diff options
| author | Seeker <[email protected]> | 2020-12-29 12:02:12 -0800 |
|---|---|---|
| committer | Seeker <[email protected]> | 2020-12-31 19:08:44 -0800 |
| commit | 4683a196d9cdcee84024ce6fb8bb73082c76eee8 (patch) | |
| tree | 089130c22ab0283de4359e0b8bceb93ca210082c /mrbgems/mruby-compiler | |
| parent | 1fbabe207d457ce771918f560fcf1bb070f6aded (diff) | |
| download | mruby-4683a196d9cdcee84024ce6fb8bb73082c76eee8.tar.gz mruby-4683a196d9cdcee84024ce6fb8bb73082c76eee8.zip | |
Fix regression for squiggly heredocs
Diffstat (limited to 'mrbgems/mruby-compiler')
| -rw-r--r-- | mrbgems/mruby-compiler/core/parse.y | 4 | ||||
| -rw-r--r-- | mrbgems/mruby-compiler/core/y.tab.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index 4a031abde..ebb18767a 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -4700,12 +4700,12 @@ parse_string(parser_state *p) pylval.nd = nd; if (head) { hinf->indented = push(hinf->indented, cons((node*)spaces, nd->cdr)); - if ((hinf->indent == -1 || spaces < hinf->indent) && (!empty || !hinf->line_head)) + if ((hinf->indent == -1 || spaces < hinf->indent) && (!empty || !line_head)) hinf->indent = spaces; } return tHD_STRING_MID; } - if (hinf && hinf->line_head) { + if (hinf && hinf->line_head && empty) { if (ISSPACE(c)) { if (hinf->indent_char == -1) hinf->indent_char = c; diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c index ea3cf2db7..2305c2bb6 100644 --- a/mrbgems/mruby-compiler/core/y.tab.c +++ b/mrbgems/mruby-compiler/core/y.tab.c @@ -11085,12 +11085,12 @@ parse_string(parser_state *p) pylval.nd = nd; if (head) { hinf->indented = push(hinf->indented, cons((node*)spaces, nd->cdr)); - if ((hinf->indent == -1 || spaces < hinf->indent) && (!empty || !hinf->line_head)) + if ((hinf->indent == -1 || spaces < hinf->indent) && (!empty || !line_head)) hinf->indent = spaces; } return tHD_STRING_MID; } - if (hinf && hinf->line_head) { + if (hinf && hinf->line_head && empty) { if (ISSPACE(c)) { if (hinf->indent_char == -1) hinf->indent_char = c; |