summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-10-31 11:55:06 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-10-31 11:55:06 +0900
commit0fe744f9192bda774749de7d8426033ae9cfd084 (patch)
tree0a338fc0af0a5f0ca83e7da7dfcd7d4b70dad5a8 /src
parenta228841668dcd5c4fcb728539fd1b2c556dfcebb (diff)
parent3376dd96e23d16871608a81a82efd08693446faa (diff)
downloadmruby-0fe744f9192bda774749de7d8426033ae9cfd084.tar.gz
mruby-0fe744f9192bda774749de7d8426033ae9cfd084.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src')
-rw-r--r--src/parse.y5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/parse.y b/src/parse.y
index 3ffc683f9..12dcfa471 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -3338,9 +3338,8 @@ nextc(parser_state *p)
mrbc_context *cxt = p->cxt;
if (cxt->partial_hook(p) < 0) return -1;
- p->cxt = NULL;
- tokadd(p, '\n');
- c = nextc(p);
+ c = '\n';
+ p->lineno = 1;
p->cxt = cxt;
return c;
}