X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fast.ml;fp=src%2Fast.ml;h=587c888660980d622f867294c89dc5c88d2f9d08;hb=6afdc65fcdb592dccb751849f65b1f482ef97cd6;hp=9f3326afc80ab59d3c888acff3dbbce23925b242;hpb=315ceff80b09b76959a067fa2f3288f22d2e55da;p=goals.git

diff --git a/src/ast.ml b/src/ast.ml
index 9f3326a..587c888 100644
--- a/src/ast.ml
+++ b/src/ast.ml
@@ -22,7 +22,12 @@ open Printf
 
 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