cases-of OK

Author: andrew4328

SRC/typecheck-infer-expr.lsts

@@ -93,9 +93,9 @@ let std-infer-expr(tctx: Maybe<TypeContext>, term: AST, is-scoped: Bool, used: I
          tctx = tctx.ascript(term, type-nil);
          for kt in index-fields-of.lookup((dt.first,dt.second,tg), mk-vector(type((CString,Type)))) {
             let actx = mk-actx().bind(field-item,mk-var(kt.first));
-            body = substitute(actx,body);
-            (tctx, body) = std-infer-expr(tctx, body, false, Used, ta);
-            term = mk-cons(term, body);
+            let re-body = substitute(actx,body);
+            (tctx, re-body) = std-infer-expr(tctx, re-body, false, Used, ta);
+            term = mk-cons(term, re-body);
             tctx = tctx.ascript(term, type-nil);
          };
       );
@@ -120,9 +120,9 @@ let std-infer-expr(tctx: Maybe<TypeContext>, term: AST, is-scoped: Bool, used: I
             # this convention is used to *discard* any tag information that exists in terms like (x as Tag::)
             # so effectively this is still a good and perfectly valid tag
             let actx = mk-actx().bind(case-item,mk-atype(t0(c"Tag::" + k)));
-            body = substitute(actx,body);
-            (tctx, body) = std-infer-expr(tctx, body, false, Used, ta);
-            term = mk-cons(term, body);
+            let re-body = substitute(actx,body);
+            (tctx, re-body) = std-infer-expr(tctx, re-body, false, Used, ta);
+            term = mk-cons(term, re-body);
             tctx = tctx.ascript(term, type-nil);
          };
       );

tests/promises/meta/cases-of.lsts

@@ -8,46 +8,46 @@ let cases-count = 0;
 let cases-cat = c"";
 
 cases-count = 0;
-case-cat = c"";
+cases-cat = c"";
 for case in $cases-of(B(1,2)) {
    cases-count = cases-count + 1;
    cases-cat = cases-cat + stringof(case);
 };
-print("case cat of B = \{cases-cat}\n");
+assert( cases-cat == c"Tag::BTag::C" );
 assert( cases-count == 2 );
 
 cases-count = 0;
-case-cat = c"";
+cases-cat = c"";
 for case in $cases-of(C(1,2,3)) {
    cases-count = cases-count + 1;
    cases-cat = cases-cat + stringof(case);
 };
-print("case cat of C = \{cases-cat}\n");
+assert( cases-cat == c"Tag::BTag::C" );
 assert( cases-count == 2 );
 
 cases-count = 0;
-case-cat = c"";
+cases-cat = c"";
 for case in $cases-of(B(1,2) as Tag::B) {
    cases-count = cases-count + 1;
    cases-cat = cases-cat + stringof(case);
 };
-print("case cat of B as Tag::B = \{cases-cat}\n");
+assert( cases-cat == c"Tag::BTag::C" );
 assert( cases-count == 2 );
 
 cases-count = 0;
-case-cat = c"";
+cases-cat = c"";
 for case in $cases-of(C(1,2,3) as Tag::C) {
    cases-count = cases-count + 1;
    cases-cat = cases-cat + stringof(case);
 };
-print("case cat of C as Tag::C = \{cases-cat}\n");
+assert( cases-cat == c"Tag::BTag::C" );
 assert( cases-count == 2 );
 
 cases-count = 0;
-case-cat = c"";
+cases-cat = c"";
 for case in $cases-of(D(1,2,3,4)) {
    cases-count = cases-count + 1;
    cases-cat = cases-cat + stringof(case);
 };
-print("cases cat of D = \{cases-cat}\n");
+assert( cases-cat == c"Tag::" );
 assert( cases-count == 1 );