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

pastojs: adapted pas2jspparser for pas2js

Browse Source 
git-svn-id: trunk@40044 -
This commit is contained in:
Mattias Gaertner 2018-10-25 20:07:00 +00:00
parent d512e581e9
commit 225aa064fe
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/pastojs/src/pas2jsfileutils.pp
View File

@ -596,7 +596,7 @@ end;
function MatchGlobbing(Mask, Name: string): boolean;
// match * and ?
{$IFDEF Pa2js}
{$IFDEF Pas2js}
begin
if Mask='' then exit(Name='');
writeln('MatchGlobbing ToDo ',Mask,' Name=',Name);

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

@ -21,7 +21,6 @@
unit Pas2jsLogger;
{$mode objfpc}{$H+}
{$inline on}
{$i pas2js_defines.inc}

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

@ -19,7 +19,8 @@
unit Pas2jsPParser;
{$mode objfpc}{$H+}
{$inline on}
{$i pas2js_defines.inc}
interface
@ -40,10 +41,9 @@ type
FLog: TPas2jsLogger;
public
constructor Create(AScanner: TPascalScanner;
AFileResolver: TBaseFileResolver; AEngine: TPasTreeContainer);
procedure SetLastMsg(MsgType: TMessageType; MsgNumber: integer;
Const Fmt : String; Args : Array of const);
procedure RaiseParserError(MsgNumber: integer; Args: array of const);
AFileResolver: TBaseFileResolver; AEngine: TPasTreeContainer); reintroduce;
procedure RaiseParserError(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF});
procedure ParseSubModule(var Module: TPasModule);
property Log: TPas2jsLogger read FLog write FLog;
end;
@ -115,13 +115,8 @@ begin
Options:=Options+po_pas2js;
end;
procedure TPas2jsPasParser.SetLastMsg(MsgType: TMessageType;
MsgNumber: integer; const Fmt: String; Args: array of const);
begin
inherited SetLastMsg(MsgType,MsgNumber,Fmt,Args);
end;
procedure TPas2jsPasParser.RaiseParserError(MsgNumber: integer; Args: array of const);
procedure TPas2jsPasParser.RaiseParserError(MsgNumber: integer;
Args: array of {$IFDEF Pas2JS}jsvalue{$ELSE}const{$ENDIF});
var
Msg: TPas2jsMessage;
begin
@ -154,7 +149,7 @@ function TPas2jsCompilerResolver.CreateElement(AClass: TPTreeElement;
begin
if AClass=TFinalizationSection then
(CurrentParser as TPas2jsPasParser).RaiseParserError(nFinalizationNotSupported,[]);
Result:=inherited;
Result:=inherited CreateElement(AClass,AName,AParent,AVisibility,ASrcPos);
if (Result is TPasModule) then
OnCheckSrcName(Result);
end;

2
utils/pas2js/nodepas2js.pp
View File

@ -9,7 +9,7 @@ uses
fpjson,
PasTree, PScanner, PParser, PasResolveEval, PasResolver, PasUseAnalyzer,
FPPas2Js,
Pas2jsFileUtils, Pas2jsLogger;
Pas2jsFileUtils, Pas2jsLogger, Pas2jsPParser;
begin
// Your code here