Skip to content
Snippets Groups Projects
Commit 29bf0fdb authored by Aaron Councilman's avatar Aaron Councilman
Browse files

Making Juno struct syntax more like rust

parent d00ffc3a
No related branches found
No related tags found
1 merge request!186Rodinia
...@@ -99,13 +99,18 @@ TypeDef -> Result<TyDef, ()> ...@@ -99,13 +99,18 @@ TypeDef -> Result<TyDef, ()>
; ;
ObjFields -> Result<Vec<ObjField>, ()> ObjFields -> Result<Vec<ObjField>, ()>
: { Ok(vec![]) } : ObjFieldList { Ok($1?.into_iter().collect()) }
| ObjFields ObjField { flatten($1, $2) } ;
ObjFieldList -> Result<VecDeque<ObjField>, ()>
: { Ok(VecDeque::new()) }
| ObjField { Ok(VecDeque::from([$1?])) }
| ObjField ',' ObjFieldList { let mut lst = $3?; lst.push_front($1?); Ok(lst) }
| ObjField ';' ObjFieldList { let mut lst = $3?; lst.push_front($1?); Ok(lst) }
; ;
ObjField -> Result<ObjField, ()> ObjField -> Result<ObjField, ()>
: PubOption 'ID' ';' : PubOption 'ID'
{ Ok(ObjField{ span : $span, public : $1?, name : span_of_tok($2)?, typ : None }) } { Ok(ObjField{ span : $span, public : $1?, name : span_of_tok($2)?, typ : None }) }
| PubOption 'ID' ':' Type ';' | PubOption 'ID' ':' Type
{ Ok(ObjField{ span : $span, public : $1?, name : span_of_tok($2)?, typ : Some($4?) }) } { Ok(ObjField{ span : $span, public : $1?, name : span_of_tok($2)?, typ : Some($4?) }) }
; ;
...@@ -457,12 +462,16 @@ Expr -> Result<Expr, ()> ...@@ -457,12 +462,16 @@ Expr -> Result<Expr, ()>
{ Ok(Expr::IntrinsicExpr{ span : $span, name : $1?, ty_args : Some($5?), args: $8? }) } { Ok(Expr::IntrinsicExpr{ span : $span, name : $1?, ty_args : Some($5?), args: $8? }) }
; ;
IdExprs -> Result<Vec<(Id, Expr)>, ()> IdExprs -> Result<Vec<(Id, Expr)>, ()>
: 'ID' '=' Expr { Ok(vec![(span_of_tok($1)?, $3?)]) } : IdExprList { Ok($1?.into_iter().collect()) }
| IdExprsS ',' 'ID' '=' Expr { flatten($1, res_pair(span_of_tok($3), $5)) } ;
IdExprList -> Result<VecDeque<(Id, Expr)>, ()>
: { Ok(VecDeque::new()) }
| IdExpr { Ok(VecDeque::from([$1?])) }
| IdExpr ',' IdExprList { let mut lst = $3?; lst.push_front($1?); Ok(lst) }
; ;
IdExprsS -> Result<Vec<(Id, Expr)>, ()> IdExpr -> Result<(Id, Expr), ()>
: 'ID' '=' Expr { Ok(vec![(span_of_tok($1)?, $3?)]) } : 'ID' ':' Expr { Ok((span_of_tok($1)?, $3?)) }
| IdExprsS ',' 'ID' '=' Expr { flatten($1, res_pair(span_of_tok($3), $5)) } | 'ID' '=' Expr { Ok((span_of_tok($1)?, $3?)) }
; ;
Params -> Result<Vec<(bool, Expr)>, ()> Params -> Result<Vec<(bool, Expr)>, ()>
: { Ok(vec![]) } : { Ok(vec![]) }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment