Still working on AST-to-Instr.

1 files changed, 138 insertions, 172 deletions

diff --git a/ast-to-instr/src/VHDLSignal.java b/ast-to-instr/src/VHDLSignal.java
index 9dffe73..1ea12d6 100644
--- a/ast-to-instr/src/VHDLSignal.java
+++ b/ast-to-instr/src/VHDLSignal.java
@@ -14,13 +14,8 @@ public class VHDLSignal extends ParsableXML
 
    static
    {
+      /* TODO */
       GET_ENTITIES = null;
-      /* TODO
-         Main.get_xpath().compile
-         (
-         );
-      */
-       //     "./*/*/library_unit[@kind=\"entity_declaration\"]"
    }
 
    public VHDLSignal
@@ -42,7 +37,7 @@ public class VHDLSignal extends ParsableXML
 
       result = new ArrayList<ParsableXML>();
 
-      xml_id = null; /* TODO: elem.attrib.get("id") */
+      xml_id = XMLManager.get_attribute(xml_node, "id");
 
       local_id = IDs.get_id_from_xml_id(xml_id, "signal");
 
@@ -80,16 +75,7 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            parent_id
-         };
-
-      /* TODO */
+      Predicates.add_entry("belongs_to_architecture", local_id, parent_id);
    }
 
 
@@ -101,19 +87,15 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      Functions.add_entry
+      (
+         "line",
+         local_id,
+         Strings.get_id_from_string
+         (
+            XMLManager.get_attribute(xml_node, "line")
+         )
+      );
    }
 
    private void handle_function_column
@@ -121,19 +103,15 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      Functions.add_entry
+      (
+         "column",
+         local_id,
+         Strings.get_id_from_string
+         (
+            XMLManager.get_attribute(xml_node, "col")
+         )
+      );
    }
 
    private void handle_function_identifier
@@ -141,19 +119,15 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      Functions.add_entry
+      (
+         "identifier",
+         local_id,
+         Strings.get_id_from_string
+         (
+            XMLManager.get_attribute(xml_node, "identifier")
+         )
+      );
    }
 
    /***************************************************************************/
@@ -164,19 +138,17 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      if
+      (
+         XMLManager.get_attribute
+         (
+            xml_node,
+            "has_disconnect_flag"
+         ).equals("true")
+      )
+      {
+         Predicates.add_entry("has_disconnect_flag", local_id);
+      }
    }
 
    private void handle_predicate_is_ref
@@ -184,19 +156,17 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      if
+      (
+         XMLManager.get_attribute
+         (
+            xml_node,
+            "is_ref"
+         ).equals("true")
+      )
+      {
+         Predicates.add_entry("is_ref", local_id);
+      }
    }
 
    private void handle_predicate_has_active_flag
@@ -204,19 +174,17 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      if
+      (
+         XMLManager.get_attribute
+         (
+            xml_node,
+            "has_active_flag"
+         ).equals("true")
+      )
+      {
+         Predicates.add_entry("has_active_flag", local_id);
+      }
    }
 
    private void handle_predicate_has_identifier_list
@@ -224,19 +192,17 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      if
+      (
+         XMLManager.get_attribute
+         (
+            xml_node,
+            "has_identifier_list"
+         ).equals("true")
+      )
+      {
+         Predicates.add_entry("has_identifier_list", local_id);
+      }
    }
 
    private void handle_predicate_has_visible_flag
@@ -244,19 +210,17 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      if
+      (
+         XMLManager.get_attribute
+         (
+            xml_node,
+            "visible_flag"
+         ).equals("true")
+      )
+      {
+         Predicates.add_entry("has_visible_flag", local_id);
+      }
    }
 
    private void handle_predicate_has_after_drivers_flag
@@ -264,19 +228,17 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      if
+      (
+         XMLManager.get_attribute
+         (
+            xml_node,
+            "after_drivers_flag"
+         ).equals("true")
+      )
+      {
+         Predicates.add_entry("has_after_drivers_flag", local_id);
+      }
    }
 
    private void handle_predicate_has_use_flag
@@ -284,19 +246,17 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      if
+      (
+         XMLManager.get_attribute
+         (
+            xml_node,
+            "use_flag"
+         ).equals("true")
+      )
+      {
+         Predicates.add_entry("has_use_flag", local_id);
+      }
    }
 
    private void handle_predicate_has_guarded_signal_flag
@@ -304,19 +264,17 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
-            (
-               null /* TODO: get attribute */
-            )
-         };
-
-      /* Functions.add_entry("filename", params); */
+      if
+      (
+         XMLManager.get_attribute
+         (
+            xml_node,
+            "guarded_signal_flag"
+         ).equals("true")
+      )
+      {
+         Predicates.add_entry("has_guarded_signal_flag", local_id);
+      }
    }
 
    private void handle_predicate_is_of_kind
@@ -324,19 +282,19 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      final IDs params[];
-
-      params =
-         new IDs[]
-         {
-            local_id,
-            Strings.get_id_from_string
+      Predicates.add_entry
+      (
+         "is_of_kind",
+         local_id,
+         Strings.get_id_from_string
+         (
+            XMLManager.get_attribute
             (
-               null /* TODO: get attribute */
+               xml_node,
+               "signal_kind"
             )
-         };
-
-      /* Functions.add_entry("filename", params); */
+         )
+      );
    }
 
    /***************************************************************************/
@@ -347,6 +305,14 @@ public class VHDLSignal extends ParsableXML
       final IDs local_id
    )
    {
-      /* TODO */
+      Predicates.add_entry
+      (
+         "is_waveform_of",
+         Waveforms.get_associated_waveform_id
+         (
+            local_id
+         ),
+         local_id
+      );
    }
 }