[Gnash-commit] gnash ChangeLog server/as_environment.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/13 11:09:13

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 

Log message:
                * server/as_environment.cpp: added debugging lines for
                  find_target (compile-time enablable).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1930&r2=1.1931
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1930
retrieving revision 1.1931
diff -u -b -r1.1930 -r1.1931
--- ChangeLog   13 Dec 2006 11:08:10 -0000      1.1930
+++ ChangeLog   13 Dec 2006 11:09:12 -0000      1.1931
@@ -1,5 +1,7 @@
 2006-12-13 Sandro Santilli <address@hidden>
 
+       * server/as_environment.cpp: added debugging lines for
+         find_target (compile-time enablable).
        * server/vm/ASHandlers.{h,cpp}: added CommonSetTarget().
        * server/font.cpp (font::read_font_info): warn only once
          about DefineFontInfo2 being partially implemented...

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/as_environment.cpp   10 Dec 2006 18:39:22 -0000      1.39
+++ server/as_environment.cpp   13 Dec 2006 11:09:12 -0000      1.40
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.39 2006/12/10 18:39:22 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.40 2006/12/13 11:09:12 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,6 +33,9 @@
 #include <string>
 #include <utility> // for std::pair
 
+// Define this to have find_target() calls trigger debugging output
+//#define DEBUG_TARGET_FINDING 1
+
 namespace gnash {
 
 // Return the value of the given var, if it's defined.
@@ -402,6 +405,7 @@
                as_object* obj = val.to_object();
                assert (obj);
                character* s=dynamic_cast<character*>(obj);
+               log_msg("find_target is a character, returning it");
                return s; // might be NULL
        }
        else if (val.get_type() == as_value::STRING)
@@ -440,10 +444,14 @@
 character*
 as_environment::find_target(const std::string& path) const
 {
-       //log_msg("find_target(%s) called", path.c_str());
+#ifdef DEBUG_TARGET_FINDING 
+       log_msg("find_target(%s) called", path.c_str());
+#endif
 
     if (path.length() <= 0) {
-       //log_msg("Returning m_target");
+#ifdef DEBUG_TARGET_FINDING 
+       log_msg("Returning m_target (empty path)");
+#endif
        return m_target;
     }
     
@@ -458,11 +466,16 @@
     if (*p == '/') {
        // Absolute path.  Start at the root.
        env = env->get_root_movie();
-       //log_msg("Absolute path, start at the root (%p)", (void*)env);
+#ifdef DEBUG_TARGET_FINDING 
+       log_msg("Absolute path, start at the root (%p)", (void*)env);
+#endif
        p++;
     }
     
     if (*p == '\0') {
+#ifdef DEBUG_TARGET_FINDING 
+       log_msg("Null path, returning m_target");
+#endif
        return env;
     }
 
@@ -479,8 +492,17 @@
        }
        
        // No more components to scan
-       if ( subpart.empty() ) break;
+       if ( subpart.empty() )
+       {
+#ifdef DEBUG_TARGET_FINDING 
+       log_msg("No more subparts, env is %p", (void*)env);
+#endif
+               break;
+       }
 
+#ifdef DEBUG_TARGET_FINDING 
+       log_msg("Invoking get_relative_target(%s) on object %p (%s)", 
subpart.c_str(), (void *)env, env->get_name().c_str());
+#endif
        env = env->get_relative_target(subpart);
        //@@   _level0 --> root, .. --> parent, . --> this, other == character