paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 22:00:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial-eps: Fixes running some EPS files

Browse Source 
git-svn-id: trunk@42143 -
This commit is contained in:
sekelsenmat 2013-07-20 04:57:04 +00:00
parent cf3dbb353e
commit e5edeb10ad
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/fpvectorial/epsvectorialreader.pas
View File

@ -80,13 +80,15 @@ type
end;
TETType = (ettNamedElement, ettOperand, ettOperator, ettDictionary,
ettVirtualMemorySnapshot, ettLiteralString, ettRawData);
ettVirtualMemorySnapshot, ettLiteralString, ettRawData, ettInvalid);
{ TExpressionToken }
TExpressionToken = class(TPSToken)
public
ETType: TETType;
SubstituteETType: TETType; // utilized when the token is substituted
constructor Create; override;
function IsExpressionOperand: Boolean;
procedure PrepareFloatValue;
procedure CopyDataFrom(ASrc: TPSToken; AKeepTokenType: Boolean); override;
@ -336,6 +338,12 @@ end;
{ TExpressionToken }
constructor TExpressionToken.Create;
begin
inherited Create;
SubstituteETType := ettInvalid;
end;
function TExpressionToken.IsExpressionOperand: Boolean;
begin
if StrValue = '' then Exit(False);
@ -381,6 +389,7 @@ begin
inherited CopyDataFrom(ASrc, AKeepTokenType);
if (ASrc is TExpressionToken) and (not AKeepTokenType) then
ETType := TExpressionToken(ASrc).ETType;
SubstituteETType := TExpressionToken(ASrc).ETType;
end;
function TExpressionToken.Duplicate: TPSToken;
@ -978,7 +987,12 @@ procedure TvEPSVectorialReader.ExecuteOperatorToken(AToken: TExpressionToken;
var
Param1, Param2: TPSToken;
begin
if AToken.StrValue = '' then raise Exception.Create(Format('[TvEPSVectorialReader.ProcessExpressionToken] Empty operator line=%d', [AToken.Line]));
if AToken.StrValue = '' then
begin
// A clean exit if the token was substituted by something else which cannot be executed
if AToken.SubstituteETType <> ettInvalid then Exit;
raise Exception.Create(Format('[TvEPSVectorialReader.ProcessExpressionToken] Empty operator line=%d', [AToken.Line]));
end;
if ExecuteDictionaryOperators(AToken, AData, ADoc) then Exit;