Move builtin functions to 'global' package

12 files changed, 12 insertions, 15 deletions

diff --git a/src/main/com/jantuomi/tunkki/core/runtime/State.java b/src/main/com/jantuomi/tunkki/core/runtime/State.java
index 742e603..cdcbacd 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/State.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/State.java
@@ -2,7 +2,7 @@ package com.jantuomi.tunkki.core.runtime;
 
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
 import com.jantuomi.tunkki.core.parser.datatype.NadaDatatype;
-import com.jantuomi.tunkki.core.runtime.builtins.BuiltinManager;
+import com.jantuomi.tunkki.core.runtime.builtins.globals.BuiltinManager;
 import com.jantuomi.tunkki.exception.TunkkiError;
 
 import java.util.Arrays;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/AsIntBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/AsIntBuiltinFunction.java
index 2c18e11..adb5209 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/AsIntBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/AsIntBuiltinFunction.java
@@ -1,4 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import com.jantuomi.tunkki.core.parser.datatype.BooleanDatatype;
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/BuiltinFunction.java
index af02f5f..4efa1da 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/BuiltinFunction.java
@@ -1,4 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
 import com.jantuomi.tunkki.core.runtime.Function;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/BuiltinManager.java
index c902f44..5d6e5c2 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/BuiltinManager.java
@@ -1,6 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
-
-import com.jantuomi.tunkki.core.runtime.Function;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/ConcatBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/ConcatBuiltinFunction.java
index 8e3ca68..30becdc 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/ConcatBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/ConcatBuiltinFunction.java
@@ -1,4 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
 import com.jantuomi.tunkki.core.parser.datatype.StringDatatype;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/ContainsBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/ContainsBuiltinFunction.java
index 256340a..ebcc3b5 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/ContainsBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/ContainsBuiltinFunction.java
@@ -1,4 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import com.jantuomi.tunkki.core.parser.datatype.BooleanDatatype;
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/EqualsBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/EqualsBuiltinFunction.java
index 6b1ed1a..3a8f525 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/EqualsBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/EqualsBuiltinFunction.java
@@ -1,4 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import com.jantuomi.tunkki.core.parser.datatype.BooleanDatatype;
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/GetBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/GetBuiltinFunction.java
index 117ada2..2dd388d 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/GetBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/GetBuiltinFunction.java
@@ -1,4 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
 import com.jantuomi.tunkki.core.parser.datatype.IntegerDatatype;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/IncludeBuiltinFunction.java
index 8db1d62..c3965e5 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/IncludeBuiltinFunction.java
@@ -1,7 +1,6 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 
-import com.jantuomi.tunkki.Main;
 import com.jantuomi.tunkki.Tunkki;
 import com.jantuomi.tunkki.core.CommandLineArgumentContainer;
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/InputBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/InputBuiltinFunction.java
index 3c10566..40ce3ab 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/InputBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/InputBuiltinFunction.java
@@ -1,4 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
 import com.jantuomi.tunkki.core.parser.datatype.StringDatatype;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/ListBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/ListBuiltinFunction.java
index a524d60..3743bbd 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/ListBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/ListBuiltinFunction.java
@@ -1,4 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
 import com.jantuomi.tunkki.core.parser.datatype.ListDatatype;
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutputBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/OutputBuiltinFunction.java
index ea86d48..e3b1e15 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutputBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/globals/OutputBuiltinFunction.java
@@ -1,4 +1,4 @@
-package com.jantuomi.tunkki.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins.globals;
 
 import com.jantuomi.tunkki.core.parser.datatype.Datatype;
 import com.jantuomi.tunkki.core.parser.datatype.VoidDatatype;