# HG changeset patch
# User Adam Chlipala <adamc@hcoop.net>
# Date 1220214410 14400
# Node ID 7a7efbb3e35417a1cb8c23b5d573ccb544f57d6e
# Parent  b66e692422a409c2cc1adb4711aed08e1b99f2b5
Monoize aggregates

diff -r b66e692422a4 -r 7a7efbb3e354 src/monoize.sml
--- a/src/monoize.sml	Sun Aug 31 16:20:34 2008 -0400
+++ b/src/monoize.sml	Sun Aug 31 16:26:50 2008 -0400
@@ -925,7 +925,52 @@
             _) => ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc),
                              (L'.EPrim (Prim.String "COUNT(*)"), loc)), loc),
                    fm)
-            
+
+          | L.ECApp (
+            (L.ECApp (
+             (L.ECApp (
+              (L.ECApp (
+               (L.EFfi ("Basis", "sql_aggregate"), _),
+               _), _),
+              _), _),
+             _), _),
+            _) =>
+            let
+                val s = (L'.TFfi ("Basis", "string"), loc)
+                fun sc s = (L'.EPrim (Prim.String s), loc)
+            in
+                ((L'.EAbs ("c", s, (L'.TFun (s, (L'.TFun (s, s), loc)), loc),
+                           (L'.EAbs ("e1", s, (L'.TFun (s, s), loc),
+                                     strcat loc [(L'.ERel 1, loc),
+                                                 sc "(",
+                                                 (L'.ERel 0, loc),
+                                                 sc ")"]), loc)), loc),
+                 fm)
+            end
+
+          | L.EFfi ("Basis", "sql_summable_int") => ((L'.ERecord [], loc), fm)
+          | L.EFfi ("Basis", "sql_summable_float") => ((L'.ERecord [], loc), fm)
+          | L.ECApp ((L.EFfi ("Basis", "sql_avg"), _), _) =>
+            ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc),
+                       (L'.EPrim (Prim.String "AVG"), loc)), loc),
+             fm)
+          | L.ECApp ((L.EFfi ("Basis", "sql_sum"), _), _) =>
+            ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc),
+                       (L'.EPrim (Prim.String "SUM"), loc)), loc),
+             fm)
+
+          | L.EFfi ("Basis", "sql_maxable_int") => ((L'.ERecord [], loc), fm)
+          | L.EFfi ("Basis", "sql_maxable_float") => ((L'.ERecord [], loc), fm)
+          | L.EFfi ("Basis", "sql_maxable_string") => ((L'.ERecord [], loc), fm)
+          | L.ECApp ((L.EFfi ("Basis", "sql_max"), _), _) =>
+            ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc),
+                       (L'.EPrim (Prim.String "MAX"), loc)), loc),
+             fm)
+          | L.ECApp ((L.EFfi ("Basis", "sql_min"), _), _) =>
+            ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc),
+                       (L'.EPrim (Prim.String "MIN"), loc)), loc),
+             fm)
+
           | L.EApp (
             (L.ECApp (
              (L.ECApp ((L.EFfi ("Basis", "cdata"), _), _), _),
diff -r b66e692422a4 -r 7a7efbb3e354 tests/agg.ur
--- a/tests/agg.ur	Sun Aug 31 16:20:34 2008 -0400
+++ b/tests/agg.ur	Sun Aug 31 16:26:50 2008 -0400
@@ -12,8 +12,8 @@
 
 datatype list a = Nil | Cons of a * list a
 
-val r1 : transaction (list int) =
-        query q1
+val r1 : transaction (list string) =
+        query q4
         (fn fs acc => return (Cons (fs.X, acc)))
         Nil