Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-10-29 09:56:28 -0700 (Mon, 29 Oct 2007)
Revision: 12448
Log message:

      I did an automated merge of 12376:12444 from 0.9.8.x into syntax, followed by
     a bunch of manual fixes. This compiles, but the parser is broken (ocamlyacc
     complains "4 rules never reduced" and the new keyword syntax results in syntax
     errors) :-(
     
     Jason, could you take a look? Thanks!

Changes  Path(relative to omake-branches/jumbo/syntax)
Properties .
+10 -2 INSTALL
+3 -4 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 12444, omake-branches/0.9.8.x/doc/images)
Properties doc/images/ (from rev 12444, omake-branches/0.9.8.x/doc/images)
+5 -4 doc/src/omake-doc.tex
+66 -10 doc/src/omake-language.tex
Copied doc/webpage/ (from rev 12444, omake-branches/0.9.8.x/doc/webpage)
+0 -0 doc/webpage/manual/
+20 -6 lib/Pervasives.om
+2 -5 lib/configure/Configure.om
+2 -2 lib/parse/C/Lex.om
Copied lib/parse/LaTeX/ (from rev 12444, omake-branches/0.9.8.x/lib/parse/LaTeX)
Properties lib/parse/LaTeX/ (from rev 12444, omake-branches/0.9.8.x/lib/parse/LaTeX)
+1 -1 omake.spec
+1 -1 omake.spec.in
+10 -3 src/ast/omake_ast.ml
+144 -14 src/ast/omake_ast_print.ml
+4 -3 src/ast/omake_ast_print.mli
+34 -23 src/ast/omake_ast_util.ml
+4 -1 src/build/omake_rule.ml
+3 -3 src/builtin/omake_builtin_file.ml
+4 -2 src/builtin/omake_builtin_io_fun.ml
+152 -2 src/builtin/omake_builtin_object.ml
+3 -3 src/builtin/omake_builtin_sys.ml
+11 -2 src/env/omake_ast_lex.mll
+76 -38 src/env/omake_ast_parse.input
+11 -3 src/env/omake_command_digest.ml
+107 -45 src/env/omake_env.ml
+6 -5 src/env/omake_env.mli
+10 -8 src/env/omake_exp_lex.ml
+4 -4 src/env/omake_exp_parse.mly
+8 -1 src/env/omake_gen_parse.ml
+57 -44 src/env/omake_ir_ast.ml
+3 -1 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
Copied test/keyword/Test4 (from rev 12444, omake-branches/0.9.8.x/test/keyword/Test4)
Copied test/keyword/Test5 (from rev 12444, omake-branches/0.9.8.x/test/keyword/Test5)
Copied test/keyword/Test6 (from rev 12444, omake-branches/0.9.8.x/test/keyword/Test6)
+2 -1 test/memo/Test6/OMakeroot
+1 -4 test/object/Test08
Properties test/shell/
Copied test/shell/Test5 (from rev 12444, omake-branches/0.9.8.x/test/shell/Test5)
+1 -1 version.txt