Changes in / [a3e7d34:848fb00]

Files:

• Makefile.in (modified) (2 diffs)
• config.h.in (modified) (2 diffs)
• configure (modified) (5 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.in (modified) (2 diffs)
• src/driver/Makefile.in (modified) (2 diffs)
• src/driver/cc1.cc (modified) (2 diffs)
• src/driver/cfa.cc (modified) (3 diffs)
• src/examples/Makefile.in (modified) (2 diffs)
• src/libcfa/Makefile.in (modified) (2 diffs)
• src/libcfa/iostream.c (modified) (4 diffs)

Makefile.in

@@ -118 +118 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -137 +136 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCC_PATH = @GCC_PATH@
 GREP = @GREP@
 INSTALL = @INSTALL@

config.h.in

@@ -1 +1 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Location of include files. */
-#undef CFA_BACKEND_CC
 
 /* Location of cfa command. */
@@ -23 +20 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
+
+/* Path/name of C compiler. */
+#undef GCC_PATH
 
 /* Define to 1 if you have `alloca', as a function or macro. */

configure

@@ -643 +643 @@
 CFA_INCDIR
 CFA_PREFIX
-CFA_BACKEND_CC
 BACKEND_CC
+GCC_PATH
 MAINT
 MAINTAINER_MODE_FALSE
@@ -2922 +2922 @@
 # Check whether --with-backend-compiler was given.
 if test "${with_backend_compiler+set}" = set; then :
-  withval=$with_backend_compiler; backendcompiler=$withval
-else
-  backendcompiler=""
-fi
-
-if test "x$backendcompiler" != x; then
-        BACKEND_CC=${backendcompiler}
-else
+  withval=$with_backend_compiler; backcompiler=$withval
+else
+  backcompiler=""
+fi
+
+  if test x$backcompiler != x; then
+        cat >>confdefs.h <<_ACEOF
+#define GCC_PATH "${backcompiler}"
+_ACEOF
+
+        BACKEND_CC=${backcompiler}
+  else
         # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BACKEND_CC+:} false; then :
+if ${ac_cv_path_GCC_PATH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $BACKEND_CC in
+  case $GCC_PATH in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_BACKEND_CC="$BACKEND_CC" # Let the user override the test with a path.
+  ac_cv_path_GCC_PATH="$GCC_PATH" # Let the user override the test with a path.
   ;;
   *)
@@ -2949 +2953 @@
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_BACKEND_CC="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_GCC_PATH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2957 +2961 @@
 IFS=$as_save_IFS
 
+  test -z "$ac_cv_path_GCC_PATH" && ac_cv_path_GCC_PATH="N/A"
   ;;
 esac
 fi
-BACKEND_CC=$ac_cv_path_BACKEND_CC
-if test -n "$BACKEND_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BACKEND_CC" >&5
-$as_echo "$BACKEND_CC" >&6; }
+GCC_PATH=$ac_cv_path_GCC_PATH
+if test -n "$GCC_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_PATH" >&5
+$as_echo "$GCC_PATH" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -2970 +2975 @@
 
 
-        if test "x$BACKEND_CC" = "x"; then
+        if test "$GCC_PATH" = "N/A"; then
                 as_fn_error $? "some version of gcc is needed. Get it at ftp://ftp.gnu.org" "$LINENO" 5
                 exit 1
         fi
-fi
 
 cat >>confdefs.h <<_ACEOF
-#define CFA_BACKEND_CC "${BACKEND_CC}"
-_ACEOF
-
+#define GCC_PATH "${GCC_PATH}"
+_ACEOF
+
+        BACKEND_CC=${GCC_PATH}
+  fi
 
 

configure.ac

@@ -20 +20 @@
 
 AC_ARG_WITH(backend-compiler, 
-        [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ], 
-        backendcompiler=$withval, backendcompiler="")
-if test "x$backendcompiler" != x; then
-        BACKEND_CC=${backendcompiler}
-else
-        AC_PATH_PROG(BACKEND_CC, gcc, [])
-        if test "x$BACKEND_CC" = "x"; then
+            [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ], 
+            backcompiler=$withval, backcompiler="")
+  if test x$backcompiler != x; then
+        AC_DEFINE_UNQUOTED(GCC_PATH, "${backcompiler}")
+        BACKEND_CC=${backcompiler}
+  else
+        AC_PATH_PROG(GCC_PATH, gcc, N/A)
+        if test "$GCC_PATH" = "N/A"; then
                 AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
                 exit 1
         fi
-fi
-AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
-AC_SUBST(CFA_BACKEND_CC)
+        AC_DEFINE_UNQUOTED(GCC_PATH, "${GCC_PATH}", [Path/name of C compiler.])
+        BACKEND_CC=${GCC_PATH}
+  fi
+AC_SUBST(BACKEND_CC)
 
 if test "x$prefix" = "xNONE"; then

src/Makefile.in

@@ -240 +240 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -259 +258 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCC_PATH = @GCC_PATH@
 GREP = @GREP@
 INSTALL = @INSTALL@

src/driver/Makefile.in

@@ -80 +80 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -99 +98 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCC_PATH = @GCC_PATH@
 GREP = @GREP@
 INSTALL = @INSTALL@

src/driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  2 17:24:26 2016
-// Update Count     : 79
+// Last Modified On : Thu May  5 16:04:30 2016
+// Update Count     : 77
 //
 
@@ -30 +30 @@
 
 
-string compiler_name( CFA_BACKEND_CC );                                 // path/name of C compiler
+string compiler_name( GCC_PATH );                                               // path/name of C compiler
 
 string D__GCC_BPREFIX__( "-D__GCC_BPREFIX__=" );

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  2 17:24:25 2016
-// Update Count     : 137
+// Last Modified On : Wed Apr 20 18:31:28 2016
+// Update Count     : 133
 //
 
@@ -75 +75 @@
         string langstd;                                                                         // language standard
 
-        string compiler_path( CFA_BACKEND_CC );                         // path/name of C compiler
+        string compiler_path( GCC_PATH );                                       // path/name of C compiler
         string compiler_name;                                                           // name of C compiler
 
@@ -317 +317 @@
                 nargs += 1;
         } else {
-                cerr << argv[0] << " error, compiler \"" << compiler_name << "\" unsupported." << endl;
+                cerr << argv[0] << " error, compiler " << compiler_name << " not supported." << endl;
                 exit( EXIT_FAILURE );
         } // if

src/examples/Makefile.in

@@ -86 +86 @@
 CC = @CFA_BINDIR@/cfa
 CCDEPMODE = @CCDEPMODE@
-CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -107 +106 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCC_PATH = @GCC_PATH@
 GREP = @GREP@
 INSTALL = @INSTALL@

src/libcfa/Makefile.in

@@ -113 +113 @@
 CC = ${abs_top_srcdir}/src/driver/cfa
 CCDEPMODE = @CCDEPMODE@
-CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -132 +131 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCC_PATH = @GCC_PATH@
 GREP = @GREP@
 INSTALL = @INSTALL@

src/libcfa/iostream.c

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 26 10:08:31 2016
-// Update Count     : 305
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon May 02 15:13:55 2016
+// Update Count     : 302
 //
 
@@ -21 +21 @@
 #include <float.h>                                                                              // DBL_DIG, LDBL_DIG
 #include <complex.h>                                                                    // creal, cimag
+#include <ctype.h>                                                                              // isspace, ispunct
 }
 
@@ -335 +336 @@
 } // ?|?
 
-_Istream_cstrUC cstr( char * str ) { return (_Istream_cstrUC){ str }; }
+_Istream_cstrUC cstr( char * str ) { _Istream_cstrUC s = { str }; return s; }
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, _Istream_cstrUC cstr ) {
@@ -342 +343 @@
 } // cstr
 
-_Istream_cstrC cstr( char * str, int size ) { return (_Istream_cstrC){ str, size }; }
+_Istream_cstrC cstr( char * str, int size ) { _Istream_cstrC s = { str, size }; return s; }
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, _Istream_cstrC cstr ) {