Commit Graph
34 Commits
Author SHA1 Message Date
Marek Safar 95a6e77b85 Warnings cleanup
svn path=/trunk/mcs/; revision=111839
2008-08-28 16:53:31 +00:00
Atsushi Eno 92573b4266 2008-07-09 Atsushi Enomoto <[email protected]>
* MapCodeGenerator.cs : use explicit element name for explicitly added
	  XmlElementAttribute. (exposed by some product from some company.)


svn path=/trunk/mcs/; revision=107530
2008-07-09 10:52:10 +00:00
Atsushi Eno 8688f906c3 2008-06-05 Atsushi Enomoto <[email protected]>
* XmlSerializationReaderInterpreter.cs, MapCodeGenerator.cs,
	  SerializationCodeGenerator.cs : fixed bug #378696.
	  Default value should not be filled during deserialization, and
	  default values for DateTime/TimeSpan/DateTimeOffset should not be
	  output as raw string in generated code.

	* XmlSerializerTestClasses.cs, DeserializeTests.cs,
	  ComplexDataStructure.cs : added test for bug #378696.
	  Fixed couple of wrong tests that expects default values filled
	  during deserialization.


svn path=/trunk/mcs/; revision=104983
2008-06-05 11:28:51 +00:00
Gert Driesen b10e9acc58 * 82078.xsd: Added new complex type as test for duplicate field
name.
* MapCodeGenerator.cs: Ensure fields that back properties are unique.
* XmlSerializationReaderTests.cs: Marked HandleOutAttributeParameters 
test as NotDotNet on 1.0 profile.
* XmlCodeExporterTests.cs: Improved test for duplicate identifiers.
Fixed ExportTypeMapping_Root and ExportTypeMapping_Field tests to
pass on .NET 2.0.

svn path=/trunk/mcs/; revision=99345
2008-03-30 15:25:11 +00:00
Lluis Sanchez 920e61fefd * MapCodeGenerator.cs, XmlTypeMapMember.cs, XmlTypeMapMemberElement.cs:
If a value type field has the IsNullable property set to true,
  generate it as System.Nullable<T>.

svn path=/trunk/mcs/; revision=99045
2008-03-26 17:34:17 +00:00
Atsushi Eno 1bef3d3d95 2007-10-30 Atsushi Enomoto <[email protected]>
* MapCodeGenerator.cs : found the true culprit for the previous
	  attempt to the fix.

	* XmlCodeExporterTests.cs : enable the previous test again.


svn path=/trunk/mcs/; revision=88365
2007-10-29 10:55:37 +00:00
Atsushi Eno d903039b06 2007-10-30 Atsushi Enomoto <[email protected]>
* MapCodeGenerator.cs, XmlSchemaImporter.cs: revert the previous
	  change; the type is included in the output, but it should not be
	  the base type.

	* XmlCodeExporterTests.cs : disable the previous test; it's reverted.


svn path=/trunk/mcs/; revision=88364
2007-10-29 10:41:53 +00:00
Atsushi Eno 1d08a72b56 2007-10-30 Atsushi Enomoto <[email protected]>
* MapCodeGenerator.cs, XmlSchemaImporter.cs: when a complexType has
	  simple content extension/restriction and the simple base type is
	  schema-defined, it must be written in exported code. Fixed (part
	  of?) bug #336739.

	* XmlCodeExporterTests.cs : added test for (part of?) bug #336739,
	  base simple content enum type output.


svn path=/trunk/mcs/; revision=88363
2007-10-29 10:23:35 +00:00
Atsushi Eno 32f6484459 2007-08-21 Atsushi Enomoto <[email protected]>
* MapCodeGenerator.cs : avoid possible duplicates in generated field 
	  names. Fixed bug #82078.

	* XmlCodeExporterTests.cs : test for bug #82078.

	* 82078.xsd : new test file.

	* Makefile : extra distfiles (82078.xsd).


svn path=/trunk/mcs/; revision=84531
2007-08-21 09:24:42 +00:00
Atsushi Eno b2528c6939 2007-02-19 Atsushi Enomoto <[email protected]>
* TypeData.cs, MapCodeGenerator.cs, XmlMemberMapping.cs,
	  TypeTranslator.cs : removed IsGenericNullable and added
	  set_IsNullable so that it could be simpler.


svn path=/trunk/mcs/; revision=73114
2007-02-19 13:21:31 +00:00
Atsushi Eno c7f990160e 2007-01-18 Atsushi Enomoto <[email protected]>
* TypeData.cs : added get_IsGenericNullable.
	* MapCodeGenerator.cs : in GetDomType(), return Nullable<T> when
	  the TypeData.IsGenericNullable.
	  Use GetDomType() instead of CodeTypeReference.ctor() to not lose
	  Nullable<T> info.
	* XmlSchemaImporter.cs : added isNullable argument to GetTypeData()
	  so that it won't XmlSchemaElement.IsNillable.
	* TypeTranslator.cs :
	  Fixed wrong TypeData modification against non-nullable stuff.
	  Added another GetTypeData() that takes isNullableRuntimeType so
	  that it won't miss XmlSchemaElement.IsNillable.
	  Added another GetPrimitiveTypeData() that takes nullable.

	* XmlSchemaImporterTests.cs :
	  test that <xs:element nillable='true' ...> is mapped to Nullable<T>.


svn path=/trunk/mcs/; revision=71304
2007-01-18 18:00:36 +00:00
Kornél Pál 133ce64e0f Use assembly name and file version constants.
svn path=/trunk/mcs/; revision=64391
2006-08-25 20:32:53 +00:00
Atsushi Eno b3cbbff9ce 2006-07-24 Atsushi Enomoto <[email protected]>
In class/System.XML:
	* System.Xml.dll.sources : added XmlMappingAccess.

	* XmlMappingAccess.cs : new type in 2.0 RTM.
	* XmlCodeExporter.cs, SoapCodeExporter.cs,
	  MapCodeGenerator.cs,
	  XmlSchemaImporter.cs, SoapSchemaImporter.cs, SchemaImporter.cs,
	  SchemaImporterExtension.cs, SchemaImporterExtensionCollection.cs,
	  XmlMemberMapping.cs, XmlSerializationReader.cs :
	  several 2.0 API fixes from betas to RTM.

	In class/System.Web.Services:
	* ProtocolImporter.cs, ServiceDescriptionImporter.cs :
	  some 2.0 API fixes from betas to RTM.

	In tools/wsdl:
	* MonoWSDL2.cs : 2.0 API fixes from beta2 to RTM.


svn path=/trunk/mcs/; revision=62910
2006-07-24 10:50:58 +00:00
Gert Driesen 0913889260 * XmlCodeExporterTests.cs: Added tests for arrays. Fixed usage of
XmlRootAttribute in tests.
* XmlCodeExporter.cs: Added bool argument to GenerateClass and
GenerateEnum methods that specifies whether we're dealing with a type
for a top-level element. In GenerateClass, do not always add Namespace
argument for XmlRootAttribute if isTopLevel is false, and do not
emit XmlRootAttribute if isTopLevel is false and no arguments have been
added.
* SoapCodeExporter.cs: Added bool argument to GenerateClass and
GenerateEnum methods.
* MapCodeGenerator.cs: Added bool argument to GenerateClass and
GenerateEnum methods.

svn path=/trunk/mcs/; revision=60710
2006-05-15 15:53:35 +00:00
Gert Driesen a392bb4584 * XmlCodeExporterTests.cs: Enabled tests for XmlCodeExporter.
* XmlSchemaImporterTests.cs: Fixed EnumSimpleContent test to pass
on MS.NET 2.0.
* XmlCodeExporter.cs: On 2.0 profile, CodeGenerationOptions defaults to
GenerateProperties. Use full type name for XML serialization attributes
instead of shortcut (without Attribute suffix). Always add Namespace
argument for XmlRootAttribute on classes. Added IsNullable argument for
XmlRootRootAttribute on classes. For attribute members, only output
Form argument for XmlSchemaForm.Qualified. Use MapCodeGenerator base
ctor that takes CodeGenerationOptions.
* SoapCodeExporter.cs: Use MapCodeGenerator base ctor that takes
CodeGenerationOptions.
* MapCodeGenerator.cs: Added CodeGenerationOptions to ctor. On 2.0
profile, emit GeneratedCodeAttribute, SerializableAttribute,
DebuggerStepThroughAttribute and DesignerCategoryAttribute for classes.
To match MS.NET, emit attribute members before element members.
* XmlReflectionImporter.cs: Enums are never nullable.
* XmlSchemaImporter.cs: Set IsNullable on map using value of
XmlSchemaElement.IsNillable. Added LocateElement overload that takes
XmlSchemaElement.

svn path=/trunk/mcs/; revision=59768
2006-04-21 17:54:54 +00:00
Lluis Sanchez 3a465797dc * MapCodeGenerator.cs: When the Object type is exported, export all
derived maps. This was done in IncludeMetadata, but this method is
	  not called by the xsd tool.
	* XmlCodeExporter.cs: In AddMappingMetadata, only generate the root
	  attribute for primitive types and arrays.
	* XmlSchemaImporter.cs: Only export all object-derived maps if the
	  Object type is explicitly referenced by an element.
	* XmlSerializationWriter.cs: Minor fix.

svn path=/trunk/mcs/; revision=34573
2004-09-30 20:56:52 +00:00
Lluis Sanchez 2929822a90 * MapCodeGenerator.cs: Moved generation of XmlInclude attributes from
ExportDerivedTypes to the new ExportDerivedTypeAttributes method.
	* XmlReflectionImporter.cs: In ImportClassMapping, moved the call to
	  ImportIncludedTypes to the end, to make sure that the current map has all
	  needed data before derived maps are constructed.
	* XmlSchemaExporter.cs: Generate the base class of simple types that are
	  not primitive types. Set the correct value for IsMixed in extended types.
	* XmlSchemaImporter.cs: In ImportSimpleContent, take into account that
	  the base class of a simple type doesn't need to be a xsd type.
	  All those patches fix bug #65654

svn path=/trunk/mcs/; revision=33935
2004-09-15 14:16:41 +00:00
Lluis Sanchez 65bd7e1e63 * MapCodeGenerator.cs: CreateFieldMember now adds the field to the class,
no need to add it after the call.
	* SoapSchemaImporter.cs: Implemented 2.0 constructors.

svn path=/trunk/mcs/; revision=31480
2004-07-26 18:18:43 +00:00
Lluis Sanchez 30fe4d3cb5 * CodeGenerationOptions.cs: Made the class internal for the 1.1 profile.
* ImportContext.cs: Implemented.
	* MapCodeGenerator.cs, SoapCodeExporter.cs, XmlCodeExporter.cs: Added new
	  options for 2.0. Implemented support for generating properties instead of
	  fields.
	* XmlSchemaImporter.cs: Added support for sharing types.

svn path=/trunk/mcs/; revision=31410
2004-07-23 15:21:14 +00:00
Duncan Mak 8fa6e766dd Add MIT license to System.XML.DLL
svn path=/trunk/mcs/; revision=30055
2004-06-21 18:07:31 +00:00
Atsushi Eno a5eaabf6f1 2004-06-18 Atsushi Enomoto <[email protected]>
* CodeIdentifier.cs, CodeIdentifiers.cs, MapCodeGenerator.cs,
	  SerializationCodeGenerator.cs, SerializationSource.cs,
	  TypeTranslator.cs, XmlAttributeOverrides.cs, XmlCustomFormatter.cs,
	  XmlSerializationReader.cs, XmlSerializationWriter.cs,
	  XmlSerializer.cs, XmlTypeMapMemberElement.cs, XmlTypeMapping.cs
	  : Globalization fixes.
	    In XmlCustomFormatter.GenerateToXmlString() time was not
	    generated correctly.
	    Replaced all CRLF XmlAttributeOverrides.cs into LF.

svn path=/trunk/mcs/; revision=29865
2004-06-18 09:50:34 +00:00
Lluis Sanchez aae87fab03 * MapCodeGenerator.cs, SoapCodeExporter.cs: Generate the same XmlInclude
attributes that MS.NET generates.
	* SerializationCodeGenerator.cs: Avoid duplicate generation of maps in the
	  same reader/writer.
	* XmlCodeExporter.cs: Added support for ignore flag in maps and members.
	* XmlReflectionImporter.cs: Changed GetReflectionMembers to match
	  MS.NET member ordering. Patch by David Taylor.
	* XmlSchemaImporter.cs: When generating a choice member, set the ignore
	  flag. The generated enum must also not be included in the schema.
	* XmlTypeMapMember.cs: Added ignore flag.
	* XmlTypeMapping.cs: The AttributeMembers property now returns the
	  attributes in the correct order.

svn path=/trunk/mcs/; revision=29172
2004-06-10 08:47:59 +00:00
Lluis Sanchez 285cd2dcc8 * XmlSerializationReader.cs: Support schamea instance namespaces other than
the 2001 one when reading the xsi type.
	* MapCodeGenerator.cs: Take into account that the root namespace and element
	  name may have changed from one export to another of the same type. In
	  this case the class attributes need to be regenerated.
	* SoapCodeExporter.cs, XmlCodeExporter.cs: Take the enum name from XmlType,
	  not ElementName. Idem for namespace.
	* XmlReflectionImporter.cs: Set nullable property of XmlTypeMapping.
	* XmlRootAttribute.cs: Default value for nullable is true.
	* XmlSchemaImporter.cs: The root name for a class may change in some
	  scenarios (for example, when the type is initially exported as part of
	  another type and later exported as a root type).
	* XmlSerializationReader.cs: In GetXsiType(), if the type attribute is not
	  found using the standard namespace, try getting the type using
	  the 2000/10 and 1999 namespaces.
	* XmlTypeMapping.cs: Added IsNullable property. Updated SetRoot method.

svn path=/trunk/mcs/; revision=28711
2004-06-02 18:16:39 +00:00
Lluis Sanchez c946a0cebc * CodeIdentifier.cs: Limit the length of identifiers.
* MapCodeGenerator.cs: Do not generate base class if it is an XmlNode.
	  Generate types using GetDomType, so if the type is an array, it creates
	  the correct combination of types.
	* SerializationCodeGenerator.cs, XmlTypeMapping.cs: When trying to parse
	  an enum, if the string is empty and the enum has [Flags], then return 0
	  as value. This fixes bug #55509.
	* XmlSchemaImporter.cs: Added check for redefines of attribute groups. They
	  are not supported. Another check: a simple type cannot be enum if it does
	  not have any enum facet.
	  And another fix: use string as default type for attribtues.
	* XmlSchemas.cs: Fixed search for schema elements. An schema may import
	  other schemas. An imported schema would not be in the table, but its
	  elements (although from another namespace) would be in the schema that
	  imported it. So, we need know to check for every schema in the table.
	* XmlSerializer.cs: Added environment variable to help debugging code
	  generator output.

svn path=/trunk/mcs/; revision=23957
2004-03-12 15:57:13 +00:00
Lluis Sanchez 5871bdbbd1 * MapCodeGenerator.cs: Added IncludeMetadata property, which returns a list
of XmlInclude attributes needed for the service class.
	  IsMapExported: Removed check for object type, since it can now be exported.
	  SetMapExported: Use the type name as key, since different importers may
	  be used to create a map for the same type.
	  GenerateClassInclude: Updated signature.
	* SoapCodeExporter.cs: Moved management of IncludeMetadata to MapCodeGenerator.
	  GenerateClassInclude(): Updated signature.
	* SoapReflectionImporter.cs: Support SoapIncludeAttribute in array members.
	  Implemented IncludeTypes.
	* XmlCodeExporter.cs: Moved management of IncludeMetadata to MapCodeGenerator.
	  GenerateClassInclude(): Updated signature.
	* XmlMemberMapping.cs: Added missing property.
	* XmlReflectionImporter.cs: GetReflectionMembers must be private.
	  Implemented IncludeTypes().
	* XmlSchemaExporter.cs: Added support for exporting typeof(object).
	* XmlSchemaImporter.cs: Changed the implementation of ImportDerivedTypeMapping.
	  Now, it does a regular import and then assign the required base class to
	  the imported map. In this way it is possible to assign a base type for a
	  map that was previously imported without a base type.
	* XmlTypeMapping.cs: Added internal method SetRoot().

svn path=/trunk/mcs/; revision=23510
2004-02-27 00:03:45 +00:00
Lluis Sanchez af31a18a06 * MapCodeGenerator.cs: Modified some methods to make them easier to reuse.
Those are basically methods to add custom attributes to element and
	  attribute members.
	* SoapCodeExporter.cs: Track changes in MapCodeGenerator.
	* XmlCodeExporter.cs: Better support for custom attribute generation for
	  method parameters.
	* XmlCustomFormatter.cs: Added null check.
	* XmlSchemaImporter.cs: do not set IsOptionalValueType property to
	  attributes that are required.
	* XmlSerializationReaderInterpreter.cs: Method parameters may be serialized
	  as attributes.

svn path=/trunk/mcs/; revision=23131
2004-02-16 15:40:15 +00:00
Lluis Sanchez d2f63bb61f * MapCodeGenerator.cs: Changed some methods to make them easier to reuse.
* TypeTranslator.cs: NMTOKENS, ENTITIES and IDREFS must be mapped to
	  string, not string[].
	* XmlCodeExporter.cs: AddMappingMetadata(): improved attribute generation
	  for array parameters. In general, improved generation of schema Form
	  property.
	* XmlMemberMapping.cs: Added Form property.
	* XmlReflectionImporter.cs: Types that inherit from other types cannot be
	  simple types. Added a check for this.
	* XmlSchemaExporter.cs: several fixes: better generation of IsMixed and
	  Form. The key used to determine if a map has been already generated must
	  include the XmlType, since there can be two xml types with the same CLR
	  type and namespace (for example, they may differ in the Form property).
	* XmlSchemaImporter.cs: When getting the TypeData for a schema element,
	  also return the corresponding map. There can be two maps that have the
	  same TypeData, so given a TypeData is not always possible to get the
	  correct corresponding map (for example two arrays that only differ in the
	  Form of the item).
	* XmlTypeMapping.cs: Added method to set if a map can represent a simple
	  type or not.

svn path=/trunk/mcs/; revision=22968
2004-02-11 11:27:23 +00:00
Lluis Sanchez 4160809c3b * MapCodeGenerator.cs: Added helper method for generating an attribute
parameter of type enum.
	* XmlAttributeAttribute.cs: little fix.
	* XmlCodeExporter.cs: Support XmlAnyAttribute when generating attributes
	  for method parameters.
	* XmlMemberMapping.cs: Improved support for members of type "any".
	* XmlReflectionImporter.cs: Improved assignment of the attribute form.
	  If the namespace is explicitly specified, then the form should be
	  qualified. Also fixed issues with the namespace assigned to attributes.
	  This should fix bug #53384.
	* XmlSchemaExporter.cs: ExportMembersMapping(): improved support for
	  methods that return values of type "any". Changed the methods
	  AddSchemaArrayElement and AddSchemaElement, so instead of adding the
	  element, return it, and the caller must add it to the collection.
	  Other fixes in attribute generation.
	* XmlSchemaImporter.cs: ImportAnyType(): if a type name is provided,
	  generate the AnyType mapping from the type described in the schema.
	  Small fixes regarding IsMixed property of complex types (it means that
	  the type can contain text, so the XmlTextAttribute must be generated).
	* XmlSerializationReaderInterpreter.cs: Reading of members by-order must
	  be only used in the bare+encoded format.

svn path=/trunk/mcs/; revision=22533
2004-01-27 12:43:22 +00:00
Lluis Sanchez b46db4ea02 * MapCodeGenerator.cs, XmlSchemaImporter.cs: Attributes are allways optional,
so a 'specified' member has always to be generated.
	* TypeData.cs: Fixed check for value type.

svn path=/trunk/mcs/; revision=22309
2004-01-20 19:18:46 +00:00
Lluis Sanchez 648ca0b963 * XmlSerializationReaderInterpreter.cs, XmlSerializationWriterInterpreter.cs,
XmlTypeMapMember.cs, MapCodeGenerator.cs, SoapCodeExporter.cs, TypeData.cs,
	  XmlCodeExporter.cs, XmlReflectionImporter.cs, XmlSchemaExporter.cs,
	  XmlSchemaImporter.cs, XmlSerializationReaderInterpreter.cs,
	  XmlSerializationWriterInterpreter.cs, XmlTypeMapMember.cs:
	  Added support for value specifiers members. This fixes bug #53024.

svn path=/trunk/mcs/; revision=22308
2004-01-20 18:18:25 +00:00
Lluis Sanchez 35c1a12ab0 * MapCodeGenerator.cs: Use type namespace instead of root namespace as
default namespace for members.
	* XmlCodeExporter.cs: Fixed generation of XmlRootAttribute.
	* XmlReflectionImporter.cs: Fixed the assignment of root and type
	  namespaces.
	* XmlSchemaExporter.cs: Use type namespace instead of root namespace as
	  default namespace for members. In AddSchemaElement, if the element is
	  a root element never use a "ref" attribute.
	* XmlSchemaImporter.cs: Fixed issue when importing root elements.

svn path=/trunk/mcs/; revision=22064
2004-01-14 17:30:50 +00:00
Lluis Sanchez a88fae3a5d * MapCodeGenerator.cs: Added support for [Flags] enum.
* XmlCodeExporter.cs: Do not add XmlElement attributes if the member is Any.
	* XmlSchemaImporter.cs: Implemented ImportAnyType(). Improved import of
	  encoded array type. Added support for enums with [Flags].
	  In encoded format, unqualified types are schema types by default.

svn path=/trunk/mcs/; revision=21072
2003-12-12 17:04:59 +00:00
Lluis Sanchez 9438297164 * MapCodeGenerator.cs: Made MapCodeGenerator internal.
svn path=/trunk/mcs/; revision=19084
2003-10-15 18:11:33 +00:00
Lluis Sanchez bf5fac805d * MapCodeGenerator.cs: New file. Moved here all code that is common
between XmlCodeExporter and SoapCodeExporter.
	* SoapCodeExporter.cs: Implemented.
	* XmlCodeExporter.cs: Moved common code to MapCodeGenerator.
	* XmlSerializationReaderInterpreter.cs: Fixed problem when reading
	  encoded bare parameter list.
	* XmlTypeMapping.cs: Added method for getting member element by index.

svn path=/trunk/mcs/; revision=19069
2003-10-15 08:18:04 +00:00