Author: atsushi
Date: 2005-03-28 01:48:47 -0500 (Mon, 28 Mar 2005)
New Revision: 42301
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/ChangeLog
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncTokenizer.cs
Log:
2005-03-28 Atsushi Enomoto <[EMAIL PROTECTED]>
* RncTokenizer.cs : check names strictly.
* RncParser.jay : quick workaround that "datatype" is rejected as
top level content. We should fix the problem that annotation
elements are not accepted instead of datatype later.
Modified: trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/ChangeLog
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/ChangeLog
2005-03-28 04:28:53 UTC (rev 42300)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/ChangeLog
2005-03-28 06:48:47 UTC (rev 42301)
@@ -1,5 +1,12 @@
2005-03-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * RncTokenizer.cs : check names strictly.
+ * RncParser.jay : quick workaround that "datatype" is rejected as
+ top level content. We should fix the problem that annotation
+ elements are not accepted instead of datatype later.
+
+2005-03-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* XmlChar.cs : copied from system.xml.
* RncTokenizer.cs : check character validity.
Handle \-prefixed keyword name more strictly.
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay
2005-03-28 04:28:53 UTC (rev 42300)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay
2005-03-28 06:48:47 UTC (rev 42301)
@@ -1094,16 +1094,19 @@
;
ForeignElementNameNotKeyword /* returns XmlQualifiedName */
-/* LAMESPEC: unprefixed Identifier causes conflict */
+/* FIXME: unprefixed Identifier causes conflict */
: /*Identifier
{
$$ = new XmlQualifiedName ((string) $1, String.Empty);
}
- |*/ PrefixedName
+*/
+/* FIXME: prefixed name causes conflict */
+ | /*PrefixedName
{
// Constraint: RELAX NG namespace URI
$$ = (XmlQualifiedName) $1;
}
+ */
;
AnnotationAttributesContent /* returns null */
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncTokenizer.cs
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncTokenizer.cs
2005-03-28 04:28:53 UTC (rev 42300)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncTokenizer.cs
2005-03-28 06:48:47 UTC (rev 42301)
@@ -310,8 +310,11 @@
{
int index = 0;
bool loop = true;
+ int c = PeekChar ();
+ if (!XmlChar.IsFirstNameChar (c) ||
!XmlChar.IsNCNameChar (c))
+ throw new RelaxngException (String.Format
("Invalid NCName start character: {0}", c));
do {
- int c = PeekChar ();
+ c = PeekChar ();
switch (c) {
case -1:
case ' ':
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
