[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/string_table.cpp libbas...
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] gnash ChangeLog libbase/string_table.cpp libbas... |
Date: |
Wed, 18 Jun 2008 17:19:26 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/06/18 17:19:26
Modified files:
. : ChangeLog
libbase : string_table.cpp string_table.h
server/asobj : ClassHierarchy.cpp ClassHierarchy.h
server/parser : abc_block.cpp
libamf : element.cpp element.h
Log message:
* server/vm/ClassHierarchy.{h,cpp}: drop no-op dump() because an
ostream operator<< is defined. Make knownClasses table const;
pass
nativeClasses by const ref. Add comments.
* libamf/element.{h,cpp}: delete(NULL) is a no-op, so there's
no need
to check first. Add GNASH to header guard.
* server/parser/abc_block.cpp: don't use ClassHierarchy::dump().
* libbase/string_table.{h,cpp}: make mEmpty, the universal
empty string
const, as it's not likely to change.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6971&r2=1.6972
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/string_table.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/string_table.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ClassHierarchy.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ClassHierarchy.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/abc_block.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/element.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/element.h?cvsroot=gnash&r1=1.23&r2=1.24
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6971
retrieving revision 1.6972
diff -u -b -r1.6971 -r1.6972
--- ChangeLog 18 Jun 2008 13:37:14 -0000 1.6971
+++ ChangeLog 18 Jun 2008 17:19:22 -0000 1.6972
@@ -1,5 +1,16 @@
2008-06-18 Benjamin Wolsey <address@hidden>
+ * server/vm/ClassHierarchy.{h,cpp}: drop no-op dump() because an
+ ostream operator<< is defined. Make knownClasses table const; pass
+ nativeClasses by const ref. Add comments.
+ * libamf/element.{h,cpp}: delete(NULL) is a no-op, so there's no need
+ to check first. Add GNASH to header guard.
+ * server/parser/abc_block.cpp: don't use ClassHierarchy::dump().
+ * libbase/string_table.{h,cpp}: make mEmpty, the universal empty string
+ const, as it's not likely to change.
+
+2008-06-18 Benjamin Wolsey <address@hidden>
+
* server/vm/ActionExec.{cpp,h}: drop unused method, rename
with_stack.
Index: libbase/string_table.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/string_table.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/string_table.cpp 1 Apr 2008 16:55:10 -0000 1.8
+++ libbase/string_table.cpp 18 Jun 2008 17:19:23 -0000 1.9
@@ -25,7 +25,7 @@
using namespace gnash;
-std::string string_table::mEmpty = "";
+const std::string string_table::mEmpty;
string_table::key
string_table::find(const std::string& t_f, bool insert_unfound)
Index: libbase/string_table.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/string_table.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/string_table.h 27 Mar 2008 16:12:35 -0000 1.11
+++ libbase/string_table.h 18 Jun 2008 17:19:24 -0000 1.12
@@ -151,7 +151,7 @@
private:
table mTable;
- static std::string mEmpty; // The empty string, universally.
+ static const std::string mEmpty; // The empty string, universally.
boost::mutex mLock;
std::size_t mHighestKey;
bool mSetToLower; // If true, affects the next group addition.
Index: server/asobj/ClassHierarchy.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ClassHierarchy.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/ClassHierarchy.cpp 17 Jun 2008 08:45:35 -0000 1.20
+++ server/asobj/ClassHierarchy.cpp 18 Jun 2008 17:19:24 -0000 1.21
@@ -146,7 +146,7 @@
public:
bool isBuiltin() { return true; }
- declare_native_function(ClassHierarchy::nativeClass &c,
+ declare_native_function(const ClassHierarchy::nativeClass &c,
as_object *g, Extension *e) :
as_function(getObjectInterface()),
mDeclaration(c), mTarget(g), mExtension(e)
@@ -229,7 +229,7 @@
}
bool
-ClassHierarchy::declareClass(nativeClass& c)
+ClassHierarchy::declareClass(const nativeClass& c)
{
// For AS2 and below, registering with mGlobal _should_ make it
equivalent
// to being in the global namespace, since everything is global there.
@@ -247,17 +247,15 @@
*getter);
}
-static ClassHierarchy::nativeClass knownClasses[] =
+static const ClassHierarchy::nativeClass knownClasses[] =
{
-// This makes it clear the difference between "We don't know where the
+// This makes clear the difference between "We don't know where the
// class belongs" and "it belongs in the global namespace", even though
// the result is the same.
-#define NS_GLOBAL 0
-#define NS_UNKNOWN 0
- /* { function_name, name key, super name key, lowest version }, */
-// { object_class_init, NSV::CLASS_OBJECT, 0, NS_GLOBAL, 5 }, // Object is
special
-// { function_class_init, NSV::CLASS_FUNCTION, NSV::CLASS_OBJECT,
NS_GLOBAL, 6 }, // Function is special
-// { array_class_init, NSV::CLASS_ARRAY, NSV::CLASS_OBJECT, NS_GLOBAL, 5
}, // Array is special
+ #define NS_GLOBAL 0
+ #define NS_UNKNOWN 0
+
+// { function_name, name key, super name key, lowest version },
{ system_class_init, NSV::CLASS_SYSTEM, 0, NSV::NS_FLASH_SYSTEM, 1 },
{ stage_class_init, NSV::CLASS_STAGE, 0, NSV::NS_FLASH_DISPLAY, 1 },
{ movieclip_class_init, NSV::CLASS_MOVIE_CLIP, 0,
NSV::NS_FLASH_DISPLAY, 3 },
@@ -275,7 +273,6 @@
{ mouse_class_init, NSV::CLASS_MOUSE, NSV::CLASS_OBJECT,
NSV::NS_FLASH_UI, 5 },
{ number_class_init, NSV::CLASS_NUMBER, NSV::CLASS_OBJECT, NS_GLOBAL, 5
},
{ textformat_class_init, NSV::CLASS_TEXT_FORMAT, NSV::CLASS_OBJECT,
NS_GLOBAL, 5 },
-// { string_class_init, NSV::CLASS_STRING, NSV::CLASS_OBJECT, NS_GLOBAL, 5
}, // string is special
{ key_class_init, NSV::CLASS_KEY, NSV::CLASS_OBJECT, NS_GLOBAL, 5 },
{ AsBroadcaster_init, NSV::CLASS_AS_BROADCASTER, NSV::CLASS_OBJECT,
NS_GLOBAL, 5 },
{ textsnapshot_class_init, NSV::CLASS_TEXT_SNAPSHOT, NSV::CLASS_OBJECT,
NSV::NS_FLASH_TEXT, 6 },
@@ -289,7 +286,15 @@
{ netstream_class_init, NSV::CLASS_NET_STREAM, NSV::CLASS_OBJECT,
NSV::NS_FLASH_NET, 6 },
{ contextmenu_class_init, NSV::CLASS_CONTEXT_MENU, NSV::CLASS_OBJECT,
NSV::NS_FLASH_UI, 7 },
{ moviecliploader_class_init, NSV::CLASS_MOVIE_CLIP_LOADER,
NSV::CLASS_OBJECT, NS_GLOBAL, 7 },
- { Error_class_init, NSV::CLASS_ERROR, NSV::CLASS_OBJECT, NS_GLOBAL, 5 },
+ { Error_class_init, NSV::CLASS_ERROR, NSV::CLASS_OBJECT, NS_GLOBAL, 5 }
+
+// These classes are all implicitly constructed; that is, it is not necessary
for
+// the class name to be used to construct the class, so they must always be
available.
+// { object_class_init, NSV::CLASS_OBJECT, 0, NS_GLOBAL, 5 }
+// { function_class_init, NSV::CLASS_FUNCTION, NSV::CLASS_OBJECT,
NS_GLOBAL, 6 }
+// { array_class_init, NSV::CLASS_ARRAY, NSV::CLASS_OBJECT, NS_GLOBAL, 5 }
+// { string_class_init, NSV::CLASS_STRING, NSV::CLASS_OBJECT, NS_GLOBAL, 5
}
+
};
void
@@ -301,9 +306,9 @@
const size_t size = sizeof (knownClasses) / sizeof (nativeClass);
for (size_t i = 0; i < size; ++i)
{
- nativeClass& c = knownClasses[i];
- if (c.version > version)
- continue;
+ const nativeClass& c = knownClasses[i];
+ if (c.version > version) continue;
+
if ( ! declareClass(c) )
{
log_error("Could not declare class %s", c);
@@ -322,10 +327,6 @@
// TODO
}
-void
-ClassHierarchy::dump()
-{
-}
std::ostream& operator << (std::ostream& os, const
ClassHierarchy::nativeClass& c)
{
string_table& st = VM::get().getStringTable();
Index: server/asobj/ClassHierarchy.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ClassHierarchy.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/ClassHierarchy.h 6 May 2008 08:54:30 -0000 1.8
+++ server/asobj/ClassHierarchy.h 18 Jun 2008 17:19:24 -0000 1.9
@@ -121,7 +121,7 @@
/// The nativeClass structure which defines the class.
///
/// @return true, unless the class with c.name already existed.
- bool declareClass(nativeClass& c);
+ bool declareClass(const nativeClass& c);
/// \brief
/// Declare all of the native and extension classes from the
@@ -223,8 +223,6 @@
/// Delete our private namespaces.
~ClassHierarchy();
- void dump();
-
private:
as_object *mGlobal;
asNamespace *mGlobalNamespace;
Index: server/parser/abc_block.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/abc_block.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/parser/abc_block.cpp 9 Jun 2008 10:18:24 -0000 1.13
+++ server/parser/abc_block.cpp 18 Jun 2008 17:19:24 -0000 1.14
@@ -1136,7 +1136,7 @@
return false;
}
mTraits.clear();
- mCH->dump();
+ //mCH->dump();
return true;
}
Index: libamf/element.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/element.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- libamf/element.cpp 18 Jun 2008 00:16:41 -0000 1.30
+++ libamf/element.cpp 18 Jun 2008 17:19:25 -0000 1.31
@@ -74,17 +74,15 @@
Element::~Element()
{
// GNASH_REPORT_FUNCTION;
- if (_buffer) {
delete _buffer;
- }
+
for (size_t i=0; i< _properties.size(); i++) {
delete _properties[i];
}
- if (_name) {
delete[] _name;
- }
}
+
Element::Element(Network::byte_t *indata)
: _name(),
_buffer(0),
@@ -265,12 +263,8 @@
Element::clear()
{
// GNASH_REPORT_FUNCTION;
- if (_name) {
delete [] _name;
- }
- if (_buffer) {
delete _buffer;
- }
}
Network::byte_t *
Index: libamf/element.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/element.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libamf/element.h 17 Jun 2008 14:55:13 -0000 1.23
+++ libamf/element.h 18 Jun 2008 17:19:25 -0000 1.24
@@ -15,8 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#ifndef _ELEMENT_H_
-#define _ELEMENT_H_
+#ifndef GNASH_ELEMENT_H
+#define GNASH_ELEMENT_H
#include <vector>
#include <string>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libbase/string_table.cpp libbas...,
Benjamin Wolsey <=