paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-01-06 16:50:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

xpath.pp: replaced TXPathScanner.SaveState/RestoreState by PeekToken().

Browse Source 
git-svn-id: trunk@13120 -
This commit is contained in:
sergei 2009-05-09 19:55:38 +00:00
parent 53ad1bcabe
commit f3e64cf8ce
1 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
packages/fcl-xml/src/xpath.pp
View File

@ -343,13 +343,6 @@ type
{ XPath lexical scanner }
TXPathScannerState = class
private
FCurData: DOMPChar;
FCurToken: TXPathToken;
FCurTokenString: DOMString;
end;
TXPathScanner = class
private
FExpressionString, FCurData: DOMPChar;
@ -370,11 +363,11 @@ type
function ParseAdditiveExpr: TXPathExprNode; // [25]
function ParseMultiplicativeExpr: TXPathExprNode; // [26]
function ParseUnaryExpr: TXPathExprNode; // [27]
function GetToken: TXPathToken;
public
constructor Create(const AExpressionString: DOMString);
function NextToken: TXPathToken;
function SaveState: TXPathScannerState;
procedure RestoreState(AState: TXPathScannerState);
function PeekToken: TXPathToken;
property CurToken: TXPathToken read FCurToken;
property CurTokenString: DOMString read FCurTokenString;
end;
@ -1537,7 +1530,24 @@ begin
NextToken;
end;
function TXPathScanner.PeekToken: TXPathToken;
var
save: DOMPChar;
begin
save := FCurData;
Result := GetToken;
FCurData := save;
end;
function TXPathScanner.NextToken: TXPathToken;
begin
Result := GetToken;
FCurToken := Result;
if Result in [tkIdentifier, tkNumber, tkString] then
SetString(FCurTokenString, FTokenStart, FTokenLength);
end;
function TXPathScanner.GetToken: TXPathToken;
procedure GetNumber(HasDot: Boolean);
begin
@ -1690,26 +1700,6 @@ begin
// We have processed at least one character now; eat it:
if Result <> tkEndOfStream then
Inc(FCurData);
FCurToken := Result;
if Result in [tkIdentifier, tkNumber, tkString] then
SetString(FCurTokenString, FTokenStart, FTokenLength);
end;
function TXPathScanner.SaveState: TXPathScannerState;
begin
Result := TXPathScannerState.Create;
Result.FCurData := FCurData;
Result.FCurToken := FCurToken;
Result.FCurTokenString := FCurTokenString;
end;
procedure TXPathScanner.RestoreState(AState: TXPathScannerState);
begin
FCurData := AState.FCurData;
FCurToken := AState.FCurToken;
FCurTokenString := AState.FCurTokenString;
AState.Free;
end;
procedure TXPathScanner.Error(const Msg: String);
@ -1932,7 +1922,6 @@ end;
function TXPathScanner.ParsePathExpr: TXPathExprNode; // [19]
var
ScannerState: TXPathScannerState;
IsFunctionCall: Boolean;
CurStep, NextStep: TStep;
begin
@ -1942,13 +1931,9 @@ begin
(CurTokenString <> 'comment') and
(CurTokenString <> 'text') and
(CurTokenString <> 'processing-instruction') and
(CurTokenString <> 'node') then
begin
ScannerState := SaveState;
if NextToken = tkLeftBracket then
(CurTokenString <> 'node') and
(PeekToken = tkLeftBracket) then
IsFunctionCall := True;
RestoreState(ScannerState);
end;
Result := nil;
CurStep := nil;