mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.XML/Makefile
View File

@@ -66,7 +66,7 @@ EXTRA_DISTFILES = \
$(nist_dom_files:%=Test/System.Xml/nist_dom/%)
System.Xml.XPath/$(PROFILE)_Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
(cd System.Xml.XPath; $(topdir)/../jay/jay -ct < $(topdir)/../jay/skeleton.cs Parser.jay >> $(PROFILE)_Parser.cs)
(cd System.Xml.XPath; $(topdir)/../jay/jay -ct < $(topdir)/../jay/skeleton.cs Parser.jay > $(PROFILE)_Parser.cs)
Mono.Xml.Xsl/$(PROFILE)_PatternParser.jay: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
sed "s/\%start Expr/\%start Pattern/" $< >$@

2
mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs
View File

@@ -38,7 +38,6 @@ using System.Xml.XPath;
using Mono.Xml;
#endif
#if NET_2_0
using System.Collections.Generic;
using QName = System.Xml.XmlQualifiedName;
@@ -818,4 +817,3 @@ namespace Mono.Xml.Schema
}
}
#endif

5
mcs/class/System.XML/Mono.Xml.Schema/XsdIdentityState.cs
View File

@@ -38,13 +38,8 @@ using System.Globalization;
using System.Xml;
using System.Xml.Schema;
#if NET_2_0
using NSResolver = System.Xml.IXmlNamespaceResolver;
using ValException = System.Xml.Schema.XmlSchemaValidationException;
#else
using NSResolver = System.Xml.XmlNamespaceManager;
using ValException = System.Xml.Schema.XmlSchemaException;
#endif
namespace Mono.Xml.Schema
{

8
mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
View File

@@ -29,9 +29,7 @@
//
using System;
using System.Collections;
#if NET_2_0
using System.Collections.Generic;
#endif
using System.Collections.Specialized;
using System.IO;
using System.Text;
@@ -39,11 +37,7 @@ using System.Xml;
using System.Xml.Schema;
using Mono.Xml;
#if NET_2_0
using ValException = System.Xml.Schema.XmlSchemaValidationException;
#else
using ValException = System.Xml.Schema.XmlSchemaException;
#endif
using QName = System.Xml.XmlQualifiedName;
using ContentProc = System.Xml.Schema.XmlSchemaContentProcessing;
@@ -1732,7 +1726,6 @@ namespace Mono.Xml.Schema
}
}
#if NET_2_0
public XmlSchemaType ActualSchemaType {
get {
object at = ActualType;
@@ -1745,7 +1738,6 @@ namespace Mono.Xml.Schema
return st;
}
}
#endif
public bool IsInvalid {
get { return State == XsdValidationState.Invalid; }

2
mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs
View File

@@ -34,7 +34,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -804,4 +803,3 @@ namespace Mono.Xml.XPath
}
}
#endif

8
mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs
View File

@@ -218,12 +218,8 @@ namespace Mono.Xml.XPath
public override bool IsDefault {
get {
#if NET_2_0
IXmlSchemaInfo si = current as IXmlSchemaInfo;
return si != null && si.IsDefault;
#else
return false; // no way to check this.
#endif
}
}
@@ -232,11 +228,9 @@ namespace Mono.Xml.XPath
get { return '\"'; }
}
#if NET_2_0
public override IXmlSchemaInfo SchemaInfo {
get { return current.SchemaInfo; }
}
#endif
public override string XmlLang {
get { return current.XmlLang; }
@@ -498,10 +492,8 @@ namespace Mono.Xml.XPath
{
if (eof)
return false;
#if NET_2_0
if (Binary != null)
Binary.Reset ();
#endif
switch (ReadState) {
case ReadState.Interactive:

2
mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs
View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections.Generic;
@@ -249,4 +248,3 @@ namespace Mono.Xml
}
}
#endif

4
mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
View File

@@ -30,7 +30,6 @@
// Similar to SAX DefaultHandler
//
#if NET_2_0
using System;
using System.Collections.Generic;
using System.Xml;
@@ -53,7 +52,6 @@ namespace Mono.Xml
#region Properties
#if NET_2_0
public override bool CanReadBinaryContent {
get { return reader.CanReadBinaryContent; }
}
@@ -61,7 +59,6 @@ namespace Mono.Xml
public override bool CanReadValueChunk {
get { return reader.CanReadValueChunk; }
}
#endif
// This is the only one non-overriden property.
public XmlReader Reader {
@@ -284,4 +281,3 @@ namespace Mono.Xml
}
}
#endif

98
mcs/class/System.XML/System.Xml.Schema/BuiltInDatatype.cs
View File

File diff suppressed because it is too large Load Diff

2
mcs/class/System.XML/System.Xml.Schema/IXmlSchemaInfo.cs
View File

@@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
namespace System.Xml.Schema
{
public interface IXmlSchemaInfo
@@ -48,4 +47,3 @@ namespace System.Xml.Schema
XmlSchemaValidity Validity { get; }
}
}
#endif

4
mcs/class/System.XML/System.Xml.Schema/ValidationEventArgs.cs
View File

@@ -28,11 +28,7 @@ namespace System.Xml.Schema
/// <summary>
/// Summary description for ValidationEventArgs.
/// </summary>
#if NET_2_0
public class ValidationEventArgs : EventArgs
#else
public sealed class ValidationEventArgs : EventArgs
#endif
{
private XmlSchemaException exception;
private string message;

2
mcs/class/System.XML/System.Xml.Schema/XmlAtomicValue.cs
View File

@@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.Collections;
using System.Xml;
@@ -807,4 +806,3 @@ namespace System.Xml.Schema
}
}
#endif

4
mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
View File

@@ -476,11 +476,7 @@ namespace System.Xml.Schema
if (this.SourceUri != null && this.SourceUri != String.Empty)
baseUri = new Uri (this.SourceUri);
Uri abs = resolver.ResolveUri (baseUri, relativeUri);
#if NET_2_0
return abs != null ? abs.OriginalString : String.Empty;
#else
return abs != null ? abs.ToString () : String.Empty;
#endif
}
void ProcessExternal (ValidationEventHandler handler, List<CompiledSchemaMemo> handledUris, XmlResolver resolver, XmlSchemaExternal ext, XmlSchemaSet col)

8
mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttribute.cs
View File

@@ -39,9 +39,7 @@ namespace System.Xml.Schema
public class XmlSchemaAttribute : XmlSchemaAnnotated
{
private object attributeType;
#if NET_2_0
private XmlSchemaSimpleType attributeSchemaType;
#endif
private string defaultValue;
private string fixedValue;
private string validatedDefaultValue;
@@ -158,9 +156,7 @@ namespace System.Xml.Schema
}
[XmlIgnore]
#if NET_2_0
[Obsolete]
#endif
public object AttributeType
{
get{
@@ -171,7 +167,6 @@ namespace System.Xml.Schema
}
}
#if NET_2_0
[XmlIgnore]
public XmlSchemaSimpleType AttributeSchemaType
{
@@ -182,7 +177,6 @@ namespace System.Xml.Schema
return attributeSchemaType;
}
}
#endif
// Post compilation default value (normalized)
internal string ValidatedDefaultValue
@@ -451,7 +445,6 @@ namespace System.Xml.Schema
else
validatedUse = Use;
#if NET_2_0
if (attributeType != null) {
attributeSchemaType = attributeType as XmlSchemaSimpleType;
if (attributeType == XmlSchemaSimpleType.AnySimpleType)
@@ -459,7 +452,6 @@ namespace System.Xml.Schema
if (attributeSchemaType == null)
attributeSchemaType = XmlSchemaType.GetBuiltInSimpleType (SchemaTypeName);
}
#endif
ValidationId = schema.ValidationId;
return errorCount;

4
mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttributeGroup.cs
View File

@@ -93,11 +93,7 @@ namespace System.Xml.Schema
}
[XmlIgnore]
#if NET_2_0
public XmlQualifiedName QualifiedName
#else
internal XmlQualifiedName QualifiedName
#endif
{
get{ return qualifiedName;}
}

2
mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs
View File

@@ -40,9 +40,7 @@ namespace System.Xml.Schema
/// XmlSchemaCollection is originally designed to be conformant to
/// W3C specification).
/// </summary>
#if NET_2_0
[Obsolete ("Use XmlSchemaSet.")]
#endif
public sealed class XmlSchemaCollection : ICollection, IEnumerable
{
//private fields

4
mcs/class/System.XML/System.Xml.Schema/XmlSchemaCompilationSettings.cs
View File

@@ -35,11 +35,7 @@ using System.Xml.Serialization;
namespace System.Xml.Schema
{
#if NET_2_0
public
#else
internal
#endif
sealed class XmlSchemaCompilationSettings
{
public XmlSchemaCompilationSettings ()

2
mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexType.cs
View File

@@ -620,10 +620,8 @@ namespace System.Xml.Schema
error (h, "Particle whose term is -all- and consists of complex type content particle must have maxOccurs = 1.");
}
#if NET_2_0
if (schema.Schemas.CompilationSettings != null &&
schema.Schemas.CompilationSettings.EnableUpaCheck)
#endif
// This check is optional only after 2.0
contentTypeParticle.ValidateUniqueParticleAttribution (new XmlSchemaObjectTable (),
new ArrayList (), h, schema);

2
mcs/class/System.XML/System.Xml.Schema/XmlSchemaDatatypeVariety.cs
View File

@@ -25,7 +25,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
namespace System.Xml.Schema
{
@@ -37,4 +36,3 @@ namespace System.Xml.Schema
}
}
#endif

8
mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs
View File

@@ -43,9 +43,7 @@ namespace System.Xml.Schema
private XmlSchemaObjectCollection constraints;
private string defaultValue;
private object elementType;
#if NET_2_0
private XmlSchemaType elementSchemaType;
#endif
private XmlSchemaDerivationMethod final;
private string fixedValue;
private XmlSchemaForm form;
@@ -216,9 +214,7 @@ namespace System.Xml.Schema
}
[XmlIgnore]
#if NET_2_0
[Obsolete]
#endif
public object ElementType
{
get {
@@ -229,7 +225,6 @@ namespace System.Xml.Schema
}
}
#if NET_2_0
[XmlIgnore]
public XmlSchemaType ElementSchemaType
{
@@ -240,7 +235,6 @@ namespace System.Xml.Schema
return elementSchemaType;
}
}
#endif
[XmlIgnore]
public XmlSchemaDerivationMethod BlockResolved
@@ -745,7 +739,6 @@ namespace System.Xml.Schema
foreach (XmlSchemaIdentityConstraint ident in Constraints)
ident.Validate (h, schema);
#if NET_2_0
if (elementType != null) {
elementSchemaType = elementType as XmlSchemaType;
if (elementType == XmlSchemaSimpleType.AnySimpleType)
@@ -753,7 +746,6 @@ namespace System.Xml.Schema
if (elementSchemaType == null)
elementSchemaType = XmlSchemaType.GetBuiltInSimpleType (SchemaTypeName);
}
#endif
ValidationId = schema.ValidationId;
return errorCount;

Some files were not shown because too many files have changed in this diff Show More