[Gnash-commit] /srv/bzr/gnash/trunk r11167: Put classes inside packages.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11167
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2009-06-25 10:28:37 +0200
message:
  Put classes inside packages.
  
  Add more infrastructure for trace tests.
added:
  testsuite/misc-swfmill.all/scope1.trace
modified:
  testsuite/as3compile.all/function.as
  testsuite/as3compile.all/lookup.as
  testsuite/misc-swfmill.all/Makefile.am
    ------------------------------------------------------------
    revno: 11163.1.7
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2009-06-25 09:58:18 +0200
    message:
      Add expected trace for stack and scope stack test.
    added:
      testsuite/misc-swfmill.all/scope1.trace
    ------------------------------------------------------------
    revno: 11163.1.8
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2009-06-25 09:58:45 +0200
    message:
      Start new set of tracing tests.
    modified:
      testsuite/misc-swfmill.all/Makefile.am
    ------------------------------------------------------------
    revno: 11163.1.9
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2009-06-25 10:26:16 +0200
    message:
      Another attempt at a blind fix for the build problem.
    modified:
      testsuite/as3compile.all/lookup.as
    ------------------------------------------------------------
    revno: 11163.1.10
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2009-06-25 10:28:00 +0200
    message:
      Do the same for function.as
    modified:
      testsuite/as3compile.all/function.as

=== modified file 'testsuite/as3compile.all/function.as'
--- a/testsuite/as3compile.all/function.as      2009-06-18 09:08:21 +0000
+++ b/testsuite/as3compile.all/function.as      2009-06-25 08:28:00 +0000
@@ -41,6 +41,8 @@
 }
         
 
+package main {
+
 import flash.display.MovieClip;
 
 public class Main extends MovieClip {
@@ -103,3 +105,4 @@
     }
 }
          
+}

=== modified file 'testsuite/as3compile.all/lookup.as'
--- a/testsuite/as3compile.all/lookup.as        2009-06-25 07:33:15 +0000
+++ b/testsuite/as3compile.all/lookup.as        2009-06-25 08:26:16 +0000
@@ -28,6 +28,8 @@
     public class C {}
 }
 
+package main {
+
 import flash.display.MovieClip;
 
 public class Main extends MovieClip {
@@ -54,3 +56,4 @@
     }
 }
          
+}

=== modified file 'testsuite/misc-swfmill.all/Makefile.am'
--- a/testsuite/misc-swfmill.all/Makefile.am    2009-06-25 07:30:46 +0000
+++ b/testsuite/misc-swfmill.all/Makefile.am    2009-06-25 07:58:45 +0000
@@ -39,7 +39,17 @@
        mixed-bytecode-as3.xml  \
        $(NULL)
 
-EXTRA_DIST = $(SC_AS2_XMLTESTS) $(SC_AS3_XMLTESTS)  
+# XML tests that rely on comparing trace output.
+TRACE_AS_TESTS = \
+       scope1.xml \
+       $(NULL)
+
+TRACE_AS3_TRACES = \
+       scope1.trace \
+       $(NULL)
+
+EXTRA_DIST = $(SC_AS2_XMLTESTS) $(SC_AS3_XMLTESTS) $(TRACE_AS_TESTS) \
+                        $(TRACE_AS3_TRACES)
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/libbase \
@@ -58,6 +68,7 @@
 
 if ENABLE_AVM2
 SC_XMLTESTS_OUT += $(SC_AS3_XMLTESTS:.xml=.swf)
+SC_XMLTESTS_OUT += $(TRACE_AS3_TESTS:.xml=.swf)
 endif
 
 # Dependencies for all self-contained SWF tests

=== added file 'testsuite/misc-swfmill.all/scope1.trace'
--- a/testsuite/misc-swfmill.all/scope1.trace   1970-01-01 00:00:00 +0000
+++ b/testsuite/misc-swfmill.all/scope1.trace   2009-06-25 07:58:18 +0000
@@ -0,0 +1,13 @@
+3
+A.f()
+[object A]
+[class Sprite]
+[class Sprite]
+[class Sprite]
+[class Sprite]
+2
+1
+[object A]
+[class EventDispatcher]
+[class EventDispatcher]
+[class EventDispatcher]