[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_8 into lp:zorba

2013-05-08 Thread Sorin Marian Nasoi
Sorin Marian Nasoi has proposed merging 
lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_8 into lp:zorba.

Commit message:
- bumped FOTS snapshot to May 8th
- updated DISPUTED test-cases

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_8/+merge/162936
-- 
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_8/+merge/162936
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-05-06 22:58:11 +
+++ test/fots/CMakeLists.txt	2013-05-08 07:22:26 +
@@ -117,9 +117,6 @@
 
 #disputed tests. These test are run but marked as 'pass' by FOTS driver.
 #All these entries should have a *valid* opened bug number from W3C bugzilla.
-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-integer format-integer-044 21448)
-EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy20 21619)
-EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy21 21619)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-001 21568)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-003 21568)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-005 21568)
@@ -145,6 +142,7 @@
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-032 21868)
 EXPECTED_FOTS_FAILURE (DISPUTED fn-id K2-SeqIDFunc-11 21414)
 EXPECTED_FOTS_FAILURE (DISPUTED fn-id K2-SeqIDFunc-12 21414)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDecl.external K2-ExternalVariablesWith-22 21960)
 
 # Next three possibly unique to old RQ machine, but they need to be
 # marked for the RQ to pass.
@@ -165,6 +163,7 @@
 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-dateTime format-dateTime-006 0)
+EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-044 21448)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat41 1167427)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat42 1167427)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60a 1167609)
@@ -342,7 +341,6 @@
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-104 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-105 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-106 0)
-EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWith-22 0)
 EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)
 EXPECTED_FOTS_FAILURE (prod-VersionDecl version_declaration-023-v3 0)
 EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-002 0)

=== modified file 'test/fots/ImportFOTS.cmake'
--- test/fots/ImportFOTS.cmake	2013-05-03 00:29:00 +
+++ test/fots/ImportFOTS.cmake	2013-05-08 07:22:26 +
@@ -19,7 +19,7 @@
 
 
 # Change this to publish updated FOTS archives
-SET (FOTS_ARCHIVE FOTS_020513.tgz)
+SET (FOTS_ARCHIVE FOTS_080513.tgz)
 
 # Change this to modify which elements in FOTS driver results are output
 # as CDATA

=== modified file 'test/fots_driver/W3C_submission_template.xml'
--- test/fots_driver/W3C_submission_template.xml	2013-05-01 22:25:33 +
+++ test/fots_driver/W3C_submission_template.xml	2013-05-08 07:22:26 +
@@ -3,14 +3,14 @@
 created  by=Sorin Nasoi
   email=sorin.marian.nasoi_at_gmail.com
   organization=FLWOR Foundation
-  on=2013-04-01/
+  on=2013-05-08/
 test-run test-suite-version=CVS
-  date-run=2013-04-01/
+  date-run=2013-05-08/
 notes/
   /submission
   product  vendor=FLWOR Foundation
-name=Zorba_11424
-version=11424
+name=Zorba
+version=11439
 released=false
 open-source=true
 language=XQ30/

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_8 into lp:zorba

2013-05-08 Thread Sorin Marian Nasoi
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_8/+merge/162936
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_8 into lp:zorba

2013-05-08 Thread Sorin Marian Nasoi
The proposal to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_8 into 
lp:zorba has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_8/+merge/162936
-- 
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_8/+merge/162936
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_8 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bump_FOTS_snapshot_May_8-2013-05-08T07-22-44.89Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_8/+merge/162936
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_8 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue job bump_FOTS_snapshot_May_8-2013-05-08T07-22-44.89Z is 
finished. The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_8/+merge/162936
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_8 into lp:zorba

2013-05-08 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_8 into 
lp:zorba has been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_8/+merge/162936
-- 
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_8/+merge/162936
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/import-cycles into lp:zorba

2013-05-08 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
-- 
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/import-cycles into lp:zorba

2013-05-08 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/import-cycles 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 import-cycles-2013-05-08T08-12-57.851Z is finished.
  The final status was:

  

  3 tests did not succeed - changes not commited.


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

-- 
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/import-cycles into lp:zorba

2013-05-08 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
-- 
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/import-cycles into lp:zorba

2013-05-08 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
-- 
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/import-cycles into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/import-cycles-2013-05-08T09-46-09.344Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/import-cycles into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue job import-cycles-2013-05-08T09-46-09.344Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/import-cycles into lp:zorba

2013-05-08 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has 
been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
-- 
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~zorba-coders/zorba/bug-1176038 into 
lp:zorba.

Commit message:
Fixed a bug in the parser that was revealed by bison 2.7 + #include clean-up

Requested reviews:
  Nicolae Brinza (nbrinza)
  Paul J. Lucas (paul-lucas)
Related bugs:
  Bug #1176038 in Zorba: pointer being freed was not allocated
  https://bugs.launchpad.net/zorba/+bug/1176038

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953

Fixed a bug in the parser that was revealed by bison 2.7 + #include clean-up
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2013-05-08 03:22:27 +
+++ ChangeLog	2013-05-08 10:58:45 +
@@ -1,5 +1,15 @@
 Zorba - The XQuery Processor
 
+version 3.x
+
+New Features:
+
+Optimizations:
+
+Bug Fixes/Other Changes:
+  * Fixed bug #1176038 (memory error in parser revealed by Bison 2.7)
+
+
 version 2.9
 
 New Features:

=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2013-05-08 03:19:57 +
+++ src/api/dynamiccontextimpl.cpp	2013-05-08 10:58:45 +
@@ -27,6 +27,7 @@
 #include types/typemanager.h
 #include types/root_typemanager.h
 #include types/schema/validate.h
+#include zorbatypes/integer.h
 
 #include api/unmarshaller.h
 #include api/zorbaimpl.h

=== modified file 'src/api/item.cpp'
--- src/api/item.cpp	2013-02-26 04:12:43 +
+++ src/api/item.cpp	2013-05-08 10:58:45 +
@@ -38,7 +38,9 @@
 #include store/api/iterator.h
 #include store/api/collection.h
 
-#include zorbatypes/numconversions.h
+#include zorbatypes/floatimpl.h
+#include zorbatypes/integer.h
+#include zorbatypes/numconversions.h
 
 namespace zorba {
 

=== modified file 'src/api/itemfactoryimpl.cpp'
--- src/api/itemfactoryimpl.cpp	2013-03-27 03:30:14 +
+++ src/api/itemfactoryimpl.cpp	2013-05-08 10:58:45 +
@@ -25,14 +25,17 @@
 
 #include api/itemfactoryimpl.h
 
-#include zorbatypes/duration.h
+#include zorbatypes/decimal.h
+#include zorbatypes/floatimpl.h
+#include zorbatypes/integer.h
+#include zorbatypes/schema_types.h
 
 #include system/globalenv.h
 
+#include store/api/copymode.h
+#include store/api/item.h
 #include store/api/item_factory.h
 #include store/api/store.h
-#include store/api/copymode.h
-#include store/api/item.h
 
 #include api/unmarshaller.h
 

=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp	2013-04-25 02:05:20 +
+++ src/api/serialization/serializer.cpp	2013-05-08 10:58:45 +
@@ -39,6 +39,7 @@
 
 #include system/globalenv.h
 #include zorbamisc/ns_consts.h
+#include zorbatypes/integer.h
 #include zorbatypes/numconversions.h
 
 #include store/api/iterator.h

=== modified file 'src/capi/csequence.cpp'
--- src/capi/csequence.cpp	2013-02-07 17:24:36 +
+++ src/capi/csequence.cpp	2013-05-08 10:58:45 +
@@ -18,16 +18,17 @@
 #include capi/csequence.h
 
 #include cassert
-#include string.h
+#include cstring
 
 #include zorba/zorba.h
 #include zorba/diagnostic_list.h
 #include zorba/iterator.h
 #include zorba/store_consts.h
-#include zorbamisc/ns_consts.h
-#include zorbatypes/numconversions.h
 
 #include util/string_util.h
+#include zorbamisc/ns_consts.h
+#include zorbatypes/floatimpl.h
+#include zorbatypes/numconversions.h
 
 #include error.h
 

=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp	2013-03-07 10:10:10 +
+++ src/compiler/expression/expr.cpp	2013-05-08 10:58:45 +
@@ -49,6 +49,9 @@
 
 #include store/api/store.h
 #include store/api/item_factory.h
+#include zorbatypes/decimal.h
+#include zorbatypes/floatimpl.h
+#include zorbatypes/integer.h
 
 
 namespace zorba

=== modified file 'src/compiler/expression/expr_manager.cpp'
--- src/compiler/expression/expr_manager.cpp	2013-04-16 20:06:08 +
+++ src/compiler/expression/expr_manager.cpp	2013-05-08 10:58:45 +
@@ -15,22 +15,24 @@
  */
 
 #include stdafx.h
+
+#include zorbatypes/decimal.h
+#include zorbatypes/integer.h
+
+#include expr.h
 #include expr_manager.h
-
-#include mem_manager.h
-
-#include expr.h
-#include ftnode.h
-#include var_expr.h
 #include flwor_expr.h
 #include fo_expr.h
 #include ft_expr.h
+#include ftnode.h
 #include function_item_expr.h
+#include json_exprs.h
+#include mem_manager.h
 #include path_expr.h
+#include pragma.h
 #include script_exprs.h
 #include update_exprs.h
-#include json_exprs.h
-#include pragma.h
+#include var_expr.h
 
 namespace zorba
 {

=== modified file 'src/compiler/parser/symbol_table.cpp'
--- src/compiler/parser/symbol_table.cpp	2013-03-25 19:47:18 +
+++ src/compiler/parser/symbol_table.cpp	2013-05-08 10:58:45 +
@@ -15,6 +15,9 @@
  */
 #include stdafx.h
 
+#include zorbatypes/decimal.h
+#include zorbatypes/floatimpl.h
+#include zorbatypes/integer.h
 #include zorbatypes/numconversions.h
 
 #include compiler/parser/symbol_table.h

=== modified file 

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
The proposal to merge lp:~zorba-coders/zorba/bug-1176038 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1176038-2013-05-08T10-59-08.787Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
The proposal to merge lp:~zorba-coders/zorba/bug-1176038 into lp:zorba has been 
updated.

Commit Message changed to:

Fixed a bug in the parser that was revealed by bison 2.7 + #include clean-up

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/bug-1176038 into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/bug-1176038 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 bug-1176038-2013-05-08T10-59-08.787Z 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

-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1176038-2013-05-08T11-41-52.814Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
The proposal to merge lp:~zorba-coders/zorba/bug-1176038 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1, 
Needs Fixing  1, Pending  1, Needs Information  1, Resubmit  1. Got: 1 
Approve, 1 Pending.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/bug-1176038 into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Paul J. Lucas
Review: Needs Fixing

There are many, many warnings like:

/Users/pjl/src/flwor/zorba/repo/bug-1176038/zorba/build/src/compiler/parser/jsoniq_scanner.l:513:1:
 warning: comparison between signed and unsigned integer expressions 
[-Wsign-compare]
/Users/pjl/src/flwor/zorba/repo/bug-1176038/zorba/build/src/compiler/parser/xquery_scanner.l:659:1:
 warning: comparison between signed and unsigned integer expressions 
[-Wsign-compare]
/Users/pjl/src/flwor/zorba/repo/bug-1176038/zorba/build/src/compiler/parser/jsoniq_scanner.l:514:1:
 warning: comparison between signed and unsigned integer expressions 
[-Wsign-compare]
/Users/pjl/src/flwor/zorba/repo/bug-1176038/zorba/build/src/compiler/parser/xquery_scanner.l:659:1:
 warning: comparison between signed and unsigned integer expressions 
[-Wsign-compare]
/Users/pjl/src/flwor/zorba/repo/bug-1176038/zorba/build/src/compiler/parser/xquery_scanner.l:661:1:
 warning: comparison between signed and unsigned integer expressions 
[-Wsign-compare]
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
I get absolutely no warnings whatsoever in the scanner, and neither does the 
remote queue, e.g. 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1176038-2013-05-08T11-41-52.814Z/ctest.txt
 . If you get them with your compiler, can't you fix them?
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Paul J. Lucas
You probably don't get the warnings because the RQ isn't running the same 
version(s) of flex/bison/g++.

I don't recall all those warnings being there before, so it's not clear to me 
why I should be the one to take my time to fix them.  It's also not easy 
because the line numbers given in the warnings are wrong.  They're probably 
wrong because of the way in which the scanner is built.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Paul J. Lucas
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1083006 into 
lp:zorba.

Commit message:
Fixed for large sequences.

Requested reviews:
  Paul J. Lucas (paul-lucas)
Related bugs:
  Bug #1083006 in Zorba: subsequence: large input values
  https://bugs.launchpad.net/zorba/+bug/1083006

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983

Fixed for large sequences.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp	2013-05-01 23:06:33 +
+++ src/runtime/sequences/sequences_impl.cpp	2013-05-08 14:17:27 +
@@ -470,9 +470,8 @@
 
 bool FnSubsequenceIterator::nextImpl(store::Item_t result, PlanState planState) const
 {
-  store::Item_t startPosItem;
+  store::Item_t item;
   xs_long startPos;
-  store::Item_t lengthItem;
   xs_double startPosDouble; 
   xs_double lengthDouble;
 
@@ -481,8 +480,8 @@
 
   state-theIsChildReset = false;
   
-  CONSUME(startPosItem, 1);
-  startPosDouble = startPosItem-getDoubleValue();
+  CONSUME(item, 1);
+  startPosDouble = item-getDoubleValue();
 
   //If starting position is set to +INF return empty sequence
   if (startPosDouble.isPosInf() || startPosDouble.isNaN())
@@ -494,26 +493,37 @@
 
   if (theChildren.size() == 3)
   {
-CONSUME(lengthItem, 2);
-lengthDouble = lengthItem-getDoubleValue();
-if (lengthDouble.isPosInf())
-{
-  //if startPos is -INF and length is +INF return empty sequence because -INF + INF = NaN
-  if (startPosDouble.isNegInf())
+CONSUME(item, 2);
+lengthDouble = item-getDoubleValue();
+if ( lengthDouble.isPosInf() ) {
+  if ( startPosDouble.isNegInf() ) {
+//
+// XQuery F0 3.0 14.1.9: ... if $startingLoc is -INF and $length is
+// +INF, then fn:round($startingLoc) + fn:round($length) is NaN; since
+// position() lt NaN is always false, the result is an empty sequence.
+//
 goto done;
+  }
 
   state-theRemaining = 1;
 }
 else
+{
   state-theRemaining =
 static_castxs_long(lengthDouble.round().getNumber());
+  if ( state-theRemaining  0  lengthDouble  0 ) {
+// overflow happened
+state-theRemaining = numeric_limitsxs_long::max();
+  }
+}
   }
 
   if (startPos  1)
   {
-if (theChildren.size() = 3)
+if ( theChildren.size() == 3 
+ state-theRemaining != numeric_limitsxs_long::max() ) {
   state-theRemaining += startPos - 1;
-
+}
 startPos = 0;
   }
 

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
I have the 2.7 bison and the 2.5.35 which are the same as you have and yet I do 
not get the warnings. I do have a different gcc -- 4.7, but I'm not really sure 
how to downgrade it to 4.2 which is what you have -- gcc version 4.2.1 (Based 
on Apple Inc. build 5658) (LLVM build 2336.11.00). And that seems to be a 
customized Mac gcc anyway. It is really weird they've bothered to update their 
Bison to 2.7 when no one else did, yet they're stuck with a 6-years old GCC. 

I did not say you should fix them, I asked if you could. That's because you're 
the only one getting them. The locations are correct relative to the generated 
.l files (e.g. build/src/compiler/parser/jsoniq_scanner.l). It is not difficult 
to trace back the line in the scanner.l file. 
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Paul J. Lucas
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
The 2.5.35 version is that of flex. Your flex is 2.5.35 as well, but again it 
seems to be a customized Apple branch -- flex 2.5.35 Apple(flex-31). 
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1083006-2013-05-08T14-22-44.359Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1, 
Needs Fixing  1, Pending  1, Needs Information  1, Resubmit  1. Got: 1 
Approve.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/bug-1083006 into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Paul J. Lucas
Review: Approve

Approved for now, warnings and all. A separate bug could be opened to address 
the warnings.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
Nicolae Brinza has proposed merging lp:~zorba-coders/zorba/bug-1176038 into 
lp:zorba.

Commit message:
Fixed a bug in the parser that was revealed by bison 2.7 + #include clean-up

Requested reviews:
  Paul J. Lucas (paul-lucas)
  Nicolae Brinza (nbrinza)
Related bugs:
  Bug #1176038 in Zorba: pointer being freed was not allocated
  https://bugs.launchpad.net/zorba/+bug/1176038

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996

Fixed a bug in the parser that was revealed by bison 2.7 + #include clean-up
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2013-05-08 03:22:27 +
+++ ChangeLog	2013-05-08 15:44:31 +
@@ -45,6 +45,7 @@
   * Extented index join  rule to general flwor expressions. 
 
 Bug Fixes/Other Changes:
+  * Fixed bug #1176038 (memory error in parser revealed by Bison 2.7)
   * Fixed bug #1102997 (Swapping referenced nodes)
   * Fixed bug #1169908 (Zorba hangs with invalid utf-8 input)
   * Fixed bug #487 (Swapping nodes that are in collections)

=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2013-05-08 03:19:57 +
+++ src/api/dynamiccontextimpl.cpp	2013-05-08 15:44:31 +
@@ -27,6 +27,7 @@
 #include types/typemanager.h
 #include types/root_typemanager.h
 #include types/schema/validate.h
+#include zorbatypes/integer.h
 
 #include api/unmarshaller.h
 #include api/zorbaimpl.h

=== modified file 'src/api/item.cpp'
--- src/api/item.cpp	2013-02-26 04:12:43 +
+++ src/api/item.cpp	2013-05-08 15:44:31 +
@@ -38,7 +38,9 @@
 #include store/api/iterator.h
 #include store/api/collection.h
 
-#include zorbatypes/numconversions.h
+#include zorbatypes/floatimpl.h
+#include zorbatypes/integer.h
+#include zorbatypes/numconversions.h
 
 namespace zorba {
 

=== modified file 'src/api/itemfactoryimpl.cpp'
--- src/api/itemfactoryimpl.cpp	2013-03-27 03:30:14 +
+++ src/api/itemfactoryimpl.cpp	2013-05-08 15:44:31 +
@@ -25,14 +25,17 @@
 
 #include api/itemfactoryimpl.h
 
-#include zorbatypes/duration.h
+#include zorbatypes/decimal.h
+#include zorbatypes/floatimpl.h
+#include zorbatypes/integer.h
+#include zorbatypes/schema_types.h
 
 #include system/globalenv.h
 
+#include store/api/copymode.h
+#include store/api/item.h
 #include store/api/item_factory.h
 #include store/api/store.h
-#include store/api/copymode.h
-#include store/api/item.h
 
 #include api/unmarshaller.h
 

=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp	2013-04-25 02:05:20 +
+++ src/api/serialization/serializer.cpp	2013-05-08 15:44:31 +
@@ -39,6 +39,7 @@
 
 #include system/globalenv.h
 #include zorbamisc/ns_consts.h
+#include zorbatypes/integer.h
 #include zorbatypes/numconversions.h
 
 #include store/api/iterator.h

=== modified file 'src/capi/csequence.cpp'
--- src/capi/csequence.cpp	2013-02-07 17:24:36 +
+++ src/capi/csequence.cpp	2013-05-08 15:44:31 +
@@ -18,16 +18,17 @@
 #include capi/csequence.h
 
 #include cassert
-#include string.h
+#include cstring
 
 #include zorba/zorba.h
 #include zorba/diagnostic_list.h
 #include zorba/iterator.h
 #include zorba/store_consts.h
-#include zorbamisc/ns_consts.h
-#include zorbatypes/numconversions.h
 
 #include util/string_util.h
+#include zorbamisc/ns_consts.h
+#include zorbatypes/floatimpl.h
+#include zorbatypes/numconversions.h
 
 #include error.h
 

=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp	2013-03-07 10:10:10 +
+++ src/compiler/expression/expr.cpp	2013-05-08 15:44:31 +
@@ -49,6 +49,9 @@
 
 #include store/api/store.h
 #include store/api/item_factory.h
+#include zorbatypes/decimal.h
+#include zorbatypes/floatimpl.h
+#include zorbatypes/integer.h
 
 
 namespace zorba

=== modified file 'src/compiler/expression/expr_manager.cpp'
--- src/compiler/expression/expr_manager.cpp	2013-04-16 20:06:08 +
+++ src/compiler/expression/expr_manager.cpp	2013-05-08 15:44:31 +
@@ -15,22 +15,24 @@
  */
 
 #include stdafx.h
+
+#include zorbatypes/decimal.h
+#include zorbatypes/integer.h
+
+#include expr.h
 #include expr_manager.h
-
-#include mem_manager.h
-
-#include expr.h
-#include ftnode.h
-#include var_expr.h
 #include flwor_expr.h
 #include fo_expr.h
 #include ft_expr.h
+#include ftnode.h
 #include function_item_expr.h
+#include json_exprs.h
+#include mem_manager.h
 #include path_expr.h
+#include pragma.h
 #include script_exprs.h
 #include update_exprs.h
-#include json_exprs.h
-#include pragma.h
+#include var_expr.h
 
 namespace zorba
 {

=== modified file 'src/compiler/parser/symbol_table.cpp'
--- src/compiler/parser/symbol_table.cpp	2013-03-25 19:47:18 +
+++ src/compiler/parser/symbol_table.cpp	2013-05-08 15:44:31 +
@@ -15,6 +15,9 @@
  */
 #include stdafx.h
 
+#include zorbatypes/decimal.h
+#include zorbatypes/floatimpl.h
+#include 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
The proposal to merge lp:~zorba-coders/zorba/bug-1176038 into lp:zorba has been 
updated.

Commit Message changed to:

Fixed a bug in the parser that was revealed by bison 2.7 + #include clean-up

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1, 
Needs Fixing  1, Pending  1, Needs Information  1, Resubmit  1. Got: 1 
Approve, 1 Needs Fixing.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Paul J. Lucas
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Nicolae Brinza
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Paul J. Lucas
Review: Needs Fixing


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1176038-2013-05-08T15-31-05.598Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162953
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Paul J. Lucas
The proposal to merge lp:~zorba-coders/zorba/bug-1176038 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1176038-2013-05-08T16-19-01.825Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue job bug-1176038-2013-05-08T16-19-01.825Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1176038 into lp:zorba

2013-05-08 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/bug-1176038 into lp:zorba has been 
updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1176038/+merge/162996
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Matthias Brantner
The proposal to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1090089-2013-05-08T19-45-21.587Z/log.html
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/bug-1083006 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue job bug-1090089-2013-05-08T19-45-21.587Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread noreply
The proposal to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba has been 
updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in ChangeLog
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/bug-1083006 into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Paul J. Lucas
The proposal to merge lp:~zorba-coders/zorba/bug-1083006 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1083006-2013-05-08T20-49-43.652Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue job bug-1083006-2013-05-08T20-49-43.652Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1083006 into lp:zorba

2013-05-08 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/bug-1083006 into lp:zorba has been 
updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1083006/+merge/162983
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-rpath into lp:zorba/util-jvm-module

2013-05-08 Thread Juan Zacarias
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/util-jvm-rpath into 
lp:zorba/util-jvm-module.

Commit message:
Fixes for Debian Installers.

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-rpath/+merge/163074

Fixes for Debian Installers.
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-rpath/+merge/163074
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.
=== added file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake	1970-01-01 00:00:00 +
+++ cmake_modules/FindJNI.cmake	2013-05-09 00:10:32 +
@@ -0,0 +1,286 @@
+# - Find JNI java libraries.
+# This module finds if Java is installed and determines where the
+# include files and libraries are. It also determines what the name of
+# the library is. This code sets the following variables:
+#   
+#  JNI_INCLUDE_DIRS  = the include dirs to use
+#  JNI_LIBRARIES = the libraries to use
+#  JNI_FOUND = TRUE if JNI headers and libraries were found.
+#  JAVA_AWT_LIBRARY  = the path to the jawt library
+#  JAVA_JVM_LIBRARY  = the path to the jvm library
+#  JAVA_INCLUDE_PATH = the include path to jni.h
+#  JAVA_INCLUDE_PATH2= the include path to jni_md.h
+#  JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
+#
+
+#=
+# Copyright 2001-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
+MACRO(java_append_library_directories _var)
+# Determine java arch-specific library subdir
+# Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
+# 1.6.0_18 + icedtea patches. However, it would be much better to base the
+# guess on the first part of the GNU config.guess platform triplet.
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch amd64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^i.86$)
+SET(_java_libarch i386)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^alpha)
+SET(_java_libarch alpha)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^arm)
+# Subdir is arm for both big-endian (arm) and little-endian (armel).
+SET(_java_libarch arm)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^mips)
+# mips* machines are bi-endian mostly so processor does not tell
+# endianess of the underlying system.
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} mips mipsel mipseb)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc)64)
+SET(_java_libarch ppc64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc))
+SET(_java_libarch ppc)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sparc)
+# Both flavours can run on the same processor
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} sparc sparcv9)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(parisc|hppa))
+SET(_java_libarch parisc parisc64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^s390)
+# s390 binaries can run on s390x machines
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} s390 s390x)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sh)
+SET(_java_libarch sh)
+ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR})
+ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+
+# Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
+# system is non-Linux (where the code above has not been well tested)
+IF(NOT _java_libarch OR NOT CMAKE_SYSTEM_NAME MATCHES Linux)
+LIST(APPEND _java_libarch i386 amd64 ppc)
+ENDIF(NOT _java_libarch OR NOT CMAKE_SYSTEM_NAME MATCHES Linux)
+
+# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
+# current value to a hardcoded list. Remove possible duplicates.
+LIST(REMOVE_DUPLICATES _java_libarch)
+
+FOREACH(_path ${ARGN})
+IF(_path MATCHES {libarch})
+FOREACH(_libarch ${_java_libarch})
+STRING(REPLACE {libarch} ${_libarch} _newpath ${_path})
+LIST(APPEND ${_var} ${_newpath})
+ENDFOREACH(_libarch)
+ELSE(_path MATCHES {libarch})
+LIST(APPEND ${_var} ${_path})
+ENDIF(_path MATCHES {libarch})
+ENDFOREACH(_path)
+ENDMACRO(java_append_library_directories)
+
+GET_FILENAME_COMPONENT(java_install_version
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java 

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-rpath into lp:zorba/util-jvm-module

2013-05-08 Thread Chris Hillery
Review: Needs Fixing

1. I believe that the correct values for RPATH are directories, not actual .so 
files, so the value of INSTALL_RPATH_PATHS should omit all the /libjvm.so 
parts.

2. FindJNI.cmake says:

# (To distribute this file outside of CMake, substitute the full
#  License text for the above reference.)

So, we should do that.
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-rpath/+merge/163074
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2013-05-08 Thread Paul J. Lucas
Review: Approve


-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/163078
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2013-05-08 Thread Paul J. Lucas
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/163078
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/163078
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-09T00-53-05.805Z/log.html
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/163078
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue job pjl-misc-2013-05-09T00-53-05.805Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/163078
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2013-05-08 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1, 
Needs Fixing  1, Pending  1, Needs Information  1, Resubmit  1. Got: 1 
Approve.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/163078
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2013-05-08 Thread Zorba Build Bot
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/163078
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/163078
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Paul J. Lucas
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-1090089 into 
lp:zorba.

Commit message:
Rewrote decimal reduction code -- fixes rounding and FOTS distinct-values tests.

Requested reviews:
  Paul J. Lucas (paul-lucas)
Related bugs:
  Bug #1090089 in Zorba: fn-distinct-values different results from test
  https://bugs.launchpad.net/zorba/+bug/1090089

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/163085

Rewrote decimal reduction code -- fixes rounding and FOTS distinct-values tests.
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/163085
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/zorbatypes/decimal.cpp'
--- src/zorbatypes/decimal.cpp	2013-05-05 03:16:33 +
+++ src/zorbatypes/decimal.cpp	2013-05-09 05:21:28 +
@@ -73,98 +73,62 @@
 }
 
 /**
- * Remove trailing .9 or .01.
- * Find four or five consecutive 9 or 0 after decimal point and eliminate them.
+ * Removes trailing .999 or .001.
  */
 void Decimal::reduce( char *s ) {
-  char *dot = strrchr( s, '.' );
-  if ( !dot )   // not a floating point number
+  if ( !strrchr( s, '.' ) ) // not a floating-point number
 return;
 
-  bool has_e = false;
-  char *e = strrchr( s, 'E' );
-  if ( !e )
-e = strrchr( s, 'e' );
-  if ( !e )
-e = s + strlen( s );
-  else
-has_e = true;
-
-  char *digits = e - 1;
-  for ( int pos = (int)(digits - dot); pos  8; --pos, --digits ) {
-if ( *digits == '9' ) {
-  if ( digits[-1] == '9'  digits[-2] == '9'  digits[-3] == '9' ) {
-if ( ascii::is_digit( digits[1] )  digits[1] = '5' )
-  digits -= 4;
-else if ( digits[-4] == '9' )
-  digits -= 5;
-else
-  continue;
-
-// now add 1 to remaining digits
-char *last_digit = digits;
-while ( digits = s ) {
-  if ( digits[0] == '.' ) {
-// skip
-  } else if ( digits[0] == '9' ) {
-digits[0] = '0';
-if ( last_digit == digits )
-  --last_digit;
-  } else {
-if ( ascii::is_digit( digits[0] ) )
-  digits[0]++;
-break;
-  }
-  --digits;
-}
-if ( last_digit[0] != '.' )
-  ++last_digit;
-else if ( has_e ) {
-  last_digit[1] = '0';
-  last_digit += 2;
-}
-if ( digits  s || !ascii::is_digit( digits[0] ) ) {
-  memmove( s + 1, s, last_digit - s );
-  ++last_digit;
-  if ( ascii::is_digit( s[0] ) )
-s[0] = '1';
-  else
-s[1] = '1';
-  if ( has_e ) {// increment the exponent
-++dot;
-dot[0] = dot[-1];
-dot[-1] = '.';
-sprintf( e + 1, %d, atoi( e + 1 ) + 1 );
---last_digit;
-  }
-}
-int const e_len = strlen( e );
-memmove( last_digit, e, e_len );
-last_digit[ e_len ] = 0;
-break;
-  }
-} else if ( *digits == '0' ) {
-  if ( digits[-1] == '0'  digits[-2] == '0'  digits[-3] == '0' ) {
-if ( ascii::is_digit( digits[1] )  digits[1]  '5' )
-  digits -= 4;
-else if ( digits[-4] == '0' )
-  digits -= 5;
-else
-  continue;
-while ( *digits == '0' )
-  --digits;
-if ( *digits != '.' )
-  ++digits;
-else if ( has_e ) {
-  digits[1] = '0';
-  digits += 2;
-}
-int const e_len = strlen( e );
-memmove( digits, e, e_len );
-digits[ e_len ] = '\0';
-break;
-  }
-}
+  char *e = strpbrk( s, eE );
+  if ( !e )
+e = s + strlen( s );// eliminates special-case
+
+  char *digit = e - 1;
+  switch ( *digit ) {
+case '0':   // trim trailing zeros
+  while ( *digit == '0' )
+*digit-- = '\0';
+  if ( *digit == '.' )
+*digit = '\0';
+  break;
+case '1':
+  int zeros;
+  for ( zeros = 0; *--digit == '0'; ++zeros )
+;
+  if ( zeros = 3 ) // this seems arbitrary
+digit[ *digit != '.' ] = '\0';
+  break;
+case '9':
+  int nines;
+  for ( nines = 1; *--digit == '9'; ++nines )
+;
+  if ( nines  1 ) {
+if ( *digit != '.' ) {  // 123.4...99...
+  ++digit[0];
+  ++digit;
+  // slide to the left: 123.4...99...[E12] = 123.4...[E12]
+  memmove( digit, digit + nines, strlen( e ) + 1 );
+} else {// 123.99...
+  *digit-- = '\0';
+  char const *const first = *s == '-' ? s + 1 : s;
+  while ( true ) {
+if ( *digit == '9' ) {
+  *digit = '0';
+  if ( digit == first ) {
+// slide to the right to insert a leading '1'
+memmove( digit + 1, digit, 

Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Paul J. Lucas
Review: Approve


-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/163085
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Paul J. Lucas
The proposal to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/163085
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/163085
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1090089-2013-05-09T05-23-51.58Z/log.html
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/163085
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Zorba Build Bot
The attempt to merge lp:~paul-lucas/zorba/bug-1090089 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 bug-1090089-2013-05-09T05-23-51.58Z is finished.  The
  final status was:

  

  28 tests did not succeed - changes not commited.


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

-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/163085
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1090089 into lp:zorba

2013-05-08 Thread Zorba Build Bot
The proposal to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/163085
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/163085
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp