Changes by: Jason Hickey (jyh at cs.caltech.edu)
Date: 2007-04-25 16:31:23 -0700 (Wed, 25 Apr 2007)
Revision: 10511
Log message:

      Merge to rev 10509.

Changes  Path
+10 -4 omake-jumbo-branches/all-features/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/all-features/0.9.8.x/src/Makefile.nt
+10 -0 omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_symbol.ml
+1 -0 omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_virtual_id.mli
+10 -4 omake-jumbo-branches/auto/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/auto/0.9.8.x/src/Makefile.nt
+9 -0 omake-jumbo-branches/auto/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/auto/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/auto/0.9.8.x/src/ir/omake_symbol.ml
+1 -1 omake-jumbo-branches/auto/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/auto/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/auto/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/auto/0.9.8.x/src/ir/omake_virtual_id.mli
+10 -4 omake-jumbo-branches/const/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/const/0.9.8.x/src/Makefile.nt
+9 -0 omake-jumbo-branches/const/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/const/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/const/0.9.8.x/src/ir/omake_symbol.ml
+1 -0 omake-jumbo-branches/const/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/const/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/const/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/const/0.9.8.x/src/ir/omake_virtual_id.mli
+10 -4 omake-jumbo-branches/dll/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/dll/0.9.8.x/src/Makefile.nt
+9 -0 omake-jumbo-branches/dll/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/dll/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/dll/0.9.8.x/src/ir/omake_symbol.ml
+1 -1 omake-jumbo-branches/dll/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/dll/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/dll/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/dll/0.9.8.x/src/ir/omake_virtual_id.mli
+0 -3 omake-jumbo-branches/dll/0.9.8.x/src/libmojave/OMakefile
+10 -4 omake-jumbo-branches/dll2/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/dll2/0.9.8.x/src/Makefile.nt
+10 -0 omake-jumbo-branches/dll2/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/dll2/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/dll2/0.9.8.x/src/ir/omake_symbol.ml
+1 -0 omake-jumbo-branches/dll2/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/dll2/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/dll2/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/dll2/0.9.8.x/src/ir/omake_virtual_id.mli
+10 -4 omake-jumbo-branches/export/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/export/0.9.8.x/src/Makefile.nt
+10 -0 omake-jumbo-branches/export/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/export/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/export/0.9.8.x/src/ir/omake_symbol.ml
+1 -1 omake-jumbo-branches/export/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/export/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/export/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/export/0.9.8.x/src/ir/omake_virtual_id.mli
+9 -0 omake-jumbo-branches/keyword/0.9.8.x/src/builtin/omake_builtin_rule.ml
+19 -9 omake-jumbo-branches/keyword/0.9.8.x/src/env/omake_env.ml
+1 -1 omake-jumbo-branches/keyword/0.9.8.x/src/env/omake_env.mli
+1 -1 omake-jumbo-branches/keyword/0.9.8.x/src/env/omake_ir_ast.ml
+12 -8 omake-jumbo-branches/keyword/0.9.8.x/src/eval/omake_eval.ml
+1 -0 omake-jumbo-branches/keyword/0.9.8.x/src/ir/omake_symbol.ml
+1 -0 omake-jumbo-branches/keyword/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/keyword/0.9.8.x/src/ir/omake_var.mli
+10 -4 omake-jumbo-branches/open/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/open/0.9.8.x/src/Makefile.nt
+9 -0 omake-jumbo-branches/open/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/open/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/open/0.9.8.x/src/ir/omake_symbol.ml
+1 -1 omake-jumbo-branches/open/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/open/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/open/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/open/0.9.8.x/src/ir/omake_virtual_id.mli
+2 -0 omake-jumbo-branches/original/0.9.8.x/lib/Pervasives.om
+7 -3 omake-jumbo-branches/original/0.9.8.x/src/Makefile
+7 -3 omake-jumbo-branches/original/0.9.8.x/src/Makefile.nt
+6 -6 omake-jumbo-branches/original/0.9.8.x/src/build/omake_build.ml
+11 -7 omake-jumbo-branches/original/0.9.8.x/src/build/omake_builtin.ml
+4 -4 omake-jumbo-branches/original/0.9.8.x/src/build/omake_builtin.mli
+71 -5 omake-jumbo-branches/original/0.9.8.x/src/build/omake_builtin_util.ml
+10 -4 omake-jumbo-branches/original/0.9.8.x/src/build/omake_builtin_util.mli
+41 -44 omake-jumbo-branches/original/0.9.8.x/src/build/omake_rule.ml
+39 -20 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_base.ml
+6 -5 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_file.ml
+47 -16 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_io.ml
+31 -32 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_io_fun.ml
+108 -5 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_object.ml
+9 -0 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_rule.ml
+3 -2 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_shell.ml
+12 -11 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_sys.ml
+5 -4 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_target.ml
+10 -9 omake-jumbo-branches/original/0.9.8.x/src/builtin/omake_builtin_test.ml
+1 -0 omake-jumbo-branches/original/0.9.8.x/src/env/omake_ast_lex.mll
+39 -21 omake-jumbo-branches/original/0.9.8.x/src/env/omake_ast_parse.input
+107 -81 omake-jumbo-branches/original/0.9.8.x/src/env/omake_command_digest.ml
+556 -575 omake-jumbo-branches/original/0.9.8.x/src/env/omake_env.ml
+30 -30 omake-jumbo-branches/original/0.9.8.x/src/env/omake_env.mli
+7 -4 omake-jumbo-branches/original/0.9.8.x/src/env/omake_gen_parse.ml
+1255 -465 omake-jumbo-branches/original/0.9.8.x/src/env/omake_ir_ast.ml
+20 -27 omake-jumbo-branches/original/0.9.8.x/src/env/omake_ir_ast.mli
+77 -84 omake-jumbo-branches/original/0.9.8.x/src/env/omake_ir_free_vars.ml
+5 -5 omake-jumbo-branches/original/0.9.8.x/src/env/omake_ir_free_vars.mli
+43 -46 omake-jumbo-branches/original/0.9.8.x/src/env/omake_ir_semant.ml
+192 -169 omake-jumbo-branches/original/0.9.8.x/src/eval/omake_eval.ml
+9 -9 omake-jumbo-branches/original/0.9.8.x/src/eval/omake_eval.mli
+4 -3 omake-jumbo-branches/original/0.9.8.x/src/eval/omake_value.ml
+3 -2 omake-jumbo-branches/original/0.9.8.x/src/eval/omake_value.mli
+1 -0 omake-jumbo-branches/original/0.9.8.x/src/ir/OMakefile
+7 -6 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_command_type.ml
+185 -35 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_ir.ml
+102 -72 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_ir_print.ml
+6 -5 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_ir_print.mli
+9 -9 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_ir_util.ml
+22 -4 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_options.ml
+5 -3 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_options.mli
+8 -0 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_symbol.ml
+5 -13 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_virtual_id.ml
+3 -6 omake-jumbo-branches/original/0.9.8.x/src/ir/omake_virtual_id.mli
+6 -6 omake-jumbo-branches/original/0.9.8.x/src/main/omake_main.ml
+23 -23 omake-jumbo-branches/original/0.9.8.x/src/main/omake_shell.ml
+3 -2 omake-jumbo-branches/original/0.9.8.x/src/shell/omake_shell_completion.ml
+3 -2 omake-jumbo-branches/original/0.9.8.x/src/shell/omake_shell_job.ml
+10 -4 omake-jumbo-branches/parse/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/parse/0.9.8.x/src/Makefile.nt
+10 -0 omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_symbol.ml
+1 -0 omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_virtual_id.mli
+9 -0 omake-jumbo-branches/var2/0.9.8.x/src/builtin/omake_builtin_rule.ml
+19 -9 omake-jumbo-branches/var2/0.9.8.x/src/env/omake_env.ml
+1 -1 omake-jumbo-branches/var2/0.9.8.x/src/env/omake_env.mli
+1 -1 omake-jumbo-branches/var2/0.9.8.x/src/env/omake_ir_ast.ml
+12 -8 omake-jumbo-branches/var2/0.9.8.x/src/eval/omake_eval.ml
+1 -0 omake-jumbo-branches/var2/0.9.8.x/src/ir/omake_symbol.ml
+1 -0 omake-jumbo-branches/var2/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/var2/0.9.8.x/src/ir/omake_var.mli
+10 -4 omake-jumbo-branches/var3/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/var3/0.9.8.x/src/Makefile.nt
+9 -0 omake-jumbo-branches/var3/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/var3/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/var3/0.9.8.x/src/ir/omake_symbol.ml
+1 -1 omake-jumbo-branches/var3/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/var3/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/var3/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/var3/0.9.8.x/src/ir/omake_virtual_id.mli
+10 -4 omake-jumbo-branches/var4/0.9.8.x/src/Makefile
+10 -4 omake-jumbo-branches/var4/0.9.8.x/src/Makefile.nt
+9 -0 omake-jumbo-branches/var4/0.9.8.x/src/builtin/omake_builtin_rule.ml
+1 -1 omake-jumbo-branches/var4/0.9.8.x/src/env/omake_ir_ast.ml
+1 -0 omake-jumbo-branches/var4/0.9.8.x/src/ir/omake_symbol.ml
+1 -1 omake-jumbo-branches/var4/0.9.8.x/src/ir/omake_var.ml
+1 -0 omake-jumbo-branches/var4/0.9.8.x/src/ir/omake_var.mli
+1 -0 omake-jumbo-branches/var4/0.9.8.x/src/ir/omake_virtual_id.ml
+1 -0 omake-jumbo-branches/var4/0.9.8.x/src/ir/omake_virtual_id.mli