1) Include files for NG were neither recursively processes nor accumulated.

[helm.git] / helm / software / components / grafite / grafiteMarshal.ml

diff --git a/helm/software/components/grafite/grafiteMarshal.ml b/helm/software/components/grafite/grafiteMarshal.ml
index 7731902b4adbf73b4c02566deafa9c6693e8c9c2..d666f62b61837163fe53dc9905fdc0d2f2df1020 100644 (file)
--- a/helm/software/components/grafite/grafiteMarshal.ml
+++ b/helm/software/components/grafite/grafiteMarshal.ml
@@ -44,10 +44,15 @@ let rehash_cmd_uris =
   | GrafiteAst.Default (loc, name, uris) ->
       let uris = List.map rehash_uri uris in
       GrafiteAst.Default (loc, name, uris)
+  | GrafiteAst.PreferCoercion (loc, uri) ->
+      GrafiteAst.PreferCoercion (loc, CicUtil.rehash_term uri)
   | GrafiteAst.Coercion (loc, uri, close, arity, saturations) ->
-      GrafiteAst.Coercion (loc, rehash_uri uri, close, arity, saturations)
+      GrafiteAst.Coercion (loc, CicUtil.rehash_term uri, close, arity, saturations)
   | GrafiteAst.Index (loc, key, uri) ->
       GrafiteAst.Index (loc, HExtlib.map_option CicUtil.rehash_term key, rehash_uri uri)
+  | GrafiteAst.Select (loc, uri) -> 
+      GrafiteAst.Select (loc, rehash_uri uri)
+  | GrafiteAst.Include _ as cmd -> cmd
   | cmd ->
       prerr_endline "Found a command not expected in a .moo:";
       let term_pp _ = assert false in