|
@@ -15230,7 +15230,7 @@ begin
|
|
if C=nil then
|
|
if C=nil then
|
|
RaiseInconsistency(20180501114300,El);
|
|
RaiseInconsistency(20180501114300,El);
|
|
V:=TJSVariableStatement(CreateElement(TJSVariableStatement,El));
|
|
V:=TJSVariableStatement(CreateElement(TJSVariableStatement,El));
|
|
- V.A:=C;
|
|
|
|
|
|
+ V.VarDecl:=C;
|
|
Result:=V;
|
|
Result:=V;
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|
|
@@ -16827,7 +16827,7 @@ begin
|
|
// var NewArr = [];
|
|
// var NewArr = [];
|
|
VarSt:=TJSVariableStatement(CreateElement(TJSVariableStatement,El));
|
|
VarSt:=TJSVariableStatement(CreateElement(TJSVariableStatement,El));
|
|
VarDecl:=TJSVarDeclaration(CreateElement(TJSVarDeclaration,El));
|
|
VarDecl:=TJSVarDeclaration(CreateElement(TJSVarDeclaration,El));
|
|
- VarSt.A:=VarDecl;
|
|
|
|
|
|
+ VarSt.VarDecl:=VarDecl;
|
|
VarDecl.Name:=NewArrName;
|
|
VarDecl.Name:=NewArrName;
|
|
VarDecl.Init:=TJSArrayLiteral(CreateElement(TJSArrayLiteral,El));
|
|
VarDecl.Init:=TJSArrayLiteral(CreateElement(TJSArrayLiteral,El));
|
|
AddLoopSt(VarSt);
|
|
AddLoopSt(VarSt);
|
|
@@ -17736,7 +17736,7 @@ begin
|
|
VarSt:=TJSVariableStatement(CreateElement(TJSVariableStatement,El.CaseExpr));
|
|
VarSt:=TJSVariableStatement(CreateElement(TJSVariableStatement,El.CaseExpr));
|
|
StList.A:=VarSt;
|
|
StList.A:=VarSt;
|
|
VarDecl:=TJSVarDeclaration(CreateElement(TJSVarDeclaration,El.CaseExpr));
|
|
VarDecl:=TJSVarDeclaration(CreateElement(TJSVarDeclaration,El.CaseExpr));
|
|
- VarSt.A:=VarDecl;
|
|
|
|
|
|
+ VarSt.VarDecl:=VarDecl;
|
|
VarDecl.Name:=TmpVar.Name;
|
|
VarDecl.Name:=TmpVar.Name;
|
|
VarDecl.Init:=ConvertExpression(El.CaseExpr,AContext);
|
|
VarDecl.Init:=ConvertExpression(El.CaseExpr,AContext);
|
|
|
|
|
|
@@ -19827,7 +19827,7 @@ begin
|
|
end;
|
|
end;
|
|
// var $in=
|
|
// var $in=
|
|
CurInVar:=FuncContext.AddLocalVar(GetBIName(pbivnLoopIn),El.VariableName,cvkNone,true);
|
|
CurInVar:=FuncContext.AddLocalVar(GetBIName(pbivnLoopIn),El.VariableName,cvkNone,true);
|
|
- VarSt.A:=CreateVarDecl(CurInVar.Name,Call,PosEl);
|
|
|
|
|
|
+ VarSt.VarDecl:=CreateVarDecl(CurInVar.Name,Call,PosEl);
|
|
|
|
|
|
PosEl:=El.VariableName;
|
|
PosEl:=El.VariableName;
|
|
TrySt:=nil;
|
|
TrySt:=nil;
|
|
@@ -23402,7 +23402,7 @@ begin
|
|
begin
|
|
begin
|
|
// add for("var $l" in <startexpr>)
|
|
// add for("var $l" in <startexpr>)
|
|
VarStat:=TJSVariableStatement(CreateElement(TJSVariableStatement,PosEl));
|
|
VarStat:=TJSVariableStatement(CreateElement(TJSVariableStatement,PosEl));
|
|
- VarStat.A:=CreatePrimitiveDotExpr(CurLoopVarName,PosEl);
|
|
|
|
|
|
+ VarStat.VarDecl:=CreatePrimitiveDotExpr(CurLoopVarName,PosEl);
|
|
TJSForInStatement(ForSt).LHS:=VarStat;
|
|
TJSForInStatement(ForSt).LHS:=VarStat;
|
|
end
|
|
end
|
|
else
|
|
else
|
|
@@ -24349,14 +24349,14 @@ procedure TPasToJSConverter.AddToVarStatement(VarStat: TJSVariableStatement;
|
|
var
|
|
var
|
|
List: TJSVariableDeclarationList;
|
|
List: TJSVariableDeclarationList;
|
|
begin
|
|
begin
|
|
- if VarStat.A=nil then
|
|
|
|
- VarStat.A:=Add
|
|
|
|
|
|
+ if VarStat.VarDecl=nil then
|
|
|
|
+ VarStat.VarDecl:=Add
|
|
else
|
|
else
|
|
begin
|
|
begin
|
|
List:=TJSVariableDeclarationList(CreateElement(TJSVariableDeclarationList,Src));
|
|
List:=TJSVariableDeclarationList(CreateElement(TJSVariableDeclarationList,Src));
|
|
- List.A:=VarStat.A;
|
|
|
|
|
|
+ List.A:=VarStat.VarDecl;
|
|
List.B:=Add;
|
|
List.B:=Add;
|
|
- VarStat.A:=List;
|
|
|
|
|
|
+ VarStat.VarDecl:=List;
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|
|
|
|
|
|
@@ -24522,7 +24522,7 @@ function TPasToJSConverter.CreateVarStatement(const aName: String;
|
|
// create "var aname = init"
|
|
// create "var aname = init"
|
|
begin
|
|
begin
|
|
Result:=TJSVariableStatement(CreateElement(TJSVariableStatement,El));
|
|
Result:=TJSVariableStatement(CreateElement(TJSVariableStatement,El));
|
|
- Result.A:=CreateVarDecl(aName,Init,El);
|
|
|
|
|
|
+ Result.VarDecl:=CreateVarDecl(aName,Init,El);
|
|
end;
|
|
end;
|
|
|
|
|
|
function TPasToJSConverter.CreateVarDecl(const aName: String; Init: TJSElement;
|
|
function TPasToJSConverter.CreateVarDecl(const aName: String; Init: TJSElement;
|
|
@@ -26854,7 +26854,7 @@ begin
|
|
if C=nil then
|
|
if C=nil then
|
|
RaiseInconsistency(20180501114422,El);
|
|
RaiseInconsistency(20180501114422,El);
|
|
V:=TJSVariableStatement(CreateElement(TJSVariableStatement,El));
|
|
V:=TJSVariableStatement(CreateElement(TJSVariableStatement,El));
|
|
- V.A:=C;
|
|
|
|
|
|
+ V.VarDecl:=C;
|
|
AddToSourceElements(Src,V);
|
|
AddToSourceElements(Src,V);
|
|
|
|
|
|
if (coStoreImplJS in Options) and (AContext.Resolver<>nil) then
|
|
if (coStoreImplJS in Options) and (AContext.Resolver<>nil) then
|