Changeset af39199d for src

Timestamp:

May 3, 2018, 12:23:14 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

01b8ccf1

Parents:

7ca8441c

Message:

add and use search routine

Location:

src

Files:

• Common/SemanticError.cc (modified) (2 diffs)
• Common/SemanticError.h (modified) (3 diffs)
• driver/cfa.cc (modified) (2 diffs)

src/Common/SemanticError.cc

@@ -7 +7 @@
 // SemanticError.cc --
 //
-// Author           : Richard C. Bilson
+// Author           : Thierry Delisle
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 29 18:17:35 2017
-// Update Count     : 3
+// Last Modified On : Wed May  2 18:13:37 2018
+// Update Count     : 8
 //
 
@@ -59 +59 @@
 void SemanticWarning_Set(const char * const name, Severity s) {
         size_t idx = 0;
-        for ( auto  & w : WarningFormats ) {
+        for ( const auto & w : WarningFormats ) {
                 if ( std::strcmp( name, w.name ) == 0 ) {
                         get_severities()[idx] = s;

src/Common/SemanticError.h

@@ -7 +7 @@
 // SemanticError.h --
 //
-// Author           : Richard C. Bilson
+// Author           : Thierry Delisle
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 15:00:01 2018
-// Update Count     : 23
+// Last Modified On : Wed May  2 18:13:15 2018
+// Update Count     : 29
 //
 
@@ -17 +17 @@
 
 #include "ErrorObjects.h"
+#include <cstring>
 
 //-----------------------------------------------------------------------------
@@ -76 +77 @@
 void SemanticWarning_Set           (const char * const name, Severity s);
 
+// SKULLDUGGERY: cfa.cc is built before SemanticError.cc but needs this routine.
+static inline bool SemanticWarning_Exist(const char * const name) {
+        for ( const auto & w : WarningFormats ) {
+                if ( std::strcmp( name, w.name ) == 0 ) return true;
+        }
+        return false;
+}
+
 //-----------------------------------------------------------------------------
 // Helpers

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 14:32:08 2018
-// Update Count     : 222
+// Last Modified On : Wed May  2 17:57:43 2018
+// Update Count     : 224
 //
 
@@ -176 +176 @@
                                         unsigned int adv = prefix( arg, "-Wno-" ) ? 5 : 2;
                                         args[nargs] = argv[i];                          // conditionally pass the argument along
-                                        char * warning = argv[i] + adv;         // extract warning
-                                        for ( const auto w : WarningFormats ) {
-                                                if ( strcmp( warning, w.name ) == 0 ) { // replace the argument for cfa-cpp
-                                                        args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str();
-                                                        break;
-                                                } // if
-                                        } // for
+                                        const char * warning = argv[i] + adv;     // extract warning
+                                        if ( SemanticWarning_Exist( warning ) ) { // replace the argument for cfa-cpp
+                                                args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str();
+                                        } // if
                                         nargs += 1;
                                 } // if