Delphi/pascalscript
Delphi/pascalscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes from Frederic Hannes to improve unicode support.

Browse Source 
git-svn-id: http://code.remobjects.com/svn/pascalscript@232 5c9d2617-0215-0410-a2ee-e80e04d1c6d8
This commit is contained in:
ck 2010-08-09 07:35:28 +00:00
parent 65cb49fc68
commit 33b59e8b6c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/uPSCompiler.pas
View File

@ -3088,6 +3088,7 @@ begin
((p1.BaseType = btChar) and (p2.BaseType = btChar)) or
((p1.BaseType = btSet) and (p2.BaseType = btSet)) or
{$IFNDEF PS_NOWIDESTRING}
((p1.BaseType = btChar) and (p2.BaseType = btWideChar)) or
((p1.BaseType = btWideChar) and (p2.BaseType = btChar)) or
((p1.BaseType = btWideChar) and (p2.BaseType = btWideChar)) or
((p1.BaseType = btWidestring) and (p2.BaseType = btChar)) or

4
Source/uPSRuntime.pas
View File

@ -8738,7 +8738,7 @@ begin
7: // StrGet
begin
temp := NewTPSVariantIFC(Stack[Stack.Count -2], True);
if (temp.Dta = nil) or (temp.aType.BaseType <> btString) then
if (temp.Dta = nil) or not (temp.aType.BaseType in [btString, btUnicodeString]) then
begin
Result := False;
exit;
@ -8755,7 +8755,7 @@ begin
8: // StrSet
begin
temp := NewTPSVariantIFC(Stack[Stack.Count -3], True);
if (temp.Dta = nil) or (temp.aType.BaseType <> btString) then
if (temp.Dta = nil) or not (temp.aType.BaseType in [btString, btUnicodeString]) then
begin
Result := False;
exit;