equal
deleted
inserted
replaced
143 theory |
143 theory |
144 else Long_Name.qualify(qualifier, theory) |
144 else Long_Name.qualify(qualifier, theory) |
145 |
145 |
146 def find_theory_node(theory: String): Option[Document.Node.Name] = |
146 def find_theory_node(theory: String): Option[Document.Node.Name] = |
147 { |
147 { |
148 val thy_file = Thy_Header.thy_path(Path.basic(Long_Name.base_name(theory))) |
148 val thy_file = Path.basic(Long_Name.base_name(theory)).thy |
149 val session = session_base.theory_qualifier(theory) |
149 val session = session_base.theory_qualifier(theory) |
150 val dirs = |
150 val dirs = |
151 sessions_structure.get(session) match { |
151 sessions_structure.get(session) match { |
152 case Some(info) => info.dirs |
152 case Some(info) => info.dirs |
153 case None => Nil |
153 case None => Nil |
157 } |
157 } |
158 |
158 |
159 def import_name(qualifier: String, dir: String, s: String): Document.Node.Name = |
159 def import_name(qualifier: String, dir: String, s: String): Document.Node.Name = |
160 { |
160 { |
161 val theory = theory_name(qualifier, Thy_Header.import_name(s)) |
161 val theory = theory_name(qualifier, Thy_Header.import_name(s)) |
162 def theory_node = make_theory_node(dir, Thy_Header.thy_path(Path.explode(s)), theory) |
162 def theory_node = make_theory_node(dir, Path.explode(s).thy, theory) |
163 |
163 |
164 if (!Thy_Header.is_base_name(s)) theory_node |
164 if (!Thy_Header.is_base_name(s)) theory_node |
165 else if (session_base.loaded_theory(theory)) loaded_theory_node(theory) |
165 else if (session_base.loaded_theory(theory)) loaded_theory_node(theory) |
166 else { |
166 else { |
167 find_theory_node(theory) match { |
167 find_theory_node(theory) match { |