Author: rolf
Date: 2007-12-14 06:56:55 -0500 (Fri, 14 Dec 2007)
New Revision: 91274
Modified:
trunk/mono-basic/vbnc/vbnc/source/ChangeLog
trunk/mono-basic/vbnc/vbnc/source/General/AssemblyInfo.vb
trunk/mono-basic/vbnc/vbnc/source/General/Helper.vb
trunk/mono-basic/vbnc/vbnc/source/Members/Attribute.vb
Log:
* Members/Attribute.vb: Don't pass XDescriptors to SRE.
* General/Helper.vb: Added more GetXOrXBuilder methods.
Modified: trunk/mono-basic/vbnc/vbnc/source/ChangeLog
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/ChangeLog 2007-12-14 11:09:40 UTC (rev
91273)
+++ trunk/mono-basic/vbnc/vbnc/source/ChangeLog 2007-12-14 11:56:55 UTC (rev
91274)
@@ -1,3 +1,8 @@
+2007-12-14 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
+ * Members/Attribute.vb: Don't pass XDescriptors to SRE.
+ * General/Helper.vb: Added more GetXOrXBuilder methods.
+
2007-11-06 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* TypeDeclarations/PartialTypeDeclaration.vb: Add attributes to the main
Modified: trunk/mono-basic/vbnc/vbnc/source/General/AssemblyInfo.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/General/AssemblyInfo.vb 2007-12-14
11:09:40 UTC (rev 91273)
+++ trunk/mono-basic/vbnc/vbnc/source/General/AssemblyInfo.vb 2007-12-14
11:56:55 UTC (rev 91274)
@@ -49,4 +49,4 @@
' You can specify all the values or you can default the Build and Revision
Numbers
' by using the '*' as shown below:
-<Assembly: AssemblyVersion("0.0.0.5850")>
+<Assembly: AssemblyVersion("0.0.0.5851")>
Modified: trunk/mono-basic/vbnc/vbnc/source/General/Helper.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/General/Helper.vb 2007-12-14 11:09:40 UTC
(rev 91273)
+++ trunk/mono-basic/vbnc/vbnc/source/General/Helper.vb 2007-12-14 11:56:55 UTC
(rev 91274)
@@ -2873,6 +2873,15 @@
End If
End Function
+ Shared Sub GetPropertyOrPropertyBuilder(ByVal Properties As
Generic.List(Of PropertyInfo))
+ For i As Integer = 0 To Properties.Count - 1
+ Dim tmp As PropertyDescriptor = TryCast(Properties(i),
PropertyDescriptor)
+ If tmp IsNot Nothing Then
+ Properties(i) = tmp.PropertyInReflection
+ End If
+ Next
+ End Sub
+
Shared Function GetFieldOrFieldBuilder(ByVal Field As FieldInfo) As
FieldInfo
Dim tmp As FieldDescriptor = TryCast(Field, FieldDescriptor)
If tmp Is Nothing Then
@@ -2882,6 +2891,15 @@
End If
End Function
+ Shared Sub GetFieldOrFieldBuilder(ByVal Fields As Generic.List(Of
FieldInfo))
+ For i As Integer = 0 To Fields.Count - 1
+ Dim tmp As FieldDescriptor = TryCast(Fields(i), FieldDescriptor)
+ If tmp IsNot Nothing Then
+ Fields(i) = tmp.FieldInReflection
+ End If
+ Next
+ End Sub
+
''' <summary>
'''
''' </summary>
Modified: trunk/mono-basic/vbnc/vbnc/source/Members/Attribute.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/Members/Attribute.vb 2007-12-14
11:09:40 UTC (rev 91273)
+++ trunk/mono-basic/vbnc/vbnc/source/Members/Attribute.vb 2007-12-14
11:56:55 UTC (rev 91274)
@@ -325,6 +325,8 @@
Helper.Assert(m_Fields IsNot Nothing AndAlso m_FieldValues IsNot
Nothing AndAlso m_Fields.Count = m_FieldValues.Count)
m_ResolvedTypeConstructor =
Helper.GetCtorOrCtorBuilder(m_ResolvedTypeConstructor)
+ Helper.GetFieldOrFieldBuilder(m_Fields)
+ Helper.GetPropertyOrPropertyBuilder(m_Properties)
For i As Integer = 0 To m_Arguments.Length - 1
Dim type As Type
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
