github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-29 13:23:53 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Ignore comments for backslash newline

Browse Source 
Works also if tok->show_comments (for highlighting and auto completion) and
with multi-line comments:

function my_function
    echo "hello" | \
    #remove 'l'
    #and more
    tr -d 'l'
end

$ my_function
heo

Fixes #983
This commit is contained in:
Sanne Wouda 2015-03-13 13:05:22 +01:00 committed by ridiculousfish
parent cad1dc5293
commit 318daaffb2
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tokenizer.cpp
View File

@ -94,7 +94,7 @@ int tok_get_error(tokenizer_t *tok)
} }
tokenizer_t::tokenizer_t(const wchar_t *b, tok_flags_t flags) : buff(NULL), orig_buff(NULL), last_type(TOK_NONE), last_pos(0), has_next(false), accept_unfinished(false), show_comments(false), last_quote(0), error(0), squash_errors(false), cached_lineno_offset(0), cached_lineno_count(0) tokenizer_t::tokenizer_t(const wchar_t *b, tok_flags_t flags) : buff(NULL), orig_buff(NULL), last_type(TOK_NONE), last_pos(0), has_next(false), accept_unfinished(false), show_comments(false), last_quote(0), error(0), squash_errors(false), cached_lineno_offset(0), cached_lineno_count(0), continue_line_after_comment(false)
{ {
CHECK(b,); CHECK(b,);
@ -587,6 +587,7 @@ void tok_next(tokenizer_t *tok)
if (tok->buff[0] == L'\\' && tok->buff[1] == L'\n') if (tok->buff[0] == L'\\' && tok->buff[1] == L'\n')
{ {
tok->buff += 2; tok->buff += 2;
tok->continue_line_after_comment = true;
} }
else if (my_iswspace(tok->buff[0])) else if (my_iswspace(tok->buff[0]))
{ {
@ -599,24 +600,34 @@ void tok_next(tokenizer_t *tok)
} }
if (*tok->buff == L'#') while (*tok->buff == L'#')
{ {
if (tok->show_comments) if (tok->show_comments)
{ {
tok->last_pos = tok->buff - tok->orig_buff; tok->last_pos = tok->buff - tok->orig_buff;
read_comment(tok); read_comment(tok);
if (tok->buff[0] == L'\n' && tok->continue_line_after_comment)
tok->buff++;
return; return;
} }
else else
{ {
while (*(tok->buff)!= L'\n' && *(tok->buff)!= L'\0') while (*(tok->buff)!= L'\n' && *(tok->buff)!= L'\0')
tok->buff++; tok->buff++;
}
while (my_iswspace(*(tok->buff))) if (tok->buff[0] == L'\n' && tok->continue_line_after_comment)
tok->buff++; tok->buff++;
} }
while (my_iswspace(*(tok->buff))) {
tok->buff++;
}
}
tok->continue_line_after_comment = false;
tok->last_pos = tok->buff - tok->orig_buff; tok->last_pos = tok->buff - tok->orig_buff;
switch (*tok->buff) switch (*tok->buff)

3
tokenizer.h
View File

@ -103,6 +103,9 @@ struct tokenizer_t
size_t cached_lineno_offset; size_t cached_lineno_offset;
int cached_lineno_count; int cached_lineno_count;
/* Whether to continue the previous line after the comment */
bool continue_line_after_comment;
/** /**
Constructor for a tokenizer. b is the string that is to be Constructor for a tokenizer. b is the string that is to be
tokenized. It is not copied, and should not be freed by the caller tokenized. It is not copied, and should not be freed by the caller