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

Type alias Vec<String> -> Block

This commit is contained in:
greg 2018-05-06 23:09:03 -07:00
parent 670833185b
commit 7686707602
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
schala-lang/src/parsing.rs
View File

@ -169,6 +169,8 @@ pub enum Statement {
Declaration(Declaration), Declaration(Declaration),
} }
type Block = Vec<Statement>;
type ParamName = Rc<String>; type ParamName = Rc<String>;
type InterfaceName = Rc<String>; //should be a singleton I think?? type InterfaceName = Rc<String>; //should be a singleton I think??
type FormalParam = (ParamName, Option<TypeName>); type FormalParam = (ParamName, Option<TypeName>);
@ -176,7 +178,7 @@ type FormalParam = (ParamName, Option<TypeName>);
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub enum Declaration { pub enum Declaration {
FuncSig(Signature), FuncSig(Signature),
FuncDecl(Signature, Vec<Statement>), FuncDecl(Signature, Block),
TypeDecl(TypeSingletonName, TypeBody), //should have TypeSingletonName in it TypeDecl(TypeSingletonName, TypeBody), //should have TypeSingletonName in it
TypeAlias(Rc<String>, Rc<String>), //should have TypeSingletonName in it, or maybe just String, not sure TypeAlias(Rc<String>, Rc<String>), //should have TypeSingletonName in it, or maybe just String, not sure
Binding { Binding {
@ -249,12 +251,12 @@ pub enum ExpressionType {
indexee: Box<Expression>, indexee: Box<Expression>,
indexers: Vec<Expression>, indexers: Vec<Expression>,
}, },
IfExpression(Box<Expression>, Vec<Statement>, Option<Vec<Statement>>), IfExpression(Box<Expression>, Block, Option<Block>),
MatchExpression(Box<Expression>, Vec<MatchArm>), MatchExpression(Box<Expression>, Vec<MatchArm>),
ForExpression, ForExpression,
Lambda { Lambda {
params: Vec<FormalParam>, params: Vec<FormalParam>,
body: Vec<Statement>, body: Block,
}, },
ListLiteral(Vec<Expression>), ListLiteral(Vec<Expression>),
} }
@ -702,7 +704,7 @@ impl Parser {
Ok(Expression(ExpressionType::IfExpression(bx!(condition), then_clause, else_clause), None)) Ok(Expression(ExpressionType::IfExpression(bx!(condition), then_clause, else_clause), None))
}); });
parse_method!(else_clause(&mut self) -> ParseResult<Option<Vec<Statement>>> { parse_method!(else_clause(&mut self) -> ParseResult<Option<Block>> {
Ok(if let Keyword(Kw::Else) = self.peek() { Ok(if let Keyword(Kw::Else) = self.peek() {
self.next(); self.next();
Some(self.block()?) Some(self.block()?)
@ -711,7 +713,7 @@ impl Parser {
}) })
}); });
parse_method!(block(&mut self) -> ParseResult<Vec<Statement>> { parse_method!(block(&mut self) -> ParseResult<Block> {
Ok(delimited!(self, LCurlyBrace, '{', statement, Newline | Semicolon, RCurlyBrace, '}', nonstrict)) Ok(delimited!(self, LCurlyBrace, '{', statement, Newline | Semicolon, RCurlyBrace, '}', nonstrict))
}); });