author | wenzelm |
Thu, 15 Mar 2012 11:37:56 +0100 | |
changeset 46941 | c0f776b661fa |
parent 46811 | 03a2dc9e0624 |
child 46942 | f5c2d66faa04 |
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) => |
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)) |
45644 | 71 |
spans.foreach(span => add(Command(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 |
||
44615 | 121 |
def update_perspective(nodes: Document.Nodes, |
122 |
name: Document.Node.Name, text_perspective: Text.Perspective) |
|
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
123 |
: (Command.Perspective, Option[Document.Nodes]) = |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
124 |
{ |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
125 |
val node = nodes(name) |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
126 |
val perspective = command_perspective(node, text_perspective) |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
127 |
val new_nodes = |
44474 | 128 |
if (node.perspective same perspective) None |
46680 | 129 |
else Some(nodes + (name -> node.update_perspective(perspective))) |
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
130 |
(perspective, new_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 |
|
44615 | 133 |
def edit_perspective(previous: Document.Version, |
134 |
name: Document.Node.Name, text_perspective: Text.Perspective) |
|
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
135 |
: (Command.Perspective, Document.Version) = |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
136 |
{ |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
137 |
val nodes = previous.nodes |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
138 |
val (perspective, new_nodes) = update_perspective(nodes, name, text_perspective) |
46941 | 139 |
val version = Document.Version.make(previous.syntax, new_nodes getOrElse nodes) |
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
140 |
(perspective, version) |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
141 |
} |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
142 |
|
44388 | 143 |
|
144 |
||
38374 | 145 |
/** text edits **/ |
146 |
||
43722 | 147 |
def text_edits( |
148 |
syntax: Outer_Syntax, |
|
149 |
previous: Document.Version, |
|
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
150 |
edits: List[Document.Edit_Text]) |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
151 |
: (List[Document.Edit_Command], Document.Version) = |
38374 | 152 |
{ |
153 |
/* phase 1: edit individual command source */ |
|
154 |
||
38425 | 155 |
@tailrec def edit_text(eds: List[Text.Edit], commands: Linear_Set[Command]) |
38374 | 156 |
: Linear_Set[Command] = |
157 |
{ |
|
158 |
eds match { |
|
159 |
case e :: es => |
|
160 |
Document.Node.command_starts(commands.iterator).find { |
|
161 |
case (cmd, cmd_start) => |
|
162 |
e.can_edit(cmd.source, cmd_start) || |
|
163 |
e.is_insert && e.start == cmd_start + cmd.length |
|
164 |
} match { |
|
165 |
case Some((cmd, cmd_start)) if e.can_edit(cmd.source, cmd_start) => |
|
166 |
val (rest, text) = e.edit(cmd.source, cmd_start) |
|
167 |
val new_commands = commands.insert_after(Some(cmd), Command.unparsed(text)) - cmd |
|
168 |
edit_text(rest.toList ::: es, new_commands) |
|
169 |
||
170 |
case Some((cmd, cmd_start)) => |
|
171 |
edit_text(es, commands.insert_after(Some(cmd), Command.unparsed(e.text))) |
|
172 |
||
173 |
case None => |
|
174 |
require(e.is_insert && e.start == 0) |
|
175 |
edit_text(es, commands.insert_after(None, Command.unparsed(e.text))) |
|
176 |
} |
|
177 |
case Nil => commands |
|
178 |
} |
|
179 |
} |
|
180 |
||
181 |
||
182 |
/* phase 2: recover command spans */ |
|
183 |
||
44615 | 184 |
@tailrec def recover_spans(node_name: Document.Node.Name, commands: Linear_Set[Command]) |
44607
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
wenzelm
parents:
44474
diff
changeset
|
185 |
: Linear_Set[Command] = |
38374 | 186 |
{ |
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44185
diff
changeset
|
187 |
commands.iterator.find(cmd => !cmd.is_defined) match { |
38374 | 188 |
case Some(first_unparsed) => |
189 |
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
|
190 |
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
|
191 |
dropWhile(_.newlines == 0).find(_.is_command) getOrElse commands.head |
38374 | 192 |
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
|
193 |
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
|
194 |
dropWhile(_.newlines == 0).find(_.is_command) getOrElse commands.last |
38374 | 195 |
val range = |
196 |
commands.iterator(first).takeWhile(_ != last).toList ::: List(last) |
|
197 |
||
198 |
val sources = range.flatMap(_.span.map(_.source)) |
|
43647 | 199 |
val spans0 = parse_spans(syntax.scan(sources.mkString)) |
38374 | 200 |
|
201 |
val (before_edit, spans1) = |
|
202 |
if (!spans0.isEmpty && first.is_command && first.span == spans0.head) |
|
203 |
(Some(first), spans0.tail) |
|
204 |
else (commands.prev(first), spans0) |
|
205 |
||
206 |
val (after_edit, spans2) = |
|
207 |
if (!spans1.isEmpty && last.is_command && last.span == spans1.last) |
|
208 |
(Some(last), spans1.take(spans1.length - 1)) |
|
209 |
else (commands.next(last), spans1) |
|
210 |
||
45644 | 211 |
val inserted = spans2.map(span => Command(Document.new_id(), node_name, span)) |
38374 | 212 |
val new_commands = |
213 |
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
|
214 |
recover_spans(node_name, new_commands) |
38374 | 215 |
|
216 |
case None => commands |
|
217 |
} |
|
218 |
} |
|
219 |
||
220 |
||
221 |
/* resulting document edits */ |
|
222 |
||
223 |
{ |
|
40479 | 224 |
val doc_edits = new mutable.ListBuffer[Document.Edit_Command] |
38417 | 225 |
var nodes = previous.nodes |
38374 | 226 |
|
40478
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
wenzelm
parents:
40457
diff
changeset
|
227 |
edits foreach { |
44185 | 228 |
case (name, Document.Node.Clear()) => |
229 |
doc_edits += (name -> Document.Node.Clear()) |
|
44443
35d67b2056cc
clarified Document.Node.clear -- retain header (cf. ML version);
wenzelm
parents:
44436
diff
changeset
|
230 |
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
|
231 |
|
44156 | 232 |
case (name, Document.Node.Edits(text_edits)) => |
43697
77ce24aa1770
explicit Document.Node.Header, with master_dir and thy_name;
wenzelm
parents:
43662
diff
changeset
|
233 |
val node = nodes(name) |
77ce24aa1770
explicit Document.Node.Header, with master_dir and thy_name;
wenzelm
parents:
43662
diff
changeset
|
234 |
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
|
235 |
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
|
236 |
val commands2 = recover_spans(name, commands1) // FIXME somewhat slow |
38374 | 237 |
|
40478
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
wenzelm
parents:
40457
diff
changeset
|
238 |
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
|
239 |
val inserted_commands = commands2.iterator.filter(!commands0.contains(_)).toList |
38374 | 240 |
|
40478
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
wenzelm
parents:
40457
diff
changeset
|
241 |
val cmd_edits = |
4bae781b8f7c
replaced Document.Node_Text_Edit by Document.Text_Edit, with treatment of deleted nodes;
wenzelm
parents:
40457
diff
changeset
|
242 |
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
|
243 |
inserted_commands.map(cmd => (commands2.prev(cmd), Some(cmd))) |
38374 | 244 |
|
44156 | 245 |
doc_edits += (name -> Document.Node.Edits(cmd_edits)) |
46680 | 246 |
nodes += (name -> node.update_commands(commands2)) |
43722 | 247 |
|
44182 | 248 |
case (name, Document.Node.Header(header)) => |
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
249 |
val node = nodes(name) |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
250 |
val update_header = |
44182 | 251 |
(node.header, header) match { |
46749 | 252 |
case (Exn.Res(deps0), Exn.Res(deps)) => deps0 != deps |
44160
8848867501fb
clarified document model header: master_dir (native wrt. editor, potentially URL) and node_name (full canonical path);
wenzelm
parents:
44157
diff
changeset
|
253 |
case _ => true |
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
254 |
} |
44180 | 255 |
if (update_header) { |
44182 | 256 |
doc_edits += (name -> Document.Node.Header(header)) |
46680 | 257 |
nodes += (name -> node.update_header(header)) |
44180 | 258 |
} |
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44185
diff
changeset
|
259 |
|
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44185
diff
changeset
|
260 |
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
|
261 |
update_perspective(nodes, name, text_perspective) match { |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
262 |
case (_, None) => |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
263 |
case (perspective, Some(nodes1)) => |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
264 |
doc_edits += (name -> Document.Node.Perspective(perspective)) |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
265 |
nodes = nodes1 |
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44185
diff
changeset
|
266 |
} |
38374 | 267 |
} |
46941 | 268 |
(doc_edits.toList, Document.Version.make(syntax, nodes)) |
38374 | 269 |
} |
270 |
} |
|
34268 | 271 |
} |