Changeset be945ac

Timestamp:

Jun 2, 2016, 11:51:07 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

2edd5502

Parents:

f1b1e4c (diff), 4df85197 (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 ctor

Conflicts:

src/SymTab/Validate.cc

Files:

• Jenkinsfile (added)
• doc/working/resolver_design.md (added)
• src/GenPoly/GenPoly.cc (modified) (7 diffs)
• src/SymTab/Validate.cc (modified) (2 diffs)
• src/examples/runTests.sh (modified) (4 diffs)
• src/libcfa/Makefile.am (modified) (2 diffs)
• src/libcfa/Makefile.in (modified) (3 diffs)

src/GenPoly/GenPoly.cc

@@ -64 +64 @@
                         return false;
                 }
-                
+
                 /// Replaces a TypeInstType by its referrent in the environment, if applicable
                 Type* replaceTypeInst( Type* type, const TypeSubstitution* env ) {
@@ -78 +78 @@
         Type *isPolyType( Type *type, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
                         return type;
@@ -91 +91 @@
         Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
                         if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
@@ -106 +106 @@
         Type *isPolyPtr( Type *type, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                         return isPolyType( ptr->get_base(), env );
@@ -115 +115 @@
         Type *isPolyPtr( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                         return isPolyType( ptr->get_base(), tyVars, env );
@@ -129 +129 @@
                 while ( true ) {
                         type = replaceTypeInst( type, env );
-                
+
                         if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                                 type = ptr->get_base();
@@ -146 +146 @@
                 while ( true ) {
                         type = replaceTypeInst( type, env );
-                
+
                         if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                                 type = ptr->get_base();

src/SymTab/Validate.cc

@@ -291 +291 @@
 
         namespace {
-                template< typename DWTIterator, typename DWTList >
-                void fixFunctionList( DWTIterator begin, DWTIterator end, FunctionType *func, DWTList & dwts ) {
+                template< typename DWTList >
+                void fixFunctionList( DWTList & dwts, FunctionType * func ) {
                         // the only case in which "void" is valid is where it is the only one in the list; then it should be removed
                         // entirely other fix ups are handled by the FixFunction class
+                        typedef typename DWTList::iterator DWTIterator;
+                        DWTIterator begin( dwts.begin() ), end( dwts.end() );
                         if ( begin == end ) return;
                         FixFunction fixer;
@@ -321 +323 @@
         void Pass1::visit( FunctionType *func ) {
                 // Fix up parameters and return types
-                fixFunctionList( func->get_parameters().begin(), func->get_parameters().end(), func, func->get_parameters() );
-                fixFunctionList( func->get_returnVals().begin(), func->get_returnVals().end(), func, func->get_returnVals() );
+                fixFunctionList( func->get_parameters(), func );
+                fixFunctionList( func->get_returnVals(), func );
                 Visitor::visit( func );
         }

src/examples/runTests.sh

@@ -36 +36 @@
 make clean > /dev/null 2>&1
 
+ret_val=0
+
 for test in $tests; do
         echo -n "    $test" | tee -a $logfile
@@ -41 +43 @@
         # build, skipping to next test on error
         if ! make -j 8 $test > tests/$test.make.txt 2>&1; then
+                ret_val=1
                 echo -e "\tFAILED with build error:" | tee -a $logfile
                 cat tests/$test.make.txt | tee -a $logfile
@@ -50 +53 @@
         ./$test < tests/$test.in.txt > tests/$test.run.txt 2>&1
         if ! diff tests/$test.out.txt tests/$test.run.txt > tests/$test.diff.txt; then
+                ret_val=1
                 echo -e "\tFAILED with output mismatch:" | tee -a $logfile
                 cat tests/$test.diff.txt | tee -a $logfile
@@ -58 +62 @@
         echo -e "\tPASSED" | tee -a $logfile
 done
+
+exit $((ret_val))

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue Apr 19 22:30:17 2016
-## Update Count     : 124
+## Last Modified On : Tue May 31 13:24:15 2016
+## Update Count     : 141
 ###############################################################################
 
@@ -53 +53 @@
 CC = ${abs_top_srcdir}/src/driver/cfa
 
-# extension-less header files are overridden by default make rules => explicitly override rule
-% : %.c
-        true
+headers = limits stdlib math iostream fstream iterator rational
+.SECONDARY : ${headers}                                 # stop implicit '.o' rules from removing extensionless headers
 
-.c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
-        ${CC} ${CFLAGS} -c -o $@ $<
+libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
 
-libs = limits stdlib math iostream fstream iterator rational
-libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
-
-cheaders = # expat
-cfaheaders = # limits
-include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
+include_HEADERS = ${headers}
 
 CLEANFILES = libcfa-prelude.c

src/libcfa/Makefile.in

@@ -214 +214 @@
 MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} \
         ${addprefix ${libdir}/,${lib_LIBRARIES}} ${includedir}/*
-libs = limits stdlib math iostream fstream iterator rational
-libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
-cheaders = # expat
-cfaheaders = # limits
-include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
+headers = limits stdlib math iostream fstream iterator rational
+libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
+include_HEADERS = ${headers}
 CLEANFILES = libcfa-prelude.c
 all: all-am
@@ -303 +301 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.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 $<
 
 .c.obj:
@@ -582 +587 @@
 libcfa-prelude.o : libcfa-prelude.c
         @BACKEND_CC@ -c -o $@ $<
-
-# extension-less header files are overridden by default make rules => explicitly override rule
-% : %.c
-        true
-
-.c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
-        ${CC} ${CFLAGS} -c -o $@ $<
+.SECONDARY : ${headers}                                 # stop implicit '.o' rules from removing extensionless headers
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.