Index: src/ResolvExpr/AlternativeFinder.cc =================================================================== --- src/ResolvExpr/AlternativeFinder.cc (revision e0bd0f925c0fbd2add47c0045972c485136f776c) +++ src/ResolvExpr/AlternativeFinder.cc (revision 80dbf6a154ef9ee195a0d75bba40d8f919324558) @@ -1188,4 +1188,5 @@ assert( toType ); toType = resolveTypeof( toType, indexer ); + assert(!dynamic_cast(toType)); SymTab::validateType( toType, &indexer ); adjustExprType( toType, env, indexer ); Index: src/SynTree/ApplicationExpr.cc =================================================================== --- src/SynTree/ApplicationExpr.cc (revision e0bd0f925c0fbd2add47c0045972c485136f776c) +++ src/SynTree/ApplicationExpr.cc (revision 80dbf6a154ef9ee195a0d75bba40d8f919324558) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Tue Apr 26 12:41:06 2016 -// Update Count : 4 +// Last Modified By : Andrew Beach +// Last Modified On : Mon Aug 12 14:28:00 2019 +// Update Count : 5 // @@ -76,4 +76,8 @@ } +bool ApplicationExpr::get_lvalue() const { + return result->get_lvalue(); +} + void ApplicationExpr::print( std::ostream &os, Indenter indent ) const { os << "Application of" << std::endl << indent+1; Index: src/SynTree/CommaExpr.cc =================================================================== --- src/SynTree/CommaExpr.cc (revision e0bd0f925c0fbd2add47c0045972c485136f776c) +++ src/SynTree/CommaExpr.cc (revision 80dbf6a154ef9ee195a0d75bba40d8f919324558) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Mon May 02 15:19:44 2016 -// Update Count : 1 +// Last Modified By : Andrew Beach +// Last Modified On : Mon Arg 12 16:11:00 2016 +// Update Count : 2 // @@ -39,4 +39,9 @@ } +bool CommaExpr::get_lvalue() const { + // xxx - as above, shouldn't be an lvalue but that information is used anyways. + return result->get_lvalue(); +} + void CommaExpr::print( std::ostream &os, Indenter indent ) const { os << "Comma Expression:" << std::endl; Index: src/SynTree/Expression.cc =================================================================== --- src/SynTree/Expression.cc (revision e0bd0f925c0fbd2add47c0045972c485136f776c) +++ src/SynTree/Expression.cc (revision 80dbf6a154ef9ee195a0d75bba40d8f919324558) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Andrew Beach -// Last Modified On : Wed Aug 7 17:03:00 2019 -// Update Count : 62 +// Last Modified On : Thr Aug 15 13:43:00 2019 +// Update Count : 64 // @@ -64,5 +64,6 @@ bool Expression::get_lvalue() const { - return result->get_lvalue(); + assert( !result->get_lvalue() ); + return false; } @@ -138,4 +139,8 @@ } +bool VariableExpr::get_lvalue() const { + return result->get_lvalue(); +} + VariableExpr * VariableExpr::functionPointer( FunctionDecl * func ) { VariableExpr * funcExpr = new VariableExpr( func ); @@ -269,4 +274,8 @@ CastExpr::~CastExpr() { delete arg; +} + +bool CastExpr::get_lvalue() const { + return result->get_lvalue(); } @@ -380,4 +389,9 @@ // don't delete the member declaration, since it points somewhere else in the tree delete aggregate; +} + +bool MemberExpr::get_lvalue() const { + assert( result->get_lvalue() ); + return true; } @@ -432,4 +446,7 @@ } +bool UntypedExpr::get_lvalue() const { + return result->get_lvalue(); +} void UntypedExpr::print( std::ostream & os, Indenter indent ) const { @@ -490,4 +507,8 @@ delete arg2; delete arg3; +} + +bool ConditionalExpr::get_lvalue() const { + return result->get_lvalue(); } @@ -548,4 +569,8 @@ } +bool ConstructorExpr::get_lvalue() const { + return result->get_lvalue(); +} + void ConstructorExpr::print( std::ostream & os, Indenter indent ) const { os << "Constructor Expression: " << std::endl << indent+1; @@ -565,4 +590,9 @@ CompoundLiteralExpr::~CompoundLiteralExpr() { delete initializer; +} + +bool CompoundLiteralExpr::get_lvalue() const { + assert( result->get_lvalue() ); + return true; } @@ -616,4 +646,7 @@ result = new VoidType( Type::Qualifiers() ); } +} +bool StmtExpr::get_lvalue() const { + return result->get_lvalue(); } void StmtExpr::print( std::ostream & os, Indenter indent ) const { Index: src/SynTree/Expression.h =================================================================== --- src/SynTree/Expression.h (revision e0bd0f925c0fbd2add47c0045972c485136f776c) +++ src/SynTree/Expression.h (revision 80dbf6a154ef9ee195a0d75bba40d8f919324558) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Andrew Beach -// Last Modified On : Wed Aug 7 16:56:00 2019 -// Update Count : 51 +// Last Modified On : Thr Aug 15 13:46:00 2019 +// Update Count : 54 // @@ -71,5 +71,5 @@ const Type * get_result() const { return result; } void set_result( Type * newValue ) { result = newValue; } - bool get_lvalue() const; + virtual bool get_lvalue() const; TypeSubstitution * get_env() const { return env; } @@ -99,4 +99,6 @@ virtual ~ApplicationExpr(); + bool get_lvalue() const final; + Expression * get_function() const { return function; } void set_function( Expression * newValue ) { function = newValue; } @@ -121,4 +123,6 @@ UntypedExpr( const UntypedExpr & other ); virtual ~UntypedExpr(); + + bool get_lvalue() const final; Expression * get_function() const { return function; } @@ -209,4 +213,6 @@ virtual ~CastExpr(); + bool get_lvalue() const final; + Expression * get_arg() const { return arg; } void set_arg( Expression * newValue ) { arg = newValue; } @@ -292,4 +298,6 @@ virtual ~MemberExpr(); + bool get_lvalue() const final; + DeclarationWithType * get_member() const { return member; } void set_member( DeclarationWithType * newValue ) { member = newValue; } @@ -314,4 +322,6 @@ VariableExpr( const VariableExpr & other ); virtual ~VariableExpr(); + + bool get_lvalue() const final; DeclarationWithType * get_var() const { return var; } @@ -501,4 +511,6 @@ virtual ~ConditionalExpr(); + bool get_lvalue() const final; + Expression * get_arg1() const { return arg1; } void set_arg1( Expression * newValue ) { arg1 = newValue; } @@ -525,4 +537,6 @@ virtual ~CommaExpr(); + bool get_lvalue() const final; + Expression * get_arg1() const { return arg1; } void set_arg1( Expression * newValue ) { arg1 = newValue; } @@ -611,4 +625,6 @@ ~ConstructorExpr(); + bool get_lvalue() const final; + Expression * get_callExpr() const { return callExpr; } void set_callExpr( Expression * newValue ) { callExpr = newValue; } @@ -629,4 +645,6 @@ CompoundLiteralExpr( const CompoundLiteralExpr & other ); virtual ~CompoundLiteralExpr(); + + bool get_lvalue() const final; Initializer * get_initializer() const { return initializer; } @@ -687,4 +705,6 @@ virtual ~TupleExpr(); + bool get_lvalue() const final; + std::list& get_exprs() { return exprs; } @@ -705,4 +725,6 @@ TupleIndexExpr( const TupleIndexExpr & other ); virtual ~TupleIndexExpr(); + + bool get_lvalue() const final; Expression * get_tuple() const { return tuple; } @@ -754,4 +776,6 @@ StmtExpr( const StmtExpr & other ); virtual ~StmtExpr(); + + bool get_lvalue() const final; CompoundStmt * get_statements() const { return statements; } Index: src/SynTree/TupleExpr.cc =================================================================== --- src/SynTree/TupleExpr.cc (revision e0bd0f925c0fbd2add47c0045972c485136f776c) +++ src/SynTree/TupleExpr.cc (revision 80dbf6a154ef9ee195a0d75bba40d8f919324558) @@ -9,7 +9,7 @@ // 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:42:29 2017 -// Update Count : 3 +// Last Modified By : Andrew Beach +// Last Modified On : Wed Aug 14 14:34:00 2019 +// Update Count : 5 // @@ -57,4 +57,8 @@ } +bool TupleExpr::get_lvalue() const { + return result->get_lvalue(); +} + void TupleExpr::print( std::ostream &os, Indenter indent ) const { os << "Tuple:" << std::endl; @@ -76,4 +80,9 @@ TupleIndexExpr::~TupleIndexExpr() { delete tuple; +} + +bool TupleIndexExpr::get_lvalue() const { + assert( result->get_lvalue() ); + return true; } Index: src/main.cc =================================================================== --- src/main.cc (revision e0bd0f925c0fbd2add47c0045972c485136f776c) +++ src/main.cc (revision 80dbf6a154ef9ee195a0d75bba40d8f919324558) @@ -10,6 +10,6 @@ // Created On : Fri May 15 23:12:02 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Aug 22 13:06:18 2019 -// Update Count : 605 +// Last Modified On : Fri Aug 23 06:50:08 2019 +// Update Count : 607 // @@ -17,8 +17,8 @@ #include // for backtrace, backtrace_symbols #include // for no_argument, optind, geto... -#include // for signal, SIGABRT, SIGSEGV #include // for assertf #include // for fopen, FILE, fclose, stdin #include // for exit, free, abort, EXIT_F... +#include // for signal, SIGABRT, SIGSEGV #include // for index #include // for ofstream @@ -96,4 +96,6 @@ DeclarationNode * parseTree = nullptr; // program parse tree +static bool waiting_for_gdb = false; // flag to set cfa-cpp to wait for gdb on start + static std::string PreludeDirector = ""; @@ -167,5 +169,4 @@ } // sigAbortHandler - int main( int argc, char * argv[] ) { FILE * input; // use FILE rather than istream because yyin is FILE @@ -184,4 +185,11 @@ parse_cmdline( argc, argv ); // process command-line arguments CodeGen::FixMain::setReplaceMain( !nomainp ); + + if ( waiting_for_gdb ) { + std::cerr << "Waiting for gdb" << std::endl; + std::cerr << "run :" << std::endl; + std::cerr << " gdb attach " << getpid() << std::endl; + raise(SIGSTOP); + } // if try { @@ -445,4 +453,5 @@ { "statistics", required_argument, nullptr, 'S' }, { "tree", no_argument, nullptr, 't' }, + { "gdb", no_argument, nullptr, 'g' }, { "", no_argument, nullptr, 0 }, // -w { "", no_argument, nullptr, 0 }, // -W @@ -462,5 +471,6 @@ " prelude directory for debug/nodebug", // no flag " enable profiling information:\n counters,heap,time,all,none", // -S - "build in tree", // -t + "building cfa standard lib", // -t + "wait for gdb to attach", // -g "", // -w "", // -W @@ -572,6 +582,9 @@ Stats::parse_params( optarg ); break; - case 't': // build in tree + case 't': // building cfa stdlib treep = true; + break; + case 'g': // wait for gdb + waiting_for_gdb = true; break; case 'w': // suppress all warnings, hidden