From e95c32a22ad9e454b8c7cccf7aa85a0962421b74 Mon Sep 17 00:00:00 2001
From: David Abram Cargill <cargilld@apache.org>
Date: Sun, 20 Feb 2005 01:58:17 +0000
Subject: [PATCH] Update error message from regular expressions.
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@176314 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml | 2 +-
src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt | 2 +-
.../util/MsgLoaders/InMemory/XercesMessages_en_US.hpp | 4 +++-
.../util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg | 2 +-
src/xercesc/util/Platforms/Win32/Version.rc | 2 +-
src/xercesc/util/regx/RegxParser.cpp | 7 ++++++-
6 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
index 1e2397078..c76ed84b8 100644
--- a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
+++ b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
@@ -551,7 +551,7 @@
<Message Id="Val_InvalidElemId" Text="The element id was invalid"/>
<Message Id="Val_CantHaveIntSS" Text="When reusing the Grammar, no internal subset is allowed"/>
<Message Id="XMLRec_UnknownEncoding" Text="The passed recognizer encoding was not known"/>
- <Message Id="Parser_Parse1" Text="Wrong character"/>
+ <Message Id="Parser_Parse1" Text="The parser found an illegal character at offset {0} in the regular expression '{1}'."/>
<Message Id="Parser_Parse2" Text="Invalid reference number"/>
<Message Id="Parser_Next1" Text="A character is required after \"/>
<Message Id="Parser_Next2" Text="'?' is not expected. '(?:' or '(?=' or '(?!' or '(?<' or '(?#' or '(?>'?"/>
diff --git a/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt b/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
index c58c3012f..cead634f9 100644
--- a/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
+++ b/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
@@ -552,7 +552,7 @@ en_US {
"The element id was invalid " ,
"When reusing the Grammar, no internal subset is allowed " ,
"The passed recognizer encoding was not known " ,
- "Wrong character " ,
+ "The parser found an illegal character at offset {0} in the regular expression '{1}'. " ,
"Invalid reference number " ,
"A character is required after \ " ,
"'?' is not expected. '(?:' or '(?=' or '(?!' or '(?<' or '(?#' or '(?>'? " ,
diff --git a/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp b/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
index 7bb8392c5..ccdc14172 100644
--- a/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
+++ b/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
@@ -1126,7 +1126,9 @@ const XMLCh gXMLExceptArray[][128] =
0x0061,0x006C,0x0020,0x0073,0x0075,0x0062,0x0073,0x0065,0x0074,0x0020,0x0069,0x0073,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0070,0x0061,0x0073,0x0073,0x0065,0x0064,0x0020,0x0072,0x0065,0x0063,0x006F,0x0067,0x006E,0x0069,0x007A,0x0065,0x0072,0x0020,0x0065,0x006E,0x0063,0x006F,0x0064,0x0069,0x006E,0x0067,0x0020,0x0077,0x0061,0x0073,0x0020,
0x006E,0x006F,0x0074,0x0020,0x006B,0x006E,0x006F,0x0077,0x006E,0x00 }
- , { 0x0057,0x0072,0x006F,0x006E,0x0067,0x0020,0x0063,0x0068,0x0061,0x0072,0x0061,0x0063,0x0074,0x0065,0x0072,0x00 }
+ , { 0x0054,0x0068,0x0065,0x0020,0x0070,0x0061,0x0072,0x0073,0x0065,0x0072,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x0020,0x0061,0x006E,0x0020,0x0069,0x006C,0x006C,0x0065,0x0067,0x0061,0x006C,0x0020,0x0063,0x0068,0x0061,0x0072,0x0061,0x0063,0x0074,
+ 0x0065,0x0072,0x0020,0x0061,0x0074,0x0020,0x006F,0x0066,0x0066,0x0073,0x0065,0x0074,0x0020,0x007B,0x0030,0x007D,0x0020,0x0069,0x006E,0x0020,0x0074,0x0068,0x0065,0x0020,0x0072,0x0065,0x0067,0x0075,0x006C,0x0061,0x0072,0x0020,0x0065,0x0078,0x0070,
+ 0x0072,0x0065,0x0073,0x0073,0x0069,0x006F,0x006E,0x0020,0x0027,0x007B,0x0031,0x007D,0x0027,0x002E,0x00 }
, { 0x0049,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x0072,0x0065,0x0066,0x0065,0x0072,0x0065,0x006E,0x0063,0x0065,0x0020,0x006E,0x0075,0x006D,0x0062,0x0065,0x0072,0x00 }
, { 0x0041,0x0020,0x0063,0x0068,0x0061,0x0072,0x0061,0x0063,0x0074,0x0065,0x0072,0x0020,0x0069,0x0073,0x0020,0x0072,0x0065,0x0071,0x0075,0x0069,0x0072,0x0065,0x0064,0x0020,0x0061,0x0066,0x0074,0x0065,0x0072,0x0020,0x005C,0x00 }
, { 0x0027,0x003F,0x0027,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0065,0x0078,0x0070,0x0065,0x0063,0x0074,0x0065,0x0064,0x002E,0x0020,0x0020,0x0027,0x0028,0x003F,0x003A,0x0027,0x0020,0x006F,0x0072,0x0020,0x0027,0x0028,0x003F,0x003D,
diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
index 50dfb596c..30cd8ed57 100644
--- a/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
@@ -535,7 +535,7 @@ $set 3
117 The element id was invalid
118 When reusing the Grammar, no internal subset is allowed
119 The passed recognizer encoding was not known
-120 Wrong character
+120 The parser found an illegal character at offset {0} in the regular expression '{1}'.
121 Invalid reference number
122 A character is required after \
123 '?' is not expected. '(?:' or '(?=' or '(?!' or '(?<' or '(?#' or '(?>'?
diff --git a/src/xercesc/util/Platforms/Win32/Version.rc b/src/xercesc/util/Platforms/Win32/Version.rc
index 87f454b7b..d74bc3a2c 100644
--- a/src/xercesc/util/Platforms/Win32/Version.rc
+++ b/src/xercesc/util/Platforms/Win32/Version.rc
@@ -637,7 +637,7 @@ BEGIN
8309 L"\x0054\x0068\x0065\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0069\x0064\x0020\x0077\x0061\x0073\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x00"
8310 L"\x0057\x0068\x0065\x006E\x0020\x0072\x0065\x0075\x0073\x0069\x006E\x0067\x0020\x0074\x0068\x0065\x0020\x0047\x0072\x0061\x006D\x006D\x0061\x0072\x002C\x0020\x006E\x006F\x0020\x0069\x006E\x0074\x0065\x0072\x006E\x0061\x006C\x0020\x0073\x0075\x0062\x0073\x0065\x0074\x0020\x0069\x0073\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x00"
8311 L"\x0054\x0068\x0065\x0020\x0070\x0061\x0073\x0073\x0065\x0064\x0020\x0072\x0065\x0063\x006F\x0067\x006E\x0069\x007A\x0065\x0072\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x0077\x0061\x0073\x0020\x006E\x006F\x0074\x0020\x006B\x006E\x006F\x0077\x006E\x00"
- 8312 L"\x0057\x0072\x006F\x006E\x0067\x0020\x0063\x0068\x0061\x0072\x0061\x0063\x0074\x0065\x0072\x00"
+ 8312 L"\x0054\x0068\x0065\x0020\x0070\x0061\x0072\x0073\x0065\x0072\x0020\x0066\x006F\x0075\x006E\x0064\x0020\x0061\x006E\x0020\x0069\x006C\x006C\x0065\x0067\x0061\x006C\x0020\x0063\x0068\x0061\x0072\x0061\x0063\x0074\x0065\x0072\x0020\x0061\x0074\x0020\x006F\x0066\x0066\x0073\x0065\x0074\x0020\x007B\x0030\x007D\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x0072\x0065\x0067\x0075\x006C\x0061\x0072\x0020\x0065\x0078\x0070\x0072\x0065\x0073\x0073\x0069\x006F\x006E\x0020\x0027\x007B\x0031\x007D\x0027\x002E\x00"
8313 L"\x0049\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x0072\x0065\x0066\x0065\x0072\x0065\x006E\x0063\x0065\x0020\x006E\x0075\x006D\x0062\x0065\x0072\x00"
8314 L"\x0041\x0020\x0063\x0068\x0061\x0072\x0061\x0063\x0074\x0065\x0072\x0020\x0069\x0073\x0020\x0072\x0065\x0071\x0075\x0069\x0072\x0065\x0064\x0020\x0061\x0066\x0074\x0065\x0072\x0020\x005C\x00"
8315 L"\x0027\x003F\x0027\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0065\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x002E\x0020\x0020\x0027\x0028\x003F\x003A\x0027\x0020\x006F\x0072\x0020\x0027\x0028\x003F\x003D\x0027\x0020\x006F\x0072\x0020\x0027\x0028\x003F\x0021\x0027\x0020\x006F\x0072\x0020\x0027\x0028\x003F\x003C\x0027\x0020\x006F\x0072\x0020\x0027\x0028\x003F\x0023\x0027\x0020\x006F\x0072\x0020\x0027\x0028\x003F\x003E\x0027\x003F\x00"
diff --git a/src/xercesc/util/regx/RegxParser.cpp b/src/xercesc/util/regx/RegxParser.cpp
index 5e7139264..bd495a311 100644
--- a/src/xercesc/util/regx/RegxParser.cpp
+++ b/src/xercesc/util/regx/RegxParser.cpp
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.13 2005/02/20 01:58:17 cargilld
+ * Update error message from regular expressions.
+ *
* Revision 1.12 2004/09/08 13:56:47 peiyongz
* Apache License Version 2.0
*
@@ -188,7 +191,9 @@ Token* RegxParser::parse(const XMLCh* const regxStr, const int options) {
Token* retTok = parseRegx();
if (fOffset != fStringLen) {
- ThrowXMLwithMemMgr(ParseException,XMLExcepts::Parser_Parse1, fMemoryManager);
+ XMLCh value1[65];
+ XMLString::binToText(fOffset, value1, 64, 10, fMemoryManager);
+ ThrowXMLwithMemMgr2(ParseException,XMLExcepts::Parser_Parse1, value1, fString, fMemoryManager);
}
if (fReferences != 0) {
--
GitLab