CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/09/27 23:06:56
Modified files:
. : ChangeLog
server : character.cpp character.h
testsuite/actionscript.all: MovieClip.as toString_valueOf.as
Log message:
* server/character.{cpp,h}: drop the get_text_value override
here.
* testsuite/actionscript.all/: toString_valueOf.as,
MovieClip.as:
more successes.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4453&r2=1.4454
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/toString_valueOf.as?cvsroot=gnash&r1=1.19&r2=1.20
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4453
retrieving revision 1.4454
diff -u -b -r1.4453 -r1.4454
--- ChangeLog 27 Sep 2007 22:30:00 -0000 1.4453
+++ ChangeLog 27 Sep 2007 23:06:55 -0000 1.4454
@@ -1,5 +1,11 @@
2007-09-28 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/character.{cpp,h}: drop the get_text_value override here.
+ * testsuite/actionscript.all/: toString_valueOf.as, MovieClip.as:
+ more successes.
+
+2007-09-28 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/actionscript.all/toString_valueOf.as: more
xcheck => xcheck_equals (easier to tell what's going on).
Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/character.cpp 19 Sep 2007 14:20:49 -0000 1.56
+++ server/character.cpp 27 Sep 2007 23:06:56 -0000 1.57
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: character.cpp,v 1.56 2007/09/19 14:20:49 cmusick Exp $ */
+/* $Id: character.cpp,v 1.57 2007/09/27 23:06:56 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -887,12 +887,14 @@
return target;
}
+#if 0
/*public*/
std::string
character::get_text_value() const
{
return getTarget();
}
+#endif
} // namespace gnash
Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- server/character.h 21 Sep 2007 08:29:02 -0000 1.96
+++ server/character.h 27 Sep 2007 23:06:56 -0000 1.97
@@ -19,7 +19,7 @@
//
//
-/* $Id: character.h,v 1.96 2007/09/21 08:29:02 strk Exp $ */
+/* $Id: character.h,v 1.97 2007/09/27 23:06:56 strk Exp $ */
#ifndef GNASH_CHARACTER_H
#define GNASH_CHARACTER_H
@@ -1082,7 +1082,7 @@
TimelineInfo* getTimelineInfo() { return _timelineInfo.get(); }
// override from as_object
- virtual std::string get_text_value() const;
+ //virtual std::string get_text_value() const;
#ifdef NEW_KEY_LISTENER_LIST_DESIGN
boost::intrusive_ptr<as_function> getUserDefinedEventHandler(const
std::string& name) const;
Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- testsuite/actionscript.all/MovieClip.as 27 Sep 2007 07:18:15 -0000
1.90
+++ testsuite/actionscript.all/MovieClip.as 27 Sep 2007 23:06:56 -0000
1.91
@@ -20,7 +20,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: MovieClip.as,v 1.90 2007/09/27 07:18:15 zoulunkai Exp $";
+rcsid="$Id: MovieClip.as,v 1.91 2007/09/27 23:06:56 strk Exp $";
#include "check.as"
@@ -413,12 +413,12 @@
check_equals(mc5._target, "/changed/mc5_mc");
check_equals(targetPath(mc4), "_level0.changed");
check_equals(targetPath(mc5), "_level0.changed.mc5_mc");
-xcheck_equals(mc4.toString(), "[object Object]");
-xcheck_equals(mc5.toString(), "[object Object]");
+check_equals(mc4.toString(), "[object Object]");
+check_equals(mc5.toString(), "[object Object]");
check_equals(changed._target, "/changed");
check_equals(changed.mc5_mc._target, "/changed/mc5_mc");
-xcheck_equals(changed.toString(), "[object Object]");
-xcheck_equals(changed.mc5_mc.toString(), "[object Object]");
+check_equals(changed.toString(), "[object Object]");
+check_equals(changed.mc5_mc.toString(), "[object Object]");
#endif // OUTPUT_VERSION >= 6
//--------------------------------------------------------------------------
Index: testsuite/actionscript.all/toString_valueOf.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/toString_valueOf.as,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- testsuite/actionscript.all/toString_valueOf.as 27 Sep 2007 22:30:01
-0000 1.19
+++ testsuite/actionscript.all/toString_valueOf.as 27 Sep 2007 23:06:56
-0000 1.20
@@ -224,7 +224,7 @@
#if OUTPUT_VERSION > 5
check_equals(typeof(x), 'string');
check_equals(typeof(y), 'movieclip');
- xcheck_equals(x, '[object Object]');
+ check_equals(x, '[object Object]');
check_equals(y, _level0.mc1);
#else
// createEmptyMovieClip is not a function in SWF5...
@@ -233,13 +233,17 @@
check_equals(x, undefined);
check_equals(y, undefined);
#endif
-check(y == _level0.mc1);
+check_equals(y, _level0.mc1);
+
//trace a movieclip doesn't invoke the toString method, either.
//trace(mc1); //output _level0.mc
MovieClip.prototype.toString = function () {return "TO_STRING";};
MovieClip.prototype.valueOf = function () {return "TO_VALUE";};
+check( mc1 != '_level0.mc1'); // won't invoke toString for comparison
+check_equals( mc1, _level0.mc1 );
+
x = mc1.toString();
y = mc1.valueOf();
#if OUTPUT_VERSION > 5
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
