Changeset cf32116 for src/AST

Timestamp:

Oct 4, 2019, 3:07:07 PM (5 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:

3f3bfe5a

Parents:

90ce35aa

Message:

Implemented expression based lvalue resolution on new ast.

Location:

src/AST

Files:

• Expr.cpp (modified) (13 diffs)
• Expr.hpp (modified) (11 diffs)

src/AST/Expr.cpp ¶

@@ -10 +10 @@
 // Created On       : Wed May 15 17:00:00 2019
 // Last Modified By : Andrew Beach
-// Created On       : Thr Jun 13 13:38:00 2019
-// Update Count     : 2
+// Created On       : Thr Jun 26 12:12:00 2019
+// Update Count     : 3
 //
 
@@ -23 +23 @@
 #include "Eval.hpp"                // for call
 #include "GenericSubstitution.hpp"
+#include "LinkageSpec.hpp"
 #include "Stmt.hpp"
 #include "Type.hpp"
@@ -29 +30 @@
 #include "Common/SemanticError.h"
 #include "GenPoly/Lvalue.h"        // for referencesPermissable
-#include "InitTweak/InitTweak.h"   // for getPointerBase
+#include "InitTweak/InitTweak.h"   // for getFunction, getPointerBase
 #include "ResolvExpr/typeops.h"    // for extractResultType
 #include "Tuples/Tuples.h"         // for makeTupleType
 
 namespace ast {
+
+namespace {
+        std::set<std::string> const lvalueFunctionNames = {"*?", "?[?]"};
+}
+
+// --- Expr
+bool Expr::get_lvalue() const {
+        return false;
+}
 
 // --- ApplicationExpr
@@ -46 +56 @@
         result = ResolvExpr::extractResultType( fn );
         assert( result );
+}
+
+bool ApplicationExpr::get_lvalue() const {
+        if ( const DeclWithType * func = InitTweak::getFunction( this ) ) {
+                return func->linkage == Linkage::Intrinsic && lvalueFunctionNames.count( func->name );
+        }
+        return false;
 }
 
@@ -71 +88 @@
 }
 
+bool UntypedExpr::get_lvalue() const {
+        std::string fname = InitTweak::getFunctionName( this );
+        return lvalueFunctionNames.count( fname );
+}
+
 UntypedExpr * UntypedExpr::createAssign( const CodeLocation & loc, Expr * lhs, Expr * rhs ) {
         assert( lhs && rhs );
@@ -106 +128 @@
 AddressExpr::AddressExpr( const CodeLocation & loc, const Expr * a ) : Expr( loc ), arg( a ) {
         if ( arg->result ) {
-                if ( arg->result->is_lvalue() ) {
+                if ( arg->get_lvalue() ) {
                         // lvalue, retains all levels of reference, and gains a pointer inside the references
                         Type * res = addrType( arg->result );
@@ -137 +159 @@
 : Expr( loc, new VoidType{} ), arg( a ), isGenerated( g ) {}
 
+bool CastExpr::get_lvalue() const {
+        // This is actually wrong by C, but it works with our current set-up.
+        return arg->get_lvalue();
+}
+
 // --- KeywordCastExpr
 
@@ -150 +177 @@
 }
 
+// --- UntypedMemberExpr
+
+bool UntypedMemberExpr::get_lvalue() const {
+        return aggregate->get_lvalue();
+}
+
 // --- MemberExpr
 
@@ -210 +243 @@
 }
 
+bool MemberExpr::get_lvalue() const {
+        // This is actually wrong by C, but it works with our current set-up.
+        return true;
+}
+
 // --- VariableExpr
 
@@ -222 +260 @@
         r->qualifiers |= CV::Lvalue;
         result = r;
+}
+
+bool VariableExpr::get_lvalue() const {
+        // It isn't always an lvalue, but it is never an rvalue.
+        return true;
 }
 
@@ -308 +351 @@
 : Expr( loc, new BasicType{ BasicType::SignedInt } ), arg1( a1 ), arg2( a2 ), isAnd( ia ) {}
 
+// --- CommaExpr
+bool CommaExpr::get_lvalue() const {
+        // This is wrong by C, but the current implementation uses it.
+        // (ex: Specialize, Lvalue and Box)
+        return arg2->get_lvalue();
+}
+
 // --- ConstructorExpr
 
@@ -329 +379 @@
 }
 
+bool CompoundLiteralExpr::get_lvalue() const {
+        return true;
+}
+
 // --- TupleExpr
 
@@ -344 +398 @@
         result = type->types[ index ];
         add_qualifiers( result, CV::Lvalue );
+}
+
+bool TupleIndexExpr::get_lvalue() const {
+        return tuple->get_lvalue();
 }
 

src/AST/Expr.hpp ¶

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri May 10 10:30:00 2019
-// Last Modified By : Aaron B. Moss
-// Created On       : Fri May 10 10:30:00 2019
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Created On       : Thr Sep 26 12:51:00 2019
+// Update Count     : 2
 //
 
@@ -187 +187 @@
 
         Expr * set_extension( bool ex ) { extension = ex; return this; }
+        virtual bool get_lvalue() const;
 
         virtual const Expr * accept( Visitor & v ) const override = 0;
@@ -203 +204 @@
         ApplicationExpr( const CodeLocation & loc, const Expr * f, std::vector<ptr<Expr>> && as = {} );
 
+        bool get_lvalue() const final;
+
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -217 +220 @@
         UntypedExpr( const CodeLocation & loc, const Expr * f, std::vector<ptr<Expr>> && as = {} )
         : Expr( loc ), func( f ), args( std::move(as) ) {}
+
+        bool get_lvalue() const final;
 
         /// Creates a new dereference expression
@@ -293 +298 @@
         CastExpr( const Expr * a ) : CastExpr( a->location, a, GeneratedCast ) {}
 
+        bool get_lvalue() const final;
+
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -340 +347 @@
         : Expr( loc ), member( mem ), aggregate( agg ) { assert( aggregate ); }
 
+        bool get_lvalue() const final;
+
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -353 +362 @@
 
         MemberExpr( const CodeLocation & loc, const DeclWithType * mem, const Expr * agg );
+
+        bool get_lvalue() const final;
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -374 +385 @@
         VariableExpr( const CodeLocation & loc );
         VariableExpr( const CodeLocation & loc, const DeclWithType * v );
+
+        bool get_lvalue() const final;
 
         /// generates a function pointer for a given function
@@ -545 +558 @@
         }
 
+        bool get_lvalue() const final;
+
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -616 +631 @@
         CompoundLiteralExpr( const CodeLocation & loc, const Type * t, const Init * i );
 
+        bool get_lvalue() const final;
+
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -671 +688 @@
 
         TupleIndexExpr( const CodeLocation & loc, const Expr * t, unsigned i );
+
+        bool get_lvalue() const final;
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }