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

Rename ASTNode -> AST 

saves typing
This commit is contained in:
greg 2015-07-22 02:54:30 -07:00
parent dbdae42c1b
commit 044e7a6a26
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@ -26,16 +26,16 @@ enum Token {
} }
#[derive(Debug)] #[derive(Debug)]
enum ASTNode { enum AST {
Name(String), Name(String),
LangString(String), LangString(String),
Number(f64), Number(f64),
BinOp(Box<ASTNode>, Box<ASTNode>, Box<ASTNode>), BinOp(Box<AST>, Box<AST>, Box<AST>),
Binding(String, Box<ASTNode>) Binding(String, Box<AST>)
} }
enum ParseResult { enum ParseResult {
Ok(ASTNode), Ok(AST),
Err(String) Err(String)
} }
@ -177,17 +177,17 @@ fn let_expression<'a>(input: &mut Iter<Token>) -> ParseResult {
if s == "=" { if s == "=" {
let next = input.next(); let next = input.next();
if let Some(&Identifier(ref value)) = next { if let Some(&Identifier(ref value)) = next {
let ast = ASTNode::Binding(name.clone(), Box::new(ASTNode::Name(value.clone()))); let ast = AST::Binding(name.clone(), Box::new(AST::Name(value.clone())));
return ParseResult::Ok(ast); return ParseResult::Ok(ast);
} }
if let Some(&StrLiteral(ref value)) = next { if let Some(&StrLiteral(ref value)) = next {
let ast = ASTNode::Binding(name.clone(), Box::new(ASTNode::LangString(value.clone()))); let ast = AST::Binding(name.clone(), Box::new(AST::LangString(value.clone())));
return ParseResult::Ok(ast); return ParseResult::Ok(ast);
} }
if let Some(&NumLiteral(n)) = next { if let Some(&NumLiteral(n)) = next {
let ast = ASTNode::Binding(name.clone(), Box::new(ASTNode::Number(n))); let ast = AST::Binding(name.clone(), Box::new(AST::Number(n)));
return ParseResult::Ok(ast); return ParseResult::Ok(ast);
} }
} }