Changeset 119 for Include/basic

Timestamp:

Feb 23, 2007, 11:00:24 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

Unicode (#50) 前準備
Byte→Char (#51) 型名は殆ど完了、ただし中身までは手を付けていないものが多い

Location:

Include/basic

Files:

• command.sbp (modified) (2 diffs)
• function.sbp (modified) (6 diffs)
• prompt.sbp (modified) (7 diffs)

Include/basic/command.sbp

@@ -6 +6 @@
 
 
-Const _System_Type_Char = 1
+Const _System_Type_SByte = 1
 Const _System_Type_Byte = 2
 Const _System_Type_Integer = 3
@@ -16 +16 @@
 Const _System_Type_Single = 9
 Const _System_Type_Double = 10
-Const _System_Type_String = 11
+Const _System_Type_Char =   11
+Const _System_Type_String = 13
+Const _System_Type_VoidPtr =    14
 Const _System_MAX_PARMSNUM = 32-1
 

Include/basic/function.sbp

@@ -514 +514 @@
     End If
 End Sub
-Function _ecvt(value As Double, count As Long, ByRef dec As Long, ByRef sign As Long) As BytePtr
-    Dim temp As BytePtr
+Function _ecvt(value As Double, count As Long, ByRef dec As Long, ByRef sign As Long) As *Char
+    Dim temp As *Char
     Dim i As Long, i2 As Long
 
@@ -540 +540 @@
     dec=1
     While value<0.999999999999999  'value<1
-        value=value*10
-        dec=dec-1
+        value *= 10
+        dec--
     Wend
     While 9.99999999999999<=value  '10<=value
-        value=value/10
-        dec=dec+1
+        value /= 10
+        dec++
     Wend
 
@@ -555 +555 @@
     _System_ecvt_buffer[i]=0
 
-    i=i-1
+    i--
     If value>=5 Then
         '切り上げ処理
@@ -562 +562 @@
 
     For i=0 To count-1
-        _System_ecvt_buffer[i]=_System_ecvt_buffer[i]+&H30
+        _System_ecvt_buffer[i] += &H30
     Next
     _System_ecvt_buffer[i]=0
@@ -713 +713 @@
 End Function
 
-Function Val(buf As BytePtr) As Double
+Function Val(buf As *Char) As Double
     Dim i As Long, i2 As Long, i3 As Long, i4 As Long
     Dim temporary As String
-    Dim TempPtr As BytePtr
+    Dim TempPtr As *Char
     Dim dbl As Double
     Dim i64data As Int64
@@ -1024 +1024 @@
 End Function
 
+Function _System_IsSurrogatePair(wcHigh As WCHAR, wcLow As WCHAR) As Boolean
+    If &hD800 <= wcHigh And wcHigh < &hDC00 Then
+        If &hDC00 <= wcLow And wcLow < &hE000 Then
+            Return True
+        End If
+    End If
+    Return False
+End Function
 
 #endif '_INC_FUNCTION

Include/basic/prompt.sbp

@@ -99 +99 @@
 
                 temporary[0]=_PromptSys_Buffer[i][i2]
+#ifdef UNICODE
+                If _System_IsSurrogatePair(_PromptSys_Buffer[i][i2], _PromptSys_Buffer[i][i2+1]) Then
+#else
                 If IsDBCSLeadByte(temporary[0]) Then
+#endif
                     temporary[1]=_PromptSys_Buffer[i][i2+1]
                     temporary[2]=0
+                    i2++
                 Else
                     temporary[1]=0
@@ -107 +112 @@
                 TextOut(hDC,i2*_PromptSys_FontSize.cx,i*_PromptSys_FontSize.cy,_
                     temporary,lstrlen(temporary))
-
-                If IsDBCSLeadByte(temporary[0]) Then i2++
             Next
         End If
@@ -172 +175 @@
     Dim CompForm As COMPOSITIONFORM
     Dim hGlobal As HGLOBAL
-    Dim pTemp As BytePtr
 
     Select Case message
@@ -246 +248 @@
                     hGlobal=GetClipboardData(CF_TEXT)
                     If hGlobal=0 Then PromptProc=0:Exit Function
-                    pTemp=GlobalLock(hGlobal) As *Byte
-
+                    Dim pTemp=GlobalLock(hGlobal) As *Byte
+#ifdef UNICODE
+                    Dim tempSizeW = MultiByteToWideChar(CP_ACP, 0, pTemp, -1, 0, 0) + 1
+                    TempStr=ZeroString(tempSizeW)
+                    MultiByteToWideChar(CP_ACP, 0, pTemp, -1, StrPtr(TempStr), tempSizeW)
+#else
                     TempStr=ZeroString(lstrlen(pTemp)+1)
                     lstrcpy(StrPtr(TempStr),pTemp)
-
+#endif
                     lstrcpy((VarPtr(_PromptSys_InputStr[0])+_PromptSys_InputLen) As *Byte,pTemp)
                     _PromptSys_InputLen=_PromptSys_InputLen+lstrlen(pTemp)
@@ -337 +343 @@
     _PromptSys_hWnd=CreateWindowEx(WS_EX_CLIENTEDGE,"PROMPT","BASIC PROMPT",WS_OVERLAPPEDWINDOW,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,0,0,GetModuleHandle(0),0)
     ShowWindow(_PromptSys_hWnd,SW_SHOW)
+    UpdateWindow(_PromptSys_hWnd)
 
     Dim msg As MSG, iResult As Long
@@ -455 +462 @@
             Case _System_Type_Integer,_System_Type_Word
                 SetWord(_System_InputDataPtr[i],Val(buf))
-            Case _System_Type_Char,_System_Type_Byte
+            Case _System_Type_SByte,_System_Type_Byte
                 SetByte(_System_InputDataPtr[i],Val(buf))
-
+            Case _System_Type_Char
+#ifdef UNICODE
+                SetWord(_System_InputDataPtr[i], buf[0])
+#else
+                SetByte(_System_InputDataPtr[i], buf[0])
+#endif
             Case _System_Type_String
+            *INPUT_FromPrompt_Type_String
                 Dim pTempStr As *String
                 pTempStr=_System_InputDataPtr[i] As *String
@@ -464 +477 @@
                 memcpy(pTempStr->Chars, buf.Chars, pTempStr->Length)
                 pTempStr->Chars[pTempStr->Length] = 0
+            Case 13
+                Goto *INPUT_FromPrompt_Type_String
         End Select