comparison libinterp/parse-tree/lex.ll @ 18437:888cd8f62c67 gui-release

maint: Periodic merge of stable to gui-release.
author Rik <rik@octave.org>
date Sat, 08 Feb 2014 13:33:05 -0800
parents 1ecfcfa4858e 4d2e15abe5e7
children e76d50d65278 ebb878596bcf
comparison
equal deleted inserted replaced
18412:f74c6aaa6d0f 18437:888cd8f62c67
867 867
868 curr_lexer->current_input_column += yyleng; 868 curr_lexer->current_input_column += yyleng;
869 curr_lexer->string_text += '\v'; 869 curr_lexer->string_text += '\v';
870 } 870 }
871 871
872 <DQ_STRING_START>(\.\.\.){S}*{NL} | 872 <DQ_STRING_START>(\.\.\.){S}*{NL} {
873 <DQ_STRING_START>(\.\.\.){S}*{CCHAR}{ANY_EXCEPT_NL}*{NL} { 873 curr_lexer->lexer_debug ("<DQ_STRING_START>(\\.\\.\\.){S}*{NL}");
874 curr_lexer->lexer_debug ("<DQ_STRING_START>(\\.\\.\\.){S}*{NL}|<DQ_STRING_START>(\\.\\.\\.){S}*{CCHAR}{ANY_EXCEPT_NL}*{NL}");
875 874
876 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"; 875 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";
877 876
878 std::string nm = curr_lexer->fcn_file_full_name; 877 std::string nm = curr_lexer->fcn_file_full_name;
879 878
885 curr_lexer->input_line_number, nm.c_str ()); 884 curr_lexer->input_line_number, nm.c_str ());
886 885
887 HANDLE_STRING_CONTINUATION; 886 HANDLE_STRING_CONTINUATION;
888 } 887 }
889 888
890 <DQ_STRING_START>\\{S}+{NL} | 889 <DQ_STRING_START>\\{S}+{NL} {
891 <DQ_STRING_START>\\{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL} { 890 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{S}+{NL}");
892 curr_lexer->lexer_debug ("<DQ_STRING_START>\\\\{S}+{NL}|<DQ_STRING_START>\\\\{S}*{CCHAR}{ANY_EXCEPT_NL}*{NL}");
893 891
894 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"; 892 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";
895 893
896 std::string nm = curr_lexer->fcn_file_full_name; 894 std::string nm = curr_lexer->fcn_file_full_name;
897 895