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

2013-04-10 Thread Chris Hillery
Nicolae has taken over this bug and I don't believe is using this branch, so 
rejecting the proposal.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
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-1130998 into lp:zorba

2013-04-02 Thread Chris Hillery
Review: Needs Fixing

Unfortunately this fix isn't in the right place. By changing the CharRef 
regexp, you've broken some valid XML character references like  . Also, 
the error message for � is not very good.

Nicolae - can you help point us in the right direction here? There is already 
code in xquery_scanner.l and jsoniq_scanner.l that verifies character 
references in string literals:

{StringLiteral}   { if (checkXmlRefs(&yylval->err, yytext, yyleng, 
this, yylloc)) return token::UNRECOGNIZED; TRY_STRING_LITERAL(STRING_LITERAL, 
yytext, yyleng); }


However, same check also needs to be done anywhere else that may have character 
references, including element content and attribute values. But we don't know 
enough about flex/bison to understand how to get this done.

If possible I'd still like Luis to do the actual change, if only to help spread 
some knowledge about the lexer/parser to other team members. But if you could 
briefly describe what kind of change needs to happen, we'd appreciate it!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
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-1130998 into lp:zorba

2013-04-02 Thread Chris Hillery
Have you merged the trunk? That's the more likely cause of merge conflicts.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
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-1130998 into lp:zorba

2013-04-02 Thread Luis Rodriguez Gonzalez
I followed Nicolae's suggestions but still I get the same problems.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
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-1130998 into lp:zorba

2013-04-02 Thread Nicolae Brinza
You will also have to update jsoniq_scanner.l file with the changes that you 
did, but be careful not to change anything else. Do not copy over the entire 
file, just the changes.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
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-1130998 into lp:zorba

2013-04-02 Thread Nicolae Brinza
Luis, after you run "make", you'll need to run the ./copyparser.sh script in 
the build folder. It will updated the above files that report a conflict. 
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
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-1130998 into lp:zorba

2013-04-02 Thread Chris Hillery
Unfortunately you've got a ton of merge conflicts here. Can you try merging 
from the latest trunk onto your branch and push it back to your branch?
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
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