[Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/16 21:06:44

Modified files:
        .              : ChangeLog 
        server         : as_value.cpp as_value.h as_environment.cpp 
                         as_environment.h 

Log message:
                * server/as_value.{cpp,h}: add to_debug_string(), have output
                  operator use it.
                * server/as_environment.{cpp,h}: use debugging output for 
as_values
                  when dumping stack,registers and locals.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2614&r2=1.2615
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2614
retrieving revision 1.2615
diff -u -b -r1.2614 -r1.2615
--- ChangeLog   16 Mar 2007 19:35:12 -0000      1.2614
+++ ChangeLog   16 Mar 2007 21:06:44 -0000      1.2615
@@ -1,3 +1,10 @@
+2007-03-16 Sandro Santilli <address@hidden>
+
+       * server/as_value.{cpp,h}: add to_debug_string(), have output
+         operator use it.
+       * server/as_environment.{cpp,h}: use debugging output for as_values
+         when dumping stack,registers and locals.
+
 2007-03-16  Rob Savoye  <address@hidden>
 
        * testsuite/libamf.all/string-variable.amf:  Binary test case for

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/as_value.cpp 16 Mar 2007 10:12:58 -0000      1.26
+++ server/as_value.cpp 16 Mar 2007 21:06:44 -0000      1.27
@@ -783,6 +783,38 @@
        return *this == v;
 }
 
+std::string
+as_value::to_debug_string() const
+{
+       std::string ret;
+       char buf[512];
+
+       switch (m_type)
+       {
+               case UNDEFINED:
+                       return "[undefined]";
+               case NULLTYPE:
+                       return "[null]";
+               case BOOLEAN:
+                       sprintf(buf, "[bool:%s]", m_boolean_value ? "true" : 
"false");
+                       return buf;
+               case OBJECT:
+                       sprintf(buf, "[object:%p]", m_object_value);
+                       return buf;
+               case AS_FUNCTION:
+                       sprintf(buf, "[function:%p]", m_as_function_value);
+                       return buf;
+               case STRING:
+                       ret = "[string:" + std::string(m_string_value.c_str()) 
+ std::string("]");
+                       return ret;
+               case NUMBER:
+                       sprintf(buf, "[number:%g]", m_number_value);
+                       return buf;
+               default:
+                       assert(0);
+       }
+}
+
 } // namespace gnash
 
 

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/as_value.h   16 Mar 2007 10:12:58 -0000      1.31
+++ server/as_value.h   16 Mar 2007 21:06:44 -0000      1.32
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.31 2007/03/16 10:12:58 strk Exp $ */
+/* $Id: as_value.h,v 1.32 2007/03/16 21:06:44 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -312,6 +312,8 @@
        ///
        std::string to_std_string(as_environment* env=NULL) const;
 
+       std::string to_debug_string() const;
+
        /// Get a version-dependent std::string representation for this value.
        //
        /// @param version
@@ -582,7 +584,7 @@
 };
 
 inline std::ostream& operator<< (std::ostream& os, const as_value& v) {
-       return os << v.to_string();
+       return os << v.to_debug_string();
 }
 
 } // namespace gnash

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/as_environment.cpp   9 Mar 2007 10:39:10 -0000       1.57
+++ server/as_environment.cpp   16 Mar 2007 21:06:44 -0000      1.58
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.57 2007/03/09 10:39:10 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.58 2007/03/16 21:06:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -220,14 +220,14 @@
 {
        IF_VERBOSE_ACTION (
     log_action("-------------- %s = %s",
-              varname.c_str(), val.to_string());
+              varname.c_str(), val.to_debug_string().c_str());
        );
 
     // Path lookup rigamarole.
     as_object* target = m_target;
     std::string        path;
     std::string        var;
-    //log_msg("set_variable(%s, %s)", varname.c_str(), val.to_string());
+    //log_msg("set_variable(%s, %s)", varname.c_str(), 
val.to_debug_string().c_str());
     bool is_slash_based;
     if (parse_path(varname, path, var, &is_slash_based)) {
        //log_msg("Variable '%s' parsed into path='%s', var='%s'", 
varname.c_str(), path.c_str(), var.c_str());
@@ -241,7 +241,7 @@
        {
                IF_VERBOSE_ASCODING_ERRORS(
                log_aserror("Path target '%s' not found while setting %s=%s",
-                       path.c_str(), varname.c_str(), val.to_string());
+                       path.c_str(), varname.c_str(), 
val.to_debug_string().c_str());
                );
        }
     } else {
@@ -441,7 +441,7 @@
                IF_VERBOSE_ASCODING_ERRORS(
                log_aserror("as_environment::find_target: '%s': "
                        "invalid path; neither string nor object",
-                       val.to_string());
+                       val.to_debug_string().c_str() );
                );
                return NULL;
        }
@@ -823,7 +823,7 @@
        for (size_t i=0; i<r.size(); ++i)
        {
                if (i) out << ", ";
-               out << i << ':' << '"' << r[i].to_string() << '"';
+               out << i << ':' << '"' << r[i] << '"';
        }
 }
 
@@ -879,7 +879,7 @@
        {
                if (i) registers += std::string(" | ");
                registers += std::string("\"") +
-                       m_global_register[i].to_std_string() +
+                       m_global_register[i].to_debug_string() +
                        std::string("\"");
                if ( ! m_global_register[i].is_undefined() ) defined++;
        }

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/as_environment.h     2 Mar 2007 19:38:56 -0000       1.41
+++ server/as_environment.h     16 Mar 2007 21:06:44 -0000      1.42
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_environment.h,v 1.41 2007/03/02 19:38:56 strk Exp $ */
+/* $Id: as_environment.h,v 1.42 2007/03/16 21:06:44 strk Exp $ */
 
 #ifndef GNASH_AS_ENVIRONMENT_H
 #define GNASH_AS_ENVIRONMENT_H
@@ -361,7 +361,7 @@
                for (unsigned int i=0, n=m_stack.size(); i<n; i++)
                {
                        if (i) out << " | ";
-                       out << '"' << m_stack[i].to_string() << '"';
+                       out << '"' << m_stack[i] << '"';
                }
                out << std::endl;
        }