| summaryrefslogtreecommitdiff |
path: root/instance-calculator
diff options
Diffstat (limited to 'instance-calculator')
| -rw-r--r-- | instance-calculator/Makefile | 16 | ||||
| -rw-r--r-- | instance-calculator/src/QuickParser.java | 2 |
2 files changed, 5 insertions, 13 deletions
diff --git a/instance-calculator/Makefile b/instance-calculator/Makefile index 9dddc88..9002ca1 100644 --- a/instance-calculator/Makefile +++ b/instance-calculator/Makefile @@ -1,24 +1,16 @@ ## Parameters ################################################################## #### Where to find the model -ifndef MODEL_DIR -MODEL_DIR = -endif +MODEL_DIR ?= #### Where to store the Instance model -ifndef MODEL_INSTANCES_DIR -MODEL_INSTANCES_DIR = -endif +MODEL_INSTANCES_DIR ?= #### Binaries ###### JRE binary -ifndef JAVA -JAVA = java -endif +JAVA ?= java ###### JDK binary -ifndef JAVAC -JAVAC = javac -endif +JAVAC ?= javac ## Parameters Sanity Check ##################################################### ifeq ($(strip $(MODEL_DIR)),) diff --git a/instance-calculator/src/QuickParser.java b/instance-calculator/src/QuickParser.java index 383373e..ed74526 100644 --- a/instance-calculator/src/QuickParser.java +++ b/instance-calculator/src/QuickParser.java @@ -14,7 +14,7 @@ public class QuickParser static { - instr_pattern = Pattern.compile("\\((?<list>[a-z_0-9 \"]+)\\)"); + instr_pattern = Pattern.compile("\\((?<list>[a-z_A-Z0-9 \"]+)\\)"); } public QuickParser (final String filename) throws FileNotFoundException |