zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
fixed bug #1223313

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185228

fixed bug #1223313
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/185228
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-09-12 08:25:47 +0000
+++ src/compiler/translator/translator.cpp	2013-09-12 09:55:43 +0000
@@ -10870,8 +10870,6 @@
     {
       accessorExpr =
       generate_fn_body(BUILTIN_FUNC(OP_ZORBA_MULTI_ARRAY_LOOKUP_2), args, loc);
-
-      pop_scope();
     }
     else
     {
@@ -10879,6 +10877,8 @@
       generate_fn_body(BUILTIN_FUNC(OP_ZORBA_SINGLE_ARRAY_LOOKUP_2), args, loc);
     }
 
+    pop_scope();
+
     push_nodestack(accessorExpr);
 
     return;

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/member_05.xml.res'
=== added file 'test/rbkt/Queries/zorba/jsoniq/member_05.xq'
--- test/rbkt/Queries/zorba/jsoniq/member_05.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/member_05.xq	2013-09-12 09:55:43 +0000
@@ -0,0 +1,1 @@
+()[[1]][[1]]