[MLton-commit] r5212

[Wesley Terpstra]

more readable demo program
----------------------------------------------------------------------

U   mltonlib/trunk/ca/terpstra/sqlite3/demo.sml

----------------------------------------------------------------------

Modified: mltonlib/trunk/ca/terpstra/sqlite3/demo.sml
===================================================================
--- mltonlib/trunk/ca/terpstra/sqlite3/demo.sml	2007-02-15 23:16:30 UTC (rev 5211)
+++ mltonlib/trunk/ca/terpstra/sqlite3/demo.sml	2007-02-15 23:36:37 UTC (rev 5212)
@@ -12,12 +12,13 @@
 local
   open SQL.Function
 in
-  val M1 : t = fnS iS iS $ (fn (a & b) => a ^ b)
-  val () = SQL.registerFunction (db, "wes", M1)
-  val M2 : t = fnR iAS $ (fn v => (Vector.app (fn s => print (s ^ "\n")) v; 0.0))
-  val () = SQL.registerFunction (db, "debug", M2)
+  fun concat (a & b) = a ^ b
+  fun debug v = Vector.app (fn s => print (s ^ "\n")) v
   fun glom (s & i) = if i = 0 then raise SQL.Error "bad integer" else s ^ Int.toString i
-  val () = SQL.registerFunction (db, "glom", fnS iS iI $ glom)
+  val () = SQL.registerFunction  (db, "wes", fnS iS iS $ concat)
+  val () = SQL.registerFunction  (db, "debug", fnN iAS $ debug)
+  val () = SQL.registerFunction  (db, "glom", fnS iS iI $ glom)
+  val () = SQL.registerCollation (db, "sless", String.compare)
 end
 
 local
@@ -31,10 +32,11 @@
 end
 
 fun dumpP (s & i) = print (s ^ " " ^ Int.toString i ^ "\n")
-fun dumpV v = Vector.app (fn s => print (s ^ "\n")) v
+fun dumpV v = (Vector.app (fn s => print (s ^ " ")) v; print "\n")
+
 val () = SQL.app dumpP Q1 (4 & "hi") handle SQL.Error x => die x
-val () = SQL.app dumpV Q2 () handle SQL.Error x => die x
+val () = SQL.app dumpV Q2 ()         handle SQL.Error x => die x
 
-val () = SQL.Query.close Q1 handle SQL.Error x => die x
-val () = SQL.Query.close Q2 handle SQL.Error x => die x
-val () = SQL.closeDB db handle SQL.Error x => die x
+val () = SQL.Query.close Q1          handle SQL.Error x => die x
+val () = SQL.Query.close Q2          handle SQL.Error x => die x
+val () = SQL.closeDB db              handle SQL.Error x => die x