Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-05-07 13:05:57 -0700 (Mon, 07 May 2007)
Revision: 10660
Log message:

      Merge dll2 + syntax -> dll-syntax

Changes  Path
+4 -4 omake-jumbo-branches/all-features/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/all-features/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/all-features/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/all-features/src/ir/omake_cache_stat.mli
+4 -4 omake-jumbo-branches/auto/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/auto/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/auto/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/auto/src/ir/omake_cache_stat.mli
+4 -4 omake-jumbo-branches/const/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/const/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/const/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/const/src/ir/omake_cache_stat.mli
+4 -4 omake-jumbo-branches/dll/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/dll/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/dll/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/dll/src/ir/omake_cache_stat.mli
+13 -4 omake-jumbo-branches/dll-syntax/src/Makefile
+13 -4 omake-jumbo-branches/dll-syntax/src/Makefile.nt
+13 -2 omake-jumbo-branches/dll-syntax/src/ast/omake_ast.ml
+18 -2 omake-jumbo-branches/dll-syntax/src/ast/omake_ast_print.ml
+306 -8 omake-jumbo-branches/dll-syntax/src/ast/omake_ast_util.ml
+2 -0 omake-jumbo-branches/dll-syntax/src/ast/omake_ast_util.mli
+4 -1 omake-jumbo-branches/dll-syntax/src/builtin/omake_builtin_object.ml
+8 -1 omake-jumbo-branches/dll-syntax/src/env/OMakefile
+3 -4 omake-jumbo-branches/dll-syntax/src/env/omake_ast_lex.mli
+41 -10 omake-jumbo-branches/dll-syntax/src/env/omake_ast_lex.mll
+83 -37 omake-jumbo-branches/dll-syntax/src/env/omake_ast_parse.input
+16 -0 omake-jumbo-branches/dll-syntax/src/env/omake_command_digest.ml
Added omake-jumbo-branches/dll-syntax/src/env/omake_exp_lex.ml
Added omake-jumbo-branches/dll-syntax/src/env/omake_exp_lex.mli
Added omake-jumbo-branches/dll-syntax/src/env/omake_exp_parse.mly
+30 -20 omake-jumbo-branches/dll-syntax/src/env/omake_gen_parse.ml
+45 -7 omake-jumbo-branches/dll-syntax/src/env/omake_ir_ast.ml
+3 -0 omake-jumbo-branches/dll-syntax/src/env/omake_ir_semant.ml
+39 -5 omake-jumbo-branches/dll-syntax/src/eval/omake_eval.ml
+10 -1 omake-jumbo-branches/dll-syntax/src/eval/omake_value.ml
Added omake-jumbo-branches/dll-syntax/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/dll-syntax/src/ir/omake_cache_stat.mli
+3 -0 omake-jumbo-branches/dll-syntax/src/ir/omake_ir.ml
+3 -0 omake-jumbo-branches/dll-syntax/src/ir/omake_ir_free_vars.ml
+6 -0 omake-jumbo-branches/dll-syntax/src/ir/omake_ir_print.ml
+22 -0 omake-jumbo-branches/dll-syntax/src/ir/omake_symbol.ml
+3 -0 omake-jumbo-branches/dll-syntax/src/ir/omake_value_print.ml
+1 -0 omake-jumbo-branches/dll-syntax/src/ir/omake_value_type.ml
+1 -0 omake-jumbo-branches/dll-syntax/src/main/omake_shell.ml
+24 -0 omake-jumbo-branches/dll-syntax/src/shell/omake_shell_lex.ml
+4 -4 omake-jumbo-branches/dll2/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/dll2/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/dll2/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/dll2/src/ir/omake_cache_stat.mli
+4 -4 omake-jumbo-branches/export/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/export/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/export/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/export/src/ir/omake_cache_stat.mli
+4 -4 omake-jumbo-branches/keyword/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/keyword/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/keyword/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/keyword/src/ir/omake_cache_stat.mli
+4 -4 omake-jumbo-branches/open/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/open/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/open/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/open/src/ir/omake_cache_stat.mli
+4 -4 omake-jumbo-branches/parse/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/parse/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/parse/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/parse/src/ir/omake_cache_stat.mli
+4 -16 omake-jumbo-branches/syntax/src/ast/omake_ast_util.ml
+1 -1 omake-jumbo-branches/syntax/src/env/omake_ast_lex.mll
+4 -4 omake-jumbo-branches/var2/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/var2/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/var2/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/var2/src/ir/omake_cache_stat.mli
+4 -4 omake-jumbo-branches/var3/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/var3/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/var3/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/var3/src/ir/omake_cache_stat.mli
+4 -4 omake-jumbo-branches/var4/src/ast/omake_ast_util.ml
+3 -3 omake-jumbo-branches/var4/src/env/omake_ast_lex.mll
Added omake-jumbo-branches/var4/src/ir/omake_cache_stat.ml
Added omake-jumbo-branches/var4/src/ir/omake_cache_stat.mli