Cosmetic: shortened macro name a bit and removed 'GXX' as it is also relevant to...

diff --git a/bootstrap/lib/lex.cc b/bootstrap/lib/lex.cc
index 9375236f0caa2af2dd6ef24c3bf5cead6e766282..f6778930e6ba5c8487eaf1ee5fa2282a27c32f11 100644 (file)
--- a/bootstrap/lib/lex.cc
+++ b/bootstrap/lib/lex.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.1.1 on Sat Jul 13 18:32:57 2019 */
+/* Generated by re2c 1.1.1 on Sat Jul 13 19:06:36 2019 */
 #line 1 "../lib/lex.re"
 #include <stdio.h>
 

diff --git a/bootstrap/lib/parse.cc b/bootstrap/lib/parse.cc
index d61d81144b12b870ad723d6b9df5d6325e2f0d1a..413de35d0c37d63a91c0435037d84e23f5917a99 100644 (file)
--- a/bootstrap/lib/parse.cc
+++ b/bootstrap/lib/parse.cc
@@ -88,7 +88,7 @@ using namespace re2c;
 extern "C" {
 
 int yylex(const char *&pattern);
-void yyerror(const char *pattern, const char*) RE2C_GXX_ATTRIBUTE((noreturn));
+void yyerror(const char *pattern, const char*) RE2C_ATTR((noreturn));
 
 } // extern "C"
 

diff --git a/bootstrap/src/parse/lex.cc b/bootstrap/src/parse/lex.cc
index 10c77319db2de1d24abf55a0e55ae1f339729308..8f059a377fbf33a1cdaa4389475148204e2433d0 100644 (file)
--- a/bootstrap/src/parse/lex.cc
+++ b/bootstrap/src/parse/lex.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.1.1 on Sat Jul 13 18:25:08 2019 */
+/* Generated by re2c 1.1.1 on Sat Jul 13 19:06:36 2019 */
 #line 1 "../src/parse/lex.re"
 #include <ctype.h>
 #include "src/util/c99_stdint.h"

diff --git a/bootstrap/src/parse/lex.h b/bootstrap/src/parse/lex.h
index 7eed37b63799861cf53b748a797d471c81eee544..59e14a0ef18fa05e08b75a7c8d21df8163541602 100644 (file)
--- a/bootstrap/src/parse/lex.h
+++ b/bootstrap/src/parse/lex.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.1.1 on Sat Jul 13 18:25:08 2019 */
+/* Generated by re2c 1.1.1 on Sat Jul 13 19:06:36 2019 */
 
 #ifndef _RE2C_PARSE_LEX_
 #define _RE2C_PARSE_LEX_

diff --git a/bootstrap/src/parse/parser.cc b/bootstrap/src/parse/parser.cc
index 9c80a26a0a85d81f3462bb81573401eec2b8633b..b510beac24c605ad1409ed07d236e4ad1f7de52d 100644 (file)
--- a/bootstrap/src/parse/parser.cc
+++ b/bootstrap/src/parse/parser.cc
@@ -84,7 +84,7 @@ using namespace re2c;
 extern "C" {
 
 int yylex(context_t &context);
-void yyerror(context_t &context, const char*) RE2C_GXX_ATTRIBUTE((noreturn));
+void yyerror(context_t &context, const char*) RE2C_ATTR((noreturn));
 
 } // extern "C"
 

diff --git a/lib/parse.ypp b/lib/parse.ypp
index 9c9c77534f8eb222ed8d1c49630bc2f2d63cb1d1..1288e38f38961470531b61745b3484c2c3e7b382 100644 (file)
--- a/lib/parse.ypp
+++ b/lib/parse.ypp
@@ -23,7 +23,7 @@ using namespace re2c;
 extern "C" {
 
 int yylex(const char *&pattern);
-void yyerror(const char *pattern, const char*) RE2C_GXX_ATTRIBUTE((noreturn));
+void yyerror(const char *pattern, const char*) RE2C_ATTR((noreturn));
 
 } // extern "C"
 

diff --git a/lib/regexec_nfa_posix_backward.cc b/lib/regexec_nfa_posix_backward.cc
index 020de2d3dca096d50417344bd87a08eddc910ae1..407e89194acaa852786af441dc7a7e5d9b83d948 100644 (file)
--- a/lib/regexec_nfa_posix_backward.cc
+++ b/lib/regexec_nfa_posix_backward.cc
@@ -258,7 +258,7 @@ void closure_posix(psimctx_t &ctx)
 }
 
 static int32_t precedence(psimctx_t &ctx, const conf_t &x
-    , const conf_t &y RE2C_GXX_ATTRIBUTE((unused)))
+    , const conf_t &y RE2C_ATTR((unused)))
 {
     DASSERT(x.state == y.state);
     const size_t idx = index(x.state, ctx.nfa);

diff --git a/lib/regexec_nfa_posix_kuklewicz.cc b/lib/regexec_nfa_posix_kuklewicz.cc
index 649122a5baa64dcf0ae7051023ee020524535dc2..e7f06fff39c02367f71da99b6748277665a526b9 100644 (file)
--- a/lib/regexec_nfa_posix_kuklewicz.cc
+++ b/lib/regexec_nfa_posix_kuklewicz.cc
@@ -275,8 +275,8 @@ int32_t khistory_t::precedence(ctx_t &ctx
 
         std::vector<int32_t> &p1 = ctx.history.path1, &p2 = ctx.history.path2;
         const int32_t
-            n1 RE2C_GXX_ATTRIBUTE((unused)) = subhistory_list(ctx.history, p1, x.thist, t),
-            n2 RE2C_GXX_ATTRIBUTE((unused)) = subhistory_list(ctx.history, p2, y.thist, t);
+            n1 RE2C_ATTR((unused)) = subhistory_list(ctx.history, p1, x.thist, t),
+            n2 RE2C_ATTR((unused)) = subhistory_list(ctx.history, p2, y.thist, t);
         DASSERT(n1 == n2);
 
         std::vector<int32_t>::const_reverse_iterator

diff --git a/src/msg/msg.h b/src/msg/msg.h
index 3905c8c5955e7181c0c6f94983c5c339a7cc77db..d056317ce998b332785fae258e1cb581dc7f3ed2 100644 (file)
--- a/src/msg/msg.h
+++ b/src/msg/msg.h
@@ -24,8 +24,8 @@ public:
     inline Msg(): filenames(), warn(*this), locfmt(LOCFMT_GNU) {}
 
     size_t register_filename(const std::string &filename);
-    void fatal(const loc_t &loc, const char *fmt, ...) RE2C_GXX_ATTRIBUTE ((format (printf, 3, 4), noreturn));
-    void warning(const char *type, const loc_t &loc, bool error, const char *fmt, ...) RE2C_GXX_ATTRIBUTE ((format (printf, 5, 6)));
+    void fatal(const loc_t &loc, const char *fmt, ...) RE2C_ATTR((format (printf, 3, 4), noreturn));
+    void warning(const char *type, const loc_t &loc, bool error, const char *fmt, ...) RE2C_ATTR((format (printf, 5, 6)));
 
     friend class Warn;
 
@@ -35,8 +35,8 @@ private:
     void warning_end(const char *type, bool error);
 };
 
-void error(const char *fmt, ...) RE2C_GXX_ATTRIBUTE ((format (printf, 1, 2)));
-void fatal(const char *fmt, ...) RE2C_GXX_ATTRIBUTE ((format (printf, 1, 2), noreturn));
+void error(const char *fmt, ...) RE2C_ATTR((format (printf, 1, 2)));
+void fatal(const char *fmt, ...) RE2C_ATTR((format (printf, 1, 2), noreturn));
 void error_arg(const char *option);
 void usage ();
 void vernum ();

diff --git a/src/parse/parser.ypp b/src/parse/parser.ypp
index 9d9d9c9363a3b174942f37fd0d285486957c3c20..faaad20ce7ad9090b5dcfad901a309ee9d41007f 100644 (file)
--- a/src/parse/parser.ypp
+++ b/src/parse/parser.ypp
@@ -19,7 +19,7 @@ using namespace re2c;
 extern "C" {
 
 int yylex(context_t &context);
-void yyerror(context_t &context, const char*) RE2C_GXX_ATTRIBUTE((noreturn));
+void yyerror(context_t &context, const char*) RE2C_ATTR((noreturn));
 
 } // extern "C"
 

diff --git a/src/util/attribute.h b/src/util/attribute.h
index 027a6072d317ec1ce030de76fcdd844b5e28b366..27b531f49d49543a8fcb2d19956af6950ae4f57e 100644 (file)
--- a/src/util/attribute.h
+++ b/src/util/attribute.h
@@ -2,9 +2,9 @@
 #define _RE2C_UTIL_ATTRIBUTE_
 
 #ifdef __GNUC__
-#    define RE2C_GXX_ATTRIBUTE(x) __attribute__(x)
+#    define RE2C_ATTR(x) __attribute__(x)
 #else
-#    define RE2C_GXX_ATTRIBUTE(x)
+#    define RE2C_ATTR(x)
 #endif
 
 #endif // _RE2C_UTIL_ATTRIBUTE_

diff --git a/src/util/s_to_n32_unsafe.h b/src/util/s_to_n32_unsafe.h
index 924850fc955bac47e15b17ac6b27a810f2394ffd..01f01a1ea7b3a2f955a443b647fc0595c8014150 100644 (file)
--- a/src/util/s_to_n32_unsafe.h
+++ b/src/util/s_to_n32_unsafe.h
@@ -8,8 +8,8 @@
 
 namespace re2c {
 
-bool s_to_u32_unsafe (const char * s, const char * s_end, uint32_t & number) RE2C_GXX_ATTRIBUTE ((warn_unused_result));
-bool s_to_i32_unsafe (const char * s, const char * s_end, int32_t & number) RE2C_GXX_ATTRIBUTE ((warn_unused_result));
+bool s_to_u32_unsafe (const char * s, const char * s_end, uint32_t & number) RE2C_ATTR((warn_unused_result));
+bool s_to_i32_unsafe (const char * s, const char * s_end, int32_t & number) RE2C_ATTR((warn_unused_result));
 
 } // namespace re2c