Zorba

Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 11390
Merged at revision: 11676
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 67 lines (+15/-6)
7 files modified
src/util/icu_regex.cpp (+3/-1)
test/rbkt/ExpQueryResults/zorba/http-client/json/options/options.xml.res (+1/-1)
test/rbkt/ExpQueryResults/zorba/http-client/xml/options/options.xml.res (+1/-1)
test/rbkt/ExpQueryResults/zorba/string/Regex/regex_m56.xml.res (+1/-0)
test/rbkt/Queries/zorba/http-client/json/options/options.xq (+4/-1)
test/rbkt/Queries/zorba/http-client/xml/options/options.xq (+4/-2)
test/rbkt/Queries/zorba/string/Regex/regex_m56.xq (+1/-0)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+199205@code.launchpad.net

Commit message

Fixed [] regex bug.

Description of the change

Fixed [] regex bug.

To post a comment you must log in.
lp:~paul-lucas/zorba/pjl-misc updated
11390. By Paul J. Lucas

Commented DEBUG back out.

Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/199205

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/199205

Stage "TestZorbaUbuntu" failed.
2 tests failed (8590 total tests run).

Check test results at http://jenkins.lambda.nu:8180/job/TestZorbaUbuntu/413/testReport/ to view the results.

lp:~paul-lucas/zorba/pjl-misc updated
11391. By Paul J. Lucas

Fixed HTTP client test results ordering.

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/199205

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/199205 :
Votes: {'Approve': 1}

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/199205

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu:8180/job/CommitZorba/256/console to view the results.

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/199205

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/util/icu_regex.cpp'
--- src/util/icu_regex.cpp 2013-09-17 19:30:18 +0000
+++ src/util/icu_regex.cpp 2013-12-17 00:27:28 +0000
@@ -513,8 +513,10 @@
513 else {513 else {
514 if ( !in_char_class )514 if ( !in_char_class )
515 goto unbalanced_char;515 goto unbalanced_char;
516 if ( put_close_bracket )516 if ( put_close_bracket ) {
517 *icu_re += ']';517 *icu_re += ']';
518 put_close_bracket = false;
519 }
518 --in_char_class;520 --in_char_class;
519 in_char_range = 0;521 in_char_range = 0;
520 }522 }
521523
=== modified file 'test/rbkt/ExpQueryResults/zorba/http-client/json/options/options.xml.res'
--- test/rbkt/ExpQueryResults/zorba/http-client/json/options/options.xml.res 2013-06-14 16:32:01 +0000
+++ test/rbkt/ExpQueryResults/zorba/http-client/json/options/options.xml.res 2013-12-17 00:27:28 +0000
@@ -1,1 +1,1 @@
1GET HEAD POST OPTIONS TRACE
2\ No newline at end of file1\ No newline at end of file
2GET HEAD OPTIONS POST TRACE
33
=== modified file 'test/rbkt/ExpQueryResults/zorba/http-client/xml/options/options.xml.res'
--- test/rbkt/ExpQueryResults/zorba/http-client/xml/options/options.xml.res 2013-02-07 17:24:36 +0000
+++ test/rbkt/ExpQueryResults/zorba/http-client/xml/options/options.xml.res 2013-12-17 00:27:28 +0000
@@ -1,1 +1,1 @@
1GET HEAD POST OPTIONS TRACE
2\ No newline at end of file1\ No newline at end of file
2GET HEAD OPTIONS POST TRACE
33
=== added file 'test/rbkt/ExpQueryResults/zorba/string/Regex/regex_m56.xml.res'
--- test/rbkt/ExpQueryResults/zorba/string/Regex/regex_m56.xml.res 1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/string/Regex/regex_m56.xml.res 2013-12-17 00:27:28 +0000
@@ -0,0 +1,1 @@
1true
02
=== modified file 'test/rbkt/Queries/zorba/http-client/json/options/options.xq'
--- test/rbkt/Queries/zorba/http-client/json/options/options.xq 2013-06-14 16:32:01 +0000
+++ test/rbkt/Queries/zorba/http-client/json/options/options.xq 2013-12-17 00:27:28 +0000
@@ -1,3 +1,6 @@
1import module namespace http = "http://zorba.io/modules/http-client";1import module namespace http = "http://zorba.io/modules/http-client";
2http:options("http://zorbatest.lambda.nu:8080/http-test-data/http1.xml")
32
3let $uri := "http://zorbatest.lambda.nu:8080/http-test-data/http1.xml"
4for $method in http:options( $uri )
5order by $method
6return $method
47
=== modified file 'test/rbkt/Queries/zorba/http-client/xml/options/options.xq'
--- test/rbkt/Queries/zorba/http-client/xml/options/options.xq 2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/http-client/xml/options/options.xq 2013-12-17 00:27:28 +0000
@@ -1,3 +1,5 @@
1import module namespace http = "http://www.zorba-xquery.com/modules/http-client";1import module namespace http = "http://www.zorba-xquery.com/modules/http-client";
2http:options("http://zorbatest.lambda.nu:8080/http-test-data/http1.xml")2let $uri := "http://zorbatest.lambda.nu:8080/http-test-data/http1.xml"
33for $method in http:options( $uri )
4order by $method
5return $method
46
=== added file 'test/rbkt/Queries/zorba/string/Regex/regex_m56.xq'
--- test/rbkt/Queries/zorba/string/Regex/regex_m56.xq 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/string/Regex/regex_m56.xq 2013-12-17 00:27:28 +0000
@@ -0,0 +1,1 @@
1fn:matches( "a@28.io", "^[^@]+@[^\.]+\.[a-z]+$" )

Subscribers

People subscribed via source and target branches