Changeset 02af79b0 for src

Timestamp:

May 9, 2019, 4:47:53 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b038fe4

Parents:

ec28948 (diff), db27767 (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:

• AST/Bitfield.hpp (added)
• AST/Decl.cpp (added)
• AST/Decl.hpp (added)
• AST/DeclReplacer.cpp (added)
• AST/DeclReplacer.hpp (added)
• AST/Fwd.hpp (added)
• AST/Label.hpp (added)
• AST/LinkageSpec.cpp (added)
• AST/LinkageSpec.hpp (added)
• AST/Node.hpp (added)
• AST/ParseNode.hpp (added)
• AST/Pass.hpp (added)
• AST/Pass.impl.hpp (added)
• AST/Pass.proto.hpp (added)
• AST/Stmt.cpp (added)
• AST/Stmt.hpp (added)
• AST/StorageClasses.hpp (added)
• AST/Type.hpp (added)
• AST/Visitor.hpp (added)
• AST/porting.md (added)
• BasicTypes-gen.cc (modified) (2 diffs)
• CodeGen/CodeGenerator.cc (modified) (37 diffs)
• CodeGen/CodeGenerator.h (modified) (4 diffs)
• CodeGen/GenType.cc (modified) (19 diffs)
• CodeGen/GenType.h (modified) (2 diffs)
• CodeGen/Options.h (added)
• Common/Assert.cc (modified) (1 diff)
• Common/PassVisitor.h (modified) (3 diffs)
• Common/PassVisitor.impl.h (modified) (4 diffs)
• Common/PassVisitor.proto.h (modified) (2 diffs)
• CompilationState.cc (modified) (2 diffs)
• CompilationState.h (modified) (2 diffs)
• ControlStruct/ExceptTranslate.cc (modified) (2 diffs)
• GenPoly/Box.cc (modified) (3 diffs)
• GenPoly/GenPoly.cc (modified) (2 diffs)
• GenPoly/GenPoly.h (modified) (1 diff)
• GenPoly/InstantiateGeneric.cc (modified) (1 diff)
• GenPoly/Specialize.cc (modified) (3 diffs)
• InitTweak/FixInit.cc (modified) (2 diffs)
• ResolvExpr/ConversionCost.cc (modified) (3 diffs)
• ResolvExpr/RenameVars.cc (modified) (4 diffs)
• ResolvExpr/TypeEnvironment.h (modified) (3 diffs)
• SynTree/Declaration.h (modified) (4 diffs)
• SynTree/TypeSubstitution.cc (modified) (2 diffs)
• SynTree/TypeSubstitution.h (modified) (9 diffs)
• Tuples/TupleExpansion.cc (modified) (1 diff)
• include/cassert (modified) (1 diff)
• main.cc (modified) (25 diffs)

src/BasicTypes-gen.cc

@@ +1 @@
+#include <algorithm>
 #include <queue>
 #include <iostream>
@@ -340 +341 @@
         } // for
         code << "\t}; // costMatrix" << endl;
+
+        // maximum conversion cost from int
+        code << "\tstatic const int maxIntCost = " << *max_element(costMatrix[SignedInt], costMatrix[SignedInt] + NUMBER_OF_BASIC_TYPES) << ";" << endl;
         code << "\t";                                                                           // indentation for end marker
-
+        
         if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", ConversionCost );
         if ( (end = str.find( STARTMK, start + 1 )) == string::npos ) Abort( "start", ConversionCost );

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 : Sat May  5 09:08:32 2018
-// Update Count     : 494
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr May  2 10:47:00 2019
+// Update Count     : 497
 //
 #include "CodeGenerator.h"
@@ -83 +83 @@
         void CodeGenerator::updateLocation( CodeLocation const & to ) {
                 // skip if linemarks shouldn't appear or if codelocation is unset
-                if ( !lineMarks || to.isUnset() ) return;
+                if ( !options.lineMarks || to.isUnset() ) return;
 
                 if ( currentLocation.followedBy( to, 0 ) ) {
@@ -116 +116 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ), printExprTypes( printExprTypes ), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), options( pretty, genC, lineMarks, printExprTypes ), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, const Options &options ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), options(options), endl( *this ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
                 // GCC builtins should always be printed unmangled
-                if ( pretty || decl->linkage.is_gcc_builtin ) return decl->name;
+                if ( options.pretty || decl->linkage.is_gcc_builtin ) return decl->name;
                 if ( decl->mangleName != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
@@ -164 +165 @@
                 previsit( (BaseSyntaxNode *)node );
                 GuardAction( [this, node](){
-                        if ( printExprTypes && node->result ) {
-                                output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
+                        if ( options.printExprTypes && node->result ) {
+                                output << " /* " << genType( node->result, "", options ) << " */ ";
                         }
                 } );
@@ -173 +174 @@
         void CodeGenerator::postvisit( FunctionDecl * functionDecl ) {
                 // deleted decls should never be used, so don't print them
-                if ( functionDecl->isDeleted && genC ) return;
+                if ( functionDecl->isDeleted && options.genC ) return;
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -180 +181 @@
                 functionDecl->get_funcSpec().print( output );
 
-                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty, genC );
+                Options subOptions = options;
+                subOptions.anonymousUnused = functionDecl->has_body();
+                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), subOptions );
 
                 asmName( functionDecl );
@@ -194 +197 @@
         void CodeGenerator::postvisit( ObjectDecl * objectDecl ) {
                 // deleted decls should never be used, so don't print them
-                if ( objectDecl->isDeleted && genC ) return;
-                if (objectDecl->get_name().empty() && genC ) {
+                if ( objectDecl->isDeleted && options.genC ) return;
+                if (objectDecl->get_name().empty() && options.genC ) {
                         // only generate an anonymous name when generating C code, otherwise it clutters the output too much
                         static UniqueName name = { "__anonymous_object" };
                         objectDecl->set_name( name.newName() );
+            // Stops unused parameter warnings.
+            if ( options.anonymousUnused ) {
+                objectDecl->attributes.push_back( new Attribute( "unused" ) );
+            }
                 }
 
@@ -205 +212 @@
 
                 handleStorageClass( objectDecl );
-                output << genType( objectDecl->get_type(), mangleName( objectDecl ), pretty, genC );
+                output << genType( objectDecl->get_type(), mangleName( objectDecl ), options.pretty, options.genC );
 
                 asmName( objectDecl );
@@ -224 +231 @@
 
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
-                if( ! aggDecl->parameters.empty() && ! genC ) {
+                if( ! aggDecl->parameters.empty() && ! options.genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         output << "forall(";
@@ -294 +301 @@
 
         void CodeGenerator::postvisit( TraitDecl * traitDecl ) {
-                assertf( ! genC, "TraitDecls should not reach code generation." );
+                assertf( ! options.genC, "TraitDecls should not reach code generation." );
                 extension( traitDecl );
                 handleAggregate( traitDecl, "trait " );
@@ -300 +307 @@
 
         void CodeGenerator::postvisit( TypedefDecl * typeDecl ) {
-                assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
+                assertf( ! options.genC, "Typedefs are removed and substituted in earlier passes." );
                 output << "typedef ";
-                output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
+                output << genType( typeDecl->get_base(), typeDecl->get_name(), options ) << endl;
         }
 
         void CodeGenerator::postvisit( TypeDecl * typeDecl ) {
-                assertf( ! genC, "TypeDecls should not reach code generation." );
+                assertf( ! options.genC, "TypeDecls should not reach code generation." );
                 output << typeDecl->genTypeString() << " " << typeDecl->name;
                 if ( typeDecl->sized ) {
@@ -371 +378 @@
 
         void CodeGenerator::postvisit( ConstructorInit * init ){
-                assertf( ! genC, "ConstructorInit nodes should not reach code generation." );
+                assertf( ! options.genC, "ConstructorInit nodes should not reach code generation." );
                 // pseudo-output for constructor/destructor pairs
                 output << "<ctorinit>{" << endl << ++indent << "ctor: ";
@@ -507 +514 @@
                                         } else {
                                                 // no constructors with 0 or more than 2 parameters
-                                                assertf( ! genC, "UntypedExpr constructor/destructor with 0 or more than 2 parameters." );
+                                                assertf( ! options.genC, "UntypedExpr constructor/destructor with 0 or more than 2 parameters." );
                                                 output << "(";
                                                 (*arg++)->accept( *visitor );
@@ -604 +611 @@
                         // an lvalue cast, this has been taken out.
                         output << "(";
-                        output << genType( castExpr->get_result(), "", pretty, genC );
+                        output << genType( castExpr->get_result(), "", options );
                         output << ")";
                 } // if
@@ -612 +619 @@
 
         void CodeGenerator::postvisit( KeywordCastExpr * castExpr ) {
-                assertf( ! genC, "KeywordCast should not reach code generation." );
+                assertf( ! options.genC, "KeywordCast should not reach code generation." );
                 extension( castExpr );
                 output << "((" << castExpr->targetString() << " &)";
@@ -620 +627 @@
 
         void CodeGenerator::postvisit( VirtualCastExpr * castExpr ) {
-                assertf( ! genC, "VirtualCastExpr should not reach code generation." );
+                assertf( ! options.genC, "VirtualCastExpr should not reach code generation." );
                 extension( castExpr );
                 output << "(virtual ";
@@ -628 +635 @@
 
         void CodeGenerator::postvisit( UntypedMemberExpr * memberExpr ) {
-                assertf( ! genC, "UntypedMemberExpr should not reach code generation." );
+                assertf( ! options.genC, "UntypedMemberExpr should not reach code generation." );
                 extension( memberExpr );
                 memberExpr->get_aggregate()->accept( *visitor );
@@ -661 +668 @@
                 output << "sizeof(";
                 if ( sizeofExpr->get_isType() ) {
-                        output << genType( sizeofExpr->get_type(), "", pretty, genC );
+                        output << genType( sizeofExpr->get_type(), "", options );
                 } else {
                         sizeofExpr->get_expr()->accept( *visitor );
@@ -673 +680 @@
                 output << "__alignof__(";
                 if ( alignofExpr->get_isType() ) {
-                        output << genType( alignofExpr->get_type(), "", pretty, genC );
+                        output << genType( alignofExpr->get_type(), "", options );
                 } else {
                         alignofExpr->get_expr()->accept( *visitor );
@@ -681 +688 @@
 
         void CodeGenerator::postvisit( UntypedOffsetofExpr * offsetofExpr ) {
-                assertf( ! genC, "UntypedOffsetofExpr should not reach code generation." );
+                assertf( ! options.genC, "UntypedOffsetofExpr should not reach code generation." );
                 output << "offsetof(";
-                output << genType( offsetofExpr->get_type(), "", pretty, genC );
+                output << genType( offsetofExpr->get_type(), "", options );
                 output << ", " << offsetofExpr->get_member();
                 output << ")";
@@ -691 +698 @@
                 // use GCC builtin
                 output << "__builtin_offsetof(";
-                output << genType( offsetofExpr->get_type(), "", pretty, genC );
+                output << genType( offsetofExpr->get_type(), "", options );
                 output << ", " << mangleName( offsetofExpr->get_member() );
                 output << ")";
@@ -697 +704 @@
 
         void CodeGenerator::postvisit( OffsetPackExpr * offsetPackExpr ) {
-                assertf( ! genC, "OffsetPackExpr should not reach code generation." );
-                output << "__CFA_offsetpack(" << genType( offsetPackExpr->get_type(), "", pretty, genC ) << ")";
+                assertf( ! options.genC, "OffsetPackExpr should not reach code generation." );
+                output << "__CFA_offsetpack(" << genType( offsetPackExpr->get_type(), "", options ) << ")";
         }
 
@@ -728 +735 @@
                 extension( commaExpr );
                 output << "(";
-                if ( genC ) {
+                if ( options.genC ) {
                         // arg1 of a CommaExpr is never used, so it can be safely cast to void to reduce gcc warnings.
                         commaExpr->set_arg1( new CastExpr( commaExpr->get_arg1() ) );
@@ -739 +746 @@
 
         void CodeGenerator::postvisit( TupleAssignExpr * tupleExpr ) {
-                assertf( ! genC, "TupleAssignExpr should not reach code generation." );
+                assertf( ! options.genC, "TupleAssignExpr should not reach code generation." );
                 tupleExpr->stmtExpr->accept( *visitor );
         }
 
         void CodeGenerator::postvisit( UntypedTupleExpr * tupleExpr ) {
-                assertf( ! genC, "UntypedTupleExpr should not reach code generation." );
+                assertf( ! options.genC, "UntypedTupleExpr should not reach code generation." );
                 extension( tupleExpr );
                 output << "[";
@@ -752 +759 @@
 
         void CodeGenerator::postvisit( TupleExpr * tupleExpr ) {
-                assertf( ! genC, "TupleExpr should not reach code generation." );
+                assertf( ! options.genC, "TupleExpr should not reach code generation." );
                 extension( tupleExpr );
                 output << "[";
@@ -760 +767 @@
 
         void CodeGenerator::postvisit( TupleIndexExpr * tupleExpr ) {
-                assertf( ! genC, "TupleIndexExpr should not reach code generation." );
+                assertf( ! options.genC, "TupleIndexExpr should not reach code generation." );
                 extension( tupleExpr );
                 tupleExpr->get_tuple()->accept( *visitor );
@@ -767 +774 @@
 
         void CodeGenerator::postvisit( TypeExpr * typeExpr ) {
-                // if ( genC ) std::cerr << "typeexpr still exists: " << typeExpr << std::endl;
-                // assertf( ! genC, "TypeExpr should not reach code generation." );
-                if ( ! genC ) {
-                        output<< genType( typeExpr->get_type(), "", pretty, genC );
+                // if ( options.genC ) std::cerr << "typeexpr still exists: " << typeExpr << std::endl;
+                // assertf( ! options.genC, "TypeExpr should not reach code generation." );
+                if ( ! options.genC ) {
+                        output << genType( typeExpr->get_type(), "", options );
                 }
         }
@@ -788 +795 @@
         void CodeGenerator::postvisit( CompoundLiteralExpr *compLitExpr ) {
                 assert( compLitExpr->get_result() && dynamic_cast< ListInit * > ( compLitExpr->get_initializer() ) );
-                output << "(" << genType( compLitExpr->get_result(), "", pretty, genC ) << ")";
+                output << "(" << genType( compLitExpr->get_result(), "", options ) << ")";
                 compLitExpr->get_initializer()->accept( *visitor );
         }
 
         void CodeGenerator::postvisit( UniqueExpr * unqExpr ) {
-                assertf( ! genC, "Unique expressions should not reach code generation." );
+                assertf( ! options.genC, "Unique expressions should not reach code generation." );
                 output << "unq<" << unqExpr->get_id() << ">{ ";
                 unqExpr->get_expr()->accept( *visitor );
@@ -829 +836 @@
 
         void CodeGenerator::postvisit( ConstructorExpr * expr ) {
-                assertf( ! genC, "Unique expressions should not reach code generation." );
+                assertf( ! options.genC, "Unique expressions should not reach code generation." );
                 expr->callExpr->accept( *visitor );
         }
 
         void CodeGenerator::postvisit( DeletedExpr * expr ) {
-                assertf( ! genC, "Deleted expressions should not reach code generation." );
+                assertf( ! options.genC, "Deleted expressions should not reach code generation." );
                 expr->expr->accept( *visitor );
         }
 
         void CodeGenerator::postvisit( DefaultArgExpr * arg ) {
-                assertf( ! genC, "Default argument expressions should not reach code generation." );
+                assertf( ! options.genC, "Default argument expressions should not reach code generation." );
                 arg->expr->accept( *visitor );
         }
 
         void CodeGenerator::postvisit( GenericExpr * expr ) {
-                assertf( ! genC, "C11 _Generic expressions should not reach code generation." );
+                assertf( ! options.genC, "C11 _Generic expressions should not reach code generation." );
                 output << "_Generic(";
                 expr->control->accept( *visitor );
@@ -854 +861 @@
                                 output << "default: ";
                         } else {
-                                output << genType( assoc.type, "", pretty, genC ) << ": ";
+                                output << genType( assoc.type, "", options ) << ": ";
                         }
                         assoc.expr->accept( *visitor );
@@ -889 +896 @@
         void CodeGenerator::postvisit( ExprStmt * exprStmt ) {
                 assert( exprStmt );
-                if ( genC ) {
+                if ( options.genC ) {
                         // cast the top-level expression to void to reduce gcc warnings.
                         exprStmt->set_expr( new CastExpr( exprStmt->get_expr() ) );
@@ -999 +1006 @@
                   case BranchStmt::FallThrough:
                   case BranchStmt::FallThroughDefault:
-                        assertf( ! genC, "fallthru should not reach code generation." );
+                        assertf( ! options.genC, "fallthru should not reach code generation." );
                   output << "fallthru";
                         break;
                 } // switch
                 // print branch target for labelled break/continue/fallthru in debug mode
-                if ( ! genC && branchStmt->get_type() != BranchStmt::Goto ) {
+                if ( ! options.genC && branchStmt->get_type() != BranchStmt::Goto ) {
                         if ( ! branchStmt->get_target().empty() ) {
                                 output << " " << branchStmt->get_target();
@@ -1021 +1028 @@
 
         void CodeGenerator::postvisit( ThrowStmt * throwStmt ) {
-                assertf( ! genC, "Throw statements should not reach code generation." );
+                assertf( ! options.genC, "Throw statements should not reach code generation." );
 
                 output << ((throwStmt->get_kind() == ThrowStmt::Terminate) ?
@@ -1036 +1043 @@
         }
         void CodeGenerator::postvisit( CatchStmt * stmt ) {
-                assertf( ! genC, "Catch statements should not reach code generation." );
+                assertf( ! options.genC, "Catch statements should not reach code generation." );
 
                 output << ((stmt->get_kind() == CatchStmt::Terminate) ?
@@ -1053 +1060 @@
 
         void CodeGenerator::postvisit( WaitForStmt * stmt ) {
-                assertf( ! genC, "Waitfor statements should not reach code generation." );
+                assertf( ! options.genC, "Waitfor statements should not reach code generation." );
 
                 bool first = true;
@@ -1099 +1106 @@
 
         void CodeGenerator::postvisit( WithStmt * with ) {
-                if ( ! genC ) {
+                if ( ! options.genC ) {
                         output << "with ( ";
                         genCommaList( with->exprs.begin(), with->exprs.end() );
@@ -1165 +1172 @@
 
         void CodeGenerator::postvisit( ImplicitCtorDtorStmt * stmt ) {
-                assertf( ! genC, "ImplicitCtorDtorStmts should not reach code generation." );
+                assertf( ! options.genC, "ImplicitCtorDtorStmts should not reach code generation." );
                 stmt->callStmt->accept( *visitor );
         }

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 15:40:00 2017
-// Update Count     : 56
+// Last Modified On : Tue Apr 30 12:01:00 2019
+// Update Count     : 57
 //
 
@@ -20 +20 @@
 #include <string>                 // for string
 
+#include "CodeGen/Options.h"      // for Options
 #include "Common/Indenter.h"      // for Indenter
 #include "Common/PassVisitor.h"   // for PassVisitor
@@ -31 +32 @@
 
                 CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false, bool printExprTypes = false );
+                CodeGenerator( std::ostream &os, const Options &options );
 
                 //*** Turn off visit_children for all nodes
@@ -144 +146 @@
                 std::ostream & output;
                 LabelPrinter printLabels;
-                bool pretty = false;  // pretty print
-                bool genC = false;    // true if output has to be C code
-                bool lineMarks = false;
-                bool printExprTypes = false;
+                Options options;
         public:
                 LineEnder endl;

src/CodeGen/GenType.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 : Fri Mar 17 09:02:28 2017
-// Update Count     : 22
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May  1 15:24:00 2019
+// Update Count     : 23
 //
 #include "GenType.h"
@@ -28 +28 @@
         struct GenType : public WithVisitorRef<GenType>, public WithShortCircuiting {
                 std::string typeString;
-                GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks );
+                GenType( const std::string &typeString, const Options &options );
 
                 void previsit( BaseSyntaxNode * );
@@ -57 +57 @@
                 void genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic );
 
-                bool pretty = false;    // pretty print
-                bool genC = false;      // generating C code?
-                bool lineMarks = false; // lineMarks on for CodeGenerator?
+                Options options;
         };
 
-        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
-                PassVisitor<GenType> gt( baseString, pretty, genC, lineMarks );
+        std::string genType( Type *type, const std::string &baseString, const Options &options ) {
+                PassVisitor<GenType> gt( baseString, options );
                 std::ostringstream os;
 
                 if ( ! type->get_attributes().empty() ) {
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         cg.pass.genAttributes( type->get_attributes() );
                 } // if
@@ -75 +73 @@
         }
 
-  std::string genPrettyType( Type * type, const std::string & baseString ) {
-        return genType( type, baseString, true, false );
-  }
-
-        GenType::GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks ) : typeString( typeString ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
+        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
+                return genType( type, baseString, Options(pretty, genC, lineMarks, false ) );
+        }
+
+        std::string genPrettyType( Type * type, const std::string & baseString ) {
+                return genType( type, baseString, true, false );
+        }
+
+        GenType::GenType( const std::string &typeString, const Options &options ) : typeString( typeString ), options( options ) {}
 
         // *** BaseSyntaxNode
@@ -133 +135 @@
                 } // if
                 if ( dimension != 0 ) {
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
@@ -167 +169 @@
         void GenType::postvisit( ReferenceType * refType ) {
                 assert( refType->base != 0);
-                assertf( ! genC, "Reference types should not reach code generation." );
+                assertf( ! options.genC, "Reference types should not reach code generation." );
                 handleQualifiers( refType );
                 typeString = "&" + typeString;
@@ -195 +197 @@
                         } // if
                 } else {
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         os << "(" ;
 
@@ -215 +217 @@
 
                 // add forall
-                if( ! funcType->forall.empty() && ! genC ) {
+                if( ! funcType->forall.empty() && ! options.genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         std::ostringstream os;
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         os << "forall(";
                         cg.pass.genCommaList( funcType->forall.begin(), funcType->forall.end() );
@@ -229 +231 @@
                 if ( ! refType->parameters.empty() ) {
                         std::ostringstream os;
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         os << "(";
                         cg.pass.genCommaList( refType->parameters.begin(), refType->parameters.end() );
@@ -240 +242 @@
         void GenType::postvisit( StructInstType * structInst )  {
                 typeString = structInst->name + handleGeneric( structInst ) + " " + typeString;
-                if ( genC ) typeString = "struct " + typeString;
+                if ( options.genC ) typeString = "struct " + typeString;
                 handleQualifiers( structInst );
         }
@@ -246 +248 @@
         void GenType::postvisit( UnionInstType * unionInst ) {
                 typeString = unionInst->name + handleGeneric( unionInst ) + " " + typeString;
-                if ( genC ) typeString = "union " + typeString;
+                if ( options.genC ) typeString = "union " + typeString;
                 handleQualifiers( unionInst );
         }
@@ -252 +254 @@
         void GenType::postvisit( EnumInstType * enumInst ) {
                 typeString = enumInst->name + " " + typeString;
-                if ( genC ) typeString = "enum " + typeString;
+                if ( options.genC ) typeString = "enum " + typeString;
                 handleQualifiers( enumInst );
         }
@@ -262 +264 @@
 
         void GenType::postvisit( TupleType * tupleType ) {
-                assertf( ! genC, "Tuple types should not reach code generation." );
+                assertf( ! options.genC, "Tuple types should not reach code generation." );
                 unsigned int i = 0;
                 std::ostringstream os;
@@ -268 +270 @@
                 for ( Type * t : *tupleType ) {
                         i++;
-                        os << genType( t, "", pretty, genC, lineMarks ) << (i == tupleType->size() ? "" : ", ");
+                        os << genType( t, "", options ) << (i == tupleType->size() ? "" : ", ");
                 }
                 os << "] ";
@@ -281 +283 @@
         void GenType::postvisit( ZeroType * zeroType ) {
                 // ideally these wouldn't hit codegen at all, but should be safe to make them ints
-                typeString = (pretty ? "zero_t " : "long int ") + typeString;
+                typeString = (options.pretty ? "zero_t " : "long int ") + typeString;
                 handleQualifiers( zeroType );
         }
@@ -287 +289 @@
         void GenType::postvisit( OneType * oneType ) {
                 // ideally these wouldn't hit codegen at all, but should be safe to make them ints
-                typeString = (pretty ? "one_t " : "long int ") + typeString;
+                typeString = (options.pretty ? "one_t " : "long int ") + typeString;
                 handleQualifiers( oneType );
         }
 
         void GenType::postvisit( GlobalScopeType * globalType ) {
-                assertf( ! genC, "Global scope type should not reach code generation." );
+                assertf( ! options.genC, "Global scope type should not reach code generation." );
                 handleQualifiers( globalType );
         }
 
         void GenType::postvisit( TraitInstType * inst ) {
-                assertf( ! genC, "Trait types should not reach code generation." );
+                assertf( ! options.genC, "Trait types should not reach code generation." );
                 typeString = inst->name + " " + typeString;
                 handleQualifiers( inst );
@@ -304 +306 @@
         void GenType::postvisit( TypeofType * typeof ) {
                 std::ostringstream os;
-                PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                PassVisitor<CodeGenerator> cg( os, options );
                 os << "typeof(";
                 typeof->expr->accept( cg );
@@ -313 +315 @@
 
         void GenType::postvisit( QualifiedType * qualType ) {
-                assertf( ! genC, "Qualified types should not reach code generation." );
-                std::ostringstream os;
-                os << genType( qualType->parent, "", pretty, genC, lineMarks ) << "." << genType( qualType->child, "", pretty, genC, lineMarks ) << typeString;
+                assertf( ! options.genC, "Qualified types should not reach code generation." );
+                std::ostringstream os;
+                os << genType( qualType->parent, "", options ) << "." << genType( qualType->child, "", options ) << typeString;
                 typeString = os.str();
                 handleQualifiers( qualType );
@@ -333 +335 @@
                         typeString = "_Atomic " + typeString;
                 } // if
-                if ( type->get_lvalue() && ! genC ) {
+                if ( type->get_lvalue() && ! options.genC ) {
                         // when not generating C code, print lvalue for debugging.
                         typeString = "lvalue " + typeString;

src/CodeGen/GenType.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 : Fri Jul 21 22:17:23 2017
-// Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Apr 30 11:47:00 2019
+// Update Count     : 3
 //
 
@@ -18 +18 @@
 #include <string>  // for string
 
+#include "CodeGen/Options.h" // for Options
+
 class Type;
 
 namespace CodeGen {
+        std::string genType( Type *type, const std::string &baseString, const Options &options );
         std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false, bool lineMarks = false );
   std::string genPrettyType( Type * type, const std::string & baseString );

src/Common/Assert.cc

@@ -39 +39 @@
 }
 
+void abort(const char *fmt, ... ) noexcept __attribute__((noreturn, format(printf, 1, 2)));
+void abort(const char *fmt, ... ) noexcept {
+        va_list args;
+        va_start( args, fmt );
+        vfprintf( stderr, fmt, args );
+        va_end( args );
+        fprintf( stderr, "\n" );
+        abort();
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/Common/PassVisitor.h

@@ -4 +4 @@
 
 #include <stack>
+#include <type_traits>
 
 #include "Common/Stats.h"
@@ -301 +302 @@
 
 
-        TypeSubstitution **             get_env_ptr    () { return env_impl             ( pass, 0); }
+        auto                                    get_env_ptr    () -> decltype(env_impl( pass, 0)) { return env_impl( pass, 0); }
         std::list< Statement* > *       get_beforeStmts() { return stmtsToAddBefore_impl( pass, 0); }
         std::list< Statement* > *       get_afterStmts () { return stmtsToAddAfter_impl ( pass, 0); }
@@ -348 +349 @@
 };
 
+class WithConstTypeSubstitution {
+protected:
+        WithConstTypeSubstitution() = default;
+        ~WithConstTypeSubstitution() = default;
+
+public:
+        const TypeSubstitution * env = nullptr;
+};
+
 class WithStmtsToAdd {
 protected:

src/Common/PassVisitor.impl.h

@@ -20 +20 @@
 
 #define MUTATE_END( type, node )                \
-        return call_postmutate< type * >( node ); \
+        auto __return = call_postmutate< type * >( node ); \
+        assert( __return ); \
+        return __return;
 
 
@@ -253 +255 @@
 
         // don't want statements from outer CompoundStmts to be added to this CompoundStmt
-        ValueGuardPtr< TypeSubstitution * >  oldEnv        ( get_env_ptr    () );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< DeclList_t >          oldBeforeDecls( get_beforeDecls() );
         ValueGuardPtr< DeclList_t >          oldAfterDecls ( get_afterDecls () );
@@ -1995 +1997 @@
 
         // don't want statements from outer CompoundStmts to be added to this StmtExpr
-        ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
@@ -2012 +2014 @@
 
         // don't want statements from outer CompoundStmts to be added to this StmtExpr
-        ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< typename std::remove_pointer<decltype(get_env_ptr())>::type >  oldEnv( get_env_ptr() );
         ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );

src/Common/PassVisitor.proto.h

@@ -165 +165 @@
 static inline type * name##_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) long unused ) { return nullptr;}    \
 
-FIELD_PTR( TypeSubstitution *, env )
+FIELD_PTR( const TypeSubstitution *, env )
 FIELD_PTR( std::list< Statement* >, stmtsToAddBefore )
 FIELD_PTR( std::list< Statement* >, stmtsToAddAfter  )
@@ -174 +174 @@
 FIELD_PTR( PassVisitor<pass_type> * const, visitor )
 
+#undef FIELD_PTR
+
 //---------------------------------------------------------
 // Indexer

src/CompilationState.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Mon Ju1 30 10:47:01 2018
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Ju1 30 10:46:25 2018
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri May  3 13:45:23 2019
+// Update Count     : 4
 //
 
-bool
+int
         astp = false,
         bresolvep = false,
@@ -26 +26 @@
         libcfap = false,
         nopreludep = false,
-        noprotop = false,
+        genproto = false,
         nomainp = false,
         parsep = false,

src/CompilationState.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Mon Ju1 30 10:47:01 2018
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Ju1 30 10:46:25 2018
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri May  3 13:43:21 2019
+// Update Count     : 4
 //
 
 extern int yydebug;                   // set for -g flag (Grammar)
-extern bool
+extern int
         astp,
         bresolvep,
@@ -27 +27 @@
         libcfap,
         nopreludep,
-        noprotop,
+        genproto,
         nomainp,
         parsep,

src/ControlStruct/ExceptTranslate.cc

@@ -617 +617 @@
                                 return create_terminate_rethrow( throwStmt );
                         } else {
-                                assertf(false, "Invalid throw in %s at %i\n",
+                                abort("Invalid throw in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
                                         throwStmt->location.first_line);
-                                return nullptr;
                         }
                 } else {
@@ -628 +627 @@
                                 return create_resume_rethrow( throwStmt );
                         } else {
-                                assertf(false, "Invalid throwResume in %s at %i\n",
+                                abort("Invalid throwResume in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
                                         throwStmt->location.first_line);
-                                return nullptr;
                         }
                 }

src/GenPoly/Box.cc

@@ -76 +76 @@
 
                 /// Replaces polymorphic return types with out-parameters, replaces calls to polymorphic functions with adapter calls as needed, and adds appropriate type variables to the function call
-                class Pass1 final : public BoxPass, public WithTypeSubstitution, public WithStmtsToAdd, public WithGuards, public WithVisitorRef<Pass1>, public WithShortCircuiting {
+                class Pass1 final : public BoxPass, public WithConstTypeSubstitution, public WithStmtsToAdd, public WithGuards, public WithVisitorRef<Pass1>, public WithShortCircuiting {
                   public:
                         Pass1();
@@ -150 +150 @@
                 /// * Calculates polymorphic offsetof expressions from offset array
                 /// * Inserts dynamic calculation of polymorphic type layouts where needed
-                class PolyGenericCalculator final : public BoxPass, public WithGuards, public WithVisitorRef<PolyGenericCalculator>, public WithStmtsToAdd, public WithDeclsToAdd, public WithTypeSubstitution {
+                class PolyGenericCalculator final : public BoxPass, public WithGuards, public WithVisitorRef<PolyGenericCalculator>, public WithStmtsToAdd, public WithDeclsToAdd, public WithConstTypeSubstitution {
                 public:
                         PolyGenericCalculator();
@@ -1764 +1764 @@
 
                 Expression *PolyGenericCalculator::postmutate( SizeofExpr *sizeofExpr ) {
-                        Type *ty = sizeofExpr->get_isType() ? 
+                        Type *ty = sizeofExpr->get_isType() ?
                                 sizeofExpr->get_type() : sizeofExpr->get_expr()->get_result();
-                        
+
                         Expression * gen = genSizeof( ty );
                         if ( gen ) {

src/GenPoly/GenPoly.cc

@@ -440 +440 @@
         }
 
-        bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, TypeSubstitution * env ) {
+        bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, const TypeSubstitution * env ) {
                 // is parameter is not polymorphic, don't need to box
                 if ( ! isPolyType( param, exprTyVars ) ) return false;
@@ -450 +450 @@
         }
 
-        bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, TypeSubstitution * env ) {
+        bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, const TypeSubstitution * env ) {
                 FunctionType * function = getFunctionType( appExpr->function->result );
                 assertf( function, "ApplicationExpr has non-function type: %s", toString( appExpr->function->result ).c_str() );

src/GenPoly/GenPoly.h

@@ -81 +81 @@
 
         /// true if arg requires boxing given exprTyVars
-        bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, TypeSubstitution * env );
+        bool needsBoxing( Type * param, Type * arg, const TyVarMap &exprTyVars, const TypeSubstitution * env );
 
         /// true if arg requires boxing in the call to appExpr
-        bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, TypeSubstitution * env );
+        bool needsBoxing( Type * param, Type * arg, ApplicationExpr * appExpr, const TypeSubstitution * env );
 
         /// Adds the type variable `tyVar` to `tyVarMap`

src/GenPoly/InstantiateGeneric.cc

@@ -168 +168 @@
 
         /// Mutator pass that replaces concrete instantiations of generic types with actual struct declarations, scoped appropriately
-        struct GenericInstantiator final : public WithTypeSubstitution, public WithDeclsToAdd, public WithVisitorRef<GenericInstantiator>, public WithGuards {
+        struct GenericInstantiator final : public WithConstTypeSubstitution, public WithDeclsToAdd, public WithVisitorRef<GenericInstantiator>, public WithGuards {
                 /// Map of (generic type, parameter list) pairs to concrete type instantiations
                 InstantiationMap< AggregateDecl, AggregateDecl > instantiations;

src/GenPoly/Specialize.cc

@@ -42 +42 @@
 
 namespace GenPoly {
-        struct Specialize final : public WithTypeSubstitution, public WithStmtsToAdd, public WithVisitorRef<Specialize> {
+        struct Specialize final : public WithConstTypeSubstitution, public WithStmtsToAdd, public WithVisitorRef<Specialize> {
                 Expression * postmutate( ApplicationExpr *applicationExpr );
                 Expression * postmutate( CastExpr *castExpr );
@@ -54 +54 @@
 
         /// Looks up open variables in actual type, returning true if any of them are bound in the environment or formal type.
-        bool needsPolySpecialization( Type *formalType, Type *actualType, TypeSubstitution *env ) {
+        bool needsPolySpecialization( Type *formalType, Type *actualType, const TypeSubstitution *env ) {
                 if ( env ) {
                         using namespace ResolvExpr;
@@ -145 +145 @@
         }
 
-        bool needsSpecialization( Type *formalType, Type *actualType, TypeSubstitution *env ) {
+        bool needsSpecialization( Type *formalType, Type *actualType, const TypeSubstitution *env ) {
                 return needsPolySpecialization( formalType, actualType, env ) || needsTupleSpecialization( formalType, actualType );
         }

src/InitTweak/FixInit.cc

@@ -72 +72 @@
                 };
 
-                struct InsertImplicitCalls : public WithTypeSubstitution {
+                struct InsertImplicitCalls : public WithConstTypeSubstitution {
                         /// wrap function application expressions as ImplicitCopyCtorExpr nodes so that it is easy to identify which
                         /// function calls need their parameters to be copy constructed
@@ -187 +187 @@
                 };
 
-                class FixCopyCtors final : public WithStmtsToAdd, public WithShortCircuiting, public WithVisitorRef<FixCopyCtors>, public WithTypeSubstitution {
+                class FixCopyCtors final : public WithStmtsToAdd, public WithShortCircuiting, public WithVisitorRef<FixCopyCtors>, public WithConstTypeSubstitution {
                   public:
                         FixCopyCtors( UnqCount & unqCount ) : unqCount( unqCount ){}

src/ResolvExpr/ConversionCost.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 07:06:19 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 26 16:33:04 2019
-// Update Count     : 24
+// Last Modified On : Mon May  6 14:18:22 2019
+// Update Count     : 25
 //
 
@@ -249 +249 @@
                 /*_FLDXC*/ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0, },
         }; // costMatrix
+        static const int maxIntCost = 15;
         // GENERATED END
         static_assert(
@@ -461 +462 @@
                         } // if
                 } else if ( dynamic_cast< PointerType* >( dest ) ) {
-                        cost = Cost::safe;
+                        cost = Cost::zero;
+                        cost.incSafe( maxIntCost + 2 ); // +1 for zero_t -> int, +1 for disambiguation
                 } // if
         }

src/ResolvExpr/RenameVars.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 12:05:18 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:36:32 2016
-// Update Count     : 5
+// Last Modified On : Tue Apr 30 17:07:57 2019
+// Update Count     : 7
 //
 
@@ -39 +39 @@
                   private:
                         int level, resetCount;
-                        std::list< std::map< std::string, std::string > > mapStack;
+                        std::list< std::unordered_map< std::string, std::string > > mapStack;
                 };
 
@@ -55 +55 @@
         namespace {
                 RenameVars::RenameVars() : level( 0 ), resetCount( 0 ) {
-                        mapStack.push_front( std::map< std::string, std::string >() );
+                        mapStack.push_front( std::unordered_map< std::string, std::string >() );
                 }
 
@@ -65 +65 @@
                 void RenameVars::previsit( TypeInstType * instType ) {
                         previsit( (Type *)instType );
-                        std::map< std::string, std::string >::const_iterator i = mapStack.front().find( instType->name );
+                        std::unordered_map< std::string, std::string >::const_iterator i = mapStack.front().find( instType->name );
                         if ( i != mapStack.front().end() ) {
                                 instType->name = i->second;

src/ResolvExpr/TypeEnvironment.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:24:58 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 18 11:58:00 2018
-// Update Count     : 4
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Apr 30 23:04:10 2019
+// Update Count     : 9
 //
 
@@ -18 +18 @@
 #include <iostream>                    // for ostream
 #include <list>                        // for list, list<>::iterator, list<>...
-#include <map>                         // for map, map<>::value_compare
-#include <set>                         // for set
+#include <map>                                             // for map, map<>::value_compare
+#include <unordered_map>
+#include <set>                                             // for set
 #include <string>                      // for string
 #include <utility>                     // for move, swap
@@ -64 +65 @@
                 AssertionSetValue() : isUsed(false), resnSlot(0) {}
         };
-        typedef std::map< DeclarationWithType*, AssertionSetValue, AssertCompare > AssertionSet;
-        typedef std::map< std::string, TypeDecl::Data > OpenVarSet;
+        typedef std::map< DeclarationWithType *, AssertionSetValue, AssertCompare > AssertionSet;
+        typedef std::unordered_map< std::string, TypeDecl::Data > OpenVarSet;
 
         /// merges one set of open vars into another

src/SynTree/Declaration.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 : Sun Sep  3 19:24:06 2017
-// Update Count     : 131
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr May  2 10:47:00 2019
+// Update Count     : 135
 //
 
@@ -19 +19 @@
 #include <iosfwd>                // for ostream
 #include <list>                  // for list
+#include <unordered_map>         // for unordered_map
 #include <string>                // for string, operator+, allocator, to_string
 
@@ -166 +167 @@
         CompoundStmt *get_statements() const { return statements; }
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
+        bool has_body() const { return NULL != statements; }
 
         static FunctionDecl * newFunction( const std::string & name, FunctionType * type, CompoundStmt * statements );
@@ -334 +336 @@
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
-        std::map< std::string, long long int > enumValues;
+        std::unordered_map< std::string, long long int > enumValues;
         virtual std::string typeString() const override;
 };

src/SynTree/TypeSubstitution.cc

@@ -108 +108 @@
 namespace {
         struct EnvTrimmer {
-                TypeSubstitution * env, * newEnv;
-                EnvTrimmer( TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
+                const TypeSubstitution * env;
+                TypeSubstitution * newEnv;
+                EnvTrimmer( const TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
                 void previsit( TypeDecl * tyDecl ) {
                         // transfer known bindings for seen type variables
@@ -120 +121 @@
 
 /// reduce environment to just the parts that are referenced in a given expression
-TypeSubstitution * TypeSubstitution::newFromExpr( Expression * expr, TypeSubstitution * env ) {
+TypeSubstitution * TypeSubstitution::newFromExpr( Expression * expr, const TypeSubstitution * env ) {
         if ( env ) {
                 TypeSubstitution * newEnv = new TypeSubstitution();

src/SynTree/TypeSubstitution.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:52:24 2017
-// Update Count     : 3
+// Last Modified On : Tue Apr 30 22:52:47 2019
+// Update Count     : 9
 //
 
@@ -19 +19 @@
 #include <iosfwd>                  // for ostream
 #include <list>                    // for list<>::iterator, _List_iterator
-#include <map>                     // for _Rb_tree_iterator, map, map<>::val...
-#include <set>                     // for set
+#include <unordered_map>
+#include <unordered_set>
 #include <string>                  // for string, operator!=
 #include <utility>                 // for pair
@@ -39 +39 @@
         TypeSubstitution &operator=( const TypeSubstitution &other );
 
-        template< typename SynTreeClass > int apply( SynTreeClass *&input );
-        template< typename SynTreeClass > int applyFree( SynTreeClass *&input );
+        template< typename SynTreeClass > int apply( SynTreeClass *&input ) const;
+        template< typename SynTreeClass > int applyFree( SynTreeClass *&input ) const;
 
         void add( std::string formalType, Type *actualType );
@@ -56 +56 @@
 
         /// create a new TypeSubstitution using bindings from env containing all of the type variables in expr
-        static TypeSubstitution * newFromExpr( Expression * expr, TypeSubstitution * env );
+        static TypeSubstitution * newFromExpr( Expression * expr, const TypeSubstitution * env );
 
         void normalize();
@@ -78 +78 @@
         friend class PassVisitor;
 
-        typedef std::map< std::string, Type* > TypeEnvType;
-        typedef std::map< std::string, Expression* > VarEnvType;
+        typedef std::unordered_map< std::string, Type * > TypeEnvType;
+        typedef std::unordered_map< std::string, Expression * > VarEnvType;
         TypeEnvType typeEnv;
         VarEnvType varEnv;
@@ -98 +98 @@
         ActualIterator actualIt = actualBegin;
         for ( ; formalIt != formalEnd; ++formalIt, ++actualIt ) {
-                if ( TypeDecl *formal = dynamic_cast< TypeDecl* >( *formalIt ) ) {
-                        if ( TypeExpr *actual = dynamic_cast< TypeExpr* >( *actualIt ) ) {
+                if ( TypeDecl *formal = dynamic_cast< TypeDecl * >( *formalIt ) ) {
+                        if ( TypeExpr *actual = dynamic_cast< TypeExpr * >( *actualIt ) ) {
                                 if ( formal->get_name() != "" ) {
                                         TypeEnvType::iterator i = typeEnv.find( formal->get_name() );
@@ -130 +130 @@
 // definitition must happen after PassVisitor is included so that WithGuards can be used
 struct TypeSubstitution::Substituter : public WithGuards, public WithVisitorRef<Substituter> {
-                Substituter( TypeSubstitution & sub, bool freeOnly ) : sub( sub ), freeOnly( freeOnly ) {}
+                Substituter( const TypeSubstitution & sub, bool freeOnly ) : sub( sub ), freeOnly( freeOnly ) {}
 
                 Type * postmutate( TypeInstType * aggregateUseType );
@@ -143 +143 @@
                 void premutate( UnionInstType * aggregateUseType );
 
-                TypeSubstitution & sub;
+                const TypeSubstitution & sub;
                 int subCount = 0;
                 bool freeOnly;
-                typedef std::set< std::string > BoundVarsType;
+                typedef std::unordered_set< std::string > BoundVarsType;
                 BoundVarsType boundVars;
 };
 
 template< typename SynTreeClass >
-int TypeSubstitution::apply( SynTreeClass *&input ) {
+int TypeSubstitution::apply( SynTreeClass *&input ) const {
         assert( input );
         PassVisitor<Substituter> sub( *this, false );
@@ -163 +163 @@
 
 template< typename SynTreeClass >
-int TypeSubstitution::applyFree( SynTreeClass *&input ) {
+int TypeSubstitution::applyFree( SynTreeClass *&input ) const {
         assert( input );
         PassVisitor<Substituter> sub( *this, true );

src/Tuples/TupleExpansion.cc

@@ -58 +58 @@
                 };
 
-                struct TupleTypeReplacer : public WithDeclsToAdd, public WithGuards, public WithTypeSubstitution {
+                struct TupleTypeReplacer : public WithDeclsToAdd, public WithGuards, public WithConstTypeSubstitution {
                         Type * postmutate( TupleType * tupleType );
 

src/include/cassert

@@ -45 +45 @@
 }
 
+extern void abort(const char *fmt, ...  ) noexcept __attribute__((noreturn, format(printf, 1, 2)));
 // Local Variables: //
 // tab-width: 4 //

src/main.cc

@@ -7 +7 @@
 // main.cc --
 //
-// Author           : Richard C. Bilson
+// Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 16 09:14:04 2019
-// Update Count     : 500
+// Last Modified On : Fri May  3 16:10:52 2019
+// Update Count     : 599
 //
 
@@ -24 +24 @@
 #include <fstream>                          // for ofstream
 #include <iostream>                         // for operator<<, basic_ostream
+#include <iomanip>
 #include <iterator>                         // for back_inserter
 #include <list>                             // for list
@@ -39 +40 @@
 #include "Common/Stats.h"
 #include "Common/PassVisitor.h"
+// #include "AST/Pass.hpp"
 #include "Common/SemanticError.h"           // for SemanticError
 #include "Common/UnimplementedError.h"      // for UnimplementedError
@@ -65 +67 @@
 using namespace std;
 
-void NewPass(const char * const name) {
-        Stats::Heap::newPass(name);
+static void NewPass( const char * const name ) {
+        Stats::Heap::newPass( name );
         using namespace Stats::Counters;
-        
         {
-                static auto group = build<CounterGroup>("Pass Visitor");
-                auto pass = build<CounterGroup>(name, group);
+                static auto group = build<CounterGroup>( "Pass Visitor" );
+                auto pass = build<CounterGroup>( name, group );
                 pass_visitor_stats.depth = 0;
-                pass_visitor_stats.avg = build<AverageCounter<double>>("Average Depth", pass);
-                pass_visitor_stats.max = build<MaxCounter<double>>("Max Depth", pass);
+                pass_visitor_stats.avg = build<AverageCounter<double>>( "Average Depth", pass );
+                pass_visitor_stats.max = build<MaxCounter<double>>( "Max Depth", pass );
         }
-
         {
-                static auto group = build<CounterGroup>("Syntax Node");
-                auto pass = build<CounterGroup>(name, group);
-                BaseSyntaxNode::new_nodes = build<SimpleCounter>("Allocs", pass);
+                static auto group = build<CounterGroup>( "Syntax Node" );
+                auto pass = build<CounterGroup>( name, group );
+                BaseSyntaxNode::new_nodes = build<SimpleCounter>( "Allocs", pass );
         }
 }
 
-#define PASS(name, pass)                  \
+#define PASS( name, pass )                  \
         if ( errorp ) { cerr << name << endl; } \
         NewPass(name);                          \
@@ -95 +95 @@
 DeclarationNode * parseTree = nullptr;                                  // program parse tree
 
-std::string PreludeDirector = "";
+static std::string PreludeDirector = "";
 
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
@@ -151 +151 @@
 } // backtrace
 
-void sigSegvBusHandler( int sig_num ) {
+static void sigSegvBusHandler( int sig_num ) {
         cerr << "*CFA runtime error* program cfa-cpp terminated with "
                  <<     (sig_num == SIGSEGV ? "segment fault" : "bus error")
@@ -157 +157 @@
         backtrace( 2 );                                                                         // skip first 2 stack frames
         //_exit( EXIT_FAILURE );
-        abort();
+        abort();                                                                                        // cause core dump for debugging
 } // sigSegvBusHandler
 
-void sigAbortHandler( __attribute__((unused)) int sig_num ) {
+static void sigAbortHandler( __attribute__((unused)) int sig_num ) {
         backtrace( 6 );                                                                         // skip first 6 stack frames
         signal( SIGABRT, SIG_DFL);                                                      // reset default signal handler
@@ -240 +240 @@
                         parseTree->printList( cout );
                         delete parseTree;
-                        return 0;
+                        return EXIT_SUCCESS;
                 } // if
 
@@ -249 +249 @@
                 if ( astp ) {
                         dump( translationUnit );
-                        return 0;
+                        return EXIT_SUCCESS;
                 } // if
 
@@ -262 +262 @@
                 if ( symtabp ) {
                         deleteAll( translationUnit );
-                        return 0;
+                        return EXIT_SUCCESS;
                 } // if
 
@@ -268 +268 @@
                         PassVisitor<ResolvExpr::AlternativePrinter> printer( cout );
                         acceptAll( translationUnit, printer );
-                        return 0;
+                        return EXIT_SUCCESS;
                 } // if
 
                 if ( validp ) {
                         dump( translationUnit );
-                        return 0;
+                        return EXIT_SUCCESS;
                 } // if
 
@@ -288 +288 @@
                         CodeTools::printDeclStats( translationUnit );
                         deleteAll( translationUnit );
-                        return 0;
-                }
+                        return EXIT_SUCCESS;
+                } // if
 
                 if ( bresolvep ) {
                         dump( translationUnit );
-                        return 0;
+                        return EXIT_SUCCESS;
                 } // if
 
@@ -300 +300 @@
                 if ( resolvprotop ) {
                         CodeTools::dumpAsResolvProto( translationUnit );
-                        return 0;
-                }
+                        return EXIT_SUCCESS;
+                } // if
 
                 PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
                 if ( exprp ) {
                         dump( translationUnit );
-                        return 0;
+                        return EXIT_SUCCESS;
                 } // if
 
@@ -313 +313 @@
                 if ( ctorinitp ) {
                         dump ( translationUnit );
-                        return 0;
+                        return EXIT_SUCCESS;
                 } // if
 
@@ -328 +328 @@
                 if ( tuplep ) {
                         dump( translationUnit );
-                        return 0;
-                }
+                        return EXIT_SUCCESS;
+                } // if
 
                 PASS( "Virtual Expand Casts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM
@@ -336 +336 @@
                 if ( genericsp ) {
                         dump( translationUnit );
-                        return 0;
-                }
+                        return EXIT_SUCCESS;
+                } // if
                 PASS( "Convert L-Value", GenPoly::convertLvalue( translationUnit ) );
 
@@ -343 +343 @@
                 if ( bboxp ) {
                         dump( translationUnit );
-                        return 0;
+                        return EXIT_SUCCESS;
                 } // if
                 PASS( "Box", GenPoly::box( translationUnit ) );
@@ -349 +349 @@
                 if ( bcodegenp ) {
                         dump( translationUnit );
-                        return 0;
-                }
+                        return EXIT_SUCCESS;
+                } // if
 
                 if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name
@@ -357 +357 @@
 
                 CodeTools::fillLocations( translationUnit );
-                PASS( "Code Gen", CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks ) );
+                PASS( "Code Gen", CodeGen::generate( translationUnit, *output, ! genproto, prettycodegenp, true, linemarks ) );
 
                 CodeGen::FixMain::fix( *output, (PreludeDirector + "/bootloader.c").c_str() );
@@ -373 +373 @@
                         delete output;
                 } // if
-                return 1;
+                return EXIT_FAILURE;
         } catch ( UnimplementedError &e ) {
                 cout << "Sorry, " << e.get_what() << " is not currently implemented" << endl;
@@ -379 +379 @@
                         delete output;
                 } // if
-                return 1;
+                return EXIT_FAILURE;
         } catch ( CompilerError &e ) {
                 cerr << "Compiler Error: " << e.get_what() << endl;
@@ -386 +386 @@
                         delete output;
                 } // if
-                return 1;
-        } catch(...) {
+                return EXIT_FAILURE;
+        } catch ( ... ) {
                 std::exception_ptr eptr = std::current_exception();
                 try {
                         if (eptr) {
                                 std::rethrow_exception(eptr);
-                        }
-                        else {
-                                std::cerr << "Exception Uncaught and Unkown" << std::endl;
-                        }
+                        } else {
+                                std::cerr << "Exception Uncaught and Unknown" << std::endl;
+                        } // if
                 } catch(const std::exception& e) {
                         std::cerr << "Uncaught Exception \"" << e.what() << "\"\n";
-                }
-                return 1;
-        }// try
+                } // try
+                return EXIT_FAILURE;
+        } // try
 
         deleteAll( translationUnit );
         Stats::print();
-
-        return 0;
+        return EXIT_SUCCESS;
 } // main
 
-void parse_cmdline( int argc, char * argv[], const char *& filename ) {
-        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, PreludeDir, Prototypes, Resolver, ResolvProto, Stats, Symbol, Tree, TupleExpansion, Validate};
-
-        static struct option long_opts[] = {
-                { "ast", no_argument, 0, Ast },
-                { "before-box", no_argument, 0, Bbox },
-                { "before-resolver", no_argument, 0, Bresolver },
-                { "ctorinitfix", no_argument, 0, CtorInitFix },
-                { "decl-stats", no_argument, 0, DeclStats },
-                { "expr", no_argument, 0, Expr },
-                { "expralt", no_argument, 0, ExprAlt },
-                { "grammar", no_argument, 0, Grammar },
-                { "libcfa", no_argument, 0, LibCFA },
-                { "line-marks", no_argument, 0, Linemarks },
-                { "no-line-marks", no_argument, 0, Nolinemarks },
-                { "no-preamble", no_argument, 0, Nopreamble },
-                { "parse", no_argument, 0, Parse },
-                { "prelude-dir", required_argument, 0, PreludeDir },
-                { "no-prototypes", no_argument, 0, Prototypes },
-                { "resolver", no_argument, 0, Resolver },
-                { "resolv-proto", no_argument, 0, ResolvProto },
-                { "stats", required_argument, 0, Stats },
-                { "symbol", no_argument, 0, Symbol },
-                { "tree", no_argument, 0, Tree },
-                { "tuple-expansion", no_argument, 0, TupleExpansion },
-                { "validate", no_argument, 0, Validate },
-                { 0, 0, 0, 0 }
-        }; // long_opts
-        int long_index;
-
+
+static const char optstring[] = ":hlLmNn:pP:S:twW:D:F:";
+
+enum { PreludeDir = 128 };
+static struct option long_opts[] = {
+        { "help", no_argument, nullptr, 'h' },
+        { "libcfa", no_argument, nullptr, 'l' },
+        { "linemarks", no_argument, nullptr, 'L' },
+        { "no-main", no_argument, 0, 'm' },
+        { "no-linemarks", no_argument, nullptr, 'N' },
+        { "no-prelude", no_argument, nullptr, 'n' },
+        { "prototypes", no_argument, nullptr, 'p' },
+        { "print", required_argument, nullptr, 'P' },
+        { "prelude-dir", required_argument, nullptr, PreludeDir },
+        { "statistics", required_argument, nullptr, 'S' },
+        { "tree", no_argument, nullptr, 't' },
+        { "", no_argument, nullptr, 0 },                                        // -w
+        { "", no_argument, nullptr, 0 },                                        // -W
+        { "", no_argument, nullptr, 0 },                                        // -D
+        { "", no_argument, nullptr, 0 },                                        // -F
+        { nullptr, 0, nullptr, 0 }
+}; // long_opts
+
+static const char * description[] = {
+        "print help message",                                                           // -h
+        "generate libcfa.c",                                                            // -l
+        "generate line marks",                                                          // -L
+        "do not replace main",                                                          // -m
+        "do not generate line marks",                                           // -N
+        "do not read prelude",                                                          // -n
+        "generate prototypes for prelude functions",            // -p
+        "print",                                                                                        // -P
+        "<directory> prelude directory for debug/nodebug",      // no flag
+        "<option-list> enable profiling information:\n          counters,heap,time,all,none", // -S
+        "build in tree",                                                                        // -t
+        "",                                                                                                     // -w
+        "",                                                                                                     // -W
+        "",                                                                                                     // -D
+        "",                                                                                                     // -F
+}; // description
+
+static_assert( sizeof( long_opts ) / sizeof( long_opts[0] ) - 1 == sizeof( description ) / sizeof( description[0] ), "Long opts and description must match" );
+
+static struct Printopts {
+        const char * name;
+        int & flag;
+        int val;
+        const char * descript;
+} printopts[] = {
+        { "altexpr", expraltp, true, "alternatives for expressions" },
+        { "ascodegen", codegenp, true, "as codegen rather than AST" },
+        { "ast", astp, true, "AST after parsing" },
+        { "astdecl", validp, true, "AST after declaration validation pass" },
+        { "asterr", errorp, true, "AST on error" },
+        { "astexpr", exprp, true, "AST after expression analysis" },
+        { "astgen", genericsp, true, "AST after instantiate generics" },
+        { "box", bboxp, true, "before box step" },
+        { "ctordtor", ctorinitp, true, "after ctor/dtor are replaced" },
+        { "codegen", bcodegenp, true, "before code generation" },
+        { "declstats", declstatsp, true, "code property statistics" },
+        { "parse", yydebug, true, "yacc (parsing) debug information" },
+        { "pretty", prettycodegenp, true, "prettyprint for ascodegen flag" },
+        { "resolver", bresolvep, true, "before resolver step" },
+        { "rproto", resolvprotop, true, "resolver-proto instance" },
+        { "rsteps", resolvep, true, "resolver steps" },
+        { "symevt", symtabp, true, "symbol table events" },
+        { "tree", parsep, true, "parse tree" },
+        { "tuple", tuplep, true, "after tuple expansion" },
+};
+enum { printoptsSize = sizeof( printopts ) / sizeof( printopts[0] ) };
+
+static void usage( char *argv[] ) {
+    cout << "Usage: " << argv[0] << " options are:" << endl;
+        int i = 0, j = 1;                                                                       // j skips starting colon
+        for ( ; long_opts[i].name != 0 && optstring[j] != '\0'; i += 1, j += 1 ) {
+                if ( long_opts[i].name[0] != '\0' ) {                   // hidden option, internal usage only
+                        if ( strcmp( long_opts[i].name, "prelude-dir" ) != 0 ) { // flag
+                                cout << "  -" << optstring[j] << ",";
+                        } else {                                                                        // no flag
+                                j -= 1;                                                                 // compensate
+                                cout << "     ";
+                        } // if
+                        cout << " --" << left << setw(12) << long_opts[i].name << "  ";
+                        if ( strcmp( long_opts[i].name, "print" ) == 0 ) {
+                                cout << "one of: " << endl;
+                                for ( int i = 0; i < printoptsSize; i += 1 ) {
+                                        cout << setw(10) << " " << left << setw(10) << printopts[i].name << "  " << printopts[i].descript << endl;
+                                } // for
+                        } else {
+                                cout << description[i] << endl;
+                        } // if
+                } // if
+                if ( optstring[j + 1] == ':' ) j += 1;
+        } // for
+        if ( long_opts[i].name != 0 || optstring[j] != '\0' ) assertf( false, "internal error, mismatch of option flags and names\n" );
+    exit( EXIT_FAILURE );
+} // usage
+
+static void parse_cmdline( int argc, char * argv[], const char *& filename ) {
         opterr = 0;                                                                                     // (global) prevent getopt from printing error messages
 
         bool Wsuppress = false, Werror = false;
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrRstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, optstring, long_opts, nullptr )) != -1 ) {
                 switch ( c ) {
-                        case Ast:
-                        case 'a':                                                                               // dump AST
-                        astp = true;
-                        break;
-                        case Bresolver:
-                        case 'b':                                                                               // print before resolver steps
-                        bresolvep = true;
-                        break;
-                        case 'B':                                                                               // print before box steps
-                        bboxp = true;
-                        break;
-                        case CtorInitFix:
-                        case 'c':                                                                               // print after constructors and destructors are replaced
-                        ctorinitp = true;
-                        break;
-                        case 'C':                                                                               // print before code generation
-                        bcodegenp = true;
-                        break;
-                        case DeclStats:
-                        case 'd':
-                                declstatsp = true;
-                        break;
-                        case Expr:
-                        case 'e':                                                                               // dump AST after expression analysis
-                        exprp = true;
-                        break;
-                        case ExprAlt:
-                        case 'f':                                                                               // print alternatives for expressions
-                        expraltp = true;
-                        break;
-                        case Grammar:
-                        case 'g':                                                                               // bison debugging info (grammar rules)
-                        yydebug = true;
-                        break;
-                        case 'G':                                                                               // dump AST after instantiate generics
-                        genericsp = true;
-                        break;
-                        case LibCFA:
-                        case 'l':                                                                               // generate libcfa.c
+                  case 'h':                                                                             // help message
+                        usage( argv );                                                          // no return
+                        break;
+                  case 'l':                                                                             // generate libcfa.c
                         libcfap = true;
                         break;
-                        case Linemarks:
-                        case 'L':                                                                               // print lines marks
+                  case 'L':                                                                             // generate line marks
                         linemarks = true;
                         break;
-                        case Nopreamble:
-                        case 'n':                                                                               // do not read preamble
+                  case 'm':                                                                             // do not replace main
+                        nomainp = true;
+                        break;
+                  case 'N':                                                                             // do not generate line marks
+                        linemarks = false;
+                        break;
+                  case 'n':                                                                             // do not read prelude
                         nopreludep = true;
                         break;
-                        case Nolinemarks:
-                        case 'N':                                                                               // suppress line marks
-                        linemarks = false;
-                        break;
-                        case Prototypes:
-                        case 'p':                                                                               // generate prototypes for preamble functions
-                        noprotop = true;
-                        break;
-                        case PreludeDir:
-                                PreludeDirector = optarg;
-                        break;
-                        case 'm':                                                                               // don't replace the main
-                                nomainp = true;
-                        break;
-                        case Parse:
-                        case 'q':                                                                               // dump parse tree
-                        parsep = true;
-                        break;
-                        case Resolver:
-                        case 'r':                                                                               // print resolver steps
-                        resolvep = true;
-                        break;
-                        case 'R':                                                                               // dump resolv-proto instance
-                        resolvprotop = true;
-                        break;
-                        case Stats:
-                                Stats::parse_params(optarg);
-                        break;
-                        case Symbol:
-                        case 's':                                                                               // print symbol table events
-                        symtabp = true;
-                        break;
-                        case Tree:
-                        case 't':                                                                               // build in tree
+                  case 'p':                                                                             // generate prototypes for prelude functions
+                        genproto = true;
+                        break;
+                  case 'P':                                                                             // print options
+                        for ( int i = 0;; i += 1 ) {
+                                if ( i == printoptsSize ) {
+                                        cout << "Unknown --print option " << optarg << endl;
+                                        goto Default;
+                                } // if
+                                if ( strcmp( optarg, printopts[i].name ) == 0 ) {
+                                        printopts[i].flag = printopts[i].val;
+                                        break;
+                                } // if
+                        } // for
+                        break;
+                  case PreludeDir:                                                              // prelude directory for debug/nodebug, hidden
+                        PreludeDirector = optarg;
+                        break;
+                  case 'S':                                                                             // enable profiling information, argument comma separated list of names
+                        Stats::parse_params( optarg );
+                        break;
+                  case 't':                                                                             // build in tree
                         treep = true;
                         break;
-                        case TupleExpansion:
-                        case 'T':                                                                               // print after tuple expansion
-                        tuplep = true;
-                        break;
-                        case 'v':                                                                               // dump AST after decl validation pass
-                        validp = true;
-                        break;
-                        case 'w':
+                  case 'w':                                                                             // suppress all warnings, hidden
                         Wsuppress = true;
                         break;
-                        case 'W':
+                  case 'W':                                                                             // coordinate gcc -W with CFA, hidden
                         if ( strcmp( optarg, "all" ) == 0 ) {
                                 SemanticWarning_EnableAll();
@@ -556 +573 @@
                         } // if
                         break;
-                        case 'y':                                                                               // dump AST on error
-                        errorp = true;
-                        break;
-                        case 'z':                                                                               // dump as codegen rather than AST
-                        codegenp = true;
-                        break;
-                        case 'Z':                                                                       // prettyprint during codegen (i.e. print unmangled names, etc.)
-                        prettycodegenp = true;
-                        break;
-                        case 'D':                                                                               // ignore -Dxxx
-                        break;
-                        case 'F':                                                                               // source file-name without suffix
+                  case 'D':                                                                             // ignore -Dxxx, forwarded by cpp, hidden
+                        break;
+                  case 'F':                                                                             // source file-name without suffix, hidden
                         filename = optarg;
                         break;
-                        case '?':
+                  case '?':                                                                             // unknown option
                         if ( optopt ) {                                                         // short option ?
-                                assertf( false, "Unknown option: -%c\n", (char)optopt );
+                                cout << "Unknown option -" << (char)optopt << endl;
                         } else {
-                                assertf( false, "Unknown option: %s\n", argv[optind - 1] );
-                        } // if
-                        #if defined(__GNUC__) && __GNUC__ >= 7
-                                __attribute__((fallthrough));
-                        #endif
-                        default:
-                        abort();
+                                cout << "Unknown option " << argv[optind - 1] << endl;
+                        } // if
+                        goto Default;
+                  case ':':                                                                             // missing option
+                        if ( optopt ) {                                                         // short option ?
+                                cout << "Missing option for -" << (char)optopt << endl;
+                        } else {
+                                cout << "Missing option for " << argv[optind - 1] << endl;
+                        } // if
+                        goto Default;
+                  Default:
+                  default:
+                        usage( argv );                                                          // no return
                 } // switch
         } // while
@@ -618 +632 @@
         list< Declaration * > decls;
 
-        if ( noprotop ) {
+        if ( genproto ) {
                 filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), notPrelude );
         } else {
@@ -626 +640 @@
         // depending on commandline options, either generate code or dump the AST
         if ( codegenp ) {
-                CodeGen::generate( decls, out, ! noprotop, prettycodegenp );
+                CodeGen::generate( decls, out, ! genproto, prettycodegenp );
         } else {
                 printAll( decls, out );
-        }
+        } // if
         deleteAll( translationUnit );
 } // dump