Skip to content

Generate lossless parse trees #2

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Generate lossless parse trees #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b02ae85
WIP
osa1 Feb 17, 2022
2382b96
Fix parser
osa1 Feb 17, 2022
f9a4f62
WIP
osa1 Feb 17, 2022
7c51360
Remove unused stuff
osa1 Feb 17, 2022
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
24 changes: 2 additions & 22 deletions src/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ pub struct NonTerminal {
#[derive(Debug)]
pub struct Production {
pub symbols: Vec<Symbol>,
pub action: Action,
}

#[derive(Debug)]
Expand Down Expand Up @@ -131,12 +130,6 @@ pub enum RepeatOp {
Question,
}

#[derive(Debug)]
pub enum Action {
User(syn::Expr),
Fallible(syn::Expr),
}

impl Parse for FieldPattern {
fn parse(input: &ParseBuffer) -> syn::Result<Self> {
let field_name = input.parse::<syn::Ident>()?;
Expand Down Expand Up @@ -325,11 +318,10 @@ impl Parse for NonTerminal {
impl Parse for Production {
fn parse(input: &ParseBuffer) -> syn::Result<Self> {
let mut symbols: Vec<Symbol> = vec![];
while !input.peek(syn::token::FatArrow) {
while !input.peek(syn::token::Comma) {
symbols.push(input.parse::<Symbol>()?);
}
let action = input.parse::<Action>()?;
Ok(Production { symbols, action })
Ok(Production { symbols })
}
}

Expand Down Expand Up @@ -383,18 +375,6 @@ fn symbol0(input: &ParseBuffer) -> syn::Result<Symbol> {
// }
}

impl Parse for Action {
fn parse(input: &ParseBuffer) -> syn::Result<Self> {
input.parse::<syn::token::FatArrow>()?;
if input.peek(syn::token::Question) {
input.parse::<syn::token::Question>()?;
Ok(Action::Fallible(input.parse::<syn::Expr>()?))
} else {
Ok(Action::User(input.parse::<syn::Expr>()?))
}
}
}

impl Parse for GrammarItem {
fn parse(input: &ParseBuffer) -> syn::Result<Self> {
if input.peek(syn::token::Type) {
Expand Down
Loading