| author | wenzelm | 
| Wed, 31 Aug 2011 15:41:22 +0200 | |
| changeset 44607 | 274eff0ea12e | 
| parent 44474 | 681447a9ffe5 | 
| child 44615 | a4ff8a787202 | 
| permissions | -rw-r--r-- | 
| 34268 | 1  | 
/* Title: Pure/Thy/thy_syntax.scala  | 
2  | 
Author: Makarius  | 
|
3  | 
||
| 38374 | 4  | 
Superficial theory syntax: tokens and spans.  | 
| 34268 | 5  | 
*/  | 
6  | 
||
7  | 
package isabelle  | 
|
8  | 
||
9  | 
||
| 
38239
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
10  | 
import scala.collection.mutable  | 
| 38374 | 11  | 
import scala.annotation.tailrec  | 
| 
38239
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
12  | 
|
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
13  | 
|
| 34303 | 14  | 
object Thy_Syntax  | 
| 34268 | 15  | 
{
 | 
| 
40454
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
16  | 
/** nested structure **/  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
17  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
18  | 
object Structure  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
19  | 
  {
 | 
| 
40478
 
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
 
wenzelm 
parents: 
40457 
diff
changeset
 | 
20  | 
    sealed abstract class Entry { def length: Int }
 | 
| 
40454
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
21  | 
case class Block(val name: String, val body: List[Entry]) extends Entry  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
22  | 
    {
 | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
23  | 
val length: Int = (0 /: body)(_ + _.length)  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
24  | 
}  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
25  | 
case class Atom(val command: Command) extends Entry  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
26  | 
    {
 | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
27  | 
def length: Int = command.length  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
28  | 
}  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
29  | 
|
| 
44607
 
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
 
wenzelm 
parents: 
44474 
diff
changeset
 | 
30  | 
def parse(syntax: Outer_Syntax, node_name: String, root_name: String, text: CharSequence)  | 
| 
 
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
 
wenzelm 
parents: 
44474 
diff
changeset
 | 
31  | 
: Entry =  | 
| 
40454
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
32  | 
    {
 | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
33  | 
/* stack operations */  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
34  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
35  | 
def buffer(): mutable.ListBuffer[Entry] = new mutable.ListBuffer[Entry]  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
36  | 
var stack: List[(Int, String, mutable.ListBuffer[Entry])] = List((0, root_name, buffer()))  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
37  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
38  | 
@tailrec def close(level: Int => Boolean)  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
39  | 
      {
 | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
40  | 
        stack match {
 | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
41  | 
case (lev, name, body) :: (_, _, body2) :: rest if level(lev) =>  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
42  | 
body2 += Block(name, body.toList)  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
43  | 
stack = stack.tail  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
44  | 
close(level)  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
45  | 
case _ =>  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
46  | 
}  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
47  | 
}  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
48  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
49  | 
def result(): Entry =  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
50  | 
      {
 | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
51  | 
close(_ => true)  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
52  | 
val (_, name, body) = stack.head  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
53  | 
Block(name, body.toList)  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
54  | 
}  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
55  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
56  | 
def add(command: Command)  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
57  | 
      {
 | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
58  | 
        syntax.heading_level(command) match {
 | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
59  | 
case Some(i) =>  | 
| 40457 | 60  | 
close(_ >= i)  | 
| 
40454
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
61  | 
stack = (i, command.source, buffer()) :: stack  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
62  | 
case None =>  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
63  | 
}  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
64  | 
stack.head._3 += Atom(command)  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
65  | 
}  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
66  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
67  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
68  | 
/* result structure */  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
69  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
70  | 
val spans = parse_spans(syntax.scan(text))  | 
| 
44607
 
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
 
wenzelm 
parents: 
44474 
diff
changeset
 | 
71  | 
spans.foreach(span => add(Command.span(node_name, span)))  | 
| 
40454
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
72  | 
result()  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
73  | 
}  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
74  | 
}  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
75  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
76  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
77  | 
|
| 38374 | 78  | 
/** parse spans **/  | 
79  | 
||
| 38373 | 80  | 
def parse_spans(toks: List[Token]): List[List[Token]] =  | 
| 34268 | 81  | 
  {
 | 
| 38373 | 82  | 
val result = new mutable.ListBuffer[List[Token]]  | 
| 
38239
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
83  | 
val span = new mutable.ListBuffer[Token]  | 
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
84  | 
val whitespace = new mutable.ListBuffer[Token]  | 
| 34268 | 85  | 
|
| 
38239
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
86  | 
def flush(buffer: mutable.ListBuffer[Token])  | 
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
87  | 
    {
 | 
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
88  | 
      if (!buffer.isEmpty) { result += buffer.toList; buffer.clear }
 | 
| 34268 | 89  | 
}  | 
| 
38239
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
90  | 
    for (tok <- toks) {
 | 
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
91  | 
      if (tok.is_command) { flush(span); flush(whitespace); span += tok }
 | 
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
92  | 
else if (tok.is_ignored) whitespace += tok  | 
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
93  | 
      else { span ++= whitespace; whitespace.clear; span += tok }
 | 
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
94  | 
}  | 
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
95  | 
flush(span); flush(whitespace)  | 
| 
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
96  | 
result.toList  | 
| 34268 | 97  | 
}  | 
| 38374 | 98  | 
|
99  | 
||
100  | 
||
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
101  | 
/** perspective **/  | 
| 44388 | 102  | 
|
103  | 
def command_perspective(node: Document.Node, perspective: Text.Perspective): Command.Perspective =  | 
|
104  | 
  {
 | 
|
| 44474 | 105  | 
if (perspective.is_empty) Command.Perspective.empty  | 
| 44388 | 106  | 
    else {
 | 
107  | 
val result = new mutable.ListBuffer[Command]  | 
|
108  | 
@tailrec  | 
|
109  | 
def check_ranges(ranges: List[Text.Range], commands: Stream[(Command, Text.Offset)])  | 
|
110  | 
      {
 | 
|
111  | 
        (ranges, commands) match {
 | 
|
112  | 
case (range :: more_ranges, (command, offset) #:: more_commands) =>  | 
|
113  | 
val command_range = command.range + offset  | 
|
114  | 
            range compare command_range match {
 | 
|
115  | 
case -1 => check_ranges(more_ranges, commands)  | 
|
116  | 
case 0 =>  | 
|
117  | 
result += command  | 
|
118  | 
check_ranges(ranges, more_commands)  | 
|
119  | 
case 1 => check_ranges(ranges, more_commands)  | 
|
120  | 
}  | 
|
121  | 
case _ =>  | 
|
122  | 
}  | 
|
123  | 
}  | 
|
| 44473 | 124  | 
check_ranges(perspective.ranges, node.command_range(perspective.range).toStream)  | 
| 44474 | 125  | 
Command.Perspective(result.toList)  | 
| 44388 | 126  | 
}  | 
127  | 
}  | 
|
128  | 
||
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
129  | 
def update_perspective(nodes: Document.Nodes, name: String, text_perspective: Text.Perspective)  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
130  | 
: (Command.Perspective, Option[Document.Nodes]) =  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
131  | 
  {
 | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
132  | 
val node = nodes(name)  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
133  | 
val perspective = command_perspective(node, text_perspective)  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
134  | 
val new_nodes =  | 
| 44474 | 135  | 
if (node.perspective same perspective) None  | 
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
136  | 
else Some(nodes + (name -> node.copy(perspective = perspective)))  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
137  | 
(perspective, new_nodes)  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
138  | 
}  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
139  | 
|
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
140  | 
def edit_perspective(previous: Document.Version, name: String, text_perspective: Text.Perspective)  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
141  | 
: (Command.Perspective, Document.Version) =  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
142  | 
  {
 | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
143  | 
val nodes = previous.nodes  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
144  | 
val (perspective, new_nodes) = update_perspective(nodes, name, text_perspective)  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
145  | 
val version = Document.Version(Document.new_id(), new_nodes getOrElse nodes)  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
146  | 
(perspective, version)  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
147  | 
}  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
148  | 
|
| 44388 | 149  | 
|
150  | 
||
| 38374 | 151  | 
/** text edits **/  | 
152  | 
||
| 43722 | 153  | 
def text_edits(  | 
154  | 
syntax: Outer_Syntax,  | 
|
155  | 
previous: Document.Version,  | 
|
| 
44157
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
156  | 
edits: List[Document.Edit_Text])  | 
| 
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
157  | 
: (List[Document.Edit_Command], Document.Version) =  | 
| 38374 | 158  | 
  {
 | 
159  | 
/* phase 1: edit individual command source */  | 
|
160  | 
||
| 38425 | 161  | 
@tailrec def edit_text(eds: List[Text.Edit], commands: Linear_Set[Command])  | 
| 38374 | 162  | 
: Linear_Set[Command] =  | 
163  | 
    {
 | 
|
164  | 
      eds match {
 | 
|
165  | 
case e :: es =>  | 
|
166  | 
          Document.Node.command_starts(commands.iterator).find {
 | 
|
167  | 
case (cmd, cmd_start) =>  | 
|
168  | 
e.can_edit(cmd.source, cmd_start) ||  | 
|
169  | 
e.is_insert && e.start == cmd_start + cmd.length  | 
|
170  | 
          } match {
 | 
|
171  | 
case Some((cmd, cmd_start)) if e.can_edit(cmd.source, cmd_start) =>  | 
|
172  | 
val (rest, text) = e.edit(cmd.source, cmd_start)  | 
|
173  | 
val new_commands = commands.insert_after(Some(cmd), Command.unparsed(text)) - cmd  | 
|
174  | 
edit_text(rest.toList ::: es, new_commands)  | 
|
175  | 
||
176  | 
case Some((cmd, cmd_start)) =>  | 
|
177  | 
edit_text(es, commands.insert_after(Some(cmd), Command.unparsed(e.text)))  | 
|
178  | 
||
179  | 
case None =>  | 
|
180  | 
require(e.is_insert && e.start == 0)  | 
|
181  | 
edit_text(es, commands.insert_after(None, Command.unparsed(e.text)))  | 
|
182  | 
}  | 
|
183  | 
case Nil => commands  | 
|
184  | 
}  | 
|
185  | 
}  | 
|
186  | 
||
187  | 
||
188  | 
/* phase 2: recover command spans */  | 
|
189  | 
||
| 
44607
 
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
 
wenzelm 
parents: 
44474 
diff
changeset
 | 
190  | 
@tailrec def recover_spans(node_name: String, commands: Linear_Set[Command])  | 
| 
 
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
 
wenzelm 
parents: 
44474 
diff
changeset
 | 
191  | 
: Linear_Set[Command] =  | 
| 38374 | 192  | 
    {
 | 
| 
44385
 
e7fdb008aa7d
propagate editor perspective through document model;
 
wenzelm 
parents: 
44185 
diff
changeset
 | 
193  | 
      commands.iterator.find(cmd => !cmd.is_defined) match {
 | 
| 38374 | 194  | 
case Some(first_unparsed) =>  | 
195  | 
val first =  | 
|
| 
38878
 
1d5b3175fd30
text_edits/recover_spans: reparse at least until line boundary -- increases chance of recovery for bad ML text, for example;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
196  | 
commands.reverse_iterator(first_unparsed).  | 
| 
 
1d5b3175fd30
text_edits/recover_spans: reparse at least until line boundary -- increases chance of recovery for bad ML text, for example;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
197  | 
dropWhile(_.newlines == 0).find(_.is_command) getOrElse commands.head  | 
| 38374 | 198  | 
val last =  | 
| 
38878
 
1d5b3175fd30
text_edits/recover_spans: reparse at least until line boundary -- increases chance of recovery for bad ML text, for example;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
199  | 
commands.iterator(first_unparsed).  | 
| 
 
1d5b3175fd30
text_edits/recover_spans: reparse at least until line boundary -- increases chance of recovery for bad ML text, for example;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
200  | 
dropWhile(_.newlines == 0).find(_.is_command) getOrElse commands.last  | 
| 38374 | 201  | 
val range =  | 
202  | 
commands.iterator(first).takeWhile(_ != last).toList ::: List(last)  | 
|
203  | 
||
204  | 
val sources = range.flatMap(_.span.map(_.source))  | 
|
| 43647 | 205  | 
val spans0 = parse_spans(syntax.scan(sources.mkString))  | 
| 38374 | 206  | 
|
207  | 
val (before_edit, spans1) =  | 
|
208  | 
if (!spans0.isEmpty && first.is_command && first.span == spans0.head)  | 
|
209  | 
(Some(first), spans0.tail)  | 
|
210  | 
else (commands.prev(first), spans0)  | 
|
211  | 
||
212  | 
val (after_edit, spans2) =  | 
|
213  | 
if (!spans1.isEmpty && last.is_command && last.span == spans1.last)  | 
|
214  | 
(Some(last), spans1.take(spans1.length - 1))  | 
|
215  | 
else (commands.next(last), spans1)  | 
|
216  | 
||
| 
44607
 
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
 
wenzelm 
parents: 
44474 
diff
changeset
 | 
217  | 
val inserted = spans2.map(span => new Command(Document.new_id(), node_name, span))  | 
| 38374 | 218  | 
val new_commands =  | 
219  | 
commands.delete_between(before_edit, after_edit).append_after(before_edit, inserted)  | 
|
| 
44607
 
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
 
wenzelm 
parents: 
44474 
diff
changeset
 | 
220  | 
recover_spans(node_name, new_commands)  | 
| 38374 | 221  | 
|
222  | 
case None => commands  | 
|
223  | 
}  | 
|
224  | 
}  | 
|
225  | 
||
226  | 
||
227  | 
/* resulting document edits */  | 
|
228  | 
||
229  | 
    {
 | 
|
| 40479 | 230  | 
val doc_edits = new mutable.ListBuffer[Document.Edit_Command]  | 
| 38417 | 231  | 
var nodes = previous.nodes  | 
| 38374 | 232  | 
|
| 
40478
 
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
 
wenzelm 
parents: 
40457 
diff
changeset
 | 
233  | 
      edits foreach {
 | 
| 44185 | 234  | 
case (name, Document.Node.Clear()) =>  | 
235  | 
doc_edits += (name -> Document.Node.Clear())  | 
|
| 
44443
 
35d67b2056cc
clarified Document.Node.clear -- retain header (cf. ML version);
 
wenzelm 
parents: 
44436 
diff
changeset
 | 
236  | 
nodes += (name -> nodes(name).clear)  | 
| 
40478
 
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
 
wenzelm 
parents: 
40457 
diff
changeset
 | 
237  | 
|
| 44156 | 238  | 
case (name, Document.Node.Edits(text_edits)) =>  | 
| 
43697
 
77ce24aa1770
explicit Document.Node.Header, with master_dir and thy_name;
 
wenzelm 
parents: 
43662 
diff
changeset
 | 
239  | 
val node = nodes(name)  | 
| 
 
77ce24aa1770
explicit Document.Node.Header, with master_dir and thy_name;
 
wenzelm 
parents: 
43662 
diff
changeset
 | 
240  | 
val commands0 = node.commands  | 
| 
40478
 
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
 
wenzelm 
parents: 
40457 
diff
changeset
 | 
241  | 
val commands1 = edit_text(text_edits, commands0)  | 
| 
44607
 
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
 
wenzelm 
parents: 
44474 
diff
changeset
 | 
242  | 
val commands2 = recover_spans(name, commands1) // FIXME somewhat slow  | 
| 38374 | 243  | 
|
| 
40478
 
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
 
wenzelm 
parents: 
40457 
diff
changeset
 | 
244  | 
val removed_commands = commands0.iterator.filter(!commands2.contains(_)).toList  | 
| 
 
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
 
wenzelm 
parents: 
40457 
diff
changeset
 | 
245  | 
val inserted_commands = commands2.iterator.filter(!commands0.contains(_)).toList  | 
| 38374 | 246  | 
|
| 
40478
 
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
 
wenzelm 
parents: 
40457 
diff
changeset
 | 
247  | 
val cmd_edits =  | 
| 
 
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
 
wenzelm 
parents: 
40457 
diff
changeset
 | 
248  | 
removed_commands.reverse.map(cmd => (commands0.prev(cmd), None)) :::  | 
| 
 
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
 
wenzelm 
parents: 
40457 
diff
changeset
 | 
249  | 
inserted_commands.map(cmd => (commands2.prev(cmd), Some(cmd)))  | 
| 38374 | 250  | 
|
| 44156 | 251  | 
doc_edits += (name -> Document.Node.Edits(cmd_edits))  | 
| 
44157
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
252  | 
nodes += (name -> node.copy(commands = commands2))  | 
| 43722 | 253  | 
|
| 44182 | 254  | 
case (name, Document.Node.Header(header)) =>  | 
| 
44157
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
255  | 
val node = nodes(name)  | 
| 
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
256  | 
val update_header =  | 
| 44182 | 257  | 
            (node.header, header) match {
 | 
258  | 
case (Exn.Res(thy_header0), Exn.Res(thy_header)) => thy_header0 != thy_header  | 
|
| 
44160
 
8848867501fb
clarified document model header: master_dir (native wrt. editor, potentially URL) and node_name (full canonical path);
 
wenzelm 
parents: 
44157 
diff
changeset
 | 
259  | 
case _ => true  | 
| 
44157
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
260  | 
}  | 
| 44180 | 261  | 
          if (update_header) {
 | 
| 44182 | 262  | 
doc_edits += (name -> Document.Node.Header(header))  | 
| 44180 | 263  | 
nodes += (name -> node.copy(header = header))  | 
264  | 
}  | 
|
| 
44385
 
e7fdb008aa7d
propagate editor perspective through document model;
 
wenzelm 
parents: 
44185 
diff
changeset
 | 
265  | 
|
| 
 
e7fdb008aa7d
propagate editor perspective through document model;
 
wenzelm 
parents: 
44185 
diff
changeset
 | 
266  | 
case (name, Document.Node.Perspective(text_perspective)) =>  | 
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
267  | 
          update_perspective(nodes, name, text_perspective) match {
 | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
268  | 
case (_, None) =>  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
269  | 
case (perspective, Some(nodes1)) =>  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
270  | 
doc_edits += (name -> Document.Node.Perspective(perspective))  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
271  | 
nodes = nodes1  | 
| 
44385
 
e7fdb008aa7d
propagate editor perspective through document model;
 
wenzelm 
parents: 
44185 
diff
changeset
 | 
272  | 
}  | 
| 38374 | 273  | 
}  | 
| 
44157
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
274  | 
(doc_edits.toList, Document.Version(Document.new_id(), nodes))  | 
| 38374 | 275  | 
}  | 
276  | 
}  | 
|
| 34268 | 277  | 
}  |