Changeset 232

Timestamp:

May 6, 2007, 8:08:17 PM (17 years ago)

Author:

dai

Message:

32bitコンパイラを更新（64bit版はしばらくお待ちください）
Importsステートメントを試験導入（スコープレベルでの使用はまだできません）。
グローバル変数、定数、クラス、グローバル関数に対してNamespaceの適用を可能にした。
ObjPtr関数を導入。
Mathクラスの構文ミスを修正。

Files:

• Include/Classes/System/Math.ab (modified) (2 diffs)
• Include/Classes/System/Object.ab (modified) (2 diffs)
• Include/Classes/System/Threading/Thread.ab (modified) (1 diff)
• Include/system/gc.sbp (modified) (2 diffs)
• TestCase/SimpleTestCase/ObjectTest.ab (modified) (1 diff)
• bin/BasicCompiler32.exe (modified) ( previous)

Include/Classes/System/Math.ab

@@ -60 +60 @@
             Acos = _System_GetNaN()
         Else
-            Acos = _System_HalfPI - ASin(x)
+            Acos = _System_HalfPI - Asin(x)
         End If
     End Function
@@ -252 +252 @@
 
     Static Function Log10(x As Double) As Double
-        Return Log(x) / Log(10)
+        Return Math.Log(x) / Math.Log(10)
     End Function
 

Include/Classes/System/Object.ab

@@ -17 +17 @@
     End Function
     Static Function Equals( objectA As Object, objectB As Object ) As Boolean
-        If VarPtr(objectA) = 0 /*objectA = Nothing*/ Then
-            Return VarPtr(objectB) = 0 'objectB = Nothing
+        If ObjPtr(objectA) = NULL /*objectA = Nothing*/ Then
+            Return ObjPtr(objectB) = NULL 'objectB = Nothing
         Else
             Return objectA.Equals( objectB )
@@ -26 +26 @@
     ' 参照先が等しいか判断する
     Static Function ReferenceEquals(objectA As Object, objectB As Object) As Boolean
-        If VarPtr( objectA ) = VarPtr( objectB) Then
+        If ObjPtr( objectA ) = ObjPtr( objectB) Then
             Return True
         Else

Include/Classes/System/Threading/Thread.ab

@@ -61 +61 @@
 
 
-    Function Equals(ByRef obj_Thread As Thread) As BOOL
-        If m_dwThreadId=obj_Thread.m_dwThreadId Then
-            Return _System_TRUE
+    Function Equals( thread As Thread ) As Boolean
+        If m_dwThreadId = thread.m_dwThreadId Then
+            Return True
         End If
-        Return _System_FALSE
+        Return False
     End Function
 

Include/system/gc.sbp

@@ -112 +112 @@
         Dim thread As Thread(hTargetThread,GetCurrentThreadId(),0)
 
-        _System_pobj_AllThreads->BeginThread(VarPtr( thread ),_System_gc_StackRoot_StartPtr As *LONG_PTR)
+        _System_pobj_AllThreads->BeginThread(ObjPtr( thread ),_System_gc_StackRoot_StartPtr As *LONG_PTR)
 
     End Sub
@@ -245 +245 @@
 
     Static Function IsNull( object As Object ) As Boolean
-        If VarPtr( object ) = NULL Then
+        If ObjPtr( object ) = NULL Then
             Return True
         End If

TestCase/SimpleTestCase/ObjectTest.ab

@@ -16 +16 @@
     UnitTest( "Object.ReferenceEquals(case 2)", Object.ReferenceEquals( obj1, obj3 ) )
 
-    ' TODO: ObjPtr関数の実装を待つ
-    'UnitTest( "Object.GetHashCode", obj1.GetHashCode() = ObjPtr( obj1 ) )
+    UnitTest( "Object.GetHashCode", obj1.GetHashCode() = ObjPtr( obj1 ) )
 
     UnitTest( "Object.ToString", obj1.ToString() = "Object" )