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:
fix hof regressions caused by Sorin/Nicolai checkin in 11491

Requested reviews:
  Markos Zaharioudakis (markos-za)

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

fix hof regressions caused by Sorin/Nicolai checkin in 11491
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-06-11 09:43:21 +0000
+++ src/compiler/translator/translator.cpp	2013-06-11 11:21:56 +0000
@@ -12156,9 +12156,9 @@
   }
   case FunctionConsts::FN_FOLD_RIGHT_3:
   {
-    arguments[2] = CREATE(fo)(theRootSctx, theUDF, loc,
+    arguments[0] = CREATE(fo)(theRootSctx, theUDF, loc,
                               BUILTIN_FUNC(FN_REVERSE_1),
-                              arguments[2]);
+                              arguments[0]);
     break;
   }
   case FunctionConsts::FN_FOR_EACH_2:
@@ -12640,9 +12640,9 @@
       {
         flwor_expr* flworBody = CREATE(flwor)(theRootSctx, theUDF, loc);
 
-        let_clause* lc = wrap_in_letclause(foArgs[0]);
+        let_clause* lc = wrap_in_letclause(foArgs[1]);
         flworBody->add_clause(lc);
-        foArgs[0] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc->get_var());
+        foArgs[1] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc->get_var());
 
         flworBody->set_return_expr(generate_fn_body(f, foArgs, loc));
         body = flworBody;

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-06-11 12:27:33 +0000
+++ test/fots/CMakeLists.txt	2013-06-11 11:21:56 +0000
@@ -143,14 +143,6 @@
 EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 1187807)
 EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 1187807)
 EXPECTED_FOTS_FAILURE (fn-fold-left fold-left-009 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-005 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-006 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-007 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-014 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-015 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-016 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-017 1187685)
-EXPECTED_FOTS_FAILURE (fn-for-each-pair fn-for-each-pair-026 1187685)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60a 1167609)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60m 1167609)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60o 1167609)
@@ -160,9 +152,6 @@
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat83 1167641)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat87 1167641)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat88 1167641)
-EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-424 1187685)
-EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-426 1187685)
-EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-430 1187685)
 EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-062 1187685)
 EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-530 1188329)
 EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
@@ -295,9 +284,6 @@
 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-17 1160015)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-18 1160015)
 EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-062 1182910)
-EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-424 1182910)
-EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-426 1182910)
-EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-430 1182910)
 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 1188159)
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 1172258)
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 1172258)