8 files changed, 16 insertions, 21 deletions
diff --git a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/Tokenizer.java b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/Tokenizer.java
index b793a8a..2449e0a 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/Tokenizer.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/Tokenizer.java
@@ -2,7 +2,6 @@ package com.jantuomi.tunkki.core.parser.tokenizer;
 
 
 import com.jantuomi.tunkki.core.parser.tokenizer.token.Token;
-import com.jantuomi.tunkki.exception.ExceptionManager;
 import com.jantuomi.tunkki.exception.types.IllegalTokenTunkkiError;
 import com.jantuomi.tunkki.exception.types.TunkkiError;
 
@@ -56,10 +55,9 @@ public class Tokenizer {
         tokenRegexes.put(Token.Type.EqualsToken, "^(\\=\\=)");
         tokenRegexes.put(Token.Type.NotEqualsToken, "^(\\!\\=)");
         tokenRegexes.put(Token.Type.OpenParenToken, "^(\\()");
-        tokenRegexes.put(Token.Type.CallEndToken, "^(\\!)");
-        tokenRegexes.put(Token.Type.FunctionDefineToken, "^(func)\\b");
-        tokenRegexes.put(Token.Type.FunctionBodyToken, "^(as)\\b");
-        tokenRegexes.put(Token.Type.EndBlockToken, "^(end)\\b");
+        tokenRegexes.put(Token.Type.BlockEndToken, "^(\\!)");
+        tokenRegexes.put(Token.Type.FunctionDefineToken, "^(\\@)");
+        tokenRegexes.put(Token.Type.FunctionBodyToken, "^(\\|)");
         tokenRegexes.put(Token.Type.NegationToken, "^(not)\\b");
         tokenRegexes.put(Token.Type.DeclarationToken, "^(decl)\\b");
 
diff --git a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/Token.java b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/Token.java
index d672b34..d53ea68 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/Token.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/Token.java
@@ -49,7 +49,7 @@ abstract public class Token {
         NotEqualsToken,
 
         OpenParenToken,
-        CallEndToken,
+        BlockEndToken,
 
         FunctionDefineToken,
         DeclarationToken,
@@ -65,7 +65,6 @@ abstract public class Token {
         SymbolToken,
         CallToken,
 
-        EndBlockToken,
         FunctionBodyToken,
         NegationToken,
 
diff --git a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/TokenFactory.java b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/TokenFactory.java
index ec5cf55..588af63 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/TokenFactory.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/TokenFactory.java
@@ -44,10 +44,8 @@ public class TokenFactory {
                 return new DivisionToken();
             case FunctionDefineToken:
                 return new FunctionDefineToken();
-            case EndBlockToken:
-                return new EndBlockToken();
             case FunctionBodyToken:
-                return new BlockBodyToken("as");
+                return new BlockBodyToken();
             case DeclarationToken:
                 return new VariableDeclareToken();
             case AssignmentToken:
@@ -58,8 +56,8 @@ public class TokenFactory {
                 return new SymbolToken(text);
             case CallToken:
                 return new CallToken(text, rawText);
-            case CallEndToken:
-                return new CallEndToken();
+            case BlockEndToken:
+                return new BlockEndToken();
             case ObjectMemberToken:
                 return new ObjectMemberToken(text, rawText);
             case NegationToken:
diff --git a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/BlockBodyToken.java b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/BlockBodyToken.java
index 48332f2..f1258c7 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/BlockBodyToken.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/BlockBodyToken.java
@@ -12,8 +12,8 @@ import java.util.List;
  * Created by jan on 16.6.2016.
  */
 public class BlockBodyToken extends VarargOperatorToken {
-    public BlockBodyToken(String keyword) {
-        super(Type.FunctionBodyToken, keyword);
+    public BlockBodyToken() {
+        super(Type.FunctionBodyToken, "|");
     }
 
     @Override
@@ -30,6 +30,6 @@ public class BlockBodyToken extends VarargOperatorToken {
 
     @Override
     public Type getTerminatorTokenType() {
-        return Type.EndBlockToken;
+        return Type.BlockEndToken;
     }
 }
diff --git a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/CallEndToken.java b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/BlockEndToken.java
index e90e929..2204bfe 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/CallEndToken.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/BlockEndToken.java
@@ -5,9 +5,9 @@ import com.jantuomi.tunkki.core.parser.ast.ASTNode;
 /**
  * Created by jan on 19.6.2016.
  */
-public class CallEndToken extends TerminalToken {
-    public CallEndToken() {
-        super(Type.CallEndToken);
+public class BlockEndToken extends TerminalToken {
+    public BlockEndToken() {
+        super(Type.BlockEndToken);
     }
 
     @Override
diff --git a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/CallToken.java b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/CallToken.java
index 2b34cd7..c304eae 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/CallToken.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/CallToken.java
@@ -35,6 +35,6 @@ public class CallToken extends VarargOperatorToken {
 
     @Override
     public Type getTerminatorTokenType() {
-        return Type.CallEndToken;
+        return Type.BlockEndToken;
     }
 }
diff --git a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/EndBlockToken.java b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/EndBlockToken.java
index 9ec4b5f..cfcf14a 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/EndBlockToken.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/EndBlockToken.java
@@ -7,7 +7,7 @@ import com.jantuomi.tunkki.core.parser.ast.ASTNode;
  */
 public class EndBlockToken extends TerminalToken {
     public EndBlockToken() {
-        super(Type.EndBlockToken, "end");
+        super(Type.BlockEndToken, "!");
     }
 
     @Override
diff --git a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/FunctionDefineToken.java b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/FunctionDefineToken.java
index 34a73f6..bf55c88 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/FunctionDefineToken.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/FunctionDefineToken.java
@@ -14,7 +14,7 @@ import java.util.List;
  */
 public class FunctionDefineToken extends VarargOperatorToken {
     public FunctionDefineToken() {
-        super(Type.FunctionDefineToken, "func");
+        super(Type.FunctionDefineToken, "@");
     }
 
     @Override