From 09a8b72257bc6f33fd2ee89c3418d8bcee6e05e6 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Mon, 23 Oct 2017 18:23:05 +0200 Subject: python: supports python3, add more interfaces. --- src/vhdl/python/libghdl/__init__.py | 2 +- src/vhdl/python/libghdl/thin.py | 242 ++++++---------------------------- src/vhdl/python/libghdl/thinutils.py | 245 +++++++++++++++++++++++++++++++++++ src/vhdl/python/pnodespy.py | 89 ++++++++----- 4 files changed, 339 insertions(+), 239 deletions(-) create mode 100644 src/vhdl/python/libghdl/thinutils.py (limited to 'src') diff --git a/src/vhdl/python/libghdl/__init__.py b/src/vhdl/python/libghdl/__init__.py index d09b70cbd..63a34b23c 100644 --- a/src/vhdl/python/libghdl/__init__.py +++ b/src/vhdl/python/libghdl/__init__.py @@ -18,6 +18,6 @@ libghdl.libghdl_init() # Set the default prefix. _prefix = os.path.join(_basedir, "ghdl") -_prefix_opt = "--PREFIX=" + _prefix +_prefix_opt = ("--PREFIX=" + _prefix).encode('utf-8') libghdl.libghdl__set_option( ctypes.c_char_p(_prefix_opt), len(_prefix_opt)) 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 diff --git a/src/vhdl/python/libghdl/thinutils.py b/src/vhdl/python/libghdl/thinutils.py new file mode 100644 index 000000000..4efa08acf --- /dev/null +++ b/src/vhdl/python/libghdl/thinutils.py @@ -0,0 +1,245 @@ +from libghdl import libghdl +from ctypes import (c_char_p, c_int32, c_int, c_bool, sizeof, c_void_p) +import libghdl.iirs as iirs +import libghdl.thin as thin +import libghdl.nodes_meta as nodes_meta +from libghdl.nodes_meta import (Attr, types) +# from libghdl_defs import (fields, Iir_Kind, types, Attr) + +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 <= thin.Iir_List_All: + return + for i in range(thin.Get_Nbr_Elements(lst)): + yield thin.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 not in iirs.Iir_Kinds.Specification \ + and k1 != iirs.Iir_Kind.Use_Clause: + 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.Concurrent_Assertion_Statement, + iirs.Iir_Kind.Concurrent_Simple_Signal_Assignment, + iirs.Iir_Kind.Concurrent_Selected_Signal_Assignment, + iirs.Iir_Kind.Concurrent_Conditional_Signal_Assignment, + iirs.Iir_Kind.Concurrent_Procedure_Call_Statement, + iirs.Iir_Kind.Block_Statement, + iirs.Iir_Kind.Block_Header, + 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.While_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.File_Declaration, + iirs.Iir_Kind.Object_Alias_Declaration, + iirs.Iir_Kind.Attribute_Declaration, + iirs.Iir_Kind.Component_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)) + + +def concurrent_stmts_iter(n): + """Iterator on concurrent statements in n.""" + k = iirs.Get_Kind(n) + if k == iirs.Iir_Kind.Design_Unit: + for n1 in concurrent_stmts_iter(iirs.Get_Library_Unit(n)): + yield n1 + elif k == iirs.Iir_Kind.Entity_Declaration \ + or k == iirs.Iir_Kind.Architecture_Body \ + or k == iirs.Iir_Kind.Block_Statement: + for n1 in chain_iter(iirs.Get_Concurrent_Statement_Chain(n)): + yield n1 + for n2 in concurrent_stmts_iter(n1): + yield n2 + elif k == iirs.Iir_Kind.For_Generate_Statement: + for n1 in concurrent_stmts_iter(iirs.Get_Generate_Statement_Body(n)): + yield n1 + elif k == iirs.Iir_Kind.If_Generate_Statement: + while n != Null_Iir: + for n1 in concurrent_stmts_iter( + iirs.Get_Generate_Statement_Body(n)): + yield n1 + n = iirs.Get_Generate_Else_Clause(n) + elif k == iirs.Iir_Kind.Case_Generate_Statement: + alt = iirs.Get_Case_Statement_Alternative_Chain(n) + for n1 in chain_iter(alt): + blk = iirs.Get_Associated_Block(n1) + if blk != Null_Iir: + for n2 in concurrent_stmts_iter( + iirs.Get_Generate_Statement_Body(n)): + yield n2 diff --git a/src/vhdl/python/pnodespy.py b/src/vhdl/python/pnodespy.py index d0168784c..11f9fcf2f 100755 --- a/src/vhdl/python/pnodespy.py +++ b/src/vhdl/python/pnodespy.py @@ -2,6 +2,7 @@ """Like pnodes but output for python""" +from __future__ import print_function import sys sys.path.append("../xtools") @@ -12,44 +13,58 @@ libname = 'libghdl' def print_enum(name, vals): - print - print - print 'class {0}:'.format(name) + print() + print() + print('class {0}:'.format(name)) for n, k in enumerate(vals): if k == 'None': k = 'PNone' - print ' {0} = {1}'.format(k, n) + print(' {0} = {1}'.format(k, n)) def do_class_kinds(): print_enum(pnodes.prefix_name.rstrip('_'), pnodes.kinds) + print() + print() + print('class Iir_Kinds:') + for k, v in pnodes.kinds_ranges.items(): + print(' {0} = ['.format(k)) + first = True + for e in v: + if first: + first = False + else: + print(',') + print(' Iir_Kind.{}'.format(e), end='') + print(']') + print() def do_iirs_subprg(): classname = pnodes.node_type.lower() + 's' - print - print 'Get_Kind = {0}.{1}__get_kind'.format(libname, classname) - print 'Get_Location = {0}.nodes__get_location'.format(libname, classname) + print() + print('Get_Kind = {0}.{1}__get_kind'.format(libname, classname)) + print('Get_Location = {0}.nodes__get_location'.format(libname, classname)) for k in pnodes.funcs: - print - print 'Get_{0} = {1}.{2}__get_{3}'.format( - k.name, libname, classname, k.name.lower()) - print - print 'Set_{0} = {1}.{2}__set_{3}'.format( - k.name, libname, classname, k.name.lower(), k.pname, k.rname) + print() + print('Get_{0} = {1}.{2}__get_{3}'.format( + k.name, libname, classname, k.name.lower())) + print() + print('Set_{0} = {1}.{2}__set_{3}'.format( + k.name, libname, classname, k.name.lower(), k.pname, k.rname)) def do_libghdl_elocations(): classname = 'elocations' - print 'from libghdl import libghdl' - print + print('from libghdl import libghdl') + print() for k in pnodes.funcs: - print - print 'Get_{0} = {1}.{2}__get_{3}'.format( - k.name, libname, classname, k.name.lower()) - print - print 'Set_{0} = {1}.{2}__set_{3}'.format( - k.name, libname, classname, k.name.lower(), k.pname, k.rname) + print() + print('Get_{0} = {1}.{2}__get_{3}'.format( + k.name, libname, classname, k.name.lower())) + print() + print('Set_{0} = {1}.{2}__set_{3}'.format( + k.name, libname, classname, k.name.lower(), k.pname, k.rname)) def do_class_types(): @@ -57,19 +72,19 @@ def do_class_types(): def do_types_subprg(): - print + print() for k in pnodes.get_types(): - print - print 'Get_{0} = {1}.nodes_meta__get_{2}'.format( - k, libname, k.lower()) + print() + print('Get_{0} = {1}.nodes_meta__get_{2}'.format( + k, libname, k.lower())) def do_has_subprg(): - print + print() for f in pnodes.funcs: - print - print 'Has_{0} =\\'.format(f.name) - print ' {0}.nodes_meta__has_{1}'.format(libname, f.name.lower()) + print() + print('Has_{0} =\\'.format(f.name)) + print(' {0}.nodes_meta__has_{1}'.format(libname, f.name.lower())) def do_class_field_attributes(): @@ -100,17 +115,18 @@ def read_spec_enum(type_name, prefix, class_name): def do_libghdl_iirs(): - print 'from libghdl import libghdl' + print('from libghdl import libghdl') do_class_kinds() read_spec_enum('Iir_Mode', 'Iir', 'Iir_Mode') + read_spec_enum('Date_State_Type', 'Date', 'Date_State') read_spec_enum('Iir_Predefined_Functions', 'Iir_Predefined', 'Iir_Predefined') do_iirs_subprg() def do_libghdl_meta(): - print 'from libghdl import libghdl' - print """ + print('from libghdl import libghdl') + print(""" # From nodes_meta @@ -122,7 +138,7 @@ get_field_by_index = libghdl.nodes_meta__get_field_by_index get_field_type = libghdl.nodes_meta__get_field_type -get_field_attribute = libghdl.nodes_meta__get_field_attribute""" +get_field_attribute = libghdl.nodes_meta__get_field_attribute""") do_class_types() do_class_field_attributes() do_class_fields() @@ -168,9 +184,12 @@ def do_libghdl_names(): val_max = max(val_max, val) dict[name_def] = val res.append((name_def, val)) - print 'class Name:' + print('class Name:') for n, v in res: - print ' {0} = {1}'.format(n, v) + # Avoid clash with Python names + if n in ['False', 'True']: + n = 'N' + n + print(' {0} = {1}'.format(n, v)) def do_libghdl_tokens(): -- cgit v1.2.3