diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-09-14 01:56:41 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-09-14 01:56:41 -0700 |
| commit | 445bc53e6a6b3d87f35f5bffc6a87a9b4d73a2c1 (patch) | |
| tree | cc418f3c28769af043ee78d295bc618773cc27bf | |
| parent | 9a1d39bac25f6ce3a599ffce70595aee70f5bb77 (diff) | |
| download | mu-445bc53e6a6b3d87f35f5bffc6a87a9b4d73a2c1.tar.gz | |
3350
Three separate CI fixes(!)
| -rw-r--r-- | 054static_dispatch.cc | 8 | ||||
| -rwxr-xr-x | test_layers | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/054static_dispatch.cc b/054static_dispatch.cc index 1cc2351d..e6bbe207 100644 --- a/054static_dispatch.cc +++ b/054static_dispatch.cc @@ -74,8 +74,8 @@ bool all_reagents_match(const recipe& r1, const recipe& r2) { return false; } for (int i = 0; i < SIZE(r1.products); ++i) { - expand_type_abbreviations(r1.ingredients.at(i).type); - expand_type_abbreviations(r2.ingredients.at(i).type); + expand_type_abbreviations(r1.products.at(i).type); + expand_type_abbreviations(r2.products.at(i).type); if (!deeply_equal_type_names(r1.products.at(i), r2.products.at(i))) return false; } @@ -616,7 +616,9 @@ def foo a:boolean -> b:number [ :(scenario override_methods_with_type_abbreviations) type string = address:array:character def main [ - 1:number/raw <- foo [abc] + local-scope + s:address:array:character <- new [abc] + 1:number/raw <- foo s ] def foo a:address:array:character -> result:number [ return 34 diff --git a/test_layers b/test_layers index 35cfb8fa..cf009d60 100755 --- a/test_layers +++ b/test_layers @@ -74,4 +74,6 @@ then ./mu_bin test edit/00* edit/010* || exit 1 echo "=== edit: until 011" ./mu_bin test edit/00* edit/01[01]* || exit 1 + echo "=== edit: until 012" + ./mu_bin test edit/00* edit/01[0-2]* || exit 1 fi |