aboutsummaryrefslogtreecommitdiffstats
path: root/src/compiler.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler.rs')
-rw-r--r--src/compiler.rs27
1 files changed, 22 insertions, 5 deletions
diff --git a/src/compiler.rs b/src/compiler.rs
index 218711c..5808abe 100644
--- a/src/compiler.rs
+++ b/src/compiler.rs
@@ -198,6 +198,27 @@ impl Compiler {
}
}
+ fn statement(&mut self, block: &mut Block) {
+ match self.peek() {
+ Token::Print => {
+ self.eat();
+ self.expression(block);
+ block.add(Op::Print, self.line());
+ if self.eat() != Token::Newline {
+ self.error("Expect newline after expression.");
+ }
+ },
+
+ _ => {
+ self.expression(block);
+ if self.eat() != Token::Newline {
+ self.error("Expect newline after expression.");
+ }
+ block.add(Op::Pop, None);
+ }
+ }
+ }
+
pub fn compile(&mut self, name: &str, file: &Path) -> Block {
let mut block = Block::new(name, file);
@@ -206,12 +227,8 @@ impl Compiler {
break;
}
- self.expression(&mut block);
- block.add(Op::Print, self.line());
+ self.statement(&mut block);
- if self.eat() != Token::Newline {
- self.error("Invalid expression");
- }
}
block.add(Op::Return, self.line());