greg
/
schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Subpattern field

This commit is contained in:
greg 2018-10-19 17:43:22 -07:00
parent e57d33eae7
commit fef66e345b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
schala-lang/language/src/reduced_ast.rs
View File

@ -58,14 +58,15 @@ pub enum Expr {
#[derive(Debug, Clone)]
pub struct Alternative {
pub tag: Option<usize>,
pub guard: Option<Expr>, //TODO should be a vec
pub subpatterns: Vec<Alternative>,
pub guard: Option<Expr>,
pub bound_vars: Vec<Option<Rc<String>>>, //remember that order matters here
pub item: Vec<Stmt>,
}
impl Alternative {
fn default(item: Vec<Stmt>) -> Alternative {
Alternative { tag: None, guard: None, bound_vars: vec![], item }
Alternative { tag: None, subpatterns: vec![], guard: None, bound_vars: vec![], item }
}
}
@ -216,9 +217,13 @@ impl Pattern {
}).collect();
*/
let guard = None;
let subpatterns = vec![];
Alternative {
tag: Some(tag),
guard: None,
subpatterns,
guard,
bound_vars,
item,
}
@ -251,6 +256,7 @@ impl Pattern {
});
Alternative {
tag: None,
subpatterns: vec![],
guard,
bound_vars: vec![],
item
@ -268,6 +274,7 @@ impl Pattern {
});
Alternative {
tag: None,
subpatterns: vec![],
guard,
bound_vars: vec![],
item
@ -277,6 +284,7 @@ impl Pattern {
Some(symbol) => handle_symbol(symbol, &vec![], item),
None => Alternative {
tag: None,
subpatterns: vec![],
guard: None,
bound_vars: vec![Some(var.clone())],
item