ilusha/lalr
1
0
Fork 0
mirror of https://github.com/cwbaker/lalr.git synced 2026-09-26 16:33:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Report errors for unterminated regular expressions

Browse source
This commit is contained in:
Charles Baker 2023-07-16 15:03:35 +12:00
parent b2224991c9
commit 638de559ca
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lalr/GrammarParser.cpp
View file

@ -234,6 +234,7 @@ bool GrammarParser::match_literal()
escaped = false;
}
}
if ( position == end_ || !is_new_line(position) )
{
lexeme_.assign( position_, position );
@ -245,6 +246,7 @@ bool GrammarParser::match_literal()
}
return true;
}
error( LALR_ERROR_UNTERMINATED_LITERAL, "unterminated literal" );
position_ = position;
return false;
@ -259,24 +261,32 @@ bool GrammarParser::match_regex()
{
bool escaped = false;
const char* position = position_;
while ( position != end_ && (*position != '"' || escaped) )
while ( position != end_ && (*position != '"' || escaped) && !is_new_line(position) )
{
escaped = *position == '\\';
++position;
if (*position == '\\' && escaped)
if ( *position == '\\' && escaped )
{
++position;
escaped = false;
}
}
lexeme_.assign( position_, position );
position_ = position;
expect( "\"" );
if ( lexeme_.empty() )
if ( position == end_ || !is_new_line(position) )
{
error( LALR_ERROR_EMPTY_LITERAL, "empty regex" );
lexeme_.assign( position_, position );
position_ = position;
expect( "\"" );
if ( lexeme_.empty() )
{
error( LALR_ERROR_EMPTY_LITERAL, "empty regex" );
}
return true;
}
return true;
error( LALR_ERROR_UNTERMINATED_LITERAL, "unterminated regex" );
position_ = position;
return false;
}
return false;
}