Author: motym
Date: 2007-03-27 04:01:41 -0500 (Tue, 27 Mar 2007)
New Revision: 75009

Modified:
   
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/Conversions.vb
   
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinder.vb
   
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StringType.vb
   
trunk/mono-basic/vbruntime/Test/Microsoft.VisualBasic.CompilerServices/LateBindingTests4.vb
   trunk/mono-basic/vbruntime/VB.J2EE.build.bat
   trunk/mono-basic/vbruntime/VB_TESTS.J2EE.build.bat
   trunk/mono-basic/vbruntime/VB_TESTS_2005.J2EE.build.bat
Log:
implementation for Conversions.ToCharArrayRankOne

Modified: 
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/Conversions.vb
===================================================================
--- 
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/Conversions.vb
      2007-03-27 08:38:22 UTC (rev 75008)
+++ 
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/Conversions.vb
      2007-03-27 09:01:41 UTC (rev 75009)
@@ -68,11 +68,28 @@
         Public Shared Function ToChar(ByVal Value As String) As Char
             Return CharType.FromString(Value)
         End Function
+
         Public Shared Function ToCharArrayRankOne(ByVal Value As Object) As 
Char()
-            Throw New NotImplementedException
+            If (Value Is Nothing) Then
+                Return ToCharArrayRankOne("")
+            End If
+
+            If (GetType(Char()).Equals(Value.GetType())) Then
+                Return CType(Value, Char())
+            End If
+
+            If (GetType(String).Equals(Value.GetType())) Then
+                Return ToCharArrayRankOne(CType(Value, String))
+            End If
+
+            Throw New InvalidCastException("Conversion from type '" + 
Value.GetType().Name + "' to type 'Char()' is not valid.")
         End Function
+
         Public Shared Function ToCharArrayRankOne(ByVal Value As String) As 
Char()
-            Throw New NotImplementedException
+            If (Value Is Nothing) Then
+                Value = ""
+            End If
+            Return Value.ToCharArray()
         End Function
         Public Shared Function ToDate(ByVal Value As Object) As DateTime
             Return DateType.FromObject(Value)

Modified: 
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinder.vb
===================================================================
--- 
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinder.vb
       2007-03-27 08:38:22 UTC (rev 75008)
+++ 
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinder.vb
       2007-03-27 09:01:41 UTC (rev 75009)
@@ -359,6 +359,7 @@
         Private Sub PrepareParameters(ByRef args() As Object, ByVal f As 
MethodBase, ByVal names() As String, ByVal bstate As BState)
 
             Dim parameters() As ParameterInfo = f.GetParameters()
+
             Dim vals() As Object
             Dim i As Integer
 
@@ -428,6 +429,8 @@
                         Return CBool(value)
                     Case TypeCode.Byte
                         Return CByte(value)
+                    Case TypeCode.SByte
+                        Return CSByte(value)
                     Case TypeCode.Char
                         Return CChar(value)
                     Case TypeCode.DateTime
@@ -442,6 +445,12 @@
                         Return CShort(value)
                     Case TypeCode.Int64
                         Return CLng(value)
+                    Case TypeCode.UInt32
+                        Return CUInt(value)
+                    Case TypeCode.UInt16
+                        Return CUShort(value)
+                    Case TypeCode.UInt64
+                        Return CULng(value)
                     Case TypeCode.Single
                         Return CSng(value)
                 End Select
@@ -457,6 +466,8 @@
                             Return CBool(value)
                         Case TypeCode.Byte
                             Return CByte(value)
+                        Case TypeCode.SByte
+                            Return CSByte(value)
                         Case TypeCode.Char
                             Return CChar(value)
                         Case TypeCode.DateTime
@@ -471,6 +482,12 @@
                             Return CShort(value)
                         Case TypeCode.Int64
                             Return CLng(value)
+                        Case TypeCode.UInt32
+                            Return CUInt(value)
+                        Case TypeCode.UInt16
+                            Return CUShort(value)
+                        Case TypeCode.UInt64
+                            Return CULng(value)
                         Case TypeCode.Single
                             Return CSng(value)
                     End Select

Modified: 
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StringType.vb
===================================================================
--- 
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StringType.vb
       2007-03-27 08:38:22 UTC (rev 75008)
+++ 
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StringType.vb
       2007-03-27 09:01:41 UTC (rev 75009)
@@ -103,8 +103,18 @@
                 Case TypeCode.String
                     ' do nothing.
                     Return Value.ToString()
-                'Case TypeCode.DBNull
-                '    Return Convert.ToString(DirectCast(Value, DBNull))
+#If TARGET_JVM Then 'These cases are always relevant, however because of a bug 
in the vbc it is only compiled for jvm
+                Case TypeCode.SByte
+                    Return Convert.ToString(DirectCast(Value, SByte))
+                Case TypeCode.UInt32
+                    Return Convert.ToString(DirectCast(Value, UInteger))
+                Case TypeCode.UInt16
+                    Return Convert.ToString(DirectCast(Value, UShort))
+                Case TypeCode.UInt64
+                    Return Convert.ToString(DirectCast(Value, ULong))
+                Case TypeCode.DBNull
+                    Return Convert.ToString(DirectCast(Value, DBNull))
+#End If
                 Case Else 'TypeCode.Object and other
                     Throw New InvalidCastException
             End Select

Modified: 
trunk/mono-basic/vbruntime/Test/Microsoft.VisualBasic.CompilerServices/LateBindingTests4.vb
===================================================================
--- 
trunk/mono-basic/vbruntime/Test/Microsoft.VisualBasic.CompilerServices/LateBindingTests4.vb
 2007-03-27 08:38:22 UTC (rev 75008)
+++ 
trunk/mono-basic/vbruntime/Test/Microsoft.VisualBasic.CompilerServices/LateBindingTests4.vb
 2007-03-27 09:01:41 UTC (rev 75009)
@@ -413,12 +413,12 @@
         End Function
     End Class
 
-#If NET_2_0 Then
-    <Test(), ExpectedException(GetType(InvalidCastException))> _
-    Public Sub LateBind_NamedParam_12()
+#If TARGET_JVM Then
+    <Test(), 
ExpectedException(GetType(InvalidCastException),Category("NotWorking"))> Public 
Sub LateBind_NamedParam_12()
+#ElseIf NET_2_0 Then
+    <Test(), ExpectedException(GetType(InvalidCastException))> Public Sub 
LateBind_NamedParam_12()
 #Else
-    <Test()> _
-    Public Sub LateBind_NamedParam_12()
+    <Test()> Public Sub LateBind_NamedParam_12()
 #End If
         Dim o As Object = New C15
         Assert.AreEqual("Integer,Integer,ParamArray Integer()", o.F(i:=5, 
j:=6))

Modified: trunk/mono-basic/vbruntime/VB.J2EE.build.bat
===================================================================
--- trunk/mono-basic/vbruntime/VB.J2EE.build.bat        2007-03-27 08:38:22 UTC 
(rev 75008)
+++ trunk/mono-basic/vbruntime/VB.J2EE.build.bat        2007-03-27 09:01:41 UTC 
(rev 75009)
@@ -27,6 +27,7 @@
 
 IF DEFINED VMW4J2EE_JGAC_DIR GOTO JGAC_DEFINED
 SET VMW4J2EE_JGAC_DIR=%VMW_HOME%\java_refs\framework
+SET VMW4J2EE_JGAC_JRE_DIR=%VMW_HOME%\java_refs\jre
 :JGAC_DEFINED
 echo using VMW4J2EE_JGAC_DIR=%VMW4J2EE_JGAC_DIR%
 
@@ -77,7 +78,7 @@
 pushd bin
 echo on
 echo converting dll to jar without validator
-"%VMW_HOME%\bin\jcsc.exe" %CD%\Microsoft.VisualBasic.dll /debug:3 /novalidator 
/out:%CD%\Microsoft.VisualBasic.jar 
/classpath:%VMW4J2EE_JGAC_JARS%;%CD%\Microsoft.VisualBasic.jar 
/lib:%CD%;"%VMW4J2EE_JGAC_DIR%" >>%BUILD_LOG% 2<&1
+"%VMW_HOME%\bin\jcsc.exe" %CD%\Microsoft.VisualBasic.dll /debug:3 /novalidator 
/out:%CD%\Microsoft.VisualBasic.jar 
/classpath:%VMW4J2EE_JGAC_JARS%;%CD%\Microsoft.VisualBasic.jar 
/lib:%CD%;"%VMW4J2EE_JGAC_JRE_DIR%";"%VMW4J2EE_JGAC_DIR%"; >>%BUILD_LOG% 2<&1
 IF %ERRORLEVEL% NEQ 0 GOTO EXCEPTION
 echo running java validator
 rem "%JAVA_HOME%\bin\java.exe" -cp 
.;..;"%VMW_HOME%\bin\validator.jar";"%VMW_HOME%\bin\bcel.jar";%VMW4J2EE_JGAC_JARS%;"%CD%\Microsoft.VisualBasic.jar"
 -Xms256m -Xmx512m validator.Validator -jar:"%CD%\Microsoft.VisualBasic.jar" 
>>%BUILD_LOG% 2<&1

Modified: trunk/mono-basic/vbruntime/VB_TESTS.J2EE.build.bat
===================================================================
--- trunk/mono-basic/vbruntime/VB_TESTS.J2EE.build.bat  2007-03-27 08:38:22 UTC 
(rev 75008)
+++ trunk/mono-basic/vbruntime/VB_TESTS.J2EE.build.bat  2007-03-27 09:01:41 UTC 
(rev 75009)
@@ -47,15 +47,16 @@
 set path=%path%;%NET_FRAMEWORK_DIR%
 
 set NUNIT_PATH=..\..\mcs\nunit20\
+set NUNIT_OPTIONS=/exclude=NotWorking
 set 
NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.jar
 
  "%VS71COMNTOOLS%..\IDE\devenv.com" %CD%\2003VB.J2EE.sln /rebuild Debug_Java
  IF %ERRORLEVEL% NEQ 0 GOTO EXCEPTION
 set CLASSPATH=%NUNIT_CLASSPATH%;%VMW4J2EE_JGAC_JARS%
 rem run  Microsoft.VisualBasic_test.jar
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi 
/xml=Microsoft.VisualBasic_test.xml 
%CD%\bin_Java\Microsoft.VisualBasic_test.jar 
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi 
%NUNIT_OPTIONS% /xml=Microsoft.VisualBasic_test.xml 
%CD%\bin_Java\Microsoft.VisualBasic_test.jar 
 rem  run Microsoft.VisualBasic_test_VB.jar 
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi 
/xml=Microsoft.VisualBasic_test_VB.xml 
%CD%\bin_Java\Microsoft.VisualBasic_test_VB.jar 
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi 
%NUNIT_OPTIONS% /xml=Microsoft.VisualBasic_test_VB.xml 
%CD%\bin_Java\Microsoft.VisualBasic_test_VB.jar 
 IF %ERRORLEVEL% NEQ 0 GOTO EXCEPTION
 
 :FINALLY

Modified: trunk/mono-basic/vbruntime/VB_TESTS_2005.J2EE.build.bat
===================================================================
--- trunk/mono-basic/vbruntime/VB_TESTS_2005.J2EE.build.bat     2007-03-27 
08:38:22 UTC (rev 75008)
+++ trunk/mono-basic/vbruntime/VB_TESTS_2005.J2EE.build.bat     2007-03-27 
09:01:41 UTC (rev 75009)
@@ -30,7 +30,7 @@
 rem ===========================
 
 SET VMW4J2EE_DIR=C:\Program Files\Mainsoft\Visual MainWin for J2EE V2
-SET VMW4J2EE_JGAC_DIR=java_refs\vmw4j2ee_110
+SET VMW4J2EE_JGAC_DIR=java_refs\framework
 
 SET VMW4J2EE_JGAC_JARS="%VMW4J2EE_DIR%\%VMW4J2EE_JGAC_DIR%\mscorlib.jar"
 SET 
VMW4J2EE_JGAC_JARS=%VMW4J2EE_JGAC_JARS%;"%VMW4J2EE_DIR%\%VMW4J2EE_JGAC_DIR%\System.jar"

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to