[Gnash-commit] gnash ChangeLog server/asobj/ClassHierarchy.cpp...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/06 08:54:30

Modified files:
        .              : ChangeLog 
        server/asobj   : ClassHierarchy.cpp ClassHierarchy.h 

Log message:
                * server/asobj/ClassHierarchy.{cpp,h}: add output operator
                  for nativeClass and extentionClass, handle declareClass
                  failures in massDeclare (log_error).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6515&r2=1.6516
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ClassHierarchy.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ClassHierarchy.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6515
retrieving revision 1.6516
diff -u -b -r1.6515 -r1.6516
--- ChangeLog   6 May 2008 08:39:53 -0000       1.6515
+++ ChangeLog   6 May 2008 08:54:29 -0000       1.6516
@@ -1,5 +1,8 @@
 2008-05-06 Sandro Santilli <address@hidden>
 
+       * server/asobj/ClassHierarchy.{cpp,h}: add output operator
+         for nativeClass and extentionClass, handle declareClass
+         failures in massDeclare (log_error).
        * server/as_prop_flags.h: add output operator (useful
          for log_debug).
 

Index: server/asobj/ClassHierarchy.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ClassHierarchy.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/asobj/ClassHierarchy.cpp     5 May 2008 10:02:30 -0000       1.14
+++ server/asobj/ClassHierarchy.cpp     6 May 2008 08:54:30 -0000       1.15
@@ -308,7 +308,10 @@
                nativeClass& c = knownClasses[i];
                if (c.version > version)
                        continue;
-               declareClass(c);
+               if ( ! declareClass(c) )
+               {
+                       log_error("Could not declare class %s", c);
+               }
        }
 
        if (mExtension != NULL)
@@ -327,5 +330,33 @@
 ClassHierarchy::dump()
 {
 }
+std::ostream& operator << (std::ostream& os, const 
ClassHierarchy::nativeClass& c)
+{
+       string_table& st = VM::get().getStringTable();
+
+       os << "("
+               << " name:" << st.value(c.name)
+               << " super:" << st.value(c.super_name)
+               << " namespace:" << st.value(c.namespace_name)
+               << " version:" << c.version
+               << ")";
+
+       return os;
+}
+
+std::ostream& operator << (std::ostream& os, const 
ClassHierarchy::extensionClass& c)
+{
+       string_table& st = VM::get().getStringTable();
+
+       os << "(file:" << c.file_name
+               << " init:" << c.init_name
+               << " name:" << st.value(c.name)
+               << " super:" << st.value(c.super_name)
+               << " namespace:" << st.value(c.namespace_name)
+               << " version:" << c.version
+               << ")";
+
+       return os;
+}
 
 } /* namespace gnash */

Index: server/asobj/ClassHierarchy.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ClassHierarchy.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/ClassHierarchy.h       21 Jan 2008 20:55:54 -0000      1.7
+++ server/asobj/ClassHierarchy.h       6 May 2008 08:54:30 -0000       1.8
@@ -21,6 +21,7 @@
 
 #include <list>
 #include <vector>
+#include <ostream>
 
 #include "as_object.h"
 #include "asClass.h"
@@ -239,6 +240,9 @@
        SafeStack<asBoundAccessor> mBoundAccessorMemory;
 };
 
+std::ostream& operator << (std::ostream& os, const 
ClassHierarchy::nativeClass& c);
+std::ostream& operator << (std::ostream& os, const 
ClassHierarchy::extensionClass& c);
+
 } /* namespace gnash */
 #endif /* GNASH_CLASS_HIERARCHY_H */