Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-11-01 16:20:39 -0700 (Thu, 01 Nov 2007)
Revision: 12475
Log message:

      Automated merge of 12463:12474 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into int

Changes  Path(relative to omake-branches/jumbo/int)
Properties .
+63 -0 doc/src/omake-grammar.tex
+8 -6 lib/Pervasives.om
+13 -4 src/Makefile
+13 -4 src/Makefile.nt
+14 -2 src/ast/omake_ast.ml
+30 -3 src/ast/omake_ast_print.ml
+305 -8 src/ast/omake_ast_util.ml
+2 -0 src/ast/omake_ast_util.mli
+1 -0 src/builtin/omake_builtin_base.ml
+7 -1 src/builtin/omake_builtin_object.ml
Properties src/env/
+8 -1 src/env/OMakefile
+3 -4 src/env/omake_ast_lex.mli
+45 -14 src/env/omake_ast_lex.mll
+91 -43 src/env/omake_ast_parse.input
+16 -0 src/env/omake_command_digest.ml
Copied src/env/omake_exp_lex.ml (from rev 12474, omake-branches/jumbo/var3/src/env/omake_exp_lex.ml)
Copied src/env/omake_exp_lex.mli (from rev 12474, omake-branches/jumbo/var3/src/env/omake_exp_lex.mli)
Copied src/env/omake_exp_parse.mly (from rev 12474, omake-branches/jumbo/var3/src/env/omake_exp_parse.mly)
+34 -22 src/env/omake_gen_parse.ml
+46 -7 src/env/omake_ir_ast.ml
+3 -0 src/env/omake_ir_semant.ml
+43 -6 src/eval/omake_eval.ml
+10 -1 src/eval/omake_value.ml
+3 -0 src/ir/omake_ir.ml
+3 -0 src/ir/omake_ir_free_vars.ml
+6 -0 src/ir/omake_ir_print.ml
+22 -0 src/ir/omake_symbol.ml
+3 -0 src/ir/omake_value_print.ml
+1 -0 src/ir/omake_value_type.ml
+1 -0 src/main/omake_shell.ml
+24 -0 src/shell/omake_shell_lex.ml
Copied test/syntax/ (from rev 12474, omake-branches/jumbo/var3/test/syntax)
Properties test/syntax/ (from rev 12474, omake-branches/jumbo/var3/test/syntax)