Fixes connect_to/node_connect, configs Makefiles.

5 files changed, 17 insertions, 9 deletions

diff --git a/ast-to-instr/Makefile b/ast-to-instr/Makefile
index 59bc9bb..f09cae1 100644
--- a/ast-to-instr/Makefile
+++ b/ast-to-instr/Makefile
@@ -18,12 +18,13 @@ CLASSES = $(SOURCES:.java=.class)
 
 ## Makefile Rules ##############################################################
 
-all: $(CLASSES)
+all: structural.mod
 
 clean:
 	rm -f $(CLASSES)
+	rm -f *.mod
 
-run: $(CLASSES) $(REQUIRED_JARS)
+structural.mod: $(CLASSES) $(REQUIRED_JARS) $(INPUT_FILE)
 	$(JAVA) -cp $(CLASSPATH) Main $(INPUT_FILE)
 
 %.class: %.java $(REQUIRED_JARS)
diff --git a/ast-to-instr/src/VHDLSSCNode.java b/ast-to-instr/src/VHDLSSCNode.java
index 34c4f7d..641377f 100644
--- a/ast-to-instr/src/VHDLSSCNode.java
+++ b/ast-to-instr/src/VHDLSSCNode.java
@@ -197,7 +197,7 @@ public class VHDLSSCNode extends VHDLNode
          Predicates.add_entry
          (
             output,
-            "connect_to",
+            "node_connect",
             prev_node,
             first_node_id
          );
diff --git a/cfg-to-paths/Makefile b/cfg-to-paths/Makefile
index f0207ae..46ba3de 100644
--- a/cfg-to-paths/Makefile
+++ b/cfg-to-paths/Makefile
@@ -1,6 +1,6 @@
 ## Target(s) Configuration #####################################################
-MODEL_FILES = $(wildcard ../instr-scripts/pfp_*.mod)
-OUTPUT_FILES = $(patsubst ../instr-scripts/%.mod,%.cfg.mod,$(MODEL_FILES))
+MODEL_FILES = $(wildcard ../ast-to-instr/cfg_*.mod)
+OUTPUT_FILES = $(patsubst ../ast-to-inst/%.mod,%.cfg.mod,$(MODEL_FILES))
 
 ## Executables #################################################################
 JAVAC = javac
@@ -19,6 +19,7 @@ all: $(CLASSES) $(OUTPUT_FILES)
 
 clean:
 	rm -f $(CLASSES)
+	rm -f *.mod
 
 #run: $(CLASSES)
 #	$(JAVA) -cp $(CLASSPATH) Main $(MODEL_FILE) $(ROOT_NODE) $(ID_PREFIX) \
@@ -27,6 +28,6 @@ clean:
 %.class: %.java
 	$(JAVAC) -cp $(CLASSPATH) $<
 
-%.cfg.mod: ../instr-scripts/%.mod $(CLASSES)
-	$(eval ROOT_NODE := $(shell head -n 1 $< | grep "[0-9]\+" -o))
+%.cfg.mod: ../ast-to-instr/%.mod $(CLASSES)
+	$(eval ROOT_NODE := $(shell head -n 2 $< | tail -n 1 | grep "[0-9]\+" -o))
 	$(JAVA) -cp $(CLASSPATH) Main $< $(ROOT_NODE) "p$(ROOT_NODE)_" $@
diff --git a/data/level/structural_level.lvl b/data/level/structural_level.lvl
index 75c4ac9..193eca4 100644
--- a/data/level/structural_level.lvl
+++ b/data/level/structural_level.lvl
@@ -34,7 +34,7 @@
 ;;;; Port ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (add_predicate is_port_of port entity)
 (add_predicate has_disconnect_flag port)
-(add_predicate is_of_mode port string)
+(add_predicate has_mode port string)
 (add_predicate has_class port)
 (add_predicate is_ref port)
 (add_predicate has_active_flag port)
diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile
index 7aa82ce..efcfaa5 100644
--- a/instr-to-kodkod/Makefile
+++ b/instr-to-kodkod/Makefile
@@ -1,6 +1,6 @@
 ## Target(s) Configuration #####################################################
 #MODEL_FILES = $(wildcard ../data/instructions/*.mod)
-MODEL_FILES = ../instr-scripts/structural.mod $(wildcard ../instr-scripts/pfp_*.mod) $(wildcard ../cfg-to-paths/pfp_*.mod)
+MODEL_FILES = ../ast-to-instr/structural.mod $(wildcard ../ast-to-instr/cfg_*.mod) $(wildcard ../cfg-to-paths/*.mod)
 LEVEL_DIR = $(wildcard ../data/level/*.lvl)
 #PROPERTY_FILE = ../data/property/unread_waveforms.pro
 #PROPERTY_FILE = ../data/property/impossible_processes.pro
@@ -28,12 +28,18 @@ CLASSES = $(SOURCES:.java=.class)
 ## Makefile Rules ##############################################################
 
 all: parser/PropertyParser.java $(CLASSES)
+	$(MAKE) -C ../ast-to-instr
+	$(MAKE) -C ../cfg-to-paths
 
 clean:
 	rm -f $(CLASSES)
 	$(MAKE) -C parser clean
+	$(MAKE) -C ../ast-to-instr clean
+	$(MAKE) -C ../cfg-to-paths clean
 
 run: parser/PropertyParser.java $(CLASSES) $(REQUIRED_JARS)
+	$(MAKE) -C ../ast-to-instr
+	$(MAKE) -C ../cfg-to-paths
 	$(JAVA) -cp $(CLASSPATH) Main $(VAR_PREFIX) $(INPUT_FILES)
 
 %.class: %.java $(REQUIRED_JARS)