diff lib/ur/top.ur @ 1173:983d9b38abc7

Fix parsing of space-free .urp directives; use 'class' for 'c*' tags
author Adam Chlipala <adamc@hcoop.net>
date Sun, 28 Feb 2010 15:46:41 -0500
parents ad15700272f6
children 26fed2c4f5be
line wrap: on
line diff
--- a/lib/ur/top.ur	Sun Feb 28 13:06:10 2010 -0500
+++ b/lib/ur/top.ur	Sun Feb 28 15:46:41 2010 -0500
@@ -138,15 +138,6 @@
            f [nm] [rest] ! r1.nm r2.nm (acc (r1 -- nm) (r2 -- nm)))
        (fn _ _ => i)
 
-fun foldURX2 [tf1 :: Type] [tf2 :: Type] [ctx :: {Unit}]
-           (f : nm :: Name -> rest :: {Unit}
-                -> [[nm] ~ rest] =>
-                      tf1 -> tf2 -> xml ctx [] []) =
-    @@foldUR2 [tf1] [tf2] [fn _ => xml ctx [] []]
-      (fn [nm :: Name] [rest :: {Unit}] [[nm] ~ rest] v1 v2 acc =>
-          <xml>{f [nm] [rest] ! v1 v2}{acc}</xml>)
-      <xml/>
-
 fun foldR [K] [tf :: K -> Type] [tr :: {K} -> Type]
            (f : nm :: Name -> t :: K -> rest :: {K}
                 -> [[nm] ~ rest] =>
@@ -195,6 +186,15 @@
           <xml>{f [nm] [t] [rest] ! r}{acc}</xml>)
       <xml/>
 
+fun mapUX2 [tf1 :: Type] [tf2 :: Type] [ctx :: {Unit}]
+           (f : nm :: Name -> rest :: {Unit}
+                -> [[nm] ~ rest] =>
+            tf1 -> tf2 -> xml ctx [] []) =
+    @@foldUR2 [tf1] [tf2] [fn _ => xml ctx [] []]
+      (fn [nm :: Name] [rest :: {Unit}] [[nm] ~ rest] v1 v2 acc =>
+          <xml>{f [nm] [rest] ! v1 v2}{acc}</xml>)
+      <xml/>
+
 fun mapX2 [K] [tf1 :: K -> Type] [tf2 :: K -> Type] [ctx :: {Unit}]
              (f : nm :: Name -> t :: K -> rest :: {K}
                   -> [[nm] ~ rest] =>