aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/compiler.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-09-02 10:51:41 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-09-02 10:51:41 -0400
commitb4398c433195b75d5e03d0774b1128fae14e9f41 (patch)
tree70e65dddc4c89b8cd1e13fce0d0c2ce21f50d67a /src/compiler.sml
parent8a494ef37c4f4f7e15bbf173f44f81d12a60b91b (diff)
'database' declaration threaded through compiler
Diffstat (limited to 'src/compiler.sml')
-rw-r--r--src/compiler.sml7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/compiler.sml b/src/compiler.sml
index 1f9da052..07bfecc2 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -230,6 +230,7 @@ val parseUrp = {
val fname = String.implode (List.filter (fn x => not (Char.isSpace x))
(String.explode line))
val fname = OS.Path.concat (dir, fname)
+ handle OS.Path.Path => fname
in
fname :: acc
end
@@ -301,8 +302,12 @@ val parse = {
in
let
val final = nameOf (List.last fnames)
+
+ val ds = ds @ [(Source.DExport (Source.StrVar final, ErrorMsg.dummySpan), ErrorMsg.dummySpan)]
in
- ds @ [(Source.DExport (Source.StrVar final, ErrorMsg.dummySpan), ErrorMsg.dummySpan)]
+ case database of
+ NONE => ds
+ | SOME s => (Source.DDatabase s, ErrorMsg.dummySpan) :: ds
end handle Empty => ds
end,
print = SourcePrint.p_file