TypeDeclare & TypeAnnotation Interpreter.

Yesterday17 · Jan 27, 2019 · 3efb3eb · 3efb3eb
1 parent b85e94a
commit 3efb3eb
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 47 deletions.
diff --git a/server/parser/zsInterpreter.ts b/server/parser/zsInterpreter.ts
@@ -292,16 +292,42 @@ class ZenScriptInterpreter extends ZSParser.getBaseCstVisitorConstructor() {
     };
   }
 
-  protected TypeDeclare(ctx: NodeContext): ASTNode {
-    return {
-      type: 'type-declare',
-    };
+  protected TypeDeclare(ctx: NodeContext) {
+    return this.visit(ctx.TypeAnnotation);
   }
 
   protected TypeAnnotation(ctx: NodeContext): ASTNode {
-    return {
-      type: 'type',
-    };
+    // Type from ANY - STRING
+    if (Object.keys(ctx).length === 1) {
+      return {
+        type: Object.keys(ctx)[0],
+      };
+    }
+
+    // Imported type
+    if (ctx.IDENTIFIER) {
+      return {
+        type: 'IMPORT',
+        item: ctx.IDENTIFIER.map((identifier: IToken) => identifier.image),
+      };
+    }
+
+    // Function type
+    if (ctx.FUNCTION) {
+      return {
+        type: 'FUNCTION',
+        item: ctx.ParameterType.map((type: any) => this.visit(type)),
+        return: this.visit(ctx.FunctionType),
+      };
+    }
+
+    // Array type
+    if (ctx.ArrayType) {
+      return {
+        type: 'ARRAY',
+        item: this.visit(ctx.ArrayType),
+      };
+    }
   }
 }
 

diff --git a/server/parser/zsParser.ts b/server/parser/zsParser.ts
@@ -627,49 +627,52 @@ export class ZenScriptParser extends Parser {
   });
 
   protected TypeAnnotation = this.RULE('TypeAnnotation', () => {
-    this.OR([
-      { ALT: () => this.CONSUME(ANY) },
-      { ALT: () => this.CONSUME(VOID) },
-      { ALT: () => this.CONSUME(BOOL) },
-      { ALT: () => this.CONSUME(BYTE) },
-      { ALT: () => this.CONSUME(SHORT) },
-      { ALT: () => this.CONSUME(INT) },
-      { ALT: () => this.CONSUME(LONG) },
-      { ALT: () => this.CONSUME(FLOAT) },
-      { ALT: () => this.CONSUME(DOUBLE) },
-      { ALT: () => this.CONSUME(STRING) },
-      {
-        ALT: () => {
-          this.AT_LEAST_ONE_SEP({
-            SEP: DOT,
-            DEF: () => {
-              this.CONSUME(IDENTIFIER);
-            },
-          });
+    this.OR({
+      DEF: [
+        { ALT: () => this.CONSUME(ANY) },
+        { ALT: () => this.CONSUME(VOID) },
+        { ALT: () => this.CONSUME(BOOL) },
+        { ALT: () => this.CONSUME(BYTE) },
+        { ALT: () => this.CONSUME(SHORT) },
+        { ALT: () => this.CONSUME(INT) },
+        { ALT: () => this.CONSUME(LONG) },
+        { ALT: () => this.CONSUME(FLOAT) },
+        { ALT: () => this.CONSUME(DOUBLE) },
+        { ALT: () => this.CONSUME(STRING) },
+        {
+          ALT: () => {
+            this.AT_LEAST_ONE_SEP({
+              SEP: DOT,
+              DEF: () => {
+                this.CONSUME(IDENTIFIER);
+              },
+            });
+          },
         },
-      },
-      {
-        ALT: () => {
-          this.CONSUME(FUNCTION);
-          this.CONSUME(BR_OPEN);
-          this.MANY_SEP({
-            SEP: COMMA,
-            DEF: () => {
-              this.SUBRULE(this.TypeAnnotation);
-            },
-          });
-          this.CONSUME(BR_CLOSE);
-          this.SUBRULE2(this.TypeAnnotation);
+        {
+          ALT: () => {
+            this.CONSUME(FUNCTION);
+            this.CONSUME(BR_OPEN);
+            this.MANY_SEP({
+              SEP: COMMA,
+              DEF: () => {
+                this.SUBRULE(this.TypeAnnotation, { LABEL: 'ParameterType' });
+              },
+            });
+            this.CONSUME(BR_CLOSE);
+            this.SUBRULE2(this.TypeAnnotation, { LABEL: 'FunctionType' });
+          },
         },
-      },
-      {
-        ALT: () => {
-          this.CONSUME(SQBR_OPEN);
-          this.SUBRULE3(this.TypeAnnotation);
-          this.CONSUME(SQBR_CLOSE);
+        {
+          ALT: () => {
+            this.CONSUME(SQBR_OPEN);
+            this.SUBRULE3(this.TypeAnnotation, { LABEL: 'ArrayType' });
+            this.CONSUME(SQBR_CLOSE);
+          },
         },
-      },
-    ]);
+      ],
+      ERR_MSG: 'Must be a type.',
+    });
     this.MANY(() => {
       this.CONSUME2(SQBR_OPEN);
       this.CONSUME2(SQBR_CLOSE);