Changeset 6250a312 for src

Timestamp:

May 10, 2017, 5:00:47 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

8514fe19, dbfb35d

Parents:

0f9bef3 (diff), 29cf9c8 (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

Files:

• CodeGen/CodeGenerator.cc (modified) (18 diffs)
• CodeGen/Generate.cc (modified) (2 diffs)
• CodeGen/Generate.h (modified) (1 diff)
• CodeGen/LineStream.cc (added)
• CodeGen/LineStream.h (added)
• CodeTools/TrackLoc.cc (added)
• CodeTools/TrackLoc.h (added)
• CodeTools/module.mk (modified) (1 diff)
• Common/utility.h (modified) (2 diffs)
• Concurrency/Keywords.cc (modified) (4 diffs)
• GenPoly/InstantiateGeneric.cc (modified) (3 diffs)
• GenPoly/PolyMutator.cc (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• Parser/parser.yy (modified) (3 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (2 diffs)
• SynTree/BaseSyntaxNode.h (modified) (1 diff)
• SynTree/Declaration.h (modified) (1 diff)
• SynTree/PointerType.cc (modified) (2 diffs)
• SynTree/SynTree.h (modified) (1 diff)
• SynTree/Type.h (modified) (1 diff)
• SynTree/TypeDecl.cc (modified) (1 diff)
• SynTree/Visitor.h (modified) (2 diffs)
• benchmark/CorCtxSwitch.c (modified) (2 diffs)
• benchmark/Makefile.am (modified) (1 diff)
• benchmark/Makefile.in (modified) (1 diff)
• benchmark/Monitor.c (added)
• benchmark/SchedInt.c (added)
• benchmark/ThrdCtxSwitch.c (modified) (1 diff)
• benchmark/bench.c (modified) (6 diffs)
• benchmark/bench.h (added)
• benchmark/csv-data.c (modified) (4 diffs)
• libcfa/concurrency/monitor (modified) (1 diff)
• libcfa/concurrency/monitor.c (modified) (4 diffs)
• libcfa/concurrency/thread.c (modified) (1 diff)
• libcfa/rational (modified) (4 diffs)
• libcfa/rational.c (modified) (9 diffs)
• main.cc (modified) (2 diffs)
• tests/.expect/concurrent/sched-int-barge.txt (added)
• tests/.expect/concurrent/sched-int-disjoint.txt (added)
• tests/.expect/concurrent/sched-int-multi.txt (deleted)
• tests/.expect/concurrent/sched-int-wait.txt (added)
• tests/.expect/concurrent/sched-int.txt (deleted)
• tests/.expect/rational.txt (added)
• tests/.in/rational.txt (added)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/rational.c (modified) (3 diffs)
• tests/sched-int-barge.c (added)
• tests/sched-int-disjoint.c (added)
• tests/sched-int-multi.c (deleted)
• tests/sched-int-wait.c (added)
• tests/sched-int.c (deleted)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 16:38:01 2017
-// Update Count     : 482
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus May  9 16:50:00 2017
+// Update Count     : 484
 //
 
@@ -41 +41 @@
 namespace CodeGen {
         int CodeGenerator::tabsize = 4;
+
+        // Pseudo Function: output << lineDirective(currentNode);
+    struct lineDirective {
+        CodeLocation const & loc;
+                lineDirective(CodeLocation const & location) : loc(location) {}
+                lineDirective(BaseSyntaxNode const * node) : loc(node->location) {}
+        };
+        std::ostream & operator<<(std::ostream & out, lineDirective const & ld) {
+                if (ld.loc.isSet())
+                        return out << "\n# " << ld.loc.linenumber << " \""
+                                << ld.loc.filename << "\"\n";
+                return out << "\n// Unset Location\n";
+        }
 
         // the kinds of statements that would ideally be followed by whitespace
@@ -128 +141 @@
 
 
-        //*** Declarations
+        // *** Declarations
         void CodeGenerator::visit( FunctionDecl * functionDecl ) {
+                output << lineDirective( functionDecl );
+
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -153 +168 @@
                 }
 
+                output << lineDirective( objectDecl );
+
                 extension( objectDecl );
                 genAttributes( objectDecl->get_attributes() );
@@ -192 +209 @@
                         cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                output << indent;
+                                output << lineDirective( *i ) << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
@@ -204 +221 @@
 
         void CodeGenerator::visit( StructDecl * structDecl ) {
+                output << lineDirective( structDecl );
+
                 extension( structDecl );
                 handleAggregate( structDecl, "struct " );
@@ -209 +228 @@
 
         void CodeGenerator::visit( UnionDecl * unionDecl ) {
+                output << lineDirective( unionDecl );
+
                 extension( unionDecl );
                 handleAggregate( unionDecl, "union " );
@@ -215 +236 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
+                output << lineDirective ( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -230 +252 @@
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << indent << mangleName( obj );
+                                output << lineDirective( obj ) << indent << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -248 +270 @@
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
                 assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
+                output << lineDirective( typeDecl );
                 output << "typedef ";
                 output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
@@ -262 +285 @@
                         } // if
                 } else {
-                        output << typeDecl->typeString() << " " << typeDecl->get_name();
+                        output << typeDecl->genTypeString() << " " << typeDecl->get_name();
+                        if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->get_sized() ) {
+                                output << " | sized(" << typeDecl->get_name() << ")";
+                        }
                         if ( ! typeDecl->get_assertions().empty() ) {
                                 output << " | { ";
@@ -316 +342 @@
         }
 
-        //*** Expressions
+        // *** Expressions
         void CodeGenerator::visit( ApplicationExpr * applicationExpr ) {
                 extension( applicationExpr );
@@ -719 +745 @@
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                output << "({" << std::endl;
+                output << lineDirective( stmtExpr) << "({" << std::endl;
                 cur_indent += CodeGenerator::tabsize;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
                 for ( Statement * stmt : stmts ) {
-                        output << indent << printLabels( stmt->get_labels() );
+                        output << lineDirective( stmt ) << indent;
+            output << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
                                 // last statement in a statement expression needs to be handled specially -
@@ -746 +773 @@
         }
 
-        //*** Statements
+        // *** Statements
         void CodeGenerator::visit( CompoundStmt * compoundStmt ) {
                 std::list<Statement*> ks = compoundStmt->get_kids();
@@ -769 +796 @@
         void CodeGenerator::visit( ExprStmt * exprStmt ) {
                 assert( exprStmt );
-                // cast the top-level expression to void to reduce gcc warnings.
-                Expression * expr = new CastExpr( exprStmt->get_expr() );
+                Expression * expr = exprStmt->get_expr();
+                if ( genC ) {
+                        // cast the top-level expression to void to reduce gcc warnings.
+                        expr = new CastExpr( expr );
+                }
                 expr->accept( *this );
                 output << ";";
@@ -807 +837 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
+                output << lineDirective( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -820 +851 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
+                output << lineDirective( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -832 +864 @@
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
+                output << lineDirective( caseStmt );
                 output << indent;
                 if ( caseStmt->isDefault()) {

src/CodeGen/Generate.cc

@@ -22 +22 @@
 #include "SynTree/Declaration.h"
 #include "CodeGenerator.h"
-#include "Tuples/Tuples.h"
+#include "GenType.h"
+#include "SynTree/SynTree.h"
+#include "SynTree/Type.h"
+#include "SynTree/BaseSyntaxNode.h"
+// #include "Tuples/Tuples.h"
 
 using namespace std;
@@ -39 +43 @@
                 } // for
         }
+
+        void generate( BaseSyntaxNode * node, std::ostream & os ) {
+                if ( Type * type = dynamic_cast< Type * >( node ) ) {
+                        os << CodeGen::genPrettyType( type, "" );
+                } else {
+                        CodeGen::CodeGenerator cgv( os, true, false );
+                        node->accept( cgv );
+                }
+                os << std::endl;
+        }
 } // namespace CodeGen
 

src/CodeGen/Generate.h

@@ -25 +25 @@
         /// Generates code. doIntrinsics determines if intrinsic functions are printed, pretty formats output nicely (e.g., uses unmangled names, etc.), generateC is true when the output must consist only of C code (allows some assertions, etc.)
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false );
+
+        /// Generate code for a single node -- helpful for debugging in gdb
+        void generate( BaseSyntaxNode * node, std::ostream & os );
 } // namespace CodeGen
 

src/CodeTools/module.mk

@@ -15 +15 @@
 ###############################################################################
 
-SRC += CodeTools/DeclStats.cc
+SRC += CodeTools/DeclStats.cc \
+        CodeTools/TrackLoc.cc

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 14 21:25:25 2016
-// Update Count     : 31
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri May 5 11:03:00 2017
+// Update Count     : 32
 //
 
@@ -322 +322 @@
         std::string filename;
 
-        CodeLocation() 
+    /// Create a new unset CodeLocation.
+        CodeLocation()
                 : linenumber( -1 )
                 , filename("")
         {}
 
+    /// Create a new CodeLocation with the given values.
         CodeLocation( const char* filename, int lineno )
                 : linenumber( lineno )
                 , filename(filename ? filename : "")
         {}
+
+    bool isSet () const {
+        return -1 != linenumber;
+    }
+
+    bool isUnset () const {
+        return !isSet();
+    }
+
+        void unset () {
+                linenumber = -1;
+                filename = "";
+        }
+
+        // Use field access for set.
 };
 
 inline std::string to_string( const CodeLocation& location ) {
-        return location.linenumber >= 0 ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
+        return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
 }
 #endif // _UTILITY_H

src/Concurrency/Keywords.cc

@@ -246 +246 @@
         //=============================================================================================
         void ConcurrentSueKeyword::visit(StructDecl * decl) {
+                Visitor::visit(decl);
                 if( decl->get_name() == type_name ) {
                         assert( !type_decl );
@@ -385 +386 @@
         //=============================================================================================
         void MutexKeyword::visit(FunctionDecl* decl) {
+                Visitor::visit(decl);           
+
                 std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl );
                 if( mutexArgs.empty() ) return;
@@ -402 +405 @@
 
         void MutexKeyword::visit(StructDecl* decl) {
+                Visitor::visit(decl);
+
                 if( decl->get_name() == "monitor_desc" ) {
                         assert( !monitor_decl );
@@ -504 +509 @@
         //=============================================================================================
         void ThreadStarter::visit(FunctionDecl * decl) {
+                Visitor::visit(decl);
+                
                 if( ! InitTweak::isConstructor(decl->get_name()) ) return;
 

src/GenPoly/InstantiateGeneric.cc

@@ -233 +233 @@
                                 } else {
                                         // normalize possibly dtype-static parameter type
-                                        out.push_back( new TypeExpr{ 
+                                        out.push_back( new TypeExpr{
                                                 ScrubTyVars::scrubAll( paramType->get_type()->clone() ) } );
                                         gt |= genericType::concrete;
@@ -369 +369 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         StructInstType *newInst = new StructInstType( inst->get_qualifiers(), concDecl->get_name() );
@@ -423 +424 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         UnionInstType *newInst = new UnionInstType( inst->get_qualifiers(), concDecl->get_name() );

src/GenPoly/PolyMutator.cc

@@ -50 +50 @@
 
         Statement * PolyMutator::mutateStatement( Statement *stmt ) {
+                // don't want statements from outer CompoundStmts to be added to this CompoundStmt
+                ValueGuard< std::list< Statement* > > oldStmtsToAdd( stmtsToAdd );
+                ValueGuard< std::list< Statement* > > oldStmtsToAddAfter( stmtsToAddAfter );
+                ValueGuard< TypeSubstitution * > oldEnv( env );
+                stmtsToAdd.clear();
+                stmtsToAddAfter.clear();
+
                 Statement *newStmt = maybeMutate( stmt, *this );
                 if ( ! stmtsToAdd.empty() || ! stmtsToAddAfter.empty() ) {
@@ -83 +90 @@
 
         Statement * PolyMutator::mutate(IfStmt *ifStmt) {
+                ifStmt->set_condition(  mutateExpression( ifStmt->get_condition() ) );
                 ifStmt->set_thenPart(  mutateStatement( ifStmt->get_thenPart() ) );
                 ifStmt->set_elsePart(  mutateStatement( ifStmt->get_elsePart() ) );
-                ifStmt->set_condition(  mutateExpression( ifStmt->get_condition() ) );
                 return ifStmt;
         }
 
         Statement * PolyMutator::mutate(WhileStmt *whileStmt) {
+                whileStmt->set_condition(  mutateExpression( whileStmt->get_condition() ) );
                 whileStmt->set_body(  mutateStatement( whileStmt->get_body() ) );
-                whileStmt->set_condition(  mutateExpression( whileStmt->get_condition() ) );
                 return whileStmt;
         }
 
         Statement * PolyMutator::mutate(ForStmt *forStmt) {
-                forStmt->set_body(  mutateStatement( forStmt->get_body() ) );
                 mutateAll( forStmt->get_initialization(), *this );
                 forStmt->set_condition(  mutateExpression( forStmt->get_condition() ) );
                 forStmt->set_increment(  mutateExpression( forStmt->get_increment() ) );
+                forStmt->set_body(  mutateStatement( forStmt->get_body() ) );
                 return forStmt;
         }
 
         Statement * PolyMutator::mutate(SwitchStmt *switchStmt) {
+                switchStmt->set_condition( mutateExpression( switchStmt->get_condition() ) );
                 mutateStatementList( switchStmt->get_statements() );
-                switchStmt->set_condition( mutateExpression( switchStmt->get_condition() ) );
                 return switchStmt;
         }
 
         Statement * PolyMutator::mutate(CaseStmt *caseStmt) {
+                caseStmt->set_condition(  mutateExpression( caseStmt->get_condition() ) );
                 mutateStatementList( caseStmt->get_statements() );
-                caseStmt->set_condition(  mutateExpression( caseStmt->get_condition() ) );
                 return caseStmt;
         }

src/Makefile.in

@@ -108 +108 @@
         CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT) \
         CodeTools/driver_cfa_cpp-DeclStats.$(OBJEXT) \
+        CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT) \
         Concurrency/driver_cfa_cpp-Keywords.$(OBJEXT) \
         Common/driver_cfa_cpp-SemanticError.$(OBJEXT) \
@@ -388 +389 @@
         CodeGen/FixNames.cc CodeGen/FixMain.cc \
         CodeGen/OperatorTable.cc CodeTools/DeclStats.cc \
-        Concurrency/Keywords.cc Common/SemanticError.cc \
-        Common/UniqueName.cc Common/DebugMalloc.cc Common/Assert.cc \
+        CodeTools/TrackLoc.cc Concurrency/Keywords.cc \
+        Common/SemanticError.cc Common/UniqueName.cc \
+        Common/DebugMalloc.cc Common/Assert.cc \
         ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
@@ -545 +547 @@
         @: > CodeTools/$(DEPDIR)/$(am__dirstamp)
 CodeTools/driver_cfa_cpp-DeclStats.$(OBJEXT):  \
+        CodeTools/$(am__dirstamp) CodeTools/$(DEPDIR)/$(am__dirstamp)
+CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT):  \
         CodeTools/$(am__dirstamp) CodeTools/$(DEPDIR)/$(am__dirstamp)
 Concurrency/$(am__dirstamp):
@@ -843 +847 @@
         -rm -f CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT)
         -rm -f CodeTools/driver_cfa_cpp-DeclStats.$(OBJEXT)
+        -rm -f CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT)
         -rm -f Common/driver_cfa_cpp-Assert.$(OBJEXT)
         -rm -f Common/driver_cfa_cpp-DebugMalloc.$(OBJEXT)
@@ -954 +959 @@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/driver_cfa_cpp-DeclStats.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Po@am__quote@
@@ -1195 +1201 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeTools/driver_cfa_cpp-DeclStats.obj `if test -f 'CodeTools/DeclStats.cc'; then $(CYGPATH_W) 'CodeTools/DeclStats.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/DeclStats.cc'; fi`
 
+CodeTools/driver_cfa_cpp-TrackLoc.o: CodeTools/TrackLoc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeTools/driver_cfa_cpp-TrackLoc.o -MD -MP -MF CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo -c -o CodeTools/driver_cfa_cpp-TrackLoc.o `test -f 'CodeTools/TrackLoc.cc' || echo '$(srcdir)/'`CodeTools/TrackLoc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeTools/TrackLoc.cc' object='CodeTools/driver_cfa_cpp-TrackLoc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeTools/driver_cfa_cpp-TrackLoc.o `test -f 'CodeTools/TrackLoc.cc' || echo '$(srcdir)/'`CodeTools/TrackLoc.cc
+
+CodeTools/driver_cfa_cpp-TrackLoc.obj: CodeTools/TrackLoc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeTools/driver_cfa_cpp-TrackLoc.obj -MD -MP -MF CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo -c -o CodeTools/driver_cfa_cpp-TrackLoc.obj `if test -f 'CodeTools/TrackLoc.cc'; then $(CYGPATH_W) 'CodeTools/TrackLoc.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/TrackLoc.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeTools/TrackLoc.cc' object='CodeTools/driver_cfa_cpp-TrackLoc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeTools/driver_cfa_cpp-TrackLoc.obj `if test -f 'CodeTools/TrackLoc.cc'; then $(CYGPATH_W) 'CodeTools/TrackLoc.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/TrackLoc.cc'; fi`
+
 Concurrency/driver_cfa_cpp-Keywords.o: Concurrency/Keywords.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Concurrency/driver_cfa_cpp-Keywords.o -MD -MP -MF Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Tpo -c -o Concurrency/driver_cfa_cpp-Keywords.o `test -f 'Concurrency/Keywords.cc' || echo '$(srcdir)/'`Concurrency/Keywords.cc

src/Parser/parser.yy

@@ -393 +393 @@
         | '(' compound_statement ')'                                            // GCC, lambda expression
                 { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
+        | primary_expression '{' argument_expression_list '}' // CFA
+                {
+                        Token fn;
+                        fn.str = new std::string( "?{}" );                      // location undefined - use location of '{'?
+                        $$ = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
+                }
         ;
 
@@ -425 +431 @@
         | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99, compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
-        | postfix_expression '{' argument_expression_list '}' // CFA
+        | '^' primary_expression '{' argument_expression_list '}' // CFA
                 {
                         Token fn;
-                        fn.str = new std::string( "?{}" );                      // location undefined - use location of '{'?
-                        $$ = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
+                        fn.str = new string( "^?{}" );                          // location undefined
+                        $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $2 )->set_last( $4 ) ) );
                 }
         ;
@@ -730 +736 @@
         | exception_statement
         | asm_statement
-        | '^' postfix_expression '{' argument_expression_list '}' ';' // CFA
-                {
-                        Token fn;
-                        fn.str = new string( "^?{}" );                          // location undefined
-                        $$ = new StatementNode( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $2 )->set_last( $4 ) ) ) ) );
-                }
-        ;
 
 labeled_statement:

src/ResolvExpr/AlternativeFinder.cc

@@ -766 +766 @@
                         } // if
                 } // for
-                // function may return struct or union value, in which case we need to add alternatives for implicit conversions to each of the anonymous members
+
+                candidates.clear();
+                candidates.splice( candidates.end(), alternatives );
+
+                findMinCost( candidates.begin(), candidates.end(), std::back_inserter( alternatives ) );
+
+                // function may return struct or union value, in which case we need to add alternatives for implicit
+                // conversions to each of the anonymous members, must happen after findMinCost since anon conversions
+                // are never the cheapest expression
                 for ( const Alternative & alt : alternatives ) {
                         addAnonConversions( alt );
                 }
-
-                candidates.clear();
-                candidates.splice( candidates.end(), alternatives );
-
-                findMinCost( candidates.begin(), candidates.end(), std::back_inserter( alternatives ) );
 
                 if ( alternatives.empty() && targetType && ! targetType->isVoid() ) {

src/SymTab/Validate.cc

@@ -240 +240 @@
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist
+                VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
                 Concurrency::applyKeywords( translationUnit );
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecayPass
                 Concurrency::implementMutexFuncs( translationUnit );
                 Concurrency::implementThreadStarter( translationUnit );
-                acceptAll( translationUnit, epc );
                 ReturnChecker::checkFunctionReturns( translationUnit );
                 compoundliteral.mutateDeclarationList( translationUnit );
                 acceptAll( translationUnit, pass3 );
-                VerifyCtorDtorAssign::verify( translationUnit );
                 ArrayLength::computeLength( translationUnit );
         }
@@ -817 +817 @@
                                 throw SemanticError( "Constructors, destructors, and assignment functions require at least one parameter ", funcDecl );
                         }
-                        if ( ! dynamic_cast< PointerType * >( params.front()->get_type() ) ) {
+                        PointerType * ptrType = dynamic_cast< PointerType * >( params.front()->get_type() );
+                        if ( ! ptrType || ptrType->is_array() ) {
                                 throw SemanticError( "First parameter of a constructor, destructor, or assignment function must be a pointer ", funcDecl );
                         }

src/SynTree/BaseSyntaxNode.h

@@ -18 +18 @@
 
 #include "Common/utility.h"
+#include "Visitor.h"
 
 class BaseSyntaxNode {
   public:
         CodeLocation location;
+
+        virtual void accept( Visitor & v ) = 0; // temporary -- needs to be here so that BaseSyntaxNode is polymorphic and can be dynamic_cast
 };
 

src/SynTree/Declaration.h

@@ -204 +204 @@
 
         virtual std::string typeString() const;
+        virtual std::string genTypeString() const;
 
         virtual TypeDecl *clone() const { return new TypeDecl( *this ); }

src/SynTree/PointerType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PointerType.cc -- 
+// PointerType.cc --
 //
 // Author           : Richard C. Bilson
@@ -38 +38 @@
 void PointerType::print( std::ostream &os, int indent ) const {
         Type::print( os, indent );
-        os << "pointer to ";
-        if ( isStatic ) {
-                os << "static ";
-        } // if
-        if ( isVarLen ) {
-                os << "variable length array of ";
-        } else if ( dimension ) {
-                os << "array of ";
-                dimension->print( os, indent );
-        } // if
+        if ( ! is_array() ) {
+                os << "pointer to ";
+        } else {
+                os << "decayed ";
+                if ( isStatic ) {
+                        os << "static ";
+                } // if
+                if ( isVarLen ) {
+                        os << "variable length array of ";
+                } else if ( dimension ) {
+                        os << "array of ";
+                        dimension->print( os, indent );
+                        os << " ";
+                } // if
+        }
         if ( base ) {
                 base->print( os, indent );

src/SynTree/SynTree.h

@@ -21 +21 @@
 #include <map>
 #include <iostream>
+
+class BaseSyntaxNode;
 
 class Declaration;

src/SynTree/Type.h

@@ -247 +247 @@
         void set_isStatic( bool newValue ) { isStatic = newValue; }
 
+        bool is_array() const { return isStatic || isVarLen || dimension; }
+
         virtual PointerType *clone() const { return new PointerType( *this ); }
         virtual void accept( Visitor & v ) { v.visit( this ); }

src/SynTree/TypeDecl.cc

@@ -29 +29 @@
 }
 
+std::string TypeDecl::genTypeString() const {
+        static const std::string kindNames[] = { "otype", "dtype", "ftype", "ttype" };
+        return kindNames[ kind ];
+}
+
 std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data ) {
   return os << data.kind << ", " << data.isComplete;

src/SynTree/Visitor.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 14:23:24 2017
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May  3 08:58:00 2017
 // Update Count     : 10
 //
@@ -26 +26 @@
         virtual ~Visitor();
   public:
+        // visit: Default implementation of all functions visits the children
+    // of the given syntax node, but performs no other action.
+
         virtual void visit( ObjectDecl *objectDecl );
         virtual void visit( FunctionDecl *functionDecl );

src/benchmark/CorCtxSwitch.c

@@ -3 +3 @@
 #include <thread>
 
-#include <unistd.h>                                     // sysconf
-#include <sys/times.h>                                  // times
-#include <time.h>
+#include "bench.h"
 
-inline unsigned long long int Time() {
-    timespec ts;
-    clock_gettime(
-#if defined( __linux__ )
-         CLOCK_THREAD_CPUTIME_ID,
-#elif defined( __freebsd__ )
-         CLOCK_PROF,
-#elif defined( __solaris__ )
-         CLOCK_HIGHRES,
-#else
-    #error uC++ : internal error, unsupported architecture
-#endif
-         &ts );
-    return 1000000000LL * ts.tv_sec + ts.tv_nsec;
-} // Time
-
-struct GreatSuspender {
-        coroutine_desc __cor;
-};
-
-DECL_COROUTINE(GreatSuspender);
+coroutine GreatSuspender {};
 
 void ?{}( GreatSuspender * this ) {
@@ -46 +24 @@
 }
 
-#ifndef N
-#define N 100000000
-#endif
-
 int main() {
         const unsigned int NoOfTimes = N;

src/benchmark/Makefile.am

@@ -44 +44 @@
         @rm -f ./a.out
 
+sched-int:
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 SchedInt.c
+        @for number in 1 2 3 4 5 6 7 8 9 10; do \
+                ./a.out ; \
+        done
+        @rm -f ./a.out
+
+monitor:
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 Monitor.c
+        @for number in 1 2 3 4 5 6 7 8 9 10; do \
+                ./a.out ; \
+        done
+        @rm -f ./a.out
+
 csv-data:
         @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c

src/benchmark/Makefile.in

@@ -492 +492 @@
         @rm -f ./a.out
 
+sched-int:
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 SchedInt.c
+        @for number in 1 2 3 4 5 6 7 8 9 10; do \
+                ./a.out ; \
+        done
+        @rm -f ./a.out
+
+monitor:
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 Monitor.c
+        @for number in 1 2 3 4 5 6 7 8 9 10; do \
+                ./a.out ; \
+        done
+        @rm -f ./a.out
+
 csv-data:
         @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c

src/benchmark/ThrdCtxSwitch.c

@@ -3 +3 @@
 #include <thread>
 
-#include <unistd.h>                                     // sysconf
-#include <sys/times.h>                                  // times
-#include <time.h>
-
-inline unsigned long long int Time() {
-    timespec ts;
-    clock_gettime(
-#if defined( __linux__ )
-         CLOCK_THREAD_CPUTIME_ID,
-#elif defined( __freebsd__ )
-         CLOCK_PROF,
-#elif defined( __solaris__ )
-         CLOCK_HIGHRES,
-#else
-    #error uC++ : internal error, unsupported architecture
-#endif
-         &ts );
-    return 1000000000LL * ts.tv_sec + ts.tv_nsec;
-} // Time
- 
-#ifndef N
-#define N 100000000
-#endif
+#include "bench.h"
 
 int main() {

src/benchmark/bench.c

@@ -4 +4 @@
 #include <thread>
 
-#include <unistd.h>                                     // sysconf
-#include <sys/times.h>                                  // times
-#include <time.h>
-
-inline unsigned long long int Time() {
-    timespec ts;
-    clock_gettime(
-#if defined( __linux__ )
-         CLOCK_THREAD_CPUTIME_ID,
-#elif defined( __freebsd__ )
-         CLOCK_PROF,
-#elif defined( __solaris__ )
-         CLOCK_HIGHRES,
-#else
-    #error uC++ : internal error, unsupported architecture
-#endif
-         &ts );
-    return 1000000000LL * ts.tv_sec + ts.tv_nsec;
-} // Time
+#include "bench.h"
 
 //=======================================
@@ -86 +68 @@
 //=======================================
 
-struct CoroutineDummy { coroutine_desc __cor; };
-DECL_COROUTINE(CoroutineDummy);
+coroutine CoroutineDummy {};
 void main(CoroutineDummy * this) {}
 
@@ -117 +98 @@
 }
 
-struct CoroutineResume {
+coroutine CoroutineResume {
     int N;
-    coroutine_desc __cor;
 };
-
-DECL_COROUTINE(CoroutineResume);
 
 void ?{}(CoroutineResume* this, int N) {
@@ -150 +128 @@
 //=======================================
 
-struct ThreadDummy { thread_desc __thrd; };
-DECL_THREAD(ThreadDummy);
+thread ThreadDummy {};
 void main(ThreadDummy * this) {}
 
@@ -177 +154 @@
 }
 
-struct ContextSwitch {
+thread ContextSwitch {
     int N;
     long long result;
-    thread_desc __thrd;
 };
-
-DECL_THREAD(ContextSwitch);
 
 void main(ContextSwitch * this) {    
@@ -241 +215 @@
         DynamicTaskCreateDelete( NoOfTimes );
         {
-                scoped(ContextSwitch) dummy = { (int)NoOfTimes };               // context switch
+                ContextSwitch dummy = { (int)NoOfTimes };               // context switch
         }
         sout | "\t" | endl;

src/benchmark/csv-data.c

@@ -1 +1 @@
 #include <fstream>
+#include <monitor>
 #include <stdlib>
 #include <thread>
 
-extern "C" {
-#include <unistd.h>                                     // sysconf
-#include <sys/times.h>                                  // times
-#include <time.h>
-}
-
-inline unsigned long long int Time() {
-    timespec ts;
-    clock_gettime(
-#if defined( __linux__ )
-         CLOCK_THREAD_CPUTIME_ID,
-#elif defined( __freebsd__ )
-         CLOCK_PROF,
-#elif defined( __solaris__ )
-         CLOCK_HIGHRES,
-#else
-    #error uC++ : internal error, unsupported architecture
-#endif
-         &ts );
-    return 1000000000LL * ts.tv_sec + ts.tv_nsec;
-} // Time
-
-struct GreatSuspender {
-        coroutine_desc __cor;
-};
-
-DECL_COROUTINE(GreatSuspender);
+#include "bench.h"
+
+coroutine GreatSuspender {};
 
 void ?{}( GreatSuspender * this ) {
@@ -52 +29 @@
 #endif
 
-
-
+//-----------------------------------------------------------------------------
+// coroutine context switch
 long long int measure_coroutine() {
         const unsigned int NoOfTimes = N;
@@ -71 +48 @@
 }
 
+//-----------------------------------------------------------------------------
+// thread context switch
 long long int measure_thread() {
         const unsigned int NoOfTimes = N;
@@ -84 +63 @@
 }
 
+//-----------------------------------------------------------------------------
+// single monitor entry
+monitor mon_t {};
+void dummy( mon_t * mutex m ) {}
+
+long long int measure_1_monitor_entry() {
+        const unsigned int NoOfTimes = N;
+        long long int StartTime, EndTime;
+        mon_t mon;
+
+        StartTime = Time();
+        for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
+                dummy( &mon );
+        }
+        EndTime = Time();
+
+        return ( EndTime - StartTime ) / NoOfTimes;
+}
+
+//-----------------------------------------------------------------------------
+// multi monitor entry
+void dummy( mon_t * mutex m1,  mon_t * mutex m2 ) {}
+
+long long int measure_2_monitor_entry() {
+        const unsigned int NoOfTimes = N;
+        long long int StartTime, EndTime;
+        mon_t mon1, mon2;
+
+        StartTime = Time();
+        for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
+                dummy( &mon1, &mon2 );
+        }
+        EndTime = Time();
+
+        return ( EndTime - StartTime ) / NoOfTimes;
+}
+
+//-----------------------------------------------------------------------------
+// single internal sched entry
+mon_t mon1;
+
+condition cond1a; 
+condition cond1b;
+
+thread thrd1a { long long int * out; };
+thread thrd1b {};
+
+void ?{}( thrd1a * this, long long int * out ) {
+        this->out = out;
+}
+
+void side1A( mon_t * mutex a, long long int * out ) {
+        long long int StartTime, EndTime;
+
+        StartTime = Time();
+        for( int i = 0;; i++ ) {
+                signal(&cond1a);
+                if( i > N ) break;
+                wait(&cond1b);
+        }
+        EndTime = Time();
+
+        *out = ( EndTime - StartTime ) / N;
+}
+
+void side1B( mon_t * mutex a ) {
+        for( int i = 0;; i++ ) {
+                signal(&cond1b);
+                if( i > N ) break;
+                wait(&cond1a);
+        }
+}
+
+void main( thrd1a * this ) { side1A( &mon1, this->out ); }
+void main( thrd1b * this ) { side1B( &mon1 ); }
+
+long long int measure_1_sched_int() {
+        long long int t;
+        {
+                thrd1a a = { &t };
+                thrd1b b;
+        }
+        return t;
+}
+
+//-----------------------------------------------------------------------------
+// multi internal sched entry
+mon_t mon2;
+
+condition cond2a; 
+condition cond2b;
+
+thread thrd2a { long long int * out; };
+thread thrd2b {};
+
+void ?{}( thrd2a * this, long long int * out ) {
+        this->out = out;
+}
+
+void side2A( mon_t * mutex a, mon_t * mutex b, long long int * out ) {
+        long long int StartTime, EndTime;
+
+        StartTime = Time();
+        for( int i = 0;; i++ ) {
+                signal(&cond2a);
+                if( i > N ) break;
+                wait(&cond2b);
+        }
+        EndTime = Time();
+
+        *out = ( EndTime - StartTime ) / N;
+}
+
+void side2B( mon_t * mutex a, mon_t * mutex b ) {
+        for( int i = 0;; i++ ) {
+                signal(&cond2b);
+                if( i > N ) break;
+                wait(&cond2a);
+        }
+}
+
+void main( thrd2a * this ) { side2A( &mon1, &mon2, this->out ); }
+void main( thrd2b * this ) { side2B( &mon1, &mon2 ); }
+
+long long int measure_2_sched_int() {
+        long long int t;
+        {
+                thrd2a a = { &t };
+                thrd2b b;
+        }
+        return t;
+}
+
+//-----------------------------------------------------------------------------
+// main loop
 int main()
 {
-        sout | time(NULL) | ',' | measure_coroutine() | ',' | measure_thread() | endl;
-}
+        sout | time(NULL) | ',';
+        sout | measure_coroutine() | ',';
+        sout | measure_thread() | ',';
+        sout | measure_1_monitor_entry() | ',';
+        sout | measure_2_monitor_entry() | ',';
+        sout | measure_1_sched_int() | ',';
+        sout | measure_2_sched_int() | endl;
+}

src/libcfa/concurrency/monitor

@@ -81 +81 @@
 }
 
+static inline void ^?{}( condition * this ) {
+        free( this->monitors );
+}
+
 void wait( condition * this );
 void signal( condition * this );

src/libcfa/concurrency/monitor.c

@@ -17 +17 @@
 #include "monitor"
 
+#include <stdlib>
+
 #include "kernel_private.h"
 #include "libhdr.h"
@@ -130 +132 @@
         this_thread()->current_monitors      = this->prev_mntrs;
         this_thread()->current_monitor_count = this->prev_count;
+}
+
+void debug_break() __attribute__(( noinline ))
+{
+        
 }
 
@@ -171 +178 @@
 
         //Find the next thread(s) to run
-        unsigned short thread_count = count;
+        unsigned short thread_count = 0;
         thread_desc * threads[ count ];
+        for(int i = 0; i < count; i++) {
+                threads[i] = 0;
+        }
+
+        debug_break();
 
         for( int i = 0; i < count; i++) {
                 thread_desc * new_owner = next_thread( this->monitors[i] );
-                thread_count = insert_unique( threads, i, new_owner );
-        }
+                thread_count = insert_unique( threads, thread_count, new_owner );
+        }
+
+        debug_break();
 
         LIB_DEBUG_PRINT_SAFE("Will unblock: ");
@@ -339 +353 @@
                 LIB_DEBUG_PRINT_SAFE("Branding\n");
                 assertf( thrd->current_monitors != NULL, "No current monitor to brand condition", thrd->current_monitors );
-                this->monitors = thrd->current_monitors;
                 this->monitor_count = thrd->current_monitor_count;
+
+                this->monitors = malloc( this->monitor_count * sizeof( *this->monitors ) );
+                for( int i = 0; i < this->monitor_count; i++ ) {
+                        this->monitors[i] = thrd->current_monitors[i];
+                }
         }
 }
 
 static inline unsigned short insert_unique( thread_desc ** thrds, unsigned short end, thread_desc * val ) {
-        for(int i = 0; i < end; i++) {
+        if( !val ) return end;
+
+        for(int i = 0; i <= end; i++) {
                 if( thrds[i] == val ) return end;
         }

src/libcfa/concurrency/thread.c

@@ -40 +40 @@
         this->next = NULL;
 
-        this->current_monitors      = NULL;
-        this->current_monitor_count = 0;
+        this->current_monitors      = &this->mon;
+        this->current_monitor_count = 1;
 }
 

src/libcfa/rational

@@ -12 +12 @@
 // Created On       : Wed Apr  6 17:56:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  4 14:11:45 2016
-// Update Count     : 16
+// Last Modified On : Mon May  1 08:25:06 2017
+// Update Count     : 33
 //
+
 #ifndef RATIONAL_H
 #define RATIONAL_H
@@ -21 +22 @@
 
 // implementation
+typedef long int RationalImpl;
 struct Rational {
-        long int numerator, denominator;                                        // invariant: denominator > 0
+        RationalImpl numerator, denominator;                                    // invariant: denominator > 0
 }; // Rational
 
@@ -31 +33 @@
 // constructors
 void ?{}( Rational * r );
-void ?{}( Rational * r, long int n );
-void ?{}( Rational * r, long int n, long int d );
+void ?{}( Rational * r, RationalImpl n );
+void ?{}( Rational * r, RationalImpl n, RationalImpl d );
 
-// getter/setter for numerator/denominator
-long int numerator( Rational r );
-long int numerator( Rational r, long int n );
-long int denominator( Rational r );
-long int denominator( Rational r, long int d );
+// getter for numerator/denominator
+RationalImpl numerator( Rational r );
+RationalImpl denominator( Rational r );
+[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational src );
+// setter for numerator/denominator
+RationalImpl numerator( Rational r, RationalImpl n );
+RationalImpl denominator( Rational r, RationalImpl d );
 
 // comparison
@@ -57 +61 @@
 // conversion
 double widen( Rational r );
-Rational narrow( double f, long int md );
+Rational narrow( double f, RationalImpl md );
 
 // I/O

src/libcfa/rational.c

@@ -10 +10 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul  9 11:18:04 2016
-// Update Count     : 40
+// Last Modified On : Thu Apr 27 17:05:06 2017
+// Update Count     : 51
 // 
 
@@ -30 +30 @@
 // Calculate greatest common denominator of two numbers, the first of which may be negative. Used to reduce rationals.
 // alternative: https://en.wikipedia.org/wiki/Binary_GCD_algorithm
-static long int gcd( long int a, long int b ) {
+static RationalImpl gcd( RationalImpl a, RationalImpl b ) {
         for ( ;; ) {                                                                            // Euclid's algorithm
-                long int r = a % b;
+                RationalImpl r = a % b;
           if ( r == 0 ) break;
                 a = b;
@@ -40 +40 @@
 } // gcd
 
-static long int simplify( long int *n, long int *d ) {
+static RationalImpl simplify( RationalImpl *n, RationalImpl *d ) {
         if ( *d == 0 ) {
                 serr | "Invalid rational number construction: denominator cannot be equal to 0." | endl;
@@ -56 +56 @@
 } // rational
 
-void ?{}( Rational * r, long int n ) {
+void ?{}( Rational * r, RationalImpl n ) {
         r{ n, 1 };
 } // rational
 
-void ?{}( Rational * r, long int n, long int d ) {
-        long int t = simplify( &n, &d );                                        // simplify
+void ?{}( Rational * r, RationalImpl n, RationalImpl d ) {
+        RationalImpl t = simplify( &n, &d );                            // simplify
         r->numerator = n / t;
         r->denominator = d / t;
@@ -67 +67 @@
 
 
-// getter/setter for numerator/denominator
-
-long int numerator( Rational r ) {
+// getter for numerator/denominator
+
+RationalImpl numerator( Rational r ) {
         return r.numerator;
 } // numerator
 
-long int numerator( Rational r, long int n ) {
-        long int prev = r.numerator;
-        long int t = gcd( abs( n ), r.denominator );            // simplify
+RationalImpl denominator( Rational r ) {
+        return r.denominator;
+} // denominator
+
+[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational src ) {
+        return *dest = src.[ numerator, denominator ];
+}
+
+// setter for numerator/denominator
+
+RationalImpl numerator( Rational r, RationalImpl n ) {
+        RationalImpl prev = r.numerator;
+        RationalImpl t = gcd( abs( n ), r.denominator );                // simplify
         r.numerator = n / t;
         r.denominator = r.denominator / t;
@@ -81 +91 @@
 } // numerator
 
-long int denominator( Rational r ) {
-        return r.denominator;
-} // denominator
-
-long int denominator( Rational r, long int d ) {
-        long int prev = r.denominator;
-        long int t = simplify( &r.numerator, &d );                      // simplify
+RationalImpl denominator( Rational r, RationalImpl d ) {
+        RationalImpl prev = r.denominator;
+        RationalImpl t = simplify( &r.numerator, &d );                  // simplify
         r.numerator = r.numerator / t;
         r.denominator = d / t;
@@ -170 +176 @@
 
 // http://www.ics.uci.edu/~eppstein/numth/frap.c
-Rational narrow( double f, long int md ) {
+Rational narrow( double f, RationalImpl md ) {
         if ( md <= 1 ) {                                                                        // maximum fractional digits too small?
                 return (Rational){ f, 1};                                               // truncate fraction
@@ -176 +182 @@
 
         // continued fraction coefficients
-        long int m00 = 1, m11 = 1, m01 = 0, m10 = 0;
-        long int ai, t;
+        RationalImpl m00 = 1, m11 = 1, m01 = 0, m10 = 0;
+        RationalImpl ai, t;
 
         // find terms until denom gets too big
         for ( ;; ) {
-                ai = (long int)f;
+                ai = (RationalImpl)f;
           if ( ! (m10 * ai + m11 <= md) ) break;
                 t = m00 * ai + m01;
@@ -202 +208 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype *is, Rational *r ) {
-        long int t;
+        RationalImpl t;
         is | &(r->numerator) | &(r->denominator);
         t = simplify( &(r->numerator), &(r->denominator) );

src/main.cc

@@ -37 +37 @@
 #include "CodeGen/FixMain.h"
 #include "CodeTools/DeclStats.h"
+#include "CodeTools/TrackLoc.h"
 #include "ControlStruct/Mutate.h"
 #include "SymTab/Validate.h"
@@ -308 +309 @@
                 } // if
 
+                CodeTools::fillLocations( translationUnit );
                 CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true );
 

src/tests/Makefile.am

@@ -22 +22 @@
 concurrent=yes
 quick_test+= coroutine thread monitor
-concurrent_test=coroutine thread monitor multi-monitor sched-int sched-ext preempt
+concurrent_test=coroutine thread monitor multi-monitor sched-int-disjoint sched-int-barge sched-int-wait sched-ext sched-ext-multi preempt
 else
 concurrent=no

src/tests/Makefile.in

@@ -230 +230 @@
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
 @BUILD_CONCURRENCY_FALSE@concurrent_test = 
-@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int sched-ext preempt
-TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
+@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-disjoint sched-int-barge sched-int-wait sched-ext sched-ext-multi preempt
 
 # applies to both programs
 EXTRA_FLAGS = 
 BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 fstream_test_SOURCES = fstream_test.c
 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c

src/tests/rational.c

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 18:29:37 2016
-// Update Count     : 25
+// Last Modified On : Tue May  2 22:11:05 2017
+// Update Count     : 41
 // 
 
@@ -36 +36 @@
         b = (Rational){ -3, 2 };
         sout | a | b | endl;
-        sout | a == 1 | endl;
+//      sout | a == 1 | endl; // FIX ME
         sout | a != b | endl;
         sout | a <  b | endl;
@@ -61 +61 @@
         sout | narrow( 3.14159265358979, 256 ) | endl;
 
+        sout | "decompose" | endl;
+        RationalImpl n, d;
+//      [n, d] = a;
+//      sout | a | n | d | endl;
+
+        sout | "more tests" | endl;
         Rational x = { 1, 2 }, y = { 2 };
         sout | x - y | endl;