|
@@ -145,13 +145,13 @@ Type
|
|
private
|
|
private
|
|
FFlags: TJSElementFlags;
|
|
FFlags: TJSElementFlags;
|
|
FLine: Integer;
|
|
FLine: Integer;
|
|
- FRow: Integer;
|
|
|
|
|
|
+ FColumn: Integer;
|
|
FSource: String;
|
|
FSource: String;
|
|
Public
|
|
Public
|
|
- Constructor Create(ALine,ARow : Integer; Const ASource : String = ''); virtual;
|
|
|
|
|
|
+ Constructor Create(ALine,AColumn : Integer; Const ASource : String = ''); virtual;
|
|
Property Source : String Read FSource Write FSource;
|
|
Property Source : String Read FSource Write FSource;
|
|
- Property Row : Integer Read FRow Write FRow;
|
|
|
|
Property Line : Integer Read FLine Write FLine;
|
|
Property Line : Integer Read FLine Write FLine;
|
|
|
|
+ Property Column : Integer Read FColumn Write FColumn;
|
|
Property Flags : TJSElementFlags Read FFlags Write FFlags;
|
|
Property Flags : TJSElementFlags Read FFlags Write FFlags;
|
|
end;
|
|
end;
|
|
TJSElementClass = Class of TJSElement;
|
|
TJSElementClass = Class of TJSElement;
|
|
@@ -170,7 +170,7 @@ Type
|
|
private
|
|
private
|
|
FValue: TJSValue;
|
|
FValue: TJSValue;
|
|
Public
|
|
Public
|
|
- Constructor Create(ALine,ARow : Integer; Const ASource : String = ''); override;
|
|
|
|
|
|
+ Constructor Create(ALine,AColumn : Integer; Const ASource : String = ''); override;
|
|
Destructor Destroy; override;
|
|
Destructor Destroy; override;
|
|
Property Value : TJSValue Read FValue Write FValue;
|
|
Property Value : TJSValue Read FValue Write FValue;
|
|
end;
|
|
end;
|
|
@@ -185,7 +185,7 @@ Type
|
|
function GetA(AIndex : integer): TJSValue;
|
|
function GetA(AIndex : integer): TJSValue;
|
|
procedure SetA(AIndex : integer; const AValue: TJSValue);
|
|
procedure SetA(AIndex : integer; const AValue: TJSValue);
|
|
Public
|
|
Public
|
|
- Constructor Create(ALine,ARow : Integer; Const ASource : String = ''); override;
|
|
|
|
|
|
+ Constructor Create(ALine,AColumn : Integer; Const ASource : String = ''); override;
|
|
Destructor Destroy; override;
|
|
Destructor Destroy; override;
|
|
Property Pattern : TJSValue Read FPattern Write FPattern;
|
|
Property Pattern : TJSValue Read FPattern Write FPattern;
|
|
Property PatternFlags : TJSValue Read FPatternFlags Write FPatternFlags;
|
|
Property PatternFlags : TJSValue Read FPatternFlags Write FPatternFlags;
|
|
@@ -233,7 +233,7 @@ Type
|
|
private
|
|
private
|
|
FElements: TJSArrayLiteralElements;
|
|
FElements: TJSArrayLiteralElements;
|
|
Public
|
|
Public
|
|
- Constructor Create(ALine,ARow : Integer; const ASource : String = ''); override;
|
|
|
|
|
|
+ Constructor Create(ALine,AColumn : Integer; const ASource : String = ''); override;
|
|
procedure AddElement(El: TJSElement);
|
|
procedure AddElement(El: TJSElement);
|
|
Destructor Destroy; override;
|
|
Destructor Destroy; override;
|
|
Property Elements : TJSArrayLiteralElements Read FElements;
|
|
Property Elements : TJSArrayLiteralElements Read FElements;
|
|
@@ -267,7 +267,7 @@ Type
|
|
private
|
|
private
|
|
FElements: TJSObjectLiteralElements;
|
|
FElements: TJSObjectLiteralElements;
|
|
Public
|
|
Public
|
|
- Constructor Create(ALine,ARow : Integer; const ASource : String = ''); override;
|
|
|
|
|
|
+ Constructor Create(ALine,AColumn : Integer; const ASource : String = ''); override;
|
|
Destructor Destroy; override;
|
|
Destructor Destroy; override;
|
|
Property Elements : TJSObjectLiteralElements Read FElements;
|
|
Property Elements : TJSObjectLiteralElements Read FElements;
|
|
end;
|
|
end;
|
|
@@ -882,7 +882,7 @@ Type
|
|
FCond: TJSelement;
|
|
FCond: TJSelement;
|
|
FDefault: TJSCaseElement;
|
|
FDefault: TJSCaseElement;
|
|
Public
|
|
Public
|
|
- Constructor Create(ALine,ARow : Integer; const ASource : String = ''); override;
|
|
|
|
|
|
+ Constructor Create(ALine,AColumn : Integer; const ASource : String = ''); override;
|
|
Destructor Destroy; override;
|
|
Destructor Destroy; override;
|
|
Property Cond : TJSelement Read FCond Write FCond;
|
|
Property Cond : TJSelement Read FCond Write FCond;
|
|
Property Cases : TJSCaseElements Read FCases;
|
|
Property Cases : TJSCaseElements Read FCases;
|
|
@@ -970,7 +970,7 @@ Type
|
|
FStatements: TJSElementNodes;
|
|
FStatements: TJSElementNodes;
|
|
FVars: TJSElementNodes;
|
|
FVars: TJSElementNodes;
|
|
Public
|
|
Public
|
|
- Constructor Create(ALine,ARow : Integer; const ASource : String = ''); override;
|
|
|
|
|
|
+ Constructor Create(ALine,AColumn : Integer; const ASource : String = ''); override;
|
|
Destructor Destroy; override;
|
|
Destructor Destroy; override;
|
|
Property Vars : TJSElementNodes Read FVars;
|
|
Property Vars : TJSElementNodes Read FVars;
|
|
Property Functions : TJSElementNodes Read FFunctions;
|
|
Property Functions : TJSElementNodes Read FFunctions;
|
|
@@ -1503,10 +1503,10 @@ end;
|
|
|
|
|
|
{ TJSElement }
|
|
{ TJSElement }
|
|
|
|
|
|
-constructor TJSElement.Create(ALine, ARow: Integer; const ASource: String);
|
|
|
|
|
|
+constructor TJSElement.Create(ALine, AColumn: Integer; const ASource: String);
|
|
begin
|
|
begin
|
|
FLine:=ALine;
|
|
FLine:=ALine;
|
|
- FRow:=ARow;
|
|
|
|
|
|
+ FColumn:=AColumn;
|
|
FSource:=ASource;
|
|
FSource:=ASource;
|
|
end;
|
|
end;
|
|
|
|
|
|
@@ -1523,10 +1523,10 @@ begin
|
|
FArgv[AIndex]:=Avalue;
|
|
FArgv[AIndex]:=Avalue;
|
|
end;
|
|
end;
|
|
|
|
|
|
-constructor TJSRegularExpressionLiteral.Create(ALine, ARow: Integer;
|
|
|
|
|
|
+constructor TJSRegularExpressionLiteral.Create(ALine, AColumn: Integer;
|
|
const ASource: String);
|
|
const ASource: String);
|
|
begin
|
|
begin
|
|
- inherited Create(ALine, ARow, ASource);
|
|
|
|
|
|
+ inherited Create(ALine, AColumn, ASource);
|
|
FPattern:=TJSValue.Create;
|
|
FPattern:=TJSValue.Create;
|
|
FPatternFlags:=TJSValue.Create;
|
|
FPatternFlags:=TJSValue.Create;
|
|
end;
|
|
end;
|
|
@@ -1552,9 +1552,9 @@ end;
|
|
|
|
|
|
{ TJSArrayLiteral }
|
|
{ TJSArrayLiteral }
|
|
|
|
|
|
-constructor TJSArrayLiteral.Create(ALine, ARow: Integer; const ASource: String);
|
|
|
|
|
|
+constructor TJSArrayLiteral.Create(ALine, AColumn: Integer; const ASource: String);
|
|
begin
|
|
begin
|
|
- inherited Create(ALine, ARow, ASource);
|
|
|
|
|
|
+ inherited Create(ALine, AColumn, ASource);
|
|
FElements:=TJSArrayLiteralElements.Create(TJSArrayLiteralElement);
|
|
FElements:=TJSArrayLiteralElements.Create(TJSArrayLiteralElement);
|
|
end;
|
|
end;
|
|
|
|
|
|
@@ -1585,9 +1585,9 @@ end;
|
|
|
|
|
|
{ TJSObjectLiteral }
|
|
{ TJSObjectLiteral }
|
|
|
|
|
|
-constructor TJSObjectLiteral.Create(ALine, ARow: Integer; const ASource: String = '');
|
|
|
|
|
|
+constructor TJSObjectLiteral.Create(ALine, AColumn: Integer; const ASource: String = '');
|
|
begin
|
|
begin
|
|
- inherited Create(ALine, ARow, ASource);
|
|
|
|
|
|
+ inherited Create(ALine, AColumn, ASource);
|
|
FElements:=TJSObjectLiteralElements.Create(TJSObjectLiteralElement);
|
|
FElements:=TJSObjectLiteralElements.Create(TJSObjectLiteralElement);
|
|
end;
|
|
end;
|
|
|
|
|
|
@@ -1814,9 +1814,9 @@ end;
|
|
|
|
|
|
{ TJSSwitch }
|
|
{ TJSSwitch }
|
|
|
|
|
|
-constructor TJSSwitchStatement.Create(ALine, ARow: Integer; const ASource: String);
|
|
|
|
|
|
+constructor TJSSwitchStatement.Create(ALine, AColumn: Integer; const ASource: String);
|
|
begin
|
|
begin
|
|
- inherited Create(ALine, ARow, ASource);
|
|
|
|
|
|
+ inherited Create(ALine, AColumn, ASource);
|
|
FCases:=TJSCaseElements.Create(TJSCaseElement);
|
|
FCases:=TJSCaseElements.Create(TJSCaseElement);
|
|
end;
|
|
end;
|
|
|
|
|
|
@@ -1852,10 +1852,10 @@ end;
|
|
|
|
|
|
{ TJSSourceElements }
|
|
{ TJSSourceElements }
|
|
|
|
|
|
-constructor TJSSourceElements.Create(ALine, ARow: Integer; const ASource: String
|
|
|
|
|
|
+constructor TJSSourceElements.Create(ALine, AColumn: Integer; const ASource: String
|
|
);
|
|
);
|
|
begin
|
|
begin
|
|
- inherited Create(ALine, ARow, ASource);
|
|
|
|
|
|
+ inherited Create(ALine, AColumn, ASource);
|
|
FStatements:=TJSElementNodes.Create(TJSElementNode);
|
|
FStatements:=TJSElementNodes.Create(TJSElementNode);
|
|
FFunctions:=TJSElementNodes.Create(TJSElementNode);
|
|
FFunctions:=TJSElementNodes.Create(TJSElementNode);
|
|
FVars:=TJSElementNodes.Create(TJSElementNode);
|
|
FVars:=TJSElementNodes.Create(TJSElementNode);
|
|
@@ -1934,10 +1934,10 @@ end;
|
|
|
|
|
|
{ TJSLiteral }
|
|
{ TJSLiteral }
|
|
|
|
|
|
-constructor TJSLiteral.Create(ALine, ARow: Integer; const ASource: String);
|
|
|
|
|
|
+constructor TJSLiteral.Create(ALine, AColumn: Integer; const ASource: String);
|
|
begin
|
|
begin
|
|
FValue:=TJSValue.Create;
|
|
FValue:=TJSValue.Create;
|
|
- inherited Create(ALine, ARow, ASource);
|
|
|
|
|
|
+ inherited Create(ALine, AColumn, ASource);
|
|
end;
|
|
end;
|
|
|
|
|
|
destructor TJSLiteral.Destroy;
|
|
destructor TJSLiteral.Destroy;
|