| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-21 15:26:01 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-21 15:26:01 +0200 |
| commit | 0fc661ebabdf55b8e0d26c4f85f0547c106b6549 (patch) | |
| tree | b41a52c7a6294b381cd370379ef4b5abbea7d8a7 /instr-to-kodkod/cfg-to-paths | |
| parent | bc3e8933e1005e93e4a97b9a207cb40db454a2a8 (diff) | |
Got some property dependencies to work.
Diffstat (limited to 'instr-to-kodkod/cfg-to-paths')
| -rw-r--r-- | instr-to-kodkod/cfg-to-paths/Makefile | 16 | ||||
| -rw-r--r-- | instr-to-kodkod/cfg-to-paths/src/QuickParser.java | 3 |
2 files changed, 6 insertions, 13 deletions
diff --git a/instr-to-kodkod/cfg-to-paths/Makefile b/instr-to-kodkod/cfg-to-paths/Makefile index 49c1e83..9dd0590 100644 --- a/instr-to-kodkod/cfg-to-paths/Makefile +++ b/instr-to-kodkod/cfg-to-paths/Makefile @@ -1,24 +1,16 @@ ## Parameters ################################################################## #### Where to find the model -ifndef MODEL_DIR -MODEL_DIR = -endif +MODEL_DIR ?= #### Where to store the CFG models -ifndef PATH_MODEL_DIR -PATH_MODEL_DIR = -endif +PATH_MODEL_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/instr-to-kodkod/cfg-to-paths/src/QuickParser.java b/instr-to-kodkod/cfg-to-paths/src/QuickParser.java index 47cea27..eb1ba33 100644 --- a/instr-to-kodkod/cfg-to-paths/src/QuickParser.java +++ b/instr-to-kodkod/cfg-to-paths/src/QuickParser.java @@ -10,8 +10,9 @@ public class QuickParser static { - instr_pattern = Pattern.compile("\\((?<list>[a-z_0-9 \"]+)\\)"); + instr_pattern = Pattern.compile("\\((?<list>[a-zA-Z_0-9 \"]+)\\)"); } + public QuickParser (final String filename) throws FileNotFoundException { |