C4 rush (#107)

* arrow syntax fixed

* quote added

* Fix syntax error

* fix imports and add arrow function test

* bump version

Author: martin-henz

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-slang",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Javascript-based interpreter for slang, written in Typescript",
   "author": {
     "name": "Source Academy",

src/__tests__/__snapshots__/parser.ts.snap

@@ -133,3 +133,130 @@ Node {
   "type": "Program",
 }
 `;
+
+exports[`Parse an arrow function 1`] = `
+Node {
+  "__id": "node_13",
+  "body": Array [
+    Node {
+      "__id": "node_12",
+      "end": 11,
+      "expression": Node {
+        "__id": "node_11",
+        "body": Node {
+          "__id": "node_10",
+          "end": 10,
+          "left": Node {
+            "__id": "node_8",
+            "end": 6,
+            "loc": SourceLocation {
+              "end": Position {
+                "column": 6,
+                "line": 1,
+              },
+              "start": Position {
+                "column": 5,
+                "line": 1,
+              },
+            },
+            "name": "x",
+            "start": 5,
+            "type": "Identifier",
+          },
+          "loc": SourceLocation {
+            "end": Position {
+              "column": 10,
+              "line": 1,
+            },
+            "start": Position {
+              "column": 5,
+              "line": 1,
+            },
+          },
+          "operator": "+",
+          "right": Node {
+            "__id": "node_9",
+            "end": 10,
+            "loc": SourceLocation {
+              "end": Position {
+                "column": 10,
+                "line": 1,
+              },
+              "start": Position {
+                "column": 9,
+                "line": 1,
+              },
+            },
+            "raw": "1",
+            "start": 9,
+            "type": "Literal",
+            "value": 1,
+          },
+          "start": 5,
+          "type": "BinaryExpression",
+        },
+        "end": 10,
+        "expression": true,
+        "generator": false,
+        "id": null,
+        "loc": SourceLocation {
+          "end": Position {
+            "column": 10,
+            "line": 1,
+          },
+          "start": Position {
+            "column": 0,
+            "line": 1,
+          },
+        },
+        "params": Array [
+          Node {
+            "end": 1,
+            "loc": SourceLocation {
+              "end": Position {
+                "column": 1,
+                "line": 1,
+              },
+              "start": Position {
+                "column": 0,
+                "line": 1,
+              },
+            },
+            "name": "x",
+            "start": 0,
+            "type": "Identifier",
+          },
+        ],
+        "start": 0,
+        "type": "ArrowFunctionExpression",
+      },
+      "loc": SourceLocation {
+        "end": Position {
+          "column": 11,
+          "line": 1,
+        },
+        "start": Position {
+          "column": 0,
+          "line": 1,
+        },
+      },
+      "start": 0,
+      "type": "ExpressionStatement",
+    },
+  ],
+  "end": 11,
+  "loc": SourceLocation {
+    "end": Position {
+      "column": 11,
+      "line": 1,
+    },
+    "start": Position {
+      "column": 0,
+      "line": 1,
+    },
+  },
+  "sourceType": "script",
+  "start": 0,
+  "type": "Program",
+}
+`;

src/__tests__/parser.ts

@@ -18,3 +18,9 @@ test('Parse a single number', () => {
   const program = parse('42;', context)
   expect(program).toMatchSnapshot()
 })
+
+test('Parse an arrow function', () => {
+  const context = mockContext()
+  const program = parse('x => x + 1;', context)
+  expect(program).toMatchSnapshot()
+})

src/__tests__/tst.notts

@@ -0,0 +1,43 @@
+// import { mockContext } from "../mocks/context";
+// import { parseError, runInContext } from "../index";
+// import { Finished } from "../types";
+//
+// test(
+//   "Functions are stored correctly in lists",
+//   () => {
+//     const code = `
+//     const f = i => i + 1;
+//     pair(3, 4);
+//     const lst = pair(f, f);
+//     head(lst) === f;
+//   `;
+//     const context = mockContext(2);
+//     const promise = runInContext(code, context, { scheduler: "preemptive" });
+//     return promise.then(obj => {
+//       console.log(parseError(context.errors));
+//
+//       expect(obj.status).toBe("finished");
+//       expect((obj as Finished).value).toBe(true);
+//     });
+//   },
+//   30000
+// );
+//
+// test(
+//   "HOFs work",
+//   () => {
+//     const code = `
+//     accumulate((x, y) => x + y, 0, list(1,2,3));
+//   `;
+//     const context = mockContext(2);
+//     const promise = runInContext(code, context, { scheduler: "preemptive" });
+//     return promise.then(obj => {
+//       console.log(parseError(context.errors));
+//       expect(obj.status).toBe("finished");
+//       expect((obj as Finished).value).toBe(6);
+//     });
+//   },
+//   30000
+// );
+//
+test("tru", {} => return true);

src/createContext.ts

@@ -5,7 +5,7 @@ import { toString } from '.';
 
 /** Import meta-circular parser */
 const createParserModule = require('./stdlib/parser')
-const createParser = createParserModule.createParser
+const Parser = createParserModule.Parser
 
 const GLOBAL = typeof window === 'undefined' ? global : window
 
@@ -29,7 +29,7 @@ export const createEmptyContext = <T>(chapter: number, externalSymbols: string[]
   externalContext,
   cfg: createEmptyCFG(),
   runtime: createEmptyRuntime(),
-  metaCircularParser: createParser()
+  metaCircularParser: new Parser()
 })
 
 export const ensureGlobalEnvironmentExist = (context: Context) => {
@@ -79,7 +79,7 @@ export const importBuiltins = (context: Context, externalBuiltIns: CustomBuiltIn
   alert.__SOURCE__ = externalBuiltIns.alert.__SOURCE__
   let visualiseList = (list: any) => externalBuiltIns.visualiseList(list, context.externalContext)
   visualiseList.__SOURCE__ = externalBuiltIns.visualiseList.__SOURCE__
- 
+
 
   if (context.chapter >= 1) {
     defineSymbol(context, 'runtime', misc.runtime)
@@ -140,7 +140,7 @@ export const importBuiltins = (context: Context, externalBuiltIns: CustomBuiltIn
   if (context.chapter >= 4) {
     defineSymbol(context, 'stringify', JSON.stringify)
     defineSymbol(context, 'parse',
-      function () { 
+      function () {
         return context.metaCircularParser
           .parse.apply(context.metaCircularParser, arguments)
       });
@@ -186,7 +186,7 @@ const defaultBuiltIns: CustomBuiltIns = {
     throw new Error('List visualizer is not enabled')}
 }
 
-const createContext = <T>(chapter = 1, externalSymbols: string[] = [], externalContext?: T, 
+const createContext = <T>(chapter = 1, externalSymbols: string[] = [], externalContext?: T,
   externalBuiltIns: CustomBuiltIns = defaultBuiltIns) => {
   const context = createEmptyContext(chapter, externalSymbols, externalContext)
 

src/stdlib/metacircular-interpreter/lib/interpreter/parser.jison

@@ -516,21 +516,24 @@ expression
 			     	}
 			};
 		}}
-	| identifier '=>' expression
-		{{
-			$$ = {
-				tag: 'function_definition',
-				parameters: [$1, [] ],
-				body: { tag: 'return_statement', expression: $3,
-					line: yylineno },
-				line: yylineno,
-				location: {
+	| expression '=>' expression
+		{{
+		             if ($1.tag === 'name') {
+			        $$ = {
+				   tag: 'function_definition',
+				   parameters: [$1, [] ],
+				   body: { tag: 'return_statement', expression: $3,
+					   line: yylineno },
+				   line: yylineno,
+				   location: {
 					start_line: @1.first_line,
 					start_col: @1.first_column,
 					end_line: @5.first_line,
 					end_col: @5.first_column
-			     	}
-			};
+			     	};
+			     } else {
+				error('expecting name before => ' + yylineno + ": " + yytext);
+			     }
 		}}
 
 	| expression '[' expression ']'

src/stdlib/metacircular-interpreter/lib/interpreter/parser.jison.tpl

@@ -516,21 +516,24 @@ expression
 			     	}
 			};
 		}}
-	| identifier '=>' expression
-		{{
-			$$ = {
-				tag: 'function_definition',
-				parameters: [$1, [] ],
-				body: { tag: 'return_statement', expression: $3,
-					line: yylineno },
-				line: yylineno,
-				location: {
+	| expression '=>' expression
+		{{
+		             if ($1.tag === 'name') {
+			        $$ = {
+				   tag: 'function_definition',
+				   parameters: [$1, [] ],
+				   body: { tag: 'return_statement', expression: $3,
+					   line: yylineno },
+				   line: yylineno,
+				   location: {
 					start_line: @1.first_line,
 					start_col: @1.first_column,
 					end_line: @5.first_line,
 					end_col: @5.first_column
-			     	}
-			};
+			     	};
+			     } else {
+				error('expecting name before => ' + yylineno + ": " + yytext);
+			     }
 		}}
 {{if week|ormore>10}}
 	| expression '[' expression ']'