Changeset 7030dab for src/Common

Timestamp:

Apr 6, 2020, 4:46:28 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into new-ast

Location:

src/Common

Files:

• Debug.h (modified) (2 diffs)
• PassVisitor.h (modified) (2 diffs)
• PassVisitor.impl.h (modified) (4 diffs)
• SemanticError.cc (modified) (1 diff)
• SemanticError.h (modified) (3 diffs)
• Stats/Time.h (modified) (3 diffs)
• utility.h (modified) (3 diffs)

src/Common/Debug.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Fri Sep 1 11:09:14 2017
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri Sep 1 11:09:36 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 23:39:42 2019
+// Update Count     : 3
 //
 
@@ -21 +21 @@
 
 #include "CodeGen/Generate.h"
-#include "Parser/LinkageSpec.h"
+#include "SynTree/LinkageSpec.h"
 #include "SynTree/Declaration.h"
 

src/Common/PassVisitor.h

@@ -110 +110 @@
         virtual void visit( FinallyStmt * finallyStmt ) override final;
         virtual void visit( const FinallyStmt * finallyStmt ) override final;
+        virtual void visit( SuspendStmt * suspendStmt ) override final;
+        virtual void visit( const SuspendStmt * suspendStmt ) override final;
         virtual void visit( WaitForStmt * waitforStmt ) override final;
         virtual void visit( const WaitForStmt * waitforStmt ) override final;
@@ -276 +278 @@
         virtual Statement * mutate( CatchStmt * catchStmt ) override final;
         virtual Statement * mutate( FinallyStmt * finallyStmt ) override final;
+        virtual Statement * mutate( SuspendStmt * suspendStmt ) override final;
         virtual Statement * mutate( WaitForStmt * waitforStmt ) override final;
         virtual Declaration * mutate( WithStmt * withStmt ) override final;

src/Common/PassVisitor.impl.h

@@ -1522 +1522 @@
 
 //--------------------------------------------------------------------------
+// SuspendStmt
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( SuspendStmt * node ) {
+        VISIT_START( node );
+
+        maybeAccept_impl( node->then  , *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const SuspendStmt * node ) {
+        VISIT_START( node );
+
+        maybeAccept_impl( node->then  , *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( SuspendStmt * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->then  , *this );
+
+        MUTATE_END( Statement, node );
+}
+
+//--------------------------------------------------------------------------
 // WaitForStmt
 template< typename pass_type >
@@ -3302 +3331 @@
         VISIT_START( node );
 
-        indexerAddStruct( node->name );
+        indexerAddUnion( node->name );
 
         {
@@ -3317 +3346 @@
         VISIT_START( node );
 
-        indexerAddStruct( node->name );
+        indexerAddUnion( node->name );
 
         {
@@ -3332 +3361 @@
         MUTATE_START( node );
 
-        indexerAddStruct( node->name );
+        indexerAddUnion( node->name );
 
         {

src/Common/SemanticError.cc

@@ -149 +149 @@
 // Helpers
 namespace ErrorHelpers {
+        Colors colors = Colors::Auto;
+
+        static inline bool with_colors() {
+                return colors == Colors::Auto ? isatty( STDERR_FILENO ) : bool(colors);
+        }
+
         const std::string & error_str() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[31merror:\e[39m " : "error: ";
+                static std::string str = with_colors() ? "\e[31merror:\e[39m " : "error: ";
                 return str;
         }
 
         const std::string & warning_str() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[95mwarning:\e[39m " : "warning: ";
+                static std::string str = with_colors() ? "\e[95mwarning:\e[39m " : "warning: ";
                 return str;
         }
 
         const std::string & bold_ttycode() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[1m" : "";
+                static std::string str = with_colors() ? "\e[1m" : "";
                 return str;
         }
 
         const std::string & reset_font_ttycode() {
-                static std::string str = isatty( STDERR_FILENO ) ? "\e[0m" : "";
+                static std::string str = with_colors() ? "\e[0m" : "";
                 return str;
         }

src/Common/SemanticError.h

@@ -49 +49 @@
 struct WarningData {
         const char * const name;
+        const Severity default_severity;
         const char * const message;
-        const Severity default_severity;
 };
 
 constexpr WarningData WarningFormats[] = {
-        {"self-assign"            , "self assignment of expression: %s"            , Severity::Warn},
-        {"reference-conversion"   , "rvalue to reference conversion of rvalue: %s" , Severity::Warn},
-        {"qualifiers-zero_t-one_t", "questionable use of type qualifier %s with %s", Severity::Warn},
-        {"aggregate-forward-decl" , "forward declaration of nested aggregate: %s"  , Severity::Warn},
-        {"superfluous-decl"       , "declaration does not allocate storage: %s"    , Severity::Warn},
-        {"gcc-attributes"         , "invalid attribute: %s"                        , Severity::Warn},
+        {"self-assign"            , Severity::Warn    , "self assignment of expression: %s"                          },
+        {"reference-conversion"   , Severity::Warn    , "rvalue to reference conversion of rvalue: %s"               },
+        {"qualifiers-zero_t-one_t", Severity::Warn    , "questionable use of type qualifier %s with %s"              },
+        {"aggregate-forward-decl" , Severity::Warn    , "forward declaration of nested aggregate: %s"                },
+        {"superfluous-decl"       , Severity::Warn    , "declaration does not allocate storage: %s"                  },
+        {"gcc-attributes"         , Severity::Warn    , "invalid attribute: %s"                                      },
+        {"c++-like-copy"          , Severity::Warn    , "Constructor from reference is not a valid copy constructor" },
 };
 
@@ -69 +70 @@
         SuperfluousDecl,
         GccAttributes,
+        CppCopy,
         NUMBER_OF_WARNINGS, // This MUST be the last warning
 };
@@ -97 +99 @@
 // Helpers
 namespace ErrorHelpers {
+        enum class Colors {
+                Never = false,
+                Always = true,
+                Auto,
+        };
+
+        extern Colors colors;
+
         const std::string & error_str();
         const std::string & warning_str();

src/Common/Stats/Time.h

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Fri Mar 01 15:14:11 2019
-// Last Modified By :
+// Last Modified By : Andrew Beach
 // Last Modified On :
 // Update Count     :
@@ -41 +41 @@
                                 f();
                         }
+
+                        template<typename ret_t = void, typename func_t, typename... arg_t>
+                        inline ret_t TimeCall(
+                                        const char *, func_t func, arg_t&&... arg) {
+                                return func(std::forward<arg_t>(arg)...);
+                        }
 #               else
                         void StartGlobal();
@@ -59 +65 @@
                                 func();
                         }
+
+                        template<typename ret_t = void, typename func_t, typename... arg_t>
+                        inline ret_t TimeCall(
+                                        const char * name, func_t func, arg_t&&... arg) {
+                                BlockGuard guard(name);
+                                return func(std::forward<arg_t>(arg)...);
+                        }
 #               endif
         }

src/Common/utility.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 24 14:28:19 2019
-// Update Count     : 41
+// Last Modified On : Tue Feb 11 13:00:36 2020
+// Update Count     : 50
 //
 
@@ -29 +29 @@
 #include <utility>
 #include <vector>
+#include <cstring>                                                                              // memcmp
 
 #include "Common/Indenter.h"
@@ -264 +265 @@
 }
 
-/// determines if `pref` is a prefix of `str`
-static inline bool isPrefix( const std::string & str, const std::string & pref ) {
+// determines if pref is a prefix of str
+static inline bool isPrefix( const std::string & str, const std::string & pref, unsigned int start = 0 ) {
         if ( pref.size() > str.size() ) return false;
-        auto its = std::mismatch( pref.begin(), pref.end(), str.begin() );
-        return its.first == pref.end();
+    return 0 == memcmp( str.c_str() + start, pref.c_str(), pref.size() );
+        // return prefix == full.substr(0, prefix.size()); // for future, requires c++17
 }