mirror of
https://github.com/fluencelabs/lalrpop
synced 2025-04-24 18:52:16 +00:00
Allow <mut name:E> in patterns
This commit is contained in:
parent
2bd51e0888
commit
14eeff42a5
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
target
|
||||
*~
|
||||
TAGS
|
||||
**/*.bak
|
||||
|
@ -7,11 +7,7 @@ grammar;
|
||||
pub Items: Vec<(usize, usize)> = {
|
||||
<@L> <@R> => vec![(<>)],
|
||||
|
||||
<v:Items> <e:Spanned<"+">> => {
|
||||
let mut v = v;
|
||||
v.push(e);
|
||||
v
|
||||
},
|
||||
<mut v:Items> <e:Spanned<"+">> => { v.push(e); v },
|
||||
|
||||
<v:Items> "-" => v
|
||||
};
|
||||
|
@ -78,6 +78,10 @@ lalrpop_mod!(loc);
|
||||
lalrpop_mod!(loc_issue_90);
|
||||
mod loc_issue_90_lib;
|
||||
|
||||
/// tests that user can use `<mut v:E+> <e:T> => { v.push(e); v }` instead of
|
||||
/// `<v:E+> <e:T> => { let mut v = v; v.push(e); v }`
|
||||
lalrpop_mod!(mut_name);
|
||||
|
||||
/// test that uses `super` in paths in various places
|
||||
lalrpop_mod!(use_super);
|
||||
|
||||
@ -134,6 +138,7 @@ lalrpop_mod!(
|
||||
|
||||
lalrpop_mod!(
|
||||
#[deny(bare_trait_objects)]
|
||||
#[allow(unused)]
|
||||
dyn_argument
|
||||
);
|
||||
|
||||
@ -886,6 +891,14 @@ fn test_match_alternatives() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_mut_name() {
|
||||
assert_eq!(
|
||||
mut_name::MutParser::new().parse("1, 2, 3: 4"),
|
||||
Ok(vec![1, 2, 3, 4])
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn issue_113() {
|
||||
assert!(error_issue_113::ItemsParser::new().parse("+").is_err());
|
||||
@ -938,7 +951,7 @@ fn verify_lalrpop_generates_itself() {
|
||||
let copied_grammar_file = Path::new(out_dir).join(lrgrammar);
|
||||
|
||||
// Don't remove the .rs file that already exist
|
||||
fs::copy(&grammar_file, &copied_grammar_file).unwrap();
|
||||
fs::copy(&grammar_file, &copied_grammar_file).expect("no grammar file found");
|
||||
|
||||
assert!(Command::new("../target/debug/lalrpop")
|
||||
.args(&[
|
||||
@ -951,7 +964,7 @@ fn verify_lalrpop_generates_itself() {
|
||||
.expect("grammar path is not UTF-8")
|
||||
])
|
||||
.status()
|
||||
.unwrap()
|
||||
.expect("lalrpop run failed")
|
||||
.success());
|
||||
|
||||
let actual = fs::read_to_string(grammar_file.with_extension("rs")).unwrap();
|
||||
|
@ -14,11 +14,7 @@ extern {
|
||||
pub Items: Vec<(usize, usize)> = {
|
||||
<@L> <@R> => vec![(<>)],
|
||||
|
||||
<v:Items> <e:Spanned<"+">> => {
|
||||
let mut v = v;
|
||||
v.push(e);
|
||||
v
|
||||
},
|
||||
<mut v:Items> <e:Spanned<"+">> => { v.push(e); v },
|
||||
|
||||
<v:Items> "-" => v
|
||||
};
|
||||
|
11
lalrpop-test/src/mut_name.lalrpop
Normal file
11
lalrpop-test/src/mut_name.lalrpop
Normal file
@ -0,0 +1,11 @@
|
||||
grammar;
|
||||
|
||||
Comma<T>: Vec<T> = {
|
||||
<mut v: (<T> ",")*> <e:T> => { v.push(e); v }
|
||||
}
|
||||
|
||||
pub Mut: Vec<i32> = {
|
||||
<mut vect:Comma<Num>> ":" <e:Num> => { vect.push(e); vect }
|
||||
}
|
||||
|
||||
Num: i32 = r"[0-9]+" => <>.parse().unwrap();
|
@ -24,7 +24,7 @@ fn find_lalrpop_binary(prefix: &str) -> Option<PathBuf> {
|
||||
}
|
||||
}
|
||||
|
||||
fn main_() -> Result<(), Box<Error>> {
|
||||
fn main_() -> Result<(), Box<dyn Error>> {
|
||||
let grammar_file = "src/parser/lrgrammar.lalrpop";
|
||||
println!(r#"cargo:rerun-if-changed={}"#, grammar_file);
|
||||
|
||||
@ -36,7 +36,7 @@ fn main_() -> Result<(), Box<Error>> {
|
||||
let lalrpop_path = find_lalrpop_binary("..").or_else(|| find_lalrpop_binary("."))
|
||||
.unwrap_or_else(|| {
|
||||
panic!(
|
||||
"Can't find a lalrpop binary to use for the snapshot. Make sure it is built and exists at target/{}/lalrpop!",
|
||||
"Can't find a lalrpop binary to use for the snapshot. Make sure it is built and exists at target/{}/lalrpop!",
|
||||
env::var("PROFILE").unwrap()
|
||||
)
|
||||
});
|
||||
|
@ -89,8 +89,6 @@ fn emit_user_action_code<W: Write>(
|
||||
// a (L, T, L) triple where the Ls are locations and
|
||||
// the T is the data. Ignore the locations and bind
|
||||
// the data to the name the user gave.
|
||||
|
||||
// NEXTCOMMITFIXME
|
||||
let mut arguments: Vec<String> = data
|
||||
.arg_patterns
|
||||
.iter()
|
||||
@ -100,11 +98,7 @@ fn emit_user_action_code<W: Write>(
|
||||
.cloned()
|
||||
.map(|t| grammar.types.spanned_type(t)),
|
||||
)
|
||||
.map(|(p, t)| format!("(_, {} {}, _): {}",
|
||||
if p.0 { "mut" } else { "" },
|
||||
p.1,
|
||||
t)
|
||||
)
|
||||
.map(|(name, ty)| format!("(_, {}, _): {}", name, ty))
|
||||
.collect();
|
||||
|
||||
// If this is a reduce of an empty production, we will
|
||||
|
@ -447,7 +447,7 @@ pub enum SymbolKind {
|
||||
Choose(Box<Symbol>),
|
||||
|
||||
// <x:X> or <mut x:X>
|
||||
Name(bool, Atom, Box<Symbol>),
|
||||
Name(Name, Box<Symbol>),
|
||||
|
||||
// @L
|
||||
Lookahead,
|
||||
@ -458,6 +458,12 @@ pub enum SymbolKind {
|
||||
Error,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub struct Name {
|
||||
pub mutable: bool,
|
||||
pub name: Atom,
|
||||
}
|
||||
|
||||
#[derive(Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
|
||||
pub enum TerminalString {
|
||||
Literal(TerminalLiteral),
|
||||
@ -692,6 +698,16 @@ impl Symbol {
|
||||
}
|
||||
}
|
||||
|
||||
impl Name {
|
||||
pub fn new(mutable: bool, name: Atom) -> Self {
|
||||
Name { mutable, name }
|
||||
}
|
||||
|
||||
pub fn immut(name: Atom) -> Self {
|
||||
Name::new(false, name)
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for Visibility {
|
||||
fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
|
||||
match *self {
|
||||
@ -902,7 +918,6 @@ impl Display for Symbol {
|
||||
impl Display for SymbolKind {
|
||||
fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
|
||||
match *self {
|
||||
// NEXTCOMMITFIXME
|
||||
SymbolKind::Expr(ref expr) => write!(fmt, "{}", expr),
|
||||
SymbolKind::Terminal(ref s) => write!(fmt, "{}", s),
|
||||
SymbolKind::Nonterminal(ref s) => write!(fmt, "{}", s),
|
||||
@ -910,8 +925,7 @@ impl Display for SymbolKind {
|
||||
SymbolKind::Macro(ref m) => write!(fmt, "{}", m),
|
||||
SymbolKind::Repeat(ref r) => write!(fmt, "{}", r),
|
||||
SymbolKind::Choose(ref s) => write!(fmt, "<{}>", s),
|
||||
SymbolKind::Name(m, ref n, ref s) =>
|
||||
write!(fmt, "{} {}:{}", if m { "mut" } else { "" }, n, s),
|
||||
SymbolKind::Name(ref n, ref s) => write!(fmt, "{}:{}", n, s),
|
||||
SymbolKind::Lookahead => write!(fmt, "@L"),
|
||||
SymbolKind::Lookbehind => write!(fmt, "@R"),
|
||||
SymbolKind::Error => write!(fmt, "error"),
|
||||
@ -919,6 +933,16 @@ impl Display for SymbolKind {
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for Name {
|
||||
fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
|
||||
if self.mutable {
|
||||
write!(fmt, "mut {}", self.name)
|
||||
} else {
|
||||
Display::fmt(&self.name, fmt)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for RepeatSymbol {
|
||||
fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
|
||||
write!(fmt, "{}{}", self.symbol, self.op)
|
||||
|
@ -13,7 +13,7 @@ use util::Sep;
|
||||
// These concepts we re-use wholesale
|
||||
pub use grammar::parse_tree::{
|
||||
Annotation, InternToken, Lifetime, NonterminalString, Path, Span, TerminalLiteral,
|
||||
TerminalString, TypeBound, TypeParameter, Visibility,
|
||||
TerminalString, TypeBound, TypeParameter, Visibility, Name
|
||||
};
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
@ -144,7 +144,7 @@ pub enum ActionFnDefnKind {
|
||||
/// An action fn written by a user.
|
||||
#[derive(Clone, PartialEq, Eq)]
|
||||
pub struct UserActionFnDefn {
|
||||
pub arg_patterns: Vec<(bool, Atom)>,
|
||||
pub arg_patterns: Vec<Name>,
|
||||
pub arg_types: Vec<TypeRepr>,
|
||||
pub code: String,
|
||||
}
|
||||
@ -663,12 +663,11 @@ impl ActionFnDefn {
|
||||
|
||||
impl UserActionFnDefn {
|
||||
fn to_fn_string(&self, defn: &ActionFnDefn, name: &str) -> String {
|
||||
//NEXTCOMMITFIXME
|
||||
let arg_strings: Vec<String> = self
|
||||
.arg_patterns
|
||||
.iter()
|
||||
.zip(self.arg_types.iter())
|
||||
.map(|(p, t)| format!("{}{}: {}", if p.0 { "mut " } else { "" }, p.1, t))
|
||||
.map(|(name, ty)| format!("{}: {}", name, ty))
|
||||
.collect();
|
||||
|
||||
format!(
|
||||
|
@ -61,8 +61,11 @@ pub trait Content: Debug {
|
||||
/// those with `op`, appending the final result into `wrap_items`.
|
||||
/// Useful for "modifier" content items like `Styled` that do not
|
||||
/// affect wrapping.
|
||||
fn into_wrap_items_map<OP, C>(content: Box<dyn Content>, wrap_items: &mut Vec<Box<dyn Content>>, op: OP)
|
||||
where
|
||||
fn into_wrap_items_map<OP, C>(
|
||||
content: Box<dyn Content>,
|
||||
wrap_items: &mut Vec<Box<dyn Content>>,
|
||||
op: OP,
|
||||
) where
|
||||
OP: FnMut(Box<dyn Content>) -> C,
|
||||
C: Content + 'static,
|
||||
{
|
||||
|
@ -5,7 +5,7 @@ use collections::{map, Map};
|
||||
use grammar::consts::CFG;
|
||||
use grammar::parse_tree as pt;
|
||||
use grammar::parse_tree::{
|
||||
read_algorithm, GrammarItem, InternToken, Lifetime, NonterminalString, Path, TerminalString,
|
||||
read_algorithm, GrammarItem, InternToken, Lifetime, NonterminalString, Path, TerminalString, Name
|
||||
};
|
||||
use grammar::pattern::{Pattern, PatternKind};
|
||||
use grammar::repr as r;
|
||||
@ -366,11 +366,11 @@ impl<'s> LowerState<'s> {
|
||||
Symbols::Named(names) => {
|
||||
// if there are named symbols, we want to give the
|
||||
// arguments the names that the user gave them:
|
||||
//NEXTCOMMITFIXME
|
||||
let arg_names = names
|
||||
.iter()
|
||||
.map(|(index, name, _)| (*index, name.clone()));
|
||||
let arg_patterns = patterns(
|
||||
names
|
||||
.iter()
|
||||
.map(|&(index, mutable, ref name, _)| (index, (mutable, name.clone()))),
|
||||
arg_names,
|
||||
symbols.len(),
|
||||
);
|
||||
|
||||
@ -378,11 +378,10 @@ impl<'s> LowerState<'s> {
|
||||
match norm_util::check_between_braces(&action) {
|
||||
norm_util::Presence::None => action,
|
||||
norm_util::Presence::Normal => {
|
||||
//NEXTCOMMITFIXME
|
||||
let name_str: String = {
|
||||
let name_strs: Vec<_> = names
|
||||
.iter()
|
||||
.map(|&(_, _, ref name, _)| name.as_ref())
|
||||
.map(|&(_, ref name, _)| name.name.as_ref())
|
||||
.collect();
|
||||
name_strs.join(", ")
|
||||
};
|
||||
@ -390,10 +389,9 @@ impl<'s> LowerState<'s> {
|
||||
}
|
||||
norm_util::Presence::InCurlyBrackets => {
|
||||
let name_str = {
|
||||
//NEXTCOMMITFIXME
|
||||
let name_strs: Vec<_> = names
|
||||
.iter()
|
||||
.map(|&(_, _, ref name, _)| format!("{0}:{0}", &*name))
|
||||
.map(|&(_, ref name, _)| format!("{0}:{0}", &*name.name))
|
||||
.collect();
|
||||
name_strs.join(", ")
|
||||
};
|
||||
@ -414,14 +412,14 @@ impl<'s> LowerState<'s> {
|
||||
}
|
||||
Symbols::Anon(indices) => {
|
||||
let names: Vec<_> = (0..indices.len()).map(|i| self.fresh_name(i)).collect();
|
||||
//NEXTCOMMITFIXME
|
||||
|
||||
let p_indices = indices.iter().map(|&(index, _)| index);
|
||||
let p_names = names.iter().cloned().map(Name::immut);
|
||||
let arg_patterns = patterns(
|
||||
indices
|
||||
.iter()
|
||||
.map(|&(index, _)| index)
|
||||
.zip(names.iter().cloned().map(|n| (false, n))),
|
||||
p_indices.zip(p_names),
|
||||
symbols.len(),
|
||||
);
|
||||
|
||||
let name_str = {
|
||||
let name_strs: Vec<_> = names.iter().map(AsRef::as_ref).collect();
|
||||
name_strs.join(", ")
|
||||
@ -456,7 +454,7 @@ impl<'s> LowerState<'s> {
|
||||
match symbol.kind {
|
||||
pt::SymbolKind::Terminal(ref id) => r::Symbol::Terminal(id.clone()),
|
||||
pt::SymbolKind::Nonterminal(ref id) => r::Symbol::Nonterminal(id.clone()),
|
||||
pt::SymbolKind::Choose(ref s) | pt::SymbolKind::Name(_, _, ref s) => self.symbol(s),
|
||||
pt::SymbolKind::Choose(ref s) | pt::SymbolKind::Name(_, ref s) => self.symbol(s),
|
||||
pt::SymbolKind::Error => {
|
||||
self.uses_error_recovery = true;
|
||||
r::Symbol::Terminal(TerminalString::Error)
|
||||
@ -479,22 +477,21 @@ impl<'s> LowerState<'s> {
|
||||
}
|
||||
}
|
||||
|
||||
//NEXTCOMMITFIXME
|
||||
fn patterns<I>(mut chosen: I, num_args: usize) -> Vec<(bool, Atom)>
|
||||
where I: Iterator<Item = (usize, (bool, Atom))>
|
||||
fn patterns<I>(mut chosen: I, num_args: usize) -> Vec<Name>
|
||||
where
|
||||
I: Iterator<Item = (usize, Name)>,
|
||||
{
|
||||
let blank = Atom::from("_");
|
||||
|
||||
let mut next_chosen = chosen.next();
|
||||
|
||||
let result = (0..num_args)
|
||||
//NEXTCOMMITFIXME
|
||||
.map(|index| match next_chosen.clone() {
|
||||
Some((chosen_index, (mutable, ref chosen_name))) if chosen_index == index => {
|
||||
Some((chosen_index, ref chosen_name)) if chosen_index == index => {
|
||||
next_chosen = chosen.next();
|
||||
(mutable, chosen_name.clone())
|
||||
chosen_name.clone()
|
||||
}
|
||||
_ => (false, blank.clone()),
|
||||
_ => Name::immut(blank.clone()),
|
||||
})
|
||||
.collect();
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
use grammar::consts::INLINE;
|
||||
use grammar::parse_tree::{
|
||||
ActionKind, Alternative, Annotation, Condition, ConditionOp, ExprSymbol, Grammar, GrammarItem,
|
||||
MacroSymbol, NonterminalData, NonterminalString, Path, RepeatOp, RepeatSymbol, Span, Symbol,
|
||||
SymbolKind, TerminalLiteral, TerminalString, TypeRef, Visibility,
|
||||
MacroSymbol, Name, NonterminalData, NonterminalString, Path, RepeatOp, RepeatSymbol, Span,
|
||||
Symbol, SymbolKind, TerminalLiteral, TerminalString, TypeRef, Visibility,
|
||||
};
|
||||
use normalize::norm_util::{self, Symbols};
|
||||
use normalize::resolve;
|
||||
@ -136,8 +136,7 @@ impl MacroExpander {
|
||||
SymbolKind::Terminal(_) | SymbolKind::Nonterminal(_) | SymbolKind::Error => {
|
||||
return;
|
||||
}
|
||||
//FIXNEXTCOMMIT
|
||||
SymbolKind::Choose(ref mut sym) | SymbolKind::Name(_, _, ref mut sym) => {
|
||||
SymbolKind::Choose(ref mut sym) | SymbolKind::Name(_, ref mut sym) => {
|
||||
self.replace_symbol(sym);
|
||||
return;
|
||||
}
|
||||
@ -345,7 +344,6 @@ impl MacroExpander {
|
||||
symbol: &Symbol,
|
||||
) -> Symbol {
|
||||
let kind = match symbol.kind {
|
||||
//NEXTCOMMITFIXME
|
||||
SymbolKind::Expr(ref expr) => {
|
||||
SymbolKind::Expr(self.macro_expand_expr_symbol(args, expr))
|
||||
}
|
||||
@ -365,9 +363,10 @@ impl MacroExpander {
|
||||
SymbolKind::Choose(ref sym) => {
|
||||
SymbolKind::Choose(Box::new(self.macro_expand_symbol(args, sym)))
|
||||
}
|
||||
SymbolKind::Name(mutable, ref id, ref sym) => {
|
||||
SymbolKind::Name(mutable, id.clone(), Box::new(self.macro_expand_symbol(args, sym)))
|
||||
}
|
||||
SymbolKind::Name(ref id, ref sym) => SymbolKind::Name(
|
||||
Name::new(id.mutable, id.name.clone()),
|
||||
Box::new(self.macro_expand_symbol(args, sym)),
|
||||
),
|
||||
SymbolKind::Lookahead => SymbolKind::Lookahead,
|
||||
SymbolKind::Lookbehind => SymbolKind::Lookbehind,
|
||||
SymbolKind::Error => SymbolKind::Error,
|
||||
@ -388,11 +387,10 @@ impl MacroExpander {
|
||||
fn expand_expr_symbol(&mut self, span: Span, expr: ExprSymbol) -> NormResult<GrammarItem> {
|
||||
let name = NonterminalString(Atom::from(expr.canonical_form()));
|
||||
|
||||
//NEXTCOMMITFIXME
|
||||
let ty_ref =
|
||||
match norm_util::analyze_expr(&expr) {
|
||||
Symbols::Named(names) => {
|
||||
let (_, _, ref ex_id, ex_sym) = names[0];
|
||||
let (_, ref ex_id, ex_sym) = names[0];
|
||||
return_err!(
|
||||
span,
|
||||
"named symbols like `{}:{}` are only allowed at the top-level of a nonterminal",
|
||||
@ -467,12 +465,10 @@ impl MacroExpander {
|
||||
Alternative {
|
||||
span,
|
||||
expr: ExprSymbol {
|
||||
//NEXTCOMMITFIXME
|
||||
symbols: vec![Symbol::new(
|
||||
span,
|
||||
SymbolKind::Name(
|
||||
false,
|
||||
v,
|
||||
Name::immut(v),
|
||||
Box::new(Symbol::new(
|
||||
span,
|
||||
SymbolKind::Repeat(plus_repeat),
|
||||
@ -516,12 +512,10 @@ impl MacroExpander {
|
||||
span,
|
||||
expr: ExprSymbol {
|
||||
symbols: vec![
|
||||
//NEXTCOMMITFIXME
|
||||
Symbol::new(
|
||||
span,
|
||||
SymbolKind::Name(
|
||||
true,
|
||||
v,
|
||||
Name::immut(v),
|
||||
Box::new(Symbol::new(
|
||||
span,
|
||||
SymbolKind::Nonterminal(name),
|
||||
@ -530,7 +524,10 @@ impl MacroExpander {
|
||||
),
|
||||
Symbol::new(
|
||||
span,
|
||||
SymbolKind::Name(false, e, Box::new(repeat.symbol.clone())),
|
||||
SymbolKind::Name(
|
||||
Name::immut(e),
|
||||
Box::new(repeat.symbol.clone()),
|
||||
),
|
||||
),
|
||||
],
|
||||
},
|
||||
|
@ -46,7 +46,7 @@ grammar;
|
||||
|
||||
`(<"Id"> ",")+`: ::std::vec::Vec<#`(<"Id"> ",")`#> = {
|
||||
`(<"Id"> ",")` => vec![<>],
|
||||
<v:`(<"Id"> ",")+`> <e:`(<"Id"> ",")`> => { v.push(e); v },
|
||||
<v:`(<"Id"> ",")+`> <e:`(<"Id"> ",")`> => { let mut v = v; v.push(e); v },
|
||||
};
|
||||
"##,
|
||||
)
|
||||
|
@ -1,5 +1,4 @@
|
||||
use grammar::parse_tree::{ActionKind, Alternative, ExprSymbol, Symbol, SymbolKind};
|
||||
use string_cache::DefaultAtom as Atom;
|
||||
use grammar::parse_tree::{ActionKind, Alternative, ExprSymbol, Symbol, SymbolKind, Name};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum AlternativeAction<'a> {
|
||||
@ -9,7 +8,7 @@ pub enum AlternativeAction<'a> {
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum Symbols<'a> {
|
||||
Named(Vec<(usize, bool, Atom, &'a Symbol)>),
|
||||
Named(Vec<(usize, Name, &'a Symbol)>),
|
||||
Anon(Vec<(usize, &'a Symbol)>),
|
||||
}
|
||||
|
||||
@ -24,13 +23,12 @@ pub fn analyze_action(alt: &Alternative) -> AlternativeAction<'_> {
|
||||
|
||||
pub fn analyze_expr(expr: &ExprSymbol) -> Symbols<'_> {
|
||||
// First look for named symbols.
|
||||
//NEXTCOMMITFIXME
|
||||
let named_symbols: Vec<_> = expr
|
||||
.symbols
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter_map(|(idx, sym)| match sym.kind {
|
||||
SymbolKind::Name(mutable, ref id, ref sub) => Some((idx, mutable, id.clone(), &**sub)),
|
||||
SymbolKind::Name(ref id, ref sub) => Some((idx, id.clone(), &**sub)),
|
||||
_ => None,
|
||||
})
|
||||
.collect();
|
||||
|
@ -184,8 +184,7 @@ impl<'grammar> Validator<'grammar> {
|
||||
match norm_util::analyze_expr(&alternative.expr) {
|
||||
Symbols::Named(syms) => {
|
||||
if alternative.action.is_none() {
|
||||
//NEXTCOMMITFIXME
|
||||
let sym = syms.iter().map(|&(_, _, _, sym)| sym).next().unwrap();
|
||||
let sym = syms.iter().map(|&(_, _, sym)| sym).next().unwrap();
|
||||
return_err!(
|
||||
sym.span,
|
||||
"named symbols (like `{}`) require a custom action",
|
||||
@ -227,12 +226,11 @@ impl<'grammar> Validator<'grammar> {
|
||||
})
|
||||
.collect();
|
||||
|
||||
//NEXTCOMMITFIXME
|
||||
let named: Multimap<Atom, Vec<&Symbol>> = expr
|
||||
.symbols
|
||||
.iter()
|
||||
.filter_map(|sym| match sym.kind {
|
||||
SymbolKind::Name(_, ref nt, _) => Some((nt.clone(), sym)),
|
||||
SymbolKind::Name(ref nt, _) => Some((nt.name.clone(), sym)),
|
||||
_ => None,
|
||||
})
|
||||
.collect();
|
||||
@ -286,8 +284,7 @@ impl<'grammar> Validator<'grammar> {
|
||||
SymbolKind::Repeat(ref repeat) => {
|
||||
self.validate_symbol(&repeat.symbol)?;
|
||||
}
|
||||
//NEXTCOMMITFIXME
|
||||
SymbolKind::Choose(ref sym) | SymbolKind::Name(_, _, ref sym) => {
|
||||
SymbolKind::Choose(ref sym) | SymbolKind::Name(_, ref sym) => {
|
||||
self.validate_symbol(sym)?;
|
||||
}
|
||||
SymbolKind::Lookahead | SymbolKind::Lookbehind => {
|
||||
|
@ -252,8 +252,7 @@ impl Validator {
|
||||
SymbolKind::Repeat(ref mut repeat) => {
|
||||
self.validate_symbol(scope, &mut repeat.symbol)?;
|
||||
}
|
||||
//NEXTCOMMITFIXME
|
||||
SymbolKind::Choose(ref mut sym) | SymbolKind::Name(_, _, ref mut sym) => {
|
||||
SymbolKind::Choose(ref mut sym) | SymbolKind::Name(_, ref mut sym) => {
|
||||
self.validate_symbol(scope, sym)?;
|
||||
}
|
||||
SymbolKind::Lookahead | SymbolKind::Lookbehind | SymbolKind::Error => {}
|
||||
|
@ -249,13 +249,9 @@ impl<'grammar> Validator<'grammar> {
|
||||
SymbolKind::Repeat(ref repeat) => {
|
||||
self.validate_symbol(&repeat.symbol)?;
|
||||
}
|
||||
SymbolKind::Choose(ref sym) | SymbolKind::Name(_, _, ref sym) => {
|
||||
SymbolKind::Choose(ref sym) | SymbolKind::Name(_, ref sym) => {
|
||||
self.validate_symbol(sym)?;
|
||||
}
|
||||
SymbolKind::Choose(ref sym) |
|
||||
SymbolKind::Name(_, _, ref sym) => {
|
||||
try!(self.validate_symbol(sym));
|
||||
}
|
||||
SymbolKind::Lookahead | SymbolKind::Lookbehind | SymbolKind::Error => {}
|
||||
SymbolKind::AmbiguousId(ref id) => {
|
||||
panic!("ambiguous id `{}` encountered after name resolution", id)
|
||||
|
@ -355,7 +355,7 @@ impl<'grammar> TypeInferencer<'grammar> {
|
||||
SymbolKind::Terminal(ref id) => Ok(self.types.terminal_type(id).clone()),
|
||||
SymbolKind::Nonterminal(ref id) => self.nonterminal_type(id),
|
||||
SymbolKind::Choose(ref s) => self.symbol_type(&s.kind),
|
||||
SymbolKind::Name(_, _, ref s) => self.symbol_type(&s.kind),
|
||||
SymbolKind::Name(_, ref s) => self.symbol_type(&s.kind),
|
||||
SymbolKind::Error => Ok(self.types.error_recovery_type().clone()),
|
||||
|
||||
SymbolKind::Repeat(..)
|
||||
|
@ -7,7 +7,7 @@ use util::strip;
|
||||
use lalrpop_util::ParseError;
|
||||
|
||||
use super::Top;
|
||||
//do
|
||||
|
||||
grammar<'input>(text: &'input str);
|
||||
|
||||
pub Top: Top = {
|
||||
@ -81,13 +81,9 @@ TypeBoundParameter: TypeBoundParameter<TypeRef> = {
|
||||
};
|
||||
|
||||
Plus<T>: Vec<T> = {
|
||||
<v:(<T> "+")*> <e:T?> => match e {
|
||||
<mut v:(<T> "+")*> <e:T?> => match e {
|
||||
None => v,
|
||||
Some(e) => {
|
||||
let mut v = v;
|
||||
v.push(e);
|
||||
v
|
||||
}
|
||||
Some(e) => { v.push(e); v }
|
||||
}
|
||||
};
|
||||
|
||||
@ -188,7 +184,7 @@ ExprSymbol: ExprSymbol =
|
||||
|
||||
Symbol: Symbol = {
|
||||
<lo:@L> "<" <m:"mut"?> @L <l:Id> ":" <s:Symbol0> ">" <hi:@R> =>
|
||||
Symbol::new(Span(lo, hi), SymbolKind::Name(m.is_some(), l, Box::new(s))),
|
||||
Symbol::new(Span(lo, hi), SymbolKind::Name(Name::new(m.is_some(), l), Box::new(s))),
|
||||
|
||||
<lo:@L> "<" <s:Symbol0> ">" <hi:@R> =>
|
||||
Symbol::new(Span(lo, hi), SymbolKind::Choose(Box::new(s))),
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user