[Gnash-commit] /srv/bzr/gnash/avm2 r9637: Improve AS2 to Haxe conversion script.

[Tom Stellard]

------------------------------------------------------------
revno: 9637
committer: Tom Stellard <address@hidden>
branch nick: gnash_dev
timestamp: Tue 2008-10-21 10:51:11 +0800
message:
  Improve AS2 to Haxe conversion script.
modified:
  testsuite/actionscript.all/haxe-swf9/as_to_hx.pl
    ------------------------------------------------------------
    revno: 9635.1.1
    committer: Tom Stellard <address@hidden>
    branch nick: gnash_dev
    timestamp: Sun 2008-10-19 21:27:04 +0800
    message:
      Don't skip calls to call()
    modified:
      testsuite/actionscript.all/haxe-swf9/as_to_hx.pl
    ------------------------------------------------------------
    revno: 9635.1.2
    committer: Tom Stellard <address@hidden>
    branch nick: gnash_dev
    timestamp: Sun 2008-10-19 22:30:00 +0800
    message:
      Convert actionscript delete statement to the equivalent Haxe function.
      Remove unused function.
    modified:
      testsuite/actionscript.all/haxe-swf9/as_to_hx.pl

=== modified file 'testsuite/actionscript.all/haxe-swf9/as_to_hx.pl'
--- a/testsuite/actionscript.all/haxe-swf9/as_to_hx.pl  2008-10-19 12:00:12 
+0000
+++ b/testsuite/actionscript.all/haxe-swf9/as_to_hx.pl  2008-10-19 14:30:00 
+0000
@@ -108,13 +108,27 @@
 #              next;
        }
 
-       #Replace deletes:
-       #ACTIONSCRIPT: delete Object.prototype.toString
-       #HAXE: Reflect.deleteField(Object.prototype,toString)
-       #TODO: Implement
-       if(index($_,"delete") != $[-1){
-               skip_line();
-               next;
+       #Replace delete object.prop or delete object["prop"] with 
Reflect.deleteField(object,'prop')
+       if($_ =~ /delete\s*([\w\[\]\"\\.]+)/){
+               my $prop = $1;
+               #Check if we have this case: delete a["Prop"];
+               if(index($prop,'.') == $[-1){
+                       $prop =~ s/(\w+)\[['"](\w+)['"]\]/$1.$2/g;
+               }
+
+               #Seperate the object from its property.
+               my @temp = split(/\./,$prop);   
+               my $field = $temp[-1];
+
+               my $object;
+               #Don't join the object with itself.
+               if($#temp == 1){
+                       $object = $temp[0];
+               }
+               else{
+                       $object = join(".",@temp[0,-2]);
+               }
+               $_ =~ 
s/delete\s*([\w\[\]\"\\.]+)/Reflect.deleteField($object,'$field')/;
        }
        
        #Replace Class.hasOwnProperty(prop) with Reflect.hasField(Class,prop)
@@ -179,12 +193,6 @@
                $_ =~ s/,\s*(\w+)\s*/) + String.fromCharCode($1/g;
        }
        
-       #Remove calls to call function.  I haven't found a Haxe equivilent for 
this.
-       if($_ =~ /\.call\(.+\)/){
-               skip_line();
-               next;
-       }
-       
        #Convert calls to chr and ord.  I think these have been depreciated 
since SWF v5.
        $_ =~ s/chr\(\s*(\w+)\s*\)/String.fromCharCode($1)/g;
        $_ =~ s/ord\(\s*(\S+)\s*\)/$1.charCodeAt(0)/g;
@@ -250,49 +258,3 @@
        my $var_name = $_[0];
        return "var $var_name:Dynamic='';\n"
 }
-
-sub instance_of{
-       
-       print stderr "INSTANCE_OF:\n";
-       print stderr "ORIG=" . $_[0]."\n";
-       #Convert non-alphanumeric characters to " ".
-#              $working =~ s/\W/ /g;
-#              print stderr $working."\n";
-               my @blocks = split(/ /,$_[0],);
-               my $instance_index == $[;
-               foreach(@blocks){
-                       if($_ eq "instanceof"){
-                               last;
-                       }
-                       $instance_index++;
-               }
-               my $object = $blocks[$instance_index-1];
-               my $type = $blocks[$instance_index+1];
-               my $index = rindex($object,"(");
-               while($index > $[-1){
-                       if(substr($object,$index+1,1) ne ")"){
-                               $object =~ s/.+\(${1}//g;
-                       }
-                       else{
-                               my $prev_index = rindex($object,"(",$index-1);
-                               $object = substr($object,$prev_index+1,1 + 
$index - $prev_index);
-                               last;
-                       }               
-                       $index = rindex($object,"(",$index-1);
-               }
-# = substr(0,$index+1)
-               #TODO: How do I delete the characters instead of replacing it 
with " "
-#              $object =~ s/.+\(/ /g;
-               #Remove left over non-alphanumeric characters from type.
-               $type =~ s/\W//g;
-               my $haxe = "Std.is(" . $object . ", " . $type . ")";
-               my $str_to_replace = $object." instanceof ".$type;
-
-               print stderr "HAXE=".$haxe."\n";
-               print stderr "REP=".$str_to_replace."_\n";
-               print stderr "ORIG=" . $_[0] ."\n";
-               print stderr "REP_INDEX=" . index($_[0],$str_to_replace) . "\n";
-               $_[0] =~ s/\Q$str_to_replace\E/$haxe/g;
-               print stderr "FINAL=" . $_[0] . "\n";
-               return $_[0];
-       }
\ No newline at end of file