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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/21 09:38:08

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 

Log message:
        use references when appropriate

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.889&r2=1.890
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -b -r1.889 -r1.890
--- ChangeLog   21 Sep 2006 09:31:11 -0000      1.889
+++ ChangeLog   21 Sep 2006 09:38:08 -0000      1.890
@@ -1,6 +1,7 @@
 2006-09-21 Sandro Santilli  <address@hidden>
 
-       * server/as_environment.h: doxygen comments 
+       * server/as_environment.{h,cpp}: doxygen comments, minor
+         interface cleanup (use references when appropriate)
        * server/parser/edit_text_character_def.cpp: added comment
          about why we're doing the wrong thing with VariableName
          (related to bug#17806)

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/as_environment.cpp   21 Sep 2006 07:20:15 -0000      1.18
+++ server/as_environment.cpp   21 Sep 2006 09:38:08 -0000      1.19
@@ -34,7 +34,7 @@
 // forward this exception.
 //
 
-/* $Id: as_environment.cpp,v 1.18 2006/09/21 07:20:15 nihilus Exp $ */
+/* $Id: as_environment.cpp,v 1.19 2006/09/21 09:38:08 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -58,7 +58,8 @@
     character* target = m_target;
     tu_string  path;
     tu_string  var;
-    if (parse_path(varname, &path, &var)) {
+    //log_msg("get_variable(%s)", varname.c_str());
+    if (parse_path(varname, path, var)) {
        target = find_target(path);     // @@ Use with_stack here too???  Need 
to test.
        if (target) {
            as_value    val;
@@ -163,7 +164,8 @@
     character* target = m_target;
     tu_string  path;
     tu_string  var;
-    if (parse_path(varname, &path, &var)) {
+    //log_msg("set_variable(%s, %s)", varname.c_str(), val.to_string());
+    if (parse_path(varname, path, var)) {
        target = find_target(path);
        if (target) {
            target->set_member(var, val);
@@ -347,24 +349,11 @@
     return -1;
 }
 
-// See if the given variable name is actually a sprite path
-// followed by a variable name.  These come in the format:
-//
-//     /path/to/some/sprite/:varname
-//
-// (or same thing, without the last '/')
-//
-// or
-//     path.to.some.var
-//
-// If that's the format, puts the path part (no colon or
-// trailing slash) in *path, and the varname part (no color)
-// in *var and returns true.
-//
-// If no colon, returns false and leaves *path & *var alone.
 bool
-as_environment::parse_path(const tu_string& var_path, tu_string* path, 
tu_string* var) const
+as_environment::parse_path(const tu_string& var_path,
+               tu_string& path, tu_string& var) const
 {
+//log_msg("parse_path(%s)", var_path.c_str());
     // Search for colon.
     int        colon_index = 0;
     int        var_path_length = var_path.length();
@@ -385,6 +374,7 @@
            }
        }
        if (colon_index < 0) {
+//log_msg(" no colon index");
            return false;
        }
     }
@@ -392,7 +382,7 @@
     // Make the subparts.
     
     // Var.
-    *var = &var_path[colon_index + 1];
+    var = &var_path[colon_index + 1];
     
     // Path.
     if (colon_index > 0) {
@@ -402,8 +392,10 @@
        }
     }
     // @@ could be better.  This whole usage of tu_string is very flabby...
-    *path = var_path;
-    path->resize(colon_index);
+    path = var_path;
+    path.resize(colon_index);
+    
+//log_msg(" path=%s var=%s", path.c_str(), var.c_str());
     
     return true;
 }
@@ -447,6 +439,9 @@
 }
 
 // Find the sprite/movie referenced by the given path.
+//
+// Supports both /slash/syntax and dot.syntax
+//
 character*
 as_environment::find_target(const tu_string& path) const
 {
@@ -461,7 +456,6 @@
     assert(env);
     
     const char*        p = path.c_str();
-    tu_string  subpart;
 
     if (*p == '/') {
        // Absolute path.  Start at the root.
@@ -473,6 +467,7 @@
        return env;
     }
 
+    tu_string  subpart;
     while (env) {
        const char*     next_slash = next_slash_or_dot(p);
        subpart = p;