[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-447-gef15bcb

[Sandro Santilli]

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, master has been updated
       via  ef15bcbffe6f448e6f7824d5ed0c1c98ec94c7dd (commit)
      from  ad6c1e98583e809fad79588a4619b880a967d4ab (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=ef15bcbffe6f448e6f7824d5ed0c1c98ec94c7dd


commit ef15bcbffe6f448e6f7824d5ed0c1c98ec94c7dd
Author: Sandro Santilli <address@hidden>
Date:   Thu Jul 7 22:01:02 2011 +0200

    Improve the test for dictionary use in function to show that when coming 
back from functions, the previous dictionary is again in effect

diff --git a/testsuite/misc-swfmill.all/func_dict.xml 
b/testsuite/misc-swfmill.all/func_dict.xml
index 69e74bb..dab264f 100644
--- a/testsuite/misc-swfmill.all/func_dict.xml
+++ b/testsuite/misc-swfmill.all/func_dict.xml
@@ -23,7 +23,7 @@
       <DoAction>
         <actions>
 
-       <!-- Dictionary at time of function definition -->
+       <!-- Dictionary 1 -->
           <Dictionary>
             <strings>
               <String value="a"/>
@@ -31,25 +31,32 @@
           </Dictionary>
 
        <!-- Function code -->
-          <DeclareFunction name="f" argc="0" length="15">
+          <DeclareFunction name="f" argc="0" length="17">
             <args/>
           </DeclareFunction>
+
           <PushData>
             <items>
-              <StackString value="r"/>
+              <StackDictionaryLookup index="0"/>
             </items>
           </PushData>
-          <Duplicate/>
-          <GetVariable/>
+
+       <!-- Dictionary 2 (in-function) -->
+          <Dictionary>
+            <strings>
+              <String value="c"/>
+            </strings>
+          </Dictionary>
+
           <PushData>
             <items>
               <StackDictionaryLookup index="0"/>
             </items>
           </PushData>
-          <AddTyped/>
-          <SetVariable/>
 
-       <!-- Dictionary after function definition -->
+       <!-- END OF FUNCTION BODY -->
+
+       <!-- Dictionary 3 (after function) -->
           <Dictionary>
             <strings>
               <String value="b"/>
@@ -57,25 +64,21 @@
           </Dictionary>
 
 
-       <!-- Main code -->
-
-         // Append dict[0] to `r'
+         // Push "r" (to assign later)
           <PushData>
             <items>
               <StackString value="r"/>
             </items>
           </PushData>
-          <Duplicate/>
-          <GetVariable/>
+
+         // Push dict[0] (expect 'b')
           <PushData>
             <items>
               <StackDictionaryLookup index="0"/>
             </items>
           </PushData>
-          <AddTyped/>
-          <SetVariable/>
 
-         // Call the function appending dict[0] to `r'
+         // Call the function  (pushes 'a' and 'c')
           <PushData>
             <items>
               <StackInteger value="0"/>
@@ -85,14 +88,26 @@
           <CallFunction/>
           <Pop/>
 
-         // Verify `r' equals 'ba'
+       
+         // Push dict[0] (expect 'b')
           <PushData>
             <items>
-              <StackString value="ba"/>
-              <StackString value="r"/>
+              <StackDictionaryLookup index="0"/>
+            </items>
+          </PushData>
+
+          <AddTyped/>
+          <AddTyped/>
+          <AddTyped/>
+          <Duplicate/>
+          <Trace/>
+
+         // Verify we got 'bacb'
+          <PushData>
+            <items>
+              <StackString value="bacb"/>
             </items>
           </PushData>
-          <GetVariable/>
          <EqualTyped/>
 
          // If true, jump to PASSED tracing

-----------------------------------------------------------------------

Summary of changes:
 testsuite/misc-swfmill.all/func_dict.xml |   55 +++++++++++++++++++-----------
 1 files changed, 35 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
Gnash