python: supports python3, add more interfaces.

1 files changed, 39 insertions, 203 deletions

diff --git a/src/vhdl/python/libghdl/thin.py b/src/vhdl/python/libghdl/thin.py
index aa25beb1d..88db6ecbd 100644
--- a/src/vhdl/python/libghdl/thin.py
+++ b/src/vhdl/python/libghdl/thin.py
@@ -1,8 +1,8 @@
 from libghdl import libghdl
 from ctypes import (c_char_p, c_int32, c_int, c_bool, sizeof, c_void_p)
-import iirs
-import nodes_meta
-from nodes_meta import (Attr, types)
+import libghdl.iirs as iirs
+import libghdl.nodes_meta as nodes_meta
+from libghdl.nodes_meta import (Attr, types)
 # from libghdl_defs import (fields, Iir_Kind, types, Attr)
 
 assert sizeof(c_bool) == 1
@@ -31,6 +31,10 @@ Get_Nbr_Elements = libghdl.lists__get_nbr_elements
 
 Get_Nth_Element = libghdl.lists__get_nth_element
 
+Create_Iir_List = libghdl.lists__create_list
+
+Destroy_Iir_List = libghdl.lists__destroy_list
+
 # Files
 
 Location_To_File = libghdl.files_map__location_to_file
@@ -63,18 +67,26 @@ Get_Name_Ptr.restype = c_char_p
 
 _Get_Identifier_With_Len = libghdl.name_table__get_identifier_with_len
 
+def Get_Identifier(s):
+    return _Get_Identifier_With_Len(c_char_p(s), len(s))
+
+
 # Ieee
 
-# Get value
-Std_Logic_Type = c_int.in_dll(libghdl, "ieee__std_logic_1164__std_logic_type")
+class Ieee:
+    # Get value
+    Std_Logic_Type = c_int.in_dll(
+        libghdl, "ieee__std_logic_1164__std_logic_type")
 
-# Get value
-Std_Logic_Vector_Type = c_int.in_dll(
-    libghdl, "ieee__std_logic_1164__std_logic_vector_type")
+    # Get value
+    Std_Logic_Vector_Type = c_int.in_dll(
+        libghdl, "ieee__std_logic_1164__std_logic_vector_type")
 
+    # Get value
+    Rising_Edge = c_int.in_dll(libghdl, "ieee__std_logic_1164__rising_edge")
 
-def Get_Identifier(s):
-    return _Get_Identifier_With_Len(c_char_p(s), len(s))
+    # Get value
+    Falling_Edge = c_int.in_dll(libghdl, "ieee__std_logic_1164__falling_edge")
 
 
 # Flags
@@ -103,11 +115,24 @@ class Scanner:
 
     Get_Position = libghdl.scanner__get_position
 
+    Current_Identifier = libghdl.scanner__current_identifier
+
 
 class Parse:
     Parse_Design_File = libghdl.parse__parse_design_file
 
 
+class Canon:
+    Flag_Concurrent_Stmts = c_bool.in_dll(
+        libghdl, "canon__canon_flag_concurrent_stmts");
+
+    Flag_Configurations = c_bool.in_dll(
+        libghdl, "canon__canon_flag_configurations");
+
+    Extract_Sequential_Statement_Chain_Sensitivity = \
+        libghdl.canon__canon_extract_sequential_statement_chain_sensitivity
+
+
 # std.standard
 
 # Use .value
@@ -140,6 +165,8 @@ Disp_Iir = libghdl.disp_tree__disp_iir
 # Iirs_Utils
 
 class Iirs_Utils:
+    Strip_Denoting_Name = libghdl.iirs_utils__strip_denoting_name
+
     Get_Entity = libghdl.iirs_utils__get_entity
 
     Is_Second_Subprogram_Specification = \
@@ -148,196 +175,5 @@ class Iirs_Utils:
 
 Null_Iir = 0
 Null_Iir_List = 0
-
-
-def _build_enum_image(cls):
-    d = [e for e in dir(cls) if e[0] != '_']
-    res = [None] * len(d)
-    for e in d:
-        res[getattr(cls, e)] = e
-    return res
-
-
-_fields_image = _build_enum_image(nodes_meta.fields)
-
-
-def fields_image(idx):
-    """String representation of field idx"""
-    return _fields_image[idx]
-
-
-_kind_image = _build_enum_image(iirs.Iir_Kind)
-
-
-def kind_image(k):
-    """String representation of Iir_Kind k"""
-    return _kind_image[k]
-
-
-_types_image = _build_enum_image(nodes_meta.types)
-
-
-def types_image(t):
-    """String representation of Nodes_Meta.Types t"""
-    return _types_image[t]
-
-
-_attr_image = _build_enum_image(nodes_meta.Attr)
-
-
-def attr_image(a):
-    """String representation of Nodes_Meta.Attr a"""
-    return _attr_image[a]
-
-
-def fields_iter(n):
-    """Iterate on fields of node n"""
-    if n == Null_Iir:
-        return
-    k = iirs.Get_Kind(n)
-    first = nodes_meta.get_fields_first(k)
-    last = nodes_meta.get_fields_last(k)
-    for i in range(first, last + 1):
-        yield nodes_meta.get_field_by_index(i)
-
-
-def chain_iter(n):
-    """Iterate of a chain headed by node n"""
-    while n != Null_Iir:
-        yield n
-        n = iirs.Get_Chain(n)
-
-
-def chain_to_list(n):
-    """Convert a chain headed by node n to a python list"""
-    return [e for e in chain_iter(n)]
-
-
-def nodes_iter(n):
-    """Iterate of all nodes of n, including n.
-    Nodes are returned only once."""
-    if n == Null_Iir:
-        return
-#    print 'nodes_iter for {0}'.format(n)
-    yield n
-    for f in fields_iter(n):
-        typ = nodes_meta.get_field_type(f)
-#        print ' {0}: field {1} (type: {2})'.format(
-#            n, fields_image(f), types_image(typ))
-        if typ == nodes_meta.types.Iir:
-            attr = nodes_meta.get_field_attribute(f)
-            if attr == Attr.ANone:
-                for n1 in nodes_iter(nodes_meta.Get_Iir(n, f)):
-                    yield n1
-            elif attr == Attr.Chain:
-                n2 = nodes_meta.Get_Iir(n, f)
-                while n2 != Null_Iir:
-                    for n1 in nodes_iter(n2):
-                        yield n1
-                    n2 = iirs.Get_Chain(n2)
-            elif attr == Attr.Maybe_Ref:
-                if not iirs.Get_Is_Ref(n, f):
-                    for n1 in nodes_iter(nodes_meta.Get_Iir(n, f)):
-                        yield n1
-        elif typ == types.Iir_List:
-            attr = nodes_meta.get_field_attribute(f)
-            if attr == Attr.ANone:
-                for n1 in list_iter(nodes_meta.Get_Iir_List(n, f)):
-                    for n2 in nodes_iter(n1):
-                        yield n2
-
-
-def list_iter(lst):
-    """Iterate of all element of Iir_List lst."""
-    if lst == Null_Iir_List:
-        return
-    for i in range(Get_Nbr_Elements(lst)):
-        yield Get_Nth_Element(lst, i)
-
-def declarations_iter(n):
-    """Iterator on all declarations in n."""
-    k = iirs.Get_Kind(n)
-    if nodes_meta.Has_Generic_Chain(k):
-        for n1 in chain_iter(iirs.Get_Generic_Chain(n)):
-            yield n1
-    if nodes_meta.Has_Port_Chain(k):
-        for n1 in chain_iter(iirs.Get_Port_Chain(n)):
-            yield n1
-    if nodes_meta.Has_Interface_Declaration_Chain(k):
-        for n1 in chain_iter(iirs.Get_Interface_Declaration_Chain(n)):
-            yield n1
-    if nodes_meta.Has_Declaration_Chain(k):
-        for n1 in chain_iter(iirs.Get_Declaration_Chain(n)):
-            k1 = iirs.Get_Kind(n1)
-            if k1 != iirs.Iir_Kind.Attribute_Specification:
-                yield n1
-                # There can be nested declarations (subprograms,
-                # record elements)
-                for n2 in declarations_iter(n1):
-                    yield n2
-    if nodes_meta.Has_Concurrent_Statement_Chain(k):
-        for n1 in chain_iter(iirs.Get_Concurrent_Statement_Chain(n)):
-            for n2 in declarations_iter(n1):
-                yield n2
-    if nodes_meta.Has_Sequential_Statement_Chain(k):
-        for n1 in chain_iter(iirs.Get_Sequential_Statement_Chain(n)):
-            for n2 in declarations_iter(n1):
-                yield n2
-    if nodes_meta.Has_Parameter_Specification(k):
-        yield iirs.Get_Parameter_Specification(n)
-    if nodes_meta.Has_Generate_Statement_Body(k):
-        for n1 in declarations_iter(iirs.Get_Generate_Statement_Body(n)):
-            yield n1
-    if nodes_meta.Has_Else_Clause(k):
-        n1 = iirs.Get_Else_Clause(n)
-        if n1 != Null_Iir:
-            for n2 in declarations_iter(n1):
-                yield n2
-    if nodes_meta.Has_Generate_Else_Clause(k):
-        n1 = iirs.Get_Generate_Else_Clause(n)
-        if n1 != Null_Iir:
-            for n2 in declarations_iter(n1):
-                yield n2
-    if nodes_meta.Has_Block_Header(k):
-        n1 = iirs.Get_Block_Header(n)
-        if n1 != Null_Iir:
-            for n2 in declarations_iter(n1):
-                yield n2
-    if k in [iirs.Iir_Kind.Entity_Declaration,
-             iirs.Iir_Kind.Architecture_Body,
-             iirs.Iir_Kind.Package_Body,
-             iirs.Iir_Kind.Process_Statement,
-             iirs.Iir_Kind.Sensitized_Process_Statement,
-             iirs.Iir_Kind.Block_Statement,
-             iirs.Iir_Kind.For_Generate_Statement,
-             iirs.Iir_Kind.If_Generate_Statement,
-             iirs.Iir_Kind.Generate_Statement_Body,
-             iirs.Iir_Kind.Assertion_Statement,
-             iirs.Iir_Kind.Wait_Statement,
-             iirs.Iir_Kind.Simple_Signal_Assignment_Statement,
-             iirs.Iir_Kind.Variable_Assignment_Statement,
-             iirs.Iir_Kind.For_Loop_Statement,
-             iirs.Iir_Kind.Case_Statement,
-             iirs.Iir_Kind.Null_Statement,
-             iirs.Iir_Kind.Exit_Statement,
-             iirs.Iir_Kind.Next_Statement,
-             iirs.Iir_Kind.Procedure_Call_Statement,
-             iirs.Iir_Kind.Signal_Declaration,
-             iirs.Iir_Kind.Constant_Declaration,
-             iirs.Iir_Kind.Variable_Declaration,
-             iirs.Iir_Kind.Object_Alias_Declaration,
-             iirs.Iir_Kind.Attribute_Declaration,
-             iirs.Iir_Kind.If_Statement,
-             iirs.Iir_Kind.Elsif,
-             iirs.Iir_Kind.Return_Statement,
-             iirs.Iir_Kind.Type_Declaration,
-             iirs.Iir_Kind.Anonymous_Type_Declaration,
-             iirs.Iir_Kind.Subtype_Declaration,
-             iirs.Iir_Kind.Function_Declaration,
-             iirs.Iir_Kind.Function_Body,
-             iirs.Iir_Kind.Procedure_Declaration,
-             iirs.Iir_Kind.Procedure_Body,
-             iirs.Iir_Kind.Component_Instantiation_Statement,
-             ]:
-        return
-    assert False, "unknown node of kind {}".format(kind_image(k))
+Iir_List_Others = 1
+Iir_List_All = 2