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

Patch from Frédéric Hannes for PS_NOWIDESTRING support.

Browse Source 
git-svn-id: http://code.remobjects.com/svn/pascalscript@234 5c9d2617-0215-0410-a2ee-e80e04d1c6d8
This commit is contained in:
ck 2010-08-26 06:41:03 +00:00
parent 5bc0220ef8
commit 0a9ac85673
2 changed files with 51 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/uPSCompiler.pas
View File

@ -12313,9 +12313,14 @@ begin
AddType('UnicodeString', btUnicodeString); AddType('UnicodeString', btUnicodeString);
{$ENDIF} {$ENDIF}
AddType('AnsiString', btString); AddType('AnsiString', btString);
{$IFNDEF PS_NOWIDESTRING}
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
AddType('String', btUnicodeString); AddType('String', btUnicodeString);
ADdType('NativeString', btUnicodeString); AddType('NativeString', btUnicodeString);
{$ELSE}
AddType('String', btString);
AddType('NativeString', btString);
{$ENDIF}
{$ELSE} {$ELSE}
AddType('String', btString); AddType('String', btString);
AddType('NativeString', btString); AddType('NativeString', btString);

30
Source/uPSRuntime.pas
View File

@ -3131,20 +3131,28 @@ end;
function VNGetString(const Src: TPSVariantIFC): String; function VNGetString(const Src: TPSVariantIFC): String;
begin begin
{$IFNDEF PS_NOWIDESTRING}
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
Result := VNGetUnicodeString(Src); Result := VNGetUnicodeString(Src);
{$ELSE} {$ELSE}
Result := VNGetAnsiString(Src); Result := VNGetAnsiString(Src);
{$ENDIF} {$ENDIF}
{$ELSE}
Result := VNGetAnsiString(Src);
{$ENDIF}
end; end;
procedure VNSetString(const Src: TPSVariantIFC; const Val: String); procedure VNSetString(const Src: TPSVariantIFC; const Val: String);
begin begin
{$IFNDEF PS_NOWIDESTRING}
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
VNSetUnicodeString(Src, Val); VNSetUnicodeString(Src, Val);
{$ELSE} {$ELSE}
VNSetAnsiString(Src, Val); VNSetAnsiString(Src, Val);
{$ENDIF} {$ENDIF}
{$ELSE}
VNSetAnsiString(Src, Val);
{$ENDIF}
end; end;
{$IFNDEF PS_NOWIDESTRING} {$IFNDEF PS_NOWIDESTRING}
@ -3267,22 +3275,30 @@ end;
function VGetString(const Src: PIFVariant): String; function VGetString(const Src: PIFVariant): String;
begin begin
{$IFNDEF PS_NOWIDESTRING}
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
Result := PSGetUnicodeString(@PPSVariantData(src).Data, src.FType); Result := PSGetUnicodeString(@PPSVariantData(src).Data, src.FType);
{$ELSE} {$ELSE}
Result := PSGetAnsiString(@PPSVariantData(src).Data, src.FType); Result := PSGetAnsiString(@PPSVariantData(src).Data, src.FType);
{$ENDIF} {$ENDIF}
{$ELSE}
Result := PSGetAnsiString(@PPSVariantData(src).Data, src.FType);
{$ENDIF}
end; end;
procedure VSetString(const Src: PIFVariant; const Val: string); procedure VSetString(const Src: PIFVariant; const Val: string);
var var
Dummy: Boolean; Dummy: Boolean;
begin begin
{$IFNDEF PS_NOWIDESTRING}
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
PSSetUnicodeString(@PPSVariantData(src).Data, src.FType, Dummy, Val); PSSetUnicodeString(@PPSVariantData(src).Data, src.FType, Dummy, Val);
{$ELSE} {$ELSE}
PSSetAnsiString(@PPSVariantData(src).Data, src.FType, Dummy, Val); PSSetAnsiString(@PPSVariantData(src).Data, src.FType, Dummy, Val);
{$ENDIF} {$ENDIF}
{$ELSE}
PSSetAnsiString(@PPSVariantData(src).Data, src.FType, Dummy, Val);
{$ENDIF}
end; end;
@ -3814,20 +3830,28 @@ end;
function PSGetString(Src: Pointer; aType: TPSTypeRec): string; function PSGetString(Src: Pointer; aType: TPSTypeRec): string;
begin begin
{$IFNDEF PS_NOWIDESTRING}
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
result := PSGetUnicodeString(Src, aType); result := PSGetUnicodeString(Src, aType);
{$ELSE} {$ELSE}
result := PSGetAnsiString(Src, aType); result := PSGetAnsiString(Src, aType);
{$ENDIF} {$ENDIF}
{$ELSE}
result := PSGetAnsiString(Src, aType);
{$ENDIF}
end; end;
procedure PSSetString(Src: Pointer; aType: TPSTypeRec; var Ok: Boolean; const Val: String); procedure PSSetString(Src: Pointer; aType: TPSTypeRec; var Ok: Boolean; const Val: String);
begin begin
{$IFNDEF PS_NOWIDESTRING}
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
PSSetUnicodeString(Src, aType, Ok, Val); PSSetUnicodeString(Src, aType, Ok, Val);
{$ELSE} {$ELSE}
PSSetAnsiString(Src, aType, Ok, Val); PSSetAnsiString(Src, aType, Ok, Val);
{$ENDIF} {$ENDIF}
{$ELSE}
PSSetAnsiString(Src, aType, Ok, Val);
{$ENDIF}
end; end;
@ -12126,7 +12150,7 @@ end;
function TPSStack.GetString(ItemNo: Longint): string; // calls the native method function TPSStack.GetString(ItemNo: Longint): string; // calls the native method
begin begin
result := {$IFDEF DELPHI2009UP}GetUnicodeString(ItemNo){$ELSE}GetAnsiString(ItemNo){$ENDIF}; result := {$IFNDEF PS_NOWIDESTRING}{$IFDEF DELPHI2009UP}GetUnicodeString(ItemNo){$ELSE}GetAnsiString(ItemNo){$ENDIF}{$ELSE}GetAnsiString(ItemNo){$ENDIF};
end; end;
function TPSStack.GetUInt(ItemNo: Longint): Cardinal; function TPSStack.GetUInt(ItemNo: Longint): Cardinal;
@ -12346,11 +12370,15 @@ end;
procedure TPSStack.SetString(ItemNo: Longint; const Data: string); procedure TPSStack.SetString(ItemNo: Longint; const Data: string);
begin begin
{$IFNDEF PS_NOWIDESTRING}
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
SetUnicodeString(ItemNo, Data); SetUnicodeString(ItemNo, Data);
{$ELSE} {$ELSE}
SetAnsiString(ItemNo, Data); SetAnsiString(ItemNo, Data);
{$ENDIF} {$ENDIF}
{$ELSE}
SetAnsiString(ItemNo, Data);
{$ENDIF}
end; end;