From 8d6870717691d2ba46e518c8d1687236019368d1 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Thu, 29 Dec 2011 14:12:03 -0500 Subject: Rename [Top.id] to avoid clash with [Basis.id] --- demo/more/versioned.ur | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'demo/more/versioned.ur') diff --git a/demo/more/versioned.ur b/demo/more/versioned.ur index 0ab15e32..d08ebcb0 100644 --- a/demo/more/versioned.ur +++ b/demo/more/versioned.ur @@ -24,7 +24,7 @@ functor Make(M : sig Eq : eq t} fun keyRecd (r : $(M.key ++ M.data)) = - @map2 [sql_injectable] [id] [sql_exp [] [] []] + @map2 [sql_injectable] [ident] [sql_exp [] [] []] (fn [t] => @sql_inject) M.keyFolder M.key (r --- M.data) @@ -33,14 +33,14 @@ functor Make(M : sig dml (Basis.insert t ({Version = (SQL {[vr]}), When = (SQL CURRENT_TIMESTAMP)} ++ keyRecd r - ++ @map2 [dmeta] [id] + ++ @map2 [dmeta] [ident] [fn t => sql_exp [] [] [] (option t)] (fn [t] x v => @sql_inject (@sql_option_prim x.Inj) (Some v)) M.dataFolder M.data (r --- M.key))) fun keyExp (r : $M.key) : sql_exp [T = all] [] [] bool = - @foldR2 [sql_injectable] [id] [fn before => after :: {Type} -> [before ~ after] + @foldR2 [sql_injectable] [ident] [fn before => after :: {Type} -> [before ~ after] => sql_exp [T = before ++ after] [] [] bool] (fn [nm :: Name] [t :: Type] [before :: {Type}] [[nm] ~ before] (inj : sql_injectable t) (v : t) @@ -113,7 +113,7 @@ functor Make(M : sig | Some cur => vr <- nextval s; let - val r' = @map3 [dmeta] [id] [id] [fn t => sql_exp [] [] [] (option t)] + val r' = @map3 [dmeta] [ident] [ident] [fn t => sql_exp [] [] [] (option t)] (fn [t] (meta : dmeta t) old new => @sql_inject (@sql_option_prim meta.Inj) (if @@eq [_] meta.Eq old new then -- cgit v1.2.3