Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-11-01 18:05:23 -0700 (Thu, 01 Nov 2007)
Revision: 12480
Log message:

      merge 12370:12479 from svn://svn.metaprl.org/omake-branches/jumbo/dll2 into dll-syntax
     
     Note, this branch should now be a no-op.

Changes  Path(relative to omake-branches/jumbo/dll-syntax)
Properties .
+10 -2 INSTALL
+2 -2 OMakefile
Deleted doc/html/announce.txt
Deleted doc/html/changelog.html
Deleted doc/html/contents_motif.gif
Deleted doc/html/download.html
Deleted doc/html/images/
Deleted doc/html/index.html
Deleted doc/html/next_motif.gif
Deleted doc/html/omake_lists.html
Deleted doc/html/omake_papers.html
Deleted doc/html/omake_users.html
Deleted doc/html/previous_motif.gif
Copied doc/images/ (from rev 12479, omake-branches/jumbo/dll2/doc/images)
Properties doc/images/ (from rev 12479, omake-branches/jumbo/dll2/doc/images)
+5 -4 doc/src/omake-doc.tex
+66 -10 doc/src/omake-language.tex
Copied doc/webpage/ (from rev 12479, omake-branches/jumbo/dll2/doc/webpage)
+0 -0 doc/webpage/manual/
+25 -9 lib/Pervasives.om
+8 -8 lib/build/C.om
+1 -1 lib/build/Dll.om
+2 -5 lib/configure/Configure.om
+3 -2 lib/parse/C/Lex.om
+15 -1 lib/parse/C/Parse.om
Copied lib/parse/LaTeX/ (from rev 12479, omake-branches/jumbo/dll2/lib/parse/LaTeX)
Properties lib/parse/LaTeX/ (from rev 12479, omake-branches/jumbo/dll2/lib/parse/LaTeX)
+1 -1 omake.spec
+1 -1 omake.spec.in
+11 -3 src/ast/omake_ast.ml
+137 -14 src/ast/omake_ast_print.ml
+4 -3 src/ast/omake_ast_print.mli
+35 -24 src/ast/omake_ast_util.ml
+4 -1 src/build/omake_rule.ml
+1 -0 src/builtin/omake_builtin_base.ml
+3 -3 src/builtin/omake_builtin_file.ml
+4 -2 src/builtin/omake_builtin_io_fun.ml
+162 -2 src/builtin/omake_builtin_object.ml
+3 -3 src/builtin/omake_builtin_sys.ml
+4 -6 src/clib/omake_shell_sys.c
Properties src/env/
+17 -6 src/env/omake_ast_lex.mll
+78 -40 src/env/omake_ast_parse.input
+11 -3 src/env/omake_command_digest.ml
+109 -47 src/env/omake_env.ml
+6 -5 src/env/omake_env.mli
+38 -39 src/env/omake_exp_lex.ml
+471 -353 src/env/omake_exp_parse.ml
+3 -0 src/env/omake_exp_parse.mli
+78 -47 src/env/omake_exp_parse.mly
+9 -1 src/env/omake_gen_parse.ml
+59 -47 src/env/omake_ir_ast.ml
+9 -2 src/eval/omake_eval.ml
+6 -4 src/ir/omake_ir.ml
+6 -4 src/ir/omake_ir_free_vars.ml
+2 -1 src/ir/omake_options.mli
+1 -1 src/ir/omake_pos.ml
+6 -1 src/ir/omake_value_print.ml
+2 -2 src/ir/omake_value_type.ml
+0 -1 test/OMakefile
+8 -8 test/curry/Test2
+5 -5 test/curry/Test5
+2 -2 test/keyword/Test1
+5 -5 test/keyword/Test2
+3 -3 test/keyword/Test3
+2 -1 test/memo/Test6/OMakeroot
+1 -4 test/object/Test08
Properties test/shell/
Copied test/syntax/ (from rev 12479, omake-branches/jumbo/dll2/test/syntax)
Properties test/syntax/ (from rev 12479, omake-branches/jumbo/dll2/test/syntax)
+1 -1 version.txt