From c6aaa3f1e66397a107518d57a1af6e08db46f153 Mon Sep 17 00:00:00 2001 From: Mattias Gaertner Date: Thu, 18 Jul 2019 09:57:06 +0000 Subject: [PATCH] pastojs: clean up git-svn-id: trunk@42453 - --- packages/pastojs/src/pas2jscompiler.pp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/pastojs/src/pas2jscompiler.pp b/packages/pastojs/src/pas2jscompiler.pp index ae01a5e4e0..5689843641 100644 --- a/packages/pastojs/src/pas2jscompiler.pp +++ b/packages/pastojs/src/pas2jscompiler.pp @@ -595,9 +595,11 @@ type Checked: TPasAnalyzerKeySet { set of TPas2jsCompilerFile, key is UnitFilename }); procedure FinishSrcMap(SrcMap: TPas2JSSrcMap); virtual; // WriteSingleJSFile does not - procedure WriteSingleJSFile(aFile: TPas2jsCompilerFile; CombinedFileWriter: TPas2JSMapper; Checked: TPasAnalyzerKeySet); + procedure WriteSingleJSFile(aFile: TPas2jsCompilerFile; CombinedFileWriter: TPas2JSMapper); // 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 ClearDefines; procedure RaiseInternalError(id: TMaxPrecInt; Msg: string); @@ -2297,7 +2299,8 @@ begin Result:=TPas2JSSrcMap.Create(aFileName); end; -Function TPas2jsCompiler.CreateFileWriter(aFile : TPas2jsCompilerFile; Const aFilename: string) : TPas2JSMapper; +function TPas2jsCompiler.CreateFileWriter(aFile: TPas2jsCompilerFile; + const aFilename: string): TPas2JSMapper; var SrcMap: TPas2JSSrcMap; @@ -2325,7 +2328,8 @@ begin end; -Procedure TPas2jsCompiler.EmitJavaScript(aFile: TPas2jsCompilerFile; aFileWriter : TPas2JSMapper); +procedure TPas2jsCompiler.EmitJavaScript(aFile: TPas2jsCompilerFile; + aFileWriter: TPas2JSMapper); var aJSWriter: TJSWriter; @@ -2354,7 +2358,8 @@ begin end; -Procedure TPas2jsCompiler.WriteJSToFile(Const MapFileName : string; aFileWriter : TPas2JSMapper); +procedure TPas2jsCompiler.WriteJSToFile(const MapFileName: string; + aFileWriter: TPas2JSMapper); Var {$IFDEF Pas2js} @@ -2430,7 +2435,8 @@ begin end; end; -Procedure TPas2jsCompiler.WriteSrcMap(Const MapFileName: string; aFileWriter : TPas2JSMapper); +procedure TPas2jsCompiler.WriteSrcMap(const MapFileName: string; + aFileWriter: TPas2JSMapper); Var {$IFDEF Pas2js} @@ -2481,7 +2487,8 @@ begin end; -procedure TPas2jsCompiler.WriteSingleJSFile(aFile: TPas2jsCompilerFile; CombinedFileWriter: TPas2JSMapper; Checked: TPasAnalyzerKeySet); +procedure TPas2jsCompiler.WriteSingleJSFile(aFile: TPas2jsCompilerFile; + CombinedFileWriter: TPas2JSMapper); Procedure WriteToStandardOutput(aFileWriter : TPas2JSMapper); @@ -2611,7 +2618,7 @@ begin CheckUsesClause(aFileWriter,aFile.GetPasMainUsesClause); CheckUsesClause(aFileWriter,aFile.GetPasImplUsesClause); // Write me... - WriteSingleJSFile(aFile,aFileWriter,Checked); + WriteSingleJSFile(aFile,aFileWriter); finally if aFileWriter<>CombinedFileWriter then aFileWriter.Free;