DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-27 00:55:19 +00:00
Code Issues Releases Wiki Activity

Remove the default load-from-file behavior from the Abacus core.

Browse Source
This commit is contained in:
Danila Fedorin
2017-08-05 17:04:07 -07:00
parent abc0e2d59f
commit f3cbb600ac
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/nwapw/abacus/Abacus.java
View File

@@ -12,7 +12,7 @@ import org.nwapw.abacus.plugin.StandardPlugin;
import org.nwapw.abacus.tree.NumberReducer;
import org.nwapw.abacus.tree.TreeNode;
import java.io.File;
import java.util.function.Supplier;
/**
* The main calculator class. This is responsible
@@ -25,10 +25,6 @@ public class Abacus {
* The default number implementation to be used if no other one is available / selected.
*/
public static final NumberImplementation DEFAULT_IMPLEMENTATION = StandardPlugin.IMPLEMENTATION_NAIVE;
/**
* The file used for saving and loading configuration.
*/
public static final File CONFIG_FILE = new File("config.toml");
/**
* The plugin manager responsible for
@@ -53,11 +49,10 @@ public class Abacus {
/**
* Creates a new instance of the Abacus calculator.
*/
public Abacus() {
public Abacus(Supplier<Configuration> configurationSupplier) {
pluginManager = new PluginManager(this);
numberReducer = new NumberReducer(this);
configuration = new Configuration(CONFIG_FILE);
configuration.saveTo(CONFIG_FILE);
configuration = configurationSupplier.get();
LexerTokenizer lexerTokenizer = new LexerTokenizer();
ShuntingYardParser shuntingYardParser = new ShuntingYardParser(this);
treeBuilder = new TreeBuilder<>(lexerTokenizer, shuntingYardParser);