1 files changed, 41 insertions, 24 deletions
diff --git a/src/main/stanza/ir-utils.stanza b/src/main/stanza/ir-utils.stanza
index 80cd39a7..ae8fdbe9 100644
--- a/src/main/stanza/ir-utils.stanza
+++ b/src/main/stanza/ir-utils.stanza
@@ -289,31 +289,48 @@ defmethod map (f: Type -> Type, c:Stmt) -> Stmt :
       (c:DefMemory) : DefRegister(name(c),f(type(c)))
       (c) : c
 
+public defmulti mapr<?T> (f: Width -> Width, t:?T&Type) -> T
+defmethod mapr (f: Width -> Width, t:Type) -> Type :
+   defn apply-t (t:Type) -> Type :
+      map{f,_} $ map(apply-t,t)
+   apply-t(t)
+
+public defmulti mapr<?T> (f: Width -> Width, s:?T&Stmt) -> T
+defmethod mapr (f: Width -> Width, s:Stmt) -> Stmt :
+   defn apply-t (t:Type) -> Type : mapr(f,t)
+   defn apply-e (e:Expression) -> Expression :
+      map{f,_} $ map{apply-t,_} $ map(apply-e,e)
+   defn apply-s (s:Stmt) -> Stmt :
+      map{apply-t,_} $ map{apply-e,_} $ map(apply-s,s)
+   apply-s(s)
+
+
 ;================= HELPER FUNCTIONS USING MAP ===================
-; These don't work properly..
-;public defmulti do (f:Expression -> ?, e:Expression) -> False
-;defmethod do (f:Expression -> ?, e:Expression) -> False :
-;   for x in e map :
-;      f(x)
-;      x
-;   false
-;
-;public defmulti do (f:Expression -> ?, s:Stmt) -> False
-;defmethod do (f:Expression -> ?, s:Stmt) -> False :
-;   defn f* (x:Expression) : 
-;      f(x)
-;      x
-;   map(f*,s)
-;   false
-;
-;public defmulti do (f:Stmt -> ?, s:Stmt) -> False
-;defmethod do (f:Stmt -> ?, s:Stmt) -> False :
-;   defn f* (x:Stmt) :
-;      f(x)
-;      x
-;   map(f*,s)
-;   false
-;
+public defmulti do (f:Expression -> ?, e:Expression) -> False
+defmethod do (f:Expression -> ?, e:Expression) -> False :
+   defn f* (x:Expression) :
+      f(x)
+      x
+   map(f*,e)
+   false
+
+public defmulti do (f:Expression -> ?, s:Stmt) -> False
+defmethod do (f:Expression -> ?, s:Stmt) -> False :
+   defn f* (x:Expression) : 
+      f(x)
+      x
+   map(f*,s)
+   false
+
+public defmulti do (f:Stmt -> ?, s:Stmt) -> False
+defmethod do (f:Stmt -> ?, s:Stmt) -> False :
+   defn f* (x:Stmt) :
+      f(x)
+      x
+   map(f*,s)
+   false
+
+; Not well defined - usually use dor on fields of a recursive type
 ;public defmulti dor (f:Expression -> ?, e:Expression) -> False
 ;defmethod dor (f:Expression -> ?, e:Expression) -> False :
 ;   f(e)