Mercurial > urweb

diff src/compiler.sml @ 1057:eaba663fd6aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Represent FFI function names as strings, to deal with cross-file recursion
author Adam Chlipala <adamc@hcoop.net>
date Sat, 05 Dec 2009 14:01:34 -0500
parents 36efaf119b85
children e8a35d710ab9
line wrap: on
line diff
--- a/src/compiler.sml	Thu Dec 03 14:32:47 2009 -0500
+++ b/src/compiler.sml	Sat Dec 05 14:01:34 2009 -0500
@@ -421,7 +421,7 @@
                             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 @@
                                          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)