Changeset 4a60488 for src/Common

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/Common

Files:

• Eval.cc (modified) (6 diffs)
• PassVisitor.h (modified) (2 diffs)
• PassVisitor.impl.h (modified) (1 diff)
• utility.h (modified) (2 diffs)

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 {