src/Pure/Thy/thy_syntax.scala
changeset 64854 f5aa712e6250
parent 64819 bebe7a164068
child 65074 df14a0e872e6
--- a/src/Pure/Thy/thy_syntax.scala	Mon Jan 09 19:34:16 2017 +0100
+++ b/src/Pure/Thy/thy_syntax.scala	Mon Jan 09 20:26:59 2017 +0100
@@ -101,7 +101,7 @@
         else {
           val header = node.header
           val imports_syntax = header.imports.flatMap(a => nodes(a._1).syntax)
-          Some((resources.base_syntax /: imports_syntax)(_ ++ _)
+          Some((resources.base.syntax /: imports_syntax)(_ ++ _)
             .add_keywords(header.keywords).add_abbrevs(header.abbrevs))
         }
       nodes += (name -> node.update_syntax(syntax))
@@ -297,7 +297,7 @@
       doc_blobs.get(name) orElse previous.nodes(name).get_blob
 
     def can_import(name: Document.Node.Name): Boolean =
-      resources.loaded_theories(name.theory) || nodes0(name).has_header
+      resources.base.loaded_theories(name.theory) || nodes0(name).has_header
 
     val (doc_edits, version) =
       if (edits.isEmpty) (Nil, Document.Version.make(previous.nodes))
@@ -321,7 +321,7 @@
         node_edits foreach {
           case (name, edits) =>
             val node = nodes(name)
-            val syntax = node.syntax getOrElse resources.base_syntax
+            val syntax = node.syntax getOrElse resources.base.syntax
             val commands = node.commands
 
             val node1 =