about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2015-11-28 22:48:57 -0800
committerKartik K. Agaram <vc@akkartik.com>2015-11-28 22:48:57 -0800
commit8a70ff4d9745a022e1833c1a111fd33831c723c9 (patch)
treefc6436ea1be3f8345d84c49bd31aca96e3d75daa
parentf78f1907a1b58720eaef83f19c0f41387159774d (diff)
downloadmu-8a70ff4d9745a022e1833c1a111fd33831c723c9.tar.gz
2499 - done reorganizing transforms
-rw-r--r--056recipe_header.cc2
-rw-r--r--057static_dispatch.cc3
-rw-r--r--999spaces.cc11
3 files changed, 9 insertions, 7 deletions
diff --git a/056recipe_header.cc b/056recipe_header.cc
index ac1ca37e..b0d1d0ca 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 "Transform.push_back(check_types_by_name)")
+:(before "End Type Modifying Transforms")
 Transform.push_back(check_reply_instructions_against_header);  // idempotent
 
 :(code)
diff --git a/057static_dispatch.cc b/057static_dispatch.cc
index 223e6ec9..a333838c 100644
--- a/057static_dispatch.cc
+++ b/057static_dispatch.cc
@@ -120,9 +120,8 @@ recipe test a:number, b:number -> z:number [
 ]
 +mem: storing 2 in location 7
 
-//: after insert_fragments (tangle) and before computing operation ids
 //: after filling in all missing types (because we'll be introducing 'blank' types in this transform in a later layer, for shape-shifting recipes)
-:(after "Transform.push_back(deduce_types_from_header)")
+:(after "End Type Modifying Transforms")
 Transform.push_back(resolve_ambiguous_calls);  // idempotent
 
 :(code)
diff --git a/999spaces.cc b/999spaces.cc
index 8a90dbb4..4e8999d9 100644
--- a/999spaces.cc
+++ b/999spaces.cc
@@ -45,14 +45,17 @@ assert(Max_callstack_depth == 9989);
 //:      ↳ 56.4 fill in reply ingredients
 //:
 //:     begin type modifying transforms
+//:     ---
 //:       48 check types by name
-//:        ↓ ↱ 56.3 deduce types from header
-//:        ↓ ↑ ↳ 57 static dispatch
-//:        ↳ 56 check reply instructions against header
+//:     ---
+//:        ↱ 56.3 deduce types from header
+//:       56 check reply instructions against header
 //:     end type modifying transforms
 //:
+//:     57 static dispatch
+//:
 //:     30 check or set invalid containers
-//:     ---
+//:   ---
 //:     13 update instruction operation
 //:     40 transform braces
 //:     41 transform labels