diff options
| -rw-r--r-- | 048check_type_by_name.cc | 4 | ||||
| -rw-r--r-- | 056recipe_header.cc | 4 | ||||
| -rw-r--r-- | 999spaces.cc | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/048check_type_by_name.cc b/048check_type_by_name.cc index f229263e..41ff6263 100644 --- a/048check_type_by_name.cc +++ b/048check_type_by_name.cc @@ -15,10 +15,10 @@ recipe main [ +error: main: x used with multiple types :(after "Begin Instruction Modifying Transforms") -Transform.push_back(check_types_by_name); // idempotent +Transform.push_back(check_or_set_types_by_name); // idempotent :(code) -void check_types_by_name(const recipe_ordinal r) { +void check_or_set_types_by_name(const recipe_ordinal r) { trace(9991, "transform") << "--- deduce types for recipe " << get(Recipe, r).name << end(); //? cerr << "--- deduce types for recipe " << get(Recipe, r).name << '\n'; map<string, type_tree*> type; diff --git a/056recipe_header.cc b/056recipe_header.cc index d1735887..db2aebbe 100644 --- a/056recipe_header.cc +++ b/056recipe_header.cc @@ -133,7 +133,7 @@ recipe add2 x:number, y:number -> z:number [ ] +error: add2: replied with the wrong type at 'reply z' -:(after "Begin Type Modifying Transforms") +:(before "End Checks") Transform.push_back(check_reply_instructions_against_header); // idempotent :(code) @@ -194,7 +194,7 @@ recipe add2 x:number, y:number -> z:number [ ] +mem: storing 8 in location 1 -:(before "Transform.push_back(check_reply_instructions_against_header)") +:(after "Begin Type Modifying Transforms") Transform.push_back(deduce_types_from_header); // idempotent :(code) diff --git a/999spaces.cc b/999spaces.cc index a9247a5d..1e85f908 100644 --- a/999spaces.cc +++ b/999spaces.cc @@ -45,9 +45,8 @@ assert(Max_callstack_depth == 9989); //: ↳ 56.4 fill in reply ingredients //: //: begin type modifying transforms -//: ↱ 56.3 deduce types from header -//: 56 check reply instructions against header -//: 48 check types by name +//: 56.3 deduce types from header +//: 48 check or set types by name //: --- //: 30 check or set invalid containers //: end type modifying transforms @@ -56,6 +55,7 @@ assert(Max_callstack_depth == 9989); //: 13 update instruction operation //: 40 transform braces //: 41 transform labels +//: //: ↱ 46 collect surrounding spaces //: 42 transform names //: end instruction modifying transforms @@ -64,5 +64,7 @@ assert(Max_callstack_depth == 9989); //: --- //: 21 check instruction //: ↳ 43 transform 'new' to 'allocate' +//: +//: 56 check reply instructions against header //: end checks //: end transforms |