[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-900688 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/bug-900688
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998
Allow prolog variables to be referenced before they are declared (XQuery 3.0
feature) (fixes bug #900688)
--
https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/parser/xquery_parser.y'
--- src/compiler/parser/xquery_parser.y 2012-08-14 11:13:50 +
+++ src/compiler/parser/xquery_parser.y 2012-08-16 18:30:28 +
@@ -1665,45 +1665,42 @@
{
std::auto_ptrVarNameAndType nt(dynamic_castVarNameAndType *($2));
- $$ = new VarDecl(LOC(@$),
- nt-theName,
- nt-theType,
- $4,
- nt-get_annotations(),
- true,// global
- false); // not external
+ $$ = new GlobalVarDecl(LOC(@$),
+ nt-theName,
+ nt-theType,
+ $4,
+ nt-get_annotations(),
+ false); // not external
- dynamic_castVarDecl*($$)-setComment(SYMTAB($1));
+ static_castGlobalVarDecl*($$)-setComment(SYMTAB($1));
}
|
DECLARE VarNameAndType EXTERNAL
{
std::auto_ptrVarNameAndType nt(dynamic_castVarNameAndType *($2));
- $$ = new VarDecl(LOC(@$),
- nt-theName,
- nt-theType,
- NULL, // no init expr
- nt-get_annotations(),
- true, // global
- true); // external
+ $$ = new GlobalVarDecl(LOC(@$),
+ nt-theName,
+ nt-theType,
+ NULL, // no init expr
+ nt-get_annotations(),
+ true); // external
- dynamic_castVarDecl*($$)-setComment(SYMTAB($1));
+ static_castGlobalVarDecl*($$)-setComment(SYMTAB($1));
}
|
DECLARE VarNameAndType EXTERNAL GETS ExprSingle
{
std::auto_ptrVarNameAndType nt(dynamic_castVarNameAndType *($2));
- $$ = new VarDecl(LOC(@$),
- nt-theName,
- nt-theType,
- $5, // init expr
- nt-get_annotations(),
- true, // global
- true); // external
+ $$ = new GlobalVarDecl(LOC(@$),
+ nt-theName,
+ nt-theType,
+ $5, // init expr
+ nt-get_annotations(),
+ true); // external
- dynamic_castVarDecl*($$)-setComment(SYMTAB($1));
+ static_castGlobalVarDecl*($$)-setComment(SYMTAB($1));
}
;
@@ -2271,7 +2268,8 @@
|
AnnotationList VARIABLE BlockVarDecl
{
- VarDeclStmt* vdecl = new VarDeclStmt(LOC(@$), static_castAnnotationListParsenode*($1));
+ VarDeclStmt* vdecl = new VarDeclStmt(LOC(@$),
+ static_castAnnotationListParsenode*($1));
vdecl-add($3);
$$ = vdecl;
}
@@ -2281,51 +2279,38 @@
BlockVarDecl :
DOLLAR QNAME
{
- VarDecl* vd = new VarDecl(LOC(@$),
-static_castQName*($2),
-NULL, // no type
-NULL, // no init expr
-NULL, // no annotations
-false, // not global
-false);// not external
- vd-set_global(false);
+ LocalVarDecl* vd = new LocalVarDecl(LOC(@$),
+ static_castQName*($2),
+ NULL, // no type
+ NULL, // no init expr
+ NULL); // no annotations
$$ = vd;
}
| DOLLAR QNAME TypeDeclaration
{
- VarDecl* vd = new VarDecl(LOC(@$),
-static_castQName*($2),
-dynamic_castSequenceType*($3), // type
-NULL, // no init expr
-NULL, // no annotations
-false, // not global
-false);// not external
-
- vd-set_global(false);
+ LocalVarDecl* vd = new LocalVarDecl(LOC(@$),
+ static_castQName*($2),
+ dynamic_castSequenceType*($3), // type
+ NULL, // no init expr
+
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-900688 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 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-900688 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-900688 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 -- https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 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-900688 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-900688-2012-08-16T21-31-59.449Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 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-900688 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-900688 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 bug-900688-2012-08-16T21-31-59.449Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 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-900688 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-900688 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 -- https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 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-900688 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-900688 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 -- https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 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-900688 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-900688-2012-08-16T21-49-08.157Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 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-900688 into lp:zorba
Validation queue job bug-900688-2012-08-16T21-49-08.157Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 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-900688 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-900688 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 -- https://code.launchpad.net/~zorba-coders/zorba/bug-900688/+merge/119998 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
