Merge pull request #335 from iovisor/p4-fixes

Reorder P4 struct key initializers and blocks

src/cc/frontends/p4/compiler/ebpfTable.py

@@ -275,6 +275,11 @@ class EbpfTable(object):
         keyname = "key"
         valueName = "value"
 
+        serializer.newline()
+        serializer.emitIndent()
+        serializer.appendFormat("{0}:", program.getLabel(self))
+        serializer.newline()
+
         serializer.emitIndent()
         serializer.blockStart()
 
@@ -283,7 +288,7 @@ class EbpfTable(object):
         serializer.newline()
 
         serializer.emitIndent()
-        serializer.appendFormat("struct {0} {1};", self.keyTypeName, keyname)
+        serializer.appendFormat("struct {0} {1} = {{}};", self.keyTypeName, keyname)
         serializer.newline()
 
         serializer.emitIndent()
@@ -291,11 +296,6 @@ class EbpfTable(object):
             "struct {0} *{1};", self.valueTypeName, valueName)
         serializer.newline()
 
-        serializer.newline()
-        serializer.emitIndent()
-        serializer.appendFormat("{0}:", program.getLabel(self))
-        serializer.newline()
-
         self.key.serializeConstruction(serializer, keyname, program)
 
         serializer.emitIndent()