Skip to content

Commit 2124e3c

Browse files
GillesDuvertGiloo
andauthored
Prompted by issue #1972 (closes #1792 and close #830) (#1984)
Co-authored-by: Giloo <gildas@localhost>
1 parent 0ae3939 commit 2124e3c

File tree

7 files changed

+495
-238
lines changed

7 files changed

+495
-238
lines changed

src/FMTLexer.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -371,11 +371,11 @@ void FMTLexer::mSTRING(bool _createToken) {
371371
}
372372
}
373373
else {
374-
goto _loop59;
374+
goto _loop61;
375375
}
376376

377377
}
378-
_loop59:;
378+
_loop61:;
379379
} // ( ... )*
380380
_saveIndex = text.length();
381381
match('\"' /* charlit */ );
@@ -401,11 +401,11 @@ void FMTLexer::mSTRING(bool _createToken) {
401401
}
402402
}
403403
else {
404-
goto _loop62;
404+
goto _loop64;
405405
}
406406

407407
}
408-
_loop62:;
408+
_loop64:;
409409
} // ( ... )*
410410
_saveIndex = text.length();
411411
match('\'' /* charlit */ );
@@ -1552,18 +1552,18 @@ void FMTLexer::mWHITESPACE(bool _createToken) {
15521552
std::string::size_type _saveIndex;
15531553

15541554
{ // ( ... )+
1555-
int _cnt158=0;
1555+
int _cnt160=0;
15561556
for (;;) {
15571557
if ((LA(1) == 0x9 /* '\t' */ || LA(1) == 0x20 /* ' ' */ )) {
15581558
mW(false);
15591559
}
15601560
else {
1561-
if ( _cnt158>=1 ) { goto _loop158; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
1561+
if ( _cnt160>=1 ) { goto _loop160; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
15621562
}
15631563

1564-
_cnt158++;
1564+
_cnt160++;
15651565
}
1566-
_loop158:;
1566+
_loop160:;
15671567
} // ( ... )+
15681568
_ttype=antlr::Token::SKIP;
15691569
if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
@@ -1580,18 +1580,18 @@ void FMTLexer::mDIGITS(bool _createToken) {
15801580
std::string::size_type _saveIndex;
15811581

15821582
{ // ( ... )+
1583-
int _cnt161=0;
1583+
int _cnt163=0;
15841584
for (;;) {
15851585
if (((LA(1) >= 0x30 /* '0' */ && LA(1) <= 0x39 /* '9' */ ))) {
15861586
matchRange('0','9');
15871587
}
15881588
else {
1589-
if ( _cnt161>=1 ) { goto _loop161; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
1589+
if ( _cnt163>=1 ) { goto _loop163; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
15901590
}
15911591

1592-
_cnt161++;
1592+
_cnt163++;
15931593
}
1594-
_loop161:;
1594+
_loop163:;
15951595
} // ( ... )+
15961596
if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
15971597
_token = makeToken(_ttype);
@@ -1643,7 +1643,7 @@ void FMTLexer::mNUMBER(bool _createToken) {
16431643
mH(false);
16441644
text.erase(_saveIndex);
16451645
{ // ( ... )+
1646-
int _cnt168=0;
1646+
int _cnt170=0;
16471647
for (;;) {
16481648
// init action gets executed even in guessing mode
16491649
if( i == n )
@@ -1654,12 +1654,12 @@ void FMTLexer::mNUMBER(bool _createToken) {
16541654
mCHAR(false);
16551655
}
16561656
else {
1657-
if ( _cnt168>=1 ) { goto _loop168; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
1657+
if ( _cnt170>=1 ) { goto _loop170; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
16581658
}
16591659

1660-
_cnt168++;
1660+
_cnt170++;
16611661
}
1662-
_loop168:;
1662+
_loop170:;
16631663
} // ( ... )+
16641664
}
16651665
else {

0 commit comments

Comments
 (0)