Merge pull request #677 from nasa/fix-bug-in-syntax-writers

Fix bug in syntax writers

Author: bocchino

compiler/lib/src/main/scala/codegen/AstWriter.scala

@@ -129,7 +129,8 @@ object AstWriter extends AstVisitor with LineUtils {
     List.concat(
       ident(data.name),
       linesOpt(typeNameNode, data.typeName),
-      data.constants.flatMap(annotateNode(defEnumConstant))
+      data.constants.flatMap(annotateNode(defEnumConstant)),
+      linesOpt(addPrefix("default", exprNode), data.default)
     ).map(indentIn)
   }
 

compiler/lib/src/main/scala/codegen/FppWriter.scala

@@ -219,7 +219,8 @@ object FppWriter extends AstVisitor with LineUtils {
       joinOpt (data.typeName) (": ") (typeNameNode).
       joinNoIndent (" ") (
         addBraces(data.constants.flatMap(annotateNode(defEnumConstant)))
-      )
+      ).
+      joinOpt (data.default) (" default ") (exprNode)
   }
 
   override def defGuardAnnotatedNode(

compiler/tools/fpp-format/test/include.ref.txt

@@ -30,7 +30,7 @@ module DefinitionsAndSpecifiers {
       X
       Y
       Z
-    }
+    } default X
 
     @ Container specifier
     product container C id 0x00 default priority 10 @< Container specifier

compiler/tools/fpp-format/test/no_include.ref.txt

@@ -30,7 +30,7 @@ module DefinitionsAndSpecifiers {
       X
       Y
       Z
-    }
+    } default X
 
     @ Container specifier
     product container C id 0x00 default priority 10 @< Container specifier

compiler/tools/fpp-syntax/test/syntax-ast.ref.txt

@@ -52,6 +52,7 @@ def module
         ident Y
       def enum constant
         ident Z
+      default ident X
     @ Container specifier
     spec container
       ident C

compiler/tools/fpp-syntax/test/syntax-include-ast.ref.txt

@@ -52,6 +52,7 @@ def module
         ident Y
       def enum constant
         ident Z
+      default ident X
     @ Container specifier
     spec container
       ident C

compiler/tools/fpp-syntax/test/syntax-stdin.ref.txt

@@ -52,6 +52,7 @@ def module
         ident Y
       def enum constant
         ident Z
+      default ident X
     @ Container specifier
     spec container
       ident C

compiler/tools/fpp-syntax/test/syntax.fpp

@@ -23,7 +23,7 @@ module DefinitionsAndSpecifiers {
     type T
     array A = [3] U32
     struct S { x: [3] U32, y: F32, z: string }
-    enum E { X, Y, Z }
+    enum E { X, Y, Z } default X
 
     @ Container specifier
     product container C id 0x00 default priority 10