Mercurial > meta
changeset 18:6cd839818393
Adjust to name change for [Top.id]
| author | Adam Chlipala <adam@chlipala.net> |
|---|---|
| date | Thu, 29 Dec 2011 14:15:02 -0500 |
| parents | 1a915f89f23a |
| children | 875221eee987 |
| files | html.ur json.ur record.ur sql.ur |
| diffstat | 4 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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]}
--- 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}
--- 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
--- 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)