From 92f18d8f4278a6e6322c4162f78494762ba7cbb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= <edvard.thornros@gmail.com>
Date: Wed, 13 Jan 2021 14:46:10 +0100
Subject: Change the assignment syntax

---
 src/compiler.rs  | 17 +++++++++++++----
 src/tokenizer.rs |  3 +++
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/compiler.rs b/src/compiler.rs
index b7e946c..c59de4d 100644
--- a/src/compiler.rs
+++ b/src/compiler.rs
@@ -446,6 +446,15 @@ impl Compiler {
         self.stack.truncate(h);
     }
 
+    fn type_ident(&mut self) -> Result<Type, ()> {
+        if let Token::Identifier(typ) = self.peek() {
+            self.eat();
+            Type::try_from(typ.as_ref())
+        } else {
+            Err(())
+        }
+    }
+
     fn statement(&mut self, block: &mut Block) {
         self.clear_panic();
 
@@ -462,14 +471,14 @@ impl Compiler {
                 block.add(Op::Print, self.line());
             },
 
-            tokens!(Token::Identifier(name), Token::Identifier(typ), Token::ColonEqual) => {
-                self.eat();
+            tokens!(Token::Identifier(name), Token::Colon) => {
                 self.eat();
                 self.eat();
-                if let Ok(typ) = Type::try_from(typ.as_ref()) {
+                if let Ok(typ) = self.type_ident() {
+                    expect!(self, Token::Equal, "Expected assignment.");
                     self.define_variable(&name, typ, block);
                 } else {
-                    error!(self, format!("Failed to parse type '{}'.", typ));
+                    error!(self, format!("Expected type found '{:?}'.", self.peek()));
                 }
             }
 
diff --git a/src/tokenizer.rs b/src/tokenizer.rs
index 62397c5..2e28cd2 100644
--- a/src/tokenizer.rs
+++ b/src/tokenizer.rs
@@ -96,6 +96,9 @@ pub enum Token {
     #[token("<=")]
     LessEqual,
 
+    #[token("|")]
+    Pipe,
+
     #[token("&&")]
     And,
     #[token("||")]
-- 
cgit v1.2.1