summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-05-25 08:07:26 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-05-25 08:07:26 +0200
commit814367acffe9c02eb5ca545af9d4eee5782c07a7 (patch)
treeaf835f4bcb7639acae5eff836b4cfe74e57c175e
parentf7d1dab52196f0d4fb0932b321645cf91e95877e (diff)
downloadghdl2hastabel-814367acffe9c02eb5ca545af9d4eee5782c07a7.zip
ghdl2hastabel-814367acffe9c02eb5ca545af9d4eee5782c07a7.tar.bz2
Got it running.
-rw-r--r--Makefile8
-rw-r--r--src/ghdl2hastabel/IDs.java53
-rw-r--r--src/ghdl2hastabel/Strings.java56
-rw-r--r--src/ghdl2hastabel/vhdl/.Node.java.swpbin12288 -> 0 bytes
-rw-r--r--src/ghdl2hastabel/vhdl/Architecture.java7
-rw-r--r--src/ghdl2hastabel/vhdl/CSNode.java8
-rw-r--r--src/ghdl2hastabel/vhdl/Component.java7
-rw-r--r--src/ghdl2hastabel/vhdl/Entity.java7
-rw-r--r--src/ghdl2hastabel/vhdl/Expressions.java (renamed from src/ghdl2hastabel/Expressions.java)19
-rw-r--r--src/ghdl2hastabel/vhdl/File.java3
-rw-r--r--src/ghdl2hastabel/vhdl/Generic.java7
-rw-r--r--src/ghdl2hastabel/vhdl/ISNode.java7
-rw-r--r--src/ghdl2hastabel/vhdl/Node.java10
-rw-r--r--src/ghdl2hastabel/vhdl/Port.java9
-rw-r--r--src/ghdl2hastabel/vhdl/Process.java9
-rw-r--r--src/ghdl2hastabel/vhdl/SSASNode.java7
-rw-r--r--src/ghdl2hastabel/vhdl/Signal.java9
-rw-r--r--src/ghdl2hastabel/vhdl/WNode.java7
18 files changed, 97 insertions, 136 deletions
diff --git a/Makefile b/Makefile
index 49f6b10..db10a58 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ BIN_DIR ?= ${CURDIR}/bin/
LIB_DIR ?= ${CURDIR}/lib/
TARGET ?= ghdl2hastabel.jar
+RUN_SCRIPT ?= ghdl2hastabel.sh
INSTALL_DIR ?= $(LIB_DIR)
#### Where to get the missing Jar files.
@@ -41,7 +42,7 @@ JAVA_SOURCES = \
CLASSES = $(patsubst $(SRC_DIR)/%,$(BIN_DIR)/%, $(JAVA_SOURCES:.java=.class))
## Makefile Rules ##############################################################
-$(TARGET): $(JAVA_SOURCES) $(CLASSES)
+$(TARGET): $(RUN_SCRIPT) $(JAVA_SOURCES) $(CLASSES)
$(MAKE) $(LIB_DIR)
rm -f $(TARGET) $(INSTALL_DIR)/$@
$(JAR) cf $@ -C $(BIN_DIR) .
@@ -59,6 +60,11 @@ $(CLASSES): $(BIN_DIR)/%.class: $(SRC_DIR)/%.java $(BIN_DIR)
echo "Attempting to download missing jar '$@'..."
cd $(LIB_DIR); $(DOWNLOADER) "$(JAR_SOURCE)/$(notdir $@)"
+$(RUN_SCRIPT): Makefile
+ echo "#!/bin/sh" > $@
+ echo "$(JAVA) -cp \"$(CLASSPATH)\" ghdl2hastabel.Main \$$*" >> $@
+ chmod +x $@
+
$(LIB_DIR):
mkdir -p $@
diff --git a/src/ghdl2hastabel/IDs.java b/src/ghdl2hastabel/IDs.java
index 23bdafb..9bcc05c 100644
--- a/src/ghdl2hastabel/IDs.java
+++ b/src/ghdl2hastabel/IDs.java
@@ -37,6 +37,21 @@ public class IDs
);
}
+ public static IDs get_id_from_string
+ (
+ String string
+ )
+ {
+ if (string == null)
+ {
+ string = "";
+ }
+
+ string = "\"" + string.toLowerCase() + "\"";
+
+ return new IDs(string, true);
+ }
+
public static IDs get_id_from_xml_id
(
final OutputFile output,
@@ -54,11 +69,10 @@ public class IDs
FROM_XML.put(xml_id, result);
- XML_MAP_OUTPUT.write("(xml->instr ");
+ XML_MAP_OUTPUT.write("xml->instr ");
XML_MAP_OUTPUT.write(xml_id);
- XML_MAP_OUTPUT.write(" ");
- XML_MAP_OUTPUT.write(Integer.toString(result.get_value()));
- XML_MAP_OUTPUT.write(")");
+ XML_MAP_OUTPUT.write("->");
+ XML_MAP_OUTPUT.write(result.get_value());
XML_MAP_OUTPUT.insert_newline();
}
@@ -89,7 +103,7 @@ public class IDs
{
final IDs result;
- result = new IDs(type);
+ result = new IDs(type, false);
if (type != null)
{
@@ -100,16 +114,24 @@ public class IDs
}
/** Non-Static *************************************************************/
- private final int value;
+ private final String value;
private String type;
- private IDs (final String type)
+ private IDs (final String type_or_val, boolean is_string)
{
- this.type = type;
+ if (is_string)
+ {
+ type = "string";
+ value = type_or_val;
+ }
+ else
+ {
+ type = type_or_val;
- value = IDs.next_id;
+ value = Integer.toString(IDs.next_id);
- IDs.next_id += 1;
+ IDs.next_id += 1;
+ }
}
public String get_type ()
@@ -117,18 +139,21 @@ public class IDs
return type;
}
- public int get_value ()
+ public String get_value ()
{
return value;
}
private void add_to_output (final OutputFile output)
{
- output.write("(add_element ");
+ if (type.equals("string"))
+ {
+ return;
+ }
+
output.write(type);
output.write(" ");
- output.write(Integer.toString(value));
- output.write(")");
+ output.write(value);
output.insert_newline();
}
}
diff --git a/src/ghdl2hastabel/Strings.java b/src/ghdl2hastabel/Strings.java
deleted file mode 100644
index 68e17e9..0000000
--- a/src/ghdl2hastabel/Strings.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package ghdl2hastabel;
-
-import java.util.Map;
-import java.util.HashMap;
-
-public class Strings
-{
- private static final Map<String, IDs> TO_ID;
- private static final OutputFile STRING_MAP_OUTPUT;
-
- static
- {
- TO_ID = new HashMap<String, IDs>();
-
- /* TODO: filename as a param? */
- STRING_MAP_OUTPUT = OutputFile.new_output_file("string_to_instr.map");
- }
-
- private Strings () {} /* Utility class. */
-
- public static IDs get_id_from_string
- (
- final String string
- )
- {
- return get_id_from_string(Main.get_main_output(), string);
- }
-
- public static IDs get_id_from_string
- (
- final OutputFile output,
- String string
- )
- {
- IDs result;
-
- string = string.toLowerCase();
- result = TO_ID.get(string);
-
- if (result == null)
- {
- result = IDs.generate_new_id(output, "string");
-
- TO_ID.put(string, result);
-
- STRING_MAP_OUTPUT.write("(string->instr \"");
- STRING_MAP_OUTPUT.write(string);
- STRING_MAP_OUTPUT.write("\" ");
- STRING_MAP_OUTPUT.write(Integer.toString(result.get_value()));
- STRING_MAP_OUTPUT.write(")");
- STRING_MAP_OUTPUT.insert_newline();
- }
-
- return result;
- }
-}
diff --git a/src/ghdl2hastabel/vhdl/.Node.java.swp b/src/ghdl2hastabel/vhdl/.Node.java.swp
deleted file mode 100644
index 942ae52..0000000
--- a/src/ghdl2hastabel/vhdl/.Node.java.swp
+++ /dev/null
Binary files differ
diff --git a/src/ghdl2hastabel/vhdl/Architecture.java b/src/ghdl2hastabel/vhdl/Architecture.java
index 36a6819..3b4f42c 100644
--- a/src/ghdl2hastabel/vhdl/Architecture.java
+++ b/src/ghdl2hastabel/vhdl/Architecture.java
@@ -2,7 +2,6 @@ package ghdl2hastabel.vhdl;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.ParsableXML;
import ghdl2hastabel.XMLManager;
import ghdl2hastabel.IDs;
@@ -160,7 +159,7 @@ public class Architecture extends ParsableXML
(
"line",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "line")
)
@@ -176,7 +175,7 @@ public class Architecture extends ParsableXML
(
"column",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "col")
)
@@ -192,7 +191,7 @@ public class Architecture extends ParsableXML
(
"identifier",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "identifier")
)
diff --git a/src/ghdl2hastabel/vhdl/CSNode.java b/src/ghdl2hastabel/vhdl/CSNode.java
index bb36824..b359b41 100644
--- a/src/ghdl2hastabel/vhdl/CSNode.java
+++ b/src/ghdl2hastabel/vhdl/CSNode.java
@@ -2,7 +2,6 @@ package ghdl2hastabel.vhdl;
import ghdl2hastabel.Depths;
import ghdl2hastabel.OutputFile;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
import ghdl2hastabel.ParsableXML;
@@ -109,9 +108,8 @@ public class CSNode extends ghdl2hastabel.vhdl.Node
output,
"label",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
- output,
XMLManager.get_attribute(xml_node, "label")
)
);
@@ -127,7 +125,7 @@ public class CSNode extends ghdl2hastabel.vhdl.Node
output,
"kind",
local_id,
- Strings.get_id_from_string("case")
+ IDs.get_id_from_string("case")
);
}
@@ -160,7 +158,7 @@ public class CSNode extends ghdl2hastabel.vhdl.Node
output,
"has_option",
local_id,
- Strings.get_id_from_string(s)
+ IDs.get_id_from_string(s)
);
}
}
diff --git a/src/ghdl2hastabel/vhdl/Component.java b/src/ghdl2hastabel/vhdl/Component.java
index 8c2d4fe..92dc785 100644
--- a/src/ghdl2hastabel/vhdl/Component.java
+++ b/src/ghdl2hastabel/vhdl/Component.java
@@ -1,7 +1,6 @@
package ghdl2hastabel.vhdl;
import ghdl2hastabel.Main;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Waveforms;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
@@ -286,7 +285,7 @@ public class Component extends ParsableXML
(
"line",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "line")
)
@@ -302,7 +301,7 @@ public class Component extends ParsableXML
(
"column",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "col")
)
@@ -318,7 +317,7 @@ public class Component extends ParsableXML
(
"label",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "label")
)
diff --git a/src/ghdl2hastabel/vhdl/Entity.java b/src/ghdl2hastabel/vhdl/Entity.java
index 607a0d9..c347c2c 100644
--- a/src/ghdl2hastabel/vhdl/Entity.java
+++ b/src/ghdl2hastabel/vhdl/Entity.java
@@ -1,6 +1,5 @@
package ghdl2hastabel.vhdl;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
import ghdl2hastabel.ParsableXML;
@@ -103,7 +102,7 @@ public class Entity extends ParsableXML
(
"line",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "line")
)
@@ -119,7 +118,7 @@ public class Entity extends ParsableXML
(
"column",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "col")
)
@@ -135,7 +134,7 @@ public class Entity extends ParsableXML
(
"identifier",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "col")
)
diff --git a/src/ghdl2hastabel/Expressions.java b/src/ghdl2hastabel/vhdl/Expressions.java
index 3c8f547..88b5d0e 100644
--- a/src/ghdl2hastabel/Expressions.java
+++ b/src/ghdl2hastabel/vhdl/Expressions.java
@@ -1,4 +1,8 @@
-package ghdl2hastabel;
+package ghdl2hastabel.vhdl;
+
+import ghdl2hastabel.IDs;
+import ghdl2hastabel.XMLManager;
+import ghdl2hastabel.Waveforms;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -174,7 +178,7 @@ public class Expressions
structure.append("(?");
elements.add
(
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
op.symbol
)
@@ -209,7 +213,7 @@ public class Expressions
structure.append("(?");
elements.add
(
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
op.symbol
)
@@ -293,7 +297,7 @@ public class Expressions
*/
elements.add
(
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(named_entity, "identifier")
)
@@ -393,10 +397,7 @@ public class Expressions
structure.append("?");
elements.add
(
- Strings.get_id_from_string
- (
- "l"
- )
+ IDs.get_id_from_string("l")
);
}
@@ -406,7 +407,7 @@ public class Expressions
elements.add
(
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
/* FIXME: Kind of a hacky */
kind.replace("_attribute", "")
diff --git a/src/ghdl2hastabel/vhdl/File.java b/src/ghdl2hastabel/vhdl/File.java
index c321eb2..8f38ba2 100644
--- a/src/ghdl2hastabel/vhdl/File.java
+++ b/src/ghdl2hastabel/vhdl/File.java
@@ -1,6 +1,5 @@
package ghdl2hastabel.vhdl;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Functions;
import ghdl2hastabel.ParsableXML;
import ghdl2hastabel.XMLManager;
@@ -80,7 +79,7 @@ public class File extends ParsableXML
(
"filename",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "file")
)
diff --git a/src/ghdl2hastabel/vhdl/Generic.java b/src/ghdl2hastabel/vhdl/Generic.java
index 3b86585..4710118 100644
--- a/src/ghdl2hastabel/vhdl/Generic.java
+++ b/src/ghdl2hastabel/vhdl/Generic.java
@@ -1,6 +1,5 @@
package ghdl2hastabel.vhdl;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Waveforms;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
@@ -86,7 +85,7 @@ public class Generic extends ParsableXML
(
"line",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "line")
)
@@ -102,7 +101,7 @@ public class Generic extends ParsableXML
(
"column",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "col")
)
@@ -118,7 +117,7 @@ public class Generic extends ParsableXML
(
"identifier",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "identifier")
)
diff --git a/src/ghdl2hastabel/vhdl/ISNode.java b/src/ghdl2hastabel/vhdl/ISNode.java
index d09a815..9aa3c61 100644
--- a/src/ghdl2hastabel/vhdl/ISNode.java
+++ b/src/ghdl2hastabel/vhdl/ISNode.java
@@ -2,7 +2,6 @@ package ghdl2hastabel.vhdl;
import ghdl2hastabel.Depths;
import ghdl2hastabel.OutputFile;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
import ghdl2hastabel.ParsableXML;
@@ -108,7 +107,7 @@ public class ISNode extends ghdl2hastabel.vhdl.Node
output,
"label",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "label")
)
@@ -125,7 +124,7 @@ public class ISNode extends ghdl2hastabel.vhdl.Node
output,
"kind",
local_id,
- Strings.get_id_from_string("if")
+ IDs.get_id_from_string("if")
);
}
@@ -158,7 +157,7 @@ public class ISNode extends ghdl2hastabel.vhdl.Node
output,
"has_option",
local_id,
- Strings.get_id_from_string(s)
+ IDs.get_id_from_string(s)
);
}
}
diff --git a/src/ghdl2hastabel/vhdl/Node.java b/src/ghdl2hastabel/vhdl/Node.java
index 3469277..88c545c 100644
--- a/src/ghdl2hastabel/vhdl/Node.java
+++ b/src/ghdl2hastabel/vhdl/Node.java
@@ -1,8 +1,6 @@
package ghdl2hastabel.vhdl;
-import ghdl2hastabel.Expressions;
import ghdl2hastabel.OutputFile;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Predicates;
import ghdl2hastabel.ParsableXML;
import ghdl2hastabel.IDs;
@@ -58,7 +56,7 @@ public abstract class Node extends ParsableXML
output,
"is_read_structure",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
structure.toString()
)
@@ -73,7 +71,7 @@ public abstract class Node extends ParsableXML
output,
"is_read_element",
local_id,
- Strings.get_id_from_string(Integer.toString(i)),
+ IDs.get_id_from_string(Integer.toString(i)),
elements.get(i)
);
@@ -107,7 +105,7 @@ public abstract class Node extends ParsableXML
output,
"is_written_structure",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
structure.toString()
)
@@ -122,7 +120,7 @@ public abstract class Node extends ParsableXML
output,
"is_written_element",
local_id,
- Strings.get_id_from_string(Integer.toString(i)),
+ IDs.get_id_from_string(Integer.toString(i)),
elements.get(i)
);
diff --git a/src/ghdl2hastabel/vhdl/Port.java b/src/ghdl2hastabel/vhdl/Port.java
index f1a30e6..9dd2e1a 100644
--- a/src/ghdl2hastabel/vhdl/Port.java
+++ b/src/ghdl2hastabel/vhdl/Port.java
@@ -1,6 +1,5 @@
package ghdl2hastabel.vhdl;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Waveforms;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
@@ -92,7 +91,7 @@ public class Port extends ParsableXML
(
"line",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "line")
)
@@ -108,7 +107,7 @@ public class Port extends ParsableXML
(
"column",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "col")
)
@@ -124,7 +123,7 @@ public class Port extends ParsableXML
(
"identifier",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "identifier")
)
@@ -332,7 +331,7 @@ public class Port extends ParsableXML
(
"has_mode",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute
(
diff --git a/src/ghdl2hastabel/vhdl/Process.java b/src/ghdl2hastabel/vhdl/Process.java
index 9f1a5f4..b821885 100644
--- a/src/ghdl2hastabel/vhdl/Process.java
+++ b/src/ghdl2hastabel/vhdl/Process.java
@@ -1,7 +1,6 @@
package ghdl2hastabel.vhdl;
import ghdl2hastabel.OutputFile;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Waveforms;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
@@ -112,7 +111,7 @@ public class Process extends ParsableXML
(
"line",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "line")
)
@@ -128,7 +127,7 @@ public class Process extends ParsableXML
(
"column",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "col")
)
@@ -144,7 +143,7 @@ public class Process extends ParsableXML
(
"label",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "label")
)
@@ -436,7 +435,7 @@ public class Process extends ParsableXML
OutputFile.new_output_file
(
"cfg_" /* TODO: Prefix as parameter? */
- + Integer.toString(local_id.get_value())
+ + local_id.get_value()
+ ".mod" /* TODO: Suffix as parameter? */
),
local_id,
diff --git a/src/ghdl2hastabel/vhdl/SSASNode.java b/src/ghdl2hastabel/vhdl/SSASNode.java
index f5571a8..f7db666 100644
--- a/src/ghdl2hastabel/vhdl/SSASNode.java
+++ b/src/ghdl2hastabel/vhdl/SSASNode.java
@@ -3,7 +3,6 @@ package ghdl2hastabel.vhdl;
import ghdl2hastabel.Depths;
import ghdl2hastabel.Main;
import ghdl2hastabel.OutputFile;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Waveforms;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
@@ -104,7 +103,7 @@ public class SSASNode extends ghdl2hastabel.vhdl.Node
output,
"label",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "label")
)
@@ -121,7 +120,7 @@ public class SSASNode extends ghdl2hastabel.vhdl.Node
output,
"kind",
local_id,
- Strings.get_id_from_string("signal_assignement")
+ IDs.get_id_from_string("signal_assignement")
);
}
@@ -154,7 +153,7 @@ public class SSASNode extends ghdl2hastabel.vhdl.Node
output,
"has_option",
local_id,
- Strings.get_id_from_string(s)
+ IDs.get_id_from_string(s)
);
}
}
diff --git a/src/ghdl2hastabel/vhdl/Signal.java b/src/ghdl2hastabel/vhdl/Signal.java
index 6812529..f09c998 100644
--- a/src/ghdl2hastabel/vhdl/Signal.java
+++ b/src/ghdl2hastabel/vhdl/Signal.java
@@ -1,6 +1,5 @@
package ghdl2hastabel.vhdl;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Waveforms;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
@@ -90,7 +89,7 @@ public class Signal extends ParsableXML
(
"line",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "line")
)
@@ -106,7 +105,7 @@ public class Signal extends ParsableXML
(
"column",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "col")
)
@@ -122,7 +121,7 @@ public class Signal extends ParsableXML
(
"identifier",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute(xml_node, "identifier")
)
@@ -285,7 +284,7 @@ public class Signal extends ParsableXML
(
"is_of_kind",
local_id,
- Strings.get_id_from_string
+ IDs.get_id_from_string
(
XMLManager.get_attribute
(
diff --git a/src/ghdl2hastabel/vhdl/WNode.java b/src/ghdl2hastabel/vhdl/WNode.java
index cc3864a..03bb0d5 100644
--- a/src/ghdl2hastabel/vhdl/WNode.java
+++ b/src/ghdl2hastabel/vhdl/WNode.java
@@ -2,7 +2,6 @@ package ghdl2hastabel.vhdl;
import ghdl2hastabel.Depths;
import ghdl2hastabel.OutputFile;
-import ghdl2hastabel.Strings;
import ghdl2hastabel.Functions;
import ghdl2hastabel.Predicates;
import ghdl2hastabel.ParsableXML;
@@ -100,7 +99,7 @@ public class WNode extends ghdl2hastabel.vhdl.Node
output,
"label",
local_id,
- Strings.get_id_from_string("")
+ IDs.get_id_from_string("")
);
}
@@ -114,7 +113,7 @@ public class WNode extends ghdl2hastabel.vhdl.Node
output,
"kind",
local_id,
- Strings.get_id_from_string("when")
+ IDs.get_id_from_string("when")
);
}
@@ -147,7 +146,7 @@ public class WNode extends ghdl2hastabel.vhdl.Node
output,
"has_option",
local_id,
- Strings.get_id_from_string(s)
+ IDs.get_id_from_string(s)
);
}
}