|
From: <rom...@us...> - 2009-01-14 09:50:54
|
Revision: 1569
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1569&view=rev
Author: roman_yakovenko
Date: 2009-01-14 09:50:52 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
adding ability to view gccxml generated file
Modified Paths:
--------------
pygccxml_dev/pygccxml/parser/project_reader.py
Modified: pygccxml_dev/pygccxml/parser/project_reader.py
===================================================================
--- pygccxml_dev/pygccxml/parser/project_reader.py 2009-01-14 09:47:29 UTC (rev 1568)
+++ pygccxml_dev/pygccxml/parser/project_reader.py 2009-01-14 09:50:52 UTC (rev 1569)
@@ -307,6 +307,44 @@
reader = source_reader.source_reader_t( self.__config, None, self.__decl_factory )
return reader.read_string( content )
+ def read_xml( self, file_configuration ):
+ """parses C++ code, defined on the file_configurations and returns GCCXML
+ generated file content"""
+
+ xml_file_path = None
+ delete_xml_file = True
+ fc = file_configuration
+ reader = source_reader.source_reader_t( self.__config, None, self.__decl_factory )
+ try:
+ if fc.content_type == fc.CONTENT_TYPE.STANDARD_SOURCE_FILE:
+ self.logger.info( 'Parsing source file "%s" ... ' % fc.data )
+ xml_file_path = reader.create_xml_file( fc.data )
+ elif fc.content_type == file_configuration_t.CONTENT_TYPE.GCCXML_GENERATED_FILE:
+ self.logger.info( 'Parsing xml file "%s" ... ' % fc.data )
+ xml_file_path = fc.data
+ delete_xml_file = False
+ elif fc.content_type == fc.CONTENT_TYPE.CACHED_SOURCE_FILE:
+ #TODO: raise error when header file does not exist
+ if not os.path.exists( fc.cached_source_file ):
+ dir_ = os.path.split( fc.cached_source_file )[0]
+ if dir_ and not os.path.exists( dir_ ):
+ os.makedirs( dir_ )
+ self.logger.info( 'Creating xml file "%s" from source file "%s" ... '
+ % ( fc.cached_source_file, header ) )
+ xml_file_path = reader.create_xml_file( header, fc.cached_source_file )
+ else:
+ xml_file_path = fc.cached_source_file
+ else:
+ xml_file_path = reader.create_xml_file_from_string( fc.data )
+ xml_file = file( xml_file_path, 'r' )
+ xml = xml_file.read()
+ xml_file.close()
+ utils.remove_file_no_raise( xml_file_path )
+ return xml
+ finally:
+ if xml_file_path and delete_xml_file:
+ utils.remove_file_no_raise( xml_file_path )
+
def _join_top_namespaces(self, main_ns_list, other_ns_list):
answer = main_ns_list[:]
for other_ns in other_ns_list:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2010-01-18 22:11:53
|
Revision: 1814
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1814&view=rev
Author: roman_yakovenko
Date: 2010-01-18 22:11:47 +0000 (Mon, 18 Jan 2010)
Log Message:
-----------
fix project merge bug - in case there are class definition and class forward declaration, the second one should be replaced with the first one
Modified Paths:
--------------
pygccxml_dev/pygccxml/parser/project_reader.py
Modified: pygccxml_dev/pygccxml/parser/project_reader.py
===================================================================
--- pygccxml_dev/pygccxml/parser/project_reader.py 2010-01-18 22:09:09 UTC (rev 1813)
+++ pygccxml_dev/pygccxml/parser/project_reader.py 2010-01-18 22:11:47 UTC (rev 1814)
@@ -384,6 +384,26 @@
assert 1 == len( joined_decls[ decl._name ] )
if isinstance( decl, pygccxml.declarations.namespace_t ):
joined_decls[ decl._name ][0].take_parenting( decl )
+
+ class_t = pygccxml.declarations.class_t
+ class_declaration_t = pygccxml.declarations.class_declaration_t
+ if class_t in ddhash and class_declaration_t in ddhash:
+ #if there is a class and its forward declaration - get rid of the
+ #second one.
+ class_names = set()
+ for name, same_name_classes in ddhash[ class_t ].iteritems():
+ if not name:
+ continue
+ class_names.add( same_name_classes[0].mangled )
+
+ class_declarations = ddhash[ class_declaration_t ]
+ for name, same_name_class_declarations in class_declarations.iteritems():
+ if not name:
+ continue
+ for class_declaration in same_name_class_declarations :
+ if class_declaration.mangled and class_declaration.mangled in class_names:
+ decls.remove( class_declaration )
+
nsref.declarations = decls
def _join_class_hierarchy( self, namespaces ):
@@ -454,6 +474,12 @@
def _relink_declarated_types(self, leaved_classes, declarated_types):
create_key = lambda decl:( decl.location.as_tuple()
, tuple( pygccxml.declarations.declaration_path( decl ) ) )
+ create_mangled_key = lambda decl:( decl.location.as_tuple(), decl.mangled )
+
+ mangled_leaved_classes = {}
+ for cls in leaved_classes.itervalues():
+ mangled_leaved_classes[ create_mangled_key( cls ) ] = cls
+
for decl_wrapper_type in declarated_types:
#it is possible, that cache contains reference to dropped class
#We need to clear it
@@ -461,7 +487,7 @@
if isinstance( decl_wrapper_type.declaration, pygccxml.declarations.class_t ):
key = create_key(decl_wrapper_type.declaration)
if leaved_classes.has_key( key ):
- decl_wrapper_type.declaration = leaved_classes[ create_key(decl_wrapper_type.declaration) ]
+ decl_wrapper_type.declaration = leaved_classes[ key ]
else:
if decl_wrapper_type.declaration._name.startswith( '__vmi_class_type_info_pseudo' ):
continue
@@ -472,6 +498,10 @@
msg.append( " 1. There are different preprocessor definitions applied on same file during compilation" )
msg.append( " 2. Bug in pygccxml." )
self.logger.error( os.linesep.join(msg) )
+ elif isinstance( decl_wrapper_type.declaration, pygccxml.declarations.class_declaration_t ):
+ key = create_mangled_key(decl_wrapper_type.declaration)
+ if mangled_leaved_classes.has_key( key ):
+ decl_wrapper_type.declaration = mangled_leaved_classes[ key ]
def _join_declarations( self, declref ):
self._join_namespaces( declref )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
