Changeset 175 for Include/Classes

Timestamp:

Mar 21, 2007, 7:06:34 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

Variant, VBObjectの追加

Location:

Include/Classes/System

Files:

• OperatingSystem.ab (modified) (2 diffs)
• String.ab (modified) (3 diffs)
• Version.ab (modified) (3 diffs)
• index.ab (modified) (1 diff)

Include/Classes/System/OperatingSystem.ab

@@ -1 +1 @@
 ' System/OperatingSystem.ab
+
+#ifndef _SYSYTEM_OPERATINGSYSTEM_AB_
+#define _SYSYTEM_OPERATINGSYSTEM_AB_
 
 #require <Classes/System/Version.ab>
@@ -79 +82 @@
     Unix = 4
 End Enum
+
+#endif '_SYSYTEM_OPERATINGSYSTEM_AB_

Include/Classes/System/String.ab

@@ -233 +233 @@
     End Sub
 
-    Sub AssignFromStrChar(text As *StrChar, textLength As Long)
-        If text = Chars Then Exit Sub
-        If AllocStringBuffer(textLength) <> 0 Then
-            memcpy(Chars, text, SizeOf (StrChar) * textLength)
-            Chars[m_Length] = 0
-        End If
-    End Sub
-#ifdef __STRCHAR_IS_NOT_UNICODE
-    Sub AssignFromWideChar(text As PCWSTR, textLengthW As Long)
+    Sub Assign(text As PCSTR, textLengthA As Long)
+#ifdef __STRING_IS_NOT_UNICODE
+        AssignFromStrChar(text, textLengthA)
+#else
+        Dim textLengthW = MultiByteToWideChar(CP_THREAD_ACP, 0, text, textLengthA, 0, 0)
+        If AllocStringBuffer(textLengthW) <> 0 Then
+            MultiByteToWideChar(CP_THREAD_ACP, 0, text, textLengthA, Chars, textLengthW)
+        End If
+#endif
+    End Sub
+
+    Sub Assign(text As PCWSTR, textLengthW As Long)
+#ifdef __STRING_IS_NOT_UNICODE
         Dim textLengthA = WideCharToMultiByte(CP_THREAD_ACP, 0, text, textLengthW, 0, 0, 0, 0)
         If AllocStringBuffer(textLengthA) <> 0 Then
             WideCharToMultiByte(CP_THREAD_ACP, 0, text, textLengthW, Chars, textLengthA, 0, 0)
         End If
-    End Sub
 #else
-    Sub AssignFromMultiByte(text As PCSTR, textLengthA As Long)
-        Dim textLengthW = MultiByteToWideChar(CP_THREAD_ACP, 0, text, textLengthA, 0, 0)
-        If AllocStringBuffer(textLengthW) <> 0 Then
-            MultiByteToWideChar(CP_THREAD_ACP, 0, text, textLengthA, Chars, textLengthW)
-        End If
-    End Sub
-#endif
-    Sub Assign(text As PCSTR, textLength As Long)
-#ifdef __STRING_IS_NOT_UNICODE
-        AssignFromStrChar(text, textLength)
-#else
-        AssignFromMultiByte(text, textLength)
-#endif
-    End Sub
-
-    Sub Assign(text As PCWSTR, textLength As Long)
-#ifdef __STRING_IS_NOT_UNICODE
-        AssignFromWideChar(text, textLength)
-#else
-        AssignFromStrChar(text, textLength)
+        AssignFromStrChar(text, textLengthW)
 #endif
     End Sub
@@ -571 +555 @@
         Dim size = m_Length
 #endif
-        Dim hash = 0 As DWord
-        Dim p = Chars As *Word
-        Dim i As Long
-        For i = 0 To ELM(size)
-            hash = ((hash << 16) + p[i]) Mod &h7fffffff
-        Next
-        Return hash As Long
+        Return _System_GetHashFromWordArray(Chars As *Word, size)
     End Function
 Private
@@ -617 +595 @@
     End Function
 
+    Sub AssignFromStrChar(text As *StrChar, textLength As Long)
+        If text = Chars Then Exit Sub
+        If AllocStringBuffer(textLength) <> 0 Then
+            memcpy(Chars, text, SizeOf (StrChar) * textLength)
+            Chars[m_Length] = 0
+        End If
+    End Sub
 End Class

Include/Classes/System/Version.ab

@@ -1 +1 @@
 ' System/Version.ab
+
+#ifndef __SYSTEM_VERSION_AB__
+#define __SYSTEM_VERSION_AB__
+
+#require <api_winsock2.sbp>
 
 Class Version
@@ -75 +80 @@
 
     Override Function GetHashCode() As Long
-        Return htonl(major) Xor minor Xor build Xor htonl(rivision)
+        Return _System_BSwap(major As DWord) Xor minor Xor build Xor _System_BSwap(rivision As DWord)
     End Function
 
@@ -143 +148 @@
     rivision As Long
 End Class
+
+#endif '__SYSTEM_VERSION_AB__

Include/Classes/System/index.ab

@@ -1 @@
-#require "DateTime.ab"
-#require "Math.ab"
-#require "Object.ab"
-#require "String.ab"
-#require "TimeSpan.ab"
-#require "OperatingSystem.ab"
-#require "Version.ab"
-#require "Environment.ab"
+#require <Classes/System/DateTime.ab>
+#require <Classes/System/Math.ab>
+#require <Classes/System/Object.ab>
+#require <Classes/System/String.ab.
+#require <Classes/System/TimeSpan.ab>
+#require <Classes/System/OperatingSystem.ab>
+#require <Classes/System/Version.ab>
+#require <Classes/System/Environment.ab>