Skip to content

Commit dfb2819

Browse files
Chi-IrohChi-Iroh
authored
Fixed ObjectPascal comment issue (#1097)
Fixes #1042.
1 parent 908d2a3 commit dfb2819

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

‎lexers/embedded/objectpascal.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,9 @@
3131
<rule pattern="\{[$].*?\}|\{[-](NOD|EXT|OBJ).*?\}|\([*][$].*?[*]\)">
3232
<token type="CommentPreproc" />
3333
</rule>
34-
<!-- Comment Single -->
35-
<rule pattern="(//.*?)(\n)">
36-
<bygroups>
37-
<token type="CommentSingle" />
38-
<token type="TextWhitespace" />
39-
</bygroups>
34+
<!-- Comment -->
35+
<rule pattern="//.*">
36+
<token type="CommentSingle" />
4037
</rule>
4138
<!-- Comment Multiline Block -->
4239
<rule pattern="\([*](.|\n)*?[*]\)">

‎lexers/testdata/objectpascal.expected‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,7 @@
314314
{"type":"Text","value":"\n"},
315315
{"type":"TextWhitespace","value":" "},
316316
{"type":"CommentSingle","value":"// Comment Single"},
317-
{"type":"TextWhitespace","value":"\n"},
318-
{"type":"Text","value":"\n"},
317+
{"type":"Text","value":"\n\n"},
319318
{"type":"KeywordReserved","value":"const"},
320319
{"type":"Text","value":"\n"},
321320
{"type":"TextWhitespace","value":" "},
@@ -412,8 +411,7 @@
412411
{"type":"CommentPreproc","value":"(*$hints off*)"},
413412
{"type":"TextWhitespace","value":" "},
414413
{"type":"CommentSingle","value":"// another valid compiler directive"},
415-
{"type":"TextWhitespace","value":"\n"},
416-
{"type":"Text","value":"\n"},
414+
{"type":"Text","value":"\n\n"},
417415
{"type":"KeywordReserved","value":"const"},
418416
{"type":"Text","value":"\n"},
419417
{"type":"TextWhitespace","value":" "},
@@ -896,15 +894,17 @@
896894
{"type":"Punctuation","value":";"},
897895
{"type":"TextWhitespace","value":" "},
898896
{"type":"CommentSingle","value":"// deprecated"},
899-
{"type":"TextWhitespace","value":"\n "},
897+
{"type":"Text","value":"\n"},
898+
{"type":"TextWhitespace","value":" "},
900899
{"type":"Text","value":"LTDoubleRec"},
901900
{"type":"Operator","value":":"},
902901
{"type":"TextWhitespace","value":" "},
903902
{"type":"KeywordType","value":"TDoubleRec"},
904903
{"type":"Punctuation","value":";"},
905904
{"type":"TextWhitespace","value":" "},
906905
{"type":"CommentSingle","value":"// deprecated"},
907-
{"type":"TextWhitespace","value":"\n "},
906+
{"type":"Text","value":"\n"},
907+
{"type":"TextWhitespace","value":" "},
908908
{"type":"Text","value":"LTExtended80Rec"},
909909
{"type":"Operator","value":":"},
910910
{"type":"TextWhitespace","value":" "},
@@ -1521,7 +1521,7 @@
15211521
{"type":"Punctuation","value":";"},
15221522
{"type":"TextWhitespace","value":" "},
15231523
{"type":"CommentSingle","value":"// ???"},
1524-
{"type":"TextWhitespace","value":"\n"},
1524+
{"type":"Text","value":"\n"},
15251525
{"type":"KeywordReserved","value":"end"},
15261526
{"type":"Punctuation","value":";"},
15271527
{"type":"Text","value":"\n\n"},
@@ -1541,7 +1541,7 @@
15411541
{"type":"Punctuation","value":";"},
15421542
{"type":"TextWhitespace","value":" "},
15431543
{"type":"CommentSingle","value":"// this is hurting"},
1544-
{"type":"TextWhitespace","value":"\n"},
1544+
{"type":"Text","value":"\n"},
15451545
{"type":"KeywordReserved","value":"var"},
15461546
{"type":"Text","value":"\n"},
15471547
{"type":"TextWhitespace","value":" "},
@@ -1946,7 +1946,8 @@
19461946
{"type":"Text","value":"eax"},
19471947
{"type":"TextWhitespace","value":" "},
19481948
{"type":"CommentSingle","value":"// fpc"},
1949-
{"type":"TextWhitespace","value":"\n "},
1949+
{"type":"Text","value":"\n"},
1950+
{"type":"TextWhitespace","value":" "},
19501951
{"type":"Text","value":"mov"},
19511952
{"type":"TextWhitespace","value":" "},
19521953
{"type":"Operator","value":"%"},
@@ -1959,7 +1960,8 @@
19591960
{"type":"Text","value":"edx"},
19601961
{"type":"TextWhitespace","value":" "},
19611962
{"type":"CommentSingle","value":"// fpc"},
1962-
{"type":"TextWhitespace","value":"\n "},
1963+
{"type":"Text","value":"\n"},
1964+
{"type":"TextWhitespace","value":" "},
19631965
{"type":"Text","value":"mov"},
19641966
{"type":"TextWhitespace","value":" "},
19651967
{"type":"LiteralNumberHex","value":"$0x1000000"},
@@ -1968,7 +1970,8 @@
19681970
{"type":"Text","value":"eax"},
19691971
{"type":"TextWhitespace","value":" "},
19701972
{"type":"CommentSingle","value":"// fpc assembler"},
1971-
{"type":"TextWhitespace","value":"\n "},
1973+
{"type":"Text","value":"\n"},
1974+
{"type":"TextWhitespace","value":" "},
19721975
{"type":"Text","value":"DB"},
19731976
{"type":"TextWhitespace","value":" "},
19741977
{"type":"LiteralString","value":"'a string...'"},
@@ -2388,7 +2391,7 @@
23882391
{"type":"Text","value":"\n"},
23892392
{"type":"TextWhitespace","value":" "},
23902393
{"type":"CommentSingle","value":"// DoIt"},
2391-
{"type":"TextWhitespace","value":"\n"},
2394+
{"type":"Text","value":"\n"},
23922395
{"type":"KeywordReserved","value":"end"},
23932396
{"type":"Punctuation","value":";"},
23942397
{"type":"Text","value":"\n\n"},
@@ -2433,13 +2436,11 @@
24332436
{"type":"KeywordReserved","value":"initialization"},
24342437
{"type":"Text","value":"\n\n"},
24352438
{"type":"CommentSingle","value":"// Unit initialization code..."},
2436-
{"type":"TextWhitespace","value":"\n"},
2437-
{"type":"Text","value":"\n"},
2439+
{"type":"Text","value":"\n\n"},
24382440
{"type":"KeywordReserved","value":"finalization"},
24392441
{"type":"Text","value":"\n\n"},
24402442
{"type":"CommentSingle","value":"// Unit finalization code..."},
2441-
{"type":"TextWhitespace","value":"\n"},
2442-
{"type":"Text","value":"\n"},
2443+
{"type":"Text","value":"\n\n"},
24432444
{"type":"KeywordReserved","value":"end"},
24442445
{"type":"Punctuation","value":"."}
24452446
]

0 commit comments

Comments
 (0)