Changeset f51aefb for src/driver/cfa.cc

Timestamp:

Nov 1, 2016, 3:18:59 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

84118d8

Parents:

40744af8 (diff), 0afffee (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/driver/cfa.cc (modified) (4 diffs)

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 : Thu Oct 27 22:19:37 2016
+// Update Count     : 154
 //
 
@@ -25 +25 @@
 using std::endl;
 using std::string;
+using std::to_string;
 
 
@@ -49 +50 @@
 
 
+#define str(s) #s
+
 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( str( CFA_VERSION_MAJOR ) ), Minor( str( CFA_VERSION_MINOR ) ), Patch( str( CFA_VERSION_PATCH ) );
 
         string installincdir( CFA_INCDIR );                                     // fixed location of include files
@@ -268 +257 @@
         // 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__";