Merge lp:~nbrinza/zorba/bugs2 into lp:zorba

[Nicolae Brinza]

Fixed the duration arithemtic bug.
Added missing testcases for HoF bugs.

Fixed the duration arithemtic bug.
Added missing testcases for HoF bugs.

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2012-09-28T08-24-10.715Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bugs2-2012-09-28T08-24-10.715Z is finished. The final
  status was:

  5 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2012-09-28T09-31-14.134Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bugs2-2012-09-28T09-31-14.134Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Matthias Brantner (matthias-brantner)]

Added Markos as a reviewer.

[Markos Zaharioudakis (markos-za)]

I approve, but I think more memory leaks of the kind fixed around xquery_parser.y:2506 exist. For example, the Expr rule has 2 "error" productions. deletes were added in one of them, but not the other.

Nicolae, can you open a bug (to yourself) to go through all of the error procuctions in the parser and fix the memory leaks, if any?

[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/bugs2-2012-09-29T04-24-59.058Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bugs2-2012-09-29T04-24-59.058Z is finished. The final status was:

All tests succeeded!

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-03-27T14-36-03.816Z/log.html

[Paul J. Lucas (paul-lucas)]

How can the constant for seconds_per_year be correct? It can't be a constant since its correct value is: 60 * 60 * 24 * (365 + is_leap(year))

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bugs2-2013-03-27T14-36-03.816Z is finished. The final
  status was:

  8 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Nicolae Brinza (nbrinza)]

It's a duration. It does not have a start/end date. So you cannot possibly know if you're in a leap year.

I've searched a bit, but I cannot find the spec where it says how to perform the duration normalization, but the code in Duration::normalize() assumes a year has 60 * 60 * 24 * 30 * 12 seconds.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-03-27T15-35-01.739Z/log.html

[Paul J. Lucas (paul-lucas)]

> It's a duration. It does not have a start/end date. So you cannot possibly
> know if you're in a leap year.

True, but the fact remains that having a constant for the number of seconds in a year is non-sensical for a duration.

> I've searched a bit, but I cannot find the spec where it says how to perform
> the duration normalization ...

Did you ask the W3C? Or file a bug against the spec?

> ... but the code in Duration::normalize() assumes a year has 60 * 60 * 24 * 30 * 12 seconds.

So? Where did that code come from? What makes you think that code is correct?

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bugs2-2013-03-27T15-35-01.739Z is finished. The final
  status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Nicolae Brinza (nbrinza)]

I've looked into it. It is not a spec issue, it's an implementation choice. The multiply/divide are only defined on the yearMonthDuration and dayTimeDuration data types. For both of these types, and for the purpose of multiplication/division, assuming a year has 60 * 60 * 24 * 30 * 12 seconds works perfectly.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-03-27T16-25-10.723Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bugs2-2013-03-27T16-25-10.723Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 3 Pending.

[Nicolae Brinza (nbrinza)]

review: Approve

[Paul J. Lucas (paul-lucas)]

When you throw FODT0002, you don't include either the value that's responsible for the error nor the location.

review: Needs Fixing

[Nicolae Brinza (nbrinza)]

I have added the location and the value.

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-01T21-56-14.821Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bugs2-2013-04-01T21-56-14.821Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 2 Pending.

[Chris Hillery (ceejatec)]

review: Approve

[Paul J. Lucas (paul-lucas)]

The TRY_XS_INT_CONVERT should probably be more like:

 #define TRY_XS_INT_CONVERT(target, value, xs_type) \
   { \
     XS_TYPE const res( value ); \
     try { \
       target = to_xs_int(res); \
     } catch (std::range_error const&) { \
       throw XQUERY_EXCEPTION(err::FODT0002, ERROR_PARAMS(res.toString())); \
     } \
   }

[Nicolae Brinza (nbrinza)]

No, I believe the construction of "res" and the conversion will be useless in the most common case where the error does not happen. But I've copy pasted your suggestion anyway.

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in test/fots/CMakeLists.txt

[Paul J. Lucas (paul-lucas)]

review: Approve

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-02T21-42-03.655Z/log.html

[Paul J. Lucas (paul-lucas)]

BTW: You don't have to keep creating new merge proposals every time you want to merge even when there are errors or merge conflicts. This way, you don't need to seek our approval multiple times. A single merge proposal is all you need.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bugs2-2013-04-02T21-42-03.655Z is finished. The final
  status was:

  5 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[lp:~nbrinza/zorba/bugs2]

11014. By Nicolae Brinza on 2013-04-03

date/time/durations castings now throw FODT0001 instead of FORG0001, as required by the 3.0 spec.

11015. By Nicolae Brinza on 2013-04-03

Merged with Zorba trunk

11016. By Nicolae Brinza on 2013-04-03

overflows in date/time casts now return FODT0001 and in durations return FODT0002.

11017. By Nicolae Brinza on 2013-04-03

Marked progressions and updated the Changelog

11018. By Nicolae Brinza on 2013-04-03

Merged with Zorba trunk

11019. By Nicolae Brinza on 2013-04-05

Fixed failing tests.

11020. By Nicolae Brinza on 2013-04-05

Merged with Zorba trunk

11021. By Nicolae Brinza on 2013-04-05

Marked more progressions

11022. By Nicolae Brinza on 2013-04-06

Marked more progressions

11023. By Nicolae Brinza on 2013-04-08

More datetime/duration fixes.

11024. By Nicolae Brinza on 2013-04-08

Fixed regressions

11025. By Nicolae Brinza on 2013-04-10

Merged with Zorba trunk

11026. By Nicolae Brinza on 2013-04-23

Merged with Zorba trunk

11027. By Nicolae Brinza on 2013-04-23

Added W3C bug reference in disputed bugs

11028. By Nicolae Brinza on 2013-04-23

Added DISPUTED to the tests that pend on W3C bugs

11029. By Nicolae Brinza on 2013-04-25

Merged with Zorba trunk

11030. By Nicolae Brinza on 2013-04-25

Merged with the fix_bug_1167641 branch

Unmerged revisions

11030. By Nicolae Brinza on 2013-04-25

Merged with the fix_bug_1167641 branch

11029. By Nicolae Brinza on 2013-04-25

Merged with Zorba trunk

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2013-04-01 02:22:49 +0000
+++ src/diagnostics/diagnostic_en.xml	2013-04-03 03:34:23 +0000
@@ -1355,7 +1355,7 @@
       <comment>
        Overflow/underflow in duration operation.
       </comment>
-      <value>overflow/underflow in duration operation</value>
+      <value>overflow/underflow in duration operation${: 1}</value>
     </diagnostic>
 
     <diagnostic code="FODT0003">

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2013-04-01 02:22:49 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2013-04-03 03:34:23 +0000
@@ -50,7 +50,7 @@
   { "FODF1280", "\"$1\": invalid decimal format name for fn:format-number()" },
   { "FODF1310", "\"$1\": invalid picture string for decimal/integer${: 2}" },
   { "FODT0001", "overflow/underflow in date/time operation" },
-  { "FODT0002", "overflow/underflow in duration operation" },
+  { "FODT0002", "overflow/underflow in duration operation${: 1}" },
   { "FODT0003", "\"$1\": invalid timezone value (in seconds)" },
   { "FOER0000", "unidentifier error" },
   { "FOFD1340", "\"$1\": invalid picture string for date/time${: 2}" },

=== modified file 'src/runtime/core/arithmetic_impl.cpp'
--- src/runtime/core/arithmetic_impl.cpp	2013-03-20 19:12:54 +0000
+++ src/runtime/core/arithmetic_impl.cpp	2013-04-03 03:34:23 +0000
@@ -596,8 +596,12 @@
     throw XQUERY_EXCEPTION( err::FODT0002, ERROR_LOC( loc ) );
   else if (i1->getDoubleValue().isNaN())
     throw XQUERY_EXCEPTION( err::FOCA0005, ERROR_LOC( loc ) );
-  else
+  else try {
     d.reset(i0->getYearMonthDurationValue() * (i1->getDoubleValue()));
+  } catch (XQueryException& e) {
+    set_source(e, *loc);
+    throw;
+  }
   
   return GENV_ITEMFACTORY->createYearMonthDuration(result, d.get());
 }
@@ -618,8 +622,12 @@
     throw XQUERY_EXCEPTION( err::FODT0002, ERROR_LOC( loc ) );
   else if (i1->getDoubleValue().isNaN())
     throw XQUERY_EXCEPTION( err::FOCA0005, ERROR_LOC( loc ) );
-  else
+  else try {
     d.reset(i0->getDayTimeDurationValue() * (i1->getDoubleValue()));
+  } catch (XQueryException& e) {
+    set_source(e, *loc);
+    throw;
+  }
   
   return GENV_ITEMFACTORY->createDayTimeDuration(result, d.get());
 }
@@ -674,8 +682,12 @@
     throw XQUERY_EXCEPTION( err::FODT0002, ERROR_LOC( loc ) );
   else if ( i1->getDoubleValue().isNaN() )
     throw XQUERY_EXCEPTION( err::FOCA0005, ERROR_LOC( loc ) );
-  else
+  else try {
     d = std::auto_ptr<Duration>(i0->getYearMonthDurationValue() / i1->getDoubleValue());
+  } catch (XQueryException& e) {
+    set_source(e, *loc);
+    throw;
+  }
 
   return GENV_ITEMFACTORY->createYearMonthDuration(result, d.get());
 }
@@ -700,8 +712,12 @@
     throw XQUERY_EXCEPTION( err::FODT0002, ERROR_LOC( loc ) );
   else if ( i1->getDoubleValue().isNaN() )
     throw XQUERY_EXCEPTION( err::FOCA0005, ERROR_LOC( loc ) );
-  else
+  else try {
     d.reset(i0->getDayTimeDurationValue() / i1->getDoubleValue());
+  } catch (XQueryException& e) {
+    set_source(e, *loc);
+    throw;
+  }
 
   return GENV_ITEMFACTORY->createDayTimeDuration(result, d.get());
 }

=== modified file 'src/zorbatypes/datetime/duration.cpp'
--- src/zorbatypes/datetime/duration.cpp	2013-03-11 15:00:50 +0000
+++ src/zorbatypes/datetime/duration.cpp	2013-04-03 03:34:23 +0000
@@ -41,6 +41,7 @@
   0, 12, 30, 24, 60, 60, Duration::FRAC_SECONDS_UPPER_LIMIT
 };
 
+static const long seconds_per_year = 60 * 60 * 24 * 30 * 12;
 
 /******************************************************************************
   Parse a 'nS' string, with fractional seconds, returns 0 on success and a
@@ -725,12 +726,24 @@
 }
 
 
+#define TRY_XS_INT_CONVERT(target, value, xs_type)                         \
+  {                                                                        \
+    xs_type const res(value);                                              \
+    try {                                                                  \
+      target = to_xs_int(res);                                             \
+    } catch (std::range_error const&) {                                    \
+      throw XQUERY_EXCEPTION(err::FODT0002, ERROR_PARAMS(res.toString())); \
+    }                                                                      \
+  }
+
 Duration* Duration::operator*(const xs_double& value) const
 {
   xs_double result;
-  xs_double dSeconds;
+  xs_integer totalSeconds;
+  int32_t years;
   int32_t seconds;
   int32_t frac_seconds;
+  bool negative = false;
 
   if (facet == DURATION_FACET)
   {
@@ -738,19 +751,26 @@
     return NULL;
   }
 
-  Integer significants = Integer(FRAC_SECONDS_UPPER_LIMIT);
-
   try {
     result = getTotalSeconds() * value;
-    result = result.round(significants);
-    seconds = to_xs_int(result.floor());
-    result = (result - result.floor()) * FRAC_SECONDS_UPPER_LIMIT;
-    frac_seconds = to_xs_int(result.round());
-  } catch ( std::range_error const& ) {
+  } catch (std::range_error const&) {
     throw XQUERY_EXCEPTION(err::FODT0002);
   }
 
-  Duration* d = new Duration(facet, seconds<0, 0, 0, 0, 0, 0, seconds, frac_seconds);
+  if (result < 0)
+  {
+    negative = true;
+    result = -result;
+  }
+  result = result.round(Integer(FRAC_SECONDS_UPPER_LIMIT));
+  totalSeconds = result.floor();
+  result = (result - result.floor()) * FRAC_SECONDS_UPPER_LIMIT;
+
+  TRY_XS_INT_CONVERT(years, totalSeconds / seconds_per_year, xs_integer);
+  TRY_XS_INT_CONVERT(seconds, totalSeconds % seconds_per_year, xs_integer);
+  TRY_XS_INT_CONVERT(frac_seconds, result.round(), xs_double);
+
+  Duration* d = new Duration(facet, negative, years, 0, 0, 0, 0, seconds, frac_seconds);
   return d;
 }
 
@@ -758,9 +778,11 @@
 Duration* Duration::operator/(const xs_double& value) const
 {
   xs_double result;
-  xs_double dSeconds;
+  xs_integer totalSeconds;
+  int32_t years;
   int32_t seconds;
   int32_t frac_seconds;
+  bool negative = false;
 
   if (facet == DURATION_FACET)
   {
@@ -768,23 +790,31 @@
     return NULL;
   }
 
-  Integer significants = Integer(FRAC_SECONDS_UPPER_LIMIT);
-
   try {
     result = getTotalSeconds() / value;
-    result = result.round(significants);
-    dSeconds = result.round();
-    seconds = to_xs_int(dSeconds.floor());
-    result = (result - dSeconds) * FRAC_SECONDS_UPPER_LIMIT;
-    frac_seconds = to_xs_int(result.round());
-  } catch ( std::range_error const& ) {
+  } catch (std::range_error const&) {
     throw XQUERY_EXCEPTION(err::FODT0002);
   }
 
-  Duration* d = new Duration(facet, seconds<0, 0, 0, 0, 0, 0, seconds, frac_seconds);
+  if (result < 0)
+  {
+    negative = true;
+    result = -result;
+  }
+  result = result.round(Integer(FRAC_SECONDS_UPPER_LIMIT));
+  totalSeconds = result.floor();
+  result = (result - result.floor()) * FRAC_SECONDS_UPPER_LIMIT;
+
+  TRY_XS_INT_CONVERT(years, totalSeconds / seconds_per_year, xs_integer);
+  TRY_XS_INT_CONVERT(seconds, totalSeconds % seconds_per_year, xs_integer);
+  TRY_XS_INT_CONVERT(frac_seconds, result.round(), xs_double);
+
+  Duration* d = new Duration(facet, negative, years, 0, 0, 0, 0, seconds, frac_seconds);
   return d;
 }
 
+#undef TRY_XS_INT_CONVERT
+
 
 Decimal Duration::operator/(const Duration& d) const
 {

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-02 18:29:15 +0000
+++ test/fots/CMakeLists.txt	2013-04-03 03:34:23 +0000
@@ -133,8 +133,6 @@
 EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-002 0)
 EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-003 0)
 EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0)
-EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-002 0)
-EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-003 0)
 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-36 0)
 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-37 0)
 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-38 0)
@@ -144,15 +142,12 @@
 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-005 0)
 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-006 0)
 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-007 0)
-EXPECTED_FOTS_FAILURE (fn-format-date format-date-005 0)
-EXPECTED_FOTS_FAILURE (fn-format-date format-date-006 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en126 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en127 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en128 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en132 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en133 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en134 0)
-EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-005 0)
 EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-006 0)
 EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-011 0)
 EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-044 1162631)
@@ -286,12 +281,8 @@
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0001-8 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0001-9 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0002-1 0)
-EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0002-2 0)
-EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0002-3 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0002-4 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0002-6 0)
-EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0002-7 0)
-EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0002-8 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FODT0002-9 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0046_13 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0046_14 0)
@@ -321,11 +312,9 @@
 EXPECTED_FOTS_FAILURE (op-date-greater-than cbcl-date-le-001 0)
 EXPECTED_FOTS_FAILURE (op-date-less-than cbcl-date-ge-001 0)
 EXPECTED_FOTS_FAILURE (op-date-less-than cbcl-date-lt-001 0)
-EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration cbcl-divide-dayTimeDuration-003 0)
 EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-001 0)
 EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-002 0)
 EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-003 0)
-EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration cbcl-divide-yearMonthDuration-003 0)
 EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration-by-yearMonthDuration cbcl-divide-yearMonthDuration-by-yearMonthDuration-001 0)
 EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0)
 EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0)

=== renamed file 'test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-101.res' => 'test/rbkt/ExpQueryResults/zorba/HigherOrder/combinator-02.xml.res'
--- test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-101.res	2013-02-07 17:24:36 +0000
+++ test/rbkt/ExpQueryResults/zorba/HigherOrder/combinator-02.xml.res	2013-04-03 03:34:23 +0000
@@ -1,1 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
[phone] 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 -1

=== added file 'test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-101.xml.res'
--- test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-101.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-101.xml.res	2013-04-03 03:34:23 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+Message: This is a test.

=== added file 'test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-104.xml.res'
--- test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-104.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-104.xml.res	2013-04-03 03:34:23 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+wbua

=== added file 'test/rbkt/Queries/zorba/HigherOrder/combinator-01.spec'
--- test/rbkt/Queries/zorba/HigherOrder/combinator-01.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/combinator-01.spec	2013-04-03 03:34:23 +0000
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZXQP0003
\ No newline at end of file

=== added file 'test/rbkt/Queries/zorba/HigherOrder/combinator-01.xq'
--- test/rbkt/Queries/zorba/HigherOrder/combinator-01.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/combinator-01.xq	2013-04-03 03:34:23 +0000
@@ -0,0 +1,7 @@
+(: Infinite Y combinator test -- should cause a stack overflow :)
+
+declare function local:Y($f) {
+ function($a) { $f(local:Y($f), $a) }
+};
+
+local:Y(function($f, $a) { $a, $f($a + 1) })(1)

=== renamed file 'test/rbkt/Queries/zorba/HigherOrder/hof-101.xq' => 'test/rbkt/Queries/zorba/HigherOrder/combinator-02.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-101.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/combinator-02.xq	2013-04-03 03:34:23 +0000
@@ -1,10 +1,7 @@
-xquery version "3.0";
-
-declare namespace o = "http://www.zorba-xquery.com/options/features";
-declare option o:enable "hof";
+(: Y combinator test :)
 
 declare function local:Y($f) {
 function($a) { $f(local:Y($f), $a) }
 };
 
-local:Y(function($f, $a) { $a, $f($a + 1) })(1)
+local:Y(function($f, $a) { $a, if ($a < 500) then $f($a + 1) else -1 })(1)

=== added file 'test/rbkt/Queries/zorba/HigherOrder/hof-101.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-101.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-101.xq	2013-04-03 03:34:23 +0000
@@ -0,0 +1,27 @@
+declare namespace an = "http://www.zorba-xquery.com/annotations";
+
+declare %private variable $handlers := ();
+
+declare %an:sequential function local:add($handler)
+{
+  $handlers := ($handlers, $handler);
+};
+
+declare function local:emit($message)
+{
+  for $h in $handlers
+  return $h($message)
+};
+
+declare function local:handle($message)
+{
+  ("Message:", $message)
+};
+
+declare %an:sequential function local:test($message)
+{
+  local:add(local:handle#1);
+  local:emit($message)
+};
+
+local:test("This is a test.")

=== added file 'test/rbkt/Queries/zorba/HigherOrder/hof-104.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-104.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-104.xq	2013-04-03 03:34:23 +0000
@@ -0,0 +1,9 @@
+(: Higher order function as a prolog variable :)
+
+declare variable $func := function($x){translate($x, "abcdefghijklmnopqrstuvwxyz", "nopqrstuvwxyzabcdefghijklm")};
+
+declare function local:scramble($x as function(xs:string) as xs:string, $y as xs:string) as xs:string {
+  $x($y)
+};
+
+local:scramble($func, "john")

=== added file 'test/rbkt/Queries/zorba/HigherOrder/hof-105.spec'
--- test/rbkt/Queries/zorba/HigherOrder/hof-105.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-105.spec	2013-04-03 03:34:23 +0000
@@ -0,0 +1,1 @@
+Error: http://www.w3.org/2005/xqt-errors:SENR0001
\ No newline at end of file

=== added file 'test/rbkt/Queries/zorba/HigherOrder/hof-105.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-105.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-105.xq	2013-04-03 03:34:23 +0000
@@ -0,0 +1,3 @@
+function($a,$b){
+  function($a1,$b1){ $a1($b1) }
+}(function($a2){$a2}, "test")