Merge lp:~paul-lucas/zorba/bug-946986 into lp:zorba

Proposed by Paul J. Lucas
Status: Merged
Approved by: Chris Hillery
Approved revision: 10778
Merged at revision: 10781
Proposed branch: lp:~paul-lucas/zorba/bug-946986
Merge into: lp:zorba
Diff against target: 62 lines (+7/-3)
7 files modified
src/diagnostics/diagnostic_en.xml (+1/-1)
src/diagnostics/pregenerated/dict_en.cpp (+1/-1)
src/util/regex.cpp (+1/-1)
test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-1.spec (+1/-0)
test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-1.xq (+1/-0)
test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-2.spec (+1/-0)
test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-2.xq (+1/-0)
To merge this branch: bzr merge lp:~paul-lucas/zorba/bug-946986
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Paul J. Lucas Approve
Review via email: mp+102612@code.launchpad.net

Commit message

Added extra check for ')' without '('.

Description of the change

Added extra check for ')' without '('.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-946986-2012-04-19T15-42-59.631Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/diagnostics/diagnostic_en.xml'
2--- src/diagnostics/diagnostic_en.xml 2012-04-18 11:34:17 +0000
3+++ src/diagnostics/diagnostic_en.xml 2012-04-19 01:44:20 +0000
4@@ -3382,7 +3382,7 @@
5 </entry>
6
7 <entry key="UnbalancedChar_3" if="!defined(ZORBA_NO_ICU)">
8- <value>missing '$3'</value>
9+ <value>unbalanced '$3'</value>
10 </entry>
11
12 <entry key="UnescapedChar_3" if="!defined(ZORBA_NO_ICU)">
13
14=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
15--- src/diagnostics/pregenerated/dict_en.cpp 2012-04-18 11:34:17 +0000
16+++ src/diagnostics/pregenerated/dict_en.cpp 2012-04-19 01:44:20 +0000
17@@ -748,7 +748,7 @@
18 #endif
19 { "~UnaryArithOp", "unary arithmetic operator" },
20 #if !defined(ZORBA_NO_ICU)
21- { "~UnbalancedChar_3", "missing '$3'" },
22+ { "~UnbalancedChar_3", "unbalanced '$3'" },
23 #endif
24 #if !defined(ZORBA_NO_ICU)
25 { "~UnescapedChar_3", "character '$3' must be escaped here" },
26
27=== modified file 'src/util/regex.cpp'
28--- src/util/regex.cpp 2012-04-16 20:56:43 +0000
29+++ src/util/regex.cpp 2012-04-19 01:44:20 +0000
30@@ -238,7 +238,7 @@
31 if ( q_flag )
32 *icu_re += '\\';
33 else {
34- if ( !open_cap_subs )
35+ if ( !open_cap_subs || cur_cap_sub == 0 )
36 throw INVALID_RE_EXCEPTION( xq_re, ZED( UnbalancedChar_3 ), ')' );
37 cap_sub[ --cur_cap_sub ] = false;
38 }
39
40=== added file 'test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-1.spec'
41--- test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-1.spec 1970-01-01 00:00:00 +0000
42+++ test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-1.spec 2012-04-19 01:44:20 +0000
43@@ -0,0 +1,1 @@
44+Error: http://www.w3.org/2005/xqt-errors:FORX0002
45
46=== added file 'test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-1.xq'
47--- test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-1.xq 1970-01-01 00:00:00 +0000
48+++ test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-1.xq 2012-04-19 01:44:20 +0000
49@@ -0,0 +1,1 @@
50+matches( 'qwerty', '(a))' )
51
52=== added file 'test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-2.spec'
53--- test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-2.spec 1970-01-01 00:00:00 +0000
54+++ test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-2.spec 2012-04-19 01:44:20 +0000
55@@ -0,0 +1,1 @@
56+Error: http://www.w3.org/2005/xqt-errors:FORX0002
57
58=== added file 'test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-2.xq'
59--- test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-2.xq 1970-01-01 00:00:00 +0000
60+++ test/rbkt/Queries/zorba/string/Regex/regex-FORX0002-2.xq 2012-04-19 01:44:20 +0000
61@@ -0,0 +1,1 @@
62+matches( 'qwerty', 'ab|(d))' )

Subscribers

People subscribed via source and target branches