Skip to content

Commit cec77d4

Browse files
authored
Merge pull request #1978 from andrew-johnson-4/lm-more-lmcommon-diiiooo
Lm more lmcommon diiiooo
2 parents e136e1c + 5902e85 commit cec77d4

57 files changed

Lines changed: 2734 additions & 3498 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

BOOTSTRAP/cli.c

Lines changed: 2586 additions & 3331 deletions
Large diffs are not rendered by default.

LM23COMMON/ascript-concrete-index.lsts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ let does-concrete-type-instance-exist(tt: Type): Bool = (
3333
TGround{tag=tag, ts=parameters} => (
3434
let exists = false;
3535
let k = (tag, ts.length as U64);
36-
for vt in concrete-type-instances-index.lookup(k, empty-type-vector) {
36+
for vector vt in concrete-type-instances-index.lookup(k, empty-type-vector) {
3737
if vt==tt then exists = true;
3838
};
3939
exists

LM23COMMON/ascript-with-only-datatype.lsts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let .with-only-datatype(tt: Type): Type = (
33
match tt {
44
TAnd{ conjugate=conjugate } => (
55
let result = ta;
6-
for c in conjugate { if not(non-zero(result)) then result = c.with-only-datatype };
6+
for vector c in conjugate { if not(non-zero(result)) then result = c.with-only-datatype };
77
result;
88
);
99
TGround{ tag=tag, parameters=parameters } => (

LM23COMMON/ast-acontext-apply.lsts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let apply(ctx: AContext, term: AST): AST = (
1313
Abs{lhs=lhs, rhs=rhs, tt=tt} => mk-abs( apply(ctx,lhs), apply(ctx,rhs), tt );
1414
Seq{seq=seq} => (
1515
let return = mk-eof();
16-
for s in seq { return = return + apply(ctx,s) };
16+
for vector s in seq { return = return + apply(ctx,s) };
1717
return
1818
);
1919
Glb{key=key, val=val} => mk-glb( substitute(ctx,key), apply(ctx,val) );

LM23COMMON/ast-acontext-substitute.lsts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ let substitute(ctx: AContext, tt: Type): Type = (
2020
);
2121
TAnd{conjugate=conjugate} => (
2222
let result = mk-vector(type(Type), 0);
23-
for c in conjugate {
23+
for vector c in conjugate {
2424
match substitute(ctx,c) {
25-
TAnd{rconjugate=conjugate} => for rc in rconjugate { result = result.push(rc) };
25+
TAnd{rconjugate=conjugate} => for vector rc in rconjugate { result = result.push(rc) };
2626
TAny{} => ();
2727
rc => ( result = result.push(rc); () );
2828
}
@@ -49,7 +49,7 @@ let substitute(ctx: AContext, term: AST): AST = (
4949
Lit{} => term.unique;
5050
Seq{seq=seq} => (
5151
let ret = mk-vector(type(AST), seq.length);
52-
for s in seq { ret = ret.push(substitute(ctx,s)) };
52+
for vector s in seq { ret = ret.push(substitute(ctx,s)) };
5353
Seq(ret)
5454
);
5555
App{is-cons=is-cons,left=left,right=right} => mk-cons-or-app(is-cons,substitute(ctx,left),substitute(ctx,right));

LM23COMMON/ast-acontext-to-string.lsts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
let .into(ctx: AContext?, tt: Type<String>): String = (
33
let result = "";
4-
for Tuple{first=first,second=second} in ctx.get-or([] : AContext) {
4+
for list Tuple{first=first,second=second} in ctx.get-or([] : AContext) {
55
result = result + "\{first} : \{second}\n";
66
};
77
result

LM23COMMON/ast-into-string.lsts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let .into(t: AST, tgt: Type<String>): String = (
2222
AType{tt=tt} => tt.into(type(String));
2323
Seq{seq=seq} => (
2424
let ret = "";
25-
for s in seq { if non-zero(ret) then ret = ret + "\n"; ret = ret + s.into(type(String)) };
25+
for vector s in seq { if non-zero(ret) then ret = ret + "\n"; ret = ret + s.into(type(String)) };
2626
ret
2727
);
2828
Typedef{lhs-type=lhs-type} => (

LM23COMMON/ast-plus.lsts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let $"+"(l: AST, r: AST): AST = (
33
match l {
44
Seq{seq=seq} => (match r {
55
Seq{rseq=seq} => (
6-
for rs in rseq { l = l + rs; };
6+
for vector rs in rseq { l = l + rs; };
77
l
88
);
99
_ => Seq(seq.push(r));

LM23COMMON/ast-substitute-uuids.lsts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let substitute-uuids(ctx: AContext, term: AST): AST = (
66
);
77
Seq{seq=seq} => (
88
let ret = mk-vector(type(AST), seq.length);
9-
for s in seq { ret = ret.push(substitute-uuids(ctx,s)) };
9+
for vector s in seq { ret = ret.push(substitute-uuids(ctx,s)) };
1010
Seq(ret)
1111
);
1212
Abs{lhs=lhs,rhs=rhs,tt=tt} => (

LM23COMMON/ast-unique.lsts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let .unique(term: AST): AST = (
55
Lit{lkey=key, token=token} => Lit(lkey, token.unique);
66
Seq{seq=seq} => (
77
let ret = mk-vector(type(AST), seq.length);
8-
for s in seq { ret = ret.push(s.unique) };
8+
for vector s in seq { ret = ret.push(s.unique) };
99
Seq(ret)
1010
);
1111
App{is-cons=is-cons,left=left,right=right} => mk-cons-or-app(is-cons,left.unique,right.unique);

0 commit comments

Comments
 (0)