diff options
author | Adam Chlipala <adamc@hcoop.net> | 2009-12-05 14:01:34 -0500 |
---|---|---|
committer | Adam Chlipala <adamc@hcoop.net> | 2009-12-05 14:01:34 -0500 |
commit | 20fe6fd5bb27486a7f3483ead05061e967c5a105 (patch) | |
tree | 27acc16bb8d3b12293fbbae8b833d7ff2e731aa9 /src/compiler.sml | |
parent | 7bfb616805a8c693aeb94067faf1098a0b50cbe5 (diff) |
Represent FFI function names as strings, to deal with cross-file recursion
Diffstat (limited to 'src/compiler.sml')
-rw-r--r-- | src/compiler.sml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler.sml b/src/compiler.sml index dcb5fdad..0d61b361 100644 --- a/src/compiler.sml +++ b/src/compiler.sml @@ -421,7 +421,7 @@ fun parseUrp' fname = dbms = mergeO #2 (#dbms old, #dbms new) } in - foldr (fn (fname, job) => merge (job, pu fname)) job (!libs) + foldr (fn (job', job) => merge (job, job')) job (!libs) end fun parsePkind s = @@ -551,7 +551,7 @@ fun parseUrp' fname = fkind := {action = Settings.Deny, kind = kind, pattern = pattern} :: !fkind end | _ => ErrorMsg.error "Bad 'deny' syntax") - | "library" => libs := relify arg :: !libs + | "library" => libs := pu (relify arg) :: !libs | "path" => (case String.fields (fn ch => ch = #"=") arg of [n, v] => pathmap := M.insert (!pathmap, n, v) |