[Gnash-commit] /srv/bzr/gnash/trunk r9760: Use named strings where appropriate, shake code a bit in array

[Sandro Santilli]

------------------------------------------------------------
revno: 9760
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Tue 2008-09-16 21:00:59 +0200
message:
  Use named strings where appropriate, shake code a bit in array
modified:
  libcore/array.cpp
  libcore/button_character_instance.cpp
  libcore/video_stream_instance.cpp

=== modified file 'libcore/array.cpp'
--- a/libcore/array.cpp 2008-09-15 11:46:35 +0000
+++ b/libcore/array.cpp 2008-09-16 19:00:59 +0000
@@ -1410,7 +1410,7 @@
     log_action(_("array_new called, nargs = %d"), fn.nargs);
     );
 
-    boost::intrusive_ptr<as_array_object>    ao = new as_array_object;
+    boost::intrusive_ptr<as_array_object> ao = new as_array_object;
 
     if (fn.nargs == 0)
     {
@@ -1447,7 +1447,7 @@
     as_c_function_ptr gettersetter;
 
     gettersetter = &array_length;
-    proto.init_property("length", *gettersetter, *gettersetter);
+    proto.init_property(NSV::PROP_LENGTH, *gettersetter, *gettersetter);
 }
 
 static void
@@ -1530,30 +1530,35 @@
     return proto.get();
 }
 
-// this registers the "Array" member on a "Global"
-// object. "Array" is a constructor, thus an object
-// with .prototype full of exported functions + 
-// 'constructor'
-//
-void
-array_class_init(as_object& glob)
+static as_function*
+getArrayConstructor(VM& vm)
 {
     // This is going to be the global Array "class"/"function"
-    static boost::intrusive_ptr<as_function> ar=NULL;
+    static as_function* ar=0;
 
     if ( ar == NULL )
     {
-        VM& vm = glob.getVM();
         vm.registerNative(array_new, 252, 0);
         ar = new builtin_function(&array_new, getArrayInterface());
-        vm.addStatic(ar.get());
+        vm.addStatic(ar);
 
         // Attach static members
         attachArrayStatics(*ar);
     }
 
+    return ar;
+}
+
+// this registers the "Array" member on a "Global"
+// object. "Array" is a constructor, thus an object
+// with .prototype full of exported functions + 
+// 'constructor'
+//
+void
+array_class_init(as_object& glob)
+{
     // Register _global.Array
-    glob.init_member("Array", ar.get());
+    glob.init_member("Array", getArrayConstructor(glob.getVM()));
 }
 
 void

=== modified file 'libcore/button_character_instance.cpp'
--- a/libcore/button_character_instance.cpp     2008-08-21 10:06:20 +0000
+++ b/libcore/button_character_instance.cpp     2008-09-16 19:00:59 +0000
@@ -237,49 +237,49 @@
        //
 
        gettersetter = &character::x_getset;
-       o.init_property("_x", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uX, *gettersetter, *gettersetter);
 
        gettersetter = &character::y_getset;
-       o.init_property("_y", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uY, *gettersetter, *gettersetter);
 
        gettersetter = &character::xscale_getset;
-       o.init_property("_xscale", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uXSCALE, *gettersetter, *gettersetter);
 
        gettersetter = &character::yscale_getset;
-       o.init_property("_yscale", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uYSCALE, *gettersetter, *gettersetter);
 
        gettersetter = &character::xmouse_get;
-       o.init_readonly_property("_xmouse", *gettersetter);
+       o.init_readonly_property(NSV::PROP_uXMOUSE, *gettersetter);
 
        gettersetter = &character::ymouse_get;
-       o.init_readonly_property("_ymouse", *gettersetter);
+       o.init_readonly_property(NSV::PROP_uYMOUSE, *gettersetter);
 
        gettersetter = &character::alpha_getset;
-       o.init_property("_alpha", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uALPHA, *gettersetter, *gettersetter);
 
        gettersetter = &character::visible_getset;
-       o.init_property("_visible", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uVISIBLE, *gettersetter, *gettersetter);
 
        gettersetter = &character::width_getset;
-       o.init_property("_width", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uWIDTH, *gettersetter, *gettersetter);
 
        gettersetter = &character::height_getset;
-       o.init_property("_height", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uHEIGHT, *gettersetter, *gettersetter);
 
        gettersetter = &character::rotation_getset;
-       o.init_property("_rotation", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uROTATION, *gettersetter, *gettersetter);
 
        gettersetter = &character::parent_getset;
-       o.init_property("_parent", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uPARENT, *gettersetter, *gettersetter);
        
        gettersetter = &character::target_getset;
-       o.init_property("_target", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uTARGET, *gettersetter, *gettersetter);
 
        gettersetter = character::name_getset;
-       o.init_property("_name", gettersetter, gettersetter);
+       o.init_property(NSV::PROP_uNAME, gettersetter, gettersetter);
        
        gettersetter = &button_character_instance::enabled_getset;
-       o.init_property("enabled", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_ENABLED, *gettersetter, *gettersetter);
 
 }
 

=== modified file 'libcore/video_stream_instance.cpp'
--- a/libcore/video_stream_instance.cpp 2008-09-01 13:24:45 +0000
+++ b/libcore/video_stream_instance.cpp 2008-09-16 19:00:59 +0000
@@ -31,6 +31,7 @@
 #include "Object.h"
 #include "MediaHandler.h" // for setting up embedded video decoder 
 #include "VideoDecoder.h" // for setting up embedded video decoder
+#include "namedStrings.h"
 
 // Define this to get debug logging during embedded video decoding
 //#define DEBUG_EMBEDDED_VIDEO_DECODING
@@ -71,43 +72,43 @@
        as_c_function_ptr gettersetter;
 
        gettersetter = &character::x_getset;
-       o.init_property("_x", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uX, *gettersetter, *gettersetter);
 
        gettersetter = &character::y_getset;
-       o.init_property("_y", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uY, *gettersetter, *gettersetter);
 
        gettersetter = &character::xscale_getset;
-       o.init_property("_xscale", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uXSCALE, *gettersetter, *gettersetter);
 
        gettersetter = &character::yscale_getset;
-       o.init_property("_yscale", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uYSCALE, *gettersetter, *gettersetter);
 
        gettersetter = &character::xmouse_get;
-       o.init_readonly_property("_xmouse", *gettersetter);
+       o.init_readonly_property(NSV::PROP_uXMOUSE, *gettersetter);
 
        gettersetter = &character::ymouse_get;
-       o.init_readonly_property("_ymouse", *gettersetter);
+       o.init_readonly_property(NSV::PROP_uYMOUSE, *gettersetter);
 
        gettersetter = &character::alpha_getset;
-       o.init_property("_alpha", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uALPHA, *gettersetter, *gettersetter);
 
        gettersetter = &character::visible_getset;
-       o.init_property("_visible", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uVISIBLE, *gettersetter, *gettersetter);
 
        gettersetter = &character::width_getset;
-       o.init_property("_width", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uWIDTH, *gettersetter, *gettersetter);
 
        gettersetter = &character::height_getset;
-       o.init_property("_height", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uHEIGHT, *gettersetter, *gettersetter);
 
        gettersetter = &character::rotation_getset;
-       o.init_property("_rotation", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uROTATION, *gettersetter, *gettersetter);
 
        gettersetter = &character::parent_getset;
-       o.init_property("_parent", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uPARENT, *gettersetter, *gettersetter);
 
        gettersetter = &character::target_getset;
-       o.init_property("_target", *gettersetter, *gettersetter);
+       o.init_property(NSV::PROP_uTARGET, *gettersetter, *gettersetter);
 }
 
 static as_value