Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

[Markos Zaharioudakis]

Fixed bug in computing the static type of an allowing-empty FOR variable.

Fixed bug in computing the static type of an allowing-empty FOR variable.

[lp:~zorba-coders/zorba/markos-scratch]

11014. By Markos Zaharioudakis on 2013-02-08

Fixed bug in computing the static type of an allowing-empty FOR variable.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-02-08T12-42-35.017Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-02-08T12-42-35.017Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-02-03 17:44:39 +0000
+++ ChangeLog	2013-02-08 12:29:23 +0000
@@ -10,27 +10,17 @@
   * Added millis-to-dateTime() function in datetime module.
 
 Optimizations:
-  * Extended optimization rules for subsequence function (pushing $startingLoc 
-    parameter into collection skip if $sourceSeq parameter is from a 
+  * Extended optimization rules for subsequence function (pushing $startingLoc
+    parameter into collection skip if $sourceSeq parameter is from a
     collection).
 
 Bug Fixes/Other Changes:
   * Fixed bug #1095889 (Improve error message for xml-parsing error).
   * NaN items are considered equal to each other during grouping
   * Fixed bug #855481 (Too small time types on Windows).
-
-
-version 2.9
-
-Bug Fixes/Other Changes:
+  * Fixed bug in computing the static type of an allowing-empty FOR variable.
   * Fixed bug #1099648 and #1088886 (XML parsing failures on Red Hat)
   * Fixed bug #1099535  (xml:parse endless loop)
-
-
-
-version 2.9
-
-Bug Fixes/Other Changes:
   * Fixed bug #866958  (Parsing error not explicit enough)
 
 

=== modified file 'src/compiler/expression/expr_type.cpp'
--- src/compiler/expression/expr_type.cpp	2013-01-29 06:01:31 +0000
+++ src/compiler/expression/expr_type.cpp	2013-02-08 12:29:23 +0000
@@ -194,6 +194,11 @@
       if (varKind == var_expr::for_var)
       {
         derivedType = TypeOps::prime_type(tm, *domainType);
+
+        if (e->get_forlet_clause()->is_allowing_empty())
+        {
+          derivedType = tm->create_type(*derivedType, TypeConstants::QUANT_QUESTION);
+        }
       }
       else if (varKind == var_expr::wincond_in_var ||
                varKind == var_expr::wincond_out_var)

=== added file 'test/rbkt/ExpQueryResults/zorba/gflwor/gflwor06.xml.res'
--- test/rbkt/ExpQueryResults/zorba/gflwor/gflwor06.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/gflwor/gflwor06.xml.res	2013-02-08 12:29:23 +0000
@@ -0,0 +1,1 @@
+0

=== added file 'test/rbkt/Queries/zorba/gflwor/gflwor06.xq'
--- test/rbkt/Queries/zorba/gflwor/gflwor06.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/gflwor/gflwor06.xq	2013-02-08 12:29:23 +0000
@@ -0,0 +1,4 @@
+declare variable $doc := <a/>;
+
+for $x allowing empty in $doc/foo
+return count($x)