redefinition

Author: andrew4328

LM23COMMON/typecheck-acontext-substitute.lsts

@@ -44,8 +44,8 @@ let substitute(ctx: List<(CString,AST)>, tt: List<Type>): List<Type> = (
 
 let substitute(ctx: List<(CString,AST)>, term: AST): AST = (
    match term {
-      App{left:Var{key:c"uuid"}, right:Var{x=key}} => ctx.lookup(x,term).unique;
-      Var{x=key} => ctx.lookup(x,term).unique;
+      App{left:Var{key:c"uuid"}, right:Var{x1=key}} => ctx.lookup(x1,term).unique;
+      Var{x2=key} => ctx.lookup(x2,term).unique;
       Lit{} => term.unique;
       Seq{seq=seq} => (
          let ret = mk-vector(type(AST), seq.length);

LM23COMMON/typecheck-std-direct-destructure-macro.lsts

@@ -2,10 +2,10 @@
 let std-direct-destructure-macro(margs: AST, mstruct: AST): AContext? = (
    let no = (None : AContext?)();
    match (margs, mstruct) {
-      Tuple{ val=first, second:Var{key=key} } => Some([(key,val)]);
-      Tuple{ first:App{lrest=left, val=right}, second:App{rrest=left, right:Var{key=key}} } => (
+      Tuple{ val=first, second:Var{key1=key} } => Some([(key1,val)]);
+      Tuple{ first:App{lrest=left, val=right}, second:App{rrest=left, right:Var{key2=key}} } => (
          let ctx = std-direct-destructure-macro(lrest, rrest);
-         if ctx.is-some then Some(cons((key,val), ctx.get-or-panic)) else no;
+         if ctx.is-some then Some(cons((key2,val), ctx.get-or-panic)) else no;
       );
       _ => fail("Unexpected std-direct-destructure-macro\nLeft: \{mstruct}\nRight: \{margs}\n");
    }

Makefile

@@ -2,8 +2,9 @@ CC = clang
 CFLAGS = -w -O2 -march=native -mtune=native
 
 dev: install-production
-	#lm --showalloc tests/promises/lm-typecheck/compilation-counting-diff1.lsts
-	lm --showalloc tests/promises/lm-typecheck/compilation-counting-diff2.lsts > out.txt
+	lm tests/promises/list/comparison.lsts
+	gcc tmp.c
+	./a.out
 
 build: compile-production
 	time ./production --v2 --c -o deploy1.c SRC/index.lsts