paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-23 00:50:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Convert array of jsvalue to array of const where appropriate

Browse Source 
git-svn-id: trunk@49345 -
This commit is contained in:
michael 2021-05-08 15:36:50 +00:00
parent 5e1e6c24a4
commit ac9d2b3cc5
10 changed files with 80 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/fcl-js/src/jswriter.pp
View File

@ -63,10 +63,10 @@ Type
{$endif}
Function Write(Const S : TJSWriterString) : Integer;
Function WriteLn(Const S : TJSWriterString) : Integer;
Function Write(Const Fmt : TJSWriterString; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif}) : Integer;
Function WriteLn(Const Fmt : TJSWriterString; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif}) : Integer;
Function Write(Const Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif}) : Integer;
Function WriteLn(Const Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif}) : Integer;
Function Write(Const Fmt : TJSWriterString; Args : Array of const) : Integer;
Function WriteLn(Const Fmt : TJSWriterString; Args : Array of const) : Integer;
Function Write(Const Args : Array of const) : Integer;
Function WriteLn(Const Args : Array of const) : Integer;
Property CurLine: integer read FCurLine write FCurLine;
Property CurColumn: integer read FCurColumn write FCurColumn;// char index, not codepoint
Property CurElement: TJSElement read FCurElement write SetCurElement;
@ -179,7 +179,7 @@ Type
Protected
// Helper routines
Procedure Error(Const Msg : TJSWriterString);
Procedure Error(Const Fmt : TJSWriterString; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif});
Procedure Error(Const Fmt : TJSWriterString; Args : Array of const);
Procedure WriteIndent; // inline;
{$ifdef FPC_HAS_CPSTRING}
Procedure Write(Const U : UnicodeString);
@ -466,7 +466,7 @@ begin
end;
procedure TJSWriter.Error(const Fmt: TJSWriterString;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
Args: array of const);
begin
Raise EJSWriter.CreateFmt(Fmt,Args);
end;
@ -2137,19 +2137,19 @@ begin
end;
function TTextWriter.Write(const Fmt: TJSWriterString;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif}): Integer;
Args: array of const): Integer;
begin
Result:=Write(Format(Fmt,Args));
end;
function TTextWriter.WriteLn(const Fmt: TJSWriterString;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif}): Integer;
Args: array of const): Integer;
begin
Result:=WriteLn(Format(Fmt,Args));
end;
function TTextWriter.Write(const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif}): Integer;
function TTextWriter.Write(const Args: array of const): Integer;
Var
I : Integer;
@ -2209,8 +2209,7 @@ begin
end;
end;
function TTextWriter.WriteLn(
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif}): Integer;
function TTextWriter.WriteLn(const Args: array of const): Integer;
begin
Result:=Write(Args)+Writeln('');
end;

10
packages/fcl-passrc/src/pasresolveeval.pas
View File

@ -695,7 +695,7 @@ type
TPasResEvalLogHandler = procedure(Sender: TResExprEvaluator; const id: TMaxPrecInt;
MsgType: TMessageType; MsgNumber: integer;
const Fmt: String; Args: Array of {$ifdef pas2js}jsvalue{$else}const{$endif}; PosEl: TPasElement) of object;
const Fmt: String; Args: Array of const; PosEl: TPasElement) of object;
TPasResEvalIdentHandler = function(Sender: TResExprEvaluator;
Expr: TPrimitiveExpr; Flags: TResEvalFlags): TResEvalValue of object;
TPasResEvalParamsHandler = function(Sender: TResExprEvaluator;
@ -718,9 +718,9 @@ type
FOnRangeCheckEl: TPasResEvalRangeCheckElHandler;
protected
procedure LogMsg(const id: TMaxPrecInt; MsgType: TMessageType; MsgNumber: integer;
const Fmt: String; Args: Array of {$ifdef pas2js}jsvalue{$else}const{$endif}; PosEl: TPasElement); overload;
const Fmt: String; Args: Array of const; PosEl: TPasElement); overload;
procedure RaiseMsg(const Id: TMaxPrecInt; MsgNumber: integer; const Fmt: String;
Args: Array of {$ifdef pas2js}jsvalue{$else}const{$endif}; ErrorPosEl: TPasElement);
Args: Array of const; ErrorPosEl: TPasElement);
procedure RaiseNotYetImplemented(id: TMaxPrecInt; El: TPasElement; Msg: string = ''); virtual;
procedure RaiseInternalError(id: TMaxPrecInt; const Msg: string = '');
procedure RaiseConstantExprExp(id: TMaxPrecInt; ErrorEl: TPasElement);
@ -1327,14 +1327,14 @@ end;
procedure TResExprEvaluator.LogMsg(const id: TMaxPrecInt; MsgType: TMessageType;
MsgNumber: integer; const Fmt: String;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
Args: array of const;
PosEl: TPasElement);
begin
OnLog(Self,id,MsgType,MsgNumber,Fmt,Args,PosEl);
end;
procedure TResExprEvaluator.RaiseMsg(const Id: TMaxPrecInt; MsgNumber: integer;
const Fmt: String; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Fmt: String; Args: array of const;
ErrorPosEl: TPasElement);
begin
LogMsg(id,mtError,MsgNumber,Fmt,Args,ErrorPosEl);

39
packages/fcl-passrc/src/pasresolver.pp
View File

@ -1801,7 +1801,7 @@ type
fExprEvaluator: TResExprEvaluator;
procedure OnExprEvalLog(Sender: TResExprEvaluator; const id: TMaxPrecInt;
MsgType: TMessageType; MsgNumber: integer; const Fmt: String;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif}; PosEl: TPasElement); virtual;
Args: array of const; PosEl: TPasElement); virtual;
function OnExprEvalIdentifier(Sender: TResExprEvaluator;
Expr: TPrimitiveExpr; Flags: TResEvalFlags): TResEvalValue; virtual;
function OnExprEvalParams(Sender: TResExprEvaluator;
@ -2174,10 +2174,10 @@ type
class function GetDbgSourcePosStr(El: TPasElement): string;
function GetElementSourcePosStr(El: TPasElement): string;
procedure SetLastMsg(const id: TMaxPrecInt; MsgType: TMessageType; MsgNumber: integer;
Const Fmt : String; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif};
Const Fmt : String; Args : Array of const;
PosEl: TPasElement);
procedure LogMsg(const id: TMaxPrecInt; MsgType: TMessageType; MsgNumber: integer;
const Fmt: String; Args: Array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Fmt: String; Args: Array of const;
PosEl: TPasElement); overload;
class function GetWarnIdentifierNumbers(Identifier: string;
out MsgNumbers: TIntegerDynArray): boolean; virtual;
@ -2188,7 +2188,7 @@ type
procedure GetIncompatibleProcParamsDesc(GotType, ExpType: TPasProcedureType;
out GotDesc, ExpDesc: string);
procedure RaiseMsg(const Id: TMaxPrecInt; MsgNumber: integer; const Fmt: String;
Args: Array of {$ifdef pas2js}jsvalue{$else}const{$endif};
Args: Array of const;
ErrorPosEl: TPasElement); virtual;
procedure RaiseNotYetImplemented(id: TMaxPrecInt; El: TPasElement; Msg: string = ''); virtual;
procedure RaiseInternalError(id: TMaxPrecInt; const Msg: string = '');
@ -2202,13 +2202,13 @@ type
procedure RaiseVarExpected(id: TMaxPrecInt; ErrorEl: TPasElement; IdentEl: TPasElement);
procedure RaiseRangeCheck(id: TMaxPrecInt; ErrorEl: TPasElement);
procedure RaiseIncompatibleTypeDesc(id: TMaxPrecInt; MsgNumber: integer;
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Args: array of const;
const GotDesc, ExpDesc: String; ErrorEl: TPasElement);
procedure RaiseIncompatibleType(id: TMaxPrecInt; MsgNumber: integer;
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Args: array of const;
GotType, ExpType: TPasType; ErrorEl: TPasElement);
procedure RaiseIncompatibleTypeRes(id: TMaxPrecInt; MsgNumber: integer;
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Args: array of const;
const GotType, ExpType: TPasResolverResult;
ErrorEl: TPasElement);
procedure RaiseHelpersCannotBeUsedAsType(id: TMaxPrecInt; ErrorEl: TPasElement);
@ -15459,7 +15459,7 @@ end;
procedure TPasResolver.OnExprEvalLog(Sender: TResExprEvaluator;
const id: TMaxPrecInt; MsgType: TMessageType; MsgNumber: integer;
const Fmt: String; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Fmt: String; Args: array of const;
PosEl: TPasElement);
begin
if MsgType<=mtError then
@ -23070,7 +23070,7 @@ end;
procedure TPasResolver.SetLastMsg(const id: TMaxPrecInt; MsgType: TMessageType;
MsgNumber: integer; const Fmt: String;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
Args: array of const;
PosEl: TPasElement);
var
{$IFDEF VerbosePasResolver}
@ -23112,7 +23112,7 @@ begin
end;
procedure TPasResolver.RaiseMsg(const Id: TMaxPrecInt; MsgNumber: integer;
const Fmt: String; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Fmt: String; Args: array of const;
ErrorPosEl: TPasElement);
var
E: EPasResolve;
@ -23224,25 +23224,22 @@ begin
end;
procedure TPasResolver.RaiseIncompatibleTypeDesc(id: TMaxPrecInt; MsgNumber: integer;
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Args: array of const;
const GotDesc, ExpDesc: String; ErrorEl: TPasElement);
function GetString(ArgNo: integer): string;
begin
if ArgNo>High(Args) then
exit('invalid param '+IntToStr(ArgNo));
{$ifdef pas2js}
if isString(Args[ArgNo]) then
Result:=String(Args[ArgNo])
else
Result:='invalid param '+jsTypeOf(Args[ArgNo]);
{$else}
case Args[ArgNo].VType of
{$IFDEF PAS2JS}
vtUnicodeString: Result:=Args[ArgNo].VUnicodeString;
{$ELSE}
vtAnsiString: Result:=AnsiString(Args[ArgNo].VAnsiString);
{$ENDIF}
else
Result:='invalid param '+IntToStr(Ord(Args[ArgNo].VType));
end;
{$endif}
end;
begin
@ -23270,7 +23267,7 @@ begin
end;
procedure TPasResolver.RaiseIncompatibleType(id: TMaxPrecInt; MsgNumber: integer;
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Args: array of const;
GotType, ExpType: TPasType; ErrorEl: TPasElement);
var
GotDesc, ExpDesc: String;
@ -23280,7 +23277,7 @@ begin
end;
procedure TPasResolver.RaiseIncompatibleTypeRes(id: TMaxPrecInt; MsgNumber: integer;
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Args: array of const;
const GotType, ExpType: TPasResolverResult;
ErrorEl: TPasElement);
var
@ -23315,7 +23312,7 @@ end;
procedure TPasResolver.LogMsg(const id: TMaxPrecInt; MsgType: TMessageType;
MsgNumber: integer; const Fmt: String;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
Args: array of const;
PosEl: TPasElement);
var
Scanner: TPascalScanner;

4
packages/fcl-passrc/src/pasuseanalyzer.pas
View File

@ -311,7 +311,7 @@ type
function IsSpecializedGenericType(El: TPasElement): boolean;
procedure EmitMessage(Id: TMaxPrecInt; MsgType: TMessageType;
MsgNumber: integer; Fmt: String;
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Args: array of const;
PosEl: TPasElement);
procedure EmitMessage(Msg: TPAMessage);
class function GetWarnIdentifierNumbers(Identifier: string;
@ -3229,7 +3229,7 @@ end;
procedure TPasAnalyzer.EmitMessage(Id: TMaxPrecInt; MsgType: TMessageType;
MsgNumber: integer; Fmt: String;
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Args: array of const;
PosEl: TPasElement);
var
Msg: TPAMessage;

14
packages/fcl-passrc/src/pparser.pp
View File

@ -297,7 +297,7 @@ type
Function SaveComments(Const AValue : String) : String;
function LogEvent(E : TPParserLogEvent) : Boolean; inline;
Procedure DoLog(MsgType: TMessageType; MsgNumber: integer; Const Msg : String; SkipSourceInfo : Boolean = False);overload;
Procedure DoLog(MsgType: TMessageType; MsgNumber: integer; Const Fmt : String; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif};SkipSourceInfo : Boolean = False);overload;
Procedure DoLog(MsgType: TMessageType; MsgNumber: integer; Const Fmt : String; Args : Array of const;SkipSourceInfo : Boolean = False);overload;
function GetProcTypeFromToken(tk: TToken; IsClass: Boolean=False ): TProcType;
procedure ParseAsmBlock(AsmBlock: TPasImplAsmStatement); virtual;
procedure ParseRecordMembers(ARec: TPasRecordType; AEndToken: TToken; AllowMethods : Boolean);
@ -314,7 +314,7 @@ type
ProcType: TProcType): boolean;
function CheckVisibility(S: String; var AVisibility: TPasMemberVisibility; IsObjCProtocol : Boolean = False): Boolean;
procedure ParseExc(MsgNumber: integer; const Msg: String);
procedure ParseExc(MsgNumber: integer; const Fmt: String; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif});
procedure ParseExc(MsgNumber: integer; const Fmt: String; Args : Array of const);
procedure ParseExcExpectedIdentifier;
procedure ParseExcSyntaxError;
procedure ParseExcTokenError(const Arg: string);
@ -372,7 +372,7 @@ type
public
constructor Create(AScanner: TPascalScanner; AFileResolver: TBaseFileResolver; AEngine: TPasTreeContainer);
Destructor Destroy; override;
procedure SetLastMsg(MsgType: TMessageType; MsgNumber: integer; Const Fmt : String; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif});
procedure SetLastMsg(MsgType: TMessageType; MsgNumber: integer; Const Fmt : String; Args : Array of const);
// General parsing routines
function CurTokenName: String;
function CurTokenText: String;
@ -988,7 +988,7 @@ begin
end;
procedure TPasParser.ParseExc(MsgNumber: integer; const Fmt: String;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
Args: array of const);
var
p: TPasSourcePos;
begin
@ -2326,7 +2326,7 @@ begin
tkCaret : Result:=eopDeref;
else
result:=eopAdd; // Fool compiler
ParseExc(nParserNotAnOperand,SParserNotAnOperand,[AToken,TokenInfos[AToken]]);
ParseExc(nParserNotAnOperand,SParserNotAnOperand,[ord(AToken),TokenInfos[AToken]]);
end;
end;
@ -4890,7 +4890,7 @@ begin
end;
procedure TPasParser.SetLastMsg(MsgType: TMessageType; MsgNumber: integer;
const Fmt: String; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
const Fmt: String; Args: array of const);
begin
FLastMsgType := MsgType;
FLastMsgNumber := MsgNumber;
@ -4906,7 +4906,7 @@ begin
end;
procedure TPasParser.DoLog(MsgType: TMessageType; MsgNumber: integer;
const Fmt: String; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Fmt: String; Args: array of const;
SkipSourceInfo: Boolean);
Var

31
packages/fcl-passrc/src/pscanner.pp
View File

@ -591,7 +591,7 @@ type
TCEEvalVarEvent = function(Sender: TCondDirectiveEvaluator; Name: String; out Value: string): boolean of object;
TCEEvalFunctionEvent = function(Sender: TCondDirectiveEvaluator; Name, Param: String; out Value: string): boolean of object;
TCELogEvent = procedure(Sender: TCondDirectiveEvaluator; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif}) of object;
TCELogEvent = procedure(Sender: TCondDirectiveEvaluator; Args : Array of const) of object;
{ TCondDirectiveEvaluator - evaluate $IF expression }
@ -631,7 +631,7 @@ type
function IsExtended(const Value: String; out e: TMaxFloat): boolean;
procedure NextToken;
procedure Log(aMsgType: TMessageType; aMsgNumber: integer;
const aMsgFmt: String; const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif}; MsgPos: integer = 0);
const aMsgFmt: String; const Args: array of const; MsgPos: integer = 0);
procedure LogXExpectedButTokenFound(const X: String; ErrorPos: integer = 0);
procedure ReadOperand(Skip: boolean = false); // unary operators plus one operand
procedure ReadExpression; // binary operators
@ -786,8 +786,7 @@ type
function IndexOfWarnMsgState(Number: integer; InsertPos: boolean): integer;
function OnCondEvalFunction(Sender: TCondDirectiveEvaluator; Name,
Param: String; out Value: string): boolean;
procedure OnCondEvalLog(Sender: TCondDirectiveEvaluator;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
procedure OnCondEvalLog(Sender: TCondDirectiveEvaluator; Args: array of const);
function OnCondEvalVar(Sender: TCondDirectiveEvaluator; Name: String; out
Value: string): boolean;
procedure SetAllowedBoolSwitches(const AValue: TBoolSwitches);
@ -806,11 +805,11 @@ type
function FetchLine: boolean;
procedure AddFile(aFilename: string); virtual;
function GetMacroName(const Param: String): String;
procedure SetCurMsg(MsgType: TMessageType; MsgNumber: integer; Const Fmt : String; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif});
procedure SetCurMsg(MsgType: TMessageType; MsgNumber: integer; Const Fmt : String; Args : Array of const);
Procedure DoLog(MsgType: TMessageType; MsgNumber: integer; Const Msg : String; SkipSourceInfo : Boolean = False);overload;
Procedure DoLog(MsgType: TMessageType; MsgNumber: integer; Const Fmt : String; Args : Array of {$ifdef pas2js}jsvalue{$else}const{$endif};SkipSourceInfo : Boolean = False);overload;
Procedure DoLog(MsgType: TMessageType; MsgNumber: integer; Const Fmt : String; Args : Array of const;SkipSourceInfo : Boolean = False);overload;
procedure Error(MsgNumber: integer; const Msg: string);overload;
procedure Error(MsgNumber: integer; const Fmt: string; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});overload;
procedure Error(MsgNumber: integer; const Fmt: string; Args: array of const);overload;
procedure PushSkipMode;
function GetMultiLineStringLineEnd(aReader: TLineReader): string;
@ -1246,8 +1245,8 @@ function FilenameIsUnixAbsolute(const TheFilename: string): boolean;
function IsNamedToken(Const AToken : String; Out T : TToken) : Boolean;
Function ExtractFilenameOnly(Const AFileName : String) : String;
procedure CreateMsgArgs(var MsgArgs: TMessageArgs; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
function SafeFormat(const Fmt: string; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif}): string;
procedure CreateMsgArgs(var MsgArgs: TMessageArgs; Args: array of const);
function SafeFormat(const Fmt: string; Args: array of const): string;
implementation
@ -1341,7 +1340,7 @@ begin
T:=SortedTokens[I];
end;
procedure CreateMsgArgs(var MsgArgs: TMessageArgs; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
procedure CreateMsgArgs(var MsgArgs: TMessageArgs; Args: array of const);
var
i: Integer;
{$ifdef pas2js}
@ -1394,7 +1393,7 @@ begin
{$endif}
end;
function SafeFormat(const Fmt: string; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif}): string;
function SafeFormat(const Fmt: string; Args: array of const): string;
var
MsgArgs: TMessageArgs;
i: Integer;
@ -1804,7 +1803,7 @@ end;
procedure TCondDirectiveEvaluator.Log(aMsgType: TMessageType;
aMsgNumber: integer; const aMsgFmt: String;
const Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Args: array of const;
MsgPos: integer);
begin
if MsgPos<1 then
@ -3331,7 +3330,7 @@ begin
end;
procedure TPascalScanner.Error(MsgNumber: integer; const Fmt: string;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
Args: array of const);
begin
SetCurMsg(mtError,MsgNumber,Fmt,Args);
raise EScannerError.CreateFmt('%s(%d,%d) Error: %s',
@ -5281,7 +5280,7 @@ begin
end;
procedure TPascalScanner.OnCondEvalLog(Sender: TCondDirectiveEvaluator;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
Args: array of const);
Var
Msg : String;
@ -5505,7 +5504,7 @@ begin
end;
procedure TPascalScanner.DoLog(MsgType: TMessageType; MsgNumber: integer;
const Fmt: String; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif};
const Fmt: String; Args: array of const;
SkipSourceInfo: Boolean);
Var
@ -5656,7 +5655,7 @@ begin
end;
procedure TPascalScanner.SetCurMsg(MsgType: TMessageType; MsgNumber: integer;
const Fmt: String; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
const Fmt: String; Args: array of const);
begin
FLastMsgType := MsgType;
FLastMsgNumber := MsgNumber;

12
packages/pastojs/src/fppas2js.pp
View File

@ -1660,7 +1660,7 @@ type
RaiseOnIncompatible: boolean): integer; override;
// utility
procedure RaiseMsg(const Id: TMaxPrecInt; MsgNumber: integer; const Fmt: String;
Args: array of {$IFDEF pas2js}jsvalue{$ELSE}const{$ENDIF}; ErrorPosEl: TPasElement); override;
Args: array of const; ErrorPosEl: TPasElement); override;
function GetOverloadName(El: TPasElement): string;
function GetBaseDescription(const R: TPasResolverResult; AddPath: boolean=
false): string; override;
@ -1961,9 +1961,9 @@ type
// Error functions
Procedure DoError(Id: TMaxPrecInt; Const Msg : String);
Procedure DoError(Id: TMaxPrecInt; Const Msg : String;
const Args: array of {$IFDEF pas2js}jsvalue{$ELSE}const{$ENDIF});
const Args: array of const);
Procedure DoError(Id: TMaxPrecInt; MsgNumber: integer; const MsgPattern: string;
const Args: array of {$IFDEF pas2js}jsvalue{$ELSE}const{$ENDIF}; El: TPasElement);
const Args: array of const; El: TPasElement);
procedure RaiseNotSupported(El: TPasElement; AContext: TConvertContext; Id: TMaxPrecInt; const Msg: string = '');
procedure RaiseIdentifierNotFound(Identifier: string; El: TPasElement; Id: TMaxPrecInt);
procedure RaiseInconsistency(Id: TMaxPrecInt; El: TPasElement);
@ -7163,7 +7163,7 @@ begin
end;
procedure TPas2JSResolver.RaiseMsg(const Id: TMaxPrecInt; MsgNumber: integer;
const Fmt: String; Args: array of {$IFDEF pas2js}jsvalue{$ELSE}const{$ENDIF};
const Fmt: String; Args: array of const;
ErrorPosEl: TPasElement);
begin
{$IFDEF VerbosePas2JS}
@ -26779,7 +26779,7 @@ begin
end;
procedure TPasToJSConverter.DoError(Id: TMaxPrecInt; const Msg: String;
const Args: array of {$IFDEF pas2js}jsvalue{$ELSE}const{$ENDIF});
const Args: array of const);
var
E: EPas2JS;
begin
@ -26791,7 +26791,7 @@ end;
procedure TPasToJSConverter.DoError(Id: TMaxPrecInt; MsgNumber: integer;
const MsgPattern: string;
const Args: array of {$IFDEF pas2js}jsvalue{$ELSE}const{$ENDIF};
const Args: array of const;
El: TPasElement);
var
E: EPas2JS;

6
packages/pastojs/src/pas2jscompiler.pp
View File

@ -459,7 +459,7 @@ type
Protected
procedure CfgSyntaxError(const Msg: string);
function ConditionEvalVariable(Sender: TCondDirectiveEvaluator; aName: String; out Value: string): boolean;
procedure ConditionEvalLog(Sender: TCondDirectiveEvaluator; Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
procedure ConditionEvalLog(Sender: TCondDirectiveEvaluator; Args: array of const);
property ConditionEvaluator: TCondDirectiveEvaluator read FConditionEval;
property CurrentCfgFilename: string read FCurrentCfgFilename;
property CurrentCfgLineNumber: integer read FCurrentCfgLineNumber;
@ -1946,7 +1946,7 @@ begin
end;
procedure TPas2JSConfigSupport.ConditionEvalLog(Sender: TCondDirectiveEvaluator;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
Args: array of const);
begin
CfgSyntaxError(SafeFormat(Sender.MsgPattern,Args));
end;
@ -2139,7 +2139,7 @@ function TPas2jsCompiler.MarkNeedBuilding(aFile: TPas2jsCompilerFile;
Checked: TPasAnalyzerKeySet; var SrcFileCount: integer): boolean;
procedure Mark(MsgNumber: integer;
Args: array of {$ifdef pas2js}jsvalue{$else}const{$endif});
Args: array of const);
begin
if aFile.NeedBuild then exit;
aFile.NeedBuild:=true;

24
packages/pastojs/src/pas2jslogger.pp
View File

@ -162,23 +162,23 @@ type
function FindMsg(MsgNumber: integer; ExceptionOnNotFound: boolean): TPas2jsMessage;
procedure Sort;
procedure LogRaw(const Msg: string); overload;
procedure LogRaw(Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF}); overload;
procedure LogRaw(Args: array of const); overload;
procedure LogLn;
procedure LogPlain(const Msg: string); overload;
procedure LogPlain(Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF}); overload;
procedure LogPlain(Args: array of const); overload;
procedure LogMsg(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF};
Args: array of const;
const Filename: string = ''; Line: integer = 0; Col: integer = 0;
UseFilter: boolean = true);
procedure Log(MsgType: TMessageType; Msg: string; MsgNumber: integer = 0;
const Filename: string = ''; Line: integer = 0; Col: integer = 0;
UseFilter: boolean = true);
procedure LogMsgIgnoreFilter(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF});
Args: array of const);
procedure LogExceptionBackTrace(E: Exception);
function MsgTypeToStr(MsgType: TMessageType): string;
function GetMsgText(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF}): string;
Args: array of const): string;
function FormatMsg(MsgType: TMessageType; Msg: string; MsgNumber: integer = 0;
const Filename: string = ''; Line: integer = 0; Col: integer = 0): string;
function FormatJSONMsg(MsgType: TMessageType; Msg: string; MsgNumber: integer = 0;
@ -192,7 +192,7 @@ type
procedure CloseDebugLog;
procedure DebugLogWriteLn(Msg: string); overload;
function GetEncodingCaption: string;
class function Concatenate(Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF}): string;
class function Concatenate(Args: array of const): string;
public
property Encoding: string read FEncoding write SetEncoding; // normalized
property MsgCount: integer read GetMsgCount;
@ -810,7 +810,7 @@ begin
end;
function TPas2jsLogger.GetMsgText(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF}): string;
Args: array of const): string;
var
Msg: TPas2jsMessage;
begin
@ -825,7 +825,7 @@ begin
end;
procedure TPas2jsLogger.LogRaw(
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF});
Args: array of const);
begin
LogRaw(Concatenate(Args));
end;
@ -870,7 +870,7 @@ begin
end;
class function TPas2jsLogger.Concatenate(
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF}): string;
Args: array of const): string;
var
s: String;
i: Integer;
@ -940,13 +940,13 @@ begin
end;
procedure TPas2jsLogger.LogPlain(
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF});
Args: array of const);
begin
LogPlain(Concatenate(Args));
end;
procedure TPas2jsLogger.LogMsg(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF};
Args: array of const;
const Filename: string; Line: integer; Col: integer; UseFilter: boolean);
var
Msg: TPas2jsMessage;
@ -977,7 +977,7 @@ begin
end;
procedure TPas2jsLogger.LogMsgIgnoreFilter(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF});
Args: array of const);
begin
LogMsg(MsgNumber,Args,'',0,0,false);
end;

4
packages/pastojs/src/pas2jspparser.pp
View File

@ -43,7 +43,7 @@ type
constructor Create(AScanner: TPascalScanner;
AFileResolver: TBaseFileResolver; AEngine: TPasTreeContainer); reintroduce;
procedure RaiseParserError(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF});
Args: array of const);
procedure ParseSubModule(var Module: TPasModule);
property Log: TPas2jsLogger read FLog write FLog;
end;
@ -116,7 +116,7 @@ begin
end;
procedure TPas2jsPasParser.RaiseParserError(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF});
Args: array of const);
var
Msg: TPas2jsMessage;
begin