|
@@ -2367,11 +2367,9 @@ end;
|
|
|
|
|
|
|
|
function TPas2jsCompiler.CreateFileWriter(aFile: TPas2jsCompilerFile;
|
|
function TPas2jsCompiler.CreateFileWriter(aFile: TPas2jsCompilerFile;
|
|
|
const aFilename: string): TPas2JSMapper;
|
|
const aFilename: string): TPas2JSMapper;
|
|
|
-
|
|
|
|
|
var
|
|
var
|
|
|
SrcMap: TPas2JSSrcMap;
|
|
SrcMap: TPas2JSSrcMap;
|
|
|
DestFileName : String;
|
|
DestFileName : String;
|
|
|
-
|
|
|
|
|
begin
|
|
begin
|
|
|
DestFileName:=AFileName;
|
|
DestFileName:=AFileName;
|
|
|
if DestFileName='' then
|
|
if DestFileName='' then
|
|
@@ -2395,15 +2393,12 @@ end;
|
|
|
|
|
|
|
|
procedure TPas2jsCompiler.HandleLinkLibStatement(Sender: TObject; const aLibName, aLibAlias, aLibOptions: String;
|
|
procedure TPas2jsCompiler.HandleLinkLibStatement(Sender: TObject; const aLibName, aLibAlias, aLibOptions: String;
|
|
|
var Handled: boolean);
|
|
var Handled: boolean);
|
|
|
-
|
|
|
|
|
Var
|
|
Var
|
|
|
Imp : TJSImportStatement;
|
|
Imp : TJSImportStatement;
|
|
|
PasLib : TJSSimpleAssignStatement;
|
|
PasLib : TJSSimpleAssignStatement;
|
|
|
dmAlias,dmimp : TJSDotMemberExpression;
|
|
dmAlias,dmimp : TJSDotMemberExpression;
|
|
|
pePas,peAlias : TJSPrimaryExpressionIdent;
|
|
pePas,peAlias : TJSPrimaryExpressionIdent;
|
|
|
LibModuleName : String;
|
|
LibModuleName : String;
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
begin
|
|
begin
|
|
|
Handled:=true;
|
|
Handled:=true;
|
|
|
if aLibOptions<>'' then
|
|
if aLibOptions<>'' then
|
|
@@ -2433,13 +2428,11 @@ begin
|
|
|
pasLib.Expr:=peAlias;
|
|
pasLib.Expr:=peAlias;
|
|
|
// Add to statements
|
|
// Add to statements
|
|
|
FImports.Statements.AddNode.Node:=Imp;
|
|
FImports.Statements.AddNode.Node:=Imp;
|
|
|
- FImports.Statements.AddNode.Node:=pasLib;
|
|
|
|
|
|
|
+ FImports.Statements.AddNode.Node:=PasLib;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
-
|
|
|
|
|
procedure TPas2jsCompiler.EmitJavaScript(aFile: TPas2jsCompilerFile;
|
|
procedure TPas2jsCompiler.EmitJavaScript(aFile: TPas2jsCompilerFile;
|
|
|
aFileWriter: TPas2JSMapper);
|
|
aFileWriter: TPas2JSMapper);
|
|
|
-
|
|
|
|
|
var
|
|
var
|
|
|
aJSWriter: TJSWriter;
|
|
aJSWriter: TJSWriter;
|
|
|
begin
|
|
begin
|
mattias