From 57d42227467fc5eeeac2baf30a2d2c5d7df99eaa Mon Sep 17 00:00:00 2001
From: greg <greg.shuflin@protonmail.com>
Date: Thu, 7 Sep 2017 22:29:23 -0700
Subject: [PATCH] Operators, keywords largely working

---
 src/schala_lang/parsing.rs | 37 ++++++++++++++++++++++++++++++++-----
 test.schala                | 21 ++++++++++++++++++++-
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/schala_lang/parsing.rs b/src/schala_lang/parsing.rs
index 71460f6..d17c35f 100644
--- a/src/schala_lang/parsing.rs
+++ b/src/schala_lang/parsing.rs
@@ -16,6 +16,7 @@ pub enum TokenType {
   LSquareBracket, RSquareBracket,
   LAngleBracket, RAngleBracket,
   LCurlyBrace, RCurlyBrace,
+  Pipe,
 
   Comma, Period, Colon, Underscore,
 
@@ -30,11 +31,13 @@ pub enum TokenType {
 
 #[derive(Debug, Clone, Copy)]
 pub enum Kw {
-  If,
-  Else,
+  If, Else,
   Func,
   For,
-  Loop,
+  Var, Const, Let,
+  Type, SelfType, SelfIdent,
+  Trait, Impl,
+  True, False
 }
 
 lazy_static! {
@@ -42,6 +45,18 @@ lazy_static! {
     hashmap! {
       "if" => Kw::If,
       "else" => Kw::Else,
+      "fn" => Kw::Func,
+      "for" => Kw::For,
+      "var" => Kw::Var,
+      "const" => Kw::Const,
+      "let" => Kw::Let,
+      "type" => Kw::Type,
+      "Self" => Kw::SelfType,
+      "self" => Kw::SelfIdent,
+      "trait" => Kw::Trait,
+      "impl" => Kw::Impl,
+      "true" => Kw::True,
+      "false" => Kw::False,
     };
 }
 
@@ -85,13 +100,14 @@ pub fn tokenize(input: &str) -> Vec<Token> {
         }
         continue;
       },
-      c if char::is_whitespace(c) && c != '\n' => continue,
+      c if c.is_whitespace() && c != '\n' => continue,
       '\n' => Newline, ';' => Semicolon,
       ':' => Colon, ',' => Comma, '.' => Period,
       '(' => LParen, ')' => RParen,
       '{' => LCurlyBrace, '}' => RCurlyBrace,
       '<' => LAngleBracket, '>' => RAngleBracket,
       '[' => LSquareBracket, ']' => RSquareBracket,
+      '|' => Pipe,
       '"' => handle_quote(&mut input),
       c if is_digit(&c) => handle_digit(c, &mut input),
       c @ '_' | c if c.is_alphabetic() => handle_alphabetic(c, &mut input), //TODO I'll probably have to rewrite this if I care about types being uppercase, also type parameterization
@@ -163,7 +179,18 @@ fn handle_alphabetic(c: char, input: &mut CharIter) -> TokenType {
 }
 
 fn handle_operator(c: char, input: &mut CharIter) -> TokenType {
-  unimplemented!()
+  let mut buf = String::new();
+  buf.push(c);
+  loop {
+    match input.peek().map(|&(_, c)| { c }) {
+      Some(c) if !c.is_alphabetic() && !c.is_whitespace() => {
+        input.next();
+        buf.push(c);
+      },
+      _ => break
+    }
+  }
+  TokenType::Operator(Rc::new(buf))
 }
 
 
diff --git a/test.schala b/test.schala
index 294bb74..a4f1aa7 100644
--- a/test.schala
+++ b/test.schala
@@ -49,7 +49,26 @@ fn main() {
 
   #syntax is, I guess, for <expr> <brace-block>, where <expr> is a bool, or a <arrow-expr>
 
-  type Maybe<T> = None | Some<T>
+  # type level alises
+ typealias <name> = <other type>
+ 
+ #declaring types of all stripes
+ type MyData = { a: i32, b: String }
+ type MyType = MyType
+ type Option<a> = None | Some(a)
+ type Signal = Absence | SimplePresence(i32) | ComplexPresence {a: i32, b: MyCustomData}
+
+ #traits
+ 
+ trait Bashable { }
+ trait Luggable {
+  fn lug(self, a: Option<Self>)
+ }
+
+
+type <name> = struct { <field> : <type>,* }
+type <name> = Variant1 | Variant2(type, type) | Variant3 struct { }
+
 
   fuck.map(fn(x) { x + 10 })