src/Tools/Code/code_namespace.ML

--- a/src/Tools/Code/code_namespace.ML	Fri May 24 23:57:24 2013 +0200
+++ b/src/Tools/Code/code_namespace.ML	Fri May 24 23:57:24 2013 +0200
@@ -7,8 +7,9 @@
 signature CODE_NAMESPACE =
 sig
   type flat_program
-  val flat_program: (string -> string) -> { module_alias: string -> string option,
-    module_prefix: string, reserved: Name.context, empty_nsp: 'a,
+  val flat_program: Proof.context -> (string -> Code_Symbol.symbol)
+    -> { module_prefix: string, module_name: string,
+    reserved: Name.context, identifiers: Code_Target.identifier_data, empty_nsp: 'a,
     namify_stmt: Code_Thingol.stmt -> string -> 'a -> string * 'a,
     modify_stmt: Code_Thingol.stmt -> Code_Thingol.stmt option }
       -> Code_Thingol.program
@@ -20,8 +21,10 @@
     | Stmt of 'a
     | Module of ('b * (string * ('a, 'b) node) Graph.T)
   type ('a, 'b) hierarchical_program
-  val hierarchical_program: (string -> string) -> { module_alias: string -> string option,
-    reserved: Name.context, empty_nsp: 'c, namify_module: string -> 'c -> string * 'c,
+  val hierarchical_program: Proof.context -> (string -> Code_Symbol.symbol)
+    -> { module_name: string,
+    reserved: Name.context, identifiers: Code_Target.identifier_data,
+    empty_nsp: 'c, namify_module: string -> 'c -> string * 'c,
     namify_stmt: Code_Thingol.stmt -> string -> 'c -> string * 'c,
     cyclic_modules: bool, empty_data: 'b, memorize_data: string -> 'b -> 'b,
     modify_stmts: (string * Code_Thingol.stmt) list -> 'a option list }
@@ -37,17 +40,25 @@
 structure Code_Namespace : CODE_NAMESPACE =
 struct
 
-(** building module name hierarchy **)
+(** fundamental module name hierarchy **)
+
+val split_name = apfst Long_Name.implode o split_last o fst o split_last o Long_Name.explode;
+
+fun lookup_identifier symbol_of identifiers name =
+  Code_Symbol.lookup identifiers (symbol_of name)
+  |> Option.map (split_last o Long_Name.explode);
 
-val dest_name =
-  apfst Long_Name.implode o split_last o fst o split_last o Long_Name.explode;
+fun force_identifier symbol_of fragments_tab identifiers name =
+  case lookup_identifier symbol_of identifiers name of
+      NONE => (apfst (the o Symtab.lookup fragments_tab) o split_name) name
+    | SOME name' => name';
 
-fun build_module_namespace { module_alias, module_prefix, reserved } program =
+fun build_module_namespace { module_prefix, module_identifiers, reserved } program =
   let
-    fun alias_fragments name = case module_alias name
+    fun alias_fragments name = case module_identifiers name
      of SOME name' => Long_Name.explode name'
       | NONE => map (fn name => fst (Name.variant name reserved)) (Long_Name.explode name);
-    val module_names = Graph.fold (insert (op =) o fst o dest_name o fst) program [];
+    val module_names = Graph.fold (insert (op =) o fst o split_name o fst) program [];
   in
     fold (fn name => Symtab.update (name, Long_Name.explode module_prefix @ alias_fragments name))
       module_names Symtab.empty
@@ -58,28 +69,31 @@
 
 type flat_program = ((string * Code_Thingol.stmt option) Graph.T * (string * string list) list) Graph.T;
 
-fun flat_program labelled_name { module_alias, module_prefix, reserved,
-      empty_nsp, namify_stmt, modify_stmt } program =
+fun flat_program ctxt symbol_of { module_prefix, module_name, reserved,
+    identifiers, empty_nsp, namify_stmt, modify_stmt } program =
   let
 
     (* building module name hierarchy *)
-    val fragments_tab = build_module_namespace { module_alias = module_alias,
-      module_prefix = module_prefix, reserved = reserved } program;
-    val dest_name = dest_name
-      #>> (Long_Name.implode o the o Symtab.lookup fragments_tab);
+    val module_identifiers = if module_name = ""
+      then Code_Symbol.lookup_module_data identifiers
+      else K (SOME module_name);
+    val fragments_tab = build_module_namespace { module_prefix = module_prefix,
+      module_identifiers = module_identifiers, reserved = reserved } program;
+    val prep_name = force_identifier symbol_of fragments_tab identifiers
+      #>> Long_Name.implode;
 
     (* distribute statements over hierarchy *)
     fun add_stmt name stmt =
       let
-        val (module_name, base) = dest_name name;
+        val (module_name, base) = prep_name name;
       in
         Graph.default_node (module_name, (Graph.empty, []))
         #> (Graph.map_node module_name o apfst) (Graph.new_node (name, (base, stmt)))
       end;
     fun add_dependency name name' =
       let
-        val (module_name, _) = dest_name name;
-        val (module_name', _) = dest_name name';
+        val (module_name, _) = prep_name name;
+        val (module_name', _) = prep_name name';
       in if module_name = module_name'
         then (Graph.map_node module_name o apfst) (Graph.add_edge (name, name'))
         else (Graph.map_node module_name o apsnd) (AList.map_default (op =) (module_name', []) (insert (op =) name'))
@@ -104,7 +118,7 @@
 
     (* qualified and unqualified imports, deresolving *)
     fun base_deresolver name = fst (Graph.get_node
-      (fst (Graph.get_node flat_program (fst (dest_name name)))) name);
+      (fst (Graph.get_node flat_program (fst (prep_name name)))) name);
     fun classify_names gr imports =
       let
         val import_tab = maps
@@ -122,10 +136,11 @@
       (uncurry classify_names o Graph.get_node flat_program)
         (Graph.keys flat_program));
     fun deresolver "" name =
-          Long_Name.append (fst (dest_name name)) (base_deresolver name)
+          Long_Name.append (fst (prep_name name)) (base_deresolver name)
       | deresolver module_name name =
           the (Symtab.lookup (the (Symtab.lookup deresolver_tab module_name)) name)
-          handle Option.Option => error ("Unknown statement name: " ^ labelled_name name);
+          handle Option.Option => error ("Unknown statement name: "
+            ^ (Code_Symbol.quote_symbol ctxt o symbol_of) name);
 
   in { deresolver = deresolver, flat_program = flat_program } end;
 
@@ -146,14 +161,17 @@
       apsnd o Graph.map_node name_fragment o apsnd o map_module_content
         o map_module name_fragments;
 
-fun hierarchical_program labelled_name { module_alias, reserved, empty_nsp,
+fun hierarchical_program ctxt symbol_of { module_name, reserved, identifiers, empty_nsp,
       namify_module, namify_stmt, cyclic_modules, empty_data, memorize_data, modify_stmts } program =
   let
 
     (* building module name hierarchy *)
-    val fragments_tab = build_module_namespace { module_alias = module_alias,
-      module_prefix = "", reserved = reserved } program;
-    val dest_name = dest_name #>> (the o Symtab.lookup fragments_tab);
+    val module_identifiers = if module_name = ""
+      then Code_Symbol.lookup_module_data identifiers
+      else K (SOME module_name);
+    val fragments_tab = build_module_namespace { module_prefix = "",
+      module_identifiers = module_identifiers, reserved = reserved } program;
+    val prep_name = force_identifier symbol_of fragments_tab identifiers;
 
     (* building empty module hierarchy *)
     val empty_module = (empty_data, Graph.empty);
@@ -165,20 +183,23 @@
       | allocate_module (name_fragment :: name_fragments) =
           ensure_module name_fragment
           #> (apsnd o Graph.map_node name_fragment o apsnd o map_module_content o allocate_module) name_fragments;
-    val empty_program = Symtab.fold (fn (_, fragments) => allocate_module fragments)
-      fragments_tab empty_module;
+    val empty_program =
+      empty_module
+      |> Symtab.fold (fn (_, fragments) => allocate_module fragments) fragments_tab
+      |> Graph.fold (allocate_module o these o Option.map fst
+          o lookup_identifier symbol_of identifiers o fst) program;
 
     (* distribute statements over hierarchy *)
     fun add_stmt name stmt =
       let
-        val (name_fragments, base) = dest_name name;
+        val (name_fragments, base) = prep_name name;
       in
         (map_module name_fragments o apsnd) (Graph.new_node (name, (base, Stmt stmt)))
       end;
     fun add_dependency name name' =
       let
-        val (name_fragments, _) = dest_name name;
-        val (name_fragments', _) = dest_name name';
+        val (name_fragments, _) = prep_name name;
+        val (name_fragments', _) = prep_name name';
         val (name_fragments_common, (diff, diff')) =
           chop_prefix (op =) (name_fragments, name_fragments');
         val is_module = not (null diff andalso null diff');
@@ -186,7 +207,8 @@
         val add_edge = if is_module andalso not cyclic_modules
           then (fn node => Graph.add_edge_acyclic dep node
             handle Graph.CYCLES _ => error ("Dependency "
-              ^ quote name ^ " -> " ^ quote name'
+              ^ (Code_Symbol.quote_symbol ctxt o symbol_of) name ^ " -> "
+              ^ (Code_Symbol.quote_symbol ctxt o symbol_of) name'
               ^ " would result in module dependency cycle"))
           else Graph.add_edge dep
       in (map_module name_fragments_common o apsnd) add_edge end;
@@ -228,13 +250,14 @@
     (* deresolving *)
     fun deresolver prefix_fragments name =
       let
-        val (name_fragments, _) = dest_name name;
+        val (name_fragments, _) = prep_name name;
         val (_, (_, remainder)) = chop_prefix (op =) (prefix_fragments, name_fragments);
         val nodes = fold (fn name_fragment => fn nodes => case Graph.get_node nodes name_fragment
          of (_, Module (_, nodes)) => nodes) name_fragments hierarchical_program;
         val (base', _) = Graph.get_node nodes name;
       in Long_Name.implode (remainder @ [base']) end
-        handle Graph.UNDEF _ => error ("Unknown statement name: " ^ labelled_name name);
+        handle Graph.UNDEF _ => error ("Unknown statement name: "
+          ^ (Code_Symbol.quote_symbol ctxt o symbol_of) name);
 
   in { deresolver = deresolver, hierarchical_program = hierarchical_program } end;