Get rid of a few C-style casts that crept in, be -Wold-style-cast clean, closes #287

Author: hsutter

include/cpp2util.h

@@ -1433,7 +1433,7 @@ inline auto to_string(std::tuple<Ts...> const& t) -> std::string
 //
 struct args_t : std::vector<std::string_view>
 {
-    args_t(int c, char const* const* v) : vector{(size_t)c}, argc{c}, argv{v} {}
+    args_t(int c, char const* const* v) : vector{static_cast<size_t>(c)}, argc{c}, argv{v} {}
 
     int                argc = 0;
     char const* const* argv = nullptr;

regression-tests/test-results/gcc-10/pure2-raw-string-literal-and-interpolation.cpp.execution

@@ -0,0 +1,17 @@
+this is a string
+raw string without interpolation
+this is raw string literal
+
+that can last for multiple
+
+lines
+this is raw string literal
+that can last for multiple
+lines
+42 R"(this can be added too)"
+calculations like m["one"] + m["two"] = 3 also works
+at the beginning of the line!!!
+
+
+    4242
+1.2.0.42

regression-tests/test-results/gcc-10/pure2-raw-string-literal-and-interpolation.cpp.output

@@ -0,0 +1,17 @@
+this is a string
+raw string without interpolation
+this is raw string literal
+
+that can last for multiple
+
+lines
+this is raw string literal
+that can last for multiple
+lines
+42 R"(this can be added too)"
+calculations like m["one"] + m["two"] = 3 also works
+at the beginning of the line!!!
+
+
+    4242
+1.2.0.42

regression-tests/test-results/msvc-2022/pure2-raw-string-literal-and-interpolation.cpp.execution

@@ -0,0 +1 @@
+pure2-raw-string-literal-and-interpolation.cpp

regression-tests/test-results/msvc-2022/pure2-raw-string-literal-and-interpolation.cpp.output

@@ -449,7 +449,7 @@ auto to_upper(char c)
     //  C toupper is only not-UB in [0,127] and returns the wrong type,
     //  so wrap the range check and the type cast here in one place...
     //  note the 126 (not 127) is intentional to avoid a GCC warning
-    if (0 <= c && c <= 126) { return (char)std::toupper(c); }
+    if (0 <= c && c <= 126) { return static_cast<char>(std::toupper(c)); }
     //  else
     return c;
 }

source/common.h

@@ -221,7 +221,20 @@ class positional_printer
     bool            enable_indent_heuristic = true;
 
     //  Modal information
-    bool            declarations_only   = true;     // print only declarations in the first pass
+    enum phases {
+        phase0_type_decls           = 0,
+        phase1_type_defs_func_decls = 1,
+        phase2_func_defs            = 2
+    };
+    phases phase = phase1_type_defs_func_decls;
+
+    auto inc_phase() -> void {
+        switch (phase) {
+        break;case phase0_type_decls          : phase = phase1_type_defs_func_decls;
+        break;case phase1_type_defs_func_decls: phase = phase2_func_defs;
+        break;default                         : assert(!"ICE: invalid lowering phase");
+        }
+    }
 
     std::vector<std::string*>                emit_string_targets;       // option to emit to string instead of out file
     std::vector<std::vector<text_with_pos>*> emit_text_chunks_targets;  // similar for vector<text_pos>
@@ -334,7 +347,7 @@ class positional_printer
         auto& comments = *pcomments;
 
         //  Don't emit comments while in the first declarations-only pass
-        if (declarations_only) {
+        if (phase < phase2_func_defs) {
             return;
         }
 
@@ -565,7 +578,7 @@ class positional_printer
         //  of the Cpp2 section, and not printed in thedeclarations-only pass
         if (
             !last_was_cpp2
-            && declarations_only
+            && phase < phase2_func_defs
             )
         {
             print ("\n");
@@ -755,19 +768,16 @@ class positional_printer
     //  Modal state control functions
     //
 
-    //  In the first pass we will print only declarations (the default)
-    //  For the second pass this function enables printing definitions
-    //
-    auto enable_definitions()
+    auto next_phase()
         -> void
     {
-        declarations_only = false;
+        inc_phase();
     }
 
     auto doing_declarations_only() const
         -> bool
     {
-        return declarations_only;
+        return phase < phase2_func_defs;
     }
 
     //  Provide an option to store to a given string instead, which is
@@ -1213,7 +1223,7 @@ class cppfront
         //
         printer.print_extra( hpp_includes );
 
-        printer.enable_definitions();
+        printer.next_phase();
 
         for (auto& section : tokens.get_map())
         {
@@ -3128,7 +3138,7 @@ class cppfront
                 && rhs_tok
                 && (
                     *rhs_tok == "nullptr"
-                    || is_digit(((std::string_view)*rhs_tok)[0])
+                    || is_digit((rhs_tok->as_string_view())[0])
                     )
                 )
             {
@@ -4665,7 +4675,7 @@ class cppfront
                         loc += (">");
                     }
                     loc += " ";
-                    loc += ((std::string_view)*decl.name());
+                    loc += decl.name()->as_string_view();
                     if (decl.initializer)
                     {
                         std::string init;

source/cppfront.cpp

@@ -243,10 +243,16 @@ class token
     {
     }
 
-    operator std::string_view() const
+    auto as_string_view() const
+        -> std::string_view
     {
         assert (start);
-        return {start, (unsigned)count};
+        return {start, static_cast<unsigned>(count)};
+    }
+
+    operator std::string_view() const
+    {
+        return as_string_view();
     }
 
     auto operator== (token const& t) const
@@ -264,7 +270,7 @@ class token
     auto to_string( bool text_only = false ) const
         -> std::string
     {
-        auto text = std::string{start, (unsigned)count};
+        auto text = std::string{start, static_cast<unsigned>(count)};
         if (text_only) {
             return text;
         }
@@ -897,7 +903,7 @@ auto lex_line(
                 || !is_identifier_continue(line[i+m[0].length()])   // non-identifier char
                 )
             {
-                return (int)(m[0].length());
+                return static_cast<int>(m[0].length());
             }
         }
         return 0;