Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-09-10 10:10:13 -0700 (Mon, 10 Sep 2007)
Revision: 12136
Log message:

      Merged revs 11926:12129 from
     svn+ssh://svn.metaprl.org/svnroot/mojave/omake-branches/jumbo/curry into var2
     (automated merge followed by some manual conflict resolution).
     
     Note - this does _not_ compile yet, as the new curry code needs to be updated
     to be var2-compatible! I will try doing this in a separate commit (to make it
     easier for Jason to review).

Changes  Path(relative to omake-branches/jumbo/var2)
Properties .
Copied COMMENTS (from rev 12129, omake-branches/jumbo/curry/COMMENTS)
+1 -1 OMakefile
+11 -9 doc/html/download.html
+1 -1 doc/src/omake-build-examples.tex
+2 -2 doc/src/omake-language-examples.tex
+4 -4 doc/src/omake-language.tex
+2 -2 doc/src/omake-rules.tex
+18 -3 lib/Pervasives.om
+19 -38 lib/build/OCaml.om
Deleted ocamldep/
+1 -3 omake.aip
+1 -1 omake.spec
+3 -3 src/build/omake_rule.ml
+22 -8 src/builtin/omake_builtin_base.ml
+127 -15 src/builtin/omake_builtin_file.ml
+16 -2 src/builtin/omake_builtin_fun.ml
+1 -2 src/builtin/omake_builtin_io.ml
+13 -4 src/builtin/omake_builtin_object.ml
+112 -0 src/builtin/omake_builtin_sys.ml
+16 -14 src/env/omake_ast_lex.mll
+20 -1 src/env/omake_command_digest.ml
+107 -107 src/env/omake_env.ml
+17 -6 src/env/omake_env.mli
+27 -11 src/env/omake_ir_ast.ml
+51 -23 src/env/omake_ir_semant.ml
+5 -4 src/env/omake_ir_semant.mli
+211 -15 src/eval/omake_eval.ml
+2 -1 src/eval/omake_eval.mli
+17 -1 src/eval/omake_value.ml
+4 -2 src/ir/omake_ir.ml
+1 -1 src/ir/omake_ir_free_vars.ml
+6 -2 src/ir/omake_ir_print.ml
+1 -1 src/ir/omake_ir_util.ml
+24 -12 src/ir/omake_symbol.ml
+8 -2 src/ir/omake_value_print.ml
+5 -9 src/ir/omake_value_type.ml
+1 -0 src/ir/omake_var.ml
+1 -0 src/ir/omake_var.mli
+6 -4 src/main/omake_shell.ml
+99 -0 src/util/omake_handle_table.ml
Copied test/curry/ (from rev 12129, omake-branches/jumbo/curry/test/curry)
Properties test/curry/ (from rev 12129, omake-branches/jumbo/curry/test/curry)
Copied test/memo/Test6/ (from rev 12129, omake-branches/jumbo/curry/test/memo/Test6)
Properties test/memo/Test6/ (from rev 12129, omake-branches/jumbo/curry/test/memo/Test6)
+9 -4 test/object/Test14
+4 -5 test/object/Test15
Copied test/return/ (from rev 12129, omake-branches/jumbo/curry/test/return)
Properties test/return/ (from rev 12129, omake-branches/jumbo/curry/test/return)
Copied test/simple/Test9 (from rev 12129, omake-branches/jumbo/curry/test/simple/Test9)
+1 -1 version.txt