[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 587ae0e20694b0d4e3c7fe71fea7bfd1fe65a672

[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  587ae0e20694b0d4e3c7fe71fea7bfd1fe65a672 (commit)
       via  7ae7dc0a28e45c266286d569e40ac567f64d64d4 (commit)
       via  03d473f665f06c0d884d0acb550b32b1846b6489 (commit)
      from  a3e2d11b545fcdb326df4229e9524bf27d4fc9bd (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=587ae0e20694b0d4e3c7fe71fea7bfd1fe65a672


commit 587ae0e20694b0d4e3c7fe71fea7bfd1fe65a672
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 00:35:54 2010 +0200

    Use proper Logger for ObjectURI

diff --git a/libcore/as_object.cpp b/libcore/as_object.cpp
index bb0e4ac..d2d3268 100644
--- a/libcore/as_object.cpp
+++ b/libcore/as_object.cpp
@@ -983,18 +983,22 @@ as_object::get_path_element(const ObjectURI& uri)
 {
 //#define DEBUG_TARGET_FINDING 1
 
+#ifdef DEBUG_TARGET_FINDING 
+    ObjectURI::Logger l(getStringTable(*this));
+#endif
+
     as_value tmp;
     if (!get_member(uri, &tmp)) {
 #ifdef DEBUG_TARGET_FINDING 
         log_debug("Member %s not found in object %p",
-                  uri.toString(getStringTable(*this)), (void*)this);
+                  l.debug(uri), (void*)this);
 #endif
         return NULL;
     }
     if (!tmp.is_object()) {
 #ifdef DEBUG_TARGET_FINDING 
         log_debug("Member %s of object %p is not an object (%s)",
-                  uri.toString(getStringTable(*this)), (void*)this, tmp);
+                  l.debug(uri), (void*)this, tmp);
 #endif
         return NULL;
     }

http://git.savannah.gnu.org/cgit//commit/?id=7ae7dc0a28e45c266286d569e40ac567f64d64d4


commit 7ae7dc0a28e45c266286d569e40ac567f64d64d4
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 00:34:19 2010 +0200

    Move equals function after equality operator, or the syntetized one would 
be used

diff --git a/libcore/ObjectURI.h b/libcore/ObjectURI.h
index dce7946..d14a384 100644
--- a/libcore/ObjectURI.h
+++ b/libcore/ObjectURI.h
@@ -91,18 +91,18 @@ equalsNoCase(string_table& st, const ObjectURI& a, const 
ObjectURI& b)
     return a.noCase(st) == b.noCase(st);
 }
 
+/// ObjectURIs are equal if name is equal
 inline bool
-equals(string_table& st, const ObjectURI& a, const ObjectURI& b, bool caseless)
+operator==(const ObjectURI& a, const ObjectURI& b)
 {
-    if ( caseless ) return equalsNoCase(st, a, b);
-    else return a == b;
+    return a.name == b.name;
 }
 
-/// ObjectURIs are equal if name is equal
 inline bool
-operator==(const ObjectURI& a, const ObjectURI& b)
+equals(string_table& st, const ObjectURI& a, const ObjectURI& b, bool caseless)
 {
-    return a.name == b.name;
+    if ( caseless ) return equalsNoCase(st, a, b);
+    else return a == b;
 }
 
 /// Comparator for ObjectURI so it can serve as a key in stdlib containers.

http://git.savannah.gnu.org/cgit//commit/?id=03d473f665f06c0d884d0acb550b32b1846b6489


commit 03d473f665f06c0d884d0acb550b32b1846b6489
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 00:17:26 2010 +0200

    Add an ObjectURI::Logger::debug method

diff --git a/libcore/ObjectURI.h b/libcore/ObjectURI.h
index 336bb56..dce7946 100644
--- a/libcore/ObjectURI.h
+++ b/libcore/ObjectURI.h
@@ -5,6 +5,7 @@
 #include "string_table.h"
 #include <string>
 #include <ostream>
+#include <sstream>
 
 #define GNASH_DEBUG_OBJECT_URI_NOCASE 1
 
@@ -127,6 +128,18 @@ public:
         const string_table::key name = getName(uri);
         return _st.value(name);
     }
+
+    std::string debug(const ObjectURI& uri) const {
+        std::stringstream ss;
+        const string_table::key name = getName(uri);
+        const string_table::key nameNoCase = uri.noCase(_st);
+        ss << _st.value(name)
+           << "(" << name << ")/"
+           << _st.value(nameNoCase)
+           << "(" << nameNoCase << ")";
+        return ss.str();
+    }
+
 private:
     string_table& _st;
 };

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

Summary of changes:
 libcore/ObjectURI.h   |   25 +++++++++++++++++++------
 libcore/as_object.cpp |    8 ++++++--
 2 files changed, 25 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Gnash