From 0b35af5ee0e660c810e22a09738ff1960745db23 Mon Sep 17 00:00:00 2001 From: Nathanael Sensfelder Date: Tue, 19 Sep 2017 16:12:54 +0200 Subject: Fixes anonymous strings, adds CNE_01100 test. --- instr-to-kodkod/Makefile | 2 +- instr-to-kodkod/src/StringManager.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'instr-to-kodkod') diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile index 08af039..b708c16 100644 --- a/instr-to-kodkod/Makefile +++ b/instr-to-kodkod/Makefile @@ -131,7 +131,7 @@ $(PARSER_CLASSES): antlr-4.7-complete.jar kodkod.jar $(PARSER_SOURCES) $(SOL_DIR)/%.sol: $(PROPERTY_FILES) $(MODEL_FILES) $(LEVEL_FILES) touch $@ - $(JAVA) -cp $(CLASSPATH) Main $@ \ + $(JAVA) -cp $(CLASSPATH) Main $@ -v \ $(filter %$(basename $(notdir $@)).pro,$(PROPERTY_FILES)) \ $(LEVEL_FILES) \ $(MODEL_FILES) \ diff --git a/instr-to-kodkod/src/StringManager.java b/instr-to-kodkod/src/StringManager.java index 48cd8d6..41969a9 100644 --- a/instr-to-kodkod/src/StringManager.java +++ b/instr-to-kodkod/src/StringManager.java @@ -45,6 +45,8 @@ public class StringManager { id = (anon_string_prefix + anon_string_count); + anon_string_count += 1; + string_type.add_member(id); TO_ID.put(str, id); -- cgit v1.2.3-70-g09d2