Initial draft to discuss approach

tact-lang · Apr 3, 2024 · 19074fd · 19074fd
1 parent 87b5cd6
commit 19074fd
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/src/generator/writers/writeFunction.ts b/src/generator/writers/writeFunction.ts
@@ -83,6 +83,9 @@ export function writeStatement(
             }
         }
         return;
+    } else if (f.kind === "statement_break") {
+        ctx.append(`break ;`);
+        return;
     } else if (f.kind === "statement_let") {
         // Contract/struct case
         const t = resolveTypeRef(ctx.ctx, f.type);

diff --git a/src/grammar/ast.ts b/src/grammar/ast.ts
@@ -473,6 +473,13 @@ export type ASTStatementRepeat = {
     ref: ASTRef;
 };
 
+export type ASTStatementBreak = {
+    kind: "statement_break";
+    id: number;
+    ref: ASTRef;
+};
+
+//
 //
 // Unions
 //
@@ -486,7 +493,8 @@ export type ASTStatement =
     | ASTCondition
     | ASTStatementWhile
     | ASTStatementUntil
-    | ASTStatementRepeat;
+    | ASTStatementRepeat
+    | ASTStatementBreak;
 export type ASTNode =
     | ASTExpression
     | ASTStruct
@@ -513,6 +521,7 @@ export type ASTNode =
     | ASTStatementWhile
     | ASTStatementUntil
     | ASTStatementRepeat
+    | ASTStatementBreak
     | ASTReceive
     | ASTLvalueRef
     | ASTString

diff --git a/src/grammar/grammar.ohm b/src/grammar/grammar.ohm
@@ -97,10 +97,12 @@ Tact {
               | StatementWhile
               | StatementRepeat
               | StatementUntil
+              | StatementBreak
     StatementBlock = "{" Statement* "}"
     StatementLet = let id ":" Type "=" Expression ";"
     StatementReturn = return Expression ";" --withExpression
-                    | return ";" --withoutExpression    
+                    | return ";" --withoutExpression
+    StatementBreak = break ";"
     StatementExpression = Expression ";"
     StatementAssign = LValue "=" Expression ";"
     StatementAugmentedAssign = StatementAugmentedAssignAdd
@@ -234,6 +236,7 @@ Tact {
     keyword = fun 
             | let
             | return 
+            | break
             | extend 
             | native 
             | public 
@@ -260,6 +263,7 @@ Tact {
     let = "let" ~idPart
     fun = "fun" ~idPart
     return = "return" ~idPart
+    break = "break" ~idPart
     extend = "extend" ~idPart
     native = "native" ~idPart
     public = "public" ~idPart

diff --git a/src/grammar/grammar.ohm-bundle.d.ts b/src/grammar/grammar.ohm-bundle.d.ts
@@ -81,6 +81,7 @@ export interface TactActionDict<T> extends ActionDict<T> {
   StatementReturn_withExpression?: (this: NonterminalNode, arg0: NonterminalNode, arg1: NonterminalNode, arg2: TerminalNode) => T;
   StatementReturn_withoutExpression?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode) => T;
   StatementReturn?: (this: NonterminalNode, arg0: NonterminalNode) => T;
+  StatementBreak?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode) => T;
   StatementExpression?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode) => T;
   StatementAssign?: (this: NonterminalNode, arg0: NonterminalNode, arg1: TerminalNode, arg2: NonterminalNode, arg3: TerminalNode) => T;
   StatementAugmentedAssign?: (this: NonterminalNode, arg0: NonterminalNode) => T;
@@ -181,6 +182,7 @@ export interface TactActionDict<T> extends ActionDict<T> {
   let?: (this: NonterminalNode, arg0: TerminalNode) => T;
   fun?: (this: NonterminalNode, arg0: TerminalNode) => T;
   return?: (this: NonterminalNode, arg0: TerminalNode) => T;
+  break?: (this: NonterminalNode, arg0: TerminalNode) => T;
   extend?: (this: NonterminalNode, arg0: TerminalNode) => T;
   native?: (this: NonterminalNode, arg0: TerminalNode) => T;
   public?: (this: NonterminalNode, arg0: TerminalNode) => 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
@@ -654,6 +654,12 @@ semantics.addOperation<ASTNode>("resolve_statement", {
             ref: createRef(this),
         });
     },
+    StatementBreak(_arg0, _arg1) {
+        return createNode({
+            kind: "statement_break",
+            ref: createRef(this),
+        });
+    },
     StatementExpression(arg0, _arg1) {
         return createNode({
             kind: "statement_expression",