Skip to content

Commit 72d939d

Browse files
committed
the new test passes but the new common project doesnt from a different error. going to commit and deploy just this change
1 parent 22a168d commit 72d939d

6 files changed

Lines changed: 6 additions & 7 deletions

File tree

LM23COMMON/typecheck-acontext-substitute.lsts renamed to LM23COMMON/ast-acontext-substitute.lsts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

2-
let substitute(ctx: List<(CString,AST)>, v: Token): Token = (
2+
let substitute(ctx: AContext, v: Token): Token = (
33
match ctx.lookup(v.key, mk-eof()) {
44
Lit{t=token} => t;
55
Var{t=token} => t;
66
_ => v;
77
}
88
);
99

10-
let substitute(ctx: List<(CString,AST)>, tt: Type): Type = (
10+
let substitute(ctx: AContext, tt: Type): Type = (
1111
match tt {
1212
TVar{v=name} => match ctx.lookup(v, mk-eof()) {
1313
Lit{tv1=key} => t0(tv1);
@@ -35,14 +35,14 @@ let substitute(ctx: List<(CString,AST)>, tt: Type): Type = (
3535
}
3636
);
3737

38-
let substitute(ctx: List<(CString,AST)>, tt: List<Type>): List<Type> = (
38+
let substitute(ctx: AContext, tt: List<Type>): List<Type> = (
3939
match tt {
4040
LCons{head=head,tail=tail} => cons( substitute(ctx,head), substitute(ctx,tail) );
4141
_ => tt;
4242
}
4343
);
4444

45-
let substitute(ctx: List<(CString,AST)>, term: AST): AST = (
45+
let substitute(ctx: AContext, term: AST): AST = (
4646
match term {
4747
App{left:Var{key:c"uuid"}, right:Var{x1=key}} => ctx.lookup(x1,term).unique;
4848
Var{x2=key} => ctx.lookup(x2,term).unique;

LM23COMMON/unit-ast-core.lsts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ import LM23COMMON/ast-misc-todo-remove-or-stabilize.lsts;
2525
import LM23COMMON/ast-misc-globals.lsts;
2626
import LM23COMMON/ast-acontext-apply.lsts;
2727
import LM23COMMON/ast-acontext-bind.lsts;
28+
import LM23COMMON/ast-acontext-substitute.lsts;

LM23COMMON/unit-typecheck-core.lsts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,4 @@ import LM23COMMON/typecheck-std-apply-macro-candidates.lsts;
2222
import LM23COMMON/typecheck-std-maybe-release-after-call.lsts;
2323
import LM23COMMON/typecheck-index-of-tag.lsts;
2424
import LM23COMMON/typecheck-extract-uuids.lsts;
25-
import LM23COMMON/typecheck-acontext-union.lsts;
26-
import LM23COMMON/typecheck-acontext-substitute.lsts;
2725
import LM23COMMON/typecheck-std-direct-destructure-macro.lsts;

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CC = clang
22
CFLAGS = -w -O2 -march=native -mtune=native
33

44
dev: install-production
5-
lm tests/promises/typechecking/phi-on-alias.lsts
5+
lm tests/promises/lm-typecheck/direct-inference.lsts
66
gcc tmp.c
77
./a.out
88

tests/promises/lm-typecheck/direct-inference.lsts.skip

Whitespace-only changes.

0 commit comments

Comments
 (0)