2002-09-11 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* CodeBinaryOperatorType.cs:
	* CodeMemberEvent.cs:
	* CodeParameterDeclarationExpression.cs:
	* CodeTypeMember.cs:
	* CodeTypeReference.cs:
	* CodeTypeReferenceCollection.cs: misc. fixes

svn path=/trunk/mcs/; revision=7369

7 files changed, 62 insertions, 37 deletions

diff --git a/mcs/class/System/System.CodeDom/ChangeLog b/mcs/class/System/System.CodeDom/ChangeLog
index 2352f22b91f..6b957f7b250 100644
--- a/mcs/class/System/System.CodeDom/ChangeLog
+++ b/mcs/class/System/System.CodeDom/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-11  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* CodeBinaryOperatorType.cs:
+	* CodeMemberEvent.cs:
+	* CodeParameterDeclarationExpression.cs:
+	* CodeTypeMember.cs:
+	* CodeTypeReference.cs:
+	* CodeTypeReferenceCollection.cs: misc. fixes
+
 2002-05-28  Daniel Stodden  <stodden@in.tum.de>
 
 	* CodeArrayCreateExpression.cs: typo + comments
diff --git a/mcs/class/System/System.CodeDom/CodeBinaryOperatorType.cs b/mcs/class/System/System.CodeDom/CodeBinaryOperatorType.cs
index e879b206400..98a14665a7c 100755
--- a/mcs/class/System/System.CodeDom/CodeBinaryOperatorType.cs
+++ b/mcs/class/System/System.CodeDom/CodeBinaryOperatorType.cs
@@ -14,22 +14,22 @@ namespace System.CodeDom
 	[Serializable]
 	[ComVisible(true)]
 	public enum CodeBinaryOperatorType {
-		Add,
-		Assign,
-		BitwiseAnd,
-		BitwiseOr,
-		BooleanAnd,
-		BooleanOr,
-		Divide,
-		GreaterThan,
-		GreaterThanOrEqual,
-		IdentityEquality,
-		IdentityInequality,
-		LessThan,
-		LessThanOrEqual,
-		Modulus,
-		Multiply,
-		Subtract,
-		ValueEquality
+		Add = 0,
+		Subtract = 1,
+		Multiply = 2,
+		Divide = 3,
+		Modulus = 4,
+		Assign = 5,
+		IdentityInequality = 6,
+		IdentityEquality = 7,
+		ValueEquality = 8,
+		BitwiseOr = 9,
+		BitwiseAnd = 10,
+		BooleanOr = 11,
+		BooleanAnd = 12,
+		LessThan = 13,
+		LessThanOrEqual = 14,
+		GreaterThan = 15,
+		GreaterThanOrEqual = 16
 	}
 }
diff --git a/mcs/class/System/System.CodeDom/CodeMemberEvent.cs b/mcs/class/System/System.CodeDom/CodeMemberEvent.cs
index 4537ddc0728..a5562443050 100755
--- a/mcs/class/System/System.CodeDom/CodeMemberEvent.cs
+++ b/mcs/class/System/System.CodeDom/CodeMemberEvent.cs
@@ -18,7 +18,7 @@ namespace System.CodeDom
 	public class CodeMemberEvent
 		: CodeTypeMember
 	{
-		private CodeTypeReference implementationType;
+		private CodeTypeReferenceCollection implementationTypes;
 		private CodeTypeReference privateImplementationType;
 		private CodeTypeReference type;
 		
@@ -32,16 +32,18 @@ namespace System.CodeDom
 		//
 		// Properties
 		//
-		public CodeTypeReference ImplementationTypes {
+		public CodeTypeReferenceCollection ImplementationTypes
+		{
 			get {
-				return implementationType;
-			}
-			set {
-				implementationType = value;
+				if (implementationTypes == null)
+					implementationTypes = new CodeTypeReferenceCollection ();
+
+				return implementationTypes;
 			}
 		}
 
-		public CodeTypeReference PrivateImplementationType {
+		public CodeTypeReference PrivateImplementationType
+		{
 			get {
 				return privateImplementationType;
 			}
@@ -50,8 +52,12 @@ namespace System.CodeDom
 			}
 		}
 
-		public CodeTypeReference Type {
+		public CodeTypeReference Type
+		{
 			get {
+				if (type == null)
+					type = new CodeTypeReference (String.Empty);
+
 				return type;
 			}
 			set {
diff --git a/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpression.cs b/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpression.cs
index 9f1cf463fa4..799a73db1e0 100755
--- a/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpression.cs
+++ b/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpression.cs
@@ -56,6 +56,9 @@ namespace System.CodeDom
 					customAttributes = new CodeAttributeDeclarationCollection();
 				return customAttributes;
 			}
+			set {
+				customAttributes = value;
+			}
 		}
 
 		public FieldDirection Direction {
diff --git a/mcs/class/System/System.CodeDom/CodeTypeMember.cs b/mcs/class/System/System.CodeDom/CodeTypeMember.cs
index cc7ce536080..ea03f20f382 100755
--- a/mcs/class/System/System.CodeDom/CodeTypeMember.cs
+++ b/mcs/class/System/System.CodeDom/CodeTypeMember.cs
@@ -58,6 +58,9 @@ namespace System.CodeDom
 					customAttributes = new CodeAttributeDeclarationCollection();
 				return customAttributes;
 			}
+			set {
+				customAttributes = value;
+			}
 		}
 
 		public CodeLinePragma LinePragma {
diff --git a/mcs/class/System/System.CodeDom/CodeTypeReference.cs b/mcs/class/System/System.CodeDom/CodeTypeReference.cs
index 2f66b093333..70e295fca2e 100644
--- a/mcs/class/System/System.CodeDom/CodeTypeReference.cs
+++ b/mcs/class/System/System.CodeDom/CodeTypeReference.cs
@@ -34,21 +34,16 @@ namespace System.CodeDom
 			this.baseType = baseType.FullName;
 		}
 
-		// FIXME: probably broken
-		[MonoTODO]
 		public CodeTypeReference( CodeTypeReference arrayType, int rank )
 		{
-			this.arrayType = arrayType;
-			this.baseType = arrayType.BaseType;
+			this.baseType = null;
 			this.rank = rank;
+			this.arrayType = arrayType;
 		}
 
-		// FIXME: probably broken
-		[MonoTODO]
 		public CodeTypeReference( string baseType, int rank )
+			: this (new CodeTypeReference (baseType), rank)
 		{
-			this.baseType = baseType;
-			this.rank = rank;
 		}
 			
 
@@ -56,8 +51,6 @@ namespace System.CodeDom
 		// Properties
 		//
 
-		// FIXME: probably broken
-		[MonoTODO]
 		public CodeTypeReference ArrayElementType
 		{
 			get {
@@ -68,8 +61,6 @@ namespace System.CodeDom
 			}
 		}
 		
-		// FIXME: probably broken
-		[MonoTODO]
 		public int ArrayRank {
 			get {
 				return rank;
@@ -81,6 +72,9 @@ namespace System.CodeDom
 
 		public string BaseType {
 			get {
+				if (baseType == null)
+					return String.Empty;
+
 				return baseType;
 			}
 			set {
diff --git a/mcs/class/System/System.CodeDom/CodeTypeReferenceCollection.cs b/mcs/class/System/System.CodeDom/CodeTypeReferenceCollection.cs
index e4e5302ba3a..c83a838faa9 100644
--- a/mcs/class/System/System.CodeDom/CodeTypeReferenceCollection.cs
+++ b/mcs/class/System/System.CodeDom/CodeTypeReferenceCollection.cs
@@ -56,6 +56,16 @@ namespace System.CodeDom
 			return List.Add( value );
 		}
 
+		public void Add (string value)
+		{
+			Add (new CodeTypeReference (value));
+		}
+
+		public void Add (Type value)
+		{
+			Add (new CodeTypeReference (value));
+		}
+
 		public void AddRange (CodeTypeReference [] value )
 		{
 			foreach ( CodeTypeReference elem in value )