Changeset cce7872 for src/libcfa

Timestamp:

Feb 11, 2016, 3:28:27 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

bed4d37c

Parents:

98735ef (diff), 52f85e0 (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

Location:

src/libcfa

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (4 diffs)
• algorithm (deleted)
• algorithm.c (deleted)
• iostream.c (modified) (4 diffs)
• stdlib (added)
• stdlib.c (added)

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Jan 30 18:56:45 2016
-## Update Count     : 110
+## Last Modified On : Wed Feb  3 11:19:35 2016
+## Update Count     : 117
 ###############################################################################
 
@@ -54 +54 @@
 
 # extension-less header files are overridden by default make rules => explicitly override rule
-% : %.c ${abs_top_srcdir}/src/driver/cfa-cpp
+% : %.c
         true
 
-libs = algorithm iostream fstream iterator
+.c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
+        ${CC} ${CFLAGS} -c -o $@ $<
+
+libs = stdlib iostream fstream iterator
 libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
 

src/libcfa/Makefile.in

@@ -83 +83 @@
 libcfa_a_AR = $(AR) $(ARFLAGS)
 libcfa_a_LIBADD =
-am__objects_1 = algorithm.$(OBJEXT) iostream.$(OBJEXT) \
-        fstream.$(OBJEXT) iterator.$(OBJEXT)
+am__objects_1 = stdlib.$(OBJEXT) iostream.$(OBJEXT) fstream.$(OBJEXT) \
+        iterator.$(OBJEXT)
 am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1)
 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
@@ -213 +213 @@
 MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} \
         ${addprefix ${libdir}/,${lib_LIBRARIES}} ${includedir}/*
-libs = algorithm iostream fstream iterator
+libs = stdlib iostream fstream iterator
 libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
 cheaders = bfd bfdlink demangle dialog evdns evhttp evrpc expat fcntl form gcrypt math
@@ -293 +293 @@
         -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/algorithm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iostream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iterator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa-prelude.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
 
 .c.obj:
@@ -585 +578 @@
 
 # extension-less header files are overridden by default make rules => explicitly override rule
-% : %.c ${abs_top_srcdir}/src/driver/cfa-cpp
+% : %.c
         true
+
+.c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
+        ${CC} ${CFLAGS} -c -o $@ $<
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb  1 14:20:30 2016
-// Update Count     : 60
+// Last Modified On : Wed Feb 10 15:48:46 2016
+// Update Count     : 66
 //
 
@@ -19 +19 @@
 #include <stdio.h>
 #include <string.h>                                                                             // strlen
+#include <float.h>                                                                              // DBL_DIG, LDBL_DIG
 #include <complex.h>                                                                    // creal, cimag
 }
@@ -72 +73 @@
 ostype * ?|?( ostype *os, double d ) {
         char buffer[32];
-        return write( os, buffer, sprintf( buffer, "%g", d ) );
+        return write( os, buffer, sprintf( buffer, "%.*lg", DBL_DIG, d ) );
 } // ?|?
 
@@ -78 +79 @@
 ostype * ?|?( ostype *os, long double d ) {
         char buffer[32];
-        return write( os, buffer, sprintf( buffer, "%Lg", d ) );
+        return write( os, buffer, sprintf( buffer, "%.*Lg", LDBL_DIG, d ) );
 } // ?|?