rfta-svn Mailing List for Refactoring Assistant (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 32
          http://rfta.svn.sourceforge.net/rfta/?rev=32&view=rev
Author:   blep
Date:     2007-04-29 02:12:07 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
- fixed crash on wrong guessed self type detection in base classes.
- fixed parsing of empty function body.
- added overall stats to result

Modified Paths:
--------------
    rfta/trunk/include/rfta/cxxparseraction.h
    rfta/trunk/src/lib_rftaparser/cxxparser_grammar.txt
    rfta/trunk/src/lib_rftaparser/cxxparseraction.cpp
    rfta/trunk/test/testresultbrowser.py

Added Paths:
-----------
    rfta/trunk/testdata/cxxparser_ut/t_class_014_inheritance_ns.cpp

Modified: rfta/trunk/include/rfta/cxxparseraction.h
===================================================================

--- rfta/trunk/include/rfta/cxxparseraction.h	2007-04-28 20:28:02 UTC (rev 31)
+++ rfta/trunk/include/rfta/cxxparseraction.h	2007-04-29 09:12:07 UTC (rev 32)
@@ -89,6 +89,7 @@
    bool scopeQualifiedLookUp_;
    bool isSelfType_;
    //ScopeManager scopeManager_;
+   LocatedSymbol selfTypeId_;
 };
 
 } // namespace Rfta {

Modified: rfta/trunk/src/lib_rftaparser/cxxparser_grammar.txt
===================================================================
--- rfta/trunk/src/lib_rftaparser/cxxparser_grammar.txt	2007-04-28 20:28:02 UTC (rev 31)
+++ rfta/trunk/src/lib_rftaparser/cxxparser_grammar.txt	2007-04-29 09:12:07 UTC (rev 32)
@@ -28,7 +28,10 @@
 # ############################## A.7: Declaration  ############################
 
 ::declaration_seq
-    +( =>( ~( %T_EOF | '}' ) ) *declaration ?declaration_error )
+    +( =>( ~( %T_EOF | '}' ) ) 
+     declaration 
+     |declaration_error 
+     )
     
 ::declaration
     namespace_definition
@@ -217,9 +220,9 @@
 
 ::fn_definition_skip_compound
     '{' 
-    ( +( ~('{' | '}' | %T_EOF) )
-    | +fn_definition_skip_compound
-    )
+    ?( +( ~('{' | '}' | %T_EOF) )
+     | +fn_definition_skip_compound
+     )
     '}'
 
 ::ctor_member_initializer

Modified: rfta/trunk/src/lib_rftaparser/cxxparseraction.cpp
===================================================================
--- rfta/trunk/src/lib_rftaparser/cxxparseraction.cpp	2007-04-28 20:28:02 UTC (rev 31)
+++ rfta/trunk/src/lib_rftaparser/cxxparseraction.cpp	2007-04-29 09:12:07 UTC (rev 32)
@@ -158,6 +158,16 @@
          CPPTL_DEBUG_ASSERT_UNREACHABLE;
       }
    }
+   // do not allow self type id .
+   if ( isSelfType_ )
+   {
+      isSelfType_ = false;
+      if ( scopeQualifiedLookUp_ )
+         typeId_ = &( decls_.declareOrResolveQualifiedType( selfTypeId_, *lookUpScope_ ) );
+      else
+         typeId_ = &( decls_.declareOrResolveUnqualifiedType( selfTypeId_, *lookUpScope_ ) );
+   }
+
    TypeDeclaration *typeDecl = typeId_->isTypeDeclaration();
    CPPTL_ASSERT_MESSAGE( typeDecl != 0, "Inherited type is not an aggregate." );
    currentClassDecl_->addBaseClass( *typeDecl, AccessLevel( access ) );
@@ -252,6 +262,7 @@
    {
       isSelfType_ = true;
       typeId_ = 0;
+      selfTypeId_ = *(typeId.start_);
    }
    else
    {

Modified: rfta/trunk/test/testresultbrowser.py
===================================================================
--- rfta/trunk/test/testresultbrowser.py	2007-04-28 20:28:02 UTC (rev 31)
+++ rfta/trunk/test/testresultbrowser.py	2007-04-29 09:12:07 UTC (rev 32)
@@ -189,17 +189,26 @@
     def _makeIndex( self ):
         print '_makeIndex'
         suffix = '-parser.txt'
-        s = "<table><tr><td>Project</td><td>%ok</td><td>Pass/Fail</td><td>Decl.</td></tr>"
+        sall = "<table><tr><td>Project</td><td>%ok</td><td>Pass/Fail</td><td>Decl.</td></tr>"
+        s = ''
+        total_passed, total_failed,total_decls = (0,0,0)
         for path in glob.glob( os.path.join( TESTRESULT_PATH, '*' + suffix ) ):
             print 'Generating content for', path
             path = path[:-len(suffix)]
             info = self.getProjectInfo( os.path.split(path)[1] )
             project_link = info.getProjectLink()
-            s+= "<tr><td>%s</td><td>%3.1f%%</td><td>%4d/%-4d</td><td>%d</td>" % (
+            s+= "<tr><td>%s</td><td>%3.1f%%</td><td>%4d/%-4d</td><td>%d</td>\n" % (
                 project_link, 100.0 * len(info.passed) / float(max(1,len(info.status))),
                 len(info.passed), len(info.failed), len(info.decls) )
-        s += "</table>"
-        return self.makeHTML( s )
+            total_passed += len(info.passed)
+            total_failed += len(info.failed)
+            total_decls += len(info.decls)
+        sall += "<tr><td>%s</td><td>%3.1f%%</td><td>%4d/%-4d</td><td>%d</td>\n" % (
+            'Overall', 100.0 * total_passed / float(max(1,total_failed+total_passed)),
+            total_passed, total_failed, total_decls )
+        sall += s
+        sall += "</table>"
+        return self.makeHTML( sall )
 
     def makeHTML( self, body, style = '' ):
         if style != '':

Added: rfta/trunk/testdata/cxxparser_ut/t_class_014_inheritance_ns.cpp
===================================================================
--- rfta/trunk/testdata/cxxparser_ut/t_class_014_inheritance_ns.cpp	                        (rev 0)
+++ rfta/trunk/testdata/cxxparser_ut/t_class_014_inheritance_ns.cpp	2007-04-29 09:12:07 UTC (rev 32)
@@ -0,0 +1,3 @@
+class C0014 : public C14::C14
+{
+};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




rfta-svn Mailing List for Refactoring Assistant (Page 2)

rfta-svn — Commit notifications