Mercurial > octave-nkf
diff libinterp/parse-tree/lex.ll @ 18438:e76d50d65278
maint: Periodic merge of gui-release to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 08 Feb 2014 13:35:00 -0800 |
| parents | fc0ce9eb9d82 888cd8f62c67 |
| children | b2a2f097c5e0 |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.ll Thu Feb 06 18:05:09 2014 -0800 +++ b/libinterp/parse-tree/lex.ll Sat Feb 08 13:35:00 2014 -0800 @@ -906,9 +906,8 @@ curr_lexer->string_text += '\v'; } -<DQ_STRING_START>(\.\.\.){S}*{NL} | -<DQ_STRING_START>(\.\.\.){S}*{CCHAR}{ANY_EXCEPT_NL}*{NL} { - curr_lexer->lexer_debug ("<DQ_STRING_START>(\\.\\.\\.){S}*{NL}|<DQ_STRING_START>(\\.\\.\\.){S}*{CCHAR}{ANY_EXCEPT_NL}*{NL}"); +<DQ_STRING_START>(\.\.\.){S}*{NL} { + curr_lexer->lexer_debug ("<DQ_STRING_START>(\\.\\.\\.){S}*{NL}"); static const char *msg = "'...' continuations in double-quoted character strings are obsolete and will not be allowed in a future version of Octave; please use '\\' instead"; @@ -924,9 +923,8 @@ HANDLE_STRING_CONTINUATION; } -<DQ_STRING_START>\\{S}+{NL} | -<DQ_STRING_START>\\{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL} { - curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{S}+{NL}|<DQ_STRING_START>\\\\{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL}"); +<DQ_STRING_START>\\{S}+{NL} { + curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{S}+{NL}"); static const char *msg = "white space and comments after continuation markers in double-quoted character strings are obsolete and will not be allowed in a future version of Octave";