From 117b2edcc185efea81141c8f2c7518b06942c3e4 Mon Sep 17 00:00:00 2001
From: Bernhard Scholz <Bernhard.Scholz@sydney.edu.au>
Date: Tue, 15 Sep 2020 10:50:51 +1000
Subject: [PATCH] Renaming IntrinsicFunctorInfo

---
 src/FunctorOps.cpp         |  2 +-
 src/FunctorOps.h           |  4 ++--
 src/ast/IntrinsicFunctor.h | 10 +++++-----
 src/ast/analysis/Type.cpp  |  2 +-
 src/ast/utility/Utils.cpp  |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/FunctorOps.cpp b/src/FunctorOps.cpp
index 2b8fdf957a2..2047f9206bc 100644
--- a/src/FunctorOps.cpp
+++ b/src/FunctorOps.cpp
@@ -154,7 +154,7 @@ using FOp = FunctorOp;
 #define VARIADIC_ORDERED(op) \
     VARIADIC(op, Signed), VARIADIC(U##op, Unsigned), VARIADIC(F##op, Float), VARIADIC(S##op, Symbol)
 
-const std::vector<IntrinsicFunctor> FUNCTOR_INTRINSICS = {
+const std::vector<IntrinsicFunctorInfo> FUNCTOR_INTRINSICS = {
         {FUNCTOR_INTRINSIC_PREFIX_NEGATE_NAME, {TAttr::Signed}, TAttr::Signed, FunctorOp::NEG},
         {FUNCTOR_INTRINSIC_PREFIX_NEGATE_NAME, {TAttr::Float}, TAttr::Float, FunctorOp::FNEG},
 
diff --git a/src/FunctorOps.h b/src/FunctorOps.h
index e176424be73..164a8dac689 100644
--- a/src/FunctorOps.h
+++ b/src/FunctorOps.h
@@ -111,7 +111,7 @@ enum class FunctorOp {
 
 std::ostream& operator<<(std::ostream& os, FunctorOp op);
 
-struct IntrinsicFunctor {
+struct IntrinsicFunctorInfo {
     std::string symbol;
     std::vector<TypeAttribute> params;
     TypeAttribute result;
@@ -120,7 +120,7 @@ struct IntrinsicFunctor {
     bool multipleResults = false;
 };
 
-using IntrinsicFunctors = std::vector<std::reference_wrapper<const IntrinsicFunctor>>;
+using IntrinsicFunctors = std::vector<std::reference_wrapper<const IntrinsicFunctorInfo>>;
 IntrinsicFunctors functorBuiltIn(FunctorOp);
 IntrinsicFunctors functorBuiltIn(std::string_view symbol);
 IntrinsicFunctors functorBuiltIn(std::string_view symbol, const std::vector<TypeAttribute>& params);
diff --git a/src/ast/IntrinsicFunctor.h b/src/ast/IntrinsicFunctor.h
index 45d098a1563..8b3ae0a34fc 100644
--- a/src/ast/IntrinsicFunctor.h
+++ b/src/ast/IntrinsicFunctor.h
@@ -61,12 +61,12 @@ class IntrinsicFunctor : public Functor {
     }
 
     /** Get function information */
-    const souffle::IntrinsicFunctor* getFunctionInfo() const {
+    const IntrinsicFunctorInfo* getFunctionInfo() const {
         return info;
     }
 
     /** Set function information */
-    void setFunctionInfo(const souffle::IntrinsicFunctor& info) {
+    void setFunctionInfo(const IntrinsicFunctorInfo& info) {
         this->info = &info;
     }
 
@@ -87,8 +87,8 @@ class IntrinsicFunctor : public Functor {
     }
 
 protected:
-    IntrinsicFunctor(std::string op, const souffle::IntrinsicFunctor* info, VecOwn<Argument> args,
-            SrcLocation loc = {})
+    IntrinsicFunctor(
+            std::string op, const IntrinsicFunctorInfo* info, VecOwn<Argument> args, SrcLocation loc = {})
             : Functor(std::move(args), std::move(loc)), function(std::move(op)), info(info) {
         assert((!info || info->symbol == function) && "functor info must match symbol");
     }
@@ -111,7 +111,7 @@ class IntrinsicFunctor : public Functor {
     std::string function;
 
     /** Functor information */
-    const souffle::IntrinsicFunctor* info = nullptr;
+    const IntrinsicFunctorInfo* info = nullptr;
 };
 
 }  // namespace souffle::ast
diff --git a/src/ast/analysis/Type.cpp b/src/ast/analysis/Type.cpp
index 63578ce13a0..14af58ce60e 100644
--- a/src/ast/analysis/Type.cpp
+++ b/src/ast/analysis/Type.cpp
@@ -352,7 +352,7 @@ TypeConstraint satisfiesOverload(const TypeEnvironment& typeEnv, IntrinsicFuncto
                 return curr.isAll() || any_of(curr, [&](auto&& t) { return getTypeAttribute(t) == ty; });
             };
 
-            overloads = filterNot(std::move(overloads), [&](const souffle::IntrinsicFunctor& x) -> bool {
+            overloads = filterNot(std::move(overloads), [&](const IntrinsicFunctorInfo& x) -> bool {
                 if (!x.variadic && args.size() != x.params.size()) return true;  // arity mismatch?
 
                 for (size_t i = 0; i < args.size(); ++i)
diff --git a/src/ast/utility/Utils.cpp b/src/ast/utility/Utils.cpp
index 0f96465ec2e..8447d6f19b6 100644
--- a/src/ast/utility/Utils.cpp
+++ b/src/ast/utility/Utils.cpp
@@ -305,7 +305,7 @@ IntrinsicFunctors validOverloads(const analysis::TypeAnalysis& typing, const ast
     auto argTys = map(func.getArguments(), typeAttrs);
 
     auto candidates =
-            filterNot(functorBuiltIn(func.getFunction()), [&](const souffle::IntrinsicFunctor& x) -> bool {
+            filterNot(functorBuiltIn(func.getFunction()), [&](const IntrinsicFunctorInfo& x) -> bool {
                 if (!x.variadic && argTys.size() != x.params.size()) return true;  // arity mismatch?
 
                 for (size_t i = 0; i < argTys.size(); ++i)
@@ -315,7 +315,7 @@ IntrinsicFunctors validOverloads(const analysis::TypeAnalysis& typing, const ast
             });
 
     std::sort(candidates.begin(), candidates.end(),
-            [&](const souffle::IntrinsicFunctor& a, const souffle::IntrinsicFunctor& b) {
+            [&](const IntrinsicFunctorInfo& a, const IntrinsicFunctorInfo& b) {
                 if (a.result != b.result) return a.result < b.result;
                 if (a.variadic != b.variadic) return a.variadic < b.variadic;
                 return std::lexicographical_compare(