Lists Week 9 Milestone 2 Implementation

.gitignore

@@ -10,4 +10,6 @@ mochawesome-report
 **/*.svg
 !/designs/example.svg
 **/.DS_Store
-.vscode
+.vscode
+.nyc_output
+coverage

Makefile

@@ -1,5 +1,6 @@
-stdlib: build/memory.wasm build/sets.wasm
+
+stdlib: build/memory.wasm build/sets.wasm build/list.wasm
 
 build/%.wasm: stdlib/%.wat
 	mkdir -p build/
-	npx wat2wasm $< -o $@
+	npx wat2wasm $< -o $@

ast.ts

@@ -5,8 +5,7 @@ export type Type =
   | {tag: "number"}
   | {tag: "bool"}
   | {tag: "none"}
-  | {tag: "list", type: Type}
-  | {tag: "class", name: string, genericArgs?: Array<Type>}
+  | {tag: "class", name: string, genericArgs?: Array<Type>, type?: Type}
   | {tag: "either", left: Type, right: Type }
   | {tag: "generator", type: Type } // generator type
   | {tag: "set", valueType: Type }
@@ -46,7 +45,7 @@ export type Expr<A> =
   | {  a?: A, tag: "call", name: string, arguments: Array<Expr<A>>, genericArgs?: Array<Type>} 
   | {  a?: A, tag: "lookup", obj: Expr<A>, field: string }
   | {  a?: A, tag: "listliteral", elements: Array<Expr<A>> }
-  | {  a?: A, tag: "index", obj: Expr<A>, index: Expr<A> }
+  | {  a?: A, tag: "index", obj: Expr<A>, index: Expr<A>, end?: Expr<A>, steps?: Expr<A> }
   | {  a?: A, tag: "method-call", obj: Expr<A>, method: string, arguments: Array<Expr<A>> }
   | {  a?: A, tag: "construct", name: string }
   | {  a?: A, tag: "set", values: Array<Expr<A>>}
@@ -74,4 +73,4 @@ export type DestructureLHS<A> = { a?: A, lhs: AssignTarget<A>, isStarred : boole
 export type AssignTarget<A> = 
 | {  a?: A,  tag : "id", name : string}
 | {  a?: A,  tag : "lookup", obj: Expr<A>, field: string }
-| {  a?: A, tag: "index", obj: Expr<A>, index: Expr<A> }
+| {  a?: A,  tag: "index", obj: Expr<A>, index: Expr<A> }

compiler.ts

@@ -1,7 +1,8 @@
-import { Program, Stmt, Expr, Value, Class, VarInit, FunDef } from "./ir"
-import { BinOp, Type, UniOp, SourceLocation } from "./ast"
-import { BOOL, NONE, NUM } from "./utils";
+import { BinOp, SourceLocation, Type, UniOp } from "./ast";
 import { RunTimeError } from "./error_reporting";
+import { Class, Expr, FunDef, Program, Stmt, Value, VarInit } from "./ir";
+import { equalType } from "./type-check";
+import { BOOL, CLASS, PrintType, NONE, NUM } from "./utils";
 
 export type GlobalEnv = {
   globals: Map<string, boolean>;
@@ -86,7 +87,7 @@ function codeGenStmt(stmt: Stmt<[Type, SourceLocation]>, env: GlobalEnv): Array<
         ...codeGenValue(stmt.start, env),
         ...codeGenValue(stmt.offset, env),
         ...codeGenValue(stmt.value, env),
-        `call $store`
+        `(call $store)`
       ]
     case "assign":
       var valStmts = codeGenExpr(stmt.value, env);
@@ -165,18 +166,35 @@ function codeGenExpr(expr: Expr<[Type, SourceLocation]>, env: GlobalEnv): Array<
         }
         var valStmts = expr.arguments.map(arg=>{
           let argCode = codeGenValue(arg, env);
-          switch (arg.a[0]){
-            case NUM:
-              argCode.push("(call $print_num)");
-              break;
-            case BOOL:
-              argCode.push("(call $print_bool)");
-              break;
-            case NONE:
-              argCode.push("(call $print_none)");
-              break;
-            default:
-              throw new RunTimeError("not implemented object print")
+          if (arg.a[0].tag === "class" && arg.a[0].name === "list") {
+            var typeToPrint = 0;
+            var listType = arg.a[0].type;
+            while (listType.tag === "class" && listType.name === "list") {
+              typeToPrint += PrintType["list"];
+              listType = listType.type;
+            }
+            if (listType.tag in PrintType) {
+              typeToPrint += PrintType[listType.tag as keyof typeof PrintType];
+            }
+            else {
+              throw new RunTimeError("List print type not supported: " + listType.tag);
+            }
+            argCode.push(`(i32.const ${typeToPrint})`);
+            argCode.push("(call $print_list)");
+          } else {
+            switch (arg.a[0]){
+              case NUM:
+                argCode.push("(call $print_num)");
+                break;
+              case BOOL:
+                argCode.push("(call $print_bool)");
+                break;
+              case NONE:
+                argCode.push("(call $print_none)");
+                break;
+              default:
+                throw new RunTimeError("not implemented object print")
+            }
           }
           argCode.push("drop");
           return argCode;
@@ -186,24 +204,20 @@ function codeGenExpr(expr: Expr<[Type, SourceLocation]>, env: GlobalEnv): Array<
       var valStmts = expr.arguments.map((arg) => codeGenValue(arg, env)).flat();
       valStmts.push(`(i32.const ${expr.a[1].line})`);
       valStmts.push(`(call $stack_push)`);
-      if(expr.name === 'assert_not_none'){
-        valStmts.push(`(i32.const ${expr.a[1].line})(i32.const ${expr.a[1].column}) `);
-      }
       valStmts.push(`(call $${expr.name})`);
       return valStmts;
 
     case "alloc":
       return [
         ...codeGenValue(expr.amount, env),
-        `call $alloc`
+        `(call $alloc)`
       ];
     case "load":
       return [
         ...codeGenValue(expr.start, env),
         `(i32.const ${expr.a[1].line})(i32.const ${expr.a[1].column}) (call $assert_not_none)`,
-        // `call $assert_not_none`,
         ...codeGenValue(expr.offset, env),
-        `call $load`
+        `(call $load)`
       ]
   }
 }

debugstart.ts

@@ -1,30 +1,17 @@
+import { parser } from "@lezer/python";
 import { parse } from "./parser";
 import { BasicREPL } from "./repl";
 import { importObject, addLibs  } from "./tests/import-object.test";
+import { stringifyTree } from "./treeprinter";
 
 // entry point for debugging
 async function debug() {
   var source = `
   a: [int] = None
-  set_x: set[int] = None
-  set_x = set([1,2,3])
-  set_x.update([2,3,4])
-  print(set_x)
+  a = [1, 2, 3]
+  a.insert(1, 6)
   `
 
-  // set_1 : set[int] = None
-  // a : int = 0
-  // b : bool = True
-  // l: [int] = None
-  // set_1 = set([1, 2, 3])
-
-  // set_1.add(3)
-  // set_1.add(3)
-  // set_1.remove(1)
-  // a = len(set_1)
-  // b = 1 in set_1
-  // print(a)
-  // print(b)
   const ast = parse(source);
   console.log(`AST: \n ${ast}`)
 

design/frontEnd-design.md → designs/front-end-design.md

@@ -126,12 +126,12 @@ We will implement the render to hanle other objects like list, string and dictio
 ### 8. highlight the error area
 
 shown in the picture below, CodeMirror is able to underline the error
-![underline error](./Screen%20Shot%202022-05-20%20at%2023.59.27.png)
+![underline error](./front-end-error-highlighting.png)
 
 ### 9. front end test
 
 Our team have comunicated with team A and find that there is a tool called [phantomjs](https://learnku.com/docs/node-lessons/browser-side-test-mocha-chai-phantomjs/6131) for front end testing.
 
 
 The overall front page will looks like below:
-![final front end](./Screen%20Shot%202022-05-21%20at%2000.09.37.png)
+![final front end](./front-end-final-design.png)

designs/lists-design.md

@@ -125,6 +125,7 @@ print(b)
 a: [int] = None
 a = [1, 2, 3]
 a.insert(1, 4)
+print(a)
 ```
 *Output:*
 ```

error_reporting.ts

@@ -1,5 +1,4 @@
 import { SourceLocation } from "./ast";
-import { stackTrace } from "./runtime_error";
 
 export class CompileTimeError extends Error {
     __proto__: Error

ir.ts

@@ -1,4 +1,4 @@
-import {Type, BinOp, UniOp, Parameter} from './ast';
+import { BinOp, Parameter, Type, UniOp } from './ast';
 
 export type Program<A> = { a: A, funs: Array<FunDef<A>>, inits: Array<VarInit<A>>, classes: Array<Class<A>>, body: Array<BasicBlock<A>> }