Changeset 2fa5bd2 for src/Common

Timestamp:

Dec 12, 2019, 10:04:15 AM (6 years ago)

Author:

Dmitry Kobets <dkobets@…>

Branches:

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

Children:

e752e4e

Parents:

aca6a54c (diff), 2cd949b (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 vector-generic

Location:

src/Common

Files:

• PassVisitor.impl.h (modified) (3 diffs)
• SemanticError.cc (modified) (1 diff)
• SemanticError.h (modified) (1 diff)

src/Common/PassVisitor.impl.h

@@ -2452 +2452 @@
 
         indexerScopedAccept( node->result    , *this );
-        maybeAccept_impl   ( node->inout     , *this );
         maybeAccept_impl   ( node->constraint, *this );
         maybeAccept_impl   ( node->operand   , *this );
@@ -2464 +2463 @@
 
         indexerScopedAccept( node->result    , *this );
-        maybeAccept_impl   ( node->inout     , *this );
         maybeAccept_impl   ( node->constraint, *this );
         maybeAccept_impl   ( node->operand   , *this );
@@ -2477 +2475 @@
         indexerScopedMutate( node->env       , *this );
         indexerScopedMutate( node->result    , *this );
-        maybeMutate_impl   ( node->inout     , *this );
         maybeMutate_impl   ( node->constraint, *this );
         maybeMutate_impl   ( node->operand   , *this );

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

@@ -97 +97 @@
 // Helpers
 namespace ErrorHelpers {
+        enum class Colors {
+                Never = false,
+                Always = true,
+                Auto,
+        };
+
+        extern Colors colors;
+
         const std::string & error_str();
         const std::string & warning_str();