Import CodeDom types and Compiler.CodeGenerator class from referencesource.

This does not import System.CodeDom.Compiler because some of them depends
on Windows specific stuff.

CodeGenerator is imported because ours depends on our own internal
Visitor implementation and could not build without making changes a lot.

diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs
index de0f569d5c5d57a002c307b612d0f9e9f10d64b3..ecc7b1a4645f400223e493bd48916a0e9819c5a9 100644 (file)
--- a/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs
+++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs
@@ -205,13 +205,15 @@ namespace Mono.CSharp
                        foreach (CodeNamespace codeNamespace in compileUnit.Namespaces) {
                                if (string.IsNullOrEmpty (codeNamespace.Name)) {
                                        global_imports = codeNamespace.Imports;
-                                       codeNamespace.Imports = new CodeNamespaceImportCollection ();
+                                       codeNamespace.Imports.Clear ();
                                }
 
                                GenerateNamespace (codeNamespace);
 
                                if (global_imports != null) {
-                                       codeNamespace.Imports = global_imports;
+                                       codeNamespace.Imports.Clear ();
+                                       foreach (CodeNamespaceImport ns in global_imports)
+                                       codeNamespace.Imports.Add (ns);
                                        global_imports = null;
                                }
                        }

diff --git a/mcs/class/System/ReferenceSources/SR.cs b/mcs/class/System/ReferenceSources/SR.cs
index 7bf4932b6d662fd503ebacb877c3fa072434d5ab..dbda7ac686451f3e87dc078ed726f5fa0dc9e5cc 100644 (file)
--- a/mcs/class/System/ReferenceSources/SR.cs
+++ b/mcs/class/System/ReferenceSources/SR.cs
@@ -910,4 +910,17 @@ public const string Incorrect_base_type = @"The specified type, '{0}' is not der
 public const string Only_specify_one = @"'switchValue' and 'switchName' cannot both be specified on source '{0}'.";
 public const string Reference_listener_cant_have_properties = @"A listener with no type name specified references the sharedListeners section and cannot have any attributes other than 'Name'.  Listener: '{0}'.";
 public const string Reference_to_nonexistent_listener = @"Listener '{0}' does not exist in the sharedListeners section.";
+
+public const string Argument_NullComment = @"The 'Comment' property of the CodeCommentStatement '{0}' cannot be null.";
+public const string CodeGenOutputWriter = @"The output writer for code generation and the writer supplied don't match and cannot be used. This is generally caused by a bad implementation of a CodeGenerator derived class.";
+public const string CodeGenReentrance = @"This code generation API cannot be called while the generator is being used to generate something else.";
+public const string InvalidElementType = @"Element type {0} is not supported.";
+public const string InvalidIdentifier = @"Identifier '{0}' is not valid.";
+public const string InvalidPrimitiveType = @"Invalid Primitive Type: {0}. Consider using CodeObjectCreateExpression.";
+public const string ArityDoesntMatch = @"The total arity specified in '{0}' does not match the number of TypeArguments supplied.  There were '{1}' TypeArguments supplied.
+";
+public const string InvalidPathCharsInChecksum = @"The CodeChecksumPragma file name '{0}' contains invalid path characters.";
+public const string InvalidLanguageIdentifier = @"The identifier:""{0}"" on the property:""{1}"" of type:""{2}"" is not a valid language-independent identifier name. Check to see if CodeGenerator.IsValidLanguageIndependentIdentifier allows the identifier name.";
+public const string InvalidTypeName = @"The type name:""{0}"" on the property:""{1}"" of type:""{2}"" is not a valid language-independent type name.";
+public const string InvalidRegion = "The region directive '{0}' contains invalid characters.  RegionText cannot contain any new line characters.";
 }

diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources
index 27a566c1b17d80f6835305f788aa0e86c731270d..34ef417ad0b414e096d3f29276a2f0fc3b8c44b3 100644 (file)
--- a/mcs/class/System/System.dll.sources
+++ b/mcs/class/System/System.dll.sources
@@ -27,95 +27,10 @@ Microsoft.Win32/UserPreferenceChangedEventHandler.cs
 Microsoft.Win32/UserPreferenceChangingEventArgs.cs
 Microsoft.Win32/UserPreferenceChangingEventHandler.cs
 Mono.Http/NtlmClient.cs
-System.CodeDom/CodeArgumentReferenceExpression.cs
-System.CodeDom/CodeArrayCreateExpression.cs
-System.CodeDom/CodeArrayIndexerExpression.cs
-System.CodeDom/CodeAssignStatement.cs
-System.CodeDom/CodeAttachEventStatement.cs
-System.CodeDom/CodeAttributeArgumentCollection.cs
-System.CodeDom/CodeAttributeArgument.cs
-System.CodeDom/CodeAttributeDeclarationCollection.cs
-System.CodeDom/CodeAttributeDeclaration.cs
-System.CodeDom/CodeBaseReferenceExpression.cs
-System.CodeDom/CodeBinaryOperatorExpression.cs
-System.CodeDom/CodeBinaryOperatorType.cs
-System.CodeDom/CodeCastExpression.cs
-System.CodeDom/CodeCatchClauseCollection.cs
-System.CodeDom/CodeCatchClause.cs
-System.CodeDom/CodeChecksumPragma.cs
-System.CodeDom/CodeComment.cs
-System.CodeDom/CodeCommentStatementCollection.cs
-System.CodeDom/CodeCommentStatement.cs
-System.CodeDom/CodeCompileUnit.cs
-System.CodeDom/CodeConditionStatement.cs
-System.CodeDom/CodeConstructor.cs
-System.CodeDom/CodeDefaultValueExpression.cs
-System.CodeDom/CodeDelegateCreateExpression.cs
-System.CodeDom/CodeDelegateInvokeExpression.cs
-System.CodeDom/CodeDirectionExpression.cs
-System.CodeDom/CodeDirectiveCollection.cs
-System.CodeDom/CodeDirective.cs
-System.CodeDom/CodeEntryPointMethod.cs
-System.CodeDom/CodeEventReferenceExpression.cs
-System.CodeDom/CodeExpressionCollection.cs
-System.CodeDom/CodeExpression.cs
-System.CodeDom/CodeExpressionStatement.cs
-System.CodeDom/CodeFieldReferenceExpression.cs
-System.CodeDom/CodeGotoStatement.cs
-System.CodeDom/CodeIndexerExpression.cs
-System.CodeDom/CodeIterationStatement.cs
-System.CodeDom/CodeLabeledStatement.cs
-System.CodeDom/CodeLinePragma.cs
-System.CodeDom/CodeMemberEvent.cs
-System.CodeDom/CodeMemberField.cs
-System.CodeDom/CodeMemberMethod.cs
-System.CodeDom/CodeMemberProperty.cs
-System.CodeDom/CodeMethodInvokeExpression.cs
-System.CodeDom/CodeMethodReferenceExpression.cs
-System.CodeDom/CodeMethodReturnStatement.cs
-System.CodeDom/CodeNamespaceCollection.cs
-System.CodeDom/CodeNamespace.cs
-System.CodeDom/CodeNamespaceImportCollection.cs
-System.CodeDom/CodeNamespaceImport.cs
-System.CodeDom/CodeObjectCreateExpression.cs
-System.CodeDom/CodeObject.cs
-System.CodeDom/CodeParameterDeclarationExpressionCollection.cs
-System.CodeDom/CodeParameterDeclarationExpression.cs
-System.CodeDom/CodePrimitiveExpression.cs
-System.CodeDom/CodePropertyReferenceExpression.cs
-System.CodeDom/CodePropertySetValueReferenceExpression.cs
-System.CodeDom/CodeRegionDirective.cs
-System.CodeDom/CodeRegionMode.cs
-System.CodeDom/CodeRemoveEventStatement.cs
-System.CodeDom/CodeSnippetCompileUnit.cs
-System.CodeDom/CodeSnippetExpression.cs
-System.CodeDom/CodeSnippetStatement.cs
-System.CodeDom/CodeSnippetTypeMember.cs
-System.CodeDom/CodeStatementCollection.cs
-System.CodeDom/CodeStatement.cs
-System.CodeDom/CodeThisReferenceExpression.cs
-System.CodeDom/CodeThrowExceptionStatement.cs
-System.CodeDom/CodeTryCatchFinallyStatement.cs
-System.CodeDom/CodeTypeConstructor.cs
-System.CodeDom/CodeTypeDeclarationCollection.cs
-System.CodeDom/CodeTypeDeclaration.cs
-System.CodeDom/CodeTypeDelegate.cs
-System.CodeDom/CodeTypeMemberCollection.cs
-System.CodeDom/CodeTypeMember.cs
-System.CodeDom/CodeTypeOfExpression.cs
-System.CodeDom/CodeTypeParameterCollection.cs
-System.CodeDom/CodeTypeParameter.cs
-System.CodeDom/CodeTypeReferenceCollection.cs
-System.CodeDom/CodeTypeReference.cs
-System.CodeDom/CodeTypeReferenceExpression.cs
-System.CodeDom/CodeTypeReferenceOptions.cs
-System.CodeDom/CodeVariableDeclarationStatement.cs
-System.CodeDom/CodeVariableReferenceExpression.cs
 System.CodeDom/ICodeDomVisitor.cs
 System.CodeDom.Compiler/CodeCompiler.cs
 System.CodeDom.Compiler/CodeDomConfigurationHandler.cs
 System.CodeDom.Compiler/CodeDomProvider.cs
-System.CodeDom.Compiler/CodeGenerator.cs
 System.CodeDom.Compiler/CodeGeneratorOptions.cs
 System.CodeDom.Compiler/CodeParser.cs
 System.CodeDom.Compiler/Compiler.cs
@@ -136,8 +51,6 @@ System.CodeDom.Compiler/ICodeParser.cs
 System.CodeDom.Compiler/IndentedTextWriter.cs
 System.CodeDom.Compiler/LanguageOptions.cs
 System.CodeDom.Compiler/TempFileCollection.cs
-System.CodeDom/FieldDirection.cs
-System.CodeDom/MemberAttributes.cs
 System.Configuration/ApplicationScopedSettingAttribute.cs
 System.Configuration/ApplicationSettingsBase.cs
 System.Configuration/ApplicationSettingsGroup.cs
@@ -1122,3 +1035,91 @@ ReferenceSources/MonoSocketRuntimeWorkItem.cs
 ../../../external/referencesource/System/misc/invariantcomparer.cs
 ../../../external/referencesource/System/misc/SecurityUtils.cs
 ../../../external/referencesource/System/misc/WeakHashtable.cs
+
+../../../external/referencesource/System/compmod/system/codedom/CodeArgumentReferenceExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeArrayCreateExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeArrayIndexerExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeAssignStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeAttachEventStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeAttributeArgumentCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeAttributeArgument.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeAttributeDeclarationCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeAttributeDeclaration.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeBaseReferenceExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeBinaryOperatorExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeBinaryOperatorType.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeCastExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeCatchClauseCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeCatchClause.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeChecksumPragma.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeComment.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeCommentStatementCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeCommentStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeCompileUnit.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeConditionStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeConstructor.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeDefaultValueExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeDelegateCreateExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeDelegateInvokeExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeDirectionExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeDirectiveCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeDirective.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeEntryPointMethod.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeEventReferenceExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeExpressionCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeExpressionStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeFieldReferenceExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeGotoStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeIndexerExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeIterationStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeLabeledStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeLinePragma.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeMemberEvent.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeMemberField.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeMemberMethod.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeMemberProperty.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeMethodInvokeExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/codemethodreferenceexpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeMethodReturnStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeNamespaceCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeNamespace.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeNamespaceImportCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeNamespaceImport.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeObjectCreateExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeObject.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeParameterDeclarationExpressionCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeParameterDeclarationExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodePrimitiveExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodePropertyReferenceExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodePropertySetValueReferenceExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeRegionDirective.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeRegionMode.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeRemoveEventStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeSnippetCompileUnit.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeSnippetExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeSnippetStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeSnippetTypeMember.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeStatementCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeThisReferenceExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeThrowExceptionStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTryCatchFinallyStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeConstructor.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeDeclarationCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeDeclaration.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeDelegate.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeMemberCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeMember.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeOfExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeParameterCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeParameter.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeReferenceCollection.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeReference.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeTypeReferenceExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeVariableDeclarationStatement.cs
+../../../external/referencesource/System/compmod/system/codedom/CodeVariableReferenceExpression.cs
+../../../external/referencesource/System/compmod/system/codedom/FieldDirection.cs
+../../../external/referencesource/System/compmod/system/codedom/MemberAttributes.cs
+../../../external/referencesource/System/compmod/system/codedom/compiler/CodeGenerator.cs
+../../../external/referencesource/System/compmod/system/codedom/compiler/CodeValidator.cs