Support for trailing comma

src/grammar/grammar.ohm

@@ -18,7 +18,9 @@ Tact {
     // Static function
     StaticFunction = Function
     NativeFunction = nameAttribute "(" funcId ")" FunctionAttribute* native id "(" ListOf<FunctionArg,","> ")" ";" --withVoid
+                   | nameAttribute "(" funcId ")" FunctionAttribute* native id "(" ListOf<FunctionArg,","> "," ")" ";" --withVoidAndTrailingComma
                    | nameAttribute "(" funcId ")" FunctionAttribute* native id "(" ListOf<FunctionArg,","> ")" ":" Type ";" --withType
+                   | nameAttribute "(" funcId ")" FunctionAttribute* native id "(" ListOf<FunctionArg,","> "," ")" ":" Type ";" --withTypeAndTrailingComma
 
     // Field declarations
     Type = typeLiteral "?" --optional
@@ -174,7 +176,8 @@ Tact {
     ExpressionString = stringLiteral
     ExpressionField = ExpressionValue "." id ~"("
     ExpressionCall = ExpressionValue "." id "(" ListOf<Expression, ","> ")"
-    ExpressionNew = id "{" ListOf<NewParameter, ","> "}"
+    ExpressionNew = id "{" ListOf<NewParameter, ","> "}"       --noTrailing
+                  | id "{" ListOf<NewParameter, ","> "," "}"   --withTrailing
     NewParameter = id ":" Expression
     ExpressionStaticCall = id "(" ListOf<Expression, ","> ")"
     ExpressionInitOf = initOf id "(" ListOf<Expression, ","> ")"

src/grammar/grammar.ohm-bundle.d.ts

@@ -18,7 +18,9 @@ export interface TactActionDict<T> extends ActionDict<T> {
   Primitive?: (this: NonterminalNode, arg0: TerminalNode, arg1: NonterminalNode, arg2: TerminalNode) => T;
   StaticFunction?: (this: NonterminalNode, arg0: NonterminalNode) => T;
   NativeFunction_withVoid?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode, arg4: IterationNode, arg5: NonterminalNode, arg6: NonterminalNode, arg7: TerminalNode, arg8: NonterminalNode, arg9: TerminalNode, arg10: TerminalNode) => T;
+  NativeFunction_withVoidAndTrailingComma?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode, arg4: IterationNode, arg5: NonterminalNode, arg6: NonterminalNode, arg7: TerminalNode, arg8: NonterminalNode, arg9: TerminalNode, arg10: TerminalNode, arg11: TerminalNode) => T;
   NativeFunction_withType?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode, arg4: IterationNode, arg5: NonterminalNode, arg6: NonterminalNode, arg7: TerminalNode, arg8: NonterminalNode, arg9: TerminalNode, arg10: TerminalNode, arg11: NonterminalNode, arg12: TerminalNode) => T;
+  NativeFunction_withTypeAndTrailingComma?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode, arg4: IterationNode, arg5: NonterminalNode, arg6: NonterminalNode, arg7: TerminalNode, arg8: NonterminalNode, arg9: TerminalNode, arg10: TerminalNode, arg11: TerminalNode, arg12: NonterminalNode, arg13: TerminalNode) => T;
   NativeFunction?: (this: NonterminalNode, arg0: NonterminalNode) => T;
   Type_optional?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode) => T;
   Type_required?: (this: NonterminalNode, arg0: NonterminalNode) => T;
@@ -136,7 +138,9 @@ export interface TactActionDict<T> extends ActionDict<T> {
   ExpressionString?: (this: NonterminalNode, arg0: NonterminalNode) => T;
   ExpressionField?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode) => T;
   ExpressionCall?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode, arg4: NonterminalNode, arg5: TerminalNode) => T;
-  ExpressionNew?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode) => T;
+  ExpressionNew_noTrailing?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode) => T;
+  ExpressionNew_withTrailing?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode, arg4: TerminalNode) => T;
+  ExpressionNew?: (this: NonterminalNode, arg0: NonterminalNode) => T;
   NewParameter?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode) => T;
   ExpressionStaticCall?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode) => T;
   ExpressionInitOf?: (this: NonterminalNode, arg0: NonterminalNode, arg1: NonterminalNode, arg2: TerminalNode, arg3: NonterminalNode, arg4: TerminalNode) => T;

src/grammar/grammar.ts

@@ -355,6 +355,19 @@ semantics.addOperation<ASTNode>('resolve_declaration', {
             ref: createRef(this)
         })
     },
+    NativeFunction_withTypeAndTrailingComma(_arg0, _arg1, arg2, _arg3, arg4, arg5, arg6, _arg7, arg8, _arg9, _arg10, arg11, _arg12, _arg13) {
+        checkVariableName(arg5.sourceString, createRef(arg5));
+        return createNode({
+            kind: 'def_native_function',
+            origin: ctx!.origin,
+            attributes: arg4.children.map((v) => v.resolve_attributes()),
+            name: arg6.sourceString,
+            nativeName: arg2.sourceString,
+            return: arg11.resolve_expression(),
+            args: arg8.asIteration().children.map((v) => v.resolve_declaration()),
+            ref: createRef(this)
+        })
+    },
     NativeFunction_withVoid(_arg0, _arg1, arg2, _arg3, arg4, arg5, arg6, _arg7, arg8, _arg9, _arg10) {
         checkVariableName(arg5.sourceString, createRef(arg5));
         return createNode({
@@ -368,6 +381,19 @@ semantics.addOperation<ASTNode>('resolve_declaration', {
             ref: createRef(this)
         })
     },
+    NativeFunction_withVoidAndTrailingComma(_arg0, _arg1, arg2, _arg3, arg4, arg5, arg6, _arg7, arg8, _arg9, _arg10, _arg11) {
+        checkVariableName(arg5.sourceString, createRef(arg5));
+        return createNode({
+            kind: 'def_native_function',
+            origin: ctx!.origin,
+            attributes: arg4.children.map((v) => v.resolve_attributes()),
+            name: arg6.sourceString,
+            nativeName: arg2.sourceString,
+            return: null,
+            args: arg8.asIteration().children.map((v) => v.resolve_declaration()),
+            ref: createRef(this)
+        })
+    },
     ContractInit(_arg0, _arg1, arg2, _arg3, _arg4, arg5, _arg6) {
         return createNode({
             kind: 'def_init_function',
@@ -712,7 +738,10 @@ semantics.addOperation<ASTNode>('resolve_expression', {
     ExpressionStaticCall(arg0, _arg1, arg2, _arg3) {
         return createNode({ kind: 'op_static_call', name: arg0.sourceString, args: arg2.asIteration().children.map((v) => v.resolve_expression()), ref: createRef(this) });
     },
-    ExpressionNew(arg0, _arg1, arg2, _arg3) {
+    ExpressionNew_withTrailing(arg0, _arg1, arg2, _arg3, _arg4) {
+        return createNode({ kind: 'op_new', type: arg0.sourceString, args: arg2.asIteration().children.map((v) => v.resolve_expression()), ref: createRef(this) });
+    },
+    ExpressionNew_noTrailing(arg0, _arg1, arg2, _arg3) {
         return createNode({ kind: 'op_new', type: arg0.sourceString, args: arg2.asIteration().children.map((v) => v.resolve_expression()), ref: createRef(this) });
     },
     NewParameter(arg0, _arg1, arg2) {

src/grammar/test/case-17.tact

@@ -1,7 +1,27 @@
 struct A {
     x: Int;
+    y: Int;
+}
+
+const a: A = new { x: 1 };
+
+fun getA(): A {
+    return A {
+        x: 1,
+        y: 2,
+    };
 }
 
 message B {
     x: Int;
-}
+    y: Int;
+}
+
+const b: B = new {
+    x: 2,
+    y: 3,
+};
+
+fun getB(): B {
+    return B { x = 1, y = 5, };
+}

src/grammar/test/case-25.tact

@@ -1,3 +1,10 @@
 fun function(a: Int, b: Int): Int {
     return (a >> b) || (a << (32 - b));
+}
+
+fun anotherFunction(
+    a: Int,
+    b: Int,
+    ): Int {
+    return (a >> b) || (a << (32 - b));
 }

src/test/features/serialization-2.tact

@@ -74,11 +74,17 @@ contract SerializationTester2 {
     }
 
     get fun getBoth():Both {
-        return Both{a: self.a, b: self.b};
+        return Both{
+            a: self.a,
+            b: self.b,
+        };
     }
 
     get fun getBothOpt():Both? {
-        return Both{a: self.a, b: self.b};
+        return Both{
+            a: self.a,
+            b: self.b,
+        };
     }
 
     get fun process(src: Vars, both: Both, both2: Both?): Vars {