Changeset 132 for Include/basic

Timestamp:

Mar 4, 2007, 11:28:44 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

String型の自身を変更するメソッドを、戻り値で返すように変更。
併せて文字列比較を自前の関数で行うように変更。
プロンプトのキャレットの位置計算が正しくなかったバグを修正。

Location:

Include/basic

Files:

• function.sbp (modified) (1 diff)
• prompt.sbp (modified) (3 diffs)

Include/basic/function.sbp

@@ -1137 +1137 @@
 End Function
 
+Function _System_StrCmp(s1 As PCSTR, s2 As PCSTR) As Long
+    Dim i = 0 As SIZE_T
+    While s1[i] = s2[i]
+        If s1[i] = 0 Then
+            Exit While
+        End If
+        i++
+    Wend
+    _System_StrCmp = s1[i] - s2[i]
+End Function
+
+Function _System_StrCmp(s1 As PCWSTR, s2 As PCWSTR) As Long
+    Dim i = 0 As SIZE_T
+    While s1[i] = s2[i]
+        If s1[i] = 0 Then
+            Exit While
+        End If
+        i++
+    Wend
+    _System_StrCmp = s1[i] - s2[i]
+End Function
 #endif '_INC_FUNCTION

Include/basic/prompt.sbp

@@ -136 +136 @@
                 .y++
             Else
-                Dim currentLineCharInfo = _PromptSys_TextLine[.y].CharInfo As *_PromptSys_CharacterInformation
+                Dim currentLineCharInfo = _PromptSys_TextLine[.y].CharInfo
                 _PromptSys_TextLine[.y].Text[.x] = buf[i2]
                 currentLineCharInfo[.x].ForeColor = _PromptSys_NowTextColor
@@ -262 +262 @@
 
         CreateCaret(hwnd, 0, 9, 6)
-        SetCaretPos(_PromptSys_CurPos.x * _PromptSys_FontSize.cx, (_PromptSys_CurPos.y + 1) * _PromptSys_FontSize.cy - 7)
+        With _PromptSys_CurPos
+            SetCaretPos(_PromptSys_TextLine[.y].CharInfo[.x].StartPos, (.y + 1) * _PromptSys_FontSize.cy - 7)
+        End With
         ShowCaret(hwnd)
     End If
@@ -353 +355 @@
 
         memcpy(VarPtr(_PromptSys_InputStr[_PromptSys_InputLen]), str, size)
-        _PromptSys_InputLen += size
+        _PromptSys_InputLen += size \ SizeOf (Char)
 
         Dim tempStr As String(str, size \ SizeOf (Char))