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

Fix warnings. Again, don't know exactly which version introduced each warning, kept it at Tokyo.

Browse Source
This commit is contained in:
Martijn Laan 2019-02-03 14:06:51 +01:00
parent 5812d520e8
commit bcf0f1b1b7
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/uPSCompiler.pas
View File

@ -2464,7 +2464,9 @@ begin
Parser := TPSPascalParser.Create; Parser := TPSPascalParser.Create;
Parser.SetText(Header); Parser.SetText(Header);
Decl := TPSParametersDecl.Create; Decl := TPSParametersDecl.Create;
{$IFNDEF DELPHI_TOKYO_UP}
x := nil; x := nil;
{$ENDIF}
try try
if Parser.CurrTokenId = CSTII_Function then if Parser.CurrTokenId = CSTII_Function then
IsFunction := True IsFunction := True
@ -13558,7 +13560,9 @@ var
begin begin
pDecl := TPSParametersDecl.Create; pDecl := TPSParametersDecl.Create;
{$IFNDEF DELPHI_TOKYO_UP}
p := nil; p := nil;
{$ENDIF}
try try
if not ParseMethod(Self, '', Decl, DOrgName, pDecl, FT) then if not ParseMethod(Self, '', Decl, DOrgName, pDecl, FT) then
Raise EPSCompilerException.CreateFmt(RPS_UnableToRegisterFunction, [Decl]); Raise EPSCompilerException.CreateFmt(RPS_UnableToRegisterFunction, [Decl]);

2
Source/uPSR_graphics.pas
View File

@ -21,7 +21,7 @@ procedure RIRegister_Graphics(Cl: TPSRuntimeClassImporter; Streams: Boolean);
implementation implementation
{$IFNDEF FPC} {$IFNDEF FPC}
uses uses
Classes{$IFDEF CLX}, QGraphics{$ELSE}, Windows, Graphics{$ENDIF}; Classes{$IFDEF CLX}, QGraphics{$ELSE}, Windows, Graphics{$ENDIF} {$IFDEF DELPHI_TOKYO_UP}, UITypes {$ENDIF};
{$ELSE} {$ELSE}
uses uses
Classes, Graphics,LCLType; Classes, Graphics,LCLType;

10
Source/uPSRuntime.pas
View File

@ -1101,7 +1101,7 @@ function IDispatchInvoke(Self: IDispatch; PropertySet: Boolean; const Name: tbtS
implementation implementation
uses uses
TypInfo {$IFDEF DELPHI3UP}{$IFNDEF FPC}{$IFNDEF KYLIX} , ComObj {$ENDIF}{$ENDIF}{$ENDIF}{$IFDEF PS_FPC_HAS_COM}, ComObj{$ENDIF}; TypInfo {$IFDEF DELPHI3UP}{$IFNDEF FPC}{$IFNDEF KYLIX} , ComObj {$ENDIF}{$ENDIF}{$ENDIF}{$IFDEF PS_FPC_HAS_COM}, ComObj{$ENDIF} {$IFDEF DELPHI_TOKYO_UP}, AnsiStrings{$ENDIF};
{$IFDEF DELPHI3UP } {$IFDEF DELPHI3UP }
resourceString resourceString
@ -1541,7 +1541,7 @@ begin
{$IFNDEF PS_NOWIDESTRING} {$IFNDEF PS_NOWIDESTRING}
tkWString: begin Result := ''''+tbtString(GetWideStrProp(Instance, pp))+''''; exit; end; tkWString: begin Result := ''''+tbtString(GetWideStrProp(Instance, pp))+''''; exit; end;
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
tkUString: begin Result := ''''+tbtString(GetUnicodeStrProp(Instance, pp))+''''; exit; end; tkUString: begin Result := ''''+tbtString({$IFDEF DELPHI_TOKYO_UP}GetStrProp{$ELSE}GetUnicodeStrProp{$ENDIF}(Instance, pp))+''''; exit; end;
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
@ -9430,7 +9430,7 @@ end;
function ToString(p: PansiChar): tbtString; function ToString(p: PansiChar): tbtString;
begin begin
SetString(Result, p, StrLen(p)); SetString(Result, p, {$IFDEF DELPHI_TOKYO_UP}AnsiStrings.{$ENDIF}StrLen(p));
end; end;
function IntPIFVariantToVariant(Src: pointer; aType: TPSTypeRec; var Dest: Variant): Boolean; function IntPIFVariantToVariant(Src: pointer; aType: TPSTypeRec; var Dest: Variant): Boolean;
@ -10640,7 +10640,7 @@ begin
{$IFNDEF DELPHI2009UP}btUnicodeString,{$ENDIF} {$IFNDEF DELPHI2009UP}btUnicodeString,{$ENDIF}
btWideString: SetWideStrProp(TObject(FSelf), P.Ext1, tbtWidestring(n.dta^)); btWideString: SetWideStrProp(TObject(FSelf), P.Ext1, tbtWidestring(n.dta^));
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
btUnicodeString: SetUnicodeStrProp(TObject(FSelf), P.Ext1, tbtUnicodestring(n.dta^)); btUnicodeString: {$IFDEF DELPHI_TOKYO_UP}SetStrProp{$ELSE}SetUnicodeStrProp{$ENDIF}(TObject(FSelf), P.Ext1, tbtUnicodestring(n.dta^));
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
@ -10697,7 +10697,7 @@ begin
{$IFDEF DELPHI6UP} {$IFDEF DELPHI6UP}
{$IFNDEF PS_NOWIDESTRING} {$IFNDEF PS_NOWIDESTRING}
{$IFDEF DELPHI2009UP} {$IFDEF DELPHI2009UP}
btUnicodeString: tbtUnicodeString(n.dta^) := GetUnicodeStrProp(TObject(FSelf), P.Ext1); btUnicodeString: tbtUnicodeString(n.dta^) := {$IFDEF DELPHI_TOKYO_UP}GetStrProp{$ELSE}GetUnicodeStrProp{$ENDIF}(TObject(FSelf), P.Ext1);
{$ELSE} {$ELSE}
btUnicodeString, btUnicodeString,
{$ENDIF} {$ENDIF}