zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #13354
[Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1038934 into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #1038934 in Zorba: "Zorba crashes upon some JSONiq errors in debug mode."
https://bugs.launchpad.net/zorba/+bug/1038934
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1038934/+merge/120446
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1038934/+merge/120446
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2012-08-16 18:31:02 +0000
+++ src/diagnostics/diagnostic_en.xml 2012-08-20 18:27:25 +0000
@@ -3697,7 +3697,43 @@
<entry key="JSONiq error">
<value>JSONIQ error</value>
</entry>
-
+
+ <entry key="JSONiq type error">
+ <value>JSONIQ type error</value>
+ </entry>
+
+ <entry key="JSONiq static error">
+ <value>JSONIQ static error</value>
+ </entry>
+
+ <entry key="JSONiq dynamic error">
+ <value>JSONIQ dynamic error</value>
+ </entry>
+
+ <entry key="JSONiq serialization error">
+ <value>JSONIQ serialization error</value>
+ </entry>
+
+ <entry key="JSONiq warning">
+ <value>JSONIQ warning</value>
+ </entry>
+
+ <entry key="JSONiq type warning">
+ <value>JSONIQ type warning</value>
+ </entry>
+
+ <entry key="JSONiq static warning">
+ <value>JSONIQ static warning</value>
+ </entry>
+
+ <entry key="JSONiq dynamic warning">
+ <value>JSONIQ dynamic warning</value>
+ </entry>
+
+ <entry key="JSONiq serialization warning">
+ <value>JSONIQ serialization warning</value>
+ </entry>
+
<entry key="dynamic error">
<value>dynamic error</value>
</entry>
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2012-08-16 18:31:02 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp 2012-08-20 18:27:25 +0000
@@ -609,7 +609,16 @@
{ "~JSON_ILLEGAL_NUMBER", "illegal JSON number${ at 2}" },
{ "~JSON_UNEXPECTED_TOKEN", "\"$2\": unexpected JSON token${ at 3}" },
{ "~JSON_UNTERMINATED_STRING", "unterminated JSON string${ at 2}" },
+ { "~JSONiq dynamic error", "JSONIQ dynamic error" },
+ { "~JSONiq dynamic warning", "JSONIQ dynamic error" },
{ "~JSONiq error", "JSONIQ error" },
+ { "~JSONiq serialization error", "JSONIQ serialization error" },
+ { "~JSONiq serialization warning", "JSONIQ serialization error" },
+ { "~JSONiq static error", "JSONIQ static error" },
+ { "~JSONiq static warning", "JSONIQ static error" },
+ { "~JSONiq type error", "JSONIQ type error" },
+ { "~JSONiq type warning", "JSONIQ type error" },
+ { "~JSONiq warning", "JSONIQ warning" },
{ "~LibModVersionMismatch_3", "XQuery library version can not be imported by a $3 version module" },
{ "~ModuleNotFound", "module not found" },
{ "~MustBeAbsoluteURI", "must be absolute" },
Follow ups
-
[Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: noreply, 2012-08-31
-
[Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: Zorba Build Bot, 2012-08-31
-
[Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: Zorba Build Bot, 2012-08-31
-
[Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: Chris Hillery, 2012-08-31
-
[Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: Zorba Build Bot, 2012-08-31
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: Zorba Build Bot, 2012-08-31
-
[Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: Zorba Build Bot, 2012-08-31
-
[Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: Matthias Brantner, 2012-08-31
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: William Candillon, 2012-08-31
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: Chris Hillery, 2012-08-20
-
[Merge] lp:~zorba-coders/zorba/bug-1038934 into lp:zorba
From: Chris Hillery, 2012-08-20