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

still more meta's

This commit is contained in:
greg 2019-09-20 02:05:57 -07:00
parent f5d1c89574
commit cf9ce74394
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
schala-lang/language/src/ast.rs
View File

@ -300,11 +300,11 @@ pub enum PatternLiteral {
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub struct Enumerator { pub struct Enumerator {
pub id: Rc<String>, pub id: Rc<String>,
pub generator: Meta<Expression>, pub generator: Expression,
} }
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub enum ForBody { pub enum ForBody {
MonadicReturn(Meta<Expression>), MonadicReturn(Expression),
StatementBlock(Block), StatementBlock(Block),
} }

6
schala-lang/language/src/parsing/test.rs
View File

@ -601,14 +601,14 @@ fn for_expr() {
parse_test_wrap_ast! { parse_test_wrap_ast! {
"for { a <- maybeValue } return 1", "for { a <- maybeValue } return 1",
exst!(ForExpression { exst!(ForExpression {
enumerators: vec![Enumerator { id: rc!(a), generator: ex!(m val!("maybeValue")) }], enumerators: vec![Enumerator { id: rc!(a), generator: ex!(val!("maybeValue")) }],
body: bx!(MonadicReturn(Meta::new(ex!(s "1")))) body: bx!(MonadicReturn(ex!(s "1")))
}) })
} }
parse_test_wrap_ast! { parse_test_wrap_ast! {
"for n <- someRange { f(n); }", "for n <- someRange { f(n); }",
exst!(ForExpression { enumerators: vec![Enumerator { id: rc!(n), generator: ex!(m val!("someRange"))}], exst!(ForExpression { enumerators: vec![Enumerator { id: rc!(n), generator: ex!(val!("someRange"))}],
body: bx!(ForBody::StatementBlock(vec![exst!(s "f(n)")])) body: bx!(ForBody::StatementBlock(vec![exst!(s "f(n)")]))
}) })
} }