JBontes
commented
8 years ago Proposal:
procedure TmwBasePasLex.SlashProc;
var
BeginRun: Integer;
CommentText: string;
begin
case FBuffer.Buf[FBuffer.Run + 1] of
'/':
begin
if FBuffer.Buf[FBuffer.Run + 2] = '/' then begin
Inc(FBuffer.Run, 3);
BeginRun := FBuffer.Run;
FTokenID := ptXMLComment;
end
else begin
Inc(FBuffer.Run, 2);
BeginRun := FBuffer.Run;
FTokenID := ptSlashesComment;
end;
while FBuffer.Buf[FBuffer.Run] <> #0 do
begin
case FBuffer.Buf[FBuffer.Run] of
#10, #13: Break;
end;
Inc(FBuffer.Run);
end;
if Assigned(FOnComment) then
begin
SetString(CommentText, PChar(@FBuffer.Buf[BeginRun]), FBuffer.Run - BeginRun);
FOnComment(Self, CommentText);
end;
end;
else
begin
Inc(FBuffer.Run);
FTokenID := ptSlash;
end;
end;
end;
...
ntWrite,
ntXMLComment,
ntAnsiComment,
ntBorComment,
ntSlashesComment
);
....
procedure TPasSyntaxTreeBuilder.DoOnComment(Sender: TObject; const Text: string);
var
Node: TCommentNode;
begin
case TokenID of
ptAnsiComment: Node := TCommentNode.Create(ntAnsiComment);
ptBorComment: Node := TCommentNode.Create(ntAnsiComment);
ptSlashesComment: Node := TCommentNode.Create(ntSlashesComment);
ptXMLComment: Node := TCommentNode.Create(ntXMLComment);
else
raise EParserException.Create(Lexer.PosXY.Y, Lexer.PosXY.X, Lexer.FileName, 'Invalid comment type');
end;
Node.Col := Lexer.PosXY.X;
Node.Line := Lexer.PosXY.Y;
Node.FileName := Lexer.FileName;
Node.Text := Text;
FComments.Add(Node);
end;
...
ntWrite,
ntXMLComment,
ntAnsiComment,
ntBorComment,
ntSlashesComment
);
....
'write',
'xmlcomment',
'ansicomment',
'borlandcomment',
'slashescomment'
);
...
procedure TmwSimplePasPar.SkipXMLComment;
begin
Expected(ptXMLComment);
end;
...
procedure TmwSimplePasPar.SkipJunk;
begin
if Lexer.IsJunk then
begin
case TokenID of
ptAnsiComment:
begin
SkipAnsiComment;
end;
ptBorComment:
begin
SkipBorComment;
end;
ptSlashesComment:
begin
SkipSlashesComment;
end;
ptXMLComment:
begin
SkipXMLComment;
end;
ptSpace:
begin
SkipSpace;
end;
ptCRLFCo:
begin
SkipCRLFco;
end;
ptCRLF:
begin
SkipCRLF;
end;
ptSquareOpen:
begin
CustomAttribute;
end;
else
begin
Lexer.Next;
end;
end;
end;
FLastNoJunkPos := Lexer.TokenPos;
FLastNoJunkLen := Lexer.TokenLen;
end;
...
function IsTokenIDJunk(const aTokenID: TptTokenKind): Boolean;
begin
Result := aTokenID in [
ptAnsiComment,
ptBorComment,
ptCRLF,
ptCRLFCo,
ptSlashesComment,
ptXMLComment,
ptSpace,
ptIfDirect,
ptElseDirect,
ptIfEndDirect,
ptElseIfDirect,
ptIfDefDirect,
ptIfNDefDirect,
ptEndIfDirect,
ptIfOptDirect,
ptDefineDirect,
ptUndefDirect];
end;Tested using the following code:
unit RepeatWhile;
//comment
interface
implementation
procedure DoWhile;
begin
while true do begin
break;
end;
while false do DoWhile;
end;
///comment
procedure DoRepeat;
begin
repeat
break;
until false;
repeat until true;
end;
end.
NickRing
vintagedave
RomanYankovsky
XML comments could (at some future point) be parsed. Perhaps it's a good idea to have them labelled as XMLdoc comments separately.
http://docwiki.embarcadero.com/RADStudio/Berlin/en/XML_Documentation_Comments
See the proposed code changes in the follow-up post.