Changeset 5cbacf1

Timestamp:

Jul 30, 2018, 4:43:48 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ba4a1d8

Parents:

05e6eb5

git-author:

Rob Schluntz <rschlunt@…> (07/30/18 16:30:06)

git-committer:

Rob Schluntz <rschlunt@…> (07/30/18 16:43:48)

Message:

Refactor eval into Common

Location:

src

Files:

• Common/Eval.cc (added)
• Common/module.mk (modified) (1 diff)
• Common/utility.h (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• Validate/HandleAttributes.cc (modified) (2 diffs)

src/Common/module.mk ¶

@@ -19 +19 @@
        Common/DebugMalloc.cc \
        Common/Assert.cc \
-       Common/Heap.cc
+       Common/Heap.cc \
+       Common/Eval.cc

src/Common/utility.h ¶

@@ -31 +31 @@
 #include "Common/Indenter.h"
 
+class Expression;
+
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -456 +458 @@
 } // ilog2
 
+// -----------------------------------------------------------------------------
+/// 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);
 
 // Local Variables: //

src/Makefile.in ¶

@@ -169 +169 @@
         Common/driver_cfa_cpp-Assert.$(OBJEXT) \
         Common/driver_cfa_cpp-Heap.$(OBJEXT) \
+        Common/driver_cfa_cpp-Eval.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT) \
@@ -494 +495 @@
         Concurrency/Waitfor.cc Common/SemanticError.cc \
         Common/UniqueName.cc Common/DebugMalloc.cc Common/Assert.cc \
-        Common/Heap.cc ControlStruct/LabelGenerator.cc \
+        Common/Heap.cc Common/Eval.cc ControlStruct/LabelGenerator.cc \
         ControlStruct/LabelFixer.cc ControlStruct/MLEMutator.cc \
         ControlStruct/Mutate.cc ControlStruct/ForExprMutator.cc \
@@ -683 +684 @@
         Common/$(DEPDIR)/$(am__dirstamp)
 Common/driver_cfa_cpp-Heap.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/driver_cfa_cpp-Eval.$(OBJEXT): Common/$(am__dirstamp) \
         Common/$(DEPDIR)/$(am__dirstamp)
 ControlStruct/$(am__dirstamp):
@@ -994 +997 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Eval.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Heap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Po@am__quote@
@@ -1359 +1363 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Common/driver_cfa_cpp-Heap.obj `if test -f 'Common/Heap.cc'; then $(CYGPATH_W) 'Common/Heap.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Heap.cc'; fi`
 
+Common/driver_cfa_cpp-Eval.o: Common/Eval.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Common/driver_cfa_cpp-Eval.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Eval.Tpo -c -o Common/driver_cfa_cpp-Eval.o `test -f 'Common/Eval.cc' || echo '$(srcdir)/'`Common/Eval.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Eval.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Eval.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Eval.cc' object='Common/driver_cfa_cpp-Eval.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Common/driver_cfa_cpp-Eval.o `test -f 'Common/Eval.cc' || echo '$(srcdir)/'`Common/Eval.cc
+
+Common/driver_cfa_cpp-Eval.obj: Common/Eval.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Common/driver_cfa_cpp-Eval.obj -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Eval.Tpo -c -o Common/driver_cfa_cpp-Eval.obj `if test -f 'Common/Eval.cc'; then $(CYGPATH_W) 'Common/Eval.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Eval.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Eval.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Eval.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Eval.cc' object='Common/driver_cfa_cpp-Eval.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Common/driver_cfa_cpp-Eval.obj `if test -f 'Common/Eval.cc'; then $(CYGPATH_W) 'Common/Eval.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Eval.cc'; fi`
+
 ControlStruct/driver_cfa_cpp-LabelGenerator.o: ControlStruct/LabelGenerator.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-LabelGenerator.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Tpo -c -o ControlStruct/driver_cfa_cpp-LabelGenerator.o `test -f 'ControlStruct/LabelGenerator.cc' || echo '$(srcdir)/'`ControlStruct/LabelGenerator.cc

src/Validate/HandleAttributes.cc ¶

@@ -16 +16 @@
 #include "HandleAttributes.h"
 
-#include <utility> // for pair
-
 #include "CompilationState.h"
 #include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"
-#include "InitTweak/InitTweak.h"
 #include "ResolvExpr/Resolver.h"
 #include "SynTree/Attribute.h"
@@ -29 +26 @@
 namespace Validate {
         namespace {
-                std::pair<long long int, bool> eval(Expression * expr);
-
-                struct Eval : public WithShortCircuiting {
-                        long long int value = 0;
-                        bool valid = true;
-
-                        void previsit( BaseSyntaxNode * ) { visit_children = false; }
-                        void postvisit( BaseSyntaxNode * ) { valid = false; }
-
-                        void postvisit( ConstantExpr * expr ) {
-                                value = expr->intValue();
-                        }
-
-                        void postvisit( CastExpr * expr ) {
-                                auto arg = eval(expr->arg);
-                                valid = arg.second;
-                                value = arg.first;
-                                // TODO: perform type conversion on value if valid
-                        }
-
-                        void postvisit( VariableExpr * expr ) {
-                                if ( EnumInstType * inst = dynamic_cast<EnumInstType *>(expr->result) ) {
-                                        if ( EnumDecl * decl = inst->baseEnum ) {
-                                                if ( decl->valueOf( expr->var, value ) ) { // value filled by valueOf
-                                                        return;
-                                                }
-                                        }
-                                }
-                                valid = false;
-                        }
-
-                        void postvisit( ApplicationExpr * expr ) {
-                                DeclarationWithType * function = InitTweak::getFunction(expr);
-                                if ( ! function || function->linkage != LinkageSpec::Intrinsic ) { valid = false; return; }
-                                const std::string & fname = function->name;
-                                assertf( expr->args.size() == 1 || expr->args.size() == 2, "Intrinsic function with %zd arguments: %s", expr->args.size(), fname.c_str() );
-                                std::pair<long long int, bool> arg1, arg2;
-                                arg1 = eval(expr->args.front());
-                                valid = valid && arg1.second;
-                                if ( ! valid ) return;
-                                if ( expr->args.size() == 2 ) {
-                                        arg2 = eval(expr->args.back());
-                                        valid = valid && arg2.second;
-                                        if ( ! valid ) return;
-                                }
-                                if (fname == "?+?") {
-                                        value = arg1.first + arg2.first;
-                                } else if (fname == "?-?") {
-                                        value = arg1.first - arg2.first;
-                                } else if (fname == "?*?") {
-                                        value = arg1.first * arg2.first;
-                                } else if (fname == "?/?") {
-                                        value = arg1.first / arg2.first;
-                                } else if (fname == "?%?") {
-                                        value = arg1.first % arg2.first;
-                                } else {
-                                        valid = false;
-                                }
-                                // TODO: implement other intrinsic functions
-                        }
-                };
-
-                std::pair<long long int, bool> eval(Expression * expr) {
-                        PassVisitor<Eval> ev;
-                        if (expr) {
-                                expr->accept(ev);
-                                return std::make_pair(ev.pass.value, ev.pass.valid);
-                        } else {
-                                return std::make_pair(0, false);
-                        }
-                }
-
                 struct HandleAttributes : public WithIndexer {
                         void previsit( ObjectDecl * decl );