paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-16 09:46:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

pastojs: parse double quotes in asm-blocks

Browse Source 
git-svn-id: trunk@40279 -
This commit is contained in:
Mattias Gaertner 2018-11-09 10:23:55 +00:00
parent c3914c1f38
commit 6d78637441
5 changed files with 328 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -648,6 +648,8 @@ type
TPScannerWarnEvent = procedure(Sender: TObject; Identifier: string; State: TWarnMsgState; var Handled: boolean) of object;
TPScannerModeDirective = procedure(Sender: TObject; NewMode: TModeSwitch; Before: boolean; var Handled: boolean) of object;
TPasScannerTokenPos = {$ifdef UsePChar}PChar{$else}integer{$endif};
TPascalScanner = class
private
type
@ -700,7 +702,7 @@ type
FSkipGlobalSwitches: boolean;
FSkipWhiteSpace: Boolean;
FTokenOptions: TTokenOptions;
FTokenPos: {$ifdef UsePChar}PChar;{$else}integer; { position in FCurLine }{$endif}
FTokenPos: TPasScannerTokenPos; // position in FCurLine }
FIncludeStack: TFPList;
FFiles: TStrings;
FWarnMsgStates: TWarnMsgNumberStateArr;
@ -767,13 +769,15 @@ type
function DoFetchToken: TToken;
procedure ClearFiles;
Procedure ClearMacros;
Procedure SetCurTokenString(AValue: string);
Procedure SetCurToken(const AValue: TToken);
Procedure SetCurTokenString(const AValue: string);
procedure SetCurrentBoolSwitches(const AValue: TBoolSwitches); virtual;
procedure SetCurrentModeSwitches(AValue: TModeSwitches); virtual;
procedure SetCurrentValueSwitch(V: TValueSwitch; const AValue: string);
procedure SetWarnMsgState(Number: integer; State: TWarnMsgState); virtual;
function GetWarnMsgState(Number: integer): TWarnMsgState; virtual;
function LogEvent(E : TPScannerLogEvent) : Boolean; inline;
property TokenPos: TPasScannerTokenPos read FTokenPos write FTokenPos;
public
constructor Create(AFileResolver: TBaseFileResolver);
destructor Destroy; override;
@ -786,7 +790,7 @@ type
procedure UnSetTokenOption(aOption : TTokenoption);
function CheckToken(aToken : TToken; const ATokenString : String) : TToken;
function FetchToken: TToken;
function ReadNonPascalTillEndToken(StopAtLineEnd: boolean): TToken;
function ReadNonPascalTillEndToken(StopAtLineEnd: boolean): TToken; virtual;
function AddDefine(const aName: String; Quiet: boolean = false): boolean;
function RemoveDefine(const aName: String; Quiet: boolean = false): boolean;
function UnDefine(const aName: String; Quiet: boolean = false): boolean; // check defines and macros
@ -2662,9 +2666,14 @@ begin
FMacros.Clear;
end;
procedure TPascalScanner.SetCurTokenString(AValue: string);
procedure TPascalScanner.SetCurToken(const AValue: TToken);
begin
FCurtokenString:=AValue;
FCurToken:=AValue;
end;
procedure TPascalScanner.SetCurTokenString(const AValue: string);
begin
FCurTokenString:=AValue;
end;
procedure TPascalScanner.OpenFile(AFilename: string);
@ -2865,9 +2874,10 @@ begin
{$endif}
'''':
begin
// Note: Eventually there should be a mechanism to override parsing non-pascal
// By default skip Pascal string literals, as this is more intuitive in
// IDEs with Pascal highlighters
// Notes:
// 1. Eventually there should be a mechanism to override parsing non-pascal
// 2. By default skip Pascal string literals, as this is more intuitive
// in IDEs with Pascal highlighters
inc(FTokenPos);
repeat
{$ifndef UsePChar}

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

@ -928,13 +928,7 @@ const
'valueOf'
);
const
ClassVarModifiersType = [vmClass,vmStatic];
LowJSNativeInt = MinSafeIntDouble;
HighJSNativeInt = MaxSafeIntDouble;
LowJSBoolean = false;
HighJSBoolean = true;
Type
type
{ EPas2JS }
@ -947,6 +941,29 @@ Type
MsgType: TMessageType;
end;
type
TPasToJsPlatform = (
PlatformBrowser,
PlatformNodeJS
);
TPasToJsPlatforms = set of TPasToJsPlatform;
const
PasToJsPlatformNames: array[TPasToJsPlatform] of string = (
'Browser',
'NodeJS'
);
type
TPasToJsProcessor = (
ProcessorECMAScript5,
ProcessorECMAScript6
);
TPasToJsProcessors = set of TPasToJsProcessor;
const
PasToJsProcessorNames: array[TPasToJsProcessor] of string = (
'ECMAScript5',
'ECMAScript6'
);
//------------------------------------------------------------------------------
// Pas2js built-in types
type
@ -962,6 +979,13 @@ const
'JSValue'
);
const
ClassVarModifiersType = [vmClass,vmStatic];
LowJSNativeInt = MinSafeIntDouble;
HighJSNativeInt = MaxSafeIntDouble;
LowJSBoolean = false;
HighJSBoolean = true;
//------------------------------------------------------------------------------
// Element CustomData
type
@ -1141,6 +1165,29 @@ const
proMethodAddrAsPointer
];
type
TPas2JSResolver = class;
{ TPas2jsPasScanner }
TPas2jsPasScanner = class(TPascalScanner)
private
FCompilerVersion: string;
FResolver: TPas2JSResolver;
FTargetPlatform: TPasToJsPlatform;
FTargetProcessor: TPasToJsProcessor;
protected
function HandleInclude(const Param: String): TToken; override;
public
function ReadNonPascalTillEndToken(StopAtLineEnd: boolean): TToken;
override;
property CompilerVersion: string read FCompilerVersion write FCompilerVersion;
property Resolver: TPas2JSResolver read FResolver write FResolver;
property TargetPlatform: TPasToJsPlatform read FTargetPlatform write FTargetPlatform;
property TargetProcessor: TPasToJsProcessor read FTargetProcessor write FTargetProcessor;
end;
{ TPas2JSResolver }
TPas2JSResolver = class(TPasResolver)
private
FJSBaseTypes: array[TPas2jsBaseType] of TPasUnresolvedSymbolRef;
@ -1427,32 +1474,7 @@ const
woCompactObjectLiterals,
woCompactArguments];
type
TPas2JSIsElementUsedEvent = function(Sender: TObject; El: TPasElement): boolean of object;
TPasToJsPlatform = (
PlatformBrowser,
PlatformNodeJS
);
TPasToJsPlatforms = set of TPasToJsPlatform;
const
PasToJsPlatformNames: array[TPasToJsPlatform] of string = (
'Browser',
'NodeJS'
);
type
TPasToJsProcessor = (
ProcessorECMAScript5,
ProcessorECMAScript6
);
TPasToJsProcessors = set of TPasToJsProcessor;
const
PasToJsProcessorNames: array[TPasToJsProcessor] of string = (
'ECMAScript5',
'ECMAScript6'
);
type
TJSReservedWordList = array of String;
TRefPathKind = (
@ -1844,6 +1866,7 @@ const
TempRefObjGetterName = 'get';
TempRefObjSetterName = 'set';
TempRefObjSetterArgName = 'v';
IdentChars = ['0'..'9', 'A'..'Z', 'a'..'z','_'];
function CodePointToJSString(u: longword): TJSString;
begin
@ -2018,6 +2041,245 @@ begin
Element:=TheEl;
end;
{ TPas2jsPasScanner }
function TPas2jsPasScanner.HandleInclude(const Param: String): TToken;
procedure SetStr(const s: string);
begin
Result:=tkString;
SetCurTokenString(''''+s+'''');
end;
var
Year, Month, Day, Hour, Minute, Second, MilliSecond: word;
i: Integer;
Scope: TPasScope;
begin
if (Param<>'') and (Param[1]='%') then
begin
case lowercase(Param) of
'%date%':
begin
DecodeDate(Now,Year,Month,Day);
SetStr(IntToStr(Year)+'/'+IntToStr(Month)+'/'+IntToStr(Day));
exit;
end;
'%time%':
begin
DecodeTime(Now,Hour,Minute,Second,MilliSecond);
SetStr(Format('%2d:%2d:%2d',[Hour,Minute,Second]));
exit;
end;
'%pas2jstarget%','%fpctarget%',
'%pas2jstargetos%','%fpctargetos%':
begin
SetStr(PasToJsPlatformNames[TargetPlatform]);
exit;
end;
'%pas2jstargetcpu%','%fpctargetcpu%':
begin
SetStr(PasToJsProcessorNames[TargetProcessor]);
exit;
end;
'%pas2jsversion%','%fpcversion%':
begin
SetStr(CompilerVersion);
exit;
end;
'%line%':
begin
SetStr(IntToStr(CurRow));
exit;
end;
'%currentroutine%':
begin
if Resolver<>nil then
for i:=Resolver.ScopeCount-1 downto 0 do
begin
Scope:=Resolver.Scopes[i];
if (Scope.Element is TPasProcedure)
and (Scope.Element.Name<>'') then
begin
SetStr(Scope.Element.Name);
exit;
end;
end;
SetStr('<anonymous>');
exit;
end;
else
DoLog(mtWarning,nWarnIllegalCompilerDirectiveX,SWarnIllegalCompilerDirectiveX,
['$i '+Param]);
end;
end;
Result:=inherited HandleInclude(Param);
end;
function TPas2jsPasScanner.ReadNonPascalTillEndToken(StopAtLineEnd: boolean
): TToken;
var
StartPos, MyTokenPos: integer;
s: string;
l: integer;
Procedure CommitTokenPos;
begin
{$IFDEF Pas2js}
TokenPos:=MyTokenPos;
{$ELSE}
TokenPos:=PChar(s)+MyTokenPos-1;
{$ENDIF}
end;
Procedure Add;
var
AddLen: PtrInt;
begin
AddLen:=MyTokenPos-StartPos;
if AddLen=0 then
SetCurTokenString('')
else
begin
SetCurTokenString(CurTokenString+copy(CurLine,StartPos,AddLen));
StartPos:=MyTokenPos;
end;
end;
function DoEndOfLine: boolean;
begin
Add;
if StopAtLineEnd then
begin
ReadNonPascalTillEndToken := tkLineEnding;
CommitTokenPos;
SetCurToken(tkLineEnding);
FetchLine;
exit(true);
end;
if not FetchLine then
begin
ReadNonPascalTillEndToken := tkEOF;
SetCurToken(tkEOF);
exit(true);
end;
s:=CurLine;
l:=length(s);
MyTokenPos:=1;
StartPos:=MyTokenPos;
Result:=false;
end;
begin
SetCurTokenString('');
s:=CurLine;
l:=length(s);
{$IFDEF Pas2js}
MyTokenPos:=TokenPos;
{$ELSE}
{$IFDEF VerbosePas2JS}
if (TokenPos<PChar(s)) or (TokenPos>PChar(s)+length(s)) then
Error(nErrRangeCheck,'[20181109104812]');
{$ENDIF}
MyTokenPos:=TokenPos-PChar(s)+1;
{$ENDIF}
StartPos:=MyTokenPos;
repeat
if MyTokenPos>l then
if DoEndOfLine then exit;
case s[MyTokenPos] of
'''':
begin
inc(MyTokenPos);
repeat
if MyTokenPos>l then
Error(nErrOpenString,SErrOpenString);
case s[MyTokenPos] of
'''':
begin
inc(MyTokenPos);
break;
end;
#10,#13:
begin
// string literal missing closing apostroph
break;
end
else
inc(MyTokenPos);
end;
until false;
end;
'"':
begin
inc(MyTokenPos);
repeat
if MyTokenPos>l then
Error(nErrOpenString,SErrOpenString);
case s[MyTokenPos] of
'"':
begin
inc(MyTokenPos);
break;
end;
#10,#13:
begin
// string literal missing closing quote
break;
end
else
inc(MyTokenPos);
end;
until false;
end;
'/':
begin
inc(MyTokenPos);
if (MyTokenPos<=l) and (s[MyTokenPos]='/') then
begin
// skip Delphi comment //, see Note above
repeat
inc(MyTokenPos);
until (MyTokenPos>l) or (s[MyTokenPos] in [#10,#13]);
end;
end;
'0'..'9', 'A'..'Z', 'a'..'z','_':
begin
// number or identifier
if (CompareText(copy(s,MyTokenPos,3),'end')=0)
and ((MyTokenPos+3>l) or not (s[MyTokenPos+3] in IdentChars)) then
begin
// 'end' found
Add;
if CurTokenString<>'' then
begin
// return characters in front of 'end'
Result:=tkWhitespace;
CommitTokenPos;
SetCurToken(Result);
exit;
end;
// return 'end'
Result := tkend;
SetCurTokenString(copy(s,MyTokenPos,3));
inc(MyTokenPos,3);
CommitTokenPos;
SetCurToken(Result);
exit;
end
else
begin
// skip identifier
while (MyTokenPos<=l) and (s[MyTokenPos] in IdentChars) do
inc(MyTokenPos);
end;
end;
else
inc(MyTokenPos);
end;
until false;
end;
{ TPas2JSResolver }
// inline

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

@ -34,23 +34,6 @@ const // Messages
type
{ TPas2jsPasScanner }
TPas2jsPasScanner = class(TPascalScanner)
private
FCompilerVersion: string;
FResolver: TPas2JSResolver;
FTargetPlatform: TPasToJsPlatform;
FTargetProcessor: TPasToJsProcessor;
protected
function HandleInclude(const Param: String): TToken; override;
public
property CompilerVersion: string read FCompilerVersion write FCompilerVersion;
property Resolver: TPas2JSResolver read FResolver write FResolver;
property TargetPlatform: TPasToJsPlatform read FTargetPlatform write FTargetPlatform;
property TargetProcessor: TPasToJsProcessor read FTargetProcessor write FTargetProcessor;
end;
{ TPas2jsPasParser }
TPas2jsPasParser = class(TPasParser)
@ -123,81 +106,6 @@ begin
r(mtError,nFinalizationNotSupported,sFinalizationNotSupported);
end;
{ TPas2jsPasScanner }
function TPas2jsPasScanner.HandleInclude(const Param: String): TToken;
procedure SetStr(const s: string);
begin
Result:=tkString;
SetCurTokenString(''''+s+'''');
end;
var
Year, Month, Day, Hour, Minute, Second, MilliSecond: word;
i: Integer;
Scope: TPasScope;
begin
if (Param<>'') and (Param[1]='%') then
begin
case lowercase(Param) of
'%date%':
begin
DecodeDate(Now,Year,Month,Day);
SetStr(IntToStr(Year)+'/'+IntToStr(Month)+'/'+IntToStr(Day));
exit;
end;
'%time%':
begin
DecodeTime(Now,Hour,Minute,Second,MilliSecond);
SetStr(Format('%2d:%2d:%2d',[Hour,Minute,Second]));
exit;
end;
'%pas2jstarget%','%fpctarget%',
'%pas2jstargetos%','%fpctargetos%':
begin
SetStr(PasToJsPlatformNames[TargetPlatform]);
exit;
end;
'%pas2jstargetcpu%','%fpctargetcpu%':
begin
SetStr(PasToJsProcessorNames[TargetProcessor]);
exit;
end;
'%pas2jsversion%','%fpcversion%':
begin
SetStr(CompilerVersion);
exit;
end;
'%line%':
begin
SetStr(IntToStr(CurRow));
exit;
end;
'%currentroutine%':
begin
if Resolver<>nil then
for i:=Resolver.ScopeCount-1 downto 0 do
begin
Scope:=Resolver.Scopes[i];
if (Scope.Element is TPasProcedure)
and (Scope.Element.Name<>'') then
begin
SetStr(Scope.Element.Name);
exit;
end;
end;
SetStr('<anonymous>');
exit;
end;
else
DoLog(mtWarning,nWarnIllegalCompilerDirectiveX,SWarnIllegalCompilerDirectiveX,
['$i '+Param]);
end;
end;
Result:=inherited HandleInclude(Param);
end;
{ TPas2jsPasParser }
constructor TPas2jsPasParser.Create(AScanner: TPascalScanner;

2
packages/pastojs/tests/tcfiler.pas
View File

@ -25,7 +25,7 @@ interface
uses
Classes, SysUtils, fpcunit, testregistry,
PasTree, PScanner, PasResolver, PasResolveEval, PParser, PasUseAnalyzer,
FPPas2Js, Pas2JsFiler, Pas2jsPParser,
FPPas2Js, Pas2JsFiler,
tcmodules, jstree;
type

16
packages/pastojs/tests/tcmodules.pas
View File

@ -27,7 +27,7 @@ uses
Classes, SysUtils, fpcunit, testregistry, contnrs,
jstree, jswriter, jsbase,
PasTree, PScanner, PasResolver, PParser, PasResolveEval,
Pas2jsPParser, FPPas2Js;
FPPas2Js;
const
// default parser+scanner options
@ -3317,6 +3317,14 @@ begin
' { a:{ b:{}, c:[]}, d:''1'' };',
' end;',
' asm console.log(); end;',
' asm',
' s = "'' ";',
' s = ''" '';',
' s = s + "world" + "''";',
' // end',
' s = ''end'';',
' s = "end";',
' end;',
'end;',
'begin']);
ConvertProgram;
@ -3326,6 +3334,12 @@ begin
' var Result = 0;',
' { a:{ b:{}, c:[]}, d:''1'' };',
' console.log();',
' s = "'' ";',
' s = ''" '';',
' s = s + "world" + "''";',
' // end',
' s = ''end'';',
' s = "end";',
' return Result;',
'};'
]),