Merge pull request #1156 from felfert/master

[mono.git] / mcs / class / System.XML / System.Xml.Serialization / MapCodeGenerator.cs

diff --git a/mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs b/mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs
index 1295c3bdc389a645b71832c4dd7511d36218c7a4..1887ab24723f765700b0594cbb1fe3f8c8ad10b6 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs
@@ -31,10 +31,8 @@
 using System.CodeDom;
 using System.CodeDom.Compiler;
 using System.Collections;
-#if NET_2_0
 using System.ComponentModel;
 using System.Diagnostics;
-#endif
 using System.Globalization;
 using System.Xml.Schema;
 
@@ -44,9 +42,9 @@ namespace System.Xml.Serialization {
        internal class MapCodeGenerator {
 
                CodeNamespace codeNamespace;
-               CodeCompileUnit codeCompileUnit;
+//             CodeCompileUnit codeCompileUnit;
                CodeAttributeDeclarationCollection includeMetadata;
-               XmlTypeMapping exportedAnyType = null;
+               XmlTypeMapping exportedAnyType;
                protected bool includeArrayTypes;
                CodeDomProvider codeProvider;
                CodeGenerationOptions options;
@@ -57,7 +55,7 @@ namespace System.Xml.Serialization {
 
                public MapCodeGenerator (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit, CodeGenerationOptions options)
                {
-                       this.codeCompileUnit = codeCompileUnit;
+//                     this.codeCompileUnit = codeCompileUnit;
                        this.codeNamespace = codeNamespace;
                        this.options = options;
                        this.identifiers = new CodeIdentifiers ();
@@ -65,15 +63,11 @@ namespace System.Xml.Serialization {
 
                public MapCodeGenerator (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit, CodeDomProvider codeProvider, CodeGenerationOptions options, Hashtable mappings)
                {
-                       this.codeCompileUnit = codeCompileUnit;
+//                     this.codeCompileUnit = codeCompileUnit;
                        this.codeNamespace = codeNamespace;
-                       this.codeProvider = codeProvider;
                        this.options = options;
-#if NET_2_0
+                       this.codeProvider = codeProvider;
                        this.identifiers = new CodeIdentifiers ((codeProvider.LanguageOptions & LanguageOptions.CaseInsensitive) == 0);
-#else
-                       this.identifiers = new CodeIdentifiers ();
-#endif
 //                     this.mappings = mappings;
                }
 
@@ -137,9 +131,7 @@ namespace System.Xml.Serialization {
                                if (codeClass != null) {
                                        // Regenerate attributes, since things may have changed
                                        codeClass.CustomAttributes.Clear ();
-#if NET_2_0
                                        AddClassAttributes (codeClass);
-#endif
                                        GenerateClass (map, codeClass, isTopLevel);
                                        ExportDerivedTypeAttributes (map, codeClass);
                                }
@@ -164,10 +156,8 @@ namespace System.Xml.Serialization {
                        AddCodeType (codeClass, map.Documentation);
                        codeClass.Attributes = MemberAttributes.Public;
 
-#if NET_2_0
                        codeClass.IsPartial = CodeProvider.Supports(GeneratorSupport.PartialTypes);
                        AddClassAttributes (codeClass);
-#endif
 
                        GenerateClass (map, codeClass, isTopLevel);
                        ExportDerivedTypeAttributes (map, codeClass);
@@ -389,7 +379,7 @@ namespace System.Xml.Serialization {
                                if (ExportExtraElementAttributes (attributes, einfo, defaultNamespace, defaultType))
                                        continue;
 
-                               GenerateElementInfoMember (attributes, member, einfo, defaultType, defaultNamespace, addAlwaysAttr, forceUseMemberName);
+                               GenerateElementInfoMember (attributes, member, einfo, defaultType, defaultNamespace, addAlwaysAttr, forceUseMemberName | addAlwaysAttr);
                        }
 
                        GenerateElementMember (attributes, member);
@@ -498,7 +488,6 @@ namespace System.Xml.Serialization {
                        if (emap.IsFlags)
                                codeEnum.CustomAttributes.Add (new CodeAttributeDeclaration ("System.FlagsAttribute"));
 
-#if NET_2_0
                        CodeAttributeDeclaration generatedCodeAttribute = new CodeAttributeDeclaration (
                                new CodeTypeReference (typeof(GeneratedCodeAttribute)));
                        generatedCodeAttribute.Arguments.Add (new CodeAttributeArgument (
@@ -509,7 +498,6 @@ namespace System.Xml.Serialization {
 
                        codeEnum.CustomAttributes.Add (new CodeAttributeDeclaration (
                                new CodeTypeReference (typeof (SerializableAttribute))));
-#endif
 
                        GenerateEnum (map, codeEnum, isTopLevel);
                        
@@ -606,7 +594,6 @@ namespace System.Xml.Serialization {
                        codeNamespace.Types.Add (type);
                }
 
-#if NET_2_0
                void AddClassAttributes (CodeTypeDeclaration codeClass)
                {
                        CodeAttributeDeclaration generatedCodeAttribute = new CodeAttributeDeclaration (
@@ -628,14 +615,11 @@ namespace System.Xml.Serialization {
                                new CodePrimitiveExpression ("code")));
                        codeClass.CustomAttributes.Add (designerCategoryAttribute);
                }
-#endif
                
                CodeTypeReference GetDomType (TypeData data, bool requiresNullable)
                {
-#if NET_2_0
                        if (data.IsValueType && (data.IsNullable || requiresNullable))
                                return new CodeTypeReference ("System.Nullable", new CodeTypeReference (data.FullTypeName));
-#endif
                        if (data.SchemaType == SchemaTypes.Array)
                                return new CodeTypeReference (GetDomType (data.ListItemTypeData, false),1);
                        else
@@ -646,7 +630,6 @@ namespace System.Xml.Serialization {
 
                #region Private Properties
 
-#if NET_2_0
                private CodeDomProvider CodeProvider {
                        get {
                                if (codeProvider == null) {
@@ -655,7 +638,6 @@ namespace System.Xml.Serialization {
                                return codeProvider;
                        }
                }
-#endif
 
                #endregion
 
@@ -689,6 +671,7 @@ namespace System.Xml.Serialization {
                        }
                        else
                        {
+                               defaultValue = defaultValue is decimal ? (object) ('"' + ((decimal) defaultValue).ToString (CultureInfo.InvariantCulture) + '"') : defaultValue;
                                AddCustomAttribute (externalField, "System.ComponentModel.DefaultValue", GetArg (defaultValue));
                                //internalField.InitExpression = new CodePrimitiveExpression (defaultValue);
                        }