Changeset 6943a987 for src/libcfa

Timestamp:

Aug 29, 2016, 10:33:05 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

5e644d3e

Parents:

79841be (diff), 413ad05 (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) (8 diffs)
• containers/vector (modified) (5 diffs)
• containers/vector.c (modified) (4 diffs)

src/libcfa/Makefile.am ¶

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Aug 11 15:36:32 2016
-## Update Count     : 198
+## Last Modified On : Fri Aug 26 12:03:37 2016
+## Update Count     : 199
 ###############################################################################
 
@@ -56 +56 @@
 CC = ${abs_top_srcdir}/src/driver/cfa
 
-headers = limits stdlib math iostream fstream iterator rational # containers/vector
+headers = limits stdlib math iostream fstream iterator rational containers/vector
 libobjs = ${headers:=.o}
 

src/libcfa/Makefile.in ¶

@@ -89 +89 @@
 libcfa_a_AR = $(AR) $(ARFLAGS)
 libcfa_a_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = limits.$(OBJEXT) stdlib.$(OBJEXT) math.$(OBJEXT) \
         iostream.$(OBJEXT) fstream.$(OBJEXT) iterator.$(OBJEXT) \
-        rational.$(OBJEXT)
+        rational.$(OBJEXT) containers/vector.$(OBJEXT)
 am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1)
 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
@@ -233 +234 @@
 cfalib_DATA = builtins.cf extras.cf prelude.cf
 MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
-headers = limits stdlib math iostream fstream iterator rational # containers/vector
+headers = limits stdlib math iostream fstream iterator rational containers/vector
 libobjs = ${headers:=.o}
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
@@ -303 +304 @@
 clean-libLIBRARIES:
         -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+containers/$(am__dirstamp):
+        @$(MKDIR_P) containers
+        @: > containers/$(am__dirstamp)
+containers/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) containers/$(DEPDIR)
+        @: > containers/$(DEPDIR)/$(am__dirstamp)
+containers/vector.$(OBJEXT): containers/$(am__dirstamp) \
+        containers/$(DEPDIR)/$(am__dirstamp)
 libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES) 
         $(AM_V_at)-rm -f libcfa.a
@@ -310 +319 @@
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
+        -rm -f containers/vector.$(OBJEXT)
 
 distclean-compile:
@@ -322 +332 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/vector.Po@am__quote@
 
 .c.o:
@@ -494 +505 @@
         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
         -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+        -rm -f containers/$(DEPDIR)/$(am__dirstamp)
+        -rm -f containers/$(am__dirstamp)
 
 maintainer-clean-generic:
@@ -504 +517 @@
 
 distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
+        -rm -rf ./$(DEPDIR) containers/$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -550 +563 @@
 
 maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
+        -rm -rf ./$(DEPDIR) containers/$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic \

src/libcfa/containers/vector ¶

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// vector -- 
-// 
+//
+// vector --
+//
 // Author           : Thierry Delisle
 // Created On       : Tue Jul  5 18:00:07 2016
@@ -12 +12 @@
 // Last Modified On : Tue Jul  5 18:01:35 2016
 // Update Count     : 2
-// 
+//
 
 #pragma once
@@ -28 +28 @@
         void ctor(allocator_t* const);
         void dtor(allocator_t* const);
-        void realloc(allocator_t* const, size_t);
+        void realloc_storage(allocator_t* const, size_t);
         T* data(allocator_t* const);
 };
@@ -64 +64 @@
 static inline void reserve(vector(T, allocator_t) *const this, size_t size)
 {
-        realloc(&this->storage, this->size+1);
+        realloc_storage(&this->storage, this->size+1);
 }
 
@@ -146 +146 @@
 
 forall(otype T)
-void realloc(heap_allocator(T) *const this, size_t size);
+void realloc_storage(heap_allocator(T) *const this, size_t size);
 
 forall(otype T)

src/libcfa/containers/vector.c ¶

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// vector.c -- 
-// 
+//
+// vector.c --
+//
 // Author           : Thierry Delisle
 // Created On       : Tue Jul  5 18:07:52 2016
@@ -12 +12 @@
 // Last Modified On : Tue Jul  5 18:08:31 2016
 // Update Count     : 2
-// 
+//
 
-#include <containers/vector> 
+#include <containers/vector>
 
 #include <stdlib>
@@ -39 +39 @@
 void push_back(vector(T, allocator_t) *const this, T value)
 {
-        realloc(&this->storage, this->size+1);
+        realloc_storage(&this->storage, this->size+1);
         data(&this->storage)[this->size] = value;
         this->size++;
@@ -77 +77 @@
 
 forall(otype T)
-inline void realloc(heap_allocator(T) *const this, size_t size)
+inline void realloc_storage(heap_allocator(T) *const this, size_t size)
 {
         enum { GROWTH_RATE = 2 };