Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-10-06 12:23:11 -0700 (Sat, 06 Oct 2007)
Revision: 12319
Log message:
merge 12293:12315 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into var3
| Changes | Path(relative to omake-branches/jumbo/var3) |
| Properties | . |
| +1 -0 | OMakefile |
| +3 -0 | lib/Pervasives.om |
| +26 -21 | lib/parse/C/Lex.om |
| +1584 -238 | lib/parse/C/Parse.om |
| +5 -5 | src/builtin/omake_builtin_io_fun.ml |
| +9 -19 | src/env/omake_ir_ast.ml |
| +2 -1 | test/memo/Test6/OMakeroot |
| Properties | test/parse/C/ |
| Deleted | test/parse/C/Test |
| Copied | test/parse/C/Test1/ (from rev 12315, omake-branches/jumbo/var2/test/parse/C/Test1) |
| Properties | test/parse/C/Test1/ (from rev 12315, omake-branches/jumbo/var2/test/parse/C/Test1) |
| Copied | test/parse/C/Test2/ (from rev 12315, omake-branches/jumbo/var2/test/parse/C/Test2) |
| Properties | test/parse/C/Test2/ (from rev 12315, omake-branches/jumbo/var2/test/parse/C/Test2) |
| Copied | test/parse/C/Test3/ (from rev 12315, omake-branches/jumbo/var2/test/parse/C/Test3) |
| Properties | test/parse/C/Test3/ (from rev 12315, omake-branches/jumbo/var2/test/parse/C/Test3) |
| Deleted | test/parse/C/input.c |
| Copied | test/parse/C/test2.c (from rev 12315, omake-branches/jumbo/var2/test/parse/C/test2.c) |
| +4 -4 | test/return/Test1 |