# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1325186102 18000
# Node ID 6cd839818393a557eb4b9fd62681421a64f89bbb
# Parent  1a915f89f23a692106ef67ad746a7ca1e1844beb
Adjust to name change for [Top.id]

diff -r 1a915f89f23a -r 6cd839818393 html.ur
--- a/html.ur	Thu Dec 29 10:10:50 2011 -0500
+++ b/html.ur	Thu Dec 29 14:15:02 2011 -0500
@@ -110,7 +110,7 @@
                                             Good (ats, post) =>
                                             let
                                                 val ats =
-                                                    @map2 [attribute] [option] [id]
+                                                    @map2 [attribute] [option] [ident]
                                                      (fn [t] meta v =>
                                                          case v of
                                                              None => error <xml>Missing attribute {[meta.Nam]}
diff -r 1a915f89f23a -r 6cd839818393 json.ur
--- a/json.ur	Thu Dec 29 10:10:50 2011 -0500
+++ b/json.ur	Thu Dec 29 14:15:02 2011 -0500
@@ -205,7 +205,7 @@
     end
 
 fun json_record [ts ::: {Type}] (fl : folder ts) (jss : $(map json ts)) (names : $(map (fn _ => string) ts)) : json $ts =
-    {ToJson = fn r => "{" ^ @foldR3 [json] [fn _ => string] [id] [fn _ => string]
+    {ToJson = fn r => "{" ^ @foldR3 [json] [fn _ => string] [ident] [fn _ => string]
                              (fn [nm ::_] [t ::_] [r ::_] [[nm] ~ r] (j : json t) name v acc =>
                                  escape name ^ ":" ^ j.ToJson v ^ (case acc of
                                                                        "" => ""
@@ -259,9 +259,9 @@
                                val (r, s') = fromJ (skipSpaces (String.substring s {Start = 1, Len = String.length s - 1}))
                                                    (@map0 [option] (fn [t ::_] => None) fl)
                            in
-                               (@map2 [option] [fn _ => string] [id] (fn [t] (v : option t) name =>
-                                                                         case v of
-                                                                             None => error <xml>Missing JSON object field {[name]}</xml>
-                                                                           | Some v => v) fl r names, s')
+                               (@map2 [option] [fn _ => string] [ident] (fn [t] (v : option t) name =>
+                                                                            case v of
+                                                                                None => error <xml>Missing JSON object field {[name]}</xml>
+                                                                              | Some v => v) fl r names, s')
                            end
                    end}
diff -r 1a915f89f23a -r 6cd839818393 record.ur
--- a/record.ur	Thu Dec 29 10:10:50 2011 -0500
+++ b/record.ur	Thu Dec 29 14:15:02 2011 -0500
@@ -8,7 +8,7 @@
      False fl r
 
 fun equal [ts ::: {Type}] (eqs : $(map eq ts)) (fl : folder ts) (r1 : $ts) (r2 : $ts) : bool =
-    @foldR3 [eq] [id] [id] [fn _ => bool]
+    @foldR3 [eq] [ident] [ident] [fn _ => bool]
      (fn [nm ::_] [t ::_] [r ::_] [[nm] ~ r] isEq x y acc =>
          acc && @eq isEq x y)
      True fl eqs r1 r2
diff -r 1a915f89f23a -r 6cd839818393 sql.ur
--- a/sql.ur	Thu Dec 29 10:10:50 2011 -0500
+++ b/sql.ur	Thu Dec 29 14:15:02 2011 -0500
@@ -1,11 +1,11 @@
 fun sqexps [env] [fields] (fl : folder fields) (inj : $(map sql_injectable fields)) (r : $fields) =
-    @map2 [sql_injectable] [id] [sql_exp env [] []]
+    @map2 [sql_injectable] [ident] [sql_exp env [] []]
      (fn [t] => @sql_inject)
      fl inj r
 
 fun selector [tn :: Name] [fs] [ofs] [fs ~ ofs] (fl : folder fs) (m : $(map sql_injectable fs)) (r : $fs)
     : sql_exp [tn = ofs ++ fs] [] [] bool =
-    @foldR2 [sql_injectable] [id]
+    @foldR2 [sql_injectable] [ident]
      [fn key => rest :: {Type} -> [rest ~ key] => sql_exp [tn = key ++ rest] [] [] bool]
      (fn [nm :: Name] [t :: Type] [key :: {Type}] [[nm] ~ key]
                       (inj : sql_injectable t) (v : t)