Changeset 77d2432 for src/Common

Timestamp:

Jul 24, 2019, 6:47:41 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

a92a4fe

Parents:

83b52f1

git-author:

Peter A. Buhr <pabuhr@…> (07/24/19 18:46:00)

git-committer:

Peter A. Buhr <pabuhr@…> (07/24/19 18:47:41)

Message:

patch sizeof evaluation problem temporarily, and make parameters constant

Location:

src/Common

Files:

• Eval.cc (modified) (6 diffs)
• 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/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 {