Changes by: Jason Hickey (jyh at cs.caltech.edu)
Date: 2005-05-07 13:03:19 -0700 (Sat, 07 May 2005)
Revision: 968
Log message:

      Folded together normal and scanner rules in the env.
      

Changes	Path
+13 -11	omake-branches/new_scanner2/src/build/omake_build.ml
+6 -0	omake-branches/new_scanner2/src/build/omake_builtin.ml
+4 -4	omake-branches/new_scanner2/src/build/omake_builtin_file.ml
+272 -356	omake-branches/new_scanner2/src/env/omake_env.ml
+22 -34	omake-branches/new_scanner2/src/env/omake_env.mli
+14 -31	omake-branches/new_scanner2/src/eval/omake_rule.ml
+0 -1	omake-branches/new_scanner2/src/eval/omake_rule.mli
+33 -34	omake-branches/new_scanner2/src/eval/omake_target.ml
+3 -3	omake-branches/new_scanner2/src/eval/omake_target.mli
+2 -1	omake-branches/new_scanner2/src/ir/omake_cache.ml
+24 -4	omake-branches/new_scanner2/src/ir/omake_node.ml
+1 -0	omake-branches/new_scanner2/src/ir/omake_node_sig.ml
+5 -4	omake-branches/new_scanner2/src/ir/omake_node_type.ml
+1 -0	omake-branches/new_scanner2/src/util/omake_marshal.ml