Author: rolf Date: 2007-12-04 09:26:52 -0500 (Tue, 04 Dec 2007) New Revision: 90675
Modified: trunk/mono-basic/vbruntime/Microsoft.VisualBasic/2005VB.vbproj trunk/mono-basic/vbruntime/Microsoft.VisualBasic/ChangeLog trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ChangeLog trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinder.vb trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinding.vb Log: * Microsoft.VisualBasic.CompilerServices/LateBinder.vb: Implement compatibility with multidimensional arrays. Fixes #344217. Modified: trunk/mono-basic/vbruntime/Microsoft.VisualBasic/2005VB.vbproj =================================================================== --- trunk/mono-basic/vbruntime/Microsoft.VisualBasic/2005VB.vbproj 2007-12-04 14:10:19 UTC (rev 90674) +++ trunk/mono-basic/vbruntime/Microsoft.VisualBasic/2005VB.vbproj 2007-12-04 14:26:52 UTC (rev 90675) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -14,10 +14,12 @@ <OutputPath>../bin/</OutputPath> <DocumentationFile>Microsoft.VisualBasic.xml</DocumentationFile> <AssemblyName>Microsoft.VisualBasic</AssemblyName> + <RootNamespace> + </RootNamespace> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <CompilerResponseFile>2005VB.rsp</CompilerResponseFile> - <DebugSymbols>True</DebugSymbols> + <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <DefineDebug>true</DefineDebug> <DefineTrace>false</DefineTrace> @@ -25,8 +27,8 @@ </NoWarn> <DefineConstants>NET_2_0=True,_MYTYPE="Empty",mono_not_yet=true,INDEVENV=true,NET_VER=2.0</DefineConstants> <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors> - <Optimize>True</Optimize> - <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <Optimize>true</Optimize> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> <WarningLevel>4</WarningLevel> <OptionExplicit>On</OptionExplicit> <OptionStrict>On</OptionStrict> @@ -34,22 +36,22 @@ <UseHostCompilerIfAvailable>false</UseHostCompilerIfAvailable> <OutputType>Library</OutputType> <AssemblyName>Microsoft.VisualBasic</AssemblyName> - <OutputPath>..\bin</OutputPath> + <OutputPath>..\bin\</OutputPath> <RootNamespace> </RootNamespace> - <AllowUnsafeBlocks>False</AllowUnsafeBlocks> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <CompilerResponseFile>2005VB.rsp</CompilerResponseFile> <DebugType>pdbonly</DebugType> <DefineDebug>false</DefineDebug> <DefineTrace>true</DefineTrace> - <Optimize>True</Optimize> + <Optimize>true</Optimize> <NoWarn> </NoWarn> <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors> - <DebugSymbols>True</DebugSymbols> - <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <DebugSymbols>true</DebugSymbols> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> <DefineConstants> </DefineConstants> <WarningLevel>4</WarningLevel> @@ -58,33 +60,33 @@ <TreatWarningsAsErrors>false</TreatWarningsAsErrors> <OutputType>Library</OutputType> <AssemblyName>Microsoft.VisualBasic</AssemblyName> - <OutputPath>..\bin</OutputPath> + <OutputPath>..\bin\</OutputPath> <RootNamespace> </RootNamespace> - <AllowUnsafeBlocks>False</AllowUnsafeBlocks> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Edit|AnyCPU' "> <RootNamespace>dummy_root</RootNamespace> <OutputType>Library</OutputType> <AssemblyName>Microsoft.VisualBasic</AssemblyName> - <OutputPath>..\bin</OutputPath> - <DebugSymbols>True</DebugSymbols> - <AllowUnsafeBlocks>False</AllowUnsafeBlocks> - <Optimize>True</Optimize> - <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <OutputPath>..\bin\</OutputPath> + <DebugSymbols>true</DebugSymbols> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> + <Optimize>true</Optimize> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> <DefineConstants>INDEVENV=true,NET_2_0=true,NET_VER=2.0</DefineConstants> <WarningLevel>4</WarningLevel> <OptionExplicit>On</OptionExplicit> <OptionStrict>On</OptionStrict> </PropertyGroup> <ItemGroup> - <Reference Include="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <Reference Include="System" /> + <Reference Include="System.Data" /> <Reference Include="System.Deployment" /> - <Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <Reference Include="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <Reference Include="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference Include="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <Reference Include="System.Drawing" /> + <Reference Include="System.Web" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> <Import Include="System" /> Modified: trunk/mono-basic/vbruntime/Microsoft.VisualBasic/ChangeLog =================================================================== --- trunk/mono-basic/vbruntime/Microsoft.VisualBasic/ChangeLog 2007-12-04 14:10:19 UTC (rev 90674) +++ trunk/mono-basic/vbruntime/Microsoft.VisualBasic/ChangeLog 2007-12-04 14:26:52 UTC (rev 90675) @@ -1,3 +1,7 @@ +2007-12-04 Rolf Bjarne Kvinge <[EMAIL PROTECTED]> + + + 2007-08-13 Rolf Bjarne Kvinge <[EMAIL PROTECTED]> * 2005VB.vbproj: Update. Modified: trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ChangeLog =================================================================== --- trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ChangeLog 2007-12-04 14:10:19 UTC (rev 90674) +++ trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ChangeLog 2007-12-04 14:26:52 UTC (rev 90675) @@ -1,3 +1,8 @@ +2007-12-04 Rolf Bjarne Kvinge <[EMAIL PROTECTED]> + + * LateBinder.vb: Implement compatibility with multidimensional arrays. Fixes + #344217. + 2007-11-06 Rolf Bjarne Kvinge <[EMAIL PROTECTED]> * Operators.vb: Fix CompareEqual with String<->Boolean. Fixes 328099. Modified: trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinder.vb =================================================================== --- trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinder.vb 2007-12-04 14:10:19 UTC (rev 90674) +++ trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinder.vb 2007-12-04 14:26:52 UTC (rev 90675) @@ -220,9 +220,7 @@ If oargs(i).GetType().IsArray Then 'array that was passed by ref Dim arr As Array = CType(clone(reverseMapping), Array) - For j As Integer = 0 To arr.Length - 1 - CType(oargs(i), Array).SetValue(arr.GetValue(j), j) - Next + Array.Copy(arr, CType(oargs(i), Array), arr.Length) args(i) = oargs(i) ElseIf oargs(i).GetType().IsPrimitive Then 'primitives passed by ref should be updated Modified: trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinding.vb =================================================================== --- trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinding.vb 2007-12-04 14:10:19 UTC (rev 90674) +++ trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinding.vb 2007-12-04 14:26:52 UTC (rev 90675) @@ -36,7 +36,12 @@ Namespace Microsoft.VisualBasic.CompilerServices <System.ComponentModel.EditorBrowsable(ComponentModel.EditorBrowsableState.Never)> _ Public NotInheritable Class LateBinding - + Public Class DebuggerStepThrough + Inherits Attribute + End Class + Public Class DebuggerHidden + Inherits Attribute + End Class Private Shared ReadOnly Property LBinder() As Microsoft.VisualBasic.CompilerServices.LateBinder Get Return New LateBinder @@ -137,7 +142,7 @@ End Try End Sub - <DebuggerStepThrough(), DebuggerHidden()> _ + '<DebuggerStepThrough(), DebuggerHidden()> _ Public Shared Function LateGet(ByVal o As Object, ByVal objType As System.Type, ByVal name As String, ByVal args() As Object, ByVal paramnames() As String, ByVal CopyBack() As Boolean) As Object Dim realType As System.Type = objType If realType Is Nothing Then @@ -145,12 +150,10 @@ End If Dim flags As BindingFlags = BindingFlags.FlattenHierarchy Or _ - BindingFlags.GetField Or _ BindingFlags.GetProperty Or _ BindingFlags.IgnoreCase Or _ BindingFlags.Instance Or _ BindingFlags.InvokeMethod Or _ - BindingFlags.NonPublic Or _ BindingFlags.OptionalParamBinding Or _ BindingFlags.Public Or _ BindingFlags.Static _______________________________________________ Mono-patches maillist - [email protected] http://lists.ximian.com/mailman/listinfo/mono-patches
