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

2013-07-04 Thread Nicolae Brinza 
The proposal to merge lp:~zorba-coders/zorba/dataguide into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026
-- 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026
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/dataguide into lp:zorba

2013-07-04 Thread Zorba Build Bot 
Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue
-- 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026
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/dataguide into lp:zorba

2013-07-04 Thread Zorba Build Bot 
Validation queue result for 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026

Stage TestZorbaUbuntu failed.
794 tests failed (8369 total tests run).

Check test results at 
http://jenkins.lambda.nu/job/TestZorbaUbuntu/49/testReport/ to view the results.
-- 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026
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/dataguide into lp:zorba

2013-07-04 Thread Zorba Build Bot 
Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue
-- 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026
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/dataguide into lp:zorba

2013-07-04 Thread Zorba Build Bot 
Validation queue result for 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026

Stage TestZorbaUbuntu failed.
794 tests failed (8369 total tests run).

Check test results at 
http://jenkins.lambda.nu/job/TestZorbaUbuntu/50/testReport/ to view the results.
-- 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026
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/dataguide into lp:zorba

2013-07-04 Thread Zorba Build Bot 
Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue
-- 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026
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/dataguide into lp:zorba

2013-07-04 Thread Zorba Build Bot 
Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue
-- 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026
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/dataguide into lp:zorba

2013-07-04 Thread Zorba Build Bot 
Validation queue result for 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026

Stage TestZorbaUbuntu failed.
26 tests failed (8373 total tests run).

Check test results at 
http://jenkins.lambda.nu/job/TestZorbaUbuntu/52/testReport/ to view the results.
-- 
https://code.launchpad.net/~zorba-coders/zorba/dataguide/+merge/173026
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/update3.0_node-position-module into lp:zorba

2013-07-04 Thread Juan Zacarias 
Juan Zacarias has proposed merging 
lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba.

Commit message:
Updated node-position module to Zorba 3.0 format.

Requested reviews:
  Chris Hillery (ceejatec)
Related bugs:
  Bug #1189795 in Zorba: Update core module node-position
  https://bugs.launchpad.net/zorba/+bug/1189795

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105

Updated node-position module to Zorba 3.0 format.
-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/zorba/xqdoc/images/modules.svg'
--- doc/zorba/xqdoc/images/modules.svg	2013-06-25 03:55:20 +
+++ doc/zorba/xqdoc/images/modules.svg	2013-07-04 22:33:25 +
@@ -2045,7 +2045,7 @@
 /g
 !-- 8 --
 g id=node213 class=nodetitle8/title
-a xlink:href=../modules_zorba_xquery_data_model_node_Node Position.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/node-position;
+a xlink:href=../modules_zorba_xquery_data_model_node_Node Position.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/node-position;
 ellipse fill=white stroke=white cx=1293 cy=-172 rx=59.2173 ry=18/
 text text-anchor=middle x=1293 y=-168.3 font-family=Times,serif font-size=14.00 fill=rednode-position/text
 /a

=== modified file 'doc/zorba/xqdoc/images/modules_new.svg'
--- doc/zorba/xqdoc/images/modules_new.svg	2013-06-25 03:55:20 +
+++ doc/zorba/xqdoc/images/modules_new.svg	2013-07-04 22:33:25 +
@@ -2045,7 +2045,7 @@
 /g
 !-- 8 --
 g id=node213 class=nodetitle8/title
-a xlink:href=../modules_zorba_xquery_data_model_node_Node Position.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/node-position;
+a xlink:href=../modules_zorba_xquery_data_model_node_Node Position.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/node-position;
 ellipse fill=white stroke=white cx=1293 cy=-172 rx=59.2173 ry=18/
 text text-anchor=middle x=1293 y=-168.3 font-family=Times,serif font-size=14.00 fill=rednode-position/text
 /a

=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	2013-06-28 02:33:07 +
+++ modules/CMakeLists.txt	2013-07-04 22:33:25 +
@@ -18,6 +18,7 @@
 ADD_SUBDIRECTORY(xqxq)
 ADD_SUBDIRECTORY(w3c)
 ADD_SUBDIRECTORY(full-text)
+ADD_SUBDIRECTORY(nodes)
 
 # Add external module projects - any subdirectories of a directory
 # named zorba_modules as a sibling to the main Zorba source

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-06-28 02:33:07 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-07-04 22:33:25 +
@@ -62,8 +62,6 @@
   URI http://www.zorba-xquery.com/modules/node-reference;)
 DECLARE_ZORBA_MODULE(FILE reference.xq VERSION 1.0
   URI http://www.zorba-xquery.com/modules/reference;)
-DECLARE_ZORBA_MODULE(FILE node-position.xq VERSION 2.0
-  URI http://www.zorba-xquery.com/modules/node-position;)
 DECLARE_ZORBA_MODULE(FILE node.xq VERSION 2.0
   URI http://www.zorba-xquery.com/modules/node;)
 DECLARE_ZORBA_MODULE(FILE item.xq VERSION 1.0

=== added directory 'modules/nodes'
=== added file 'modules/nodes/CMakeLists.txt'
--- modules/nodes/CMakeLists.txt	1970-01-01 00:00:00 +
+++ modules/nodes/CMakeLists.txt	2013-07-04 22:33:25 +
@@ -0,0 +1,2 @@
+DECLARE_ZORBA_MODULE(FILE node-position.xq VERSION 2.0
+  URI http://zorba.io/modules/node-position;)
\ No newline at end of file

=== renamed file 'modules/com/zorba-xquery/www/modules/node-position.xq' = 'modules/nodes/node-position.xq'
--- modules/com/zorba-xquery/www/modules/node-position.xq	2013-06-15 16:20:18 +
+++ modules/nodes/node-position.xq	2013-07-04 22:33:25 +
@@ -1,4 +1,4 @@
-xquery version 1.0;
+jsoniq version 1.0;
 (:
  : Copyright 2006-2011 The FLWOR Foundation.
  :
@@ -16,28 +16,28 @@
  :)
 
 (:~
- : This module provides a function (np:node-position) that, given a node, 
+ : pThis module provides a function (np:node-position) that, given a node, 
  : returns positional information about the node in the form of an xs:anyURI
  : item. The module also defines functions that use such positional information
  : to determine: (1) positional relationships between two nodes (e.g. if one 
  : is the ancestor of another) and (2) positional properties of a single node
- : (e.g. its level in the tree).
- :
- : Within this module, the term node position will be used to refer to an
- : xs:anyURI item that is returned by the np:node-position function.
+ : (e.g. its level in the tree)./p
+ : p/
+ : pWithin this module, the term node position will be used to refer to an
+ : xs:anyURI item that is returned by the np:node-position function./p
  :
  : @author Federico Cavalieri, Markos Zaharioudakis 
  :
  : @project Zorba/XQuery Data Model/Node/Node Position
  :)
-module namespace np =

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

2013-07-04 Thread William Candillon 
William Candillon has proposed merging lp:~zorba-coders/zorba/skiplimit into 
lp:zorba.

Commit message:
Add offset limit clauses to the FLWOR.

Requested reviews:
  William Candillon (wcandillon)
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126

Add offset limit clauses to the FLWOR.
These clauses are similar to limit and offset from SQL.
For example:
for $i in (1 to 10)
offset 5
limit 2
return $i
-- 
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/parser/parser.y'
--- src/compiler/parser/parser.y	2013-06-17 20:05:21 +
+++ src/compiler/parser/parser.y	2013-07-05 04:45:36 +
@@ -325,6 +325,8 @@
 %token QUOTE'\'
 %token RBRACE   '}'
 %token RBRACK   ']'
+%token OFFSET'offset'
+%token LIMIT'limit'
 %token RETURN   'return'
 %token RPAR ')'
 %token SATISFIES'satisfies'
@@ -693,6 +695,7 @@
 %type expr ExprSimple
 %type expr ExtensionExpr
 %type expr FLWORExpr
+%type expr OffsetLimitExpr
 %type expr ReturnExpr
 %type expr PostfixExpr
 %type expr FunctionCall
@@ -904,7 +907,7 @@
 %destructor { release_hack( $$ ); } AxisStep
 
 // exprnodes
-%destructor { release_hack( $$ ); } AdditiveExpr AndExpr CDataSection CastExpr CastableExpr CommonContent ComparisonExpr CompAttrConstructor CompCommentConstructor CompDocConstructor CompElemConstructor CompPIConstructor CompNamespaceConstructor CompTextConstructor ComputedConstructor Constructor ContextItemExpr DirCommentConstructor DirElemConstructor DirElemContent DirPIConstructor DirectConstructor BracedExpr BlockExpr EnclosedStatementsAndOptionalExpr BlockStatement Statement Statements StatementsAndExpr StatementsAndOptionalExpr StatementsAndOptionalExprTop SwitchStatement TypeswitchStatement TryStatement CatchListStatement CatchStatement ApplyStatement IfStatement FLWORStatement ReturnStatement VarDeclStatement Expr ExprSingle ExprSimple ExtensionExpr FLWORExpr ReturnExpr PostfixExpr FunctionCall IfExpr InstanceofExpr IntersectExceptExpr Literal MultiplicativeExpr NumericLiteral OrExpr OrderedExpr ParenthesizedExpr PathExpr Predicate PrimaryExpr QuantifiedExpr QueryBody RangeExpr RelativePathExpr StepExpr StringLiteral TreatExpr StringConcatExpr SwitchExpr TypeswitchExpr UnaryExpr UnionExpr UnorderedExpr ValidateExpr ValueExpr SimpleMapExpr VarRef TryExpr CatchListExpr CatchExpr DeleteExpr InsertExpr RenameExpr ReplaceExpr TransformExpr VarNameList VarNameDecl AssignStatement ExitStatement WhileStatement FlowCtlStatement QNAME EQNAME FUNCTION_NAME FTContainsExpr
+%destructor { release_hack( $$ ); } AdditiveExpr AndExpr CDataSection CastExpr CastableExpr CommonContent ComparisonExpr CompAttrConstructor CompCommentConstructor CompDocConstructor CompElemConstructor CompPIConstructor CompNamespaceConstructor CompTextConstructor ComputedConstructor Constructor ContextItemExpr DirCommentConstructor DirElemConstructor DirElemContent DirPIConstructor DirectConstructor BracedExpr BlockExpr EnclosedStatementsAndOptionalExpr BlockStatement Statement Statements StatementsAndExpr StatementsAndOptionalExpr StatementsAndOptionalExprTop SwitchStatement TypeswitchStatement TryStatement CatchListStatement CatchStatement ApplyStatement IfStatement FLWORStatement ReturnStatement VarDeclStatement Expr ExprSingle ExprSimple ExtensionExpr FLWORExpr OffsetLimitExpr ReturnExpr PostfixExpr FunctionCall IfExpr InstanceofExpr IntersectExceptExpr Literal MultiplicativeExpr NumericLiteral OrExpr OrderedExpr ParenthesizedExpr PathExpr Predicate PrimaryExpr QuantifiedExpr QueryBody RangeExpr RelativePathExpr StepExpr StringLiteral TreatExpr StringConcatExpr SwitchExpr TypeswitchExpr UnaryExpr UnionExpr UnorderedExpr ValidateExpr ValueExpr SimpleMapExpr VarRef TryExpr CatchListExpr CatchExpr DeleteExpr InsertExpr RenameExpr ReplaceExpr TransformExpr VarNameList VarNameDecl AssignStatement ExitStatement WhileStatement FlowCtlStatement QNAME EQNAME FUNCTION_NAME FTContainsExpr
 
 // internal non-terminals with values
 %destructor { delete $$; } FunctionSig VarNameAndType NameTestList DecimalFormatParam DecimalFormatParamList
@@ -973,6 +976,10 @@
 %nonassoc SIMPLEMAPEXPR_REDUCE
 %left BANG
 
+%nonassoc SKIPLIMIT_REDUCE
+%left OFFSET
+%left LIMIT
+
 /*_
  *
  * resolve shift-reduce conflict for
@@ -2584,6 +2591,19 @@
 
 
 FLWORExpr :
+FLWORClauseList %prec SKIPLIMIT_REDUCE OffsetLimitExpr ReturnExpr
+{
+  OffsetLimitExpr *sl = dynamic_castOffsetLimitExpr*($2);
+  ReturnExpr *re = dynamic_castReturnExpr*($3);
+  $$ = new FLWORExpr(LOC(@$),
+ dynamic_castFLWORClauseList*($1),
+

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

2013-07-04 Thread William Candillon 
The proposal to merge lp:~zorba-coders/zorba/skiplimit into lp:zorba has been 
updated.

Commit Message changed to:

Add offset limit clauses to the FLWOR.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126
-- 
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126
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/skiplimit into lp:zorba

2013-07-04 Thread William Candillon 
The proposal to merge lp:~zorba-coders/zorba/skiplimit into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126
-- 
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126
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/skiplimit into lp:zorba

2013-07-04 Thread William Candillon 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/skiplimit/+merge/173126
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