Skip to content

Commit 3e6e2dc

Browse files
author
Dimitri van Heesch
committed
Merge pull request doxygen#448 from albert-github/feature/bug_761139
Bug 761139 - python unicode docstrings are ignored
2 parents 5072006 + be100f8 commit 3e6e2dc

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/pyscanner.l

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ static void initTriDoubleQuoteBlock()
368368
docBlockContext = YY_START;
369369
docBlockInBody = FALSE;
370370
docBlockJavaStyle = TRUE;
371-
docBlockSpecial = yytext[3]=='!';
371+
docBlockSpecial = yytext[strlen(yytext) - 1]=='!';
372372
docBlock.resize(0);
373373
g_doubleQuote = TRUE;
374374
startCommentBlock(FALSE);
@@ -379,7 +379,7 @@ static void initTriSingleQuoteBlock()
379379
docBlockContext = YY_START;
380380
docBlockInBody = FALSE;
381381
docBlockJavaStyle = TRUE;
382-
docBlockSpecial = yytext[3]=='!';
382+
docBlockSpecial = yytext[strlen(yytext) - 1]=='!';
383383
docBlock.resize(0);
384384
g_doubleQuote = FALSE;
385385
startCommentBlock(FALSE);
@@ -470,8 +470,10 @@ IDENTIFIER ({LETTER}|"_")({LETTER}|{DIGIT}|"_")*
470470
SCOPE {IDENTIFIER}("."{IDENTIFIER})*
471471
BORDER ([^A-Za-z0-9])
472472

473-
TRISINGLEQUOTE "'''"(!)?
474-
TRIDOUBLEQUOTE "\"\"\""(!)?
473+
TRISINGLEQUOTE {STRINGPREFIX}?"'''"(!)?
474+
TRIDOUBLEQUOTE {STRINGPREFIX}?"\"\"\""(!)?
475+
ENDTRISINGLEQUOTE "'''"
476+
ENDTRIDOUBLEQUOTE "\"\"\""
475477
LONGSTRINGCHAR [^\\"']
476478
ESCAPESEQ ("\\")(.)
477479
LONGSTRINGITEM ({LONGSTRINGCHAR}|{ESCAPESEQ})
@@ -1369,8 +1371,8 @@ STARTDOCSYMS "##"
13691371
}
13701372

13711373
<TripleComment>{
1372-
{TRIDOUBLEQUOTE} |
1373-
{TRISINGLEQUOTE} {
1374+
{ENDTRIDOUBLEQUOTE} |
1375+
{ENDTRISINGLEQUOTE} {
13741376
// printf("Expected module block %d special=%d\n",g_expectModuleDocs,g_specialBlock);
13751377
if (g_doubleQuote==(yytext[0]=='"'))
13761378
{
@@ -1515,8 +1517,8 @@ STARTDOCSYMS "##"
15151517
}
15161518

15171519
<TripleString>{
1518-
{TRIDOUBLEQUOTE} |
1519-
{TRISINGLEQUOTE} {
1520+
{ENDTRIDOUBLEQUOTE} |
1521+
{ENDTRISINGLEQUOTE} {
15201522
*g_copyString += yytext;
15211523
if (g_doubleQuote==(yytext[0]=='"'))
15221524
{

0 commit comments

Comments
 (0)