1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
//! Incremental parsing v2: types for edits, positions and node changes.
//!
//! This module provides efficient reparsing by reusing unchanged subtrees
use crate::parser_v2::{ParseError, ParseNode, Token};
use adze_glr_core::{Action, ParseTable};
use adze_ir::{Grammar, RuleId, StateId, SymbolId};
use std::collections::HashMap;
use std::ops::Range;
/// Edit operation on source text
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Edit {
/// Byte offset where the edit starts.
pub start_byte: usize,
/// Byte offset where the edit ended in the old text.
pub old_end_byte: usize,
/// Byte offset where the edit ends in the new text.
pub new_end_byte: usize,
/// Position where the edit starts.
pub start_position: Position,
/// Position where the edit ended in the old text.
pub old_end_position: Position,
/// Position where the edit ends in the new text.
pub new_end_position: Position,
}
/// Position in source text (line, column)
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct Position {
/// 0-based line number within the source.
pub row: usize,
/// 0-based UTF-8 column offset within `row`.
pub column: usize,
}
impl Position {
/// Creates a new [`Position`] from a 0-based `(row, column)` pair.
pub fn new(row: usize, column: usize) -> Self {
Position { row, column }
}
}
/// A reusable subtree from a previous parse
#[derive(Debug, Clone)]
pub struct ReusableNode {
/// The parse node affected by this change.
pub node: ParseNode,
/// Half-open byte range `[start, end)` in the original source covered by `node`.
pub byte_range: Range<usize>,
/// Half-open token index range `[start, end)` covered by `node`.
pub token_range: Range<usize>,
/// Whether `node` represents a parse error.
pub is_error: bool,
/// Whether `node` or any of its descendants changed relative to the previous tree.
pub has_changes: bool,
}
/// Tracks which subtrees can be reused
pub struct SubtreePool {
nodes: Vec<ReusableNode>,
by_range: HashMap<Range<usize>, usize>, // byte_range -> node index
}
impl Default for SubtreePool {
fn default() -> Self {
Self::new()
}
}
impl SubtreePool {
/// Creates an empty subtree pool.
pub fn new() -> Self {
SubtreePool {
nodes: Vec::new(),
by_range: HashMap::new(),
}
}
/// Build pool from a parse tree
pub fn build_from_tree(root: &ParseNode, tokens: &[Token]) -> Self {
let mut pool = SubtreePool::new();
pool.collect_subtrees(root, tokens, 0, 0);
pool
}
fn collect_subtrees(
&mut self,
node: &ParseNode,
tokens: &[Token],
mut byte_offset: usize,
mut token_offset: usize,
) -> (usize, usize) {
let start_byte = byte_offset;
let start_token = token_offset;
if node.children.is_empty() {
// Leaf node
if token_offset < tokens.len() {
let token = &tokens[token_offset];
byte_offset += token.text.len();
token_offset += 1;
}
} else {
// Internal node
for child in &node.children {
let (new_byte, new_token) =
self.collect_subtrees(child, tokens, byte_offset, token_offset);
byte_offset = new_byte;
token_offset = new_token;
}
}
let byte_range = start_byte..byte_offset;
let token_range = start_token..token_offset;
// Store reusable node
let reusable = ReusableNode {
node: node.clone(),
byte_range: byte_range.clone(),
token_range,
is_error: false,
has_changes: false,
};
let index = self.nodes.len();
self.nodes.push(reusable);
self.by_range.insert(byte_range, index);
(byte_offset, token_offset)
}
/// Find reusable subtrees that don't overlap with edits
pub fn find_reusable(&self, edits: &[Edit]) -> Vec<&ReusableNode> {
self.nodes
.iter()
.filter(|node| {
!edits.iter().any(|edit| {
// Check if node overlaps with edit
node.byte_range.end > edit.start_byte
&& node.byte_range.start < edit.old_end_byte
})
})
.collect()
}
/// Get a reusable node by byte range
pub fn get_by_range(&self, range: &Range<usize>) -> Option<&ReusableNode> {
self.by_range
.get(range)
.and_then(|&idx| self.nodes.get(idx))
}
}
/// Incremental parser with subtree reuse
pub struct IncrementalParserV2 {
grammar: Grammar,
table: ParseTable,
subtree_pool: SubtreePool,
}
impl IncrementalParserV2 {
/// Creates a new incremental parser backed by `grammar` and `table`.
pub fn new(grammar: Grammar, table: ParseTable) -> Self {
IncrementalParserV2 {
grammar,
table,
subtree_pool: SubtreePool::new(),
}
}
/// Parse incrementally, reusing subtrees from previous parse
pub fn parse(
&mut self,
tokens: Vec<Token>,
old_tree: Option<&ParseNode>,
edits: &[Edit],
) -> Result<ParseNode, ParseError> {
// Build subtree pool from old tree
if let Some(tree) = old_tree {
self.subtree_pool = SubtreePool::build_from_tree(tree, &tokens);
}
// Find reusable subtrees
let reusable = self.subtree_pool.find_reusable(edits);
// Parse with subtree reuse
let mut parser = IncrementalParserState::new(&self.grammar, &self.table, tokens, reusable);
parser.parse()
}
}
/// Parser state that can reuse subtrees
struct IncrementalParserState<'a> {
grammar: &'a Grammar,
table: &'a ParseTable,
tokens: Vec<Token>,
#[allow(dead_code)]
reusable: Vec<&'a ReusableNode>,
position: usize,
stack: Vec<(StateId, Option<ParseNode>)>,
reuse_queue: Vec<(usize, &'a ReusableNode)>, // (start_position, node)
}
impl<'a> IncrementalParserState<'a> {
fn new(
grammar: &'a Grammar,
table: &'a ParseTable,
tokens: Vec<Token>,
reusable: Vec<&'a ReusableNode>,
) -> Self {
// Sort reusable nodes by start position
let mut reuse_queue: Vec<_> = reusable
.into_iter()
.map(|node| (node.token_range.start, node))
.collect();
reuse_queue.sort_by_key(|(pos, _)| *pos);
IncrementalParserState {
grammar,
table,
tokens,
reusable: vec![],
position: 0,
stack: vec![(StateId(0), None)],
reuse_queue,
}
}
fn parse(&mut self) -> Result<ParseNode, ParseError> {
while self.position < self.tokens.len() {
// Check if we can reuse a subtree at current position
if let Some(reusable) = self.try_reuse_subtree() {
self.shift_subtree(reusable);
continue;
}
// Normal parsing
let token = &self.tokens[self.position];
let Some((state, _)) = self.stack.last() else {
return Err(ParseError::UnexpectedToken {
expected: vec![],
found: token.symbol,
position: self.position,
});
};
// Get action for current state and token
if let Some(actions) = self.table.action_table.get(state.0 as usize)
&& let Some(action_cell) = actions.get(token.symbol.0 as usize)
{
// Handle Vec<Action> - prefer shift over reduce for now
// TODO: Implement full GLR-aware incremental re-parse
let action = if action_cell.is_empty() {
&Action::Error
} else {
// Prefer shift actions over reduce actions for better parsing behavior
action_cell
.iter()
.find(|a| matches!(a, Action::Shift(_)))
.unwrap_or(&action_cell[0])
};
match action {
Action::Shift(next_state) => {
let node = ParseNode {
symbol: token.symbol,
rule_id: None,
children: vec![],
start_byte: token.start,
end_byte: token.end,
text: Some(token.text.clone()),
};
self.stack.push((*next_state, Some(node)));
self.position += 1;
}
Action::Reduce(rule_id) => {
self.reduce(*rule_id)?;
}
Action::Accept => {
if let Some((_, Some(node))) = self.stack.pop() {
return Ok(node);
}
}
Action::Error => {
return Err(ParseError::UnexpectedToken {
expected: vec![],
found: token.symbol,
position: self.position,
});
}
Action::Fork(_) => {
// TODO: Implement GLR fork handling
return Err(ParseError::UnexpectedToken {
expected: vec![],
found: token.symbol,
position: self.position,
});
}
_ => {
// Action is #[non_exhaustive] - required wildcard
continue;
}
}
}
}
// End of input - check for accept
if let Some((_, Some(node))) = self.stack.pop() {
Ok(node)
} else {
Err(ParseError::UnexpectedToken {
expected: vec![],
found: SymbolId(0),
position: self.position,
})
}
}
fn try_reuse_subtree(&mut self) -> Option<&'a ReusableNode> {
// Check if there's a reusable subtree at current position
while let Some(&(start_pos, node)) = self.reuse_queue.first() {
if start_pos == self.position {
self.reuse_queue.remove(0);
// Verify the subtree is still valid in current context
if self.can_reuse_subtree(node) {
return Some(node);
}
} else if start_pos > self.position {
break;
} else {
// Skip outdated entries
self.reuse_queue.remove(0);
}
}
None
}
fn can_reuse_subtree(&self, node: &ReusableNode) -> bool {
// Check if the subtree's tokens match current position
let end_pos = self.position + (node.token_range.end - node.token_range.start);
if end_pos > self.tokens.len() {
return false;
}
// Verify token match
let current_tokens = &self.tokens[self.position..end_pos];
let expected_len = node.token_range.end - node.token_range.start;
current_tokens.len() == expected_len
}
fn shift_subtree(&mut self, reusable: &'a ReusableNode) {
// Skip tokens covered by the reusable subtree
let token_count = reusable.token_range.end - reusable.token_range.start;
self.position += token_count;
// Push the reused subtree onto the stack
let Some((state, _)) = self.stack.last() else {
return;
};
// Get next state after shifting this symbol
if let Some(gotos) = self.table.goto_table.get(state.0 as usize)
&& let Some(&goto_state) = gotos.get(reusable.node.symbol.0 as usize)
{
self.stack.push((goto_state, Some(reusable.node.clone())));
}
}
fn reduce(&mut self, rule_id: RuleId) -> Result<(), ParseError> {
// Find the rule
let rule = self
.grammar
.rules
.values()
.flat_map(|rules| rules.iter())
.find(|r| r.production_id.0 == rule_id.0)
.ok_or(ParseError::UnexpectedToken {
expected: vec![],
found: SymbolId(0),
position: self.position,
})?;
let rhs_len = rule.rhs.len();
let mut children = Vec::with_capacity(rhs_len);
// Pop RHS symbols from stack
for _ in 0..rhs_len {
if let Some((_, Some(node))) = self.stack.pop() {
children.push(node);
} else {
return Err(ParseError::UnexpectedToken {
expected: vec![],
found: SymbolId(0),
position: self.position,
});
}
}
children.reverse();
// Create new node
let start_byte = children.first().map(|n| n.start_byte).unwrap_or(0);
let end_byte = children.last().map(|n| n.end_byte).unwrap_or(0);
let node = ParseNode {
symbol: rule.lhs,
rule_id: Some(rule_id),
children,
start_byte,
end_byte,
text: None,
};
// Get goto state
let Some((state, _)) = self.stack.last() else {
return Err(ParseError::UnexpectedToken {
expected: vec![],
found: SymbolId(0),
position: self.position,
});
};
if let Some(gotos) = self.table.goto_table.get(state.0 as usize) {
if let Some(&goto_state) = gotos.get(rule.lhs.0 as usize) {
self.stack.push((goto_state, Some(node)));
Ok(())
} else {
Err(ParseError::UnexpectedToken {
expected: vec![],
found: rule.lhs,
position: self.position,
})
}
} else {
Err(ParseError::UnexpectedToken {
expected: vec![],
found: rule.lhs,
position: self.position,
})
}
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_subtree_pool_construction() {
let root = ParseNode {
symbol: SymbolId(0),
rule_id: None,
children: vec![
ParseNode {
symbol: SymbolId(1),
rule_id: None,
children: vec![],
start_byte: 0,
end_byte: 5,
text: Some(b"hello".to_vec()),
},
ParseNode {
symbol: SymbolId(2),
rule_id: None,
children: vec![],
start_byte: 6,
end_byte: 11,
text: Some(b"world".to_vec()),
},
],
start_byte: 0,
end_byte: 11,
text: None,
};
let tokens = vec![
Token {
symbol: SymbolId(1),
text: b"hello".to_vec(),
start: 0,
end: 5,
},
Token {
symbol: SymbolId(2),
text: b" ".to_vec(),
start: 5,
end: 6,
},
Token {
symbol: SymbolId(3),
text: b"world".to_vec(),
start: 6,
end: 11,
},
];
let pool = SubtreePool::build_from_tree(&root, &tokens);
assert!(!pool.nodes.is_empty());
}
#[test]
fn test_edit_filtering() {
let node1 = ReusableNode {
node: ParseNode {
symbol: SymbolId(1),
rule_id: None,
children: vec![],
start_byte: 0,
end_byte: 5,
text: Some(b"hello".to_vec()),
},
byte_range: 0..5,
token_range: 0..1,
is_error: false,
has_changes: false,
};
let node2 = ReusableNode {
node: ParseNode {
symbol: SymbolId(2),
rule_id: None,
children: vec![],
start_byte: 10,
end_byte: 15,
text: Some(b"world".to_vec()),
},
byte_range: 10..15,
token_range: 2..3,
is_error: false,
has_changes: false,
};
let mut pool = SubtreePool::new();
pool.nodes.push(node1);
pool.nodes.push(node2);
// Edit in the middle (5..10)
let edits = vec![Edit {
start_byte: 5,
old_end_byte: 10,
new_end_byte: 8,
start_position: Position::new(0, 5),
old_end_position: Position::new(0, 10),
new_end_position: Position::new(0, 8),
}];
let reusable = pool.find_reusable(&edits);
assert_eq!(reusable.len(), 2); // Both nodes should be reusable
}
}