Rename ObjectDefinition to ObjectPrototype

5 files changed, 11 insertions, 11 deletions

diff --git a/src/main/com/jantuomi/tunkki/core/parser/ast/ObjectDefinitionNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/ObjectPrototypeNode.java
index d02fb0c..abffba4 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/ast/ObjectDefinitionNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/ObjectPrototypeNode.java
@@ -13,8 +13,8 @@ import java.util.Collections;
 /**
  * Created by jan on 8.8.2016.
  */
-public class ObjectDefinitionNode extends NullaryOperatorNode {
-    public ObjectDefinitionNode(Token token, String name, CallableDatatype constructor) {
+public class ObjectPrototypeNode extends NullaryOperatorNode {
+    public ObjectPrototypeNode(Token token, String name, CallableDatatype constructor) {
         super(token);
         this.name = name;
         this.constructor = constructor;
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 9515abf..1cd5a2f 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/Tokenizer.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/Tokenizer.java
@@ -61,7 +61,7 @@ public class Tokenizer {
         tokenRegexes.put(Token.Type.NegationToken, "^(not)\\b");
         tokenRegexes.put(Token.Type.DeclarationToken, "^(decl)\\b");
 
-        tokenRegexes.put(Token.Type.ObjectDefinitionToken, "^(obj)\\b");
+        tokenRegexes.put(Token.Type.ObjectPrototypeToken, "^(obj)\\b");
         tokenRegexes.put(Token.Type.CallToken, "^([a-öA-Ö]+\\w*)\\?[\\s|\\!]");
         tokenRegexes.put(Token.Type.ObjectMemberToken, "^([a-öA-Ö]+)\\:");
         tokenRegexes.put(Token.Type.SymbolToken, "^([a-öA-Ö]+\\w*)\\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 21ccbaf..83a6712 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
@@ -70,7 +70,7 @@ abstract public class Token {
 
         DeclareAssignToken,
         ObjectMemberToken,
-        ObjectDefinitionToken,
+        ObjectPrototypeToken,
         NotAToken
     }
 
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 326958d..fd3102c 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
@@ -56,8 +56,8 @@ public class TokenFactory {
                 return new SymbolToken(text);
             case CallToken:
                 return new CallToken(text, rawText);
-            case ObjectDefinitionToken:
-                return new ObjectDefinitionToken();
+            case ObjectPrototypeToken:
+                return new ObjectPrototypeToken();
             case BlockEndToken:
                 return new BlockEndToken();
             case ObjectMemberToken:
diff --git a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/ObjectDefinitionToken.java b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/ObjectPrototypeToken.java
index 8215c26..6b54f52 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/ObjectDefinitionToken.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/tokenizer/token/types/ObjectPrototypeToken.java
@@ -2,7 +2,7 @@ package com.jantuomi.tunkki.core.parser.tokenizer.token.types;
 
 import com.jantuomi.tunkki.core.parser.ast.ASTNode;
 import com.jantuomi.tunkki.core.parser.ast.FunctionDefineNode;
-import com.jantuomi.tunkki.core.parser.ast.ObjectDefinitionNode;
+import com.jantuomi.tunkki.core.parser.ast.ObjectPrototypeNode;
 import com.jantuomi.tunkki.core.parser.ast.SymbolNode;
 import com.jantuomi.tunkki.core.parser.datatype.CallableDatatype;
 import com.jantuomi.tunkki.core.parser.tokenizer.token.Token;
@@ -12,9 +12,9 @@ import com.jantuomi.tunkki.exception.types.TunkkiError;
 /**
  * Created by jan on 8.8.2016.
  */
-public class ObjectDefinitionToken extends VarargOperatorToken {
-    public ObjectDefinitionToken() {
-        super(Type.ObjectDefinitionToken, "obj");
+public class ObjectPrototypeToken extends VarargOperatorToken {
+    public ObjectPrototypeToken() {
+        super(Type.ObjectPrototypeToken, "obj");
     }
 
     @Override
@@ -44,7 +44,7 @@ public class ObjectDefinitionToken extends VarargOperatorToken {
 
         FunctionDefineNode constructor = (FunctionDefineNode) funcArg.generateNode();
         CallableDatatype constructorCallable = (CallableDatatype) constructor.evaluate();
-        ObjectDefinitionNode node = new ObjectDefinitionNode(this, name, constructorCallable);
+        ObjectPrototypeNode node = new ObjectPrototypeNode(this, name, constructorCallable);
         node.setName(name);
         return node;
     }