Skip to content

Issue 473 using a span on Production. #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ltratt merged 1 commit into from
Mar 21, 2025
Merged

Issue 473 using a span on Production. #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions cfgrammar/src/lib/yacc/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ pub struct Production {
pub symbols: Vec<Symbol>,
pub precedence: Option<String>,
pub action: Option<String>,
pub prod_span: Span,
}

#[derive(Clone, Debug)]
Expand Down Expand Up @@ -185,12 +186,14 @@ impl GrammarAST {
symbols: Vec<Symbol>,
precedence: Option<String>,
action: Option<String>,
prod_span: Span,
) {
self.rules[&rule_name].pidxs.push(self.prods.len());
self.prods.push(Production {
symbols,
precedence,
action,
prod_span,
});
}

Expand Down Expand Up @@ -436,7 +439,7 @@ mod test {
let empty_span = Span::new(0, 0);
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("B".to_string(), empty_span), None);
grm.add_prod("B".to_string(), vec![], None, None);
grm.add_prod("B".to_string(), vec![], None, None, empty_span);
match grm.complete_and_validate() {
Err(YaccGrammarError {
kind: YaccGrammarErrorKind::InvalidStartRule(_),
Expand All @@ -452,7 +455,7 @@ mod test {
let empty_span = Span::new(0, 0);
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("A".to_string(), empty_span), None);
grm.add_prod("A".to_string(), vec![], None, None);
grm.add_prod("A".to_string(), vec![], None, None, empty_span);
assert!(grm.complete_and_validate().is_ok());
}

Expand All @@ -463,8 +466,8 @@ mod test {
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("A".to_string(), empty_span), None);
grm.add_rule(("B".to_string(), empty_span), None);
grm.add_prod("A".to_string(), vec![rule("B")], None, None);
grm.add_prod("B".to_string(), vec![], None, None);
grm.add_prod("A".to_string(), vec![rule("B")], None, None, empty_span);
grm.add_prod("B".to_string(), vec![], None, None, empty_span);
assert!(grm.complete_and_validate().is_ok());
}

Expand All @@ -474,7 +477,7 @@ mod test {
let empty_span = Span::new(0, 0);
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("A".to_string(), empty_span), None);
grm.add_prod("A".to_string(), vec![rule("B")], None, None);
grm.add_prod("A".to_string(), vec![rule("B")], None, None, empty_span);
match grm.complete_and_validate() {
Err(YaccGrammarError {
kind: YaccGrammarErrorKind::UnknownRuleRef(_),
Expand All @@ -491,7 +494,7 @@ mod test {
grm.tokens.insert("b".to_string());
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("A".to_string(), empty_span), None);
grm.add_prod("A".to_string(), vec![token("b")], None, None);
grm.add_prod("A".to_string(), vec![token("b")], None, None, empty_span);
assert!(grm.complete_and_validate().is_ok());
}

Expand All @@ -504,7 +507,7 @@ mod test {
grm.tokens.insert("b".to_string());
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("A".to_string(), empty_span), None);
grm.add_prod("A".to_string(), vec![rule("b")], None, None);
grm.add_prod("A".to_string(), vec![rule("b")], None, None, empty_span);
assert!(grm.complete_and_validate().is_err());
}

Expand All @@ -514,7 +517,7 @@ mod test {
let empty_span = Span::new(0, 0);
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("A".to_string(), empty_span), None);
grm.add_prod("A".to_string(), vec![token("b")], None, None);
grm.add_prod("A".to_string(), vec![token("b")], None, None, empty_span);
match grm.complete_and_validate() {
Err(YaccGrammarError {
kind: YaccGrammarErrorKind::UnknownToken(_),
Expand All @@ -530,7 +533,13 @@ mod test {
let empty_span = Span::new(0, 0);
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("A".to_string(), empty_span), None);
grm.add_prod("A".to_string(), vec![rule("b"), token("b")], None, None);
grm.add_prod(
"A".to_string(),
vec![rule("b"), token("b")],
None,
None,
Span::new(0, 2),
);
match grm.complete_and_validate() {
Err(YaccGrammarError {
kind: YaccGrammarErrorKind::UnknownRuleRef(_),
Expand All @@ -546,7 +555,7 @@ mod test {
let empty_span = Span::new(2, 3);
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("A".to_string(), empty_span), None);
grm.add_prod("A".to_string(), vec![], None, None);
grm.add_prod("A".to_string(), vec![], None, None, empty_span);
grm.epp
.insert("k".to_owned(), (empty_span, ("v".to_owned(), empty_span)));
match grm.complete_and_validate() {
Expand Down Expand Up @@ -580,6 +589,7 @@ mod test {
vec![token("b")],
Some("b".to_string()),
None,
empty_span,
);
assert!(grm.complete_and_validate().is_ok());
}
Expand All @@ -595,6 +605,7 @@ mod test {
vec![token("b")],
Some("b".to_string()),
None,
empty_span,
);
match grm.complete_and_validate() {
Err(YaccGrammarError {
Expand All @@ -619,11 +630,11 @@ mod test {
let empty_span = Span::new(0, 0);
grm.start = Some(("A".to_string(), empty_span));
grm.add_rule(("A".to_string(), empty_span), None);
grm.add_prod("A".to_string(), vec![], None, None);
grm.add_prod("A".to_string(), vec![], None, None, empty_span);
grm.tokens.insert("b".to_string());
grm.spans.push(Span::new(4, 5));
grm.add_rule(("B".to_string(), Span::new(1, 2)), None);
grm.add_prod("B".to_string(), vec![token("b")], None, None);
grm.add_prod("B".to_string(), vec![token("b")], None, None, empty_span);

assert_eq!(
grm.unused_symbols()
Expand Down
Loading