Changes by: Jason Hickey (jyh at cs.caltech.edu)
Date: 2007-04-30 12:38:32 -0700 (Mon, 30 Apr 2007)
Revision: 10569
Log message:

      Merge to rev 10567.  Unfortunately, this required some reordering in
     Omake_env.

Changes  Path
+0 -12 omake-jumbo-branches/all-features/lib/Pervasives.om
+6 -11 omake-jumbo-branches/all-features/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/all-features/src/builtin/omake_builtin_base.ml
+2 -4 omake-jumbo-branches/all-features/src/builtin/omake_builtin_target.ml
+308 -262 omake-jumbo-branches/all-features/src/env/omake_env.ml
+17 -6 omake-jumbo-branches/all-features/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/all-features/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/all-features/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/all-features/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/all-features/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/all-features/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/all-features/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/all-features/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/all-features/src/ir/omake_virtual_id.mli
+0 -12 omake-jumbo-branches/auto/lib/Pervasives.om
+6 -11 omake-jumbo-branches/auto/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/auto/src/builtin/omake_builtin_base.ml
+2 -6 omake-jumbo-branches/auto/src/builtin/omake_builtin_target.ml
+306 -260 omake-jumbo-branches/auto/src/env/omake_env.ml
+20 -6 omake-jumbo-branches/auto/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/auto/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/auto/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/auto/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/auto/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/auto/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/auto/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/auto/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/auto/src/ir/omake_virtual_id.mli
+0 -12 omake-jumbo-branches/const/lib/Pervasives.om
+6 -11 omake-jumbo-branches/const/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/const/src/builtin/omake_builtin_base.ml
+2 -6 omake-jumbo-branches/const/src/builtin/omake_builtin_target.ml
+306 -260 omake-jumbo-branches/const/src/env/omake_env.ml
+20 -6 omake-jumbo-branches/const/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/const/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/const/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/const/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/const/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/const/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/const/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/const/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/const/src/ir/omake_virtual_id.mli
+0 -12 omake-jumbo-branches/dll/lib/Pervasives.om
+6 -11 omake-jumbo-branches/dll/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/dll/src/builtin/omake_builtin_base.ml
+3 -10 omake-jumbo-branches/dll/src/builtin/omake_builtin_dll.ml
+2 -6 omake-jumbo-branches/dll/src/builtin/omake_builtin_target.ml
+306 -260 omake-jumbo-branches/dll/src/env/omake_env.ml
+20 -6 omake-jumbo-branches/dll/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/dll/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/dll/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/dll/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/dll/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/dll/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/dll/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/dll/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/dll/src/ir/omake_virtual_id.mli
+0 -12 omake-jumbo-branches/dll2/lib/Pervasives.om
+6 -11 omake-jumbo-branches/dll2/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/dll2/src/builtin/omake_builtin_base.ml
+2 -4 omake-jumbo-branches/dll2/src/builtin/omake_builtin_target.ml
+308 -262 omake-jumbo-branches/dll2/src/env/omake_env.ml
+17 -6 omake-jumbo-branches/dll2/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/dll2/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/dll2/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/dll2/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/dll2/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/dll2/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/dll2/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/dll2/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/dll2/src/ir/omake_virtual_id.mli
+0 -12 omake-jumbo-branches/export/lib/Pervasives.om
+6 -11 omake-jumbo-branches/export/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/export/src/builtin/omake_builtin_base.ml
+2 -4 omake-jumbo-branches/export/src/builtin/omake_builtin_target.ml
+306 -260 omake-jumbo-branches/export/src/env/omake_env.ml
+20 -6 omake-jumbo-branches/export/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/export/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/export/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/export/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/export/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/export/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/export/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/export/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/export/src/ir/omake_virtual_id.mli
+0 -12 omake-jumbo-branches/keyword/lib/Pervasives.om
+6 -11 omake-jumbo-branches/keyword/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/keyword/src/builtin/omake_builtin_base.ml
+2 -6 omake-jumbo-branches/keyword/src/builtin/omake_builtin_target.ml
+89 -53 omake-jumbo-branches/keyword/src/env/omake_env.ml
+16 -5 omake-jumbo-branches/keyword/src/env/omake_env.mli
+2 -2 omake-jumbo-branches/keyword/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/keyword/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/keyword/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/keyword/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/keyword/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/keyword/src/ir/omake_var.mli
+0 -12 omake-jumbo-branches/open/lib/Pervasives.om
+6 -11 omake-jumbo-branches/open/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/open/src/builtin/omake_builtin_base.ml
+2 -6 omake-jumbo-branches/open/src/builtin/omake_builtin_target.ml
+308 -262 omake-jumbo-branches/open/src/env/omake_env.ml
+20 -6 omake-jumbo-branches/open/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/open/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/open/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/open/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/open/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/open/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/open/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/open/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/open/src/ir/omake_virtual_id.mli
+0 -12 omake-jumbo-branches/parse/lib/Pervasives.om
+6 -11 omake-jumbo-branches/parse/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/parse/src/builtin/omake_builtin_base.ml
+2 -4 omake-jumbo-branches/parse/src/builtin/omake_builtin_target.ml
+308 -262 omake-jumbo-branches/parse/src/env/omake_env.ml
+17 -6 omake-jumbo-branches/parse/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/parse/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/parse/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/parse/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/parse/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/parse/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/parse/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/parse/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/parse/src/ir/omake_virtual_id.mli
+0 -12 omake-jumbo-branches/var2/lib/Pervasives.om
+6 -11 omake-jumbo-branches/var2/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/var2/src/builtin/omake_builtin_base.ml
+2 -6 omake-jumbo-branches/var2/src/builtin/omake_builtin_target.ml
+100 -64 omake-jumbo-branches/var2/src/env/omake_env.ml
+19 -5 omake-jumbo-branches/var2/src/env/omake_env.mli
+2 -2 omake-jumbo-branches/var2/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/var2/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/var2/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/var2/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/var2/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/var2/src/ir/omake_var.mli
+0 -12 omake-jumbo-branches/var3/lib/Pervasives.om
+6 -11 omake-jumbo-branches/var3/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/var3/src/builtin/omake_builtin_base.ml
+2 -6 omake-jumbo-branches/var3/src/builtin/omake_builtin_target.ml
+306 -260 omake-jumbo-branches/var3/src/env/omake_env.ml
+20 -6 omake-jumbo-branches/var3/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/var3/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/var3/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/var3/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/var3/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/var3/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/var3/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/var3/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/var3/src/ir/omake_virtual_id.mli
+0 -12 omake-jumbo-branches/var4/lib/Pervasives.om
+6 -11 omake-jumbo-branches/var4/src/build/omake_rule.ml
+11 -4 omake-jumbo-branches/var4/src/builtin/omake_builtin_base.ml
+2 -6 omake-jumbo-branches/var4/src/builtin/omake_builtin_target.ml
+306 -260 omake-jumbo-branches/var4/src/env/omake_env.ml
+20 -6 omake-jumbo-branches/var4/src/env/omake_env.mli
+6 -3 omake-jumbo-branches/var4/src/eval/omake_eval.ml
+1 -1 omake-jumbo-branches/var4/src/eval/omake_eval.mli
+1 -4 omake-jumbo-branches/var4/src/eval/omake_value.ml
+0 -1 omake-jumbo-branches/var4/src/ir/omake_symbol.ml
+0 -1 omake-jumbo-branches/var4/src/ir/omake_var.ml
+0 -1 omake-jumbo-branches/var4/src/ir/omake_var.mli
+0 -1 omake-jumbo-branches/var4/src/ir/omake_virtual_id.ml
+0 -1 omake-jumbo-branches/var4/src/ir/omake_virtual_id.mli