Changeset 3f0c6a5 for src/driver

Timestamp:

Oct 28, 2016, 1:40:31 PM (7 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, resolv-new, with_gc

Children:

066d77a

Parents:

77971f6 (diff), 47a8d17 (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 tuples

Conflicts:

src/Parser/parser.cc
src/Parser/parser.yy

Location:

src/driver

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (2 diffs)
• cfa.cc (modified) (4 diffs)

src/driver/Makefile.am

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## Makefile.am -- 
+## Makefile.am --
 ##
 ## Author           : Peter A. Buhr
@@ -26 +26 @@
 cc1_SOURCES = cc1.cc
 
+cfa.cc : ${abs_top_srcdir}/version
+        @true
+
 MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}

src/driver/Makefile.in

@@ -100 +100 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -542 +543 @@
 
 
+cfa.cc : ${abs_top_srcdir}/version
+        @true
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  6 16:14:55 2016
-// Update Count     : 148
+// Last Modified On : Tue Oct 25 21:29:48 2016
+// Update Count     : 152
 //
 
@@ -25 +25 @@
 using std::endl;
 using std::string;
+using std::to_string;
 
 
@@ -50 +51 @@
 
 int main( int argc, char *argv[] ) {
-        string Version( VERSION );                                                      // current version number from CONFIG
-        string Major( "0" ), Minor( "0" ), Patch( "0" );        // default version numbers
-
-        int posn1 = Version.find( "." );                                        // find the divider between major and minor version numbers
-        if ( posn1 == -1 ) {                                                            // not there ?
-                Major = Version;
-        } else {
-                Major = Version.substr( 0, posn1 );
-                int posn2 = Version.find( ".", posn1 + 1 );             // find the divider between minor and patch numbers
-                if ( posn2 == -1 ) {                                                    // not there ?
-                        Minor = Version.substr( posn1 );
-                } else {
-                        Minor = Version.substr( posn1 + 1, posn2 - posn1 - 1 );
-                        Patch = Version.substr( posn2 + 1 );
-                } // if
-        } // if
+        string Version( CFA_VERSION_LONG );                                                     // current version number from CONFIG
+        string Major( to_string( CFA_VERSION_MAJOR ) ), Minor( to_string( CFA_VERSION_MINOR ) ), Patch( to_string( CFA_VERSION_PATCH ) );
 
         string installincdir( CFA_INCDIR );                                     // fixed location of include files
@@ -268 +255 @@
         // add the correct set of flags based on the type of compile this is
 
-        args[nargs] = ( *new string( string("-D__CFA__=") + Major ) ).c_str();
+        args[nargs] = ( *new string( string("-D__CFA_MAJOR__=") + Major ) ).c_str();
         nargs += 1;
         args[nargs] = ( *new string( string("-D__CFA_MINOR__=") + Minor ) ).c_str();
         nargs += 1;
-        args[nargs] = ( *new string( string("-D__CFA_PATCHLEVEL__=") + Patch ) ).c_str();
+        args[nargs] = ( *new string( string("-D__CFA_PATCH__=") + Patch ) ).c_str();
         nargs += 1;
         args[nargs] = "-D__CFA__";