@intend-it/parser 1.3.2 → 1.3.3

package/dist/index.js

@@ -9145,6 +9145,7 @@ class CstParser extends Parser {
   }
 }
 // src/tokens.ts
+var Identifier = createToken({ name: "Identifier", pattern: /[a-zA-Z_]\w*/ });
 var LineComment = createToken({
   name: "LineComment",
   pattern: /\/\/[^\n\r]*/,
@@ -9155,20 +9156,20 @@ var BlockComment = createToken({
   pattern: /\/\*[\s\S]*?\*\//,
   group: Lexer.SKIPPED
 });
-var Import = createToken({ name: "Import", pattern: /import/ });
-var From = createToken({ name: "From", pattern: /from/ });
-var Intent = createToken({ name: "Intent", pattern: /intent/ });
-var Context = createToken({ name: "Context", pattern: /context/ });
-var Export = createToken({ name: "Export", pattern: /export/ });
-var Invariant = createToken({ name: "Invariant", pattern: /invariant/ });
-var Step = createToken({ name: "Step", pattern: /step/ });
-var Ensure = createToken({ name: "Ensure", pattern: /ensure/ });
-var Const = createToken({ name: "Const", pattern: /const/ });
-var Is = createToken({ name: "Is", pattern: /is/ });
-var Defined = createToken({ name: "Defined", pattern: /defined/ });
-var Entry = createToken({ name: "Entry", pattern: /entry/ });
-var Let = createToken({ name: "Let", pattern: /let/ });
-var Return = createToken({ name: "Return", pattern: /return/ });
+var Import = createToken({ name: "Import", pattern: /import/, longer_alt: Identifier });
+var From = createToken({ name: "From", pattern: /from/, longer_alt: Identifier });
+var Intent = createToken({ name: "Intent", pattern: /intent/, longer_alt: Identifier });
+var Context = createToken({ name: "Context", pattern: /context/, longer_alt: Identifier });
+var Export = createToken({ name: "Export", pattern: /export/, longer_alt: Identifier });
+var Invariant = createToken({ name: "Invariant", pattern: /invariant/, longer_alt: Identifier });
+var Step = createToken({ name: "Step", pattern: /step/, longer_alt: Identifier });
+var Ensure = createToken({ name: "Ensure", pattern: /ensure/, longer_alt: Identifier });
+var Const = createToken({ name: "Const", pattern: /const/, longer_alt: Identifier });
+var Is = createToken({ name: "Is", pattern: /is/, longer_alt: Identifier });
+var Defined = createToken({ name: "Defined", pattern: /defined/, longer_alt: Identifier });
+var Entry = createToken({ name: "Entry", pattern: /entry/, longer_alt: Identifier });
+var Let = createToken({ name: "Let", pattern: /let/, longer_alt: Identifier });
+var Return = createToken({ name: "Return", pattern: /return/, longer_alt: Identifier });
 var LCurly = createToken({ name: "LCurly", pattern: /{/ });
 var RCurly = createToken({ name: "RCurly", pattern: /}/ });
 var LParen = createToken({ name: "LParen", pattern: /\(/ });
@@ -9192,7 +9193,6 @@ var StringLiteral = createToken({
   line_breaks: true
 });
 var NumberLiteral = createToken({ name: "NumberLiteral", pattern: /-?\d+(\.\d+)?/ });
-var Identifier = createToken({ name: "Identifier", pattern: /[a-zA-Z_]\w*/ });
 var WhiteSpace = createToken({
   name: "WhiteSpace",
   pattern: /\s+/,
@@ -9350,18 +9350,27 @@ class IntendParser extends CstParser {
     this.OPTION(() => {
       this.CONSUME(FatArrow);
       this.OR([
-        { ALT: () => this.CONSUME(Const) },
-        { ALT: () => this.CONSUME(Let) }
+        { ALT: () => {
+          this.OR2([
+            { ALT: () => this.CONSUME(Const) },
+            { ALT: () => this.CONSUME(Let) }
+          ]);
+          this.CONSUME(Identifier, { LABEL: "ResultVar" });
+          this.OPTION2(() => {
+            this.CONSUME(Colon);
+            this.CONSUME2(Identifier, { LABEL: "ResultType" });
+            this.OPTION3(() => {
+              this.CONSUME(LBracket);
+              this.CONSUME(RBracket);
+            });
+          });
+        } },
+        { ALT: () => {
+          this.CONSUME(LCurly);
+          this.SUBRULE(this.body);
+          this.CONSUME(RCurly);
+        } }
       ]);
-      this.CONSUME(Identifier, { LABEL: "ResultVar" });
-      this.OPTION2(() => {
-        this.CONSUME(Colon);
-        this.CONSUME2(Identifier, { LABEL: "ResultType" });
-        this.OPTION3(() => {
-          this.CONSUME(LBracket);
-          this.CONSUME(RBracket);
-        });
-      });
     });
   });
   ensureStatement = this.RULE("ensureStatement", () => {
@@ -9377,7 +9386,8 @@ class IntendParser extends CstParser {
         { ALT: () => this.CONSUME(LessThan) },
         { ALT: () => this.CONSUME(Is) },
         { ALT: () => this.CONSUME(Defined) },
-        { ALT: () => this.CONSUME(StringLiteral) }
+        { ALT: () => this.CONSUME(StringLiteral) },
+        { ALT: () => this.CONSUME(NumberLiteral) }
       ]);
     });
   });
@@ -9605,7 +9615,8 @@ class IntendASTVisitor extends BaseIntendVisitor {
       ...ctx.LessThan || [],
       ...ctx.Is || [],
       ...ctx.Defined || [],
-      ...ctx.StringLiteral || []
+      ...ctx.StringLiteral || [],
+      ...ctx.NumberLiteral || []
     ];
     tokens.sort((a, b) => a.startOffset - b.startOffset);
     let expression = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intend-it/parser",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Parser for the Intend programming language",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",