Changeset 779a4a3 for src/driver

Timestamp:

May 3, 2018, 4:33:19 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f3152ab

Parents:

f465f0e (diff), c9d5c4f (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 fix-reference-overloading

Location:

src/driver

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• cfa.cc (modified) (5 diffs)

src/driver/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:49:31 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Oct 28 13:46:06 2016
-## Update Count     : 10
+## Last Modified On : Mon Apr 30 17:44:17 2018
+## Update Count     : 11
 ###############################################################################
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14
+AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
 if BUILD_NO_LIB
 else

src/driver/Makefile.in

@@ -294 +294 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14 $(am__append_1) $(am__append_2) \
-        $(am__append_3)
+AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src \
+        $(am__append_1) $(am__append_2) $(am__append_3)
 cfa_SOURCES = cfa.cc
 

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb  5 22:05:28 2018
-// Update Count     : 166
+// Last Modified On : Wed May  2 17:57:43 2018
+// Update Count     : 224
 //
 
@@ -19 +19 @@
 #include <unistd.h>                                                                             // execvp
 #include <string>                                                                               // STL version
-
+#include <string.h>                                                                             // strcmp
+
+#include "Common/SemanticError.h"
 #include "config.h"                                                                             // configure info
 
@@ -160 +162 @@
                                 args[nargs] = argv[i];                                  // pass the argument along
                                 nargs += 1;
+                        } else if ( arg == "-w" ) {
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                                args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
+                                nargs += 1;
+                        } else if ( prefix( arg, "-W" ) ) {                     // check before next tests
+                                if ( arg == "-Werror" || arg == "-Wall" ) {
+                                        args[nargs] = argv[i];                          // pass the argument along
+                                        nargs += 1;
+                                        args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
+                                        nargs += 1;
+                                } else {
+                                        unsigned int adv = prefix( arg, "-Wno-" ) ? 5 : 2;
+                                        args[nargs] = argv[i];                          // conditionally pass the argument along
+                                        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
                         } else if ( prefix( arg, "-B" ) ) {
                                 Bprefix = arg.substr(2);                                // strip the -B flag
@@ -247 +269 @@
                 #if ! defined(HAVE_LIBCFA_RELEASE)
                         if( !debug ) {
-                                cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
+                                cerr << "error: Option -nodebug is unavailable, libcfa was not installed." << endl;
                                 exit( EXIT_FAILURE );
                                 }
@@ -253 +275 @@
                 #if ! defined(HAVE_LIBCFA_DEBUG)
                         if( debug ) {
-                                cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
+                                cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl;
                                 exit( EXIT_FAILURE );
                                 }