full-single-quoted.patch

   1 Subject: allow newlines in single quoted string
   2
   3 This allows a newline to be inside a single quoted string, i.e.
   4
   5   str = 'hello
   6 word
   7 '
   8 also adds syntax pattern for single quoted string and updates escape chars for
   9 double quoted string.
  10
  11 ---
  12
  13  source/highlightData.c |    4 +++-
  14  source/parse.y         |    7 +++++--
  15  2 files changed, 8 insertions(+), 3 deletions(-)
  16
  17 diff --quilt old/source/parse.y new/source/parse.y
  18 --- old/source/parse.y
  19 +++ new/source/parse.y
  20 @@ -869,12 +869,15 @@ static int scanString(void)
  21          InPtr = startPtr;
  22          stopper = first_stopper;
  23          handleBackslash = (stopper == '\"');
  24          len = 0;
  25          InPtr++;
  26 -        while (*InPtr != '\0' && *InPtr != '\n') {
  27 -            if (*InPtr == stopper) {
  28 +        while (*InPtr) {
  29 +            if (*InPtr == '\n' && handleBackslash) {
  30 +                break;
  31 +            }
  32 +            else if (*InPtr == stopper) {
  33                  char *endPtr = InPtr++;
  34                  skipWhitespace();
  35                  /* is this followed by another string literal? */
  36                  if (*InPtr == '\"' || *InPtr == '\'') {
  37                      stopper = *InPtr++; /* add it to the end of the first */
  38 diff --quilt old/source/highlightData.c new/source/highlightData.c
  39 --- old/source/highlightData.c
  40 +++ new/source/highlightData.c
  41 @@ -555,12 +555,14 @@ static char *DefaultPatternSets[] = {
  42          Menu Actions:\"<(?:new(?:_tab|_opposite)?|open|open-dialog|open_dialog|open-selected|open_selected|close|save|save-as|save_as|save-as-dialog|save_as_dialog|revert-to-saved|revert_to_saved|revert_to_saved_dialog|include-file|include_file|include-file-dialog|include_file_dialog|load-macro-file|load_macro_file|load-macro-file-dialog|load_macro_file_dialog|load-tags-file|load_tags_file|load-tags-file-dialog|load_tags_file_dialog|unload_tags_file|load_tips_file|load_tips_file_dialog|unload_tips_file|print|print-selection|print_selection|exit|undo|redo|delete|select-all|select_all|shift-left|shift_left|shift-left-by-tab|shift_left_by_tab|shift-right|shift_right|shift-right-by-tab|shift_right_by_tab|find|find-dialog|find_dialog|find-again|find_again|find-selection|find_selection|find_incremental|start_incremental_find|replace|replace-dialog|replace_dialog|replace-all|replace_all|replace-in-selection|replace_in_selection|replace-again|replace_again|replace_find|replace_find_same|replace_find_again|goto-line-number|goto_line_number|goto-line-number-dialog|goto_line_number_dialog|goto-selected|goto_selected|mark|mark-dialog|mark_dialog|goto-mark|goto_mark|goto-mark-dialog|goto_mark_dialog|match|select_to_matching|goto_matching|find-definition|find_definition|show_tip|split-pane|split_pane|close-pane|close_pane|detach_document(?:_dialog)?|move_document_dialog|(?:next|previous|last)_document|uppercase|lowercase|fill-paragraph|fill_paragraph|control-code-dialog|control_code_dialog|filter-selection-dialog|filter_selection_dialog|filter-selection|filter_selection|execute-command|execute_command|execute-command-dialog|execute_command_dialog|execute-command-line|execute_command_line|shell-menu-command|shell_menu_command|macro-menu-command|macro_menu_command|bg_menu_command|post_window_bg_menu|post_tab_context_menu|beginning-of-selection|beginning_of_selection|end-of-selection|end_of_selection|repeat_macro|repeat_dialog|raise_window|focus_pane|set_statistics_line|set_incremental_search_line|set_show_line_numbers|set_auto_indent|set_wrap_text|set_wrap_margin|set_highlight_syntax|set_make_backup_copy|set_incremental_backup|set_show_matching|set_match_syntax_based|set_overtype_mode|set_locked|set_tab_dist|set_em_tab_dist|set_use_tabs|set_fonts|set_language_mode)(?=\\s*\\()\":::Subroutine::\n\
  43          Text Actions:\"<(?:self-insert|self_insert|grab-focus|grab_focus|extend-adjust|extend_adjust|extend-start|extend_start|extend-end|extend_end|secondary-adjust|secondary_adjust|secondary-or-drag-adjust|secondary_or_drag_adjust|secondary-start|secondary_start|secondary-or-drag-start|secondary_or_drag_start|process-bdrag|process_bdrag|move-destination|move_destination|move-to|move_to|move-to-or-end-drag|move_to_or_end_drag|end_drag|copy-to|copy_to|copy-to-or-end-drag|copy_to_or_end_drag|exchange|process-cancel|process_cancel|paste-clipboard|paste_clipboard|copy-clipboard|copy_clipboard|cut-clipboard|cut_clipboard|copy-primary|copy_primary|cut-primary|cut_primary|newline|newline-and-indent|newline_and_indent|newline-no-indent|newline_no_indent|delete-selection|delete_selection|delete-previous-character|delete_previous_character|delete-next-character|delete_next_character|delete-previous-word|delete_previous_word|delete-next-word|delete_next_word|delete-to-start-of-line|delete_to_start_of_line|delete-to-end-of-line|delete_to_end_of_line|forward-character|forward_character|backward-character|backward_character|key-select|key_select|process-up|process_up|process-down|process_down|process-shift-up|process_shift_up|process-shift-down|process_shift_down|process-home|process_home|forward-word|forward_word|backward-word|backward_word|forward-paragraph|forward_paragraph|backward-paragraph|backward_paragraph|beginning-of-line|beginning_of_line|end-of-line|end_of_line|beginning-of-file|beginning_of_file|end-of-file|end_of_file|next-page|next_page|previous-page|previous_page|page-left|page_left|page-right|page_right|toggle-overstrike|toggle_overstrike|scroll-up|scroll_up|scroll-down|scroll_down|scroll_left|scroll_right|scroll-to-line|scroll_to_line|select-all|select_all|deselect-all|deselect_all|focusIn|focusOut|process-return|process_return|process-tab|process_tab|insert-string|insert_string|mouse_pan)(?=\\s*\\()\":::Subroutine::\n\
  44          Keyword:\"<(?:break|continue|define|delete|else|for|if|in|return|while)>\":::Keyword::\n\
  45          Braces:\"[{}\\[\\]]\":::Keyword::\n\
  46          Global Variable:\"\\$[A-Za-z0-9_]+\":::Identifier1::\n\
  47 +        String sq:\"'\":\"'\"::String::\n\
  48          String:\"\"\"\":\"\"\"\":\"\\n\":String::\n\
  49 -        String Escape Char:\"\\\\(?:.|\\n)\":::Text Escape:String:\n\
  50 +        String Escape Char:\"\\\\(?:[\\\\\"\"ntbrfave\\n]|[xX][0-9a-fA-F]{1,2}|0*[0-7]{1,3})\":::Text Escape:String:\n\
  51 +        String Escape Char Error:\"\\\\.\":::Flag:String:\n\
  52          Numeric Const:\"(?<!\\Y)-?[0-9]+>\":::Numeric Const::\n\
  53          Macro Definition:\"(?<=define)\\s+\\w+\":::Subroutine1::\n\
  54          Custom Macro:\"\\w+(?=\\s*(?:\\\\\\n)?\\s*[\\(])\":::Subroutine1::\n\
  55          Variables:\"\\w+\":::Identifier1::D}",
  56      "Pascal:1:0{\n\