summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2016-03-11 08:16:23 -0500
committerGravatar Adam Chlipala <adam@chlipala.net>2016-03-11 08:16:23 -0500
commitd2823e60805a6cc394b149563ff500ea969b8627 (patch)
treee3db92117ef09b995fd84bd115c2c8ea1ff90ae6
parent1e7a95459bc0fa25781e7d343db85f356f0eee9a (diff)
Make Sql compatible with unmangling
-rw-r--r--src/sql.sml2
-rw-r--r--src/sqlcache.sml3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/sql.sml b/src/sql.sml
index dfe2f968..e8e82196 100644
--- a/src/sql.sml
+++ b/src/sql.sml
@@ -193,7 +193,7 @@ val uw_ident = wrapP ident (fn s => if String.isPrefix "uw_" s andalso size s >=
SOME (str (Char.toUpper (String.sub (s, 3)))
^ String.extract (s, 4, NONE))
else
- NONE)
+ SOME s)
val field = wrap (follow (opt (follow t_ident (const ".")))
uw_ident)
diff --git a/src/sqlcache.sml b/src/sqlcache.sml
index 75a17e48..570c7d45 100644
--- a/src/sqlcache.sml
+++ b/src/sqlcache.sml
@@ -1599,7 +1599,8 @@ fun addFlushing ((file, {tableToIndices, indexToInvalInfo, ffiInfo, ...} : state
in
case inval of
(* TODO: fail more gracefully. *)
- NONE => raise Fail "Sqlcache: addFlushing (b)"
+ NONE => (Print.preface ("DML", MonoPrint.p_exp MonoEnv.empty dmlText);
+ raise Fail "Sqlcache: addFlushing (b)")
| SOME invs => sequence (flushes invs @ [dmlExp])
end
| e' => e'