summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-compiler
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-12-23 21:31:51 +0900
committerGitHub <[email protected]>2019-12-23 21:31:51 +0900
commit0f89a9160733260ab27597ea3b5ec42dafa7a26d (patch)
treee34bf5de13153c8e1c5fe5c45ee0ebf04bb70453 /mrbgems/mruby-compiler
parent49301ed7855017d7fe5c79d758b60bf99585692f (diff)
parentbb0aec1d949c075e86c2f88a73975b615f5dc247 (diff)
downloadmruby-0f89a9160733260ab27597ea3b5ec42dafa7a26d.tar.gz
mruby-0f89a9160733260ab27597ea3b5ec42dafa7a26d.zip
Merge pull request #4902 from take-cheeze/native_crlf
Handle CR LF newline natively in lexer
Diffstat (limited to 'mrbgems/mruby-compiler')
-rw-r--r--mrbgems/mruby-compiler/core/parse.y7
1 files changed, 7 insertions, 0 deletions
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index 6abc6d820..de875a1ae 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -3984,6 +3984,13 @@ nextc(parser_state *p)
if (c >= 0) {
p->column++;
}
+ if (c == '\r') {
+ const int lf = nextc(p);
+ if (lf == '\n') {
+ return '\n';
+ }
+ pushback(p, lf);
+ }
return c;
eof: