comparison libinterp/parse-tree/lex.ll @ 18506: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
comparison
equal deleted inserted replaced
18502:92ec75319e73 18506:e76d50d65278
904 904
905 curr_lexer->current_input_column += yyleng; 905 curr_lexer->current_input_column += yyleng;
906 curr_lexer->string_text += '\v'; 906 curr_lexer->string_text += '\v';
907 } 907 }
908 908
909 <DQ_STRING_START>(\.\.\.){S}*{NL} | 909 <DQ_STRING_START>(\.\.\.){S}*{NL} {
910 <DQ_STRING_START>(\.\.\.){S}*{CCHAR}{ANY_EXCEPT_NL}*{NL} { 910 curr_lexer->lexer_debug ("<DQ_STRING_START>(\\.\\.\\.){S}*{NL}");
911 curr_lexer->lexer_debug ("<DQ_STRING_START>(\\.\\.\\.){S}*{NL}|<DQ_STRING_START>(\\.\\.\\.){S}*{CCHAR}{ANY_EXCEPT_NL}*{NL}");
912 911
913 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"; 912 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";
914 913
915 std::string nm = curr_lexer->fcn_file_full_name; 914 std::string nm = curr_lexer->fcn_file_full_name;
916 915
922 curr_lexer->input_line_number, nm.c_str ()); 921 curr_lexer->input_line_number, nm.c_str ());
923 922
924 HANDLE_STRING_CONTINUATION; 923 HANDLE_STRING_CONTINUATION;
925 } 924 }
926 925
927 <DQ_STRING_START>\\{S}+{NL} | 926 <DQ_STRING_START>\\{S}+{NL} {
928 <DQ_STRING_START>\\{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL} { 927 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{S}+{NL}");
929 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{S}+{NL}|<DQ_STRING_START>\\\\{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL}");
930 928
931 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"; 929 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";
932 930
933 std::string nm = curr_lexer->fcn_file_full_name; 931 std::string nm = curr_lexer->fcn_file_full_name;
934 932