[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. fa09e6c4630bd1122
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, objecturi, updated. fa09e6c4630bd112230e8a95400c12c518570d1a |
|
Date: |
Fri, 08 Oct 2010 09:53:10 +0000 |
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 fa09e6c4630bd112230e8a95400c12c518570d1a (commit)
via 6de513e7ad5000c8fb9c16511693e47f3fcfbcd4 (commit)
via 32237a93e5c6218f720d7b6b3e4f38b86a8e74de (commit)
via a554d076eed757cb43c03c7ce1ba1e38b12f0d6d (commit)
via fc2ca5004aeeac3cbb2e883b569cd783ca3ee4e0 (commit)
via 3618d5207a4476d3760af06def3c3050c6cee325 (commit)
via 62b44d9a91944e6448cfee69c2502886d9e7133d (commit)
via d8ac7a62591c827a0a6a37d18580568a0a01ea1f (commit)
via 7af4e6cc88eb803845ac826c72f53f0b50388f48 (commit)
via 46cf89e6467bc1a96f7e7e11089f51d19d9b88e8 (commit)
via 891a392ba637f6162b4b809ab23d7b7e649b21d8 (commit)
via 586fdd79ab7a758fd1a7850a76fd65a2ccca1fd5 (commit)
via 5192164c0260ca1a8ca7986274470e1bb3c9e46c (commit)
via 76f94f4f0e97b4d5ab9fabfa98e22c562f0a8bed (commit)
via 767fd1e85c317a56ab53b89d8c3f6909d13417fe (commit)
via df57ebaa3f9f28e5f243c6e5646e28ba72b03834 (commit)
via a26699161c963370b8bd42027120e12ee48fbc7f (commit)
via 5ee7efe3ec5d1570edf2807f1601185e9bba4d05 (commit)
via b88ec353b054a013b5d533f216ca4344988a4fe9 (commit)
via 9e0dc654e56972056eca60ab2730fe4a9b61af41 (commit)
via 32a0a6f93c061c8fb7507305922c45cf4c34d64a (commit)
via 620116ebc15bf1a540d1750dbcbe34113cc5fece (commit)
via 6c40fe14ed58e2217b17a1e6ab05e64869f530e9 (commit)
via d6a1e379b950a57fbc934a83a7c6832a4f109049 (commit)
via be73e7767c044651bf38023505df175e8c02404b (commit)
via 2f788d7ed047d0cafd86459e53b86ec82988f3ea (commit)
via 52440353c9580e1af1a8b87c228b6a8aba472338 (commit)
via a0f2f8ad94796aecf41b60d646dd42a1bfd8246a (commit)
via 7798e1fcf93403bdec633d6bf18a401c54ba556b (commit)
via cd93b0126a7c7cef7ea3fecb5f6f642cbca5ca5f (commit)
via 9e08637ddb180097b1bd7aece2626fac5f16e5f4 (commit)
via 693b64384cff5d688933ef95c3aeb9f7b5a2de3d (commit)
via a6d690e2243f2f1f42bc9efec59d5bb3392e300b (commit)
via f316478988eab5ed46f2c54c412f13bd3e828682 (commit)
via 3c624d76aa4bd9ace680aab8dc78f1a08235b6f2 (commit)
via eb5947080f6403ff98557b057d944b5138e5f621 (commit)
via 8e6fe3e65118cbabaf6a7c7e89cc97e4192bb64f (commit)
via 1899a4a10b6104d34f6c5447e72b838a91dd2b2f (commit)
from 540bc69c87511b5d877f6a6e2cd6afcb4b0684eb (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=fa09e6c4630bd112230e8a95400c12c518570d1a
commit fa09e6c4630bd112230e8a95400c12c518570d1a
Merge: 540bc69 6de513e
Author: Benjamin Wolsey <address@hidden>
Date: Fri Oct 8 11:53:02 2010 +0200
Fix conflicts from master
diff --cc libcore/AMFConverter.cpp
index 052e729,e892071..67fd2a8
--- a/libcore/AMFConverter.cpp
+++ b/libcore/AMFConverter.cpp
@@@ -514,8 -515,9 +514,8 @@@ Reader::readArray(
as_value
Reader::readObject()
{
-
- string_table& st = getStringTable(_global);
+ VM& vm = getVM(_global);
- as_object* obj = _global.createObject();
+ as_object* obj = createObject(_global);
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
log_debug("amf0 starting read of OBJECT");
diff --cc libcore/Button.cpp
index 812a668,36b6ff3..f67dc8f
--- a/libcore/Button.cpp
+++ b/libcore/Button.cpp
@@@ -311,12 -311,13 +311,16 @@@ boo
Button::trackAsMenu()
{
// TODO: check whether the AS or the tag value takes precedence.
+ as_object* obj = getObject(this);
+ assert(obj);
+
++ VM& vm = getVM(*obj);
++
as_value track;
- string_table& st = getStringTable(*obj);
- if (obj->get_member(st.find("trackAsMenu"), &track)) {
- return toBool(track, getVM(*obj));
+ // TODO: use NSV
- const ObjectURI& propTrackAsMenu = getURI(getVM(*getObject(this)),
- "trackAsMenu");
- if (getObject(this)->get_member(propTrackAsMenu, &track)) {
- return track.to_bool();
++ const ObjectURI& propTrackAsMenu = getURI(vm, "trackAsMenu");
++ if (obj->get_member(propTrackAsMenu, &track)) {
++ return toBool(track, vm);
}
if (_def) return _def->trackAsMenu();
return false;
diff --cc libcore/MovieClip.cpp
index b7c8849,f52ad14..3eec9b1
--- a/libcore/MovieClip.cpp
+++ b/libcore/MovieClip.cpp
@@@ -1539,10 -1541,14 +1539,14 @@@ MovieClip::findDropTarget(boost::int32_
bool
MovieClip::trackAsMenu()
{
+ as_object* obj = getObject(this);
+ assert(obj);
+
- string_table& st = getStringTable(*obj);
-
as_value track;
- VM& vm = getVM(*getObject(this));
- return (obj->get_member(st.find("trackAsMenu"), &track) &&
- toBool(track, getVM(*obj)));
++ VM& vm = getVM(*obj);
+ // TODO: use namedStrings here
- return (getObject(this)->get_member(getURI(vm, "trackAsMenu"), &track) &&
track.to_bool());
++ return (obj->get_member(getURI(vm, "trackAsMenu"), &track) &&
++ toBool(track, vm));
}
bool
diff --cc libcore/as_value.cpp
index 684f85f,b4e5bbe..c1224aa
--- a/libcore/as_value.cpp
+++ b/libcore/as_value.cpp
@@@ -63,11 -63,13 +63,13 @@@
namespace gnash {
namespace {
- bool objectEqualsPrimitive(const as_value& obj, const as_value& prim);
- bool stringEqualsNumber(const as_value& str, const as_value& num);
- bool compareBoolean(const as_value& boolean, const as_value& other);
+ bool objectEqualsPrimitive(const as_value& obj, const as_value& prim,
+ int version);
+ bool stringEqualsNumber(const as_value& str, const as_value& num,
+ int version);
+ bool compareBoolean(const as_value& boolean, const as_value& other,
+ int version);
- inline bool findMethod(as_object& obj, string_table::key m, as_value&
ret);
+ inline bool findMethod(as_object& obj, const ObjectURI& m, as_value& ret);
- boost::int32_t truncateToInt(double d);
}
namespace {
diff --cc libcore/asobj/Array_as.cpp
index ce18b32,5a982e4..03b21cc
--- a/libcore/asobj/Array_as.cpp
+++ b/libcore/asobj/Array_as.cpp
@@@ -817,12 -814,9 +814,12 @@@ IsStrictArray::accept(const ObjectURI&
void
checkArrayLength(as_object& array, const ObjectURI& uri, const as_value& val)
{
- const string_table::key name = getName(uri);
- if (name == NSV::PROP_LENGTH) {
+ // TODO: check if we should really be doing
+ // case-sensitive comparison here!
- bool caseless=true;
++ const bool caseless = true;
+ ObjectURI::CaseEquals eq(getStringTable(array), caseless);
- if ( eq(uri, getURI(getVM(array), NSV::PROP_LENGTH)) ) {
- resizeArray(array, toInt(val));
++ if (eq(uri, getURI(getVM(array), NSV::PROP_LENGTH))) {
+ resizeArray(array, toInt(val, getVM(array)));
return;
}
@@@ -1094,11 -1083,11 +1089,11 @@@ array_sortOn(const fn_call& fn
// cases: sortOn("prop) and sortOn("prop", Array.FLAG)
if (fn.arg(0).is_string())
{
- string_table::key propField =
- st.find(fn.arg(0).to_string(version));
+ ObjectURI propField =
+ getURI(vm, fn.arg(0).to_string(version));
if (fn.nargs > 1 && fn.arg(1).is_number()) {
- flags = static_cast<boost::uint8_t>(fn.arg(1).to_number());
+ flags = static_cast<boost::uint8_t>(toNumber(fn.arg(1),
getVM(fn)));
flags = flag_preprocess(flags, &do_unique, &do_index);
}
diff --cc libcore/asobj/AsBroadcaster.cpp
index fdacdad,89bfc91..75a41ab
--- a/libcore/asobj/AsBroadcaster.cpp
+++ b/libcore/asobj/AsBroadcaster.cpp
@@@ -358,18 -358,17 +358,19 @@@ asbroadcaster_removeListener(const fn_c
// This is an ActionScript-like implementation, which is why it looks
// like poor C++.
- const int length = toInt(getMember(*listeners, NSV::PROP_LENGTH));
+ const int length = toInt(getMember(*listeners, NSV::PROP_LENGTH),
+ getVM(fn));
int i = 0;
- string_table& st = getStringTable(fn);
+
+ VM& vm = getVM(fn);
+ const ObjectURI& propSplice = getURI(vm, NSV::PROP_SPLICE);
while (i < length) {
std::ostringstream s;
s << i;
- as_value el = getMember(*listeners, st.find(s.str()));
+ as_value el = getMember(*listeners, getURI(vm, s.str()));
- if (el.equals(listenerToRemove)) {
+ if (equals(el, listenerToRemove, getVM(fn))) {
- callMethod(listeners, NSV::PROP_SPLICE, s.str(), 1);
+ callMethod(listeners, propSplice, s.str(), 1);
return as_value(true);
}
++i;
diff --cc libcore/asobj/Color_as.cpp
index 33c2320,6599615..258680b
--- a/libcore/asobj/Color_as.cpp
+++ b/libcore/asobj/Color_as.cpp
@@@ -254,7 -252,7 +254,7 @@@ color_ctor(const fn_call& fn
}
inline void
- parseColorTransProp (as_object& obj, const ObjectURI& key, boost::int16_t&
-parseColorTransProp(as_object& obj, string_table::key key, boost::int16_t&
++parseColorTransProp(as_object& obj, const ObjectURI& key, boost::int16_t&
target, bool scale)
{
as_value tmp;
diff --cc libcore/asobj/ContextMenu_as.cpp
index a333c99,c0331c7..6df1e32
--- a/libcore/asobj/ContextMenu_as.cpp
+++ b/libcore/asobj/ContextMenu_as.cpp
@@@ -106,12 -106,12 +106,12 @@@ as_valu
contextmenu_hideBuiltInItems(const fn_call& fn)
{
as_object* ptr = ensure<ValidThis>(fn);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
Global_as& gl = getGlobal(fn);
- as_object* builtIns = gl.createObject();
+ as_object* builtIns = createObject(gl);
setBuiltInItems(*builtIns, false);
- ptr->set_member(st.find("builtInItems"), builtIns);
+ ptr->set_member(getURI(vm, "builtInItems"), builtIns);
return as_value();
}
@@@ -183,11 -183,11 +183,11 @@@ contextmenu_ctor(const fn_call& fn
const as_value& callback = fn.nargs ? fn.arg(0) : as_value();
obj->set_member(NSV::PROP_ON_SELECT, callback);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
Global_as& gl = getGlobal(fn);
- as_object* builtInItems = gl.createObject();
+ as_object* builtInItems = createObject(gl);
setBuiltInItems(*builtInItems, true);
- obj->set_member(st.find("builtInItems"), builtInItems);
+ obj->set_member(getURI(vm, "builtInItems"), builtInItems);
// There is an empty customItems array.
as_object* customItems = gl.createArray();
diff --cc libcore/asobj/Global_as.cpp
index 600883d,4e58535..7f3568f
--- a/libcore/asobj/Global_as.cpp
+++ b/libcore/asobj/Global_as.cpp
@@@ -139,16 -138,21 +138,21 @@@ namespace
as_value local_errorConstructor(const fn_call& fn);
void registerNatives(as_object& global);
- template<typename T> as_object* constructObject(Global_as& gl, const T&
arg,
- string_table::key className);
+ template<typename T> as_object* constructObject(Global_as& gl,
+ const T& arg, const ObjectURI& className);
}
-
- as_object*
- AVM1Global::createObject()
+
+ Global_as::Global_as(VM& vm)
+ :
+ as_object(vm),
+ _et(new Extension()),
+ _classes(this, _et.get()),
+ _objectProto(new as_object(*this))
+ {
+ }
+
+ Global_as::~Global_as()
{
- as_object* obj = new as_object(*this);
- obj->set_prototype(_objectProto);
- return obj;
}
builtin_function*
diff --cc libcore/asobj/MovieClip_as.cpp
index 42fff3b,c430465..800dab3
--- a/libcore/asobj/MovieClip_as.cpp
+++ b/libcore/asobj/MovieClip_as.cpp
@@@ -1806,10 -1808,10 +1808,10 @@@ movieclip_beginGradientFill(const fn_ca
gradients.reserve(stops);
for (size_t i = 0; i < stops; ++i) {
- string_table::key key = st.find(boost::lexical_cast<std::string>(i));
+ const ObjectURI& key = getURI(vm,
boost::lexical_cast<std::string>(i));
as_value colVal = getMember(*colors, key);
- boost::uint32_t col = colVal.is_number() ? toInt(colVal) : 0;
+ boost::uint32_t col = colVal.is_number() ? toInt(colVal, getVM(fn)) :
0;
/// Alpha is the range 0..100.
as_value alpVal = getMember(*alphas, key);
diff --cc libcore/asobj/XML_as.cpp
index c3d0bd2,fac45a4..e961c69
--- a/libcore/asobj/XML_as.cpp
+++ b/libcore/asobj/XML_as.cpp
@@@ -518,14 -518,16 +518,17 @@@ boo
XML_as::ignoreWhite()
{
- const string_table::key propnamekey =
- getStringTable(_global).find("ignoreWhite");
+ // TODO: use NSV:
+ const ObjectURI& propnamekey =
+ getURI(getVM(_global), "ignoreWhite");
as_value val;
- if (!object()->get_member(propnamekey, &val)) {
+
+ as_object* obj = object();
+
+ if (!obj->get_member(propnamekey, &val)) {
return false;
}
- return val.to_bool();
+ return toBool(val, getVM(*obj));
}
// XML.prototype is assigned after the class has been constructed, so it
diff --cc libcore/asobj/flash/display/display_pkg.cpp
index 83077ce,de41756..197baae
--- a/libcore/asobj/flash/display/display_pkg.cpp
+++ b/libcore/asobj/flash/display/display_pkg.cpp
@@@ -38,11 -38,11 +38,11 @@@ get_flash_display_package(const fn_call
Global_as& gl = getGlobal(fn);
- as_object* pkg = gl.createObject();
+ as_object* pkg = createObject(gl);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
- bitmapdata_class_init(*pkg, st.find("BitmapData"));
+ bitmapdata_class_init(*pkg, getURI(vm, "BitmapData"));
return pkg;
}
diff --cc libcore/asobj/flash/external/external_pkg.cpp
index c7b8129,cf8dcf4..85c7127
--- a/libcore/asobj/flash/external/external_pkg.cpp
+++ b/libcore/asobj/flash/external/external_pkg.cpp
@@@ -39,11 -39,11 +39,11 @@@ get_flash_external_package(const fn_cal
Global_as& gl = getGlobal(fn);
- as_object* pkg = gl.createObject();
+ as_object* pkg = createObject(gl);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
- externalinterface_class_init(*pkg, st.find("ExternalInterface"));
+ externalinterface_class_init(*pkg, getURI(vm, "ExternalInterface"));
return pkg;
}
diff --cc libcore/asobj/flash/filters/filters_pkg.cpp
index 347ee67,e6d6600..cdce6b1
--- a/libcore/asobj/flash/filters/filters_pkg.cpp
+++ b/libcore/asobj/flash/filters/filters_pkg.cpp
@@@ -47,20 -47,20 +47,20 @@@ get_flash_filters_package(const fn_call
log_debug("Loading flash.filters package");
Global_as& gl = getGlobal(fn);
- as_object* pkg = gl.createObject();
+ as_object* pkg = createObject(gl);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
- bitmapfilter_class_init(*pkg, st.find("BitmapFilter"));
- bevelfilter_class_init(*pkg, st.find("BevelFilter"));
- blurfilter_class_init(*pkg, st.find("BlurFilter"));
- colormatrixfilter_class_init(*pkg, st.find("ColorMatrixFilter"));
- convolutionfilter_class_init(*pkg, st.find("ConvolutionFilter"));
- displacementmapfilter_class_init(*pkg, st.find("DisplacementMapFilter"));
- dropshadowfilter_class_init(*pkg, st.find("DropShadowFilter"));
- glowfilter_class_init(*pkg, st.find("GlowFilter"));
- gradientbevelfilter_class_init(*pkg, st.find("GradientBevelFilter"));
- gradientglowfilter_class_init(*pkg, st.find("GradientGlowFilter"));
+ bitmapfilter_class_init(*pkg, getURI(vm, "BitmapFilter"));
+ bevelfilter_class_init(*pkg, getURI(vm, "BevelFilter"));
+ blurfilter_class_init(*pkg, getURI(vm, "BlurFilter"));
+ colormatrixfilter_class_init(*pkg, getURI(vm, "ColorMatrixFilter"));
+ convolutionfilter_class_init(*pkg, getURI(vm, "ConvolutionFilter"));
+ displacementmapfilter_class_init(*pkg, getURI(vm,
"DisplacementMapFilter"));
+ dropshadowfilter_class_init(*pkg, getURI(vm, "DropShadowFilter"));
+ glowfilter_class_init(*pkg, getURI(vm, "GlowFilter"));
+ gradientbevelfilter_class_init(*pkg, getURI(vm, "GradientBevelFilter"));
+ gradientglowfilter_class_init(*pkg, getURI(vm, "GradientGlowFilter"));
return pkg;
}
diff --cc libcore/asobj/flash/flash_pkg.cpp
index 8b15666,befbac2..7f88c90
--- a/libcore/asobj/flash/flash_pkg.cpp
+++ b/libcore/asobj/flash/flash_pkg.cpp
@@@ -40,16 -40,16 +40,16 @@@ get_flash_package(const fn_call& fn
{
Global_as& gl = getGlobal(fn);
- as_object* pkg = gl.createObject();
+ as_object* pkg = createObject(gl);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
- flash_text_package_init(*pkg, st.find("text"));
- flash_display_package_init(*pkg, st.find("display"));
- flash_filters_package_init(*pkg, st.find("filters"));
- flash_geom_package_init(*pkg, st.find("geom"));
- flash_net_package_init(*pkg, st.find("net"));
- flash_external_package_init(*pkg, st.find("external"));
+ flash_text_package_init(*pkg, getURI(vm, "text"));
+ flash_display_package_init(*pkg, getURI(vm, "display"));
+ flash_filters_package_init(*pkg, getURI(vm, "filters"));
+ flash_geom_package_init(*pkg, getURI(vm, "geom"));
+ flash_net_package_init(*pkg, getURI(vm, "net"));
+ flash_external_package_init(*pkg, getURI(vm, "external"));
return pkg;
}
diff --cc libcore/asobj/flash/geom/geom_pkg.cpp
index a1c1ddf,3bb2a08..e4bbf10
--- a/libcore/asobj/flash/geom/geom_pkg.cpp
+++ b/libcore/asobj/flash/geom/geom_pkg.cpp
@@@ -41,15 -41,15 +41,15 @@@ get_flash_geom_package(const fn_call& f
log_debug("Loading flash.geom package");
Global_as& gl = getGlobal(fn);
- as_object *pkg = gl.createObject();
+ as_object *pkg = createObject(gl);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
- colortransform_class_init(*pkg, st.find("ColorTransform"));
- matrix_class_init(*pkg, st.find("Matrix"));
- point_class_init(*pkg, st.find("Point"));
- rectangle_class_init(*pkg, st.find("Rectangle"));
- transform_class_init(*pkg, st.find("Transform"));
+ colortransform_class_init(*pkg, getURI(vm, "ColorTransform"));
+ matrix_class_init(*pkg, getURI(vm, "Matrix"));
+ point_class_init(*pkg, getURI(vm, "Point"));
+ rectangle_class_init(*pkg, getURI(vm, "Rectangle"));
+ transform_class_init(*pkg, getURI(vm, "Transform"));
return pkg;
}
diff --cc libcore/asobj/flash/net/net_pkg.cpp
index d00008b,864984f..12b5ac6
--- a/libcore/asobj/flash/net/net_pkg.cpp
+++ b/libcore/asobj/flash/net/net_pkg.cpp
@@@ -37,11 -37,11 +37,11 @@@ get_flash_net_package(const fn_call& fn
Global_as& gl = getGlobal(fn);
- as_object* pkg = gl.createObject();
+ as_object* pkg = createObject(gl);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
- filereference_class_init(*pkg, st.find("FileReference"));
+ filereference_class_init(*pkg, getURI(vm, "FileReference"));
return pkg;
}
diff --cc libcore/asobj/flash/text/text_pkg.cpp
index ae199dc,5d0ad18..bd67637
--- a/libcore/asobj/flash/text/text_pkg.cpp
+++ b/libcore/asobj/flash/text/text_pkg.cpp
@@@ -35,11 -35,11 +35,11 @@@ get_flash_text_package(const fn_call& f
Global_as& gl = getGlobal(fn);
- as_object* pkg = gl.createObject();
+ as_object* pkg = createObject(gl);
- string_table& st = getStringTable(fn);
+ VM& vm = getVM(fn);
- textrenderer_class_init(*pkg, st.find("TextRenderer"));
+ textrenderer_class_init(*pkg, getURI(vm, "TextRenderer"));
return pkg;
}
diff --cc testsuite/misc-ming.all/DefineTextTest-Runner.cpp
index 8a5dcfe,db9eb27..dbcefb0
--- a/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
+++ b/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
@@@ -112,13 -112,12 +112,13 @@@ main(int /*argc*/, char** /*argv*/
for (int i=0; i<3; ++i) tester.advance(); // get to the end
+ VM& vm = VM::get();
string_table& st = VM::get().getStringTable();
as_value eot;
- bool endOfTestFound = getObject(root)->get_member(st.find("endoftest"),
&eot);
+ bool endOfTestFound = getObject(root)->get_member(getURI(vm,
"endoftest"), &eot);
xcheck(endOfTestFound);
xcheck(eot.is_bool());
- xcheck(eot.to_bool());
+ xcheck(eot.to_bool(8));
// TODO: use check_pixel for checking bacground colors
}
diff --cc testsuite/misc-ming.all/attachMovieTestRunner.cpp
index 7b7d6e4,d75f4be..36feb18
--- a/testsuite/misc-ming.all/attachMovieTestRunner.cpp
+++ b/testsuite/misc-ming.all/attachMovieTestRunner.cpp
@@@ -91,16 -91,16 +91,16 @@@ main(int /*argc*/, char** /*argv*/
// Note that we are *not* on an active entity !
tester.pressMouseButton();
- getObject(root)->get_member(st.find("mousedown"), &tmp);
+ getObject(root)->get_member(mousedown, &tmp);
- check_equals(tmp.to_number(), 1);
+ check_equals(toNumber(tmp, vm), 1);
- check ( ! getObject(root)->get_member(st.find("mouseup"), &tmp) );
+ check ( ! getObject(root)->get_member(mouseup, &tmp) );
tester.depressMouseButton();
- getObject(root)->get_member(st.find("mousedown"), &tmp);
+ getObject(root)->get_member(mousedown, &tmp);
- check_equals(tmp.to_number(), 1);
+ check_equals(toNumber(tmp, vm), 1);
- getObject(root)->get_member(st.find("mouseup"), &tmp);
+ getObject(root)->get_member(mouseup, &tmp);
- check_equals(tmp.to_number(), 1);
+ check_equals(toNumber(tmp, vm), 1);
tester.advance();
@@@ -156,8 -156,8 +156,8 @@@
// Note that we are *not* on an active entity !
tester.pressMouseButton();
- getObject(root)->get_member(st.find("mousedown"), &tmp);
+ getObject(root)->get_member(mousedown, &tmp);
- check_equals(tmp.to_number(), 5);
+ check_equals(toNumber(tmp, vm), 5);
}
diff --cc testsuite/misc-ming.all/intervalTestRunner.cpp
index 515d5c4,7fc62fb..6386db3
--- a/testsuite/misc-ming.all/intervalTestRunner.cpp
+++ b/testsuite/misc-ming.all/intervalTestRunner.cpp
@@@ -62,83 -62,78 +62,81 @@@ main(int /*argc*/, char** /*argv*/
// Now timers are set and counters initialized
VM& vm = VM::get();
- string_table& st = vm.getStringTable();
- getObject(root)->get_member(st.find("this_counter"), &tmp);
+ const ObjectURI& thisCounter = getURI(vm, "this_counter");
+ const ObjectURI& thatCounter = getURI(vm, "that_counter");
+ const ObjectURI& pushedArgs = getURI(vm, "pushed_args");
+ const ObjectURI& testCompleted = getURI(vm, "test_completed");
+
- string_table& st = vm.getStringTable();
+ getObject(root)->get_member(thisCounter, &tmp);
- check_equals(tmp.to_number(), 0);
+ check_equals(toNumber(tmp, vm), 0);
- getObject(root)->get_member(st.find("that_counter"), &tmp);
+ getObject(root)->get_member(thatCounter, &tmp);
- check_equals(tmp.to_number(), 0);
+ check_equals(toNumber(tmp, vm), 0);
tester.advanceClock(500); // "sleep" 500 milliseconds
tester.advance(); // run expired timers
- getObject(root)->get_member(st.find("this_counter"), &tmp);
+ getObject(root)->get_member(thisCounter, &tmp);
- check_equals(tmp.to_number(), 1);
+ check_equals(toNumber(tmp, vm), 1);
- getObject(root)->get_member(st.find("that_counter"), &tmp);
+ getObject(root)->get_member(thatCounter, &tmp);
- check_equals(tmp.to_number(), 0);
+ check_equals(toNumber(tmp, vm), 0);
tester.advanceClock(600); // "sleep" 500 milliseconds
tester.advance(); // run expired timers
- getObject(root)->get_member(st.find("this_counter"), &tmp);
+ getObject(root)->get_member(thisCounter, &tmp);
- check_equals(tmp.to_number(), 2);
+ check_equals(toNumber(tmp, vm), 2);
- getObject(root)->get_member(st.find("that_counter"), &tmp);
+ getObject(root)->get_member(thatCounter, &tmp);
- check_equals(tmp.to_number(), 1);
+ check_equals(toNumber(tmp, vm), 1);
tester.advanceClock(500); // "sleep" 500 milliseconds
tester.advance(); // run expired timers
- getObject(root)->get_member(st.find("this_counter"), &tmp);
+ getObject(root)->get_member(thisCounter, &tmp);
- check_equals(tmp.to_number(), 3);
+ check_equals(toNumber(tmp, vm), 3);
- getObject(root)->get_member(st.find("that_counter"), &tmp);
+ getObject(root)->get_member(thatCounter, &tmp);
- check_equals(tmp.to_number(), 1);
+ check_equals(toNumber(tmp, vm), 1);
tester.advanceClock(520); // "sleep" 520 milliseconds
tester.advance(); // run expired timers
- getObject(root)->get_member(st.find("this_counter"), &tmp);
+ getObject(root)->get_member(thisCounter, &tmp);
- check_equals(tmp.to_number(), 4);
+ check_equals(toNumber(tmp, vm), 4);
- getObject(root)->get_member(st.find("that_counter"), &tmp);
+ getObject(root)->get_member(thatCounter, &tmp);
- check_equals(tmp.to_number(), 2);
+ check_equals(toNumber(tmp, vm), 2);
tester.advanceClock(1020); // "sleep" 1020 milliseconds
tester.advance(); // run expired timers
- getObject(root)->get_member(st.find("this_counter"), &tmp);
+ getObject(root)->get_member(thisCounter, &tmp);
- check_equals(tmp.to_number(), 4);
+ check_equals(toNumber(tmp, vm), 4);
- getObject(root)->get_member(st.find("that_counter"), &tmp);
+ getObject(root)->get_member(thatCounter, &tmp);
- check_equals(tmp.to_number(), 3);
+ check_equals(toNumber(tmp, vm), 3);
tester.advanceClock(1020); // "sleep" 1020 milliseconds
tester.advance(); // run expired timers
- getObject(root)->get_member(st.find("this_counter"), &tmp);
+ getObject(root)->get_member(thisCounter, &tmp);
- check_equals(tmp.to_number(), 4);
+ check_equals(toNumber(tmp, vm), 4);
- getObject(root)->get_member(st.find("that_counter"), &tmp);
+ getObject(root)->get_member(thatCounter, &tmp);
- check_equals(tmp.to_number(), 4);
+ check_equals(toNumber(tmp, vm), 4);
tester.advanceClock(520); // "sleep" 520 milliseconds
tester.advance(); // run expired timers
- getObject(root)->get_member(st.find("this_counter"), &tmp);
+ getObject(root)->get_member(thisCounter, &tmp);
- check_equals(tmp.to_number(), 5);
+ check_equals(toNumber(tmp, vm), 5);
- getObject(root)->get_member(st.find("that_counter"), &tmp);
+ getObject(root)->get_member(thatCounter, &tmp);
- check_equals(tmp.to_number(), 4);
+ check_equals(toNumber(tmp, vm), 4);
- getObject(root)->get_member(st.find("pushed_args"), &tmp);
+ getObject(root)->get_member(pushedArgs, &tmp);
as_environment env(vm); // needed for proper to_string()
check_equals(tmp.to_string(), std::string("8,9,10"));
tester.advanceClock(100); // "sleep" another 100 milliseconds
tester.advance(); // run expired timers
- getObject(root)->get_member(st.find("test_completed"), &tmp);
+ getObject(root)->get_member(testCompleted, &tmp);
- check_equals(tmp.to_number(), 1);
-
+ check_equals(toNumber(tmp, vm), 1);
-
}
diff --cc testsuite/misc-swfc.all/button_test1runner.cpp
index 7093d57,eb39d2b..d5f1505
--- a/testsuite/misc-swfc.all/button_test1runner.cpp
+++ b/testsuite/misc-swfc.all/button_test1runner.cpp
@@@ -156,9 -158,9 +156,9 @@@ main(int /*argc*/, char** /*argv*/
as_value eot;
- getObject(root)->get_member(st.find("testcompleted"), &eot);
+ getObject(root)->get_member(getURI(vm, "testcompleted"), &eot);
//cerr << "EOT is " << eot.to_debug_string() << endl;
- check(eot.to_bool());
+ check(eot.to_bool(8));
}
diff --cc testsuite/movies.all/gravity_embedded-TestRunner.cpp
index 68c10a7,c65b58b..2d91ea0
--- a/testsuite/movies.all/gravity_embedded-TestRunner.cpp
+++ b/testsuite/movies.all/gravity_embedded-TestRunner.cpp
@@@ -68,10 -68,12 +68,11 @@@ main(int /*argc*/, char** /*argv*/
check(loaded);
check_equals(loaded->parent(), root);
- VM& vm = VM::get();
-
- string_table& st = VM::get().getStringTable();
- string_table::key xscale = st.find("_xscale");
- string_table::key yscale = st.find("_yscale");
- // we need a const_cast as get_member *might* eventually
+ VM& vm = getVM(*getObject(loaded));
- const ObjectURI& xscale = getURI(vm,"_xscale");
- const ObjectURI& yscale = getURI(vm,"_yscale");
- // we need a const_cast as get_member *might* eventually
++ const ObjectURI& xscale = getURI(vm, "_xscale");
++ const ObjectURI& yscale = getURI(vm, "_yscale");
++
++ // we need a const_cast as get_member *might* eventually
// change the DisplayObject (fetching _x shouldn't change it though)
check(getObject(const_cast<DisplayObject*>(loaded))->get_member(xscale,
&tmp));
check(tmp.strictly_equals(50));
-----------------------------------------------------------------------
Summary of changes:
devtools/lib/Gnash/Distribution.pm | 307 ------------
devtools/lib/Gnash/Utils.pm | 148 ------
devtools/testsuite/c_casts.t | 112 ----
devtools/testsuite/copyright_notices.t | 127 -----
devtools/testsuite/tabs.t | 87 ----
devtools/testsuite/uncuddled_else.t | 102 ----
doc/C/actionscript.xml | 1 -
doc/C/preformatted/gnash_ref.info.in | 2 +-
doc/C/preformatted/gnashref.html.in | 2 +-
doc/C/refmanual/extensions/extensions.xml | 2 +-
extensions/dbus/dbus_ext.cpp | 4 +-
extensions/dejagnu/dejagnu.cpp | 4 +-
extensions/fileio/fileio.cpp | 8 +-
extensions/gtk2/gtkext.cpp | 4 +-
extensions/lirc/lirc_ext.cpp | 4 +-
extensions/mysql/mysql_db.cpp | 31 +-
libbase/SharedMem.cpp | 2 +
libcore/AMFConverter.cpp | 2 +-
libcore/Button.cpp | 21 +-
libcore/CharacterProxy.cpp | 31 +-
libcore/CharacterProxy.h | 57 ++-
libcore/ClassHierarchy.cpp | 33 --
libcore/ClassHierarchy.h | 28 +-
libcore/DisplayObject.cpp | 29 +-
libcore/ExternalInterface.cpp | 3 +-
libcore/MovieClip.cpp | 31 +-
libcore/Video.cpp | 5 +-
libcore/as_function.cpp | 81 +---
libcore/as_function.h | 24 +-
libcore/as_object.cpp | 4 +-
libcore/as_object.h | 2 +-
libcore/as_value.cpp | 131 ++----
libcore/as_value.h | 36 +--
libcore/asobj/ASConversions.cpp | 24 +-
libcore/asobj/Accessibility_as.cpp | 2 +-
libcore/asobj/Array_as.cpp | 205 ++++----
libcore/asobj/AsBroadcaster.cpp | 5 +-
libcore/asobj/Boolean_as.cpp | 6 +-
libcore/asobj/Camera_as.cpp | 20 +-
libcore/asobj/Color_as.cpp | 10 +-
libcore/asobj/ContextMenu_as.cpp | 4 +-
libcore/asobj/Date_as.cpp | 74 ++--
libcore/asobj/{Globals.cpp => Global_as.cpp} | 126 +++--
libcore/asobj/Global_as.h | 95 ++--
libcore/asobj/Globals.h | 122 -----
libcore/asobj/Key_as.cpp | 2 +-
libcore/asobj/LocalConnection_as.cpp | 3 +-
libcore/asobj/Math_as.cpp | 27 +-
libcore/asobj/Microphone_as.cpp | 12 +-
libcore/asobj/MovieClipLoader.cpp | 2 +-
libcore/asobj/MovieClip_as.cpp | 99 ++--
libcore/asobj/NetConnection_as.cpp | 2 +-
libcore/asobj/NetStream_as.cpp | 15 +-
libcore/asobj/Number_as.cpp | 12 +-
libcore/asobj/Object.cpp | 7 +-
libcore/asobj/Selection_as.cpp | 4 +-
libcore/asobj/SharedObject_as.cpp | 6 +-
libcore/asobj/Sound_as.cpp | 12 +-
libcore/asobj/Stage_as.cpp | 2 +-
libcore/asobj/String_as.cpp | 55 +-
libcore/asobj/TextField_as.cpp | 50 +-
libcore/asobj/TextFormat_as.cpp | 38 +-
libcore/asobj/TextSnapshot_as.cpp | 32 +-
libcore/asobj/XMLNode_as.cpp | 8 +-
libcore/asobj/XMLSocket_as.cpp | 2 +-
libcore/asobj/XML_as.cpp | 11 +-
libcore/asobj/flash.am | 3 +-
libcore/asobj/flash/display/BitmapData_as.cpp | 45 +-
libcore/asobj/flash/display/display_pkg.cpp | 2 +-
.../asobj/flash/external/ExternalInterface_as.cpp | 6 +-
libcore/asobj/flash/external/external_pkg.cpp | 2 +-
libcore/asobj/flash/filters/BevelFilter_as.cpp | 22 +-
libcore/asobj/flash/filters/BitmapFilter_as.cpp | 4 +-
libcore/asobj/flash/filters/BlurFilter_as.cpp | 6 +-
.../asobj/flash/filters/DropShadowFilter_as.cpp | 22 +-
libcore/asobj/flash/filters/GlowFilter_as.cpp | 16 +-
.../asobj/flash/filters/GradientBevelFilter_as.cpp | 14 +-
.../asobj/flash/filters/GradientGlowFilter_as.cpp | 14 +-
libcore/asobj/flash/filters/filters_pkg.cpp | 2 +-
libcore/asobj/flash/flash_pkg.cpp | 2 +-
libcore/asobj/flash/geom/ColorTransform_as.cpp | 36 +-
libcore/asobj/flash/geom/Matrix_as.cpp | 112 ++---
libcore/asobj/flash/geom/Point_as.cpp | 44 +-
libcore/asobj/flash/geom/Rectangle_as.cpp | 22 +-
libcore/asobj/flash/geom/Transform_as.cpp | 2 +-
libcore/asobj/flash/geom/geom_pkg.cpp | 2 +-
libcore/asobj/flash/net/net_pkg.cpp | 2 +-
libcore/asobj/flash/text/text_pkg.cpp | 2 +-
libcore/asobj/gen-asclass.pl | 529 --------------------
libcore/vm/ASHandlers.cpp | 157 ++++---
libcore/vm/ExecutableCode.h | 3 +-
libcore/vm/Machine.cpp | 32 +-
libcore/vm/VM.cpp | 109 ++++-
libcore/vm/VM.h | 57 ++-
testsuite/actionscript.all/Function.as | 24 +-
testsuite/libcore.all/AsValueTest.cpp | 133 -----
testsuite/libcore.all/DisplayListTest.cpp | 4 +-
testsuite/misc-ming.all/DefineTextTest-Runner.cpp | 2 +-
testsuite/misc-ming.all/DragDropTestRunner.cpp | 2 +-
.../PrototypeEventListenersTestRunner.cpp | 2 +-
testsuite/misc-ming.all/attachMovieTestRunner.cpp | 8 +-
testsuite/misc-ming.all/intervalTestRunner.cpp | 36 +-
testsuite/misc-ming.all/loadMovieTestRunner.cpp | 2 +-
testsuite/misc-swfc.all/button_test1runner.cpp | 2 +-
.../movies.all/gravity_embedded-TestRunner.cpp | 35 +-
105 files changed, 1176 insertions(+), 2902 deletions(-)
delete mode 100644 devtools/lib/Gnash/Distribution.pm
delete mode 100644 devtools/lib/Gnash/Utils.pm
delete mode 100755 devtools/testsuite/c_casts.t
delete mode 100755 devtools/testsuite/copyright_notices.t
delete mode 100755 devtools/testsuite/tabs.t
delete mode 100755 devtools/testsuite/uncuddled_else.t
rename libcore/asobj/{Globals.cpp => Global_as.cpp} (93%)
delete mode 100644 libcore/asobj/Globals.h
delete mode 100755 libcore/asobj/gen-asclass.pl
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, objecturi, updated. fa09e6c4630bd112230e8a95400c12c518570d1a,
Benjamin Wolsey <=