[prev in list] [next in list] [prev in thread] [next in thread]
List: mono-patches
Subject: [Mono-patches] r120289 - in branches/rolf/cecil-vbnc/vbnc: cecil
From: "Rolf Bjarne Kvinge (rolfkvinge () ya ! com)"
Date: 2008-11-29 23:13:48
Message-ID: 20081129231348.1A15B9472C () mono-cvs ! ximian ! com
[Download RAW message or body]
Author: rolf
Date: 2008-11-29 18:13:47 -0500 (Sat, 29 Nov 2008)
New Revision: 120289
Modified:
branches/rolf/cecil-vbnc/vbnc/cecil/ChangeLog
branches/rolf/cecil-vbnc/vbnc/cecil/Mono.Cecil/FieldDefinition.cs
branches/rolf/cecil-vbnc/vbnc/vbnc/source/ChangeLog
branches/rolf/cecil-vbnc/vbnc/vbnc/source/General/AssemblyInfo.vb
branches/rolf/cecil-vbnc/vbnc/vbnc/source/Members/ConstantDeclaration.vb
branches/rolf/cecil-vbnc/vbnc/vbnc/tests/ChangeLog
branches/rolf/cecil-vbnc/vbnc/vbnc/tests/KnownFailures.txt
Log:
* cecil/Mono.Cecil/FieldDefinition.cs: Add a HasConstant setter.
* vbnc/source/General/AssemblyInfo.vb,
vbnc/source/Members/ConstantDeclaration.vb,
vbnc/tests/KnownFailures.txt: Fix date and decimal constants.
Modified: branches/rolf/cecil-vbnc/vbnc/cecil/ChangeLog
===================================================================
--- branches/rolf/cecil-vbnc/vbnc/cecil/ChangeLog 2008-11-29 23:01:16 UTC (rev \
120288)
+++ branches/rolf/cecil-vbnc/vbnc/cecil/ChangeLog 2008-11-29 23:13:47 UTC (rev \
120289) @@ -1,3 +1,7 @@
+2008-11-30 Rolf Bjarne Kvinge <RKvinge@novell.com>
+
+ * Mono.Cecil/FieldDefinition.cs: Add a HasConstant setter.
+
2008-11-29 Rolf Bjarne Kvinge <RKvinge@novell.com>
* Mono.Cecil/PInvokeInfo.cs: Local fix for #450269.
Modified: branches/rolf/cecil-vbnc/vbnc/cecil/Mono.Cecil/FieldDefinition.cs
===================================================================
--- branches/rolf/cecil-vbnc/vbnc/cecil/Mono.Cecil/FieldDefinition.cs 2008-11-29 \
23:01:16 UTC (rev 120288)
+++ branches/rolf/cecil-vbnc/vbnc/cecil/Mono.Cecil/FieldDefinition.cs 2008-11-29 \
23:13:47 UTC (rev 120289) @@ -117,6 +117,9 @@
InitConstant ();
return m_hasConstant;
}
+ set {
+ m_hasConstant = value;
+ }
}
public object Constant {
Modified: branches/rolf/cecil-vbnc/vbnc/vbnc/source/ChangeLog
===================================================================
--- branches/rolf/cecil-vbnc/vbnc/vbnc/source/ChangeLog 2008-11-29 23:01:16 UTC (rev \
120288)
+++ branches/rolf/cecil-vbnc/vbnc/vbnc/source/ChangeLog 2008-11-29 23:13:47 UTC (rev \
120289) @@ -1,5 +1,10 @@
2008-11-30 Rolf Bjarne Kvinge <RKvinge@novell.com>
+ * General/AssemblyInfo.vb, Members/ConstantDeclaration.vb: Fix date and
+ decimal constants.
+
+2008-11-30 Rolf Bjarne Kvinge <RKvinge@novell.com>
+
* General/AssemblyInfo.vb, General/Compiler.vb, General/Helper.vb,
General/MemberCache.vb, General/MyGenerator.vb,
General/TypeConverter.vb, Parser/Parser(Types).vb,
Modified: branches/rolf/cecil-vbnc/vbnc/vbnc/source/General/AssemblyInfo.vb
===================================================================
--- branches/rolf/cecil-vbnc/vbnc/vbnc/source/General/AssemblyInfo.vb 2008-11-29 \
23:01:16 UTC (rev 120288)
+++ branches/rolf/cecil-vbnc/vbnc/vbnc/source/General/AssemblyInfo.vb 2008-11-29 \
23:13:47 UTC (rev 120289) @@ -49,7 +49,7 @@
' 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.6331")>
+<Assembly: AssemblyVersion("0.0.0.6336")>
Modified: branches/rolf/cecil-vbnc/vbnc/vbnc/source/Members/ConstantDeclaration.vb
===================================================================
--- branches/rolf/cecil-vbnc/vbnc/vbnc/source/Members/ConstantDeclaration.vb 2008-11-29 \
23:01:16 UTC (rev 120288)
+++ branches/rolf/cecil-vbnc/vbnc/vbnc/source/Members/ConstantDeclaration.vb 2008-11-29 \
23:13:47 UTC (rev 120289) @@ -235,14 +235,14 @@
'm_FieldBuilder.SetConstant(Nothing)
ElseIf Helper.CompareType(CecilHelper.GetType(Compiler, m_ConstantValue), \
Compiler.TypeCache.System_Decimal) Then Dim value As Decimal = \
DirectCast(m_ConstantValue, Decimal)
- Dim attrib As New \
Mono.Cecil.CustomAttribute(Compiler.TypeCache.System_Runtime_CompilerServices_DecimalConstantAttribute__ctor_Byte_Byte_Int32_Int32_Int32)
+ Dim attrib As New \
Mono.Cecil.CustomAttribute(Helper.GetMethodOrMethodReference(Compiler, \
Compiler.TypeCache.System_Runtime_CompilerServices_DecimalConstantAttribute__ctor_Byte_Byte_Int32_Int32_Int32))
Dim params As Object() = New \
Emitter.DecimalFields(value).AsByte_Byte_Int32_Int32_Int32() For i As Integer = 0 To \
params.Length - 1 attrib.ConstructorParameters.Add(params(i))
Next
m_FieldBuilderCecil.CustomAttributes.Add(attrib)
ElseIf Helper.CompareType(CecilHelper.GetType(Compiler, m_ConstantValue), \
Compiler.TypeCache.System_DateTime) Then
- Dim attrib As New \
Mono.Cecil.CustomAttribute(Compiler.TypeCache.System_Runtime_CompilerServices_DateTimeConstantAttribute__ctor_Int64)
+ Dim attrib As New \
Mono.Cecil.CustomAttribute(Helper.GetMethodOrMethodReference(Compiler, \
Compiler.TypeCache.System_Runtime_CompilerServices_DateTimeConstantAttribute__ctor_Int64))
attrib.ConstructorParameters.Add(DirectCast(m_ConstantValue, \
Date).Ticks) m_FieldBuilderCecil.CustomAttributes.Add(attrib)
Else
@@ -270,8 +270,13 @@
DeclaringType.CecilType.Fields.Add(m_FieldBuilderCecil)
End If
- m_FieldBuilderCecil.Constant = m_ConstantValue
+ If m_RequiresSharedInitialization Then
+ m_FieldBuilderCecil.Constant = Nothing
+ Else
+ m_FieldBuilderCecil.Constant = m_ConstantValue
+ End If
m_FieldBuilderCecil.HasDefault = True
+ m_FieldBuilderCecil.HasConstant = Not m_RequiresSharedInitialization
m_FieldBuilderCecil.Name = Name
If m_TypeName IsNot Nothing Then
m_FieldBuilderCecil.FieldType = Helper.GetTypeOrTypeReference(Compiler, \
m_TypeName.ResolvedType)
Modified: branches/rolf/cecil-vbnc/vbnc/vbnc/tests/ChangeLog
===================================================================
--- branches/rolf/cecil-vbnc/vbnc/vbnc/tests/ChangeLog 2008-11-29 23:01:16 UTC (rev \
120288)
+++ branches/rolf/cecil-vbnc/vbnc/vbnc/tests/ChangeLog 2008-11-29 23:13:47 UTC (rev \
120289) @@ -1,5 +1,9 @@
2008-11-30 Rolf Bjarne Kvinge <RKvinge@novell.com>
+ * KnownFailures.txt: Fix date and decimal constants.
+
+2008-11-30 Rolf Bjarne Kvinge <RKvinge@novell.com>
+
* KnownFailures.txt: More fixes and more passing tests.
2008-11-17 Rolf Bjarne Kvinge <RKvinge@novell.com>
Modified: branches/rolf/cecil-vbnc/vbnc/vbnc/tests/KnownFailures.txt
===================================================================
--- branches/rolf/cecil-vbnc/vbnc/vbnc/tests/KnownFailures.txt 2008-11-29 23:01:16 \
UTC (rev 120288)
+++ branches/rolf/cecil-vbnc/vbnc/vbnc/tests/KnownFailures.txt 2008-11-29 23:13:47 \
UTC (rev 120289) @@ -17,11 +17,7 @@
Errors\32106 'VBNC Compile succeeded unexpectedly.
Mono\PropertyL 'VBNC Compile failed, process exited with exit code -1
NonCecilRelated\GenericType3 'VBNC Compile failed, process exited with exit code 1
-NotImplementedYet\CDateConstantExpression1 'VBNC Compile failed, process exited with \
exit code -1
-NotImplementedYet\CDecConstantExpression1 'VBNC Compile failed, process exited with \
exit code -1
-NotImplementedYet\DecimalConstant1 'VBNC Compile failed, process exited with exit \
code -1 Unfixable\GenericNestedType1 'VBNC Compile failed, process exited with exit \
code -1
-Unfixable\NestedInterfaceInheritance1 'VBNC Compile failed, process exited with exit \
code -1 Unfixable\NoVBRuntimeRef1 'VBC Compile (verifies that the test itself is \
correct) failed, process exited with exit code 1
'The following fails on linux only.
@@ -122,9 +118,6 @@
Mono\PropertyL 'Type Safety and Security Verification failed, process exited with \
exit code 1 Mono\TypeMembersF 'VBNC Compile failed, process exited with exit code -1
My\WindowsForms_module 'VBNC Compile failed, process exited with exit code 1
-NotImplementedYet\CDateConstantExpression1 'VBNC Compile failed, process exited with \
exit code -1
-NotImplementedYet\CDecConstantExpression1 'VBNC Compile failed, process exited with \
exit code -1
-NotImplementedYet\DecimalConstant1 'VBNC Compile failed, process exited with exit \
code -1 NotImplementedYet\DelegateAsMethodParameter1 'Type Safety and Security \
Verification failed, process exited with exit code 1 \
NotImplementedYet\MethodOverload1 'Only 'MethodOverload1_vbc' has the Method \
'MethodOverload1.Test.F(Of )(System.Int32)'. NUnitTests\MethodCall4 'VBNC Compile \
failed, process exited with exit code -1 @@ -134,7 +127,6 @@
RunTime\CType_TypeParameter4 'VBNC Compile failed, process exited with exit code -1
SelfTest\rt.windows 'VBNC Compile failed, process exited with exit code 1
Unfixable\GenericNestedType1 'VBNC Compile failed, process exited with exit code -1
-Unfixable\NestedInterfaceInheritance1 'VBNC Compile failed, process exited with exit \
code -1 Unfixable\NoVBRuntimeRef1 'VBC Compile (verifies that the test itself is \
correct) failed, process exited with exit code 1 \
VBRunTime\Microsoft.VisualBasic.linux VBRunTime\Microsoft.VisualBasic.windows 'VBNC \
Compile failed, process exited with exit code -1
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic