git.annexia.org
/
goals.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement stdlib directory, -I, --no-prelude, etc.
[goals.git]
/
src
/
ast.ml
diff --git
a/src/ast.ml
b/src/ast.ml
index
9f3326a
..
587c888
100644
(file)
--- a/
src/ast.ml
+++ b/
src/ast.ml
@@
-22,7
+22,12
@@
open Printf
open Utils
open Utils
-module Env = Map.Make (String)
+module Env = struct
+ include Map.Make (String)
+
+ let merge env env' =
+ List.fold_left (fun env (k, v) -> add k v env) env (bindings env')
+end
type loc = position * position
let noloc = dummy_pos, dummy_pos
type loc = position * position
let noloc = dummy_pos, dummy_pos