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
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
//! Tree builder from parse events.
use std::borrow::Cow;
use styx_parse::{Event, ParseErrorKind, Span};
use crate::value::{Entry, Object, Payload, Scalar, Sequence, Tag, Value};
/// Error during tree building.
#[derive(Debug, Clone, PartialEq)]
pub enum BuildError {
/// Unexpected event during building.
UnexpectedEvent(String),
/// Unclosed structure.
UnclosedStructure,
/// Empty document.
EmptyDocument,
/// Parse error from the lexer/parser.
Parse(ParseErrorKind, Span),
}
impl std::fmt::Display for BuildError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
BuildError::UnexpectedEvent(msg) => write!(f, "unexpected event: {}", msg),
BuildError::UnclosedStructure => write!(f, "unclosed structure"),
BuildError::EmptyDocument => write!(f, "empty document"),
BuildError::Parse(kind, span) => {
write!(f, "parse error at {}-{}: {}", span.start, span.end, kind)
}
}
}
}
impl std::error::Error for BuildError {}
impl BuildError {
/// If this is a parse error, return it as a `ParseError` for diagnostic rendering.
pub fn as_parse_error(&self) -> Option<crate::diagnostic::ParseError> {
match self {
BuildError::Parse(kind, span) => {
Some(crate::diagnostic::ParseError::new(kind.clone(), *span))
}
_ => None,
}
}
}
/// Builder that constructs a tree from parse events.
pub struct TreeBuilder {
stack: Vec<BuilderFrame>,
root_entries: Vec<Entry>,
pending_doc_comment: Option<String>,
errors: Vec<(ParseErrorKind, Span)>,
}
enum BuilderFrame {
Object {
entries: Vec<Entry>,
span: Span,
pending_doc_comment: Option<String>,
},
Sequence {
items: Vec<Value>,
span: Span,
},
Tag {
name: String,
span: Span,
},
Entry {
key: Option<Value>,
doc_comment: Option<String>,
},
}
impl TreeBuilder {
/// Create a new tree builder.
pub fn new() -> Self {
Self {
stack: Vec::new(),
root_entries: Vec::new(),
pending_doc_comment: None,
errors: Vec::new(),
}
}
/// Finish building and return the root value.
pub fn finish(self) -> Result<Value, BuildError> {
// Return the first error if any occurred during parsing
if let Some((kind, span)) = self.errors.into_iter().next() {
return Err(BuildError::Parse(kind, span));
}
if !self.stack.is_empty() {
return Err(BuildError::UnclosedStructure);
}
// Root is always an implicit object (no tag)
Ok(Value {
tag: None,
payload: Some(Payload::Object(Object {
entries: self.root_entries,
span: None,
})),
span: None,
})
}
/// Push a value to the current context.
fn push_value(&mut self, value: Value) {
// First, check if we're in a Tag frame - if so, the value becomes the tag's payload
if let Some(BuilderFrame::Tag { .. }) = self.stack.last() {
// Pop the tag frame
if let Some(BuilderFrame::Tag { name, span }) = self.stack.pop() {
// Create tagged value: the tag wraps the value's payload
let tagged = Value {
tag: Some(Tag {
name,
span: Some(span),
}),
payload: value.payload,
span: value.span,
};
// Recursively push the tagged value
self.push_value(tagged);
}
return;
}
// Check if we're in an Entry frame with a key - if so, this value completes the entry
if let Some(BuilderFrame::Entry { key: Some(_), .. }) = self.stack.last() {
// Pop the entry frame and add the complete entry to parent
if let Some(BuilderFrame::Entry { key, doc_comment }) = self.stack.pop() {
let key_val = key.unwrap();
match self.stack.last_mut() {
Some(BuilderFrame::Object { entries, .. }) => {
entries.push(Entry {
key: key_val,
value,
doc_comment,
});
}
_ => {
self.root_entries.push(Entry {
key: key_val,
value,
doc_comment,
});
}
}
// Re-push an empty entry frame for potential continuation
self.stack.push(BuilderFrame::Entry {
key: None,
doc_comment: None,
});
}
return;
}
match self.stack.last_mut() {
Some(BuilderFrame::Object {
entries,
pending_doc_comment,
..
}) => {
// Value for an entry without explicit key - use unit key
entries.push(Entry {
key: Value::unit(),
value,
doc_comment: pending_doc_comment.take(),
});
}
Some(BuilderFrame::Sequence { items, .. }) => {
items.push(value);
}
Some(BuilderFrame::Tag { .. }) => {
// Already handled above
unreachable!()
}
Some(BuilderFrame::Entry { key, .. }) => {
if key.is_none() {
// This is the key
*key = Some(value);
}
}
None => {
// Root level - treat as entry in implicit object
self.root_entries.push(Entry {
key: Value::unit(),
value,
doc_comment: self.pending_doc_comment.take(),
});
}
}
}
}
impl Default for TreeBuilder {
fn default() -> Self {
Self::new()
}
}
impl TreeBuilder {
/// Process a parse event.
pub fn event(&mut self, event: Event<'_>) {
let span = event.span;
match event.kind {
styx_parse::EventKind::DocumentStart | styx_parse::EventKind::DocumentEnd => {
// No-op for tree building
}
styx_parse::EventKind::ObjectStart => {
self.stack.push(BuilderFrame::Object {
entries: Vec::new(),
span,
pending_doc_comment: None,
});
}
styx_parse::EventKind::ObjectEnd => {
if let Some(BuilderFrame::Object {
entries,
span: start_span,
..
}) = self.stack.pop()
{
// If stack is now empty, this is the root object
if self.stack.is_empty() {
self.root_entries = entries;
} else {
let obj = Value {
tag: None,
payload: Some(Payload::Object(Object {
entries,
span: Some(Span {
start: start_span.start,
end: span.end,
}),
})),
span: Some(Span {
start: start_span.start,
end: span.end,
}),
};
self.push_value(obj);
}
}
}
styx_parse::EventKind::SequenceStart => {
self.stack.push(BuilderFrame::Sequence {
items: Vec::new(),
span,
});
}
styx_parse::EventKind::SequenceEnd => {
if let Some(BuilderFrame::Sequence {
items,
span: start_span,
}) = self.stack.pop()
{
let seq = Value {
tag: None,
payload: Some(Payload::Sequence(Sequence {
items,
span: Some(Span {
start: start_span.start,
end: span.end,
}),
})),
span: Some(Span {
start: start_span.start,
end: span.end,
}),
};
self.push_value(seq);
}
}
styx_parse::EventKind::EntryStart => {
let doc_comment = match self.stack.last_mut() {
Some(BuilderFrame::Object {
pending_doc_comment,
..
}) => pending_doc_comment.take(),
_ => self.pending_doc_comment.take(),
};
self.stack.push(BuilderFrame::Entry {
key: None,
doc_comment,
});
}
styx_parse::EventKind::EntryEnd => {
if let Some(BuilderFrame::Entry { key, doc_comment }) = self.stack.pop()
&& let Some(key) = key
{
// We have a key but might not have a value yet
match self.stack.last_mut() {
Some(BuilderFrame::Object { entries, .. }) => {
// Check if last entry needs this key
if let Some(last) = entries.last_mut()
&& last.key.is_unit()
&& last.doc_comment.is_none()
{
last.key = key;
last.doc_comment = doc_comment;
return;
}
// Otherwise add as unit-valued entry
entries.push(Entry {
key,
value: Value::unit(),
doc_comment,
});
}
_ => {
// Root level
if let Some(last) = self.root_entries.last_mut()
&& last.key.is_unit()
&& last.doc_comment.is_none()
{
last.key = key;
last.doc_comment = doc_comment;
return;
}
self.root_entries.push(Entry {
key,
value: Value::unit(),
doc_comment,
});
}
}
}
}
styx_parse::EventKind::Key { tag, payload, kind } => {
let key_value = Value {
tag: tag.map(|name| Tag {
name: name.to_string(),
span: Some(span),
}),
payload: payload.map(|text| {
Payload::Scalar(Scalar {
text: cow_to_string(text),
kind,
span: Some(span),
})
}),
span: Some(span),
};
if let Some(BuilderFrame::Entry { key, .. }) = self.stack.last_mut() {
*key = Some(key_value);
}
}
styx_parse::EventKind::Scalar { value, kind } => {
let scalar = Value {
tag: None,
payload: Some(Payload::Scalar(Scalar {
text: cow_to_string(value),
kind,
span: Some(span),
})),
span: Some(span),
};
// Check if we're in an entry context with a key already set
if let Some(BuilderFrame::Entry { key, doc_comment }) = self.stack.last_mut()
&& key.is_some()
{
// We have a key, this is the value
let key_val = key.take().unwrap();
let doc = doc_comment.take();
// Pop the entry frame
self.stack.pop();
// Add to parent
match self.stack.last_mut() {
Some(BuilderFrame::Object { entries, .. }) => {
entries.push(Entry {
key: key_val,
value: scalar,
doc_comment: doc,
});
}
_ => {
self.root_entries.push(Entry {
key: key_val,
value: scalar,
doc_comment: doc,
});
}
}
// Re-push entry frame for potential more processing
self.stack.push(BuilderFrame::Entry {
key: None,
doc_comment: None,
});
return;
}
self.push_value(scalar);
}
styx_parse::EventKind::Unit => {
let unit = Value {
tag: None,
payload: None,
span: Some(span),
};
// Similar logic to Scalar for entry handling
if let Some(BuilderFrame::Entry { key, doc_comment }) = self.stack.last_mut()
&& key.is_some()
{
let key_val = key.take().unwrap();
let doc = doc_comment.take();
self.stack.pop();
match self.stack.last_mut() {
Some(BuilderFrame::Object { entries, .. }) => {
entries.push(Entry {
key: key_val,
value: unit,
doc_comment: doc,
});
}
_ => {
self.root_entries.push(Entry {
key: key_val,
value: unit,
doc_comment: doc,
});
}
}
self.stack.push(BuilderFrame::Entry {
key: None,
doc_comment: None,
});
return;
}
self.push_value(unit);
}
styx_parse::EventKind::TagStart { name } => {
self.stack.push(BuilderFrame::Tag {
name: name.to_string(),
span,
});
}
styx_parse::EventKind::TagEnd => {
// Only pop if the top frame is a Tag - otherwise the tag was already
// consumed when its payload was processed
if !matches!(self.stack.last(), Some(BuilderFrame::Tag { .. })) {
return;
}
if let Some(BuilderFrame::Tag { name, span }) = self.stack.pop() {
// Tag with no payload - just the tag itself
let tagged = Value {
tag: Some(Tag {
name,
span: Some(span),
}),
payload: None,
span: Some(span),
};
// Similar to scalar handling
if let Some(BuilderFrame::Entry { key, doc_comment }) = self.stack.last_mut()
&& key.is_some()
{
let key_val = key.take().unwrap();
let doc = doc_comment.take();
self.stack.pop();
match self.stack.last_mut() {
Some(BuilderFrame::Object { entries, .. }) => {
entries.push(Entry {
key: key_val,
value: tagged,
doc_comment: doc,
});
}
_ => {
self.root_entries.push(Entry {
key: key_val,
value: tagged,
doc_comment: doc,
});
}
}
self.stack.push(BuilderFrame::Entry {
key: None,
doc_comment: None,
});
return;
}
self.push_value(tagged);
}
}
styx_parse::EventKind::DocComment { lines } => {
// Lines are already stripped of `/// ` prefix by the parser
let comment = lines.join("\n");
match self.stack.last_mut() {
Some(BuilderFrame::Object {
pending_doc_comment,
..
}) => {
append_doc_comment(pending_doc_comment, comment);
}
_ => {
append_doc_comment(&mut self.pending_doc_comment, comment);
}
}
}
styx_parse::EventKind::Comment { .. } => {
// Ignore regular comments for tree building
}
styx_parse::EventKind::Error { kind } => {
self.errors.push((kind, span));
}
}
}
}
fn cow_to_string(cow: Cow<'_, str>) -> String {
cow.into_owned()
}
/// Append a doc comment line to an existing doc comment, joining with newline.
fn append_doc_comment(target: &mut Option<String>, line: String) {
match target {
Some(existing) => {
existing.push('\n');
existing.push_str(&line);
}
None => {
*target = Some(line);
}
}
}
#[cfg(test)]
mod tests {
use styx_parse::Parser;
use super::*;
fn parse(source: &str) -> Value {
let mut parser = Parser::new(source);
let mut builder = TreeBuilder::new();
while let Some(event) = parser.next_event() {
eprintln!("Event: {:?}", event);
builder.event(event);
}
builder.finish().unwrap()
}
fn try_parse(source: &str) -> Result<Value, BuildError> {
let mut parser = Parser::new(source);
let mut builder = TreeBuilder::new();
while let Some(event) = parser.next_event() {
builder.event(event);
}
builder.finish()
}
#[test]
fn test_empty_document() {
let value = parse("");
assert!(value.as_object().unwrap().is_empty());
}
#[test]
fn test_simple_entry() {
let value = parse("name Alice");
let obj = value.as_object().unwrap();
assert_eq!(obj.get("name").and_then(|v| v.as_str()), Some("Alice"));
}
#[test]
fn test_multiple_entries() {
let value = parse("name Alice\nage 30");
let obj = value.as_object().unwrap();
assert_eq!(obj.get("name").and_then(|v| v.as_str()), Some("Alice"));
assert_eq!(obj.get("age").and_then(|v| v.as_str()), Some("30"));
}
#[test]
fn test_path_access() {
let value = parse("name Alice\nage 30");
eprintln!("Built value: {value:#?}");
assert_eq!(value.get("name").and_then(|v| v.as_str()), Some("Alice"));
assert_eq!(value.get("age").and_then(|v| v.as_str()), Some("30"));
}
#[test]
fn test_unit_value() {
let value = parse("enabled @");
let obj = value.as_object().unwrap();
assert!(obj.get("enabled").unwrap().is_unit());
}
#[test]
fn test_unit_key() {
// @ followed by a value should create a unit key
let value = parse("@ server.schema.styx");
let obj = value.as_object().unwrap();
// The unit key entry
let unit_entry = obj.entries.iter().find(|e| e.key.is_unit());
assert!(
unit_entry.is_some(),
"should have unit key entry, got: {:?}",
obj.entries
.iter()
.map(|e| format!("key={:?}", e.key))
.collect::<Vec<_>>()
);
assert_eq!(
unit_entry.unwrap().value.as_str(),
Some("server.schema.styx")
);
}
#[test]
fn test_tag() {
let value = parse("type @user");
let obj = value.as_object().unwrap();
assert_eq!(obj.get("type").and_then(|v| v.tag_name()), Some("user"));
}
#[test]
fn test_tag_with_object_payload() {
let value = parse("result @err{message \"failed\"}");
let obj = value.as_object().unwrap();
let result = obj.get("result").unwrap();
assert_eq!(result.tag_name(), Some("err"));
// Check payload is an object with message field
let payload_obj = result.as_object().expect("payload should be object");
assert_eq!(
payload_obj.get("message").and_then(|v| v.as_str()),
Some("failed")
);
}
#[test]
fn test_tag_with_sequence_payload() {
let value = parse("color @rgb(255 128 0)");
let obj = value.as_object().unwrap();
let color = obj.get("color").unwrap();
assert_eq!(color.tag_name(), Some("rgb"));
// Check payload is a sequence
let payload_seq = color.as_sequence().expect("payload should be sequence");
assert_eq!(payload_seq.len(), 3);
assert_eq!(payload_seq.get(0).and_then(|v| v.as_str()), Some("255"));
assert_eq!(payload_seq.get(1).and_then(|v| v.as_str()), Some("128"));
assert_eq!(payload_seq.get(2).and_then(|v| v.as_str()), Some("0"));
}
#[test]
fn test_schema_structure_with_space_is_error() {
// @ @object { ... } with space before brace is now an error (3 atoms)
let source = r#"schema {
@ @object {
name @string
}
}"#;
// This should produce a parse error (TooManyAtoms)
let result = try_parse(source);
assert!(
result.is_err(),
"@ @object {{ }} with space should be a parse error"
);
match result {
Err(BuildError::Parse(styx_parse::ParseErrorKind::TooManyAtoms, _)) => {}
Err(e) => panic!("expected TooManyAtoms error, got {:?}", e),
Ok(_) => panic!("expected error, got Ok"),
}
}
#[test]
fn test_schema_structure_no_space() {
// @ @object{ ... } without space before brace
let source = r#"schema {
@ @object{
name @string
}
}"#;
// Debug: print all events
eprintln!("=== Events for no-space version ===");
let mut debug_parser = Parser::new(source);
while let Some(event) = debug_parser.next_event() {
eprintln!("Event: {:?}", event);
}
let value = parse(source);
let obj = value.as_object().unwrap();
eprintln!(
"Root entries: {:?}",
obj.entries
.iter()
.map(|e| e.key.as_str())
.collect::<Vec<_>>()
);
assert!(obj.get("schema").is_some(), "should have schema entry");
let schema = obj.get("schema").unwrap();
assert!(
schema.as_object().is_some(),
"schema should be an object, got tag={:?} payload={:?}",
schema.tag,
schema.payload.is_some()
);
}
#[test]
fn test_multiline_doc_comment() {
let source = r#"/// First line of doc
/// Second line of doc
name @string"#;
let value = parse(source);
let obj = value.as_object().unwrap();
let entry = obj.entries.iter().find(|e| e.key.as_str() == Some("name"));
assert!(entry.is_some(), "should have 'name' entry");
let entry = entry.unwrap();
assert_eq!(
entry.doc_comment,
Some("First line of doc\nSecond line of doc".to_string()),
"doc comment should contain both lines joined by newline"
);
}
#[test]
fn test_single_line_doc_comment() {
let source = r#"/// Just one line
value 42"#;
let value = parse(source);
let obj = value.as_object().unwrap();
let entry = obj.entries.iter().find(|e| e.key.as_str() == Some("value"));
assert!(entry.is_some(), "should have 'value' entry");
let entry = entry.unwrap();
assert_eq!(entry.doc_comment, Some("Just one line".to_string()),);
}
#[test]
fn test_multiline_doc_comment_in_object() {
// Test doc comments inside a braced object
let source = r#"schema {
/// First line
/// Second line
/// Third line
field @string
}"#;
let value = parse(source);
let obj = value.as_object().unwrap();
let schema = obj.get("schema").expect("should have schema");
let schema_obj = schema.as_object().expect("schema should be an object");
let entry = schema_obj
.entries
.iter()
.find(|e| e.key.as_str() == Some("field"));
assert!(entry.is_some(), "should have 'field' entry");
let entry = entry.unwrap();
assert_eq!(
entry.doc_comment,
Some("First line\nSecond line\nThird line".to_string()),
"doc comment should contain all lines joined by newline"
);
}
}