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

fpvectorial: Adds support for literal strings in expressions and arrays

Browse Source 
git-svn-id: trunk@39538 -
This commit is contained in:
sekelsenmat 2012-12-14 13:28:33 +00:00
parent bc75803dc7
commit 8ec4f4bd8c
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/fpvectorial/epsvectorialreader.pas
View File

@ -79,7 +79,7 @@ type
end;
TETType = (ettNamedElement, ettOperand, ettOperator, ettDictionary,
ettVirtualMemorySnapshot);
ettVirtualMemorySnapshot, ettLiteralString);
{ TExpressionToken }
@ -358,7 +358,7 @@ begin
else
// Code for normal numbers, decimals
begin
FloatValue := StrToFloat(StrValue, FPointSeparator);
FloatValue := 0;
end;
end;
@ -406,6 +406,7 @@ var
DictionaryToken: TDictionaryToken;
Len: Integer;
lScannerStateReturn: TPostScriptScannerState = ssSearchingToken;
lCommentStateReturn: TPostScriptScannerState = ssSearchingToken;
lIsEndOfLine: Boolean;
begin
// Check if the EPS file starts with a TIFF preview
@ -445,6 +446,7 @@ begin
CommentToken.Line := CurLine;
CommentToken.StrValue := '%';
State := ssInComment;
lCommentStateReturn := ssSearchingToken;
// {$ifdef FPVECTORIALDEBUG}
// WriteLn(Format('Starting Comment at Line %d', [CurLine]));
// {$endif}
@ -459,7 +461,7 @@ begin
else if CurChar = '[' then
begin
ArrayToken := TArrayToken.Create;
lScannerStateReturn:= ssInArray;
lScannerStateReturn := ssInArray;
State := ssInArray;
end
else if CurChar = '<' then
@ -469,7 +471,7 @@ begin
begin
DictionaryToken := TDictionaryToken.Create;
State := ssInDictionary;
lScannerStateReturn:= ssInDictionary;
lScannerStateReturn := ssInDictionary;
end
else
raise Exception.Create(Format('[TPSTokenizer.ReadFromStream] Unexpected char while searching for "<<" token: $%s in Line %d',
@ -482,6 +484,8 @@ begin
ExpressionToken.StrValue := '';
if CurChar = '/' then
ExpressionToken.ETType := ettNamedElement
else if CurChar = '(' then
ExpressionToken.ETType := ettLiteralString
else
begin
ExpressionToken.StrValue := CurChar;
@ -506,7 +510,7 @@ begin
if lIsEndOfLine then
begin
Tokens.Add(CommentToken);
State := ssSearchingToken;
State := lCommentStateReturn;
// {$ifdef FPVECTORIALDEBUG}
// WriteLn(Format('Adding Comment "%s" at Line %d', [CommentToken.StrValue, CurLine]));
// {$endif}
@ -516,7 +520,16 @@ begin
// Starts at [ and ends in ]
ssInArray:
begin
if (CurChar = '[') then
if CurChar = '%' then
begin
CommentToken := TCommentToken.Create;
CommentToken.Line := CurLine;
CommentToken.StrValue := '%';
State := ssInComment;
lCommentStateReturn := ssInArray;
end
// Another array inside the array
else if (CurChar = '[') then
begin
// We are starting another array, so save the parent and go to the new one
NewArrayToken := TArrayToken.Create;
@ -538,7 +551,7 @@ begin
ArrayToken := ArrayToken.Parent;
end;
end
else if CurChar in ['a'..'z','A'..'Z','0'..'9','-','/'] then
else if CurChar in ['a'..'z','A'..'Z','0'..'9','-','/','('] then
begin
ExpressionToken := TExpressionToken.Create;
ExpressionToken.Line := CurLine;