From 10d98039cbd7b8c2dae808761705ce64de2c69f6 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Tue, 26 Jul 2016 19:58:48 +0300 Subject: Rename builtins out and in to output and input --- .../core/runtime/builtins/BuiltinManager.java | 4 +-- .../core/runtime/builtins/InBuiltinFunction.java | 36 ---------------------- .../runtime/builtins/InputBuiltinFunction.java | 36 ++++++++++++++++++++++ .../core/runtime/builtins/OutBuiltinFunction.java | 31 ------------------- .../runtime/builtins/OutputBuiltinFunction.java | 31 +++++++++++++++++++ 5 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 src/main/com/jantuomi/tunkki/core/runtime/builtins/InBuiltinFunction.java create mode 100644 src/main/com/jantuomi/tunkki/core/runtime/builtins/InputBuiltinFunction.java delete mode 100644 src/main/com/jantuomi/tunkki/core/runtime/builtins/OutBuiltinFunction.java create mode 100644 src/main/com/jantuomi/tunkki/core/runtime/builtins/OutputBuiltinFunction.java (limited to 'src/main/com') diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java index 02d65c3..94d25a6 100644 --- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java +++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java @@ -18,8 +18,8 @@ public class BuiltinManager { private List builtins = new ArrayList<>(); private BuiltinManager() { - builtins.add(new OutBuiltinFunction()); - builtins.add(new InBuiltinFunction()); + builtins.add(new OutputBuiltinFunction()); + builtins.add(new InputBuiltinFunction()); builtins.add(new ConcatBuiltinFunction()); builtins.add(new AsIntBuiltinFunction()); builtins.add(new IncludeBuiltinFunction()); diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/InBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/InBuiltinFunction.java deleted file mode 100644 index 478633e..0000000 --- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/InBuiltinFunction.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.jantuomi.tunkki.core.runtime.builtins; - -import com.jantuomi.tunkki.core.parser.datatype.DataContainer; -import com.jantuomi.tunkki.core.parser.datatype.StringDataContainer; -import com.jantuomi.tunkki.exception.BorkError; - -import java.util.Arrays; -import java.util.List; -import java.util.Scanner; - -/** - * Created by jan on 21.6.2016. - */ -public class InBuiltinFunction extends BuiltinFunction { - public InBuiltinFunction() { - super( - Arrays.asList("expression") - ); - } - - @Override - public String getName() { - return "in"; - } - - @Override - public DataContainer evaluate(List params) throws BorkError { - if (params.size() > 0) { - DataContainer param = params.get(0); - System.out.print(param.getData().toString()); - } - Scanner in = new Scanner(System.in); - String userInput = in.nextLine(); - return new StringDataContainer(userInput); - } -} diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/InputBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/InputBuiltinFunction.java new file mode 100644 index 0000000..e30d69a --- /dev/null +++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/InputBuiltinFunction.java @@ -0,0 +1,36 @@ +package com.jantuomi.tunkki.core.runtime.builtins; + +import com.jantuomi.tunkki.core.parser.datatype.DataContainer; +import com.jantuomi.tunkki.core.parser.datatype.StringDataContainer; +import com.jantuomi.tunkki.exception.BorkError; + +import java.util.Arrays; +import java.util.List; +import java.util.Scanner; + +/** + * Created by jan on 21.6.2016. + */ +public class InputBuiltinFunction extends BuiltinFunction { + public InputBuiltinFunction() { + super( + Arrays.asList("expression") + ); + } + + @Override + public String getName() { + return "input"; + } + + @Override + public DataContainer evaluate(List params) throws BorkError { + if (params.size() > 0) { + DataContainer param = params.get(0); + System.out.print(param.getData().toString()); + } + Scanner in = new Scanner(System.in); + String userInput = in.nextLine(); + return new StringDataContainer(userInput); + } +} diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutBuiltinFunction.java deleted file mode 100644 index e85752b..0000000 --- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutBuiltinFunction.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jantuomi.tunkki.core.runtime.builtins; - -import com.jantuomi.tunkki.core.parser.datatype.DataContainer; -import com.jantuomi.tunkki.core.parser.datatype.VoidDataContainer; -import com.jantuomi.tunkki.exception.BorkError; - -import java.util.Arrays; -import java.util.List; - -/** - * Created by jan on 21.6.2016. - */ -public class OutBuiltinFunction extends BuiltinFunction { - public OutBuiltinFunction() { - super( - Arrays.asList("expression") - ); - } - - @Override - public String getName() { - return "out"; - } - - @Override - public DataContainer evaluate(List params) throws BorkError { - DataContainer param = params.get(0); - System.out.println(param.getData().toString()); - return new VoidDataContainer(); - } -} diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutputBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutputBuiltinFunction.java new file mode 100644 index 0000000..f87074d --- /dev/null +++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutputBuiltinFunction.java @@ -0,0 +1,31 @@ +package com.jantuomi.tunkki.core.runtime.builtins; + +import com.jantuomi.tunkki.core.parser.datatype.DataContainer; +import com.jantuomi.tunkki.core.parser.datatype.VoidDataContainer; +import com.jantuomi.tunkki.exception.BorkError; + +import java.util.Arrays; +import java.util.List; + +/** + * Created by jan on 21.6.2016. + */ +public class OutputBuiltinFunction extends BuiltinFunction { + public OutputBuiltinFunction() { + super( + Arrays.asList("expression") + ); + } + + @Override + public String getName() { + return "output"; + } + + @Override + public DataContainer evaluate(List params) throws BorkError { + DataContainer param = params.get(0); + System.out.println(param.getData().toString()); + return new VoidDataContainer(); + } +} -- cgit v1.3