Correctly handle multi-character newlines (e.g. CR LF) when parsing #line directives.

Bug report thanks to Denis Naumov.

diff --git a/re2c/bootstrap/src/parse/lex.cc b/re2c/bootstrap/src/parse/lex.cc
index ce767035d9f892592485be3c46d0581e206fe2ea..309871d071f5a556392f511f507343e29b6d45f1 100644 (file)
--- a/re2c/bootstrap/src/parse/lex.cc
+++ b/re2c/bootstrap/src/parse/lex.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.1.1 on Tue Feb 12 22:50:47 2019 */
+/* Generated by re2c 1.1.1 on Tue Feb 19 16:29:01 2019 */
 #line 1 "../src/parse/lex.re"
 #include "src/util/c99_stdint.h"
 #include <stddef.h>
@@ -478,7 +478,7 @@ yy82:
        YYCURSOR = yyt1;
 #line 213 "../src/parse/lex.re"
        {
-        out.wraw(tok, ptr + 1);
+        out.wraw(tok, ptr).ws("\n");
         set_sourceline();
         goto next;
     }

diff --git a/re2c/bootstrap/src/parse/lex.h b/re2c/bootstrap/src/parse/lex.h
index fdbb29297028e6fd34a12c388c062a544599632f..9d8ee86b5e083f01fd61379dc3a0eb8d7d29d34b 100644 (file)
--- a/re2c/bootstrap/src/parse/lex.h
+++ b/re2c/bootstrap/src/parse/lex.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.1.1 on Tue Feb 12 22:50:47 2019 */
+/* Generated by re2c 1.1.1 on Tue Feb 19 16:29:01 2019 */
 
 #include <string.h>
 #include "src/util/forbid_copy.h"

diff --git a/re2c/src/parse/lex.re b/re2c/src/parse/lex.re
index 9b4dd3e5082fdf8caa1cb3292aa967505327b6eb..eb0fd56478f58c7b9c8933f5e2e941cd15de6f25 100644 (file)
--- a/re2c/src/parse/lex.re
+++ b/re2c/src/parse/lex.re
@@ -211,7 +211,7 @@ loop:
     }
 
     linedir / lineinf {
-        out.wraw(tok, ptr + 1);
+        out.wraw(tok, ptr).ws("\n");
         set_sourceline();
         goto next;
     }