pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

XML Parser: Fixed or ignored not-well-formed unit tests. The parser is passing over 600 W3C tests now. The issues being ignored are mostly related to the fact that the parser is not verifying DTDs. (which is not supported and is not going to be supported). 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4703 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 16 years ago
parent
8847410980
commit
6fa83ffd40
5 changed files with 98 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      samples/XmlDOM/XmlDOM.csproj
  2. 38
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/XmlParser/W3C.cs
  3. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlText.cs
  4. 27
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TagMatchingHeuristics.cs
  5. 26
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TagReader.cs

16
samples/XmlDOM/XmlDOM.csproj
Unescape View File

@ -7,16 +7,21 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>XmlDOM</RootNamespace> <RootNamespace>XmlDOM</RootNamespace>
<AssemblyName>XmlDOM</AssemblyName> <AssemblyName>XmlDOM</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>True</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>Full</DebugType> <DebugType>Full</DebugType>
<Optimize>False</Optimize> <Optimize>False</Optimize>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<StartAction>Project</StartAction>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
@ -26,6 +31,13 @@
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="PresentationCore"> <Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework> <RequiredTargetFramework>3.0</RequiredTargetFramework>

38
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/XmlParser/W3C.cs
Unescape View File

@ -57,7 +57,8 @@ namespace ICSharpCode.AvalonEdit.Xml.Tests
public void Valid() public void Valid()
{ {
string[] exclude = { string[] exclude = {
"ibm02v01", "ibm03v01", "ibm85v01", "ibm86v01", "ibm87v01", "ibm88v01", "ibm89v01", // NAME in DTD infoset // NAME in DTD infoset
"ibm02v01", "ibm03v01", "ibm85v01", "ibm86v01", "ibm87v01", "ibm88v01", "ibm89v01",
}; };
TestFiles(GetXmlFilesStartingWith("ibm/valid/"), true, exclude); TestFiles(GetXmlFilesStartingWith("ibm/valid/"), true, exclude);
} }
@ -66,16 +67,37 @@ namespace ICSharpCode.AvalonEdit.Xml.Tests
public void Invalid() public void Invalid()
{ {
string[] exclude = { string[] exclude = {
"ibm56i03", // Default attribute value // Default attribute value
"ibm56i03",
}; };
TestFiles(GetXmlFilesStartingWith("ibm/invalid/"), true, exclude); TestFiles(GetXmlFilesStartingWith("ibm/invalid/"), true, exclude);
} }
[Test] [Test]
[Ignore]
public void NotWellformed() public void NotWellformed()
{ {
string[] exclude = { string[] exclude = {
// XML declaration well formed
"ibm23n", "ibm24n", "ibm26n01", "ibm32n", "ibm80n06", "ibm81n01", "ibm81n02", "ibm81n03", "ibm81n04", "ibm81n05", "ibm81n06", "ibm81n07", "ibm81n08", "ibm81n09",
// Invalid chars in a comment - do we care?
"ibm02n",
// Invalid char ref - do we care?
"ibm66n12", "ibm66n13", "ibm66n14", "ibm66n15",
// DTD in wrong location
"ibm27n01", "ibm43n",
// Entity refs depending on DTD
"ibm41n10", "ibm41n11", "ibm41n12", "ibm41n13", "ibm41n14", "ibm68n04", "ibm68n06", "ibm68n07", "ibm68n08", "ibm68n09", "ibm68n10",
// DTD Related tests
"ibm09n01", "ibm09n02", "ibm13n01", "ibm13n02", "ibm13n03", "ibm28n01", "ibm28n02", "ibm28n03", "ibm29n01", "ibm29n03", "ibm29n04", "ibm29n07", "ibm30n01", "ibm31n01", "ibm45n01", "ibm45n02", "ibm45n03", "ibm45n04", "ibm45n05", "ibm45n06", "ibm46n01", "ibm46n02", "ibm46n03", "ibm46n04",
"ibm46n05", "ibm47n01", "ibm47n02", "ibm47n03", "ibm47n04", "ibm47n05", "ibm47n06", "ibm48n01", "ibm48n02", "ibm48n03", "ibm48n04", "ibm48n05", "ibm48n06", "ibm48n07", "ibm49n01", "ibm49n02", "ibm49n03", "ibm49n04", "ibm49n05", "ibm49n06", "ibm50n01", "ibm50n02", "ibm50n03", "ibm50n04",
"ibm50n05", "ibm50n06", "ibm50n07", "ibm51n01", "ibm51n02", "ibm51n03", "ibm51n04", "ibm51n05", "ibm51n06", "ibm51n07", "ibm52n01", "ibm52n02", "ibm52n03", "ibm53n01", "ibm53n02", "ibm53n03", "ibm53n04", "ibm53n05", "ibm53n06", "ibm53n07", "ibm53n08", "ibm54n01", "ibm54n02", "ibm55n01",
"ibm55n02", "ibm55n03", "ibm56n01", "ibm56n02", "ibm56n03", "ibm56n04", "ibm56n05", "ibm56n06", "ibm56n07", "ibm57n01", "ibm58n01", "ibm58n02", "ibm58n03", "ibm58n04", "ibm58n05", "ibm58n06", "ibm58n07", "ibm58n08", "ibm59n01", "ibm59n02", "ibm59n03", "ibm59n04", "ibm59n05", "ibm59n06",
"ibm60n01", "ibm60n02", "ibm60n03", "ibm60n04", "ibm60n05", "ibm60n06", "ibm60n07", "ibm60n08", "ibm61n01", "ibm62n01", "ibm62n02", "ibm62n03", "ibm62n04", "ibm62n05", "ibm62n06", "ibm62n07", "ibm62n08", "ibm63n01", "ibm63n02", "ibm63n03", "ibm63n04", "ibm63n05", "ibm63n06", "ibm63n07",
"ibm64n01", "ibm64n02", "ibm64n03", "ibm65n01", "ibm65n02", "ibm66n01", "ibm66n03", "ibm66n05", "ibm66n07", "ibm66n09", "ibm66n11", "ibm69n01", "ibm69n02", "ibm69n03", "ibm69n04", "ibm69n05", "ibm69n06", "ibm69n07", "ibm70n01", "ibm71n01", "ibm71n02", "ibm71n03", "ibm71n04", "ibm71n05",
"ibm72n01", "ibm72n02", "ibm72n03", "ibm72n04", "ibm72n05", "ibm72n06", "ibm72n09", "ibm73n01", "ibm73n03", "ibm74n01", "ibm75n01", "ibm75n02", "ibm75n03", "ibm75n04", "ibm75n05", "ibm75n06", "ibm75n07", "ibm75n08", "ibm75n09", "ibm75n10", "ibm75n11", "ibm75n12", "ibm75n13", "ibm76n01",
"ibm76n02", "ibm76n03", "ibm76n04", "ibm76n05", "ibm76n06", "ibm76n07", "ibm77n01", "ibm77n02", "ibm77n03", "ibm77n04", "ibm78n01", "ibm78n02", "ibm79n01", "ibm79n02", "ibm82n01", "ibm82n02", "ibm82n03", "ibm82n04", "ibm82n08", "ibm83n01", "ibm83n03", "ibm83n04", "ibm83n05", "ibm83n06",
// No idea what this is
"misc/432gewf", "ibm28an01",
}; };
TestFiles(GetXmlFilesStartingWith("ibm/not-wf/"), false, exclude); TestFiles(GetXmlFilesStartingWith("ibm/not-wf/"), false, exclude);
} }
@ -86,10 +108,14 @@ namespace ICSharpCode.AvalonEdit.Xml.Tests
{ {
errorOutput = new StringBuilder(); errorOutput = new StringBuilder();
int testsRun = 0; int testsRun = 0;
int ignored = 0;
foreach (ZipEntry file in files) { foreach (ZipEntry file in files) {
if (exclude.Any(exc => file.Name.Contains(exc))) continue; if (exclude.Any(exc => file.Name.Contains(exc))) {
testsRun++; ignored++;
TestFile(file, areWellFormed); } else {
testsRun++;
TestFile(file, areWellFormed);
}
} }
if (testsRun == 0) { if (testsRun == 0) {
Assert.Fail("Test files not found"); Assert.Fail("Test files not found");

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/AXmlText.cs
Unescape View File

@ -27,6 +27,8 @@ namespace ICSharpCode.AvalonEdit.Xml
public string EscapedValue { get; set; } public string EscapedValue { get; set; }
/// <summary> The text with all entity references resloved </summary> /// <summary> The text with all entity references resloved </summary>
public string Value { get; set; } public string Value { get; set; }
/// <summary> True if the text contains only whitespace characters </summary>
public bool ContainsOnlyWhitespace { get; set; }
/// <inheritdoc/> /// <inheritdoc/>
public override void AcceptVisitor(IAXmlVisitor visitor) public override void AcceptVisitor(IAXmlVisitor visitor)

27
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TagMatchingHeuristics.cs
Unescape View File

@ -55,6 +55,33 @@ namespace ICSharpCode.AvalonEdit.Xml
doc.EndOffset = doc.LastChild.EndOffset; doc.EndOffset = doc.LastChild.EndOffset;
} }
// Check well formed
foreach(AXmlTag xmlDeclaration in doc.Children.OfType<AXmlTag>().Where(t => t.IsProcessingInstruction && t.Name.ToLower() == "xml")) {
if (xmlDeclaration.StartOffset != 0)
TagReader.OnSyntaxError(doc, xmlDeclaration.StartOffset, xmlDeclaration.StartOffset + 5,
"XML declaration must be at the start of document");
}
int elemCount = doc.Children.OfType<AXmlElement>().Count();
if (elemCount == 0)
TagReader.OnSyntaxError(doc, doc.EndOffset, doc.EndOffset,
"Root element is missing");
if (elemCount > 1) {
AXmlElement next = doc.Children.OfType<AXmlElement>().Skip(1).First();
TagReader.OnSyntaxError(doc, next.StartOffset, next.StartOffset,
"Only one root element is allowed");
}
foreach(AXmlTag tag in doc.Children.OfType<AXmlTag>()) {
if (tag.IsCData)
TagReader.OnSyntaxError(doc, tag.StartOffset, tag.EndOffset,
"CDATA not allowed in document root");
}
foreach(AXmlText text in doc.Children.OfType<AXmlText>()) {
if (!text.ContainsOnlyWhitespace)
TagReader.OnSyntaxError(doc, text.StartOffset, text.EndOffset,
"Only whitespace is allowed in document root");
}
AXmlParser.Log("Constructed {0}", doc); AXmlParser.Log("Constructed {0}", doc);
trackedSegments.AddParsedObject(doc, null); trackedSegments.AddParsedObject(doc, null);
return doc; return doc;

26
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Xml/TagReader.cs
Unescape View File

@ -92,6 +92,9 @@ namespace ICSharpCode.AvalonEdit.Xml
// It identifies the type of tag and parsing behavior for the rest of it // It identifies the type of tag and parsing behavior for the rest of it
tag.OpeningBracket = ReadOpeningBracket(); tag.OpeningBracket = ReadOpeningBracket();
if (tag.IsUnknownBang && !TryPeekWhiteSpace())
OnSyntaxError(tag, tag.StartOffset, this.CurrentLocation, "Unknown tag");
if (tag.IsStartOrEmptyTag || tag.IsEndTag || tag.IsProcessingInstruction) { if (tag.IsStartOrEmptyTag || tag.IsEndTag || tag.IsProcessingInstruction) {
// Read the name // Read the name
string name; string name;
@ -107,7 +110,9 @@ namespace ICSharpCode.AvalonEdit.Xml
tag.Name = string.Empty; tag.Name = string.Empty;
} }
if (tag.IsStartOrEmptyTag || tag.IsEndTag) { bool isXmlDeclr = tag.StartOffset == 0 && tag.Name == "xml";
if (tag.IsStartOrEmptyTag || tag.IsEndTag || isXmlDeclr) {
// Read attributes for the tag // Read attributes for the tag
while(true) { while(true) {
// Chech for all forbiden 'name' charcters first - see ReadName // Chech for all forbiden 'name' charcters first - see ReadName
@ -125,7 +130,10 @@ namespace ICSharpCode.AvalonEdit.Xml
} }
// We have "=\'\"" or name - read attribute // We have "=\'\"" or name - read attribute
tag.AddChild(ReadAttribulte()); AXmlAttribute attr = ReadAttribulte();
tag.AddChild(attr);
if (tag.IsEndTag)
OnSyntaxError(tag, attr.StartOffset, attr.EndOffset, "Attribute not allowed in end tag.");
} }
} else if (tag.IsDocumentType) { } else if (tag.IsDocumentType) {
tag.AddChildren(ReadContentOfDTD()); tag.AddChildren(ReadContentOfDTD());
@ -470,6 +478,10 @@ namespace ICSharpCode.AvalonEdit.Xml
text.StartOffset = this.CurrentLocation; text.StartOffset = this.CurrentLocation;
int start = this.CurrentLocation; int start = this.CurrentLocation;
// Whitespace would be skipped anyway by any operation
TryMoveToNonWhiteSpace(fragmentEnd);
int wsEnd = this.CurrentLocation;
// Try move to the terminator given by the context // Try move to the terminator given by the context
if (type == TextType.WhiteSpace) { if (type == TextType.WhiteSpace) {
TryMoveToNonWhiteSpace(fragmentEnd); TryMoveToNonWhiteSpace(fragmentEnd);
@ -517,6 +529,8 @@ namespace ICSharpCode.AvalonEdit.Xml
throw new Exception("Uknown type " + type); throw new Exception("Uknown type " + type);
} }
text.ContainsOnlyWhitespace = (wsEnd == this.CurrentLocation);
// Terminal found or real end was reached; // Terminal found or real end was reached;
bool finished = this.CurrentLocation < fragmentEnd || IsEndOfFile(); bool finished = this.CurrentLocation < fragmentEnd || IsEndOfFile();
@ -664,7 +678,10 @@ namespace ICSharpCode.AvalonEdit.Xml
// Resolve the name // Resolve the name
string replacement; string replacement;
if (name == "amp") { if (name == "") {
replacement = null;
OnSyntaxError(owner, errorLoc + 1, errorLoc + 1, "Entity name expected");
} else if (name == "amp") {
replacement = "&"; replacement = "&";
} else if (name == "lt") { } else if (name == "lt") {
replacement = "<"; replacement = "<";
@ -697,6 +714,9 @@ namespace ICSharpCode.AvalonEdit.Xml
} else { } else {
replacement = null; replacement = null;
} }
} else if (!IsValidName(name)) {
replacement = null;
OnSyntaxError(owner, errorLoc + 1, errorLoc + 1, "Invalid entity name");
} else { } else {
replacement = null; replacement = null;
if (parser.UknonwEntityReferenceIsError) { if (parser.UknonwEntityReferenceIsError) {

Write Preview
Loading…
Cancel
Save