From 375bbcdd01f5afab2f9630d6b6c396145e5d6b00 Mon Sep 17 00:00:00 2001
From: Kevin Funk <kevin.funk@kdab.com>
Date: Tue, 28 Feb 2017 17:21:56 +0100
Subject: qlalr: Fix and re-run qlalr on its own sources

So the generated files are up-to-date again.

Generated with:
  qlalr --qt --no-lines --no-debug lalr.g

Change-Id: I3c4adb0083be7e66fed3db92c079493b574295aa
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/tools/qlalr/recognizer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/tools/qlalr/recognizer.cpp')

diff --git a/src/tools/qlalr/recognizer.cpp b/src/tools/qlalr/recognizer.cpp
index 69dad1a6c1..453be6f63e 100644
--- a/src/tools/qlalr/recognizer.cpp
+++ b/src/tools/qlalr/recognizer.cpp
@@ -178,8 +178,8 @@ int Recognizer::nextToken()
 
       text.clear ();
       if (! _M_no_lines)
-        text += QLatin1String("\n#line ") + QString::number (_M_action_line)
-                + QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n");
+        text += QLatin1String("\n#line ") + QString::number(_M_action_line) +
+                QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n");
       inp (); // skip ':'
 
       forever
@@ -216,7 +216,7 @@ int Recognizer::nextToken()
 
       text.clear ();
       if (! _M_no_lines)
-        text += QLatin1String ("\n#line ") + QString::number (_M_action_line) +
+        text += QLatin1String("\n#line ") + QString::number(_M_action_line) +
                 QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n");
 
       inp (); // skip ':'
-- 
cgit v1.2.3


From 137e6632c89a04c7785a005752e8a21b60678705 Mon Sep 17 00:00:00 2001
From: Kevin Funk <kevin.funk@kdab.com>
Date: Wed, 8 Mar 2017 16:01:52 +0100
Subject: qlalr: Use forward slashes in #include directives

Makes sure we don't use backslashes on Windows systems, which could lead
to the following warnings being emitted:

In file included from main.cpp:43:0:
repparser.h:2:10: warning: unknown escape sequence: '\.'
  #line 57 "..\..\src\repparser\parser.g"

caused by lines like
  #line 57 "..\..\src\\repparser\parser.g"

Change-Id: I6cfe0e39a2a58eb39f9d385ece30374bcfa09e05
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/tools/qlalr/recognizer.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/tools/qlalr/recognizer.cpp')

diff --git a/src/tools/qlalr/recognizer.cpp b/src/tools/qlalr/recognizer.cpp
index 453be6f63e..8c7665f1b9 100644
--- a/src/tools/qlalr/recognizer.cpp
+++ b/src/tools/qlalr/recognizer.cpp
@@ -28,6 +28,8 @@
 
 #include "recognizer.h"
 
+#include <QtCore/qdir.h>
+
 #include <cstdlib>
 #include <cstring>
 #include <cctype>
@@ -179,7 +181,7 @@ int Recognizer::nextToken()
       text.clear ();
       if (! _M_no_lines)
         text += QLatin1String("\n#line ") + QString::number(_M_action_line) +
-                QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n");
+                QLatin1String(" \"") + QDir::fromNativeSeparators(_M_input_file) + QLatin1String("\"\n");
       inp (); // skip ':'
 
       forever
@@ -217,7 +219,7 @@ int Recognizer::nextToken()
       text.clear ();
       if (! _M_no_lines)
         text += QLatin1String("\n#line ") + QString::number(_M_action_line) +
-                QLatin1String(" \"") + _M_input_file + QLatin1String("\"\n");
+                QLatin1String(" \"") + QDir::fromNativeSeparators(_M_input_file) + QLatin1String("\"\n");
 
       inp (); // skip ':'
 
-- 
cgit v1.2.3