author | wenzelm |
Tue, 08 Apr 2014 20:03:00 +0200 | |
changeset 56473 | 5b5c750e9763 |
parent 56394 | bbf4d512f395 |
child 57625 | 2a9d8dcea893 |
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])] = |
54515 | 36 |
List((0, node_name.toString, 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)) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54518
diff
changeset
|
71 |
spans.foreach(span => add(Command(Document_ID.none, node_name, Nil, 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 |
||
52535
b7badd371e4d
tuned signature -- eliminated pointless type synonym;
wenzelm
parents:
52530
diff
changeset
|
80 |
def parse_spans(toks: List[Token]): List[List[Token]] = |
34268 | 81 |
{ |
52535
b7badd371e4d
tuned signature -- eliminated pointless type synonym;
wenzelm
parents:
52530
diff
changeset
|
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] |
53843
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
84 |
val improper = new mutable.ListBuffer[Token] |
34268 | 85 |
|
53843
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
86 |
def flush() |
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
87 |
{ |
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
88 |
if (!span.isEmpty) { result += span.toList; span.clear } |
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
89 |
if (!improper.isEmpty) { result += improper.toList; improper.clear } |
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
90 |
} |
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
91 |
for (tok <- toks) { |
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
92 |
if (tok.is_command) { flush(); span += tok } |
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
93 |
else if (tok.is_improper) improper += tok |
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
94 |
else { span ++= improper; improper.clear; span += tok } |
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
95 |
} |
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
|
96 |
flush() |
53843
88c6e630c15f
clarified command spans (again, see also 03a2dc9e0624): restrict to proper range to allow Isabelle.command_edit adding material monotonically without destroying the command (e.g. relevant for sendback from sledgehammer);
wenzelm
parents:
52901
diff
changeset
|
97 |
|
38239
89a4d1028fb3
parse_spans: somewhat faster low-level implementation;
wenzelm
parents:
36956
diff
changeset
|
98 |
result.toList |
34268 | 99 |
} |
38374 | 100 |
|
101 |
||
102 |
||
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44388
diff
changeset
|
103 |
/** perspective **/ |
44388 | 104 |
|
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
105 |
def command_perspective( |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
106 |
node: Document.Node, |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
107 |
perspective: Text.Perspective, |
52887 | 108 |
overlays: Document.Node.Overlays): (Command.Perspective, Command.Perspective) = |
44388 | 109 |
{ |
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
110 |
if (perspective.is_empty && overlays.is_empty) |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
111 |
(Command.Perspective.empty, Command.Perspective.empty) |
44388 | 112 |
else { |
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
113 |
val has_overlay = overlays.commands |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
114 |
val visible = new mutable.ListBuffer[Command] |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
115 |
val visible_overlay = new mutable.ListBuffer[Command] |
44388 | 116 |
@tailrec |
117 |
def check_ranges(ranges: List[Text.Range], commands: Stream[(Command, Text.Offset)]) |
|
118 |
{ |
|
119 |
(ranges, commands) match { |
|
120 |
case (range :: more_ranges, (command, offset) #:: more_commands) => |
|
121 |
val command_range = command.range + offset |
|
122 |
range compare command_range match { |
|
123 |
case 0 => |
|
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
124 |
visible += command |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
125 |
visible_overlay += command |
44388 | 126 |
check_ranges(ranges, more_commands) |
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
127 |
case c => |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
128 |
if (has_overlay(command)) visible_overlay += command |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
129 |
|
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
130 |
if (c < 0) check_ranges(more_ranges, commands) |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
131 |
else check_ranges(ranges, more_commands) |
44388 | 132 |
} |
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
133 |
|
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
134 |
case (Nil, (command, _) #:: more_commands) => |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
135 |
if (has_overlay(command)) visible_overlay += command |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
136 |
|
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
137 |
check_ranges(Nil, more_commands) |
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
138 |
|
44388 | 139 |
case _ => |
140 |
} |
|
141 |
} |
|
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
142 |
|
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
143 |
val commands = |
56373
0605d90be6fc
tuned signature -- more explicit iterator terminology;
wenzelm
parents:
56372
diff
changeset
|
144 |
(if (overlays.is_empty) node.command_iterator(perspective.range) |
0605d90be6fc
tuned signature -- more explicit iterator terminology;
wenzelm
parents:
56372
diff
changeset
|
145 |
else node.command_iterator()).toStream |
0605d90be6fc
tuned signature -- more explicit iterator terminology;
wenzelm
parents:
56372
diff
changeset
|
146 |
check_ranges(perspective.ranges, commands) |
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
147 |
(Command.Perspective(visible.toList), Command.Perspective(visible_overlay.toList)) |
44388 | 148 |
} |
149 |
} |
|
150 |
||
151 |
||
152 |
||
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
153 |
/** header edits: structure and outer syntax **/ |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
154 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
155 |
private def header_edits( |
56394
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
156 |
resources: Resources, |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
157 |
previous: Document.Version, |
55134
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
wenzelm
parents:
55118
diff
changeset
|
158 |
edits: List[Document.Edit_Text]): |
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56373
diff
changeset
|
159 |
(Prover.Syntax, Boolean, Boolean, List[Document.Node.Name], Document.Nodes, |
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
160 |
List[Document.Edit_Command]) = |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
161 |
{ |
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
|
162 |
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
|
163 |
var updated_keywords = false |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
164 |
var nodes = previous.nodes |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
165 |
val doc_edits = new mutable.ListBuffer[Document.Edit_Command] |
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 |
edits foreach { |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
168 |
case (name, Document.Node.Deps(header)) => |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
169 |
val node = nodes(name) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
170 |
val update_header = |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
171 |
!node.header.errors.isEmpty || !header.errors.isEmpty || node.header != header |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
172 |
if (update_header) { |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
173 |
val node1 = node.update_header(header) |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
174 |
updated_imports = updated_imports || (node.header.imports != node1.header.imports) |
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
175 |
updated_keywords = updated_keywords || (node.header.keywords != node1.header.keywords) |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
176 |
nodes += (name -> node1) |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
48706
diff
changeset
|
177 |
doc_edits += (name -> Document.Node.Deps(header)) |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
178 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
179 |
case _ => |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
180 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
181 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
182 |
val (syntax, syntax_changed) = |
56394
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
183 |
previous.syntax match { |
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
184 |
case Some(syntax) if !updated_keywords => |
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
185 |
(syntax, false) |
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
186 |
case _ => |
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
187 |
val syntax = |
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
188 |
(resources.base_syntax /: nodes.iterator) { |
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
189 |
case (syn, (_, node)) => syn.add_keywords(node.header.keywords) |
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
190 |
} |
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
191 |
(syntax, true) |
55134
1b67b17cdad5
propagate update of outer syntax keywords: global propertiesChanged, buffer TokenMarker.markTokens, text area repainting;
wenzelm
parents:
55118
diff
changeset
|
192 |
} |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
193 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
194 |
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
|
195 |
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
|
196 |
nodes.descendants(doc_edits.iterator.map(_._1).toList) |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
197 |
else Nil |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
198 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
199 |
(syntax, syntax_changed, updated_imports, reparse, nodes, doc_edits.toList) |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
200 |
} |
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 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
203 |
|
38374 | 204 |
/** text edits **/ |
205 |
||
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
206 |
/* edit individual command source */ |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
207 |
|
50761 | 208 |
@tailrec def edit_text(eds: List[Text.Edit], commands: Linear_Set[Command]): Linear_Set[Command] = |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
209 |
{ |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
210 |
eds match { |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
211 |
case e :: es => |
52901
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
wenzelm
parents:
52887
diff
changeset
|
212 |
Document.Node.Commands.starts(commands.iterator).find { |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
213 |
case (cmd, cmd_start) => |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
214 |
e.can_edit(cmd.source, cmd_start) || |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
215 |
e.is_insert && e.start == cmd_start + cmd.length |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
216 |
} match { |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
217 |
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
|
218 |
val (rest, text) = e.edit(cmd.source, cmd_start) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
219 |
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
|
220 |
edit_text(rest.toList ::: es, new_commands) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
221 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
222 |
case Some((cmd, cmd_start)) => |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
223 |
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
|
224 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
225 |
case None => |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
226 |
require(e.is_insert && e.start == 0) |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
227 |
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
|
228 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
229 |
case Nil => commands |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
230 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
231 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
232 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
233 |
|
54513 | 234 |
/* inlined files */ |
235 |
||
236 |
private def find_file(tokens: List[Token]): Option[String] = |
|
237 |
{ |
|
238 |
def clean(toks: List[Token]): List[Token] = |
|
239 |
toks match { |
|
240 |
case t :: _ :: ts if t.is_keyword && (t.source == "%" || t.source == "--") => clean(ts) |
|
241 |
case t :: ts => t :: clean(ts) |
|
242 |
case Nil => Nil |
|
243 |
} |
|
55118
7df949045dc5
clarified approximative syntax of thy_load commands: first name after command keyword, after cleaning wrt. tags and cmts;
wenzelm
parents:
54562
diff
changeset
|
244 |
clean(tokens.filter(_.is_proper)) match { |
7df949045dc5
clarified approximative syntax of thy_load commands: first name after command keyword, after cleaning wrt. tags and cmts;
wenzelm
parents:
54562
diff
changeset
|
245 |
case tok :: toks if tok.is_command => toks.find(_.is_name).map(_.content) |
7df949045dc5
clarified approximative syntax of thy_load commands: first name after command keyword, after cleaning wrt. tags and cmts;
wenzelm
parents:
54562
diff
changeset
|
246 |
case _ => None |
7df949045dc5
clarified approximative syntax of thy_load commands: first name after command keyword, after cleaning wrt. tags and cmts;
wenzelm
parents:
54562
diff
changeset
|
247 |
} |
54513 | 248 |
} |
249 |
||
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56373
diff
changeset
|
250 |
def span_files(syntax: Prover.Syntax, span: List[Token]): List[String] = |
56314 | 251 |
syntax.load(span) match { |
54513 | 252 |
case Some(exts) => |
253 |
find_file(span) match { |
|
254 |
case Some(file) => |
|
255 |
if (exts.isEmpty) List(file) |
|
256 |
else exts.map(ext => file + "." + ext) |
|
257 |
case None => Nil |
|
258 |
} |
|
259 |
case None => Nil |
|
260 |
} |
|
261 |
||
262 |
def resolve_files( |
|
56208 | 263 |
resources: Resources, |
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56373
diff
changeset
|
264 |
syntax: Prover.Syntax, |
54517 | 265 |
node_name: Document.Node.Name, |
266 |
span: List[Token], |
|
56336 | 267 |
get_blob: Document.Node.Name => Option[Document.Blob]) |
54519
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents:
54518
diff
changeset
|
268 |
: List[Command.Blob] = |
54513 | 269 |
{ |
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55134
diff
changeset
|
270 |
span_files(syntax, span).map(file_name => |
54517 | 271 |
Exn.capture { |
272 |
val name = |
|
56208 | 273 |
Document.Node.Name(resources.append(node_name.master_dir, Path.explode(file_name))) |
56473 | 274 |
val blob = get_blob(name).map(blob => ((blob.bytes.sha1_digest, blob.chunk))) |
55431
e0f20a44ff9d
common Command.Chunk for command source and auxiliary files (static Symbol.Index without actual String content);
wenzelm
parents:
55134
diff
changeset
|
275 |
(name, blob) |
55783 | 276 |
}) |
54513 | 277 |
} |
278 |
||
279 |
||
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
280 |
/* reparse range of command spans */ |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
281 |
|
48748
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents:
48747
diff
changeset
|
282 |
@tailrec private def chop_common( |
55779 | 283 |
cmds: List[Command], |
284 |
blobs_spans: List[(List[Command.Blob], List[Token])]) |
|
285 |
: (List[Command], List[(List[Command.Blob], List[Token])]) = |
|
286 |
{ |
|
287 |
(cmds, blobs_spans) match { |
|
288 |
case (cmd :: cmds, (blobs, span) :: rest) if cmd.blobs == blobs && cmd.span == span => |
|
289 |
chop_common(cmds, rest) |
|
290 |
case _ => (cmds, blobs_spans) |
|
48748
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents:
48747
diff
changeset
|
291 |
} |
55779 | 292 |
} |
48748
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents:
48747
diff
changeset
|
293 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
294 |
private def reparse_spans( |
56208 | 295 |
resources: Resources, |
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56373
diff
changeset
|
296 |
syntax: Prover.Syntax, |
56336 | 297 |
get_blob: Document.Node.Name => Option[Document.Blob], |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
298 |
name: Document.Node.Name, |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
299 |
commands: Linear_Set[Command], |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
300 |
first: Command, last: Command): Linear_Set[Command] = |
48748
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents:
48747
diff
changeset
|
301 |
{ |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
302 |
val cmds0 = commands.iterator(first, last).toList |
55779 | 303 |
val blobs_spans0 = |
54513 | 304 |
parse_spans(syntax.scan(cmds0.iterator.map(_.source).mkString)). |
56336 | 305 |
map(span => (resolve_files(resources, syntax, name, span, get_blob), span)) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
306 |
|
55779 | 307 |
val (cmds1, blobs_spans1) = chop_common(cmds0, blobs_spans0) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
308 |
|
55779 | 309 |
val (rev_cmds2, rev_blobs_spans2) = chop_common(cmds1.reverse, blobs_spans1.reverse) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
310 |
val cmds2 = rev_cmds2.reverse |
55779 | 311 |
val blobs_spans2 = rev_blobs_spans2.reverse |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
312 |
|
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
313 |
cmds2 match { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
314 |
case Nil => |
55779 | 315 |
assert(blobs_spans2.isEmpty) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
316 |
commands |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
317 |
case cmd :: _ => |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
318 |
val hook = commands.prev(cmd) |
54462 | 319 |
val inserted = |
55779 | 320 |
blobs_spans2.map({ case (blobs, span) => Command(Document_ID.make(), name, blobs, span) }) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
321 |
(commands /: cmds2)(_ - _).append_after(hook, inserted) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
322 |
} |
48748
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents:
48747
diff
changeset
|
323 |
} |
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents:
48747
diff
changeset
|
324 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
325 |
|
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
326 |
/* recover command spans after edits */ |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
327 |
|
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
328 |
// FIXME somewhat slow |
48746
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
wenzelm
parents:
48718
diff
changeset
|
329 |
private def recover_spans( |
56208 | 330 |
resources: Resources, |
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56373
diff
changeset
|
331 |
syntax: Prover.Syntax, |
56336 | 332 |
get_blob: Document.Node.Name => Option[Document.Blob], |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
333 |
name: Document.Node.Name, |
48748
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents:
48747
diff
changeset
|
334 |
perspective: Command.Perspective, |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
335 |
commands: Linear_Set[Command]): Linear_Set[Command] = |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
336 |
{ |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
337 |
val visible = perspective.commands.toSet |
48748
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
wenzelm
parents:
48747
diff
changeset
|
338 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
339 |
def next_invisible_command(cmds: Linear_Set[Command], from: Command): Command = |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
340 |
cmds.iterator(from).dropWhile(cmd => !cmd.is_command || visible(cmd)) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
341 |
.find(_.is_command) getOrElse cmds.last |
48746
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
wenzelm
parents:
48718
diff
changeset
|
342 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
343 |
@tailrec def recover(cmds: Linear_Set[Command]): Linear_Set[Command] = |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
344 |
cmds.find(_.is_unparsed) match { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
345 |
case Some(first_unparsed) => |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
346 |
val first = next_invisible_command(cmds.reverse, first_unparsed) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
347 |
val last = next_invisible_command(cmds, first_unparsed) |
56336 | 348 |
recover(reparse_spans(resources, syntax, get_blob, name, cmds, first, last)) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
349 |
case None => cmds |
48746
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
wenzelm
parents:
48718
diff
changeset
|
350 |
} |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
351 |
recover(commands) |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
352 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
353 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
354 |
|
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
355 |
/* consolidate unfinished spans */ |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
356 |
|
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
357 |
private def consolidate_spans( |
56208 | 358 |
resources: Resources, |
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56373
diff
changeset
|
359 |
syntax: Prover.Syntax, |
56336 | 360 |
get_blob: Document.Node.Name => Option[Document.Blob], |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
361 |
reparse_limit: Int, |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
362 |
name: Document.Node.Name, |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
363 |
perspective: Command.Perspective, |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
364 |
commands: Linear_Set[Command]): Linear_Set[Command] = |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
365 |
{ |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
366 |
if (perspective.commands.isEmpty) commands |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
367 |
else { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
368 |
commands.find(_.is_unfinished) match { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
369 |
case Some(first_unfinished) => |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
370 |
val visible = perspective.commands.toSet |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
371 |
commands.reverse.find(visible) match { |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
372 |
case Some(last_visible) => |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
373 |
val it = commands.iterator(last_visible) |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
374 |
var last = last_visible |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
375 |
var i = 0 |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
376 |
while (i < reparse_limit && it.hasNext) { |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
377 |
last = it.next |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
378 |
i += last.length |
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
379 |
} |
56336 | 380 |
reparse_spans(resources, syntax, get_blob, name, commands, first_unfinished, last) |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
381 |
case None => commands |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
382 |
} |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
383 |
case None => commands |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
384 |
} |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
385 |
} |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
386 |
} |
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
387 |
|
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
388 |
|
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
389 |
/* main */ |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
390 |
|
50761 | 391 |
def diff_commands(old_cmds: Linear_Set[Command], new_cmds: Linear_Set[Command]) |
52849 | 392 |
: List[Command.Edit] = |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
393 |
{ |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
394 |
val removed = old_cmds.iterator.filter(!new_cmds.contains(_)).toList |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
395 |
val inserted = new_cmds.iterator.filter(!old_cmds.contains(_)).toList |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
396 |
|
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
397 |
removed.reverse.map(cmd => (old_cmds.prev(cmd), None)) ::: |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
398 |
inserted.map(cmd => (new_cmds.prev(cmd), Some(cmd))) |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
399 |
} |
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
400 |
|
54513 | 401 |
private def text_edit( |
56208 | 402 |
resources: Resources, |
56393
22f533e6a049
more abstract Prover.Syntax, as proposed by Carst Tankink;
wenzelm
parents:
56373
diff
changeset
|
403 |
syntax: Prover.Syntax, |
56336 | 404 |
get_blob: Document.Node.Name => Option[Document.Blob], |
54513 | 405 |
reparse_limit: Int, |
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
406 |
node: Document.Node, edit: Document.Edit_Text): Document.Node = |
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
407 |
{ |
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
408 |
edit match { |
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
409 |
case (_, Document.Node.Clear()) => node.clear |
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
410 |
|
56335
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents:
56316
diff
changeset
|
411 |
case (_, Document.Node.Blob(blob)) => node.init_blob(blob) |
54562
301a721af68b
clarified node edits sent to prover -- Clear/Blob only required for text edits within editor;
wenzelm
parents:
54524
diff
changeset
|
412 |
|
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
413 |
case (name, Document.Node.Edits(text_edits)) => |
56335
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents:
56316
diff
changeset
|
414 |
if (name.is_theory) { |
55435
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
wenzelm
parents:
55431
diff
changeset
|
415 |
val commands0 = node.commands |
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
wenzelm
parents:
55431
diff
changeset
|
416 |
val commands1 = edit_text(text_edits, commands0) |
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
wenzelm
parents:
55431
diff
changeset
|
417 |
val commands2 = |
56336 | 418 |
recover_spans(resources, syntax, get_blob, name, node.perspective.visible, commands1) |
55435
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
wenzelm
parents:
55431
diff
changeset
|
419 |
node.update_commands(commands2) |
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
wenzelm
parents:
55431
diff
changeset
|
420 |
} |
56335
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
wenzelm
parents:
56316
diff
changeset
|
421 |
else node |
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
422 |
|
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
423 |
case (_, Document.Node.Deps(_)) => node |
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
424 |
|
52849 | 425 |
case (name, Document.Node.Perspective(required, text_perspective, overlays)) => |
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
426 |
val (visible, visible_overlay) = command_perspective(node, text_perspective, overlays) |
52849 | 427 |
val perspective: Document.Node.Perspective_Command = |
52861
e93d73b51fd0
commands with overlay remain visible, to avoid loosing printed output;
wenzelm
parents:
52849
diff
changeset
|
428 |
Document.Node.Perspective(required, visible_overlay, overlays) |
52808
143f225e50f5
allow explicit indication of required node: full eval, no prints;
wenzelm
parents:
52535
diff
changeset
|
429 |
if (node.same_perspective(perspective)) node |
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
430 |
else |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
431 |
node.update_perspective(perspective).update_commands( |
56336 | 432 |
consolidate_spans(resources, syntax, get_blob, reparse_limit, |
54517 | 433 |
name, visible, node.commands)) |
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
434 |
} |
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
435 |
} |
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48754
diff
changeset
|
436 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
437 |
def parse_change( |
56208 | 438 |
resources: Resources, |
49524
68796a77c42b
Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents:
49414
diff
changeset
|
439 |
reparse_limit: Int, |
43722 | 440 |
previous: Document.Version, |
54521
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
wenzelm
parents:
54519
diff
changeset
|
441 |
doc_blobs: Document.Blobs, |
56315 | 442 |
edits: List[Document.Edit_Text]): Session.Change = |
38374 | 443 |
{ |
56336 | 444 |
def get_blob(name: Document.Node.Name) = |
445 |
doc_blobs.get(name) orElse previous.nodes(name).get_blob |
|
446 |
||
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
447 |
val (syntax, syntax_changed, deps_changed, reparse0, nodes0, doc_edits0) = |
56394
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
448 |
header_edits(resources, previous, edits) |
54518
81a9a54c57fc
always reparse nodes with thy_load commands, to update inlined files;
wenzelm
parents:
54517
diff
changeset
|
449 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
450 |
val (doc_edits, version) = |
56394
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
451 |
if (edits.isEmpty) (Nil, Document.Version.make(Some(syntax), previous.nodes)) |
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
452 |
else { |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
453 |
val reparse = |
56372
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
wenzelm
parents:
56336
diff
changeset
|
454 |
(reparse0 /: nodes0.iterator)({ |
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
455 |
case (reparse, (name, node)) => |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
456 |
if (node.load_commands.exists(_.blobs_changed(doc_blobs))) |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
457 |
name :: reparse |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
458 |
else reparse |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
459 |
}) |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
460 |
val reparse_set = reparse.toSet |
46946
acc8ebf980ca
more explicit header_edits before main text_edits;
wenzelm
parents:
46942
diff
changeset
|
461 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
462 |
var nodes = nodes0 |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
463 |
val doc_edits = new mutable.ListBuffer[Document.Edit_Command]; doc_edits ++= doc_edits0 |
54521
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
wenzelm
parents:
54519
diff
changeset
|
464 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
465 |
val node_edits = |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
466 |
(edits ::: reparse.map((_, Document.Node.Edits(Nil)))).groupBy(_._1) |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
467 |
.asInstanceOf[Map[Document.Node.Name, List[Document.Edit_Text]]] // FIXME ??? |
38374 | 468 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
469 |
node_edits foreach { |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
470 |
case (name, edits) => |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
471 |
val node = nodes(name) |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
472 |
val commands = node.commands |
48754
c2c1e5944536
clarified undefined, unparsed, unfinished command spans;
wenzelm
parents:
48748
diff
changeset
|
473 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
474 |
val node1 = |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
475 |
if (reparse_set(name) && !commands.isEmpty) |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
476 |
node.update_commands( |
56336 | 477 |
reparse_spans(resources, syntax, get_blob, |
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
478 |
name, commands, commands.head, commands.last)) |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
479 |
else node |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
480 |
val node2 = |
56336 | 481 |
(node1 /: edits)(text_edit(resources, syntax, get_blob, reparse_limit, _, _)) |
54521
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
wenzelm
parents:
54519
diff
changeset
|
482 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
483 |
if (!(node.same_perspective(node2.perspective))) |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
484 |
doc_edits += (name -> node2.perspective) |
54521
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
wenzelm
parents:
54519
diff
changeset
|
485 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
486 |
doc_edits += (name -> Document.Node.Edits(diff_commands(commands, node2.commands))) |
54521
744ea0025e11
clarified Document.Blobs environment vs. actual edits of auxiliary files;
wenzelm
parents:
54519
diff
changeset
|
487 |
|
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
488 |
nodes += (name -> node2) |
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
489 |
} |
56394
bbf4d512f395
clarified Version.syntax -- avoid guessing initial situation;
wenzelm
parents:
56393
diff
changeset
|
490 |
(doc_edits.toList, Document.Version.make(Some(syntax), nodes)) |
54513 | 491 |
} |
492 |
||
56316
b1cf8ddc2e04
propagate deps_changed, to resolve missing files without requiring jEdit events (e.g. buffer load/save);
wenzelm
parents:
56315
diff
changeset
|
493 |
Session.Change(previous, doc_blobs, syntax_changed, deps_changed, doc_edits, version) |
38374 | 494 |
} |
34268 | 495 |
} |