From: Oleg T. <he...@us...> - 2004-10-26 19:27:18
|
Update of /cvsroot/mvp-xml/XPointer/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11154/v1/src Modified Files: ElementSchemaPointerPart.cs XPath1SchemaPointerPart.cs XPointerParser.cs XPointerSchemaPointerPart.cs XmlnsSchemaPointerPart.cs Log Message: Syntax error should lead to an exception. Index: ElementSchemaPointerPart.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/ElementSchemaPointerPart.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ElementSchemaPointerPart.cs 4 Oct 2004 19:04:34 -0000 1.2 +++ ElementSchemaPointerPart.cs 26 Oct 2004 19:26:50 -0000 1.3 @@ -117,9 +117,8 @@ lexer.NextLexeme(); } if (lexer.Kind != XPointerLexer.LexKind.RRBracket) - { - Debug.WriteLine(SR.InvalidTokenInElementSchemeWhileClosingRoundBracketExpected); - return null; + { + throw new XPointerSyntaxException(SR.InvalidTokenInElementSchemeWhileClosingRoundBracketExpected); } if (part.NCName==null && part.ChildSequence.Count==0) { Index: XPointerParser.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointerParser.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XPointerParser.cs 4 Oct 2004 19:04:35 -0000 1.2 +++ XPointerParser.cs 26 Oct 2004 19:26:51 -0000 1.3 @@ -39,7 +39,8 @@ } } if (schemaNSURI == null) - throw new XPointerSyntaxException(SR.GetString("UndeclaredPrefix", lexer.Prefix)); + //No binding for the prefix - ignore pointer part + return XPointerSchema.SchemaType.Unknown; } else schemaNSURI = String.Empty; Index: XPointerSchemaPointerPart.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointerSchemaPointerPart.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XPointerSchemaPointerPart.cs 4 Oct 2004 19:04:35 -0000 1.2 +++ XPointerSchemaPointerPart.cs 26 Oct 2004 19:26:52 -0000 1.3 @@ -66,8 +66,7 @@ } catch (Exception e) { - Debug.WriteLine(SR.GetString("SyntaxErrorInXPointerSchemeData", e.Message)); - return null; + throw new XPointerSyntaxException(SR.GetString("SyntaxErrorInXPointerSchemeData", e.Message)); } return part; } Index: XmlnsSchemaPointerPart.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XmlnsSchemaPointerPart.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XmlnsSchemaPointerPart.cs 4 Oct 2004 19:04:35 -0000 1.2 +++ XmlnsSchemaPointerPart.cs 26 Oct 2004 19:26:52 -0000 1.3 @@ -103,8 +103,7 @@ } catch (Exception e) { - Debug.WriteLine(SR.GetString("SyntaxErrorInXmlnsSchemeData", e.Message)); - return null; + throw new XPointerSyntaxException(SR.GetString("SyntaxErrorInXmlnsSchemeData", e.Message)); } return new XmlnsSchemaPointerPart(prefix, nsURI); } Index: XPath1SchemaPointerPart.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPath1SchemaPointerPart.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XPath1SchemaPointerPart.cs 4 Oct 2004 19:04:35 -0000 1.2 +++ XPath1SchemaPointerPart.cs 26 Oct 2004 19:26:51 -0000 1.3 @@ -65,9 +65,8 @@ } catch (Exception e) { - Debug.WriteLine(SR.GetString("SyntaxErrorInXPath1SchemeData", - e.Message)); - return null; + throw new XPointerSyntaxException(SR.GetString("SyntaxErrorInXPath1SchemeData", + e.Message)); } return part; } |