Centralizes the processing of (read) expressions.

1 files changed, 8 insertions, 30 deletions

diff --git a/ast-to-instr/src/VHDLWNode.java b/ast-to-instr/src/VHDLWNode.java
index 06a903c..66d0c00 100644
--- a/ast-to-instr/src/VHDLWNode.java
+++ b/ast-to-instr/src/VHDLWNode.java
@@ -10,15 +10,15 @@ import java.util.Stack;
 /* When Node */
 public class VHDLWNode extends VHDLNode
 {
-   private static final XPathExpression XPE_FIND_NAMED_ENTITIES;
+   private static final XPathExpression XPE_FIND_SOURCES;
    private static final XPathExpression XPE_FIND_BODY;
 
    static
    {
-      XPE_FIND_NAMED_ENTITIES =
+      XPE_FIND_SOURCES =
          XMLManager.compile_or_die
          (
-            "./choice_expression//named_entity"
+            "./choice_expression" /* //named_entity" */
          );
 
       XPE_FIND_BODY =
@@ -159,38 +159,16 @@ public class VHDLWNode extends VHDLNode
    )
    throws XPathExpressionException
    {
-      final NodeList named_entities;
-      final int named_entities_count;
+      final Node sources;
 
-      named_entities =
-         (NodeList) XPE_FIND_NAMED_ENTITIES.evaluate
+      sources =
+         (Node) XPE_FIND_SOURCES.evaluate
          (
             xml_node,
-            XPathConstants.NODESET
+            XPathConstants.NODE
          );
 
-      named_entities_count = named_entities.getLength();
-
-      for (int i = 0; i < named_entities_count; ++i)
-      {
-         final String ref;
-
-         ref = XMLManager.get_attribute(named_entities.item(0), "ref");
-
-         if (!Main.node_is_function_or_literal(ref))
-         {
-            Predicates.add_entry
-            (
-               output,
-               "expr_reads",
-               local_id,
-               Waveforms.get_associated_waveform_id
-               (
-                  IDs.get_id_from_xml_id(ref, (String) null)
-               )
-            );
-         }
-      }
+      handle_expression(local_id, sources);
    }
 
    /***************************************************************************/