tuned signature;
authorwenzelm
Tue, 12 Aug 2014 00:17:02 +0200
changeset 57906 020df63dd0a9
parent 57905 c0c5652e796e
child 57907 7fc36b4c7cce
tuned signature;
src/Pure/Isar/outer_syntax.scala
src/Pure/PIDE/prover.scala
src/Pure/PIDE/resources.scala
src/Pure/Thy/thy_structure.scala
src/Pure/Thy/thy_syntax.scala
--- a/src/Pure/Isar/outer_syntax.scala	Tue Aug 12 00:08:32 2014 +0200
+++ b/src/Pure/Isar/outer_syntax.scala	Tue Aug 12 00:17:02 2014 +0200
@@ -186,6 +186,9 @@
     result.toList
   }
 
+  def parse_spans(input: CharSequence): List[Command_Span.Span] =
+    parse_spans(scan(input))
+
 
   /* language context */
 
--- a/src/Pure/PIDE/prover.scala	Tue Aug 12 00:08:32 2014 +0200
+++ b/src/Pure/PIDE/prover.scala	Tue Aug 12 00:17:02 2014 +0200
@@ -14,8 +14,7 @@
   trait Syntax
   {
     def add_keywords(keywords: Thy_Header.Keywords): Syntax
-    def scan(input: CharSequence): List[Token]
-    def parse_spans(toks: List[Token]): List[Command_Span.Span]
+    def parse_spans(input: CharSequence): List[Command_Span.Span]
     def load_command(name: String): Option[List[String]]
     def load_commands_in(text: String): Boolean
   }
--- a/src/Pure/PIDE/resources.scala	Tue Aug 12 00:08:32 2014 +0200
+++ b/src/Pure/PIDE/resources.scala	Tue Aug 12 00:17:02 2014 +0200
@@ -56,7 +56,7 @@
 
   def loaded_files(syntax: Prover.Syntax, text: String): List[String] =
     if (syntax.load_commands_in(text)) {
-      val spans = syntax.parse_spans(syntax.scan(text))
+      val spans = syntax.parse_spans(text)
       spans.iterator.map(Command_Span.span_files(syntax, _)).flatten.toList
     }
     else Nil
--- a/src/Pure/Thy/thy_structure.scala	Tue Aug 12 00:08:32 2014 +0200
+++ b/src/Pure/Thy/thy_structure.scala	Tue Aug 12 00:17:02 2014 +0200
@@ -63,7 +63,7 @@
 
     /* result structure */
 
-    val spans = syntax.parse_spans(syntax.scan(text))
+    val spans = syntax.parse_spans(text)
     spans.foreach(span => add(Command(Document_ID.none, node_name, Nil, span)))
     result()
   }
--- a/src/Pure/Thy/thy_syntax.scala	Tue Aug 12 00:08:32 2014 +0200
+++ b/src/Pure/Thy/thy_syntax.scala	Tue Aug 12 00:17:02 2014 +0200
@@ -168,7 +168,7 @@
   {
     val cmds0 = commands.iterator(first, last).toList
     val blobs_spans0 =
-      syntax.parse_spans(syntax.scan(cmds0.iterator.map(_.source).mkString)).
+      syntax.parse_spans(cmds0.iterator.map(_.source).mkString).
         map(span => (Command_Span.resolve_files(resources, syntax, name, span, get_blob), span))
 
     val (cmds1, blobs_spans1) = chop_common(cmds0, blobs_spans0)