Expand coverage to include ExpressionCall, ExpressionInitOf and Expre…

…ssionStaticCall
tact-lang · Mar 21, 2024 · ae10d4e · ae10d4e
1 parent 42b1d55
commit ae10d4e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/src/grammar/grammar.ohm b/src/grammar/grammar.ohm
@@ -173,11 +173,11 @@ Tact {
                     | ExpressionString
     ExpressionString = stringLiteral
     ExpressionField = ExpressionValue "." id ~"("
-    ExpressionCall = ExpressionValue "." id "(" ListOf<Expression, ","> ")"
+    ExpressionCall = ExpressionValue "." id "(" ListOf<Expression, ","> ","? ")"
     ExpressionNew = id "{" ListOf<NewParameter, ","> ","? "}"
     NewParameter = id ":" Expression
-    ExpressionStaticCall = id "(" ListOf<Expression, ","> ")"
-    ExpressionInitOf = initOf id "(" ListOf<Expression, ","> ")"
+    ExpressionStaticCall = id "(" ListOf<Expression, ","> ","? ")"
+    ExpressionInitOf = initOf id "(" ListOf<Expression, ","> ","? ")"
 
     // Type Literal
     typeLiteral = letterAsciiUC typeLiteralPart*

diff --git a/src/grammar/grammar.ohm-bundle.d.ts b/src/grammar/grammar.ohm-bundle.d.ts
@@ -135,11 +135,11 @@ export interface TactActionDict<T> extends ActionDict<T> {
   ExpressionValue?: (this: NonterminalNode, arg0: NonterminalNode) => 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;
+  ExpressionCall?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode, arg4: NonterminalNode, arg5: IterationNode, arg6: TerminalNode) => T;
   ExpressionNew?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: IterationNode, arg4: TerminalNode) => 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;
+  ExpressionStaticCall?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: IterationNode, arg4: TerminalNode) => T;
+  ExpressionInitOf?: (this: NonterminalNode, arg0: NonterminalNode, arg1: NonterminalNode, arg2: TerminalNode, arg3: NonterminalNode, arg4: IterationNode, arg5: TerminalNode) => T;
   typeLiteral?: (this: NonterminalNode, arg0: NonterminalNode, arg1: IterationNode) => T;
   typeLiteralPart?: (this: NonterminalNode, arg0: NonterminalNode | TerminalNode) => T;
   integerLiteral?: (this: NonterminalNode, arg0: NonterminalNode) => T;

diff --git a/src/grammar/grammar.ohm-bundle.js b/src/grammar/grammar.ohm-bundle.js
diff --git a/src/grammar/grammar.ts b/src/grammar/grammar.ts
@@ -706,10 +706,10 @@ semantics.addOperation<ASTNode>('resolve_expression', {
     ExpressionField(arg0, _arg1, arg2) {
         return createNode({ kind: 'op_field', src: arg0.resolve_expression(), name: arg2.sourceString, ref: createRef(this) });
     },
-    ExpressionCall(arg0, _arg1, arg2, _arg3, arg4, _arg5) {
+    ExpressionCall(arg0, _arg1, arg2, _arg3, arg4, _arg5, _arg6) {
         return createNode({ kind: 'op_call', src: arg0.resolve_expression(), name: arg2.sourceString, args: arg4.asIteration().children.map((v) => v.resolve_expression()), ref: createRef(this) });
     },
-    ExpressionStaticCall(arg0, _arg1, arg2, _arg3) {
+    ExpressionStaticCall(arg0, _arg1, arg2, _arg3, _arg4) {
         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, _arg4) {
@@ -718,7 +718,7 @@ semantics.addOperation<ASTNode>('resolve_expression', {
     NewParameter(arg0, _arg1, arg2) {
         return createNode({ kind: 'new_parameter', name: arg0.sourceString, exp: arg2.resolve_expression(), ref: createRef(this) });
     },
-    ExpressionInitOf(_arg0, arg1, _arg2, arg3, _arg4) {
+    ExpressionInitOf(_arg0, arg1, _arg2, arg3, _arg4, _arg5) {
         return createNode({ kind: 'init_of', name: arg1.sourceString, args: arg3.asIteration().children.map((v) => v.resolve_expression()), ref: createRef(this) });
     },
 

diff --git a/src/grammar/test/case-25.tact b/src/grammar/test/case-25.tact
@@ -9,6 +9,13 @@ fun anotherFunction(
     return (a >> b) || (a << (32 - b));
 }
 
+fun coverage(a: Int, b: Int) {
+    let c: Int = anotherFunction(
+        a,
+        b,
+    );
+}
+
 fun oneMoreFunction(
     a: Int,
     b: Int,