Add more entries to .gitignore.

This prevents infinite loops, as Link nodes do not follow regular
addInto behavior.

.gitignore

@@ -20,3 +20,12 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+# Custom Stuff
+# Gradle
+.gradle/*
+build/*
+
+# IntelliJ
+.idea/*
+abacus.iml

build.gradle

@@ -0,0 +1,22 @@
+apply plugin: 'java'
+apply plugin: 'application'
+
+sourceSets {
+  main {
+    java {
+      srcDirs = ['src']
+    }
+  }
+}
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+    testCompile 'junit:junit:4.12'
+}
+
+// Define the main class for the application
+mainClassName = 'org.nwapw.abacus.Abacus'
+

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Fri Jul 28 17:18:51 PDT 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'abacus'

src/org/nwapw/abacus/Abacus.java

@@ -1,10 +1,14 @@
 package org.nwapw.abacus;
 
 import org.nwapw.abacus.plugin.PluginManager;
+//import org.nwapw.abacus.plugin.StandardPlugin;
 import org.nwapw.abacus.plugin.StandardPlugin;
 import org.nwapw.abacus.window.Window;
+import org.nwapw.abacus.plugin.ClassFinder;
 
 import javax.swing.*;
+import java.io.IOException;
+import java.util.ArrayList;
 
 public class Abacus {
 
@@ -23,9 +27,16 @@ public class Abacus {
         }
         manager = new PluginManager();
         manager.addInstantiated(new StandardPlugin(manager));
+        try {
+            ClassFinder.loadJars("plugins")
+                    .forEach(plugin -> manager.addClass(plugin));
+        } catch (IOException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
         mainUi = new Window(manager);
         mainUi.setVisible(true);
         manager.load();
+
     }
 
     public static void main(String[] args){

src/org/nwapw/abacus/function/Function.java

@@ -2,6 +2,7 @@ package org.nwapw.abacus.function;
 
 import org.nwapw.abacus.number.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
+import org.nwapw.abacus.number.PreciseNumber;
 
 import java.util.HashMap;
 
@@ -17,6 +18,7 @@ public abstract class Function {
     private static final HashMap<Class<? extends NumberInterface>, Integer> priorityMap =
             new HashMap<Class<? extends NumberInterface>, Integer>() {{
                 put(NaiveNumber.class, 0);
+                put(PreciseNumber.class, 1);
             }};
 
     /**

src/org/nwapw/abacus/lexing/pattern/LinkNode.java

@@ -11,7 +11,10 @@ public class LinkNode<T> extends PatternNode<T> {
 
     @Override
     public void addInto(Collection<PatternNode<T>> into) {
-        addOutputsInto(into);
+        if(!into.contains(this)) {
+            into.add(this);
+            addOutputsInto(into);
+        }
     }
 
 }

src/org/nwapw/abacus/number/NaiveNumber.java

@@ -88,11 +88,15 @@ public class NaiveNumber implements NumberInterface {
     @Override
     public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
         if(toClass == this.getClass()) return this;
+        else if(toClass == PreciseNumber.class){
+            return new PreciseNumber(Double.toString(value));
+        }
         return null;
     }
 
     public String toString(){
-        return Double.toString(value);
+        double shiftBy = Math.pow(10, 10);
+        return Double.toString(Math.round(value * shiftBy) / shiftBy);
     }
 
 }

src/org/nwapw/abacus/number/PreciseNumber.java

@@ -0,0 +1,115 @@
+package org.nwapw.abacus.number;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.MathContext;
+import java.math.RoundingMode;
+
+public class PreciseNumber implements NumberInterface{
+
+    /**
+     * The number one.
+     */
+    static final PreciseNumber ONE = new PreciseNumber(BigDecimal.ONE);
+    /**
+     * The number zero.
+     */
+    static final PreciseNumber ZERO = new PreciseNumber(BigDecimal.ZERO);
+    /**
+     * The number ten.
+     */
+    static final PreciseNumber TEN = new PreciseNumber(BigDecimal.TEN);
+
+    /**
+     * The value of the PreciseNumber.
+     */
+    BigDecimal value;
+
+    /**
+     * Constructs a precise number from the given string.
+     * @param string a string representation of the number meeting the same conditions
+     *               as the BidDecimal(String) constructor.
+     */
+    public PreciseNumber(String string){
+        value = new BigDecimal(string);
+    }
+
+    /**
+     * Constructs a precise number from the given BigDecimal.
+     * @param value a BigDecimal object representing the value of the number.
+     */
+    public PreciseNumber(BigDecimal value){
+        this.value = value;
+    }
+
+    @Override
+    public int precision() {
+        return 54;
+    }
+
+    @Override
+    public NumberInterface multiply(NumberInterface multiplier) {
+        return new PreciseNumber(value.multiply(((PreciseNumber) multiplier).value));
+    }
+
+    @Override
+    public NumberInterface divide(NumberInterface divisor) {
+        return new PreciseNumber(value.divide(((PreciseNumber) divisor).value, this.precision(), RoundingMode.HALF_UP));
+    }
+
+    @Override
+    public NumberInterface add(NumberInterface summand) {
+        return new PreciseNumber(value.add(((PreciseNumber) summand).value));
+    }
+
+    @Override
+    public NumberInterface subtract(NumberInterface subtrahend) {
+        return new PreciseNumber(value.subtract(((PreciseNumber) subtrahend).value));
+    }
+
+    @Override
+    public NumberInterface intPow(int exponent) {
+        if(exponent == 0){
+            return PreciseNumber.ONE;
+        }
+        boolean takeReciprocal = exponent < 0;
+        exponent = Math.abs(exponent);
+        NumberInterface power = this;
+        for(int currentExponent = 1; currentExponent < exponent; currentExponent++){
+            power = power.multiply(this);
+        }
+        if(takeReciprocal){
+            power = PreciseNumber.ONE.divide(power);
+        }
+        return power;
+    }
+
+    @Override
+    public int compareTo(NumberInterface number) {
+        return value.compareTo(((PreciseNumber) number).value);
+    }
+
+    @Override
+    public int signum() {
+        return value.signum();
+    }
+
+    @Override
+    public NumberInterface negate(){
+        return new PreciseNumber(value.negate());
+    }
+
+    @Override
+    public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
+        if(toClass == this.getClass()){
+            return this;
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        BigDecimal rounded = value.setScale(precision() - 4, RoundingMode.HALF_UP);
+        return rounded.stripTrailingZeros().toPlainString();
+    }
+}

src/org/nwapw/abacus/plugin/ClassFinder.java

@@ -1,65 +1,76 @@
-package org.nwapw.abacus.plugin;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.zip.ZipInputStream;
-
-public class ClassFinder extends ClassLoader{
-
-    ArrayList<Class> classes;
-
-    public ClassFinder(){
-        super(ClassFinder.class.getClassLoader());
-        classes=new ArrayList();
-    }
-    public Class loadClass(String className) throws ClassNotFoundException{
-        return findClass(className);
-    }
-    public ArrayList<String> loadClass(File jarLocation) throws ClassNotFoundException, IOException{
-        return addJar(jarLocation);
-    }
-    public ArrayList<String> addJar(File jarLocation) throws IOException {
-        JarFile jarFolder = new JarFile(jarLocation);
-        Enumeration jarList = jarFolder.entries();
-        HashMap classSize = new HashMap();
-        HashMap classContent = new HashMap();
-        ArrayList<String> classNames = new ArrayList();
-        JarEntry tempJar;
-        ZipInputStream zipStream = new ZipInputStream(new BufferedInputStream(new FileInputStream(jarLocation)));
-        while(jarList.hasMoreElements()){
-            tempJar = (JarEntry)jarList.nextElement();
-            zipStream.getNextEntry();
-            if(!tempJar.isDirectory()) {
-                if (tempJar.getName().substring(tempJar.getName().indexOf('.')).equals(".class") && (tempJar.getName().length() < 9 || !tempJar.getName().substring(0, 9).equals("META-INF/"))) {
-                    int size = (int)tempJar.getSize();
-                    classSize.put(tempJar.getName(),new Integer((int)tempJar.getSize()));
-                    byte[] bytes = new byte[size];
-                    zipStream.read(bytes,0,size);
-                    classContent.put(tempJar.getName(),bytes);
-                    classNames.add(tempJar.getName());
-                }
-            }
-        }
-        jarFolder.close();
-        for(String name:classNames) {
-            classes.add(super.defineClass(name, (byte[]) classContent.get(name), 0, (int) classSize.get(name)));
-        }
-        return classNames;
-    }
-    public ArrayList<Class> getClasses(){
-        return classes;
-    }
-    public Class getClass(int number){
-        return classes.get(number);
-    }
-    public void delClasses(){
-        classes=new ArrayList();
-    }
-}
+package org.nwapw.abacus.plugin;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.stream.Collectors;
+
+/**
+ * Class that loads plugin classes from their jars.
+ */
+public class ClassFinder {
+
+    /**
+     * Loads all the plugin classes from the given plugin folder.
+     * @param filePath the path for the plugin folder.
+     * @return the list of all loaded classes.
+     * @throws IOException thrown if an error occurred scanning the plugin folder.
+     * @throws ClassNotFoundException thrown if the class listed in the file doesn't get loaded.
+     */
+    public static ArrayList<Class<?>> loadJars(String filePath) throws IOException, ClassNotFoundException {
+        return loadJars(new File(filePath));
+    }
+
+    /**
+     * Loads all the plugin classes from the given plugin folder.
+     * @param pluginFolderPath the folder in which to look for plugins.
+     * @return the list of all loaded classes.
+     * @throws IOException thrown if an error occurred scanning the plugin folder.
+     * @throws ClassNotFoundException thrown if the class listed in the file doesn't get loaded.
+     */
+    public static ArrayList<Class<?>> loadJars(File pluginFolderPath) throws IOException, ClassNotFoundException {
+        ArrayList<Class<?>> toReturn = new ArrayList<>();
+        if(!pluginFolderPath.exists()) return toReturn;
+        ArrayList<File> files = Files.walk(pluginFolderPath.toPath())
+                .map(Path::toFile)
+                .filter(f -> f.getName().endsWith(".jar"))
+                .collect(Collectors.toCollection(ArrayList::new));
+        for (File file : files){
+            toReturn.addAll(loadJar(file));
+        }
+        return toReturn;
+    }
+
+    /**
+     * Loads the classes from a single path, given by the file.
+     * @param jarLocation the location of the jar to load.
+     * @return the list of loaded classes loaded from the jar.
+     * @throws IOException thrown if there was an error reading the file
+     * @throws ClassNotFoundException thrown if the class could not be loaded.
+     */
+    public static ArrayList<Class<?>> loadJar(File jarLocation) throws IOException, ClassNotFoundException {
+        ArrayList<Class<?>> loadedClasses = new ArrayList<>();
+        String path = jarLocation.getPath();
+        URL[] urls = new URL[]{new URL("jar:file:" + path + "!/")};
+
+        URLClassLoader classLoader = URLClassLoader.newInstance(urls);
+        JarFile jarFolder = new JarFile(jarLocation);
+        Enumeration jarEntityList = jarFolder.entries();
+
+        while (jarEntityList.hasMoreElements()) {
+            JarEntry jarEntity = (JarEntry) jarEntityList.nextElement();
+            if (jarEntity.getName().endsWith(".class")) {
+                loadedClasses.add(classLoader.loadClass(jarEntity.getName().replace('/', '.').substring(0, jarEntity.getName().length() - 6)));
+            }
+        }
+        return loadedClasses;
+    }
+
+}

src/org/nwapw/abacus/plugin/PluginManager.java

@@ -12,10 +12,14 @@ import java.util.*;
  */
 public class PluginManager {
 
+    /**
+     * List of classes loaded by this manager.
+     */
+    private Set<Class<?>> loadedPluginClasses;
     /**
      * A list of loaded plugins.
      */
-    private List<Plugin> plugins;
+    private Set<Plugin> plugins;
     /**
      * List of functions that have been cached,
      * that is, found in a plugin and returned.
@@ -43,7 +47,8 @@ public class PluginManager {
      * Creates a new plugin manager.
      */
     public PluginManager(){
-        plugins = new ArrayList<>();
+        loadedPluginClasses = new HashSet<>();
+        plugins = new HashSet<>();
         cachedFunctions = new HashMap<>();
         cachedOperators = new HashMap<>();
         allFunctions = new HashSet<>();
@@ -104,7 +109,9 @@ public class PluginManager {
      * @param plugin the plugin to add.
      */
     public void addInstantiated(Plugin plugin){
+        if(loadedPluginClasses.contains(plugin.getClass())) return;
         plugins.add(plugin);
+        loadedPluginClasses.add(plugin.getClass());
     }
 
     /**
@@ -113,7 +120,7 @@ public class PluginManager {
      * @param newClass the new class to instantiate.
      */
     public void addClass(Class<?> newClass){
-        if(!Plugin.class.isAssignableFrom(newClass)) return;
+        if(!Plugin.class.isAssignableFrom(newClass) || newClass == Plugin.class) return;
         try {
             addInstantiated((Plugin) newClass.getConstructor(PluginManager.class).newInstance(this));
         } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {

src/org/nwapw/abacus/plugin/StandardPlugin.java

@@ -229,7 +229,7 @@ public class StandardPlugin extends Plugin {
 
             @Override
             protected NumberInterface applyInternal(NumberInterface[] params) {
-                return StandardPlugin.this.getOperator("^").getFunction().apply(params[0], (new NaiveNumber(0.5)));
+                return StandardPlugin.this.getOperator("^").getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
             }
         });
     }

src/org/nwapw/abacus/tree/NumberNode.java

@@ -22,19 +22,10 @@ public class NumberNode extends TreeNode {
 
     /**
      * Creates a new number node with the given double value.
-     * @param value the value to use.
+     * @param newNumber the number for which to create a number node.
      */
-    public NumberNode(double value){
-        number = new NaiveNumber(value);
-    }
-
-    /**
-     * Creates a new number node with the given string value, converted
-     * to a double.
-     * @param value the value.
-     */
-    public NumberNode(String value){
-        this(Double.parseDouble(value));
+    public NumberNode(NumberInterface newNumber){
+        this.number = newNumber;
     }
 
     /**

src/org/nwapw/abacus/tree/TreeBuilder.java

@@ -5,6 +5,8 @@ import org.nwapw.abacus.function.OperatorType;
 import org.nwapw.abacus.lexing.Lexer;
 import org.nwapw.abacus.lexing.pattern.Match;
 import org.nwapw.abacus.lexing.pattern.Pattern;
+import org.nwapw.abacus.number.NaiveNumber;
+import org.nwapw.abacus.number.PreciseNumber;
 
 import java.util.*;
 
@@ -42,7 +44,7 @@ public class TreeBuilder {
         lexer = new Lexer<TokenType>(){{
             register(" ", TokenType.WHITESPACE);
             register(",", TokenType.COMMA);
-            register("[0-9]+(\\.[0-9]+)?", TokenType.NUM);
+            register("[0-9]*(\\.[0-9]+)?", TokenType.NUM);
             register("\\(", TokenType.OPEN_PARENTH);
             register("\\)", TokenType.CLOSE_PARENTH);
         }};
@@ -170,7 +172,7 @@ public class TreeBuilder {
                 else return new UnaryPrefixNode(operator, applyTo);
             }
         } else if(matchType == TokenType.NUM){
-            return new NumberNode(Double.parseDouble(source.substring(match.getFrom(), match.getTo())));
+            return new NumberNode(new NaiveNumber(Double.parseDouble(source.substring(match.getFrom(), match.getTo()))));
         } else if(matchType == TokenType.FUNCTION){
             String functionName = source.substring(match.getFrom(), match.getTo());
             FunctionNode node = new FunctionNode(functionName);

src/org/nwapw/abacus/tree/UnaryPrefixNode.java

@@ -51,4 +51,9 @@ public class UnaryPrefixNode extends TreeNode {
     public TreeNode getApplyTo() {
         return applyTo;
     }
+
+    @Override
+    public String toString() {
+        return "(" + (applyTo == null ? "null" : applyTo.toString()) + ")" + operation;
+    }
 }