Changeset 4a60488 for src

Timestamp:

Sep 27, 2019, 3:35:46 PM (6 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

90ce35aa

Parents:

8e1467d (diff), 849720f (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:

Merged from master taking the lvalue changes to expression and everything before that.

Location:

src

Files:

• AST/Convert.cpp (modified) (2 diffs)
• AST/porting.md (modified) (1 diff)
• BasicTypes-gen.cc (modified) (7 diffs)
• Common/Eval.cc (modified) (6 diffs)
• Common/PassVisitor.h (modified) (2 diffs)
• Common/PassVisitor.impl.h (modified) (1 diff)
• Common/utility.h (modified) (2 diffs)
• GenPoly/Box.cc (modified) (1 diff)
• GenPoly/Lvalue.cc (modified) (2 diffs)
• InitTweak/InitTweak.cc (modified) (2 diffs)
• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (11 diffs)
• Parser/DeclarationNode.cc (modified) (3 diffs)
• Parser/ExpressionNode.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (3 diffs)
• Parser/lex.ll (modified) (9 diffs)
• Parser/parser.yy (modified) (33 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (10 diffs)
• ResolvExpr/CastCost.cc (modified) (7 diffs)
• ResolvExpr/CommonType.cc (modified) (35 diffs)
• ResolvExpr/ConversionCost.cc (modified) (15 diffs)
• ResolvExpr/ConversionCost.h (modified) (4 diffs)
• ResolvExpr/ResolveAssertions.cc (modified) (2 diffs)
• ResolvExpr/Unify.cc (modified) (4 diffs)
• ResolvExpr/typeops.h (modified) (4 diffs)
• SymTab/Demangle.cc (modified) (2 diffs)
• SymTab/Mangler.cc (modified) (3 diffs)
• SymTab/Validate.cc (modified) (5 diffs)
• SynTree/AddressExpr.cc (modified) (1 diff)
• SynTree/ApplicationExpr.cc (modified) (3 diffs)
• SynTree/BasicType.cc (modified) (2 diffs)
• SynTree/CommaExpr.cc (modified) (2 diffs)
• SynTree/Expression.cc (modified) (13 diffs)
• SynTree/Expression.h (modified) (16 diffs)
• SynTree/Mutator.h (modified) (2 diffs)
• SynTree/SynTree.h (modified) (2 diffs)
• SynTree/TopLvalue.cc (added)
• SynTree/TopLvalue.h (added)
• SynTree/TupleExpr.cc (modified) (3 diffs)
• SynTree/Type.cc (modified) (4 diffs)
• SynTree/Type.h (modified) (2 diffs)
• SynTree/Visitor.h (modified) (2 diffs)
• SynTree/module.mk (modified) (1 diff)
• main.cc (modified) (22 diffs)

src/AST/Convert.cpp

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu May 09 15::37::05 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 17 16:44:00 2019
-// Update Count     : 12
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 25 22:21:46 2019
+// Update Count     : 13
 //
 
@@ -2688 +2688 @@
                 );
         }
-
-        virtual void visit( const AttrExpr * ) override final {
-                assertf( false, "AttrExpr deprecated in new AST." );
-        }
 };
 

src/AST/porting.md

@@ -171 +171 @@
   * all existing uses assume `type` set if true and don't use `expr`
 
-`AttrExpr`
-* did not port due to feature deprecation (e.g. `expr@attribute`)
-
 `LogicalExpr`
 * un-defaulted constructor parameter determining `&&` or `||`

src/BasicTypes-gen.cc

@@ -295 +295 @@
         // cout << code.str();
 
-        
+
+        // TEMPORARY DURING CHANGE OVER
+        #define TypeAST TOP_SRCDIR "src/AST/Type.hpp"
+        resetInput( file, TypeAST, buffer, code, str );
+
+        if ( (start = str.find( STARTMK )) == string::npos ) Abort( "start", TypeAST );
+        start += sizeof( STARTMK );                                                     // includes newline
+        code << str.substr( 0, start );
+
+        code << "\t" << BYMK << endl;
+        code << "\tenum Kind {" << endl;
+        for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
+                code << "\t\t" << graph[r].name << "," << endl;
+        } // for        
+        code << "\t\tNUMBER_OF_BASIC_TYPES" << endl;
+        code << "\t} kind;" << endl;
+        code << "\t";                                                                           // indentation for end marker
+
+        if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", TypeAST );
+        code << str.substr( start );
+
+        output( file, TypeAST, code );
+        // cout << code.str();
+
+
         #define ConversionCost TOP_SRCDIR "src/ResolvExpr/ConversionCost.cc"
         resetInput( file, ConversionCost, buffer, code, str );
@@ -310 +334 @@
                         code << right << setw(30) << graph[c].type << left;
                 } else if ( graph[c].rank != graph[c + 2].rank ) {
-                        code << string( 10, ' ' ) << setw(25) << graph[c].type << setw(25) << graph[c + 1].type;
+                        code << string( 10, ' ' ) << setw(25) << graph[c].type << graph[c + 1].type;
                         c += 1;
                 } else {
-                        code << setw(20) << graph[c].type << setw(20) << graph[c + 1].type << setw(20) << graph[c + 2].type;
+                        code << setw(20) << graph[c].type << setw(20) << graph[c + 1].type << graph[c + 2].type;
                         c += 2;
                 } // if
@@ -328 +352 @@
         code << "\t" << BYMK << endl;
         code << "\tstatic const int costMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // path length from root to node" << endl
-                 << "\t\t/*         ";
+                 << "\t\t/*           ";
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // titles
                 code << setw(5) << graph[r].abbrev;
@@ -334 +358 @@
         code << " */" << endl;
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // costs
-                code << "\t\t/*" << setw(6) << graph[r].abbrev << "*/ {";
+                code << "\t\t/* " << setw(6) << graph[r].abbrev << " */ {";
                 for ( int c = 0; c < NUMBER_OF_BASIC_TYPES; c += 1 ) {
                         code << setw(4) << costMatrix[r][c] << ",";
@@ -353 +377 @@
         code << "\t" << BYMK << endl;
         code << "\tstatic const int signMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion" << endl
-                 << "\t\t/*         ";
+                 << "\t\t/*           ";
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // titles
                 code << setw(5) << graph[r].abbrev;
@@ -359 +383 @@
         code << " */" << endl;
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // costs
-                code << "\t\t/*" << setw(6) << graph[r].abbrev << "*/ {";
+                code << "\t\t/* " << setw(6) << graph[r].abbrev << " */ {";
                 for ( int c = 0; c < NUMBER_OF_BASIC_TYPES; c += 1 ) {
                         code << setw(4) << signMatrix[r][c] << ",";
@@ -395 +419 @@
         code << "*/" << endl;
         for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) { // costs
-                code << "\t\t\t\t  {\n\t\t/*" << setw(6) << graph[r].abbrev << "*/";
+                code << "\t\t\t\t  {\n\t\t/* " << setw(6) << graph[r].abbrev << " */";
                 for ( int c = 0; c < NUMBER_OF_BASIC_TYPES; c += 1 ) {
                         string s = string{"BT "} + graph[commonTypeMatrix[r][c]].name;

src/Common/Eval.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May  6 22:24:16 2018
-// Update Count     : 40
+// Last Modified On : Wed Jul 24 15:09:06 2019
+// Update Count     : 64
 //
 
@@ -27 +27 @@
         bool valid = true;
 
-        void previsit( BaseSyntaxNode * ) { visit_children = false; }
-        void postvisit( BaseSyntaxNode * ) { valid = false; }
+        void previsit( const BaseSyntaxNode * ) { visit_children = false; }
+        void postvisit( const BaseSyntaxNode * ) { valid = false; }
 
-        void postvisit( ConstantExpr * expr ) {
+        void postvisit( const SizeofExpr * ) {
+        }
+
+        void postvisit( const ConstantExpr * expr ) {
                 value = expr->intValue();
         }
 
-        void postvisit( CastExpr * expr ) {
+        void postvisit( const CastExpr * expr ) {
                 auto arg = eval(expr->arg);
                 valid = arg.second;
@@ -41 +44 @@
         }
 
-        void postvisit( VariableExpr * expr ) {
+        void postvisit( const VariableExpr * const expr ) {
                 if ( EnumInstType * inst = dynamic_cast<EnumInstType *>(expr->result) ) {
                         if ( EnumDecl * decl = inst->baseEnum ) {
@@ -52 +55 @@
         }
 
-        void postvisit( ApplicationExpr * expr ) {
-                DeclarationWithType * function = InitTweak::getFunction(expr);
+        void postvisit( const ApplicationExpr * expr ) {
+                DeclarationWithType * function = InitTweak::getFunction(const_cast<ApplicationExpr *>(expr));
                 if ( ! function || function->linkage != LinkageSpec::Intrinsic ) { valid = false; return; }
                 const std::string & fname = function->name;
@@ -94 +97 @@
         void postvisit( const ast::ConstantExpr * expr ) {
                 value = expr->intValue();
+        }
+
+        void postvisit( const ast::SizeofExpr * expr ) {
+                if ( expr->expr ) value = eval(expr->expr).first;
+                else if ( expr->type ) value = eval(expr->expr).first;
+                else SemanticError( expr->location, ::toString( "Internal error: SizeofExpr has no expression or type value" ) );
         }
 
@@ -145 +154 @@
 };
 
-std::pair<long long int, bool> eval(Expression * expr) {
+std::pair<long long int, bool> eval( const Expression * expr) {
         PassVisitor<EvalOld> ev;
         if (expr) {

src/Common/PassVisitor.h

@@ -155 +155 @@
         virtual void visit( OffsetPackExpr * offsetPackExpr ) override final;
         virtual void visit( const OffsetPackExpr * offsetPackExpr ) override final;
-        virtual void visit( AttrExpr * attrExpr ) override final;
-        virtual void visit( const AttrExpr * attrExpr ) override final;
         virtual void visit( LogicalExpr * logicalExpr ) override final;
         virtual void visit( const LogicalExpr * logicalExpr ) override final;
@@ -301 +299 @@
         virtual Expression * mutate( OffsetofExpr * offsetofExpr ) override final;
         virtual Expression * mutate( OffsetPackExpr * offsetPackExpr ) override final;
-        virtual Expression * mutate( AttrExpr * attrExpr ) override final;
         virtual Expression * mutate( LogicalExpr * logicalExpr ) override final;
         virtual Expression * mutate( ConditionalExpr * conditionalExpr ) override final;

src/Common/PassVisitor.impl.h

@@ -2302 +2302 @@
 
 //--------------------------------------------------------------------------
-// AttrExpr
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( AttrExpr * node ) {
-        VISIT_START( node );
-
-        indexerScopedAccept( node->result, *this );
-        if ( node->get_isType() ) {
-                maybeAccept_impl( node->type, *this );
-        } else {
-                maybeAccept_impl( node->expr, *this );
-        }
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( const AttrExpr * node ) {
-        VISIT_START( node );
-
-        indexerScopedAccept( node->result, *this );
-        if ( node->get_isType() ) {
-                maybeAccept_impl( node->type, *this );
-        } else {
-                maybeAccept_impl( node->expr, *this );
-        }
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( AttrExpr * node ) {
-        MUTATE_START( node );
-
-        indexerScopedMutate( node->env   , *this );
-        indexerScopedMutate( node->result, *this );
-        if ( node->get_isType() ) {
-                maybeMutate_impl( node->type, *this );
-        } else {
-                maybeMutate_impl( node->expr, *this );
-        }
-
-        MUTATE_END( Expression, node );
-}
-
-//--------------------------------------------------------------------------
 // LogicalExpr
 template< typename pass_type >

src/Common/utility.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May  6 22:24:16 2018
-// Update Count     : 40
+// Last Modified On : Wed Jul 24 14:28:19 2019
+// Update Count     : 41
 //
 
@@ -483 +483 @@
 // -----------------------------------------------------------------------------
 /// evaluates expr as a long long int. If second is false, expr could not be evaluated
-std::pair<long long int, bool> eval(Expression * expr);
+std::pair<long long int, bool> eval(const Expression * expr);
 
 namespace ast {

src/GenPoly/Box.cc

@@ -725 +725 @@
                         if ( ! needsBoxing( param, arg->result, exprTyVars, env ) ) return;
 
-                        if ( arg->result->get_lvalue() ) {
+                        if ( arg->get_lvalue() ) {
                                 // argument expression may be CFA lvalue, but not C lvalue -- apply generalizedLvalue transformations.
                                 // if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( arg ) ) {

src/GenPoly/Lvalue.cc

@@ -363 +363 @@
                         int diff = depth1 - depth2;
 
-                        if ( diff > 0 && ! srcType->get_lvalue() ) {
+                        if ( diff > 0 && ! castExpr->arg->get_lvalue() ) {
                                 // rvalue to reference conversion -- introduce temporary
                                 // know that reference depth of cast argument is 0, need to introduce n temporaries for reference depth of n, e.g.
@@ -407 +407 @@
                                         ret = new AddressExpr( ret );
                                 }
-                                if ( srcType->get_lvalue() && ! ResolvExpr::typesCompatible( srcType, strict_dynamic_cast<ReferenceType *>( destType )->base, SymTab::Indexer() ) ) {
+                                if ( castExpr->arg->get_lvalue() && ! ResolvExpr::typesCompatible( srcType, strict_dynamic_cast<ReferenceType *>( destType )->base, SymTab::Indexer() ) ) {
                                         // must keep cast if cast-to type is different from the actual type
                                         castExpr->arg = ret;

src/InitTweak/InitTweak.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Fri May 13 11:26:36 2016
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 19 14:34:00 2019
-// Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 25 22:21:48 2019
+// Update Count     : 7
 //
 
@@ -957 +957 @@
                 void previsit( OffsetofExpr * ) {}
                 void previsit( OffsetPackExpr * ) {}
-                void previsit( AttrExpr * ) {}
                 void previsit( CommaExpr * ) {}
                 void previsit( LogicalExpr * ) {}

src/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:51:46 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Feb 15 09:44:09 2019
-## Update Count     : 97
+## Last Modified On : Mon Aug  5 12:57:46 2019
+## Update Count     : 98
 ###############################################################################
 
@@ -55 +55 @@
 $(addprefix $(srcdir)/, ResolvExpr/ConversionCost.cc ResolvExpr/CommonType.cc SymTab/ManglerCommon.cc) : $(srcdir)/SynTree/Type.h
 
-$(srcdir)/SynTree/Type.h : BasicTypes-gen.cc
+$(srcdir)/AST/Type.hpp : BasicTypes-gen.cc
         ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra
         @./BasicTypes-gen
@@ -62 +62 @@
 # put into lib for now
 cfa_cpplibdir = $(CFA_LIBDIR)
-cfa_cpplib_PROGRAMS = ../driver/cfa-cpp demangler
+cfa_cpplib_PROGRAMS = ../driver/cfa-cpp $(DEMANGLER)
+EXTRA_PROGRAMS = demangler
 ___driver_cfa_cpp_SOURCES = $(SRC)
 ___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
@@ -74 +75 @@
 demangler_LDADD = libdemangle.a -ldl                    # yywrap
 
-noinst_LIBRARIES = libdemangle.a
+noinst_LIBRARIES = $(LIBDEMANGLE)
+EXTRA_LIBRARIES = libdemangle.a
 libdemangle_a_SOURCES = $(SRCDEMANGLE)
 

src/Makefile.in

@@ -141 +141 @@
 build_triplet = @build@
 host_triplet = @host@
-cfa_cpplib_PROGRAMS = ../driver/cfa-cpp$(EXEEXT) demangler$(EXEEXT)
+cfa_cpplib_PROGRAMS = ../driver/cfa-cpp$(EXEEXT) $(DEMANGLER)
+EXTRA_PROGRAMS = demangler$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -231 +232 @@
         SynTree/Initializer.$(OBJEXT) \
         SynTree/TypeSubstitution.$(OBJEXT) SynTree/Attribute.$(OBJEXT) \
-        SynTree/DeclReplacer.$(OBJEXT)
+        SynTree/DeclReplacer.$(OBJEXT) SynTree/TopLvalue.$(OBJEXT)
 am__objects_8 = CompilationState.$(OBJEXT) $(am__objects_1) \
         $(am__objects_2) Concurrency/Keywords.$(OBJEXT) \
@@ -411 +412 @@
 CCDEPMODE = @CCDEPMODE@
 CFACC = @CFACC@
+CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
@@ -428 +430 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -440 +443 @@
 FGREP = @FGREP@
 GREP = @GREP@
+HAS_DISTCC = @HAS_DISTCC@
 HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
@@ -453 +457 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -693 +698 @@
       SynTree/TypeSubstitution.cc \
       SynTree/Attribute.cc \
-      SynTree/DeclReplacer.cc
+      SynTree/DeclReplacer.cc \
+      SynTree/TopLvalue.cc
 
 
@@ -705 +711 @@
 demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
 demangler_LDADD = libdemangle.a -ldl                    # yywrap
-noinst_LIBRARIES = libdemangle.a
+noinst_LIBRARIES = $(LIBDEMANGLE)
+EXTRA_LIBRARIES = libdemangle.a
 libdemangle_a_SOURCES = $(SRCDEMANGLE)
 all: $(BUILT_SOURCES)
@@ -1023 +1030 @@
 SynTree/DeclReplacer.$(OBJEXT): SynTree/$(am__dirstamp) \
         SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/TopLvalue.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
 Tuples/$(am__dirstamp):
         @$(MKDIR_P) Tuples
@@ -1334 +1343 @@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/ReferenceType.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/Statement.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/TopLvalue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/TupleExpr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/TupleType.Po@am__quote@
@@ -1667 +1677 @@
 $(addprefix $(srcdir)/, ResolvExpr/ConversionCost.cc ResolvExpr/CommonType.cc SymTab/ManglerCommon.cc) : $(srcdir)/SynTree/Type.h
 
-$(srcdir)/SynTree/Type.h : BasicTypes-gen.cc
+$(srcdir)/AST/Type.hpp : BasicTypes-gen.cc
         ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra
         @./BasicTypes-gen

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  1 16:49:17 2019
-// Update Count     : 1113
+// Last Modified On : Thu Jul 25 22:17:10 2019
+// Update Count     : 1116
 //
 
@@ -49 +49 @@
 const char * DeclarationNode::aggregateNames[] = { "struct", "union", "trait", "coroutine", "monitor", "thread", "NoAggregateNames" };
 const char * DeclarationNode::typeClassNames[] = { "otype", "dtype", "ftype", "NoTypeClassNames" };
-const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "zero_t", "one_t", "NoBuiltinTypeNames" };
+const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "__auto_type", "zero_t", "one_t", "NoBuiltinTypeNames" };
 
 UniqueName DeclarationNode::anonymous( "__anonymous" );
@@ -418 +418 @@
         return newnode;
 } // DeclarationNode::newBuiltinType
-
-DeclarationNode * DeclarationNode::newAttr( const string * name, ExpressionNode * expr ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = nullptr;
-//      newnode->attr.name = name;
-        newnode->name = name;
-        newnode->attr.expr = expr;
-        return newnode;
-}
-
-DeclarationNode * DeclarationNode::newAttr( const string * name, DeclarationNode * type ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = nullptr;
-//      newnode->attr.name = name;
-        newnode->name = name;
-        newnode->attr.type = type;
-        return newnode;
-}
 
 DeclarationNode * DeclarationNode::newAttribute( const string * name, ExpressionNode * expr ) {

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Mar 10 16:10:32 2019
-// Update Count     : 976
+// Last Modified On : Sun Aug  4 20:57:55 2019
+// Update Count     : 978
 //
 
@@ -109 +109 @@
 
 Expression * build_constantInteger( string & str ) {
-        static const BasicType::Kind kind[2][7] = {
+        static const BasicType::Kind kind[2][6] = {
                 // short (h) must be before char (hh) because shorter type has the longer suffix
                 { BasicType::ShortSignedInt, BasicType::SignedChar, BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt, BasicType::SignedInt128, },

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr 15 14:22:39 2019
-// Update Count     : 874
+// Last Modified On : Thu Jul 25 22:17:10 2019
+// Update Count     : 876
 //
 
@@ -221 +221 @@
         enum TypeClass { Otype, Dtype, Ftype, Ttype, NoTypeClass };
         static const char * typeClassNames[];
-        enum BuiltinType { Valist, Zero, One, NoBuiltinType };
+        enum BuiltinType { Valist, AutoType, Zero, One, NoBuiltinType };
         static const char * builtinTypeNames[];
 
@@ -252 +252 @@
         static DeclarationNode * newTuple( DeclarationNode * members );
         static DeclarationNode * newTypeof( ExpressionNode * expr, bool basetypeof = false );
-        static DeclarationNode * newAttr( const std::string *, ExpressionNode * expr ); // @ attributes
-        static DeclarationNode * newAttr( const std::string *, DeclarationNode * type ); // @ attributes
         static DeclarationNode * newAttribute( const std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Wed May 15 21:25:27 2019
- * Update Count     : 708
+ * Last Modified On : Sun Aug  4 20:53:47 2019
+ * Update Count     : 719
  */
 
@@ -59 +59 @@
 #define QKEYWORD_RETURN(x)      RETURN_VAL(x);                          // quasi-keyword
 #define IDENTIFIER_RETURN()     RETURN_VAL( typedefTable.isKind( yytext ) )
-#define ATTRIBUTE_RETURN()      RETURN_VAL( ATTR_IDENTIFIER )
 
 #ifdef HAVE_KEYWORDS_FLOATXX                                                            // GCC >= 7 => keyword, otherwise typedef
@@ -92 +91 @@
                                 // identifier, GCC: $ in identifier
 identifier ([a-zA-Z_$]|{universal_char})([0-9a-zA-Z_$]|{universal_char})*
-
-                                // attribute identifier, GCC: $ in identifier
-attr_identifier "@"{identifier}
 
                                 // numeric constants, CFA: '_' in constant
@@ -218 +214 @@
 __attribute__   { KEYWORD_RETURN(ATTRIBUTE); }                  // GCC
 auto                    { KEYWORD_RETURN(AUTO); }
+__auto_type             { KEYWORD_RETURN(AUTO_TYPE); }
 basetypeof              { KEYWORD_RETURN(BASETYPEOF); }                 // CFA
 _Bool                   { KEYWORD_RETURN(BOOL); }                               // C99
@@ -276 +273 @@
 __inline__              { KEYWORD_RETURN(INLINE); }                             // GCC
 int                             { KEYWORD_RETURN(INT); }
+int128                  { KEYWORD_RETURN(INT128); }                             // CFA
 __int128                { KEYWORD_RETURN(INT128); }                             // GCC
-int128                  { KEYWORD_RETURN(INT128); }                             // GCC
+__int128_t              { KEYWORD_RETURN(INT128); }                             // GCC
 __label__               { KEYWORD_RETURN(LABEL); }                              // GCC
 long                    { KEYWORD_RETURN(LONG); }
@@ -292 +290 @@
 __restrict__    { KEYWORD_RETURN(RESTRICT); }                   // GCC
 return                  { KEYWORD_RETURN(RETURN); }
+        /* resume                       { KEYWORD_RETURN(RESUME); }                             // CFA */
 short                   { KEYWORD_RETURN(SHORT); }
 signed                  { KEYWORD_RETURN(SIGNED); }
@@ -300 +299 @@
 _Static_assert  { KEYWORD_RETURN(STATICASSERT); }               // C11
 struct                  { KEYWORD_RETURN(STRUCT); }
+        /* suspend                      { KEYWORD_RETURN(SUSPEND); }                    // CFA */
 switch                  { KEYWORD_RETURN(SWITCH); }
 thread                  { KEYWORD_RETURN(THREAD); }                             // C11
@@ -314 +314 @@
 __typeof__              { KEYWORD_RETURN(TYPEOF); }                             // GCC
 union                   { KEYWORD_RETURN(UNION); }
+__uint128_t             { KEYWORD_RETURN(UINT128); }                    // GCC
 unsigned                { KEYWORD_RETURN(UNSIGNED); }
 __builtin_va_list { KEYWORD_RETURN(VALIST); }                   // GCC
@@ -333 +334 @@
         IDENTIFIER_RETURN();
 }
-{attr_identifier} { ATTRIBUTE_RETURN(); }
 
                                 /* numeric constants */

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jul 14 07:54:30 2019
-// Update Count     : 4355
+// Last Modified On : Sun Aug  4 21:48:23 2019
+// Update Count     : 4364
 //
 
@@ -268 +268 @@
 %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
 %token BOOL COMPLEX IMAGINARY                                                   // C99
-%token INT128 uuFLOAT80 uuFLOAT128                                              // GCC
+%token INT128 UINT128 uuFLOAT80 uuFLOAT128                              // GCC
 %token uFLOAT16 uFLOAT32 uFLOAT32X uFLOAT64 uFLOAT64X uFLOAT128 // GCC
 %token ZERO_T ONE_T                                                                             // CFA
 %token VALIST                                                                                   // GCC
+%token AUTO_TYPE                                                                                // GCC
 %token TYPEOF BASETYPEOF LABEL                                                  // GCC
 %token ENUM STRUCT UNION
@@ -288 +289 @@
 %token<tok> IDENTIFIER                  QUOTED_IDENTIFIER               TYPEDEFname                             TYPEGENname
 %token<tok> TIMEOUT                             WOR
-%token<tok> ATTR_IDENTIFIER             ATTR_TYPEDEFname                ATTR_TYPEGENname
 %token<tok> INTEGERconstant             CHARACTERconstant               STRINGliteral
 %token<tok> DIRECTIVE
@@ -312 +312 @@
 %token ATassign                                                                                 // @=
 
-%type<tok> identifier  no_attr_identifier
-%type<tok> identifier_or_type_name  no_attr_identifier_or_type_name  attr_name
+%type<tok> identifier
+%type<tok> identifier_or_type_name  attr_name
 %type<tok> quasi_keyword
 %type<constant> string_literal
@@ -546 +546 @@
         ;
 
-no_attr_identifier:
+identifier:
         IDENTIFIER
         | quasi_keyword
         | '@'                                                                                           // CFA
                 { Token tok = { new string( DeclarationNode::anonymous.newName() ), yylval.tok.loc }; $$ = tok; }
-        ;
-
-identifier:
-        no_attr_identifier
-        | ATTR_IDENTIFIER                                                                       // CFA
         ;
 
@@ -594 +589 @@
         | '(' comma_expression ')' '`' IDENTIFIER                       // CFA, postfix call
                 { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $5 ) ), $2 ) ); }
-        | type_name '.' no_attr_identifier                                      // CFA, nested type
+        | type_name '.' identifier                                                      // CFA, nested type
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         | type_name '.' '[' field_name_list ']'                         // CFA, nested type / tuple field selector
@@ -647 +642 @@
         | postfix_expression '(' argument_expression_list ')'
                 { $$ = new ExpressionNode( build_func( $1, $3 ) ); }
-        | postfix_expression '.' no_attr_identifier
+        | postfix_expression '.' identifier
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression '.' INTEGERconstant                        // CFA, tuple index
@@ -655 +650 @@
         | postfix_expression '.' '[' field_name_list ']'        // CFA, tuple field selector
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); }
-        | postfix_expression ARROW no_attr_identifier
+        | postfix_expression ARROW identifier
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression ARROW INTEGERconstant                      // CFA, tuple index
@@ -718 +713 @@
         | FLOATINGconstant fraction_constants_opt
                 { $$ = new ExpressionNode( build_field_name_fraction_constants( build_field_name_FLOATINGconstant( *$1 ), $2 ) ); }
-        | no_attr_identifier fraction_constants_opt
+        | identifier fraction_constants_opt
                 {
                         $$ = new ExpressionNode( build_field_name_fraction_constants( build_varref( $1 ), $2 ) );
@@ -776 +771 @@
         | ALIGNOF '(' type_no_function ')'                                      // GCC, type alignment
                 { $$ = new ExpressionNode( new AlignofExpr( maybeMoveBuildType( $3 ) ) ); }
-        | OFFSETOF '(' type_no_function ',' no_attr_identifier ')'
+        | OFFSETOF '(' type_no_function ',' identifier ')'
                 { $$ = new ExpressionNode( build_offsetOf( $3, build_varref( $5 ) ) ); }
-        | ATTR_IDENTIFIER
-                { $$ = new ExpressionNode( new AttrExpr( build_varref( $1 ), maybeMoveBuild< Expression >( (ExpressionNode *)nullptr ) ) ); }
-        | ATTR_IDENTIFIER '(' argument_expression ')'
-                { $$ = new ExpressionNode( new AttrExpr( build_varref( $1 ), maybeMoveBuild< Expression >( $3 ) ) ); }
-        | ATTR_IDENTIFIER '(' type ')'
-                { $$ = new ExpressionNode( new AttrExpr( build_varref( $1 ), maybeMoveBuildType( $3 ) ) ); }
         ;
 
@@ -1018 +1007 @@
 
 labeled_statement:
-                // labels cannot be identifiers 0 or 1 or ATTR_IDENTIFIER
+                // labels cannot be identifiers 0 or 1
         identifier_or_type_name ':' attribute_list_opt statement
                 { $$ = $4->add_label( $1, $3 ); }
@@ -1386 +1375 @@
         | type_specifier_nobody variable_abstract_declarator
                 { $$ = $2->addType( $1 ); }
-        | cfa_abstract_declarator_tuple no_attr_identifier      // CFA
+        | cfa_abstract_declarator_tuple identifier                      // CFA
                 { $$ = $1->addName( $2 ); }
         | cfa_abstract_declarator_tuple                                         // CFA
@@ -1450 +1439 @@
 
 label_list:
-        no_attr_identifier
+        identifier
                 {
                         $$ = new LabelNode(); $$->labels.push_back( *$1 );
                         delete $1;                                                                      // allocated by lexer
                 }
-        | label_list ',' no_attr_identifier
+        | label_list ',' identifier
                 {
                         $$ = $1; $1->labels.push_back( *$3 );
@@ -1500 +1489 @@
 
 local_label_list:                                                                               // GCC, local label
-        no_attr_identifier_or_type_name
-        | local_label_list ',' no_attr_identifier_or_type_name
+        identifier_or_type_name
+        | local_label_list ',' identifier_or_type_name
         ;
 
@@ -1623 +1612 @@
                         $$ = $2->addTypedef();
                 }
-        | cfa_typedef_declaration pop ',' push no_attr_identifier
+        | cfa_typedef_declaration pop ',' push identifier
                 {
                         typedefTable.addToEnclosingScope( *$5, TYPEDEFname, "3" );
@@ -1663 +1652 @@
 typedef_expression:
                 // GCC, naming expression type: typedef name = exp; gives a name to the type of an expression
-        TYPEDEF no_attr_identifier '=' assignment_expression
+        TYPEDEF identifier '=' assignment_expression
                 {
                         // $$ = DeclarationNode::newName( 0 );                  // unimplemented
                         SemanticError( yylloc, "Typedef expression is currently unimplemented." ); $$ = nullptr;
                 }
-        | typedef_expression pop ',' push no_attr_identifier '=' assignment_expression
+        | typedef_expression pop ',' push identifier '=' assignment_expression
                 {
                         // $$ = DeclarationNode::newName( 0 );                  // unimplemented
@@ -1837 +1826 @@
         | INT128
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Int128 ); }
+        | UINT128
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Int128 )->addType( DeclarationNode::newSignedNess( DeclarationNode::Unsigned ) ); }
         | FLOAT
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Float ); }
@@ -1871 +1862 @@
         | VALIST                                                                                        // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
+        | AUTO_TYPE
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::AutoType ); }
         ;
 
@@ -1912 +1905 @@
         | BASETYPEOF '(' comma_expression ')'                           // CFA: basetypeof( a+b ) y;
                 { $$ = DeclarationNode::newTypeof( $3, true ); }
-        | ATTR_TYPEGENname '(' type ')'                                         // CFA: e.g., @type( x ) y;
-                { $$ = DeclarationNode::newAttr( $1, $3 ); }
-        | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type( a+b ) y;
-                { $$ = DeclarationNode::newAttr( $1, $3 ); }
         | ZERO_T                                                                                        // CFA
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
@@ -2024 +2013 @@
           '{' field_declaration_list_opt '}' type_parameters_opt
                 { $$ = DeclarationNode::newAggregate( $1, nullptr, $7, $5, true )->addQualifiers( $2 ); }
-        | aggregate_key attribute_list_opt no_attr_identifier fred
+        | aggregate_key attribute_list_opt identifier fred
                 {
                         typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
@@ -2050 +2039 @@
 
 aggregate_type_nobody:                                                                  // struct, union - {...}
-        aggregate_key attribute_list_opt no_attr_identifier fred
+        aggregate_key attribute_list_opt identifier fred
                 {
                         typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname );
@@ -2151 +2140 @@
 cfa_field_declaring_list:                                                               // CFA, new style field declaration
         // bit-fields are handled by C declarations
-        cfa_abstract_declarator_tuple no_attr_identifier_or_type_name
+        cfa_abstract_declarator_tuple identifier_or_type_name
                 { $$ = $1->addName( $2 ); }
-        | cfa_field_declaring_list ',' no_attr_identifier_or_type_name
+        | cfa_field_declaring_list ',' identifier_or_type_name
                 { $$ = $1->appendList( $1->cloneType( $3 ) ); }
         ;
@@ -2178 +2167 @@
         ENUM attribute_list_opt '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( nullptr, $4, true )->addQualifiers( $2 ); }
-        | ENUM attribute_list_opt no_attr_identifier
+        | ENUM attribute_list_opt identifier
                 { typedefTable.makeTypedef( *$3 ); }
           '{' enumerator_list comma_opt '}'
@@ -2189 +2178 @@
 
 enum_type_nobody:                                                                               // enum - {...}
-        ENUM attribute_list_opt no_attr_identifier
+        ENUM attribute_list_opt identifier
                 {
                         typedefTable.makeTypedef( *$3 );
@@ -2202 +2191 @@
 
 enumerator_list:
-        no_attr_identifier_or_type_name enumerator_value_opt
+        identifier_or_type_name enumerator_value_opt
                 { $$ = DeclarationNode::newEnumConstant( $1, $2 ); }
-        | enumerator_list ',' no_attr_identifier_or_type_name enumerator_value_opt
+        | enumerator_list ',' identifier_or_type_name enumerator_value_opt
                 { $$ = $1->appendList( DeclarationNode::newEnumConstant( $3, $4 ) ); }
         ;
@@ -2312 +2301 @@
 
 identifier_list:                                                                                // K&R-style parameter list => no types
-        no_attr_identifier
+        identifier
                 { $$ = DeclarationNode::newName( $1 ); }
-        | identifier_list ',' no_attr_identifier
+        | identifier_list ',' identifier
                 { $$ = $1->appendList( DeclarationNode::newName( $3 ) ); }
         ;
@@ -2320 +2309 @@
 identifier_or_type_name:
         identifier
-        | TYPEDEFname
-        | TYPEGENname
-        ;
-
-no_attr_identifier_or_type_name:
-        no_attr_identifier
         | TYPEDEFname
         | TYPEGENname
@@ -2380 +2363 @@
 designation:
         designator_list ':'                                                                     // C99, CFA uses ":" instead of "="
-        | no_attr_identifier ':'                                                        // GCC, field name
+        | identifier ':'                                                                        // GCC, field name
                 { $$ = new ExpressionNode( build_varref( $1 ) ); }
         ;
@@ -2392 +2375 @@
 
 designator:
-        '.' no_attr_identifier                                                          // C99, field name
+        '.' identifier                                                                          // C99, field name
                 { $$ = new ExpressionNode( build_varref( $2 ) ); }
         | '[' push assignment_expression pop ']'                        // C99, single array element
@@ -2437 +2420 @@
 
 type_parameter:                                                                                 // CFA
-        type_class no_attr_identifier_or_type_name
+        type_class identifier_or_type_name
                 { typedefTable.addToScope( *$2, TYPEDEFname, "9" ); }
           type_initializer_opt assertion_list_opt
@@ -2470 +2453 @@
 
 assertion:                                                                                              // CFA
-        '|' no_attr_identifier_or_type_name '(' type_list ')'
+        '|' identifier_or_type_name '(' type_list ')'
                 { $$ = DeclarationNode::newTraitUse( $2, $4 ); }
         | '|' '{' push trait_declaration_list pop '}'
@@ -2507 +2490 @@
 
 type_declarator_name:                                                                   // CFA
-        no_attr_identifier_or_type_name
+        identifier_or_type_name
                 {
                         typedefTable.addToEnclosingScope( *$1, TYPEDEFname, "10" );
                         $$ = DeclarationNode::newTypeDecl( $1, 0 );
                 }
-        | no_attr_identifier_or_type_name '(' type_parameter_list ')'
+        | identifier_or_type_name '(' type_parameter_list ')'
                 {
                         typedefTable.addToEnclosingScope( *$1, TYPEGENname, "11" );
@@ -2520 +2503 @@
 
 trait_specifier:                                                                                // CFA
-        TRAIT no_attr_identifier_or_type_name '(' type_parameter_list ')' '{' '}'
+        TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' '}'
                 { $$ = DeclarationNode::newTrait( $2, $4, 0 ); }
-        | TRAIT no_attr_identifier_or_type_name '(' type_parameter_list ')' '{' push trait_declaration_list pop '}'
+        | TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' push trait_declaration_list pop '}'
                 { $$ = DeclarationNode::newTrait( $2, $4, $8 ); }
         ;

src/ResolvExpr/AlternativeFinder.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:52:08 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov  1 21:00:56 2018
-// Update Count     : 35
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:35:00 2019
+// Update Count     : 38
 //
 
@@ -79 +79 @@
                 void postvisit( OffsetofExpr * offsetofExpr );
                 void postvisit( OffsetPackExpr * offsetPackExpr );
-                void postvisit( AttrExpr * attrExpr );
                 void postvisit( LogicalExpr * logicalExpr );
                 void postvisit( ConditionalExpr * conditionalExpr );
@@ -378 +377 @@
         }
 
-        Cost computeConversionCost( Type * actualType, Type * formalType, const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
+        Cost computeConversionCost( Type * actualType, Type * formalType, bool actualIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
                 PRINT(
                         std::cerr << std::endl << "converting ";
@@ -388 +388 @@
                         std::cerr << std::endl;
                 )
-                Cost convCost = conversionCost( actualType, formalType, indexer, env );
+                Cost convCost = conversionCost( actualType, formalType, actualIsLvalue, indexer, env );
                 PRINT(
                         std::cerr << std::endl << "cost is " << convCost << std::endl;
@@ -403 +403 @@
 
         Cost computeExpressionConversionCost( Expression *& actualExpr, Type * formalType, const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
-                Cost convCost = computeConversionCost( actualExpr->result, formalType, indexer, env );
+                Cost convCost = computeConversionCost(
+                        actualExpr->result, formalType, actualExpr->get_lvalue(), indexer, env );
 
                 // if there is a non-zero conversion cost, ignoring poly cost, then the expression requires conversion.
@@ -1136 +1137 @@
         bool isLvalue( Expression *expr ) {
                 // xxx - recurse into tuples?
-                return expr->result && ( expr->result->get_lvalue() || dynamic_cast< ReferenceType * >( expr->result ) );
+                return expr->result && ( expr->get_lvalue() || dynamic_cast< ReferenceType * >( expr->result ) );
         }
 
@@ -1187 +1188 @@
                 assert( toType );
                 toType = resolveTypeof( toType, indexer );
+                assert(!dynamic_cast<TypeofType *>(toType));
                 SymTab::validateType( toType, &indexer );
                 adjustExprType( toType, env, indexer );
@@ -1213 +1215 @@
                         unify( castExpr->result, alt.expr->result, alt.env, needAssertions,
                                 haveAssertions, openVars, indexer );
-                        Cost thisCost = castCost( alt.expr->result, castExpr->result, indexer,
-                                alt.env );
+                        Cost thisCost = castCost( alt.expr->result, castExpr->result, alt.expr->get_lvalue(),
+                                indexer, alt.env );
                         PRINT(
                                 std::cerr << "working on cast with result: " << castExpr->result << std::endl;
@@ -1402 +1404 @@
         void AlternativeFinder::Finder::postvisit( OffsetPackExpr *offsetPackExpr ) {
                 alternatives.push_back( Alternative{ offsetPackExpr->clone(), env } );
-        }
-
-        namespace {
-                void resolveAttr( SymTab::Indexer::IdData data, const FunctionType * function, Type * argType, const TypeEnvironment &env, AlternativeFinder & finder ) {
-                        // assume no polymorphism
-                        // assume no implicit conversions
-                        assert( function->parameters.size() == 1 );
-                        PRINT(
-                                std::cerr << "resolvAttr: funcDecl is ";
-                                data.id->print( std::cerr );
-                                std::cerr << " argType is ";
-                                argType->print( std::cerr );
-                                std::cerr << std::endl;
-                        )
-                        const SymTab::Indexer & indexer = finder.get_indexer();
-                        AltList & alternatives = finder.get_alternatives();
-                        if ( typesCompatibleIgnoreQualifiers( argType, function->parameters.front()->get_type(), indexer, env ) ) {
-                                Cost cost = Cost::zero;
-                                Expression * newExpr = data.combine( cost );
-                                alternatives.push_back( Alternative{
-                                        new AttrExpr{ newExpr, argType->clone() }, env, OpenVarSet{},
-                                        AssertionList{}, Cost::zero, cost } );
-                                for ( DeclarationWithType * retVal : function->returnVals ) {
-                                        alternatives.back().expr->result = retVal->get_type()->clone();
-                                } // for
-                        } // if
-                }
-        }
-
-        void AlternativeFinder::Finder::postvisit( AttrExpr * attrExpr ) {
-                // assume no 'pointer-to-attribute'
-                NameExpr * nameExpr = dynamic_cast< NameExpr* >( attrExpr->get_attr() );
-                assert( nameExpr );
-                std::list< SymTab::Indexer::IdData > attrList;
-                indexer.lookupId( nameExpr->get_name(), attrList );
-                if ( attrExpr->get_isType() || attrExpr->get_expr() ) {
-                        for ( auto & data : attrList ) {
-                                const DeclarationWithType * id = data.id;
-                                // check if the type is function
-                                if ( const FunctionType * function = dynamic_cast< const FunctionType * >( id->get_type() ) ) {
-                                        // assume exactly one parameter
-                                        if ( function->parameters.size() == 1 ) {
-                                                if ( attrExpr->get_isType() ) {
-                                                        resolveAttr( data, function, attrExpr->get_type(), env, altFinder);
-                                                } else {
-                                                        AlternativeFinder finder( indexer, env );
-                                                        finder.find( attrExpr->get_expr() );
-                                                        for ( AltList::iterator choice = finder.alternatives.begin(); choice != finder.alternatives.end(); ++choice ) {
-                                                                if ( choice->expr->get_result()->size() == 1 ) {
-                                                                        resolveAttr(data, function, choice->expr->get_result(), choice->env, altFinder );
-                                                                } // fi
-                                                        } // for
-                                                } // if
-                                        } // if
-                                } // if
-                        } // for
-                } else {
-                        for ( auto & data : attrList ) {
-                                Cost cost = Cost::zero;
-                                Expression * newExpr = data.combine( cost );
-                                alternatives.push_back( Alternative{
-                                        newExpr, env, OpenVarSet{}, AssertionList{}, Cost::zero, cost } );
-                                renameTypes( alternatives.back().expr );
-                        } // for
-                } // if
         }
 
@@ -1706 +1643 @@
                                 // xxx - do some inspecting on this line... why isn't result bound to initAlt.type?
 
-                                Cost thisCost = castCost( alt.expr->result, toType, indexer, newEnv );
+                                Cost thisCost = castCost( alt.expr->result, toType, alt.expr->get_lvalue(),
+                                        indexer, newEnv );
                                 if ( thisCost != Cost::infinity ) {
                                         // count one safe conversion for each value that is thrown away

src/ResolvExpr/CastCost.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 06:57:43 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  2 15:34:36 2016
-// Update Count     : 7
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:12:00 2019
+// Update Count     : 8
 //
 
@@ -37 +37 @@
         struct CastCost_old : public ConversionCost {
           public:
-                CastCost_old( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
+                CastCost_old( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
 
                 using ConversionCost::previsit;
@@ -45 +46 @@
         };
 
-        Cost castCost( const Type * src, const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+        Cost castCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType * >( dest ) ) {
                         if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->name ) ) {
                                 if ( eqvClass->type ) {
-                                        return castCost( src, eqvClass->type, indexer, env );
+                                        return castCost( src, eqvClass->type, srcIsLvalue, indexer, env );
                                 } else {
                                         return Cost::infinity;
@@ -57 +59 @@
                                 const TypeDecl * type = strict_dynamic_cast< const TypeDecl * >( namedType );
                                 if ( type->base ) {
-                                        return castCost( src, type->base, indexer, env ) + Cost::safe;
+                                        return castCost( src, type->base, srcIsLvalue, indexer, env ) + Cost::safe;
                                 } // if
                         } // if
@@ -78 +80 @@
                 } else if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
-                        return convertToReferenceCost( src, refType, indexer, env, [](const Type * t1, const Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
+                        return convertToReferenceCost( src, refType, srcIsLvalue, indexer, env, [](const Type * t1, const Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
                                 return ptrsCastable( t1, t2, env, indexer );
                         });
                 } else {
                         PassVisitor<CastCost_old> converter(
-                                dest, indexer, env,
-                                (Cost (*)( const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment & ))
+                                dest, srcIsLvalue, indexer, env,
+                                (Cost (*)( const Type *, const Type *, bool, const SymTab::Indexer &, const TypeEnvironment & ))
                                         castCost );
                         src->accept( converter );
@@ -96 +98 @@
         }
 
-        CastCost_old::CastCost_old( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
-                : ConversionCost( dest, indexer, env, costFunc ) {
+        CastCost_old::CastCost_old( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : ConversionCost( dest, srcIsLvalue, indexer, env, costFunc ) {
         }
 
@@ -106 +109 @@
                         cost = Cost::unsafe;
                 } else {
-                        cost = conversionCost( basicType, dest, indexer, env );
+                        cost = conversionCost( basicType, dest, srcIsLvalue, indexer, env );
                 } // if
         }

src/ResolvExpr/CommonType.cc

@@ -190 +190 @@
                                  */
                                   {
-                /*     B */                BT Bool,                BT Char,          BT SignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                /*      B */                BT Bool,                BT Char,          BT SignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
                                              BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -198 +198 @@
                                   },
                                   {
-                /*     C */                BT Char,                BT Char,          BT SignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                /*      C */                BT Char,                BT Char,          BT SignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
                                              BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -206 +206 @@
                                   },
                                   {
-                /*    SC */          BT SignedChar,          BT SignedChar,          BT SignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                /*     SC */          BT SignedChar,          BT SignedChar,          BT SignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
                                              BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -214 +214 @@
                                   },
                                   {
-                /*    UC */        BT UnsignedChar,        BT UnsignedChar,        BT UnsignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                /*     UC */        BT UnsignedChar,        BT UnsignedChar,        BT UnsignedChar,        BT UnsignedChar,      BT ShortSignedInt,    BT ShortUnsignedInt,
                                              BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -222 +222 @@
                                   },
                                   {
-                /*    SI */      BT ShortSignedInt,      BT ShortSignedInt,      BT ShortSignedInt,      BT ShortSignedInt,      BT ShortSignedInt,    BT ShortUnsignedInt,
+                /*     SI */      BT ShortSignedInt,      BT ShortSignedInt,      BT ShortSignedInt,      BT ShortSignedInt,      BT ShortSignedInt,    BT ShortUnsignedInt,
                                              BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -230 +230 @@
                                   },
                                   {
-                /*   SUI */    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,
+                /*    SUI */    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,    BT ShortUnsignedInt,
                                              BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -238 +238 @@
                                   },
                                   {
-                /*     I */           BT SignedInt,           BT SignedInt,           BT SignedInt,           BT SignedInt,           BT SignedInt,           BT SignedInt,
+                /*      I */           BT SignedInt,           BT SignedInt,           BT SignedInt,           BT SignedInt,           BT SignedInt,           BT SignedInt,
                                              BT SignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -246 +246 @@
                                   },
                                   {
-                /*    UI */         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,
+                /*     UI */         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,         BT UnsignedInt,
                                            BT UnsignedInt,         BT UnsignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -254 +254 @@
                                   },
                                   {
-                /*    LI */       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,
+                /*     LI */       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,
                                          BT LongSignedInt,       BT LongSignedInt,       BT LongSignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -262 +262 @@
                                   },
                                   {
-                /*   LUI */     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,
+                /*    LUI */     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,
                                        BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,     BT LongUnsignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -270 +270 @@
                                   },
                                   {
-                /*   LLI */   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,
+                /*    LLI */   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,
                                      BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt,   BT LongLongSignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -278 +278 @@
                                   },
                                   {
-                /*  LLUI */ BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt,
+                /*   LLUI */ BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt,
                                    BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt, BT LongLongUnsignedInt,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -286 +286 @@
                                   },
                                   {
-                /*    IB */        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,
+                /*     IB */        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,
                                           BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,        BT SignedInt128,
                                           BT SignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -294 +294 @@
                                   },
                                   {
-                /*   UIB */      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,
+                /*    UIB */      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,
                                         BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,      BT UnsignedInt128,
                                         BT UnsignedInt128,      BT UnsignedInt128,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -302 +302 @@
                                   },
                                   {
-                /*   _FH */            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,
+                /*    _FH */            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,
                                               BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,            BT uFloat16,
                                               BT uFloat16,            BT uFloat16,            BT uFloat16,     BT uFloat16Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -310 +310 @@
                                   },
                                   {
-                /*   _FH */     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,
+                /*    _FH */     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,
                                        BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,
                                        BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat16Complex,     BT uFloat32Complex,     BT uFloat32Complex,
@@ -318 +318 @@
                                   },
                                   {
-                /*    _F */            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,
+                /*     _F */            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,
                                               BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,            BT uFloat32,
                                               BT uFloat32,            BT uFloat32,            BT uFloat32,     BT uFloat32Complex,            BT uFloat32,     BT uFloat32Complex,
@@ -326 +326 @@
                                   },
                                   {
-                /*   _FC */     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,
+                /*    _FC */     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,
                                        BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,
                                        BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,     BT uFloat32Complex,
@@ -334 +334 @@
                                   },
                                   {
-                /*     F */               BT Float,               BT Float,               BT Float,               BT Float,               BT Float,               BT Float,
+                /*      F */               BT Float,               BT Float,               BT Float,               BT Float,               BT Float,               BT Float,
                                                  BT Float,               BT Float,               BT Float,               BT Float,               BT Float,               BT Float,
                                                  BT Float,               BT Float,               BT Float,        BT FloatComplex,               BT Float,        BT FloatComplex,
@@ -342 +342 @@
                                   },
                                   {
-                /*    FC */        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,
+                /*     FC */        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,
                                           BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,
                                           BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,        BT FloatComplex,
@@ -350 +350 @@
                                   },
                                   {
-                /*   _FX */           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,
+                /*    _FX */           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,
                                              BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,           BT uFloat32x,
                                              BT uFloat32x,           BT uFloat32x,           BT uFloat32x,    BT uFloat32xComplex,           BT uFloat32x,    BT uFloat32xComplex,
@@ -358 +358 @@
                                   },
                                   {
-                /*  _FXC */    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,
+                /*   _FXC */    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,
                                       BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,
                                       BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,    BT uFloat32xComplex,
@@ -366 +366 @@
                                   },
                                   {
-                /*    FD */            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,
+                /*     FD */            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,
                                               BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,            BT uFloat64,
                                               BT uFloat64,            BT uFloat64,            BT uFloat64,     BT uFloat64Complex,            BT uFloat64,     BT uFloat64Complex,
@@ -374 +374 @@
                                   },
                                   {
-                /*  _FDC */     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,
+                /*   _FDC */     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,
                                        BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,
                                        BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,     BT uFloat64Complex,
@@ -382 +382 @@
                                   },
                                   {
-                /*     D */              BT Double,              BT Double,              BT Double,              BT Double,              BT Double,              BT Double,
+                /*      D */              BT Double,              BT Double,              BT Double,              BT Double,              BT Double,              BT Double,
                                                 BT Double,              BT Double,              BT Double,              BT Double,              BT Double,              BT Double,
                                                 BT Double,              BT Double,              BT Double,       BT DoubleComplex,              BT Double,       BT DoubleComplex,
@@ -390 +390 @@
                                   },
                                   {
-                /*    DC */       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,
+                /*     DC */       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,
                                          BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,
                                          BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,       BT DoubleComplex,
@@ -398 +398 @@
                                   },
                                   {
-                /*  F80X */           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,
+                /*   F80X */           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,
                                              BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,           BT uFloat64x,
                                              BT uFloat64x,           BT uFloat64x,           BT uFloat64x,    BT uFloat64xComplex,           BT uFloat64x,    BT uFloat64xComplex,
@@ -406 +406 @@
                                   },
                                   {
-                /* _FDXC */    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,
+                /*  _FDXC */    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,
                                       BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,
                                       BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,    BT uFloat64xComplex,
@@ -414 +414 @@
                                   },
                                   {
-                /*   F80*/           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,
+                /*    F80 */           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,
                                              BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,           BT uuFloat80,
                                              BT uuFloat80,           BT uuFloat80,           BT uuFloat80,    BT uFloat64xComplex,           BT uuFloat80,    BT uFloat64xComplex,
@@ -422 +422 @@
                                   },
                                   {
-                /*   _FB */           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,
+                /*    _FB */           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,
                                              BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,           BT uFloat128,
                                              BT uFloat128,           BT uFloat128,           BT uFloat128,    BT uFloat128Complex,           BT uFloat128,    BT uFloat128Complex,
@@ -430 +430 @@
                                   },
                                   {
-                /* _FLDC */    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,
+                /*  _FLDC */    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,
                                       BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,
                                       BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,    BT uFloat128Complex,
@@ -438 +438 @@
                                   },
                                   {
-                /*    FB */          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,
+                /*     FB */          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,
                                             BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,          BT uuFloat128,
                                             BT uuFloat128,          BT uuFloat128,          BT uuFloat128,    BT uFloat128Complex,          BT uuFloat128,    BT uFloat128Complex,
@@ -446 +446 @@
                                   },
                                   {
-                /*    LD */          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,
+                /*     LD */          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,
                                             BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,          BT LongDouble,
                                             BT LongDouble,          BT LongDouble,          BT LongDouble,   BT LongDoubleComplex,          BT LongDouble,   BT LongDoubleComplex,
@@ -454 +454 @@
                                   },
                                   {
-                /*   LDC */   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,
+                /*    LDC */   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,
                                      BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,
                                      BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,   BT LongDoubleComplex,
@@ -462 +462 @@
                                   },
                                   {
-                /*  _FBX */          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,
+                /*   _FBX */          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,
                                             BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,          BT uFloat128x,
                                             BT uFloat128x,          BT uFloat128x,          BT uFloat128x,   BT uFloat128xComplex,          BT uFloat128x,   BT uFloat128xComplex,

src/ResolvExpr/ConversionCost.cc

@@ -46 +46 @@
 #endif
 
-        Cost conversionCost( const Type * src, const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
+        Cost conversionCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( const TypeInstType * destAsTypeInst = dynamic_cast< const TypeInstType * >( dest ) ) {
                         PRINT( std::cerr << "type inst " << destAsTypeInst->name; )
                         if ( const EqvClass * eqvClass = env.lookup( destAsTypeInst->name ) ) {
                                 if ( eqvClass->type ) {
-                                        return conversionCost( src, eqvClass->type, indexer, env );
+                                        return conversionCost( src, eqvClass->type, srcIsLvalue, indexer, env );
                                 } else {
                                         return Cost::infinity;
@@ -61 +62 @@
                                 assert( type );
                                 if ( type->base ) {
-                                        return conversionCost( src, type->base, indexer, env ) + Cost::safe;
+                                        return conversionCost( src, type->base, srcIsLvalue, indexer, env )
+                                                + Cost::safe;
                                 } // if
                         } // if
@@ -81 +83 @@
                 } else if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
-                        return convertToReferenceCost( src, refType, indexer, env, [](const Type * const t1, const Type * t2, const SymTab::Indexer &, const TypeEnvironment & env ){
+                        return convertToReferenceCost( src, refType, srcIsLvalue, indexer, env, [](const Type * const t1, const Type * t2, const SymTab::Indexer &, const TypeEnvironment & env ){
                                 return ptrsAssignable( t1, t2, env );
                         });
                 } else {
                         PassVisitor<ConversionCost> converter(
-                                dest, indexer, env,
-                                (Cost (*)(const Type *, const Type *, const SymTab::Indexer&, const TypeEnvironment&))
+                                dest, srcIsLvalue, indexer, env,
+                                (Cost (*)(const Type *, const Type *, bool, const SymTab::Indexer&, const TypeEnvironment&))
                                         conversionCost );
                         src->accept( converter );
@@ -98 +100 @@
         }
 
-        Cost convertToReferenceCost( const Type * src, const Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
+        static Cost convertToReferenceCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                        int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 PRINT( std::cerr << "convert to reference cost... diff " << diff << " " << src << " / " << dest << std::endl; )
                 if ( diff > 0 ) {
                         // TODO: document this
-                        Cost cost = convertToReferenceCost( strict_dynamic_cast< const ReferenceType * >( src )->base, dest, diff-1, indexer, env, func );
+                        Cost cost = convertToReferenceCost(
+                                strict_dynamic_cast< const ReferenceType * >( src )->base, dest, srcIsLvalue,
+                                diff-1, indexer, env, func );
                         cost.incReference();
                         return cost;
                 } else if ( diff < -1 ) {
                         // TODO: document this
-                        Cost cost = convertToReferenceCost( src, strict_dynamic_cast< const ReferenceType * >( dest )->base, diff+1, indexer, env, func );
+                        Cost cost = convertToReferenceCost(
+                                src, strict_dynamic_cast< const ReferenceType * >( dest )->base, srcIsLvalue,
+                                diff+1, indexer, env, func );
                         cost.incReference();
                         return cost;
@@ -138 +145 @@
                                 PRINT( std::cerr << "reference to rvalue conversion" << std::endl; )
                                 PassVisitor<ConversionCost> converter(
-                                        dest, indexer, env,
-                                        (Cost (*)(const Type *, const Type *, const SymTab::Indexer&, const TypeEnvironment&))
+                                        dest, srcIsLvalue, indexer, env,
+                                        (Cost (*)(const Type *, const Type *, bool, const SymTab::Indexer&, const TypeEnvironment&))
                                                 conversionCost );
                                 src->accept( converter );
@@ -150 +157 @@
                         if ( typesCompatibleIgnoreQualifiers( src, destAsRef->base, indexer, env ) ) {
                                 PRINT( std::cerr << "converting compatible base type" << std::endl; )
-                                if ( src->get_lvalue() ) {
+                                if ( srcIsLvalue ) {
                                         PRINT(
                                                 std::cerr << "lvalue to reference conversion" << std::endl;
@@ -178 +185 @@
         }
 
-        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
+        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, bool srcIsLvalue,
+                        const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 int sdepth = src->referenceDepth(), ddepth = dest->referenceDepth();
-                Cost cost = convertToReferenceCost( src, dest, sdepth-ddepth, indexer, env, func );
+                Cost cost = convertToReferenceCost( src, dest, srcIsLvalue, sdepth-ddepth, indexer, env, func );
                 PRINT( std::cerr << "convertToReferenceCost result: " << cost << std::endl; )
                 return cost;
         }
 
-        ConversionCost::ConversionCost( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
-                : dest( dest ), indexer( indexer ), cost( Cost::infinity ), env( env ), costFunc( costFunc ) {
+        ConversionCost::ConversionCost( const Type * dest, bool srcIsLvalue, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : dest( dest ), srcIsLvalue( srcIsLvalue ), indexer( indexer ), cost( Cost::infinity ), env( env ), costFunc( costFunc ) {
         }
 
@@ -217 +225 @@
         // GENERATED BY BasicTypes-gen.cc
         static const int costMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // path length from root to node
-                /*             B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
-                /*     B */ {   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  15,  16,  17,  16,  18,  17, },
-                /*     C */ {  -1,   0,   1,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  16,  15,  17,  16, },
-                /*    SC */ {  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  16,  15,  17,  16, },
-                /*    UC */ {  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  16,  15,  17,  16, },
-                /*    SI */ {  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  15,  14,  16,  15, },
-                /*   SUI */ {  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  15,  14,  16,  15, },
-                /*     I */ {  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  14,  13,  15,  14, },
-                /*    UI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  14,  13,  15,  14, },
-                /*    LI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  13,  12,  14,  13, },
-                /*   LUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  13,  12,  14,  13, },
-                /*   LLI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  12,  11,  13,  12, },
-                /*  LLUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  12,  11,  13,  12, },
-                /*    IB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  11,  10,  12,  11, },
-                /*   UIB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  11,  10,  12,  11, },
-                /*   _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,  10,   9,  11,  10, },
-                /*   _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,   4,  -1,   5,  -1,   6,  -1,  -1,   7,  -1,  -1,   8,  -1,   9, },
-                /*    _F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   9,   8,  10,   9, },
-                /*   _FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,   4,  -1,   5,  -1,  -1,   6,  -1,  -1,   7,  -1,   8, },
-                /*     F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   8,   7,   9,   8, },
-                /*    FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,   4,  -1,  -1,   5,  -1,  -1,   6,  -1,   7, },
-                /*   _FX */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   7,   6,   8,   7, },
-                /*  _FXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,  -1,   4,  -1,  -1,   5,  -1,   6, },
-                /*    FD */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   6,   5,   7,   6, },
-                /*  _FDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,  -1,   3,  -1,  -1,   4,  -1,   5, },
-                /*     D */ {  -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,   1,   1,   2,   2,   3,   3,   4,   5,   4,   6,   5, },
-                /*    DC */ {  -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,  -1,   1,  -1,  -1,   2,  -1,  -1,   3,  -1,   4, },
-                /*  F80X */ {  -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,   1,   1,   2,   2,   3,   4,   3,   5,   4, },
-                /* _FDXC */ {  -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,  -1,  -1,   1,  -1,  -1,   2,  -1,   3, },
-                /*   F80*/ {  -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,   1,   2,   2,   3,   3,   4,   4, },
-                /*   _FB */ {  -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,   1,   1,   2,   2,   3,   3, },
-                /* _FLDC */ {  -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,  -1,  -1,   1,  -1,   2, },
-                /*    FB */ {  -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,   1,   2,   2,   3, },
-                /*    LD */ {  -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,   1,   1,   2, },
-                /*   LDC */ {  -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,  -1,   1, },
-                /*  _FBX */ {  -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,   1, },
+                /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
+                /*      B */ {   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  15,  16,  17,  16,  18,  17, },
+                /*      C */ {  -1,   0,   1,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  16,  15,  17,  16, },
+                /*     SC */ {  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  16,  15,  17,  16, },
+                /*     UC */ {  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  16,  15,  17,  16, },
+                /*     SI */ {  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  15,  14,  16,  15, },
+                /*    SUI */ {  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  15,  14,  16,  15, },
+                /*      I */ {  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  14,  13,  15,  14, },
+                /*     UI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  14,  13,  15,  14, },
+                /*     LI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  13,  12,  14,  13, },
+                /*    LUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  13,  12,  14,  13, },
+                /*    LLI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  12,  11,  13,  12, },
+                /*   LLUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  12,  11,  13,  12, },
+                /*     IB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  11,  10,  12,  11, },
+                /*    UIB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  11,  10,  12,  11, },
+                /*    _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,  10,   9,  11,  10, },
+                /*    _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,   4,  -1,   5,  -1,   6,  -1,  -1,   7,  -1,  -1,   8,  -1,   9, },
+                /*     _F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   9,   8,  10,   9, },
+                /*    _FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,   4,  -1,   5,  -1,  -1,   6,  -1,  -1,   7,  -1,   8, },
+                /*      F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   8,   7,   9,   8, },
+                /*     FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,   4,  -1,  -1,   5,  -1,  -1,   6,  -1,   7, },
+                /*    _FX */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   7,   6,   8,   7, },
+                /*   _FXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,   3,  -1,  -1,   4,  -1,  -1,   5,  -1,   6, },
+                /*     FD */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   6,   5,   7,   6, },
+                /*   _FDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   1,  -1,   2,  -1,  -1,   3,  -1,  -1,   4,  -1,   5, },
+                /*      D */ {  -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,   1,   1,   2,   2,   3,   3,   4,   5,   4,   6,   5, },
+                /*     DC */ {  -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,  -1,   1,  -1,  -1,   2,  -1,  -1,   3,  -1,   4, },
+                /*   F80X */ {  -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,   1,   1,   2,   2,   3,   4,   3,   5,   4, },
+                /*  _FDXC */ {  -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,  -1,  -1,   1,  -1,  -1,   2,  -1,   3, },
+                /*    F80 */ {  -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,   1,   2,   2,   3,   3,   4,   4, },
+                /*    _FB */ {  -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,   1,   1,   2,   2,   3,   3, },
+                /*  _FLDC */ {  -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,  -1,  -1,   1,  -1,   2, },
+                /*     FB */ {  -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,   1,   2,   2,   3, },
+                /*     LD */ {  -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,   1,   1,   2, },
+                /*    LDC */ {  -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,  -1,   1, },
+                /*   _FBX */ {  -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,   1, },
                 /* _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
@@ -265 +273 @@
         // GENERATED BY BasicTypes-gen.cc
         static const int signMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion
-                /*             B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
-                /*     B */ {   0,   0,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*     C */ {  -1,   0,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*    SC */ {  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*    UC */ {  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*    SI */ {  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*   SUI */ {  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*     I */ {  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*    UI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*    LI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*   LUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*   LLI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*  LLUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*    IB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*   UIB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*   _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*   _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
-                /*    _F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*   _FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
-                /*     F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*    FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
-                /*   _FX */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*  _FXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
-                /*    FD */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*  _FDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
-                /*     D */ {  -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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*    DC */ {  -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,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
-                /*  F80X */ {  -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,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /* _FDXC */ {  -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,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
-                /*   F80*/ {  -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,   0,   0,   0,   0,   0,   0,   0,   0, },
-                /*   _FB */ {  -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,   0,   0,   0,   0,   0,   0, },
-                /* _FLDC */ {  -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,  -1,  -1,   0,  -1,   0, },
-                /*    FB */ {  -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,   0,   0,   0,   0,   0, },
-                /*    LD */ {  -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,   0,   0,   0, },
-                /*   LDC */ {  -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,  -1,   0, },
-                /*  _FBX */ {  -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,   0, },
+                /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
+                /*      B */ {   0,   0,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*      C */ {  -1,   0,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     SC */ {  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     UC */ {  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     SI */ {  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    SUI */ {  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*      I */ {  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     UI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     LI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    LUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    LLI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*   LLUI */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     IB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    UIB */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    _FH */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*     _F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    _FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*      F */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     FC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*    _FX */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*   _FXC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*     FD */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*   _FDC */ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0,  -1,   0,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*      D */ {  -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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*     DC */ {  -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,  -1,   0,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*   F80X */ {  -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,   0,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*  _FDXC */ {  -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,  -1,  -1,   0,  -1,  -1,   0,  -1,   0, },
+                /*    F80 */ {  -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,   0,   0,   0,   0,   0,   0,   0,   0, },
+                /*    _FB */ {  -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,   0,   0,   0,   0,   0,   0, },
+                /*  _FLDC */ {  -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,  -1,  -1,   0,  -1,   0, },
+                /*     FB */ {  -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,   0,   0,   0,   0,   0, },
+                /*     LD */ {  -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,   0,   0,   0, },
+                /*    LDC */ {  -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,  -1,   0, },
+                /*   _FBX */ {  -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,   0, },
                 /* _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, },
         }; // signMatrix
@@ -371 +379 @@
                 // recursively compute conversion cost from T1 to T2.
                 // cv can be safely dropped because of 'implicit dereference' behavior.
-                cost = costFunc( refType->base, dest, indexer, env );
+                cost = costFunc( refType->base, dest, srcIsLvalue, indexer, env );
                 if ( refType->base->tq == dest->tq ) {
                         cost.incReference();  // prefer exact qualifiers
@@ -403 +411 @@
                 static Type::Qualifiers q;
                 static BasicType integer( q, BasicType::SignedInt );
-                cost = costFunc( &integer, dest, indexer, env );  // safe if dest >= int
+                cost = costFunc( &integer, dest, srcIsLvalue, indexer, env );  // safe if dest >= int
                 if ( cost < Cost::unsafe ) {
                         cost.incSafe();
@@ -413 +421 @@
         void ConversionCost::postvisit( const TypeInstType * inst ) {
                 if ( const EqvClass * eqvClass = env.lookup( inst->name ) ) {
-                        cost = costFunc( eqvClass->type, dest, indexer, env );
+                        cost = costFunc( eqvClass->type, dest, srcIsLvalue, indexer, env );
                 } else if ( const TypeInstType * destAsInst = dynamic_cast< const TypeInstType * >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
@@ -423 +431 @@
                         assert( type );
                         if ( type->base ) {
-                                cost = costFunc( type->base, dest, indexer, env ) + Cost::safe;
+                                cost = costFunc( type->base, dest, srcIsLvalue, indexer, env ) + Cost::safe;
                         } // if
                 } // if
@@ -434 +442 @@
                         std::list< Type * >::const_iterator destIt = destAsTuple->types.begin();
                         while ( srcIt != tupleType->types.end() && destIt != destAsTuple->types.end() ) {
-                                Cost newCost = costFunc( * srcIt++, * destIt++, indexer, env );
+                                Cost newCost = costFunc( * srcIt++, * destIt++, srcIsLvalue, indexer, env );
                                 if ( newCost == Cost::infinity ) {
                                         return;
@@ -534 +542 @@
 }
 
-Cost convertToReferenceCost( const ast::Type * src, const ast::Type * dst, int diff,
-                const ast::SymbolTable & symtab, const ast::TypeEnvironment & env,
+static Cost convertToReferenceCost( const ast::Type * src, const ast::Type * dst,
+                int diff, const ast::SymbolTable & symtab, const ast::TypeEnvironment & env,
                 NumCostCalculation func ) {
         if ( 0 < diff ) {

src/ResolvExpr/ConversionCost.h

@@ -10 +10 @@
 // Created On       : Sun May 17 09:37:28 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 24 10:00:00 2019
-// Update Count     : 5
+// Last Modified On : Thu Aug  8 16:13:00 2019
+// Update Count     : 6
 //
 
@@ -33 +33 @@
         class TypeEnvironment;
 
-        typedef std::function<Cost(const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
+        typedef std::function<Cost(const Type *, const Type *, bool,
+                const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
+
         struct ConversionCost : public WithShortCircuiting {
           public:
-                ConversionCost( const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
+                ConversionCost( const Type * dest, bool srcIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
 
                 Cost get_cost() const { return cost; }
@@ -59 +62 @@
           protected:
                 const Type * dest;
+                bool srcIsLvalue;
                 const SymTab::Indexer &indexer;
                 Cost cost;
@@ -66 +70 @@
 
         typedef std::function<int(const Type *, const Type *, const SymTab::Indexer &, const TypeEnvironment &)> PtrsFunction;
-        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
+        Cost convertToReferenceCost( const Type * src, const ReferenceType * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func );
 
 // Some function pointer types, differ in return type.

src/ResolvExpr/ResolveAssertions.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Oct 05 13:46:00 2018
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 10 16:10:37 2019
-// Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:47:00 2019
+// Update Count     : 3
 //
 
@@ -156 +156 @@
                         for ( const auto& assn : x.assns ) {
                                 // compute conversion cost from satisfying decl to assertion
+                                assert( !assn.match.adjType->get_lvalue() );
                                 k += computeConversionCost(
-                                        assn.match.adjType, assn.decl->get_type(), indexer, x.env );
+                                        assn.match.adjType, assn.decl->get_type(), false, indexer, x.env );
 
                                 // mark vars+specialization cost on function-type assertions

src/ResolvExpr/Unify.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 18 11:58:00 2018
-// Update Count     : 43
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Sep  4 10:00:00 2019
+// Update Count     : 44
 //
 
@@ -274 +274 @@
 #endif
                         if ( ( common = commonType( type1, type2, widen.first, widen.second, indexer, env, openVars ) ) ) {
-                                common->get_qualifiers() = tq1 | tq2;
+                                common->tq = tq1.unify( tq2 );
 #ifdef DEBUG
                                 std::cerr << "unifyInexact: common type is ";
@@ -291 +291 @@
                                 if ( ( tq1 > tq2 || widen.first ) && ( tq2 > tq1 || widen.second ) ) {
                                         common = type1->clone();
-                                        common->get_qualifiers() = tq1 | tq2;
+                                        common->tq = tq1.unify( tq2 );
                                         result = true;
                                 } else {
@@ -298 +298 @@
                         } else {
                                 common = type1->clone();
-                                common->get_qualifiers() = tq1 | tq2;
+                                common->tq = tq1.unify( tq2 );
                                 result = true;
                         } // if

src/ResolvExpr/typeops.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 07:28:22 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  8 09:30:34 2019
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:36:00 2019
+// Update Count     : 5
 //
 
@@ -80 +80 @@
 
         // in CastCost.cc
-        Cost castCost( const Type * src, const Type * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        Cost castCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
         Cost castCost(
                 const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
@@ -86 +87 @@
 
         // in ConversionCost.cc
-        Cost conversionCost( const Type * src, const Type * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        Cost conversionCost( const Type * src, const Type * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
         Cost conversionCost(
                 const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
@@ -92 +94 @@
 
         // in AlternativeFinder.cc
-        Cost computeConversionCost( Type * actualType, Type * formalType,
+        Cost computeConversionCost( Type * actualType, Type * formalType, bool actualIsLvalue,
                 const SymTab::Indexer & indexer, const TypeEnvironment & env );
 

src/SymTab/Demangle.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Thu Jul 19 12:52:41 2018
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jul 19 12:54:35 2018
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 30 13:46:33 2019
+// Update Count     : 3
 //
 
@@ -313 +313 @@
                         typeString = "_Atomic " + typeString;
                 } // if
-                if ( type->get_lvalue() ) {
-                        // when not generating C code, print lvalue for debugging.
-                        typeString = "lvalue " + typeString;
-                }
         }
 }

src/SymTab/Mangler.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 25 15:49:26 2017
-// Update Count     : 23
+// Last Modified On : Tue Jul 30 13:46:10 2019
+// Update Count     : 26
 //
 #include "Mangler.h"
@@ -377 +377 @@
                                         mangleName << Encoding::qualifiers.at(Type::Mutex);
                                 } // if
-                                if ( type->get_lvalue() ) {
-                                        // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues
-                                        mangleName << Encoding::qualifiers.at(Type::Lvalue);
-                                }
-
                                 if ( inFunctionType ) {
                                         // turn off inFunctionType so that types can be differentiated for nested qualifiers
@@ -724 +719 @@
                                 mangleName << Encoding::qualifiers.at(Type::Mutex);
                         } // if
-                        if ( type->is_lvalue() ) {
-                                // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues
-                                mangleName << Encoding::qualifiers.at(Type::Lvalue);
-                        }
-
                         if ( inFunctionType ) {
                                 // turn off inFunctionType so that types can be differentiated for nested qualifiers

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 28 13:47:23 2017
-// Update Count     : 359
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Aug  7 6:42:00 2019
+// Update Count     : 360
 //
 
@@ -81 +81 @@
 #include "SynTree/Label.h"             // for operator==, Label
 #include "SynTree/Mutator.h"           // for Mutator
+#include "SynTree/TopLvalue.h"         // for assertTopLvalue, clearInnerLvalue
 #include "SynTree/Type.h"              // for Type, TypeInstType, EnumInstType
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
@@ -308 +309 @@
                 PassVisitor<FixQualifiedTypes> fixQual;
 
+                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-A");
@@ -316 +318 @@
                         acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes_old because it is an indexer and needs correct types for mangling
                 }
+                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-B");
                         Stats::Time::BlockGuard guard("validate-B");
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Link Reference To Types", [&]() {
                                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
                         });
+                        clearInnerLvalue( translationUnit );
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Fix Qualified Types", [&]() {
                                 mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes_old, because aggregate members are accessed
                         });
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Hoist Structs", [&]() {
                                 HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
                         });
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Eliminate Typedefs", [&]() {
                                 EliminateTypedef::eliminateTypedef( translationUnit ); //
                         });
                 }
+                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-C");
@@ -340 +349 @@
                         InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
                 }
+                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-D");
                         Stats::Time::BlockGuard guard("validate-D");
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Apply Concurrent Keywords", [&]() {
                                 Concurrency::applyKeywords( translationUnit );
                         });
+                        clearInnerLvalue( translationUnit );
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Forall Pointer Decay", [&]() {
                                 acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
                         });
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Hoist Control Declarations", [&]() {
                                 ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
                         });
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Generate Autogen routines", [&]() {
                                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay_old
                         });
-                }
+                        clearInnerLvalue( translationUnit );
+                }
+                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-E");
                         Stats::Time::BlockGuard guard("validate-E");
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Implement Mutex Func", [&]() {
                                 Concurrency::implementMutexFuncs( translationUnit );
                         });
+                        clearInnerLvalue( translationUnit );
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Implement Thread Start", [&]() {
                                 Concurrency::implementThreadStarter( translationUnit );
                         });
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Compound Literal", [&]() {
                                 mutateAll( translationUnit, compoundliteral );
                         });
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Resolve With Expressions", [&]() {
                                 ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
                         });
-                }
+                        clearInnerLvalue( translationUnit );
+                }
+                assertTopLvalue( translationUnit );
                 {
                         Stats::Heap::newPass("validate-F");
                         Stats::Time::BlockGuard guard("validate-F");
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Fix Object Type", [&]() {
                                 FixObjectType::fix( translationUnit );
                         });
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Array Length", [&]() {
                                 ArrayLength::computeLength( translationUnit );
                         });
+                        clearInnerLvalue( translationUnit );
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Find Special Declarations", [&]() {
                                 Validate::findSpecialDecls( translationUnit );
                         });
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Fix Label Address", [&]() {
                                 mutateAll( translationUnit, labelAddrFixer );
                         });
+                        assertTopLvalue( translationUnit );
                         Stats::Time::TimeBlock("Handle Attributes", [&]() {
                                 Validate::handleAttributes( translationUnit );
                         });
                 }
+                assertTopLvalue( translationUnit );
         }
 

src/SynTree/AddressExpr.cc

@@ -42 +42 @@
 AddressExpr::AddressExpr( Expression *arg ) : Expression(), arg( arg ) {
         if ( arg->result ) {
-                if ( arg->result->get_lvalue() ) {
+                if ( arg->get_lvalue() ) {
                         // lvalue, retains all layers of reference and gains a pointer inside the references
                         set_result( addrType( arg->result ) );

src/SynTree/ApplicationExpr.cc

@@ -9 +9 @@
 // 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
 //
 
@@ -25 +25 @@
 #include "Declaration.h"         // for Declaration
 #include "Expression.h"          // for ParamEntry, ApplicationExpr, Expression
+#include "InitTweak/InitTweak.h" // for getFunction
 #include "ResolvExpr/typeops.h"  // for extractResultType
 #include "Type.h"                // for Type, PointerType, FunctionType
@@ -76 +77 @@
 }
 
+bool ApplicationExpr::get_lvalue() const {
+        // from src/GenPoly/Lvalue.cc: isIntrinsicReference
+        static std::set<std::string> lvalueFunctions = { "*?", "?[?]" };
+        if ( const DeclarationWithType * func = InitTweak::getFunction( this ) ) {
+                return func->linkage == LinkageSpec::Intrinsic && lvalueFunctions.count(func->name);
+        }
+        return false;
+}
+
 void ApplicationExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Application of" << std::endl << indent+1;

src/SynTree/BasicType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan 31 21:37:36 2019
-// Update Count     : 12
+// Last Modified On : Sun Aug  4 21:07:44 2019
+// Update Count     : 13
 //
 
@@ -31 +31 @@
 bool BasicType::isInteger() const {
         return kind <= UnsignedInt128;
-#if 0
-        switch ( kind ) {
-          case Bool:
-          case Char:
-          case SignedChar:
-          case UnsignedChar:
-          case ShortSignedInt:
-          case ShortUnsignedInt:
-          case SignedInt:
-          case UnsignedInt:
-          case LongSignedInt:
-          case LongUnsignedInt:
-          case LongLongSignedInt:
-          case LongLongUnsignedInt:
-          case SignedInt128:
-          case UnsignedInt128:
-                return true;
-          case Float:
-          case Double:
-          case LongDouble:
-          case FloatComplex:
-          case DoubleComplex:
-          case LongDoubleComplex:
-          case FloatImaginary:
-          case DoubleImaginary:
-          case LongDoubleImaginary:
-          case Float80:
-          case Float128:
-                return false;
-          case NUMBER_OF_BASIC_TYPES:
-                assert( false );
-        } // switch
-        assert( false );
-        return false;
-#endif
 }
 

src/SynTree/CommaExpr.cc

@@ -9 +9 @@
 // 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 +39 @@
 }
 
+bool CommaExpr::get_lvalue() const {
+        // This is wrong by C, but the current implementation uses it.
+        return arg2->get_lvalue();
+}
+
 void CommaExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Comma Expression:" << std::endl;

src/SynTree/Expression.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 : Tue Feb 19 18:10:55 2019
-// Update Count     : 60
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 15 13:43:00 2019
+// Update Count     : 64
 //
 
@@ -19 +19 @@
 #include <iostream>                  // for ostream, operator<<, basic_ostream
 #include <list>                      // for list, _List_iterator, list<>::co...
+#include <set>                       // for set
 
 #include "Common/utility.h"          // for maybeClone, cloneAll, deleteAll
@@ -63 +64 @@
 }
 
+bool Expression::get_lvalue() const {
+        return false;
+}
+
 void Expression::print( std::ostream & os, Indenter indent ) const {
         printInferParams( inferParams, os, indent+1, 0 );
@@ -134 +139 @@
 }
 
+bool VariableExpr::get_lvalue() const {
+        // It isn't always an lvalue, but it is never an rvalue.
+        return true;
+}
+
 VariableExpr * VariableExpr::functionPointer( FunctionDecl * func ) {
         VariableExpr * funcExpr = new VariableExpr( func );
@@ -252 +262 @@
 }
 
-AttrExpr::AttrExpr( Expression * attr, Expression * expr_ ) :
-                Expression(), attr( attr ), expr(expr_), type(0), isType(false) {
-}
-
-AttrExpr::AttrExpr( Expression * attr, Type * type_ ) :
-                Expression(), attr( attr ), expr(0), type(type_), isType(true) {
-}
-
-AttrExpr::AttrExpr( const AttrExpr & other ) :
-                Expression( other ), attr( maybeClone( other.attr ) ), expr( maybeClone( other.expr ) ), type( maybeClone( other.type ) ), isType( other.isType ) {
-}
-
-AttrExpr::~AttrExpr() {
-        delete attr;
-        delete expr;
-        delete type;
-}
-
-void AttrExpr::print( std::ostream & os, Indenter indent) const {
-        os << "Attr ";
-        attr->print( os, indent+1);
-        if ( isType || expr ) {
-                os << "applied to: ";
-                if (isType) type->print(os, indent+1);
-                else expr->print(os, indent+1);
-        } // if
-        Expression::print( os, indent );
-}
-
 CastExpr::CastExpr( Expression * arg, Type * toType, bool isGenerated ) : arg(arg), isGenerated( isGenerated ) {
         set_result(toType);
@@ -294 +275 @@
 CastExpr::~CastExpr() {
         delete arg;
+}
+
+bool CastExpr::get_lvalue() const {
+        // This is actually wrong by C, but it works with our current set-up.
+        return arg->get_lvalue();
 }
 
@@ -376 +362 @@
 }
 
+bool UntypedMemberExpr::get_lvalue() const {
+        return aggregate->get_lvalue();
+}
+
 void UntypedMemberExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Untyped Member Expression, with field: " << std::endl << indent+1;
@@ -405 +395 @@
         // don't delete the member declaration, since it points somewhere else in the tree
         delete aggregate;
+}
+
+bool MemberExpr::get_lvalue() const {
+        // This is actually wrong by C, but it works with our current set-up.
+        return true;
 }
 
@@ -457 +452 @@
 }
 
+bool UntypedExpr::get_lvalue() const {
+        // from src/GenPoly/Lvalue.cc: isIntrinsicReference
+        static std::set<std::string> lvalueFunctions = { "*?", "?[?]" };
+        std::string fname = InitTweak::getFunctionName( const_cast< UntypedExpr * >( this ) );
+        return lvalueFunctions.count(fname);
+}
 
 void UntypedExpr::print( std::ostream & os, Indenter indent ) const {
@@ -515 +516 @@
         delete arg2;
         delete arg3;
+}
+
+bool ConditionalExpr::get_lvalue() const {
+        return false;
 }
 
@@ -573 +578 @@
 }
 
+bool ConstructorExpr::get_lvalue() const {
+        return false;
+}
+
 void ConstructorExpr::print( std::ostream & os, Indenter indent ) const {
         os <<  "Constructor Expression: " << std::endl << indent+1;
@@ -590 +599 @@
 CompoundLiteralExpr::~CompoundLiteralExpr() {
         delete initializer;
+}
+
+bool CompoundLiteralExpr::get_lvalue() const {
+        return true;
 }
 
@@ -641 +654 @@
                 result = new VoidType( Type::Qualifiers() );
         }
+}
+bool StmtExpr::get_lvalue() const {
+        return false;
 }
 void StmtExpr::print( std::ostream & os, Indenter indent ) const {

src/SynTree/Expression.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 : Mon Feb 18 18:29:51 2019
-// Update Count     : 49
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 15 13:46:00 2019
+// Update Count     : 54
 //
 
@@ -71 +71 @@
         const Type * get_result() const { return result; }
         void set_result( Type * newValue ) { result = newValue; }
+        virtual bool get_lvalue() const;
 
         TypeSubstitution * get_env() const { return env; }
@@ -98 +99 @@
         virtual ~ApplicationExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_function() const { return function; }
         void set_function( Expression * newValue ) { function = newValue; }
@@ -120 +123 @@
         UntypedExpr( const UntypedExpr & other );
         virtual ~UntypedExpr();
+
+        bool get_lvalue() const final;
 
         Expression * get_function() const { return function; }
@@ -208 +213 @@
         virtual ~CastExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_arg() const { return arg; }
         void set_arg( Expression * newValue ) { arg = newValue; }
@@ -268 +275 @@
         virtual ~UntypedMemberExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_member() const { return member; }
         void set_member( Expression * newValue ) { member = newValue; }
@@ -291 +300 @@
         virtual ~MemberExpr();
 
+        bool get_lvalue() const final;
+
         DeclarationWithType * get_member() const { return member; }
         void set_member( DeclarationWithType * newValue ) { member = newValue; }
@@ -313 +324 @@
         VariableExpr( const VariableExpr & other );
         virtual ~VariableExpr();
+
+        bool get_lvalue() const final;
 
         DeclarationWithType * get_var() const { return var; }
@@ -463 +476 @@
 };
 
-/// AttrExpr represents an @attribute expression (like sizeof, but user-defined)
-class AttrExpr : public Expression {
-  public:
-        Expression * attr;
-        Expression * expr;
-        Type * type;
-        bool isType;
-
-        AttrExpr(Expression * attr, Expression * expr );
-        AttrExpr( const AttrExpr & other );
-        AttrExpr( Expression * attr, Type * type );
-        virtual ~AttrExpr();
-
-        Expression * get_attr() const { return attr; }
-        void set_attr( Expression * newValue ) { attr = newValue; }
-        Expression * get_expr() const { return expr; }
-        void set_expr( Expression * newValue ) { expr = newValue; }
-        Type * get_type() const { return type; }
-        void set_type( Type * newValue ) { type = newValue; }
-        bool get_isType() const { return isType; }
-        void set_isType( bool newValue ) { isType = newValue; }
-
-        virtual AttrExpr * clone() const override { return new AttrExpr( * this ); }
-        virtual void accept( Visitor & v ) override { v.visit( this ); }
-        virtual void accept( Visitor & v ) const override { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
-};
-
 /// LogicalExpr represents a short-circuit boolean expression (&& or ||)
 class LogicalExpr : public Expression {
@@ -528 +512 @@
         ConditionalExpr( const ConditionalExpr & other );
         virtual ~ConditionalExpr();
+
+        bool get_lvalue() const final;
 
         Expression * get_arg1() const { return arg1; }
@@ -553 +539 @@
         virtual ~CommaExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_arg1() const { return arg1; }
         void set_arg1( Expression * newValue ) { arg1 = newValue; }
@@ -639 +627 @@
         ~ConstructorExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_callExpr() const { return callExpr; }
         void set_callExpr( Expression * newValue ) { callExpr = newValue; }
@@ -657 +647 @@
         CompoundLiteralExpr( const CompoundLiteralExpr & other );
         virtual ~CompoundLiteralExpr();
+
+        bool get_lvalue() const final;
 
         Initializer * get_initializer() const { return initializer; }
@@ -715 +707 @@
         virtual ~TupleExpr();
 
+        bool get_lvalue() const final;
+
         std::list<Expression*>& get_exprs() { return exprs; }
 
@@ -733 +727 @@
         TupleIndexExpr( const TupleIndexExpr & other );
         virtual ~TupleIndexExpr();
+
+        bool get_lvalue() const final;
 
         Expression * get_tuple() const { return tuple; }
@@ -782 +778 @@
         StmtExpr( const StmtExpr & other );
         virtual ~StmtExpr();
+
+        bool get_lvalue() const final;
 
         CompoundStmt * get_statements() const { return statements; }

src/SynTree/Mutator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:31:00 2017
-// Update Count     : 16
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 25 22:37:46 2019
+// Update Count     : 17
 //
 #pragma once
@@ -74 +74 @@
         virtual Expression * mutate( OffsetofExpr * offsetofExpr ) = 0;
         virtual Expression * mutate( OffsetPackExpr * offsetPackExpr ) = 0;
-        virtual Expression * mutate( AttrExpr * attrExpr ) = 0;
         virtual Expression * mutate( LogicalExpr * logicalExpr ) = 0;
         virtual Expression * mutate( ConditionalExpr * conditionalExpr ) = 0;

src/SynTree/SynTree.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:54:00 2017
-// Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 25 22:37:45 2019
+// Update Count     : 12
 //
 
@@ -79 +79 @@
 class OffsetofExpr;
 class OffsetPackExpr;
-class AttrExpr;
 class LogicalExpr;
 class ConditionalExpr;

src/SynTree/TupleExpr.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: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 +57 @@
 }
 
+bool TupleExpr::get_lvalue() const {
+        return false;
+}
+
 void TupleExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Tuple:" << std::endl;
@@ -76 +80 @@
 TupleIndexExpr::~TupleIndexExpr() {
         delete tuple;
+}
+
+bool TupleIndexExpr::get_lvalue() const {
+        return tuple->get_lvalue();
 }
 

src/SynTree/Type.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 12 15:48:00 2019
-// Update Count     : 44
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Aug  4 21:05:07 2019
+// Update Count     : 45
 //
 #include "Type.h"
@@ -24 +24 @@
 using namespace std;
 
-const char *BasicType::typeNames[] = {
-#if 0
-        "_Bool",
-        "char",
-        "signed char",
-        "unsigned char",
-        "signed short int",
-        "unsigned short int",
-        "signed int",
-        "unsigned int",
-        "signed long int",
-        "unsigned long int",
-        "signed long long int",
-        "unsigned long long int",
-        "float",
-        "double",
-        "long double",
-        "float _Complex",
-        "double _Complex",
-        "long double _Complex",
-        "float _Imaginary",
-        "double _Imaginary",
-        "long double _Imaginary",
-        "__int128",
-        "unsigned __int128",
-        "__float80",
-        "__float128",
-        "_Float16",
-        "_Float32",
-        "_Float32x",
-        "_Float64",
-        "_Float64x",
-        "_Float128",
-        "_Float128x",
-        "_Float16 _Complex",
-        "_Float32 _Complex",
-        "_Float32x _Complex",
-        "_Float64 _Complex",
-        "_Float64x _Complex",
-        "_Float128 _Complex",
-        "_Float128x _Complex",
-#endif
+const char * BasicType::typeNames[] = {
         "_Bool",
         "char",
@@ -107 +66 @@
 };
 static_assert(
-        sizeof(BasicType::typeNames)/sizeof(BasicType::typeNames[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
+        sizeof(BasicType::typeNames) / sizeof(BasicType::typeNames[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
         "Each basic type name should have a corresponding kind enum value"
 );
@@ -152 +111 @@
 TypeSubstitution Type::genericSubstitution() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
 
-void Type::print( std::ostream &os, Indenter indent ) const {
+void Type::print( std::ostream & os, Indenter indent ) const {
         if ( ! forall.empty() ) {
                 os << "forall" << std::endl;

src/SynTree/Type.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 14 17:11:24 2019
-// Update Count     : 169
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Sep  4 09:58:00 2019
+// Update Count     : 170
 //
 
@@ -131 +131 @@
                 bool operator>( Qualifiers other ) const { return *this != other && *this >= other; }
                 BFCommon( Qualifiers, NumTypeQualifier )
+
+                Qualifiers unify( Qualifiers const & other ) const {
+                        int or_flags = Mask & (val | other.val);
+                        int and_flags = val & other.val;
+                        return Qualifiers( or_flags | and_flags );
+                }
         }; // Qualifiers
 

src/SynTree/Visitor.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:28:00 2017
-// Update Count     : 13
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 25 22:21:49 2019
+// Update Count     : 14
 //
 
@@ -123 +123 @@
         virtual void visit( OffsetPackExpr * node ) { visit( const_cast<const OffsetPackExpr *>(node) ); }
         virtual void visit( const OffsetPackExpr * offsetPackExpr ) = 0;
-        virtual void visit( AttrExpr * node ) { visit( const_cast<const AttrExpr *>(node) ); }
-        virtual void visit( const AttrExpr * attrExpr ) = 0;
         virtual void visit( LogicalExpr * node ) { visit( const_cast<const LogicalExpr *>(node) ); }
         virtual void visit( const LogicalExpr * logicalExpr ) = 0;

src/SynTree/module.mk

@@ -49 +49 @@
       SynTree/TypeSubstitution.cc \
       SynTree/Attribute.cc \
-      SynTree/DeclReplacer.cc
+      SynTree/DeclReplacer.cc \
+      SynTree/TopLvalue.cc
 
 SRC += $(SRC_SYNTREE)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  5 20:35:13 2019
-// Update Count     : 601
+// Last Modified On : Fri Aug 23 06:50:08 2019
+// Update Count     : 607
 //
 
@@ -17 +17 @@
 #include <execinfo.h>                       // for backtrace, backtrace_symbols
 #include <getopt.h>                         // for no_argument, optind, geto...
-#include <signal.h>                         // for signal, SIGABRT, SIGSEGV
 #include <cassert>                          // for assertf
 #include <cstdio>                           // for fopen, FILE, fclose, stdin
 #include <cstdlib>                          // for exit, free, abort, EXIT_F...
+#include <csignal>                         // for signal, SIGABRT, SIGSEGV
 #include <cstring>                          // for index
 #include <fstream>                          // for ofstream
@@ -60 +60 @@
 #include "ResolvExpr/Resolver.h"            // for resolve
 #include "SymTab/Validate.h"                // for validate
+#include "SynTree/TopLvalue.h"              // for assertTopLvalue, clearInn...
 #include "SynTree/Declaration.h"            // for Declaration
 #include "SynTree/Visitor.h"                // for acceptAll
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
 #include "Virtual/ExpandCasts.h"            // for expandCasts
+
 
 using namespace std;
@@ -95 +97 @@
 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 = "";
 
-static void parse_cmdline( int argc, char *argv[], const char *& filename );
+static void parse_cmdline( int argc, char *argv[] );
 static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
@@ -166 +170 @@
 } // sigAbortHandler
 
-
 int main( int argc, char * argv[] ) {
         FILE * input;                                                                           // use FILE rather than istream because yyin is FILE
         ostream * output = & cout;
-        const char * filename = nullptr;
         list< Declaration * > translationUnit;
 
@@ -182 +184 @@
         // } // for
 
-        parse_cmdline( argc, argv, filename );                          // process command-line arguments
+        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 {
@@ -189 +198 @@
                 if ( optind < argc ) {                                                  // any commands after the flags ? => input file name
                         input = fopen( argv[ optind ], "r" );
-                        assertf( input, "cannot open %s\n", argv[ optind ] );
-                        // if running cfa-cpp directly, might forget to pass -F option (and really shouldn't have to)
-                        if ( filename == nullptr ) filename = argv[ optind ];
-                        // prelude filename comes in differently
-                        if ( libcfap ) filename = "prelude.cfa";
+                        assertf( input, "cannot open %s because %s\n", argv[ optind ], strerror( errno ) );
                         optind += 1;
                 } else {                                                                                // no input file name
                         input = stdin;
-                        // if running cfa-cpp directly, might forget to pass -F option. Since this takes from stdin, pass
-                        // a fake name along
-                        if ( filename == nullptr ) filename = "stdin";
                 } // if
 
@@ -258 +260 @@
                 Stats::Time::StopBlock();
 
+                //std::cerr << "Post-Parse Check" << std::endl;
+                clearInnerLvalue( translationUnit );
+                assertTopLvalue( translationUnit );
+
                 // add the assignment statement after the initialization of a type parameter
                 PASS( "Validate", SymTab::validate( translationUnit, symtabp ) );
@@ -276 +282 @@
                 } // if
 
+                assertTopLvalue( translationUnit );
                 PASS( "Fix Labels", ControlStruct::fixLabels( translationUnit ) );
+                assertTopLvalue( translationUnit );
                 PASS( "Fix Names", CodeGen::fixNames( translationUnit ) );
+                assertTopLvalue( translationUnit );
                 PASS( "Gen Init", InitTweak::genInit( translationUnit ) );
+                assertTopLvalue( translationUnit );
                 PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
+                assertTopLvalue( translationUnit );
                 if ( libcfap ) {
                         // generate the bodies of cfa library functions
@@ -309 +320 @@
                         translationUnit = convert( move( transUnit ) );
                 }
+
                 if ( exprp ) {
                         dump( translationUnit );
                         return EXIT_SUCCESS;
                 } // if
+
+                clearInnerLvalue( translationUnit );
+                assertTopLvalue( translationUnit );
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
                 PASS( "Fix Init", InitTweak::fix( translationUnit, buildingLibrary() ) );
+                clearInnerLvalue( translationUnit );
+                assertTopLvalue( translationUnit );
                 if ( ctorinitp ) {
                         dump ( translationUnit );
@@ -322 +339 @@
 
                 PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
+                assertTopLvalue( translationUnit );
 
                 PASS( "Translate EHM" , ControlStruct::translateEHM( translationUnit ) );
+                assertTopLvalue( translationUnit );
 
                 PASS( "Gen Waitfor" , Concurrency::generateWaitFor( translationUnit ) );
+                clearInnerLvalue( translationUnit );
+                assertTopLvalue( translationUnit );
 
                 PASS( "Convert Specializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded
+                clearInnerLvalue( translationUnit );
+                assertTopLvalue( translationUnit );
 
                 PASS( "Expand Tuples", Tuples::expandTuples( translationUnit ) ); // xxx - is this the right place for this?
+                assertTopLvalue( translationUnit );
 
                 if ( tuplep ) {
@@ -337 +361 @@
 
                 PASS( "Virtual Expand Casts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM
+                assertTopLvalue( translationUnit );
 
                 PASS( "Instantiate Generics", GenPoly::instantiateGeneric( translationUnit ) );
@@ -343 +368 @@
                         return EXIT_SUCCESS;
                 } // if
+                clearInnerLvalue( translationUnit );
+                assertTopLvalue( translationUnit );
                 PASS( "Convert L-Value", GenPoly::convertLvalue( translationUnit ) );
-
+                clearInnerLvalue( translationUnit );
+                assertTopLvalue( translationUnit );
 
                 if ( bboxp ) {
@@ -351 +379 @@
                 } // if
                 PASS( "Box", GenPoly::box( translationUnit ) );
+                clearInnerLvalue( translationUnit );
+                assertTopLvalue( translationUnit );
 
                 if ( bcodegenp ) {
@@ -362 +392 @@
 
                 CodeTools::fillLocations( translationUnit );
+                assertTopLvalue( translationUnit );
                 PASS( "Code Gen", CodeGen::generate( translationUnit, *output, ! genproto, prettycodegenp, true, linemarks ) );
 
@@ -412 +443 @@
 
 
-static const char optstring[] = ":hlLmNnpP:S:twW:D:F:";
+static const char optstring[] = ":hlLmNnpP:S:twW:D:";
 
 enum { PreludeDir = 128 };
@@ -427 +458 @@
         { "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
         { "", no_argument, nullptr, 0 },                                        // -D
-        { "", no_argument, nullptr, 0 },                                        // -F
         { nullptr, 0, nullptr, 0 }
 }; // long_opts
@@ -445 +476 @@
         "<directory> prelude directory for debug/nodebug",      // no flag
         "<option-list> 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
         "",                                                                                                     // -D
-        "",                                                                                                     // -F
 }; // description
 
@@ -484 +515 @@
 
 static void usage( char *argv[] ) {
-    cout << "Usage: " << argv[0] << " options are:" << endl;
+    cout << "Usage: " << argv[0] << " [options] [input-file (default stdin)] [output-file (default stdout)], where 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 ) {
@@ -510 +541 @@
 } // usage
 
-static void parse_cmdline( int argc, char * argv[], const char *& filename ) {
+static void parse_cmdline( int argc, char * argv[] ) {
         opterr = 0;                                                                                     // (global) prevent getopt from printing error messages
 
@@ -556 +587 @@
                         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
@@ -581 +615 @@
                   case 'D':                                                                             // ignore -Dxxx, forwarded by cpp, hidden
                         break;
-                  case 'F':                                                                             // source file-name without suffix, hidden
-                        filename = optarg;
-                        break;
                   case '?':                                                                             // unknown option
                         if ( optopt ) {                                                         // short option ?