Fixed all sorts of compiler errors.

svn path=/trunk/mcs/; revision=124
baulig · Jul 13, 2001 · 7fc6d7d · 7fc6d7d
1 parent e904d2e
commit 7fc6d7d
Show file tree

Hide file tree

Showing 100 changed files with 585 additions and 370 deletions.
diff --git a/mcs/class/System.Data/makefile b/mcs/class/System.Data/makefile
@@ -0,0 +1,4 @@
+all: windows
+
+windows:
+	$(csc) /target:library /out:System.Data.dll /nowarn:1595 /recurse:*.cs
diff --git a/mcs/class/System.Drawing/makefile b/mcs/class/System.Drawing/makefile
@@ -0,0 +1,4 @@
+all: windows
+
+windows:
+	$(csc) /target:library /out:System.Drawing.dll /nowarn:1595 /recurse:*.cs
diff --git a/mcs/class/System.Management/makefile b/mcs/class/System.Management/makefile
@@ -0,0 +1,4 @@
+all: windows
+
+windows:
+	$(csc) /target:library /out:System.Management.dll /nowarn:1595 /recurse:*.cs
diff --git a/mcs/class/System/System.CodeDom.Compiler/CodeGenerator.cs b/mcs/class/System/System.CodeDom.Compiler/CodeGenerator.cs
@@ -1,24 +1,26 @@
 //
-// System.CodeDOM.Compiler CodeGenerator class
+// System.CodeDom.Compiler CodeGenerator class
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
 //
 // (C) 2001 Ximian, Inc.
 //
 
-namespace System.CodeDOM.Compiler {
+namespace System.CodeDom.Compiler {
 
-	using System.CodeDOM;
+	using System.CodeDom;
 	using System.Reflection;
 	using System.IO;
 
 	public abstract class CodeGenerator : ICodeGenerator {
 		protected TextWriter output;
 
-		protected virtual  void ContinueOnNewLine (string st);
+		protected virtual  void ContinueOnNewLine (string st)
+		{
+		}
 
-		void CodeGenerator ()
+		CodeGenerator ()
 		{
 			indent = 8;
 		}
@@ -29,37 +31,23 @@ void CodeGenerator ()
 		protected abstract void GenerateArrayCreateExpression (CodeArrayCreateExpression e);
 		protected abstract void GenerateAssignStatement (CodeAssignStatement s);
 		protected abstract void GenerateAttachEventStatement (CodeAttachEventStatement s);
-		protected abstract void GenerateAttributeBlockStart (CodeAttributeBlock a);
-		protected abstract void GenerateAttributeBlockEnd (CodeAttributeBlock a);
 		protected abstract void GenerateBaseReferenceExpression (CodeBaseReferenceExpression e);
 		protected abstract void GenerateBinaryOperatorExpression (CodeBinaryOperatorExpression x);
 		protected abstract void GenerateCastExpression (CodeCastExpression x);
-		protected abstract void GenerateClassConstructor (CodeClassConstructor x);
 		protected abstract void GenerateClasses (CodeNamespace x);
-		protected abstract void GenerateClassEnd (CodeClass x);
-		protected abstract void GenerateClassStart (CodeClass x);
 		protected abstract void GenerateCommentStatement (CodeCommentStatement x);
-		protected abstract void GenerateConstructor (CodeConstructor x, CodeClass c);
+		protected abstract void GenerateConstructor (CodeConstructor x, CodeTypeDeclaration c);
 		protected abstract void GenerateDelegateCreateExpression (CodeDelegateCreateExpression x);
 		protected abstract void GenerateDelegateInvokeExpression (CodeDelegateInvokeExpression x);
-		protected abstract void GenerateDelegateInvokeStatement (CodeDelegateInvokeStatement x);
-		protected abstract void GenerateDetachEventStatement (CodeDetachEventStatement x);
-		protected abstract void GenerateEvent (CodeMemberEvent x, CodeClass c);
+		protected abstract void GenerateEvent (CodeMemberEvent x, CodeTypeDeclaration c);
 		protected abstract void GenerateExpression (CodeExpression x);
 		protected abstract void GenerateField (CodeMemberField x);
 		protected abstract void GenerateFieldReferenceExpression (CodeFieldReferenceExpression x);
-		protected abstract void GenerateForLoopStatement (CodeForLoopStatement x);
-		protected abstract void GenerateIfStatement (CodeIfStatement x);
 		protected abstract void GenerateIndexerExpression (CodeIndexerExpression x);
 		protected abstract void GenerateLinePragmaStart (CodeLinePragma x);
 		protected abstract void GenerateLinePragmaEnd (CodeLinePragma x);
-		protected abstract void GenerateLiteralExpression (CodeLiteralExpression x);
-		protected abstract void GenerateLiteralMember (CodeLiteralClassMember x);
-		protected abstract void GenerateLiteralNamespace (CodeLiteralNamespace x);
-		protected abstract void GenerateLiteralStatement (CodeLiteralStatement x);
-		protected abstract void GenerateMethod (CodeMemberMethod m, CodeClass c);
+		protected abstract void GenerateMethod (CodeMemberMethod m, CodeTypeDeclaration c);
 		protected abstract void GenerateMethodInvokeExpression (CodeMethodInvokeExpression x);
-		protected abstract void GenerateMethodInvokeStatement (CodeMethodInvokeStatement x);
 		protected abstract void GenerateMethodReturnStatement (CodeMethodReturnStatement x);
 		protected abstract void GenerateNamespace (CodeNamespace x);
 		protected abstract void GenerateNamespaceStart (CodeNamespace x);
@@ -69,7 +57,7 @@ void CodeGenerator ()
 		protected abstract void GenerateObjectCreateExpression (CodeObjectCreateExpression x);
 		protected abstract void GenerateParameterDeclarationExpression (CodeParameterDeclarationExpression x);
 		protected abstract void GeneratePrimitiveExpression (CodePrimitiveExpression x);
-		protected abstract void GenerateProperty (CodeMemberProperty e, CodeClass c);
+		protected abstract void GenerateProperty (CodeMemberProperty e, CodeTypeDeclaration c);
 		protected abstract void GeneratePropertyReferenceExpression (CodePropertyReferenceExpression x);
 		protected abstract void GenerateStatement (CodeStatement x);
 		protected abstract void GenerateStatementCollection (CodeStatementCollection x);
@@ -83,11 +71,9 @@ void CodeGenerator ()
 		//
 		// Other members
 		//
-		protected abstract string GetNullToken ()
-		protected int GetTypeArrayRank (string type);
-		protected string GetTypeBaseType (string type);
+		protected abstract string GetNullToken ();
 
-		protected abstract bool IsValidIdentifier (string value);
+		public abstract bool IsValidIdentifier (string value);
 
 		public static bool IsValidLanguateIndependentIdentifier (string value)
 		{
@@ -98,36 +84,77 @@ public static bool IsValidLanguateIndependentIdentifier (string value)
 		//
 		// Output functions
 		//
-		protected virtual void OutputAttributeArgument (CodeAttributeArgument arg);
-		protected virtual void OutputAttributeBlock (CodeAttributeBlock a);
-		protected virtual void OutputDirection (FieldDirection dir);
-		protected virtual void OutputExpressionList (CodeExpressionCollection c);
-		protected virtual void OutputExpressionLIst (CodeExpressionCollection c, bool useNewlines);
-		protected virtual void OutputFieldScopeModifier (MemberAttributes attrs);
-		protected virtual void OutputIdentifier (string ident);
-		protected virtual void OutputMemberAccessModifier (MemberAttributes attrs);
-		protected virtual void OutputMemberScopeModifier (MemberAttributes attrs);
-		protected virtual void OutputOperator (CodeBinaryOperatorType op);
-		protected virtual void OutputParameters (CodeParameterDeclarationExpressionCollection pars);
-		protected virtual void OutputType (string typeRef);
-		protected virtual void OutputTypeAttributes (TypeAttributes attrs);
-		protected virtual void OutputTypeNamePair (string typeRef, string name);
-
-		protected abstract string void QuoteLiteralString (string value);
-
-		protected virtual bool ValidateIdentifier (string value);
+		protected virtual void OutputAttributeArgument (CodeAttributeArgument arg)
+		{
+		}
+
+		protected virtual void OutputDirection (FieldDirection dir)
+		{
+		}
+
+		protected virtual void OutputExpressionList (CodeExpressionCollection c)
+		{
+		}
+
+		protected virtual void OutputExpressionLIst (CodeExpressionCollection c, bool useNewlines)
+		{
+		}
+
+		protected virtual void OutputFieldScopeModifier (MemberAttributes attrs)
+		{
+		}
+
+		protected virtual void OutputIdentifier (string ident)
+		{
+		}
+
+		protected virtual void OutputMemberAccessModifier (MemberAttributes attrs)
+		{
+		}
+
+		protected virtual void OutputMemberScopeModifier (MemberAttributes attrs)
+		{
+		}
+
+		protected virtual void OutputOperator (CodeBinaryOperatorType op)
+		{
+		}
+
+		protected virtual void OutputParameters (CodeParameterDeclarationExpressionCollection pars)
+		{
+		}
+
+		protected virtual void OutputType (string typeRef)
+		{
+		}
+
+		protected virtual void OutputTypeAttributes (TypeAttributes attrs)
+		{
+		}
+
+		protected virtual void OutputTypeNamePair (string typeRef, string name)
+		{
+		}
+
+
+		protected abstract string QuoteLiteralString (string value);
+
+		public virtual void ValidateIdentifier (string value)
+		{
+		}
 
 		//
 		// Properties
 		//
-		string currentClassname;
+		protected string currentClassName;
 		protected string CurrentClassName {
 			get {
 				return currentClassName;
 			}
 		}
-
-		protected CodeClassMember CurrentMember {
+
+		protected CodeTypeMember codeClassMember;
+		protected CodeTypeMember CurrentMember {
 			get {
 				return codeClassMember;
 			}
@@ -157,33 +184,33 @@ public static bool IsValidLanguateIndependentIdentifier (string value)
 		// functions should not be abstract, or abstract could
 		// have an implementation piece?
 		//
-		bool isCurrentClass;
+		public bool isCurrentClass;
 		protected bool IsCurrentClass {
 			get {
 				return isCurrentClass;
 			}
 		}
 
-		bool isCurrentDelegate;
+		public bool isCurrentDelegate;
 		protected bool IsCurrentDelegate {
 			get {
 				return isCurrentDelegate;
 			}
 		}
-		bool isCurrentEnum;
+		public bool isCurrentEnum;
 		protected bool IsCurrentEnum {
 			get {
 				return isCurrentEnum;
 			}
 		}
-		bool isCurrentInterface;
+		public bool isCurrentInterface;
 		protected bool IsCurrentInterface {
 			get {
 				return isCurrentInterface;
 			}
 		}
 
-		bool isCurrentStruct
+		public bool isCurrentStruct;
 		protected bool IsCurrentStruct {
 			get {
 				return isCurrentStruct;
@@ -199,5 +226,12 @@ bool isCurrentStruct
 				output = value;
 			}
 		}
+
+                public abstract void GenerateCodeFromExpression (TextWriter output, CodeExpression expression);
+
+                public abstract void GenerateCodeFromNamespace (TextWriter output, CodeExpression expression);
+
+                public abstract void GenerateCodeFromStatement (TextWriter output, CodeStatement expression);
+
 	}
 }
diff --git a/mcs/class/System/System.CodeDom.Compiler/ICodeGenerator.cs b/mcs/class/System/System.CodeDom.Compiler/ICodeGenerator.cs
@@ -1,29 +1,30 @@
 //
-// System.CodeDOM.Compiler ICodeGenerator Interface
+// System.CodeDom.Compiler ICodeGenerator Interface
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
 //
 // (C) 2001 Ximian, Inc.
 //
 
-public interface ICodeGenerator {
-
-	using System.CodeDOM;
+namespace System.CodeDom.Compiler {
+	using System.CodeDom;
 	using System.IO;
-
-	// <summary>
-	//   Generates code for @expression on @output
-	// </summary>
-	void GenerateCodeFromClass (TextWriter output, CodeClass expression);
 
-	void GenerateCodeFromExpression (TextWriter output, CodeExpression expression);
+	public interface ICodeGenerator {
+
+
+		// <summary>
+		//   Generates code for @expression on @output
+		// </summary>
+		void GenerateCodeFromExpression (TextWriter output, CodeExpression expression);
 
-	void GenerateCodeFromNamespace (TextWriter output, CodeExpression expression);
+		void GenerateCodeFromNamespace (TextWriter output, CodeExpression expression);
 
-	void GenerateCodeFromStatement (TextWriter output, CodeStatement expression);
+		void GenerateCodeFromStatement (TextWriter output, CodeStatement expression);
 
-	bool IsValidIdentifier (string value);
+		bool IsValidIdentifier (string value);
 
-	void ValidateIdentifier (string value);
+		void ValidateIdentifier (string value);
+	}
 }
diff --git a/mcs/class/System/System.CodeDom/ChangeLog b/mcs/class/System/System.CodeDom/ChangeLog
@@ -0,0 +1,5 @@
+2001-07-12  Sean MacIsaac  <macisaac@ximian.com>
+
+	* All files implementing IList: Added IsFixedSize property.
+
+	* All files:  Changed CodeDOM to CodeDom.
diff --git a/mcs/class/System/System.CodeDom/CodeArrayCreateExpression.cs b/mcs/class/System/System.CodeDom/CodeArrayCreateExpression.cs
@@ -1,12 +1,12 @@
 //
-// System.CodeDOM CodeArrayCreateExpression Class implementation
+// System.CodeDom CodeArrayCreateExpression Class implementation
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
 //
 // (C) 2001 Ximian, Inc.
 //
-namespace System.CodeDOM {
+namespace System.CodeDom {
 
 	public class CodeArrayCreateExpression : CodeExpression {
 		string createType;

diff --git a/mcs/class/System/System.CodeDom/CodeAssignStatement.cs b/mcs/class/System/System.CodeDom/CodeAssignStatement.cs
@@ -1,13 +1,13 @@
 //
-// System.CodeDOM CodeArrayCreateExpression Class implementation
+// System.CodeDom CodeArrayCreateExpression Class implementation
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
 //
 // (C) 2001 Ximian, Inc.
 //
 
-namespace System.CodeDOM {
+namespace System.CodeDom {
 
 	public class CodeAssignStatement : CodeStatement {
 

diff --git a/mcs/class/System/System.CodeDom/CodeAttachEventStatement.cs b/mcs/class/System/System.CodeDom/CodeAttachEventStatement.cs
@@ -1,12 +1,12 @@
 //
-// System.CodeDOM CodeAttachEventStatement Class implementation
+// System.CodeDom CodeAttachEventStatement Class implementation
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
 //
 // (C) 2001 Ximian, Inc.
 //
-namespace System.CodeDOM {
+namespace System.CodeDom {
 
 	public class CodeAttachEventStatement : CodeStatement {
 		CodeExpression targetObject;

diff --git a/mcs/class/System/System.CodeDom/CodeAttributeArgument.cs b/mcs/class/System/System.CodeDom/CodeAttributeArgument.cs
@@ -1,13 +1,13 @@
 //
-// System.CodeDOM CodeAttributeArgument Class implementation
+// System.CodeDom CodeAttributeArgument Class implementation
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
 //
 // (C) 2001 Ximian, Inc.
 //
 
-namespace System.CodeDOM {
+namespace System.CodeDom {
 
 	public class CodeAttributeArgument {
 		string name;