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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/21 12:26:17

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

Log message:
                * server/as_environment.{cpp,h}: parse_path() made a public
                  static method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.892&r2=1.893
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.892
retrieving revision 1.893
diff -u -b -r1.892 -r1.893
--- ChangeLog   21 Sep 2006 10:18:37 -0000      1.892
+++ ChangeLog   21 Sep 2006 12:26:17 -0000      1.893
@@ -1,5 +1,7 @@
 2006-09-21 Sandro Santilli  <address@hidden>
 
+       * server/as_environment.{cpp,h}: parse_path() made a public
+         static method.
        * server/edit_text_character.cpp, server/edit_text_character.h,
          server/parser/edit_text_character_def.cpp,
          server/parser/edit_text_character_def.h:

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/as_environment.cpp   21 Sep 2006 09:38:08 -0000      1.19
+++ server/as_environment.cpp   21 Sep 2006 12:26:17 -0000      1.20
@@ -34,7 +34,7 @@
 // forward this exception.
 //
 
-/* $Id: as_environment.cpp,v 1.19 2006/09/21 09:38:08 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.20 2006/09/21 12:26:17 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -349,9 +349,10 @@
     return -1;
 }
 
+/* public static */
 bool
 as_environment::parse_path(const tu_string& var_path,
-               tu_string& path, tu_string& var) const
+               tu_string& path, tu_string& var) 
 {
 //log_msg("parse_path(%s)", var_path.c_str());
     // Search for colon.

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/as_environment.h     21 Sep 2006 09:31:12 -0000      1.21
+++ server/as_environment.h     21 Sep 2006 12:26:17 -0000      1.22
@@ -36,7 +36,7 @@
 //
 //
 
-/* $Id: as_environment.h,v 1.21 2006/09/21 09:31:12 strk Exp $ */
+/* $Id: as_environment.h,v 1.22 2006/09/21 12:26:17 strk Exp $ */
 
 #ifndef GNASH_AS_ENVIRONMENT_H
 #define GNASH_AS_ENVIRONMENT_H
@@ -291,18 +291,6 @@
        ///
        int get_version() const;
 
-private:
-
-       as_value m_global_register[4];
-
-       /// function2 uses this (could move to swf_function2 class)
-       std::vector<as_value>   m_local_register;
-
-       /// Movie target. 
-       character* m_target;
-
-       int find_local(const tu_string& varname) const;
-
        // See if the given variable name is actually a sprite path
        // followed by a variable name.  These come in the format:
        //
@@ -319,8 +307,21 @@
        //
        // If no colon, returns false and leaves *path & *var alone.
        //
-       bool parse_path(const tu_string& var_path, tu_string& path,
-               tu_string& var) const;
+       static bool parse_path(const tu_string& var_path, tu_string& path,
+               tu_string& var);
+
+
+private:
+
+       as_value m_global_register[4];
+
+       /// function2 uses this (could move to swf_function2 class)
+       std::vector<as_value>   m_local_register;
+
+       /// Movie target. 
+       character* m_target;
+
+       int find_local(const tu_string& varname) const;
 
        /// Given a variable name, set its value (no support for path)
        void set_variable_raw(const tu_string& path, const as_value& val,