re2c: cleanup a few clang ++ warnings

Found those as:

    $ make CXXFLAGS="-Weverything -Werror -Wno-gnu-statement-expression -Wno-nested-anon-types"

- cleaned struct<->class declaration mismatch
- 'static' around local function
- 'RE2C_GXX_ATTRIBUTE ((noreturn))' around functions known to fail

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/re2c/src/codegen/bitmap.h b/re2c/src/codegen/bitmap.h
index a2f75abf4a71cbcdf536b1a81495079cb6f3aad5..c6cfceb16594f95347f0a49b4f6da3b3cdb24fbf 100644 (file)
--- a/re2c/src/codegen/bitmap.h
+++ b/re2c/src/codegen/bitmap.h
@@ -10,7 +10,7 @@ namespace re2c {
 
 struct Go;
 struct Span;
-class State;
+struct State;
 class OutputFile;
 
 struct bitmap_t

diff --git a/re2c/src/codegen/go.h b/re2c/src/codegen/go.h
index 3abcfc50ed45176f724c625f24ddf4c8f175bb73..c94a5ccdbf6a2caad92da9fc724ff97acded22d9 100644 (file)
--- a/re2c/src/codegen/go.h
+++ b/re2c/src/codegen/go.h
@@ -14,9 +14,9 @@ namespace re2c
 {
 
 struct DFA;
-class bitmap_t;
+struct bitmap_t;
 class bitmaps_t;
-class State;
+struct State;
 struct If;
 
 struct Span

diff --git a/re2c/src/codegen/print.cc b/re2c/src/codegen/print.cc
index 854ba93e1c8dc2da6b33099e1ccc23a7e9643006..6a157accb32d8fa3eaa0702eb98b6e4d4fe3ddb9 100644 (file)
--- a/re2c/src/codegen/print.cc
+++ b/re2c/src/codegen/print.cc
@@ -72,7 +72,7 @@ void prtChOrHex(std::ostream& o, uint32_t c, uint32_t szcunit, bool ebcdic, bool
        }
 }
 
-void prtChOrHexForSpan(std::ostream& o, uint32_t c, uint32_t szcunit, bool ebcdic, bool dot)
+static void prtChOrHexForSpan(std::ostream& o, uint32_t c, uint32_t szcunit, bool ebcdic, bool dot)
 {
        if (!ebcdic && c != ']' && is_print(c)) {
                prtCh(o, c, dot);

diff --git a/re2c/src/conf/warn.h b/re2c/src/conf/warn.h
index 9c7eeeeba39526f2acb494458fa877751bcc52d8..c9435f5d31abd141c4c478b3308861de58448a91 100644 (file)
--- a/re2c/src/conf/warn.h
+++ b/re2c/src/conf/warn.h
@@ -9,7 +9,7 @@
 
 namespace re2c {
 
-struct path_t;
+class path_t;
 struct Skeleton;
 
 #define RE2C_WARNING_TYPES \

diff --git a/re2c/src/ir/adfa/action.h b/re2c/src/ir/adfa/action.h
index 6bd03fc7c22277ecc0e2dab0c42b55c2bc72a5d8..8202a7b8a563f2a4865fd8537bd5b91a703e1f44 100644 (file)
--- a/re2c/src/ir/adfa/action.h
+++ b/re2c/src/ir/adfa/action.h
@@ -11,8 +11,8 @@
 namespace re2c
 {
 
-struct OutputFile;
-class State;
+class OutputFile;
+struct State;
 
 struct Initial
 {

diff --git a/re2c/src/ir/adfa/adfa.h b/re2c/src/ir/adfa/adfa.h
index e64cbf09e01c2cca8207bf4ce57c55e4644856da..0cc68ff07397309d0015bd121e50478ff0b6e5de 100644 (file)
--- a/re2c/src/ir/adfa/adfa.h
+++ b/re2c/src/ir/adfa/adfa.h
@@ -20,7 +20,7 @@ namespace re2c
 {
 
 struct Output;
-struct OutputFile;
+class OutputFile;
 struct dfa_t;
 
 struct State

diff --git a/re2c/src/ir/regexp/encoding/range_suffix.h b/re2c/src/ir/regexp/encoding/range_suffix.h
index f50ccb148c4956bc95633ae7243f87895e0d4acb..66672d20e6935423ec468a26217fb480b66db802 100644 (file)
--- a/re2c/src/ir/regexp/encoding/range_suffix.h
+++ b/re2c/src/ir/regexp/encoding/range_suffix.h
@@ -9,7 +9,7 @@
 
 namespace re2c {
 
-class RegExp;
+struct RegExp;
 
 struct RangeSuffix
 {

diff --git a/re2c/src/ir/regexp/encoding/utf16/utf16_regexp.h b/re2c/src/ir/regexp/encoding/utf16/utf16_regexp.h
index 13c209c5e96ba7df4d140e91725e4328279a1438..9d1345c11212c589cd698562fc1887536dcecdec 100644 (file)
--- a/re2c/src/ir/regexp/encoding/utf16/utf16_regexp.h
+++ b/re2c/src/ir/regexp/encoding/utf16/utf16_regexp.h
@@ -6,7 +6,7 @@
 namespace re2c {
 
 class Range;
-class RegExp;
+struct RegExp;
 
 const RegExp * UTF16Symbol(utf16::rune r);
 const RegExp * UTF16Range(const Range * r);

diff --git a/re2c/src/ir/regexp/encoding/utf8/utf8_regexp.h b/re2c/src/ir/regexp/encoding/utf8/utf8_regexp.h
index 4295937c58b87e8a9854407d5a3d50358a699405..0d327014e39a7fa3a608ab652f41be8f928e5a90 100644 (file)
--- a/re2c/src/ir/regexp/encoding/utf8/utf8_regexp.h
+++ b/re2c/src/ir/regexp/encoding/utf8/utf8_regexp.h
@@ -6,7 +6,7 @@
 namespace re2c {
 
 class Range;
-class RegExp;
+struct RegExp;
 
 const RegExp * UTF8Symbol(utf8::rune r);
 const RegExp * UTF8Range(const Range * r);

diff --git a/re2c/src/ir/regexp/regexp.cc b/re2c/src/ir/regexp/regexp.cc
index 584b1f7fb302eef966f98212b0387542632a5236..cde534ae0bcc0baca1a33f22f4d2625f8a04ff83 100644 (file)
--- a/re2c/src/ir/regexp/regexp.cc
+++ b/re2c/src/ir/regexp/regexp.cc
@@ -113,7 +113,6 @@ const RegExp *Scanner::cls(const Range *r) const
                                break;
                        case EMPTY_CLASS_ERROR:
                                fatal("empty character class");
-                               break;
                }
        }
 

diff --git a/re2c/src/ir/skeleton/skeleton.h b/re2c/src/ir/skeleton/skeleton.h
index c50c58013a5c238c154ff081efc2af0a1b28818a..b1b1dff2d572cc67a97e35d4326a5b85a64467e7 100644 (file)
--- a/re2c/src/ir/skeleton/skeleton.h
+++ b/re2c/src/ir/skeleton/skeleton.h
@@ -26,8 +26,8 @@ namespace re2c
 struct dfa_t;
 struct dfa_state_t;
 struct DFA;
-struct OutputFile;
-struct path_t;
+class OutputFile;
+class path_t;
 
 typedef local_increment_t<uint8_t> local_inc;
 

diff --git a/re2c/src/parse/scanner.h b/re2c/src/parse/scanner.h
index d8a78c98a24f06f04d19f54702cd383a3dc5b6da..0fa8024907e389c6b9df8b3e4fbcfc8f6a8eb735 100644 (file)
--- a/re2c/src/parse/scanner.h
+++ b/re2c/src/parse/scanner.h
@@ -15,8 +15,8 @@ namespace re2c
 {
 
 class Range;
-class RegExp;
-struct OutputFile;
+struct RegExp;
+class OutputFile;
 
 struct ScannerState
 {
@@ -106,11 +106,11 @@ public:
 
        uint32_t get_cline() const;
        const std::string & get_fname () const;
-       void fatal_at(uint32_t line, ptrdiff_t ofs, const char *msg) const;
-       void fatalf_at(uint32_t line, const char*, ...) const RE2C_GXX_ATTRIBUTE ((format (printf, 3, 4)));
-       void fatalf(const char*, ...) const RE2C_GXX_ATTRIBUTE ((format (printf, 2, 3)));
-       void fatal(const char*) const;
-       void fatal(ptrdiff_t, const char*) const;
+       void fatal_at(uint32_t line, ptrdiff_t ofs, const char *msg) const RE2C_GXX_ATTRIBUTE ((noreturn));
+       void fatalf_at(uint32_t line, const char*, ...) const RE2C_GXX_ATTRIBUTE ((format (printf, 3, 4))) RE2C_GXX_ATTRIBUTE ((noreturn));
+       void fatalf(const char*, ...) const RE2C_GXX_ATTRIBUTE ((format (printf, 2, 3))) RE2C_GXX_ATTRIBUTE ((noreturn));
+       void fatal(const char*) const RE2C_GXX_ATTRIBUTE ((noreturn));
+       void fatal(ptrdiff_t, const char*) const RE2C_GXX_ATTRIBUTE ((noreturn));
 
        const RegExp * mkDiff (const RegExp * e1, const RegExp * e2) const;
        const RegExp * mkDot () const;