paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 15:49:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: fixed lfm parser TokenStart

Browse Source 
git-svn-id: trunk@16141 -
This commit is contained in:
mattias 2008-08-19 11:11:22 +00:00
parent 23cd07a771
commit c6872df774
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/codetools/lfmtrees.pas
View File

@ -567,6 +567,9 @@ end;
function TLFMTree.NextToken: Char;
begin
TokenStart:=Parser.SourcePos+1;
while (TokenStart<=LFMBuffer.SourceLength)
and (LFMBuffer.Source[TokenStart] in [' ',#9,#10,#13]) do
inc(TokenStart);
Result:=Parser.NextToken;
end;
@ -709,13 +712,13 @@ begin
if PropertyNode=nil then ;
// Get name of property
Parser.CheckToken(toSymbol);
PropertyNode.Add(Parser.TokenString,Parser.SourcePos+1);
PropertyNode.Add(Parser.TokenString,TokenStart);
while True do begin
NextToken;
if Parser.Token <> '.' then break;
NextToken;
Parser.CheckToken(toSymbol);
PropertyNode.Add(Parser.TokenString,Parser.SourcePos+1);
PropertyNode.Add(Parser.TokenString,TokenStart);
end;
Parser.CheckToken('=');
NextToken;
@ -744,7 +747,7 @@ begin
ObjectStartLine:=Parser.SourceLine;
ObjectNode.Name := '';
ObjectNode.TypeName := Parser.TokenString;
ObjectNode.TypeNamePosition:=Parser.SourcePos+1;
ObjectNode.TypeNamePosition:=TokenStart;
ObjectNode.ChildPos := -1;
NextToken;
if Parser.Token = ':' then begin
@ -753,7 +756,7 @@ begin
ObjectNode.Name := ObjectNode.TypeName;
ObjectNode.NamePosition:=ObjectNode.TypeNamePosition;
ObjectNode.TypeName := Parser.TokenString;
ObjectNode.TypeNamePosition:=Parser.SourcePos+1;
ObjectNode.TypeNamePosition:=TokenStart;
NextToken;
if parser.Token = '[' then begin
NextToken;

6
designer/changeclassdialog.pas
View File

@ -175,9 +175,9 @@ var
end;
ComponentStream.Position:=0;
LFMBuffer.LoadFromStream(ComponentStream);
debugln('ChangePersistentClass-Before-Checking--------------------------------------------');
debugln(LFMBuffer.Source);
debugln('ChangePersistentClass-Before-Checking-------------------------------------------');
//debugln('ChangePersistentClass-Before-Checking--------------------------------------------');
//debugln(LFMBuffer.Source);
//debugln('ChangePersistentClass-Before-Checking-------------------------------------------');
if not CodeToolBoss.CheckLFM(UnitCode,LFMBuffer,LFMTree,false,false) then
begin
debugln('ChangePersistentClass-Before--------------------------------------------');