Merge pull request #16 from source-academy/cse/assignment

ECE - Evaluate Assignment

.gitignore

@@ -1,6 +1,7 @@
 # compiled output
 /dist
 /node_modules
+tsconfig.tsbuildinfo
 
 # Logs
 logs

package.json

@@ -6,6 +6,7 @@
   "repository": "https://github.com/source-academy/java-slang.git",
   "license": "Apache-2.0",
   "scripts": {
+    "build": "tsc --build --force",
     "test": "jest",
     "test:watch": "jest --watch"
   },

src/ast/astExtractor/block-statement-extractor.ts

@@ -4,6 +4,9 @@ import {
   BinaryExpressionCtx,
   BlockStatementCstNode,
   ExpressionCtx,
+  FqnOrRefTypeCtx,
+  FqnOrRefTypePartCommonCtx,
+  FqnOrRefTypePartFirstCtx,
   IToken,
   IntegerLiteralCtx,
   IntegralTypeCtx,
@@ -22,30 +25,41 @@ import {
   BinaryExpression,
   BlockStatement,
   Expression,
+  ExpressionName,
 } from "../types/blocks-and-statements";
 
 export class BlockStatementExtractor extends BaseJavaCstVisitorWithDefaults {
   private type: UnannType;
   private identifier: Identifier;
   private value: Expression;
+  private name: ExpressionName;
 
   constructor() {
     super();
   }
 
   extract(cst: BlockStatementCstNode): BlockStatement {
     this.visit(cst);
-    return {
-      kind: "LocalVariableDeclarationStatement",
-      localVariableType: this.type,
-      variableDeclaratorList: [
-        {
-          kind: "VariableDeclarator",
-          variableDeclaratorId: this.identifier,
-          variableInitializer: this.value,
-        }
-      ],
-    };
+    if (cst.children.localVariableDeclarationStatement) {
+      return {
+        kind: "LocalVariableDeclarationStatement",
+        localVariableType: this.type,
+        variableDeclaratorList: [
+          {
+            kind: "VariableDeclarator",
+            variableDeclaratorId: this.identifier,
+            variableInitializer: this.value,
+          },
+        ],
+      };
+    } else {
+      return {
+        kind: "Assignment",
+        left: this.name,
+        operator: "=",
+        right: this.value,
+      };
+    }
   }
 
   integralType(ctx: IntegralTypeCtx) {
@@ -77,6 +91,9 @@ export class BlockStatementExtractor extends BaseJavaCstVisitorWithDefaults {
   binaryExpression(ctx: BinaryExpressionCtx) {
     if (ctx.BinaryOperator && ctx.BinaryOperator.length > 0) {
       return this.makeBinaryExpression(ctx.BinaryOperator, ctx.unaryExpression);
+    } else if (ctx.AssignmentOperator && ctx.expression) {
+      this.value = this.visit(ctx.expression);
+      this.name = this.visit(ctx.unaryExpression[0]);
     } else {
       return this.visit(ctx.unaryExpression[0]);
     }
@@ -183,9 +200,26 @@ export class BlockStatementExtractor extends BaseJavaCstVisitorWithDefaults {
       return this.visit(ctx.literal);
     } else if (ctx.parenthesisExpression) {
       return this.visit(ctx.parenthesisExpression);
+    } else if (ctx.fqnOrRefType) {
+      return this.visit(ctx.fqnOrRefType);
     }
   }
 
+  fqnOrRefType(ctx: FqnOrRefTypeCtx) {
+    return this.visit(ctx.fqnOrRefTypePartFirst);
+  }
+
+  fqnOrRefTypePartFirst(ctx: FqnOrRefTypePartFirstCtx) {
+    return this.visit(ctx.fqnOrRefTypePartCommon);
+  }
+
+  fqnOrRefTypePartCommon(ctx: FqnOrRefTypePartCommonCtx) {
+    return ctx.Identifier && {
+      kind: "ExpressionName",
+      name: ctx.Identifier[0].image,
+    };
+  }
+
   literal(ctx: LiteralCtx) {
     if (ctx.integerLiteral) {
       return this.visit(ctx.integerLiteral);

src/ast/types/ast.ts

@@ -1,5 +1,6 @@
 import { CompilationUnit } from "./packages-and-modules";
 import {
+  Assignment,
   Block,
   BlockStatement,
   Expression,
@@ -10,6 +11,7 @@ interface NodeMap {
   Block: Block;
   BlockStatement: BlockStatement;
   Expression: Expression;
+  Assignment: Assignment;
 }
 
 export type Node = NodeMap[keyof NodeMap];

src/ast/types/blocks-and-statements.ts

@@ -63,7 +63,7 @@ export type LocalVariableType = UnannType;
 export interface VariableDeclarator {
   kind: "VariableDeclarator";
   variableDeclaratorId: VariableDeclaratorId;
-  variableInitializer: VariableInitializer;
+  variableInitializer?: VariableInitializer;
 }
 
 export type VariableDeclaratorId = Identifier;