cargilld 2005/02/19 17:58:17
Modified: c/src/xercesc/NLS/EN_US XMLErrList_EN_US.Xml
c/src/xercesc/util/MsgLoaders/ICU/resources en_US.txt
c/src/xercesc/util/MsgLoaders/InMemory
XercesMessages_en_US.hpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
XercesMessages_en_US.Msg
c/src/xercesc/util/Platforms/Win32 Version.rc
c/src/xercesc/util/regx RegxParser.cpp
Log:
Update error message from regular expressions.
Revision Changes Path
1.56 +1 -1 xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
Index: XMLErrList_EN_US.Xml
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- XMLErrList_EN_US.Xml 14 Dec 2004 02:06:39 -0000 1.55
+++ XMLErrList_EN_US.Xml 20 Feb 2005 01:58:16 -0000 1.56
@@ -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 '(?>'?"/>
1.48 +1 -1
xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Index: en_US.txt
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- en_US.txt 14 Dec 2004 02:06:39 -0000 1.47
+++ en_US.txt 20 Feb 2005 01:58:16 -0000 1.48
@@ -552,7 +552,7 @@
"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 '(?>'? " ,
1.38 +3 -1
xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Index: XercesMessages_en_US.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- XercesMessages_en_US.hpp 14 Dec 2004 02:06:39 -0000 1.37
+++ XercesMessages_en_US.hpp 20 Feb 2005 01:58:16 -0000 1.38
@@ -1126,7 +1126,9 @@
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,
1.37 +1 -1
xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Index: XercesMessages_en_US.Msg
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- XercesMessages_en_US.Msg 14 Dec 2004 02:06:39 -0000 1.36
+++ XercesMessages_en_US.Msg 20 Feb 2005 01:58:16 -0000 1.37
@@ -535,7 +535,7 @@
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
'(?>'?
1.68 +1 -1 xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc
Index: Version.rc
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Version.rc 14 Dec 2004 02:06:39 -0000 1.67
+++ Version.rc 20 Feb 2005 01:58:17 -0000 1.68
@@ -637,7 +637,7 @@
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"
1.13 +6 -1 xml-xerces/c/src/xercesc/util/regx/RegxParser.cpp
Index: RegxParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegxParser.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RegxParser.cpp 8 Sep 2004 13:56:47 -0000 1.12
+++ RegxParser.cpp 20 Feb 2005 01:58:17 -0000 1.13
@@ -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* 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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
