[Gnash-commit] gnash ChangeLog server/asobj/gen-asclass.sh

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/28 11:02:05

Modified files:
        .              : ChangeLog 
        server/asobj   : gen-asclass.sh 

Log message:
                * server/asobj/gen-asclass.sh: updated to
                  use new, more robust and more correct layout.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2494&r2=1.2495
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/gen-asclass.sh?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2494
retrieving revision 1.2495
diff -u -b -r1.2494 -r1.2495
--- ChangeLog   28 Feb 2007 10:52:37 -0000      1.2494
+++ ChangeLog   28 Feb 2007 11:02:04 -0000      1.2495
@@ -1,5 +1,7 @@
 2007-02-28 Sandro Santilli <address@hidden>
 
+       * server/asobj/gen-asclass.sh: updated to
+         use new, more robust and more correct layout.
        * server/asobj/string.cpp: robustness and
          correctness improvements: use builtin_function,
          not c_function for buildin methods; make sure

Index: server/asobj/gen-asclass.sh
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/gen-asclass.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/gen-asclass.sh 18 Jan 2007 22:53:22 -0000      1.7
+++ server/asobj/gen-asclass.sh 28 Feb 2007 11:02:04 -0000      1.8
@@ -143,6 +143,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+#include "GnashException.h" // for ActionException
 
 namespace gnash {
 
@@ -151,7 +152,7 @@
 # DO NOT CONVERT CASE, SWF7+ is case-sensitive 
 newi=`echo $i | sed -e 's/)//g'` # | tr '[A-Z]' '[a-z]'
 cat <<EOF>>${srcname}
-void ${lowname}_${newi}const fn_call& fn);
+static void ${lowname}_${newi}const fn_call& fn);
 EOF
 done
 cat <<EOF>>${srcname}
@@ -166,7 +167,7 @@
     # DO NOT CONVERT CASE, SWF7+ is case-sensitive 
     newi=`echo $i | sed -e 's/()//g'` # | tr '[A-Z]' '[a-z]'
     cat <<EOF>>${srcname}
-       o.init_member("${newi}", &${lowname}_${newi});
+       o.init_member("${newi}", new builtin_function(${lowname}_${newi}));
 EOF
 done
 cat <<EOF>>${srcname}
@@ -203,12 +204,28 @@
 
 EOF
 
+cat <<EOF>>${srcname}
+static ${lowname}_as_object* 
+ensure_${lowname}(as_object* obj)
+{
+       ${lowname}_as_object* ret = dynamic_cast<${lowname}_as_object*>(obj);
+       if ( ! ret )
+       {
+               throw ActionException("builtin method or gettersetter for 
${asname} objects called against non-${asname} instance");
+       }
+       return ret;
+}
+EOF
 for i in $methods; do
 # DO NOT CONVERT CASE, SWF7+ is case-sensitive 
 newi=`echo $i | sed -e 's/)//g'` # | tr '[A-Z]' '[a-z]'
 cat <<EOF>>${srcname}
-void ${lowname}_${newi}const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+static void
+${lowname}_${newi}const fn_call& fn)
+{
+       ${lowname}_as_object* ptr = ensure_${lowname}(fn.this_ptr);
+       UNUSED(ptr);
+       log_warning("%s: unimplemented", __FUNCTION__);
 }
 EOF
 done