| author | wenzelm | 
| Wed, 01 Aug 2012 15:50:50 +0200 | |
| changeset 48635 | bfce940c6f38 | 
| parent 47987 | 4e9df6ffcc6e | 
| child 48706 | e2b512024eab | 
| 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  | 
|
| 
46811
 
03a2dc9e0624
clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
 
wenzelm 
parents: 
46749 
diff
changeset
 | 
30  | 
def parse(syntax: Outer_Syntax, node_name: Document.Node.Name, text: CharSequence): Entry =  | 
| 
40454
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
31  | 
    {
 | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
32  | 
/* stack operations */  | 
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
33  | 
|
| 
 
2516ea25a54b
some support for nested source structure, based on section headings;
 
wenzelm 
parents: 
38878 
diff
changeset
 | 
34  | 
def buffer(): mutable.ListBuffer[Entry] = new mutable.ListBuffer[Entry]  | 
| 44615 | 35  | 
var stack: List[(Int, String, mutable.ListBuffer[Entry])] =  | 
36  | 
List((0, "theory " + node_name.theory, buffer()))  | 
|
| 
40454
 
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) =>  | 
| 46969 | 60  | 
close(_ > i)  | 
61  | 
stack = (i + 1, command.source, buffer()) :: stack  | 
|
| 
40454
 
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))  | 
| 
47012
 
0e246130486b
clarified command span classification: strict Command.is_command, permissive Command.name;
 
wenzelm 
parents: 
46969 
diff
changeset
 | 
71  | 
spans.foreach(span => add(Command(Document.no_id, 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]  | 
| 34268 | 84  | 
|
| 
46811
 
03a2dc9e0624
clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
 
wenzelm 
parents: 
46749 
diff
changeset
 | 
85  | 
    def flush() { if (!span.isEmpty) { result += span.toList; span.clear } }
 | 
| 
 
03a2dc9e0624
clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
 
wenzelm 
parents: 
46749 
diff
changeset
 | 
86  | 
    for (tok <- toks) { if (tok.is_command) flush(); span += tok }
 | 
| 
 
03a2dc9e0624
clarified command span: include trailing whitespace/comments and thus reduce number of ignored spans with associated transactions and states (factor 2);
 
wenzelm 
parents: 
46749 
diff
changeset
 | 
87  | 
flush()  | 
| 
38239
 
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
 
wenzelm 
parents: 
36956 
diff
changeset
 | 
88  | 
result.toList  | 
| 34268 | 89  | 
}  | 
| 38374 | 90  | 
|
91  | 
||
92  | 
||
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44388 
diff
changeset
 | 
93  | 
/** perspective **/  | 
| 44388 | 94  | 
|
95  | 
def command_perspective(node: Document.Node, perspective: Text.Perspective): Command.Perspective =  | 
|
96  | 
  {
 | 
|
| 44474 | 97  | 
if (perspective.is_empty) Command.Perspective.empty  | 
| 44388 | 98  | 
    else {
 | 
99  | 
val result = new mutable.ListBuffer[Command]  | 
|
100  | 
@tailrec  | 
|
101  | 
def check_ranges(ranges: List[Text.Range], commands: Stream[(Command, Text.Offset)])  | 
|
102  | 
      {
 | 
|
103  | 
        (ranges, commands) match {
 | 
|
104  | 
case (range :: more_ranges, (command, offset) #:: more_commands) =>  | 
|
105  | 
val command_range = command.range + offset  | 
|
106  | 
            range compare command_range match {
 | 
|
107  | 
case -1 => check_ranges(more_ranges, commands)  | 
|
108  | 
case 0 =>  | 
|
109  | 
result += command  | 
|
110  | 
check_ranges(ranges, more_commands)  | 
|
111  | 
case 1 => check_ranges(ranges, more_commands)  | 
|
112  | 
}  | 
|
113  | 
case _ =>  | 
|
114  | 
}  | 
|
115  | 
}  | 
|
| 44473 | 116  | 
check_ranges(perspective.ranges, node.command_range(perspective.range).toStream)  | 
| 44474 | 117  | 
Command.Perspective(result.toList)  | 
| 44388 | 118  | 
}  | 
119  | 
}  | 
|
120  | 
||
121  | 
||
122  | 
||
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
123  | 
/** header edits: structure and outer syntax **/  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
124  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
125  | 
private def header_edits(  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
126  | 
base_syntax: Outer_Syntax,  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
127  | 
previous: Document.Version,  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
128  | 
edits: List[Document.Edit_Text])  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
129  | 
: (Outer_Syntax, List[Document.Node.Name], Document.Nodes, List[Document.Edit_Command]) =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
130  | 
  {
 | 
| 
47987
 
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
 
wenzelm 
parents: 
47346 
diff
changeset
 | 
131  | 
var updated_imports = false  | 
| 
 
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
 
wenzelm 
parents: 
47346 
diff
changeset
 | 
132  | 
var updated_keywords = false  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
133  | 
var nodes = previous.nodes  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
134  | 
val doc_edits = new mutable.ListBuffer[Document.Edit_Command]  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
135  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
136  | 
    edits foreach {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
137  | 
case (name, Document.Node.Header(header)) =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
138  | 
val node = nodes(name)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
139  | 
val update_header =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
140  | 
          (node.header, header) match {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
141  | 
case (Exn.Res(deps0), Exn.Res(deps)) => deps0 != deps  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
142  | 
case _ => true  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
143  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
144  | 
        if (update_header) {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
145  | 
val node1 = node.update_header(header)  | 
| 
47987
 
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
 
wenzelm 
parents: 
47346 
diff
changeset
 | 
146  | 
updated_imports = updated_imports || (node.imports != node1.imports)  | 
| 
 
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
 
wenzelm 
parents: 
47346 
diff
changeset
 | 
147  | 
updated_keywords = updated_keywords || (node.keywords != node1.keywords)  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
148  | 
nodes += (name -> node1)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
149  | 
doc_edits += (name -> Document.Node.Header(header))  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
150  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
151  | 
case _ =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
152  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
153  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
154  | 
val syntax =  | 
| 
47987
 
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
 
wenzelm 
parents: 
47346 
diff
changeset
 | 
155  | 
if (previous.is_init || updated_keywords)  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
156  | 
        (base_syntax /: nodes.entries)({ case (syn, (_, node)) => (syn /: node.keywords)(_ + _) })
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
157  | 
else previous.syntax  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
158  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
159  | 
val reparse =  | 
| 
47987
 
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
 
wenzelm 
parents: 
47346 
diff
changeset
 | 
160  | 
if (updated_imports || updated_keywords)  | 
| 
 
4e9df6ffcc6e
reparse descendants after update of imports, e.g. required for 'primrec' (line 17 of "src/HOL/Power.thy");
 
wenzelm 
parents: 
47346 
diff
changeset
 | 
161  | 
nodes.descendants(doc_edits.iterator.map(_._1).toList)  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
162  | 
else Nil  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
163  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
164  | 
(syntax, reparse, nodes, doc_edits.toList)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
165  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
166  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
167  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
168  | 
|
| 38374 | 169  | 
/** text edits **/  | 
170  | 
||
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
171  | 
/* phase 1: edit individual command source */  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
172  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
173  | 
@tailrec private def edit_text(eds: List[Text.Edit], commands: Linear_Set[Command])  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
174  | 
: Linear_Set[Command] =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
175  | 
  {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
176  | 
    eds match {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
177  | 
case e :: es =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
178  | 
        Document.Node.command_starts(commands.iterator).find {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
179  | 
case (cmd, cmd_start) =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
180  | 
e.can_edit(cmd.source, cmd_start) ||  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
181  | 
e.is_insert && e.start == cmd_start + cmd.length  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
182  | 
        } match {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
183  | 
case Some((cmd, cmd_start)) if e.can_edit(cmd.source, cmd_start) =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
184  | 
val (rest, text) = e.edit(cmd.source, cmd_start)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
185  | 
val new_commands = commands.insert_after(Some(cmd), Command.unparsed(text)) - cmd  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
186  | 
edit_text(rest.toList ::: es, new_commands)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
187  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
188  | 
case Some((cmd, cmd_start)) =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
189  | 
edit_text(es, commands.insert_after(Some(cmd), Command.unparsed(e.text)))  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
190  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
191  | 
case None =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
192  | 
require(e.is_insert && e.start == 0)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
193  | 
edit_text(es, commands.insert_after(None, Command.unparsed(e.text)))  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
194  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
195  | 
case Nil => commands  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
196  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
197  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
198  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
199  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
200  | 
/* phase 2: recover command spans */  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
201  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
202  | 
@tailrec private def recover_spans(  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
203  | 
syntax: Outer_Syntax,  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
204  | 
node_name: Document.Node.Name,  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
205  | 
commands: Linear_Set[Command]): Linear_Set[Command] =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
206  | 
  {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
207  | 
    commands.iterator.find(cmd => !cmd.is_defined) match {
 | 
| 
47012
 
0e246130486b
clarified command span classification: strict Command.is_command, permissive Command.name;
 
wenzelm 
parents: 
46969 
diff
changeset
 | 
208  | 
case Some(first_undefined) =>  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
209  | 
val first =  | 
| 
47012
 
0e246130486b
clarified command span classification: strict Command.is_command, permissive Command.name;
 
wenzelm 
parents: 
46969 
diff
changeset
 | 
210  | 
commands.reverse_iterator(first_undefined).  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
211  | 
dropWhile(_.newlines == 0).find(_.is_command) getOrElse commands.head  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
212  | 
val last =  | 
| 
47012
 
0e246130486b
clarified command span classification: strict Command.is_command, permissive Command.name;
 
wenzelm 
parents: 
46969 
diff
changeset
 | 
213  | 
commands.iterator(first_undefined).  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
214  | 
dropWhile(_.newlines == 0).find(_.is_command) getOrElse commands.last  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
215  | 
val range =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
216  | 
commands.iterator(first).takeWhile(_ != last).toList ::: List(last)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
217  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
218  | 
val spans0 = parse_spans(syntax.scan(range.map(_.source).mkString))  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
219  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
220  | 
val (before_edit, spans1) =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
221  | 
if (!spans0.isEmpty && first.is_command && first.span == spans0.head)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
222  | 
(Some(first), spans0.tail)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
223  | 
else (commands.prev(first), spans0)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
224  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
225  | 
val (after_edit, spans2) =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
226  | 
if (!spans1.isEmpty && last.is_command && last.span == spans1.last)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
227  | 
(Some(last), spans1.take(spans1.length - 1))  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
228  | 
else (commands.next(last), spans1)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
229  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
230  | 
val inserted = spans2.map(span => Command(Document.new_id(), node_name, span))  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
231  | 
val new_commands =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
232  | 
commands.delete_between(before_edit, after_edit).append_after(before_edit, inserted)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
233  | 
recover_spans(syntax, node_name, new_commands)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
234  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
235  | 
case None => commands  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
236  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
237  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
238  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
239  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
240  | 
/* phase 3: full reparsing after syntax change */  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
241  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
242  | 
private def reparse_spans(  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
243  | 
syntax: Outer_Syntax,  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
244  | 
node_name: Document.Node.Name,  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
245  | 
commands: Linear_Set[Command]): Linear_Set[Command] =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
246  | 
  {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
247  | 
val cmds = commands.toList  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
248  | 
val spans1 = parse_spans(syntax.scan(cmds.map(_.source).mkString))  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
249  | 
if (cmds.map(_.span) == spans1) commands  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
250  | 
else Linear_Set(spans1.map(span => Command(Document.new_id(), node_name, span)): _*)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
251  | 
}  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
252  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
253  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
254  | 
/* main phase */  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
255  | 
|
| 43722 | 256  | 
def text_edits(  | 
| 
46942
 
f5c2d66faa04
basic support for outer syntax keywords in theory header;
 
wenzelm 
parents: 
46941 
diff
changeset
 | 
257  | 
base_syntax: Outer_Syntax,  | 
| 43722 | 258  | 
previous: Document.Version,  | 
| 
44157
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
259  | 
edits: List[Document.Edit_Text])  | 
| 
 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 
wenzelm 
parents: 
44156 
diff
changeset
 | 
260  | 
: (List[Document.Edit_Command], Document.Version) =  | 
| 38374 | 261  | 
  {
 | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
262  | 
val (syntax, reparse, nodes0, doc_edits0) = header_edits(base_syntax, previous, edits)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
263  | 
val reparse_set = reparse.toSet  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
264  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
265  | 
var nodes = nodes0  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
266  | 
val doc_edits = new mutable.ListBuffer[Document.Edit_Command]; doc_edits ++= doc_edits0  | 
| 38374 | 267  | 
|
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
268  | 
    (edits ::: reparse.map((_, Document.Node.Edits(Nil)))) foreach {
 | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
269  | 
case (name, Document.Node.Clear()) =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
270  | 
doc_edits += (name -> Document.Node.Clear())  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
271  | 
nodes += (name -> nodes(name).clear)  | 
| 38374 | 272  | 
|
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
273  | 
case (name, Document.Node.Edits(text_edits)) =>  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
274  | 
val node = nodes(name)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
275  | 
val commands0 = node.commands  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
276  | 
val commands1 = edit_text(text_edits, commands0)  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
277  | 
val commands2 = recover_spans(syntax, name, commands1) // FIXME somewhat slow  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
278  | 
val commands3 =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
279  | 
if (reparse_set.contains(name)) reparse_spans(syntax, name, commands2) // slow  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
280  | 
else commands2  | 
| 38374 | 281  | 
|
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
282  | 
val removed_commands = commands0.iterator.filter(!commands3.contains(_)).toList  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
283  | 
val inserted_commands = commands3.iterator.filter(!commands0.contains(_)).toList  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
284  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
285  | 
val cmd_edits =  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
286  | 
removed_commands.reverse.map(cmd => (commands0.prev(cmd), None)) :::  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
287  | 
inserted_commands.map(cmd => (commands3.prev(cmd), Some(cmd)))  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
288  | 
|
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
289  | 
doc_edits += (name -> Document.Node.Edits(cmd_edits))  | 
| 
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
290  | 
nodes += (name -> node.update_commands(commands3))  | 
| 38374 | 291  | 
|
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
292  | 
case (name, Document.Node.Header(_)) =>  | 
| 38374 | 293  | 
|
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
294  | 
case (name, Document.Node.Perspective(text_perspective)) =>  | 
| 
47346
 
cd3ab7625519
discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
 
wenzelm 
parents: 
47012 
diff
changeset
 | 
295  | 
val node = nodes(name)  | 
| 
 
cd3ab7625519
discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
 
wenzelm 
parents: 
47012 
diff
changeset
 | 
296  | 
val perspective = command_perspective(node, text_perspective)  | 
| 
 
cd3ab7625519
discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
 
wenzelm 
parents: 
47012 
diff
changeset
 | 
297  | 
        if (!(node.perspective same perspective)) {
 | 
| 
 
cd3ab7625519
discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
 
wenzelm 
parents: 
47012 
diff
changeset
 | 
298  | 
doc_edits += (name -> Document.Node.Perspective(perspective))  | 
| 
 
cd3ab7625519
discontinued Document.update_perspective side-entry (cf. 546adfa8a6fc) -- NB: re-assignment is always necessary due to non-monotonic cancel_execution;
 
wenzelm 
parents: 
47012 
diff
changeset
 | 
299  | 
nodes += (name -> node.update_perspective(perspective))  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
300  | 
}  | 
| 38374 | 301  | 
}  | 
| 
46946
 
acc8ebf980ca
more explicit header_edits before main text_edits;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
302  | 
(doc_edits.toList, Document.Version.make(syntax, nodes))  | 
| 38374 | 303  | 
}  | 
| 34268 | 304  | 
}  |