Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-05-08 15:37:14 -0700 (Tue, 08 May 2007)
Revision: 10687
Log message:

      Collect the merge:
        rename open -> var3
        remove var4
        remove export

Changes  Path
+1 -9 omake-jumbo-branches/all-features/src/env/omake_ir_ast.ml
+39 -0 omake-jumbo-branches/all-features/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/all-features/src/ir/omake_ir_print.mli
+6 -2 omake-jumbo-branches/auto/src/build/omake_builtin_util.ml
+4 -1 omake-jumbo-branches/auto/src/env/omake_command_digest.ml
+81 -28 omake-jumbo-branches/auto/src/env/omake_env.ml
+5 -3 omake-jumbo-branches/auto/src/env/omake_env.mli
+431 -166 omake-jumbo-branches/auto/src/env/omake_ir_ast.ml
+2 -1 omake-jumbo-branches/auto/src/env/omake_ir_ast.mli
+1 -1 omake-jumbo-branches/auto/src/env/omake_ir_semant.ml
+12 -9 omake-jumbo-branches/auto/src/eval/omake_eval.ml
+7 -2 omake-jumbo-branches/auto/src/ir/omake_ir.ml
+1 -1 omake-jumbo-branches/auto/src/ir/omake_ir_free_vars.ml
+42 -4 omake-jumbo-branches/auto/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/auto/src/ir/omake_ir_print.mli
+1 -1 omake-jumbo-branches/auto/src/ir/omake_ir_util.ml
+2 -0 omake-jumbo-branches/auto/src/ir/omake_pos.ml
+2 -1 omake-jumbo-branches/auto/src/ir/omake_symbol.ml
+4 -1 omake-jumbo-branches/auto/src/ir/omake_value_type.ml
+2 -2 omake-jumbo-branches/auto/src/ir/omake_virtual_id.ml
+1 -1 omake-jumbo-branches/auto/src/ir/omake_virtual_id.mli
+3 -3 omake-jumbo-branches/auto/src/util/omake_print_util.ml
+3 -3 omake-jumbo-branches/auto/src/util/omake_print_util.mli
+6 -2 omake-jumbo-branches/const/src/build/omake_builtin_util.ml
+4 -1 omake-jumbo-branches/const/src/env/omake_command_digest.ml
+81 -28 omake-jumbo-branches/const/src/env/omake_env.ml
+5 -3 omake-jumbo-branches/const/src/env/omake_env.mli
+431 -166 omake-jumbo-branches/const/src/env/omake_ir_ast.ml
+2 -1 omake-jumbo-branches/const/src/env/omake_ir_ast.mli
+1 -1 omake-jumbo-branches/const/src/env/omake_ir_semant.ml
+12 -9 omake-jumbo-branches/const/src/eval/omake_eval.ml
+7 -2 omake-jumbo-branches/const/src/ir/omake_ir.ml
+1 -1 omake-jumbo-branches/const/src/ir/omake_ir_free_vars.ml
+42 -4 omake-jumbo-branches/const/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/const/src/ir/omake_ir_print.mli
+1 -1 omake-jumbo-branches/const/src/ir/omake_ir_util.ml
+2 -0 omake-jumbo-branches/const/src/ir/omake_pos.ml
+2 -1 omake-jumbo-branches/const/src/ir/omake_symbol.ml
+4 -1 omake-jumbo-branches/const/src/ir/omake_value_type.ml
+2 -2 omake-jumbo-branches/const/src/ir/omake_virtual_id.ml
+1 -1 omake-jumbo-branches/const/src/ir/omake_virtual_id.mli
+3 -3 omake-jumbo-branches/const/src/util/omake_print_util.ml
+3 -3 omake-jumbo-branches/const/src/util/omake_print_util.mli
+2 -10 omake-jumbo-branches/dll/src/Makefile
+2 -10 omake-jumbo-branches/dll/src/Makefile.nt
+6 -2 omake-jumbo-branches/dll/src/build/omake_builtin_util.ml
+4 -1 omake-jumbo-branches/dll/src/env/omake_command_digest.ml
+81 -28 omake-jumbo-branches/dll/src/env/omake_env.ml
+5 -3 omake-jumbo-branches/dll/src/env/omake_env.mli
+431 -166 omake-jumbo-branches/dll/src/env/omake_ir_ast.ml
+2 -1 omake-jumbo-branches/dll/src/env/omake_ir_ast.mli
+1 -1 omake-jumbo-branches/dll/src/env/omake_ir_semant.ml
+12 -9 omake-jumbo-branches/dll/src/eval/omake_eval.ml
+7 -2 omake-jumbo-branches/dll/src/ir/omake_ir.ml
+1 -1 omake-jumbo-branches/dll/src/ir/omake_ir_free_vars.ml
+42 -4 omake-jumbo-branches/dll/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/dll/src/ir/omake_ir_print.mli
+1 -1 omake-jumbo-branches/dll/src/ir/omake_ir_util.ml
+2 -0 omake-jumbo-branches/dll/src/ir/omake_pos.ml
+2 -1 omake-jumbo-branches/dll/src/ir/omake_symbol.ml
+4 -1 omake-jumbo-branches/dll/src/ir/omake_value_type.ml
+2 -2 omake-jumbo-branches/dll/src/ir/omake_virtual_id.ml
+1 -1 omake-jumbo-branches/dll/src/ir/omake_virtual_id.mli
+3 -3 omake-jumbo-branches/dll/src/util/omake_print_util.ml
+3 -3 omake-jumbo-branches/dll/src/util/omake_print_util.mli
+1 -9 omake-jumbo-branches/dll-fuse/src/env/omake_ir_ast.ml
+39 -0 omake-jumbo-branches/dll-fuse/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/dll-fuse/src/ir/omake_ir_print.mli
+1 -9 omake-jumbo-branches/dll-syntax/src/env/omake_ir_ast.ml
+39 -0 omake-jumbo-branches/dll-syntax/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/dll-syntax/src/ir/omake_ir_print.mli
+1 -9 omake-jumbo-branches/dll2/src/env/omake_ir_ast.ml
+39 -0 omake-jumbo-branches/dll2/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/dll2/src/ir/omake_ir_print.mli
+1 -9 omake-jumbo-branches/parse/src/env/omake_ir_ast.ml
+39 -0 omake-jumbo-branches/parse/src/ir/omake_ir_print.ml
+1 -0 omake-jumbo-branches/parse/src/ir/omake_ir_print.mli