[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 90378ba7b238278d65ec5c258ad76062660bf4f0

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, objecturi has been updated
       via  90378ba7b238278d65ec5c258ad76062660bf4f0 (commit)
       via  12ad72a09822108ff024b1a9aadbe9c782387c6f (commit)
       via  6353d0c7c24fa67a5ddc1ce71815cd912c177a99 (commit)
      from  e0a41f5052bee45f3bb7f00384566e6ac43c25a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=90378ba7b238278d65ec5c258ad76062660bf4f0


commit 90378ba7b238278d65ec5c258ad76062660bf4f0
Author: Sandro Santilli <address@hidden>
Date:   Thu Nov 25 14:59:49 2010 +0100

    last build fix

diff --git a/libcore/asobj/flash/external/ExternalInterface_as.cpp 
b/libcore/asobj/flash/external/ExternalInterface_as.cpp
index 15ab8d0..f1d7e2c 100644
--- a/libcore/asobj/flash/external/ExternalInterface_as.cpp
+++ b/libcore/asobj/flash/external/ExternalInterface_as.cpp
@@ -640,25 +640,27 @@ externalinterface_uToAS(const fn_call& fn)
     if (!o) {
         return as_value();
     }
-    string_table& st = getStringTable(fn);
-    const ObjectURI nodeName(st.find("nodeName"));
-    const ObjectURI firstChild(st.find("firstChild"));
+
+    VM& vm = getVM(fn);
+    // TODO: use NSV ?
+    const ObjectURI& nodeName = getURI(vm, "nodeName");
+    const ObjectURI& firstChild = getURI(vm, "firstChild");
 
     const as_value& nn = getMember(*o, nodeName);
 
-    if (equals(nn, as_value("number"), getVM(fn))) {
-        as_object* fc = toObject(getMember(*o, firstChild), getVM(fn));
+    if (equals(nn, as_value("number"), vm)) {
+        as_object* fc = toObject(getMember(*o, firstChild), vm);
         const as_value v = callMethod(fc, NSV::PROP_TO_STRING);
         // This should call Number(obj.firstChild.toString()), i.e. use
         // the non-constructing number conversion function, but the extra
         // code needed to implement that isn't worth it.
-        return as_value(toNumber(v, getVM(fn)));
+        return as_value(toNumber(v, vm));
     }
     if (equals(nn, as_value("string"), getVM(fn))) {
         as_object* ei =
             findObject(fn.env(), "flash.external.ExternalInterface");
         as_value fc = getMember(*o, firstChild);
-        return callMethod(ei, st.find("_unescapeXML"),
+        return callMethod(ei, getURI(vm, "_unescapeXML"),
                 fc.to_string(getSWFVersion(fn)));
     }
     if (equals(nn, as_value("false"), getVM(fn))) {
@@ -678,12 +680,12 @@ externalinterface_uToAS(const fn_call& fn)
     if (equals(nn, as_value("object"), getVM(fn))) {
         as_object* ei =
             findObject(fn.env(), "flash.external.ExternalInterface");
-        return callMethod(ei, st.find("_objectToXML"), o);
+        return callMethod(ei, getURI(vm, "_objectToXML"), o);
     }
     if (equals(nn, as_value("array"), getVM(fn))) {
         as_object* ei =
             findObject(fn.env(), "flash.external.ExternalInterface");
-        return callMethod(ei, st.find("_arrayToXML"), o);
+        return callMethod(ei, getURI(vm, "_arrayToXML"), o);
     }
     if (equals(nn, as_value("class"), getVM(fn))) {
         as_value fc = getMember(*o, firstChild);

http://git.savannah.gnu.org/cgit//commit/?id=12ad72a09822108ff024b1a9aadbe9c782387c6f


commit 12ad72a09822108ff024b1a9aadbe9c782387c6f
Author: Sandro Santilli <address@hidden>
Date:   Thu Nov 25 14:48:29 2010 +0100

    fix more build

diff --git a/libcore/as_environment.cpp b/libcore/as_environment.cpp
index 6205e05..00e379b 100644
--- a/libcore/as_environment.cpp
+++ b/libcore/as_environment.cpp
@@ -301,7 +301,7 @@ getVariable(const as_environment& env, const std::string& 
varname,
 
         if (target) {
             as_value val;
-            target->get_member(env.getVM().getStringTable().find(var), &val);
+            target->get_member(getURI(env.getVM(), var), &val);
             if (retTarget) *retTarget = target;
             return val;
         }
@@ -340,7 +340,7 @@ setVariable(const as_environment& env, const std::string& 
varname,
     if (parsePath(varname, path, var)) {
         as_object* target = findObject(env, path, &scope); 
         if (target) {
-            target->set_member(env.getVM().getStringTable().find(var), val);
+            target->set_member(getURI(env.getVM(), var), val);
         }
         else {
             IF_VERBOSE_ASCODING_ERRORS(
@@ -363,7 +363,7 @@ delVariable(const as_environment& ctx, const std::string& 
varname,
 
     VM& vm = ctx.getVM();
 
-    string_table::key varkey = vm.getStringTable().find(varname);
+    const ObjectURI& varkey = getURI(vm, varname);
 
     // Check the with-stack.
     for (size_t i = scope.size(); i > 0; --i) {
@@ -449,8 +449,7 @@ setVariableRaw(const as_environment& env, const 
std::string& varname,
     }
 
     VM& vm = env.getVM();
-    string_table& st = vm.getStringTable();
-    string_table::key varkey = st.find(varname);
+    const ObjectURI& varkey = getURI(vm, varname);
 
     // in SWF5 and lower, scope stack should just contain 'with' elements 
 
@@ -496,8 +495,7 @@ getVariableRaw(const as_environment& env, const 
std::string& varname,
 
     VM& vm = env.getVM();
     const int swfVersion = vm.getSWFVersion();
-    string_table& st = vm.getStringTable();
-    string_table::key key = st.find(varname);
+    const ObjectURI& key = getURI(vm, varname);
 
     // Check the scope stack.
     for (size_t i = scope.size(); i > 0; --i) {
@@ -544,7 +542,9 @@ getVariableRaw(const as_environment& env, const 
std::string& varname,
 
     as_object* global = vm.getGlobal();
 
-    if (swfVersion > 5 && key == NSV::PROP_uGLOBAL) {
+    // TODO: check if we really want case-sensitive comparison
+    ObjectURI::CaseEquals eq(getVM(env).getStringTable());
+    if (swfVersion > 5 && eq(key, NSV::PROP_uGLOBAL)) {
 #ifdef GNASH_DEBUG_GET_VARIABLE
         log_debug("Took %s as _global, returning _global", varname);
 #endif
@@ -573,8 +573,7 @@ getVariableRaw(const as_environment& env, const 
std::string& varname,
 bool
 getLocal(as_object& locals, const std::string& name, as_value& ret)
 {
-    string_table& st = getStringTable(locals);
-    return locals.get_member(st.find(name), &ret);
+    return locals.get_member(getURI(getVM(locals), name), &ret);
 }
 
 bool
@@ -593,15 +592,13 @@ findLocal(as_object& locals, const std::string& varname, 
as_value& ret,
 bool
 deleteLocal(as_object& locals, const std::string& varname)
 {
-    string_table& st = getStringTable(locals);
-    return locals.delProperty(st.find(varname)).second;
+    return locals.delProperty(getURI(getVM(locals), varname)).second;
 }
 
 bool
 setLocal(as_object& locals, const std::string& varname, const as_value& val)
 {
-    string_table& st = getStringTable(locals);
-    Property* prop = locals.getOwnProperty(st.find(varname));
+    Property* prop = locals.getOwnProperty(getURI(getVM(locals), varname));
     if (!prop) return false;
     prop->setValue(locals, val);
     return true;

http://git.savannah.gnu.org/cgit//commit/?id=6353d0c7c24fa67a5ddc1ce71815cd912c177a99


commit 6353d0c7c24fa67a5ddc1ce71815cd912c177a99
Author: Sandro Santilli <address@hidden>
Date:   Thu Nov 25 14:29:54 2010 +0100

    fix build

diff --git a/libcore/vm/ASHandlers.cpp b/libcore/vm/ASHandlers.cpp
index b65704a..e3a113b 100644
--- a/libcore/vm/ASHandlers.cpp
+++ b/libcore/vm/ASHandlers.cpp
@@ -2142,8 +2142,8 @@ ActionDelete(ActionExec& thread)
         return;
     }
 
-    string_table& st = getStringTable(env);
-    const std::pair<bool, bool> ret = obj->delProperty(st.find(propertyname));
+    VM& vm = getVM(env);
+    const std::pair<bool, bool> ret = obj->delProperty(getURI(vm, 
propertyname));
 
     env.top(1).set_bool(ret.second);
 
@@ -2185,8 +2185,8 @@ ActionDelete2(ActionExec& thread)
 
     as_object* obj = safeToObject(getVM(thread.env), target);
 
-    string_table& st = getStringTable(env);
-    const std::pair<bool, bool> ret = obj->delProperty(st.find(var));
+    VM& vm = getVM(env);
+    const std::pair<bool, bool> ret = obj->delProperty(getURI(vm, var));
 
     env.top(1).set_bool(ret.second);
 }

-----------------------------------------------------------------------

Summary of changes:
 libcore/as_environment.cpp                         |   25 ++++++++-----------
 .../asobj/flash/external/ExternalInterface_as.cpp  |   20 ++++++++-------
 libcore/vm/ASHandlers.cpp                          |    8 +++---
 3 files changed, 26 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
Gnash