From d05b8f181e96cc048951c8e465ff67ab0bc5ff27 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Tue, 1 Jan 2019 18:02:41 +0100
Subject: [PATCH] style: sort includes in scanners

* src/scan-code.l, src/scan-gram.l, src/scan-skel.l: Reorder includes.
---
 src/scan-code.l | 28 ++++++++++++++--------------
 src/scan-gram.l | 23 +++++++++++------------
 src/scan-skel.l | 20 ++++++++++----------
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/scan-code.l b/src/scan-code.l
index 6ec278a9..b934e618 100644
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -21,24 +21,24 @@
 %option prefix="code_" outfile="lex.yy.c"
 
 %{
-/* Work around a bug in flex 2.5.31.  See Debian bug 333231
-   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
-#undef code_wrap
-#define code_wrap() 1
+#include <c-ctype.h>
+#include <get-errno.h>
+#include <quote.h>
+
+#include <src/complain.h>
+#include <src/getargs.h>
+#include <src/muscle-tab.h>
+#include <src/reader.h>
+#include <src/scan-code.h>
+#include <src/symlist.h>
 
 #define FLEX_PREFIX(Id) code_ ## Id
 #include <src/flex-scanner.h>
 
-#include <src/complain.h>
-#include <src/reader.h>
-#include <src/getargs.h>
-#include <src/muscle-tab.h>
-#include <src/scan-code.h>
-#include <src/symlist.h>
-
-#include <c-ctype.h>
-#include <get-errno.h>
-#include <quote.h>
+/* Work around a bug in flex 2.5.31.  See Debian bug 333231
+   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
+#undef code_wrap
+#define code_wrap() 1
 
 /* The current calling start condition: SC_RULE_ACTION or
    SC_SYMBOL_ACTION. */
diff --git a/src/scan-gram.l b/src/scan-gram.l
index 5fe0fc4e..66bb2d8e 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -21,27 +21,26 @@
 %option prefix="gram_" outfile="lex.yy.c"
 
 %{
-/* Work around a bug in flex 2.5.31.  See Debian bug 333231
-   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
-#undef gram_wrap
-#define gram_wrap() 1
-
-#define FLEX_PREFIX(Id) gram_ ## Id
-#include <src/flex-scanner.h>
+#include <c-ctype.h>
+#include <mbswidth.h>
+#include <quote.h>
+#include <quotearg.h>
 
 #include <src/complain.h>
 #include <src/files.h>
 #include <src/getargs.h>
 #include <src/gram.h>
-#include <quotearg.h>
 #include <src/reader.h>
+#include <src/scan-gram.h>
 #include <src/uniqstr.h>
 
-#include <c-ctype.h>
-#include <mbswidth.h>
-#include <quote.h>
+#define FLEX_PREFIX(Id) gram_ ## Id
+#include <src/flex-scanner.h>
 
-#include <src/scan-gram.h>
+/* Work around a bug in flex 2.5.31.  See Debian bug 333231
+   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
+#undef gram_wrap
+#define gram_wrap() 1
 
 #define YY_DECL GRAM_LEX_DECL
 
diff --git a/src/scan-skel.l b/src/scan-skel.l
index 63a6dc32..9517f4f0 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -21,24 +21,24 @@
 %option prefix="skel_" outfile="lex.yy.c"
 
 %{
-/* Work around a bug in flex 2.5.31.  See Debian bug 333231
-   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
-#undef skel_wrap
-#define skel_wrap() 1
-
-#define FLEX_PREFIX(Id) skel_ ## Id
-#include <src/flex-scanner.h>
-
-#include <error.h>
 #include <dirname.h>
+#include <error.h>
 #include <path-join.h>
 #include <quotearg.h>
 
 #include <src/complain.h>
-#include <src/getargs.h>
 #include <src/files.h>
+#include <src/getargs.h>
 #include <src/scan-skel.h>
 
+#define FLEX_PREFIX(Id) skel_ ## Id
+#include <src/flex-scanner.h>
+
+/* Work around a bug in flex 2.5.31.  See Debian bug 333231
+   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>.  */
+#undef skel_wrap
+#define skel_wrap() 1
+
 #define YY_DECL static int skel_lex (void)
 YY_DECL;