commit 22e729d6f5fa5c5bd5e5c33270dd8866c5188e96
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 28 22:30:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 28 22:30:36 2017 +0000
tree 03493d3799fce8726b74d7edf3c8f01fc4538f87
parent 8202eed1601f8dd26986dd76e5fac190a9983bfc
parent 505e56125eba2ce327892646eed799419240e59d

Merge "Use constant expression isTrivialDescription"

Scope.cpp

diff --git a/Scope.cpp b/Scope.cpp
index 2ee09fa..31ce843 100644
--- a/Scope.cpp
+++ b/Scope.cpp
@@ -134,18 +134,9 @@
     return OK;
 }
 
-status_t Scope::resolveInheritance() {
-    status_t err = forEachType(&Type::resolveInheritance);
-    if (err != OK) return err;
-    return NamedType::resolveInheritance();
-}
-
 status_t Scope::evaluate() {
-    status_t err = forEachType(&Type::evaluate);
-    if (err != OK) return err;
-
     for (auto* annotation : mAnnotations) {
-        err = annotation->evaluate();
+        status_t err = annotation->evaluate();
         if (err != OK) return err;
     }
 
@@ -153,11 +144,8 @@
 }
 
 status_t Scope::validate() const {
-    status_t err = forEachType(&Type::validate);
-    if (err != OK) return err;
-
     for (const auto* annotation : mAnnotations) {
-        err = annotation->validate();
+        status_t err = annotation->validate();
         if (err != OK) return err;
     }
 

Scope.h

diff --git a/Scope.h b/Scope.h
index 8d5ec1c..2c3e177 100644
--- a/Scope.h
+++ b/Scope.h
@@ -56,7 +56,6 @@
 
     std::vector<Type*> getDefinedTypes() const override;
 
-    virtual status_t resolveInheritance() override;
     virtual status_t evaluate() override;
     virtual status_t validate() const override;