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

pastojs: clean up

Browse Source 
git-svn-id: trunk@42453 -
This commit is contained in:
Mattias Gaertner 2019-07-18 09:57:06 +00:00
parent 6ca93e294f
commit c6aaa3f1e6
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -595,9 +595,11 @@ type
Checked: TPasAnalyzerKeySet { set of TPas2jsCompilerFile, key is UnitFilename }); Checked: TPasAnalyzerKeySet { set of TPas2jsCompilerFile, key is UnitFilename });
procedure FinishSrcMap(SrcMap: TPas2JSSrcMap); virtual; procedure FinishSrcMap(SrcMap: TPas2JSSrcMap); virtual;
// WriteSingleJSFile does not // WriteSingleJSFile does not
procedure WriteSingleJSFile(aFile: TPas2jsCompilerFile; CombinedFileWriter: TPas2JSMapper; Checked: TPasAnalyzerKeySet); procedure WriteSingleJSFile(aFile: TPas2jsCompilerFile; CombinedFileWriter: TPas2JSMapper);
// WriteJSFiles recurses uses clause // WriteJSFiles recurses uses clause
procedure WriteJSFiles(aFile: TPas2jsCompilerFile; CombinedFileWriter: TPas2JSMapper; Checked: TPasAnalyzerKeySet { set of TPas2jsCompilerFile, key is UnitFilename }); procedure WriteJSFiles(aFile: TPas2jsCompilerFile;
CombinedFileWriter: TPas2JSMapper;
Checked: TPasAnalyzerKeySet { set of TPas2jsCompilerFile, key is UnitFilename });
procedure InitParamMacros;virtual; procedure InitParamMacros;virtual;
procedure ClearDefines; procedure ClearDefines;
procedure RaiseInternalError(id: TMaxPrecInt; Msg: string); procedure RaiseInternalError(id: TMaxPrecInt; Msg: string);
@ -2297,7 +2299,8 @@ begin
Result:=TPas2JSSrcMap.Create(aFileName); Result:=TPas2JSSrcMap.Create(aFileName);
end; end;
Function TPas2jsCompiler.CreateFileWriter(aFile : TPas2jsCompilerFile; Const aFilename: string) : TPas2JSMapper; function TPas2jsCompiler.CreateFileWriter(aFile: TPas2jsCompilerFile;
const aFilename: string): TPas2JSMapper;
var var
SrcMap: TPas2JSSrcMap; SrcMap: TPas2JSSrcMap;
@ -2325,7 +2328,8 @@ begin
end; end;
Procedure TPas2jsCompiler.EmitJavaScript(aFile: TPas2jsCompilerFile; aFileWriter : TPas2JSMapper); procedure TPas2jsCompiler.EmitJavaScript(aFile: TPas2jsCompilerFile;
aFileWriter: TPas2JSMapper);
var var
aJSWriter: TJSWriter; aJSWriter: TJSWriter;
@ -2354,7 +2358,8 @@ begin
end; end;
Procedure TPas2jsCompiler.WriteJSToFile(Const MapFileName : string; aFileWriter : TPas2JSMapper); procedure TPas2jsCompiler.WriteJSToFile(const MapFileName: string;
aFileWriter: TPas2JSMapper);
Var Var
{$IFDEF Pas2js} {$IFDEF Pas2js}
@ -2430,7 +2435,8 @@ begin
end; end;
end; end;
Procedure TPas2jsCompiler.WriteSrcMap(Const MapFileName: string; aFileWriter : TPas2JSMapper); procedure TPas2jsCompiler.WriteSrcMap(const MapFileName: string;
aFileWriter: TPas2JSMapper);
Var Var
{$IFDEF Pas2js} {$IFDEF Pas2js}
@ -2481,7 +2487,8 @@ begin
end; end;
procedure TPas2jsCompiler.WriteSingleJSFile(aFile: TPas2jsCompilerFile; CombinedFileWriter: TPas2JSMapper; Checked: TPasAnalyzerKeySet); procedure TPas2jsCompiler.WriteSingleJSFile(aFile: TPas2jsCompilerFile;
CombinedFileWriter: TPas2JSMapper);
Procedure WriteToStandardOutput(aFileWriter : TPas2JSMapper); Procedure WriteToStandardOutput(aFileWriter : TPas2JSMapper);
@ -2611,7 +2618,7 @@ begin
CheckUsesClause(aFileWriter,aFile.GetPasMainUsesClause); CheckUsesClause(aFileWriter,aFile.GetPasMainUsesClause);
CheckUsesClause(aFileWriter,aFile.GetPasImplUsesClause); CheckUsesClause(aFileWriter,aFile.GetPasImplUsesClause);
// Write me... // Write me...
WriteSingleJSFile(aFile,aFileWriter,Checked); WriteSingleJSFile(aFile,aFileWriter);
finally finally
if aFileWriter<>CombinedFileWriter then if aFileWriter<>CombinedFileWriter then
aFileWriter.Free; aFileWriter.Free;