Merge branch 'master' of github.com:mruby/mruby

0fe744f9 · Yukihiro "Matz" Matsumoto · a2288416 · 3376dd96 · 0fe744f9
Commit 0fe744f9 authored Oct 31, 2013 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

src/parse.y src/parse.y +2 -3

No files found.
--- 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;
+    c = '\n';
-    tokadd(p, '\n');
+    p->lineno = 1;
-    c = nextc(p);
    p->cxt = cxt;
    return c;
  }