tuned;
authorwenzelm
Sun, 15 Mar 2015 12:42:30 +0100
changeset 59699 a6efad6acafd
parent 59698 d4ce901f20c5
child 59700 d887abcc7c24
tuned;
src/Pure/PIDE/command.scala
src/Pure/Thy/thy_syntax.scala
--- a/src/Pure/PIDE/command.scala	Sat Mar 14 21:16:29 2015 +0100
+++ b/src/Pure/PIDE/command.scala	Sun Mar 15 12:42:30 2015 +0100
@@ -349,12 +349,11 @@
     }
 
   def resolve_files(
-      resources: Resources,
-      syntax: Prover.Syntax,
-      node_name: Document.Node.Name,
-      span: Command_Span.Span,
-      get_blob: Document.Node.Name => Option[Document.Blob])
-    : (List[Command.Blob], Int) =
+    resources: Resources,
+    syntax: Prover.Syntax,
+    get_blob: Document.Node.Name => Option[Document.Blob],
+    node_name: Document.Node.Name,
+    span: Command_Span.Span): (List[Command.Blob], Int) =
   {
     val (files, index) = span_files(syntax, span)
     val blobs =
--- a/src/Pure/Thy/thy_syntax.scala	Sat Mar 14 21:16:29 2015 +0100
+++ b/src/Pure/Thy/thy_syntax.scala	Sun Mar 15 12:42:30 2015 +0100
@@ -63,7 +63,7 @@
 
 
 
-  /** header edits: structure and outer syntax **/
+  /** header edits: graph structure and outer syntax **/
 
   private def header_edits(
     resources: Resources,
@@ -157,14 +157,14 @@
     resources: Resources,
     syntax: Prover.Syntax,
     get_blob: Document.Node.Name => Option[Document.Blob],
-    name: Document.Node.Name,
+    node_name: Document.Node.Name,
     commands: Linear_Set[Command],
     first: Command, last: Command): Linear_Set[Command] =
   {
     val cmds0 = commands.iterator(first, last).toList
     val blobs_spans0 =
       syntax.parse_spans(cmds0.iterator.map(_.source).mkString).
-        map(span => (Command.resolve_files(resources, syntax, name, span, get_blob), span))
+        map(span => (Command.resolve_files(resources, syntax, get_blob, node_name, span), span))
 
     val (cmds1, blobs_spans1) = chop_common(cmds0, blobs_spans0)
 
@@ -180,7 +180,7 @@
         val hook = commands.prev(cmd)
         val inserted =
           blobs_spans2.map({ case (blobs, span) =>
-            Command(Document_ID.make(), name, Some(blobs), span) })
+            Command(Document_ID.make(), node_name, Some(blobs), span) })
         (commands /: cmds2)(_ - _).append_after(hook, inserted)
     }
   }