From c961a3079dda8735363872cdb84c489d61846003 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 6 Feb 2018 12:20:00 +0100
Subject: Turn simplification rule tuple into struct.

---
 libjulia/optimiser/SimplificationRules.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'libjulia/optimiser/SimplificationRules.h')

diff --git a/libjulia/optimiser/SimplificationRules.h b/libjulia/optimiser/SimplificationRules.h
index 96f3de21..68b640b1 100644
--- a/libjulia/optimiser/SimplificationRules.h
+++ b/libjulia/optimiser/SimplificationRules.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <libevmasm/ExpressionClasses.h>
+#include <libevmasm/SimplificationRule.h>
 
 #include <libjulia/ASTDataForward.h>
 
@@ -48,16 +49,16 @@ public:
 
 	/// @returns a pointer to the first matching pattern and sets the match
 	/// groups accordingly.
-	static std::tuple<Pattern, std::function<Pattern()>, bool> const* findFirstMatch(Expression const& _expr);
+	static SimplificationRule<Pattern> const* findFirstMatch(Expression const& _expr);
 
 private:
-	void addRules(std::vector<std::tuple<Pattern, std::function<Pattern()>, bool>> const& _rules);
-	void addRule(std::tuple<Pattern, std::function<Pattern()>, bool> const& _rule);
+	void addRules(std::vector<SimplificationRule<Pattern>> const& _rules);
+	void addRule(SimplificationRule<Pattern> const& _rule);
 
 	void resetMatchGroups() { m_matchGroups.clear(); }
 
 	std::map<unsigned, Expression const*> m_matchGroups;
-	std::vector<std::tuple<Pattern, std::function<Pattern()>, bool>> m_rules[256];
+	std::vector<SimplificationRule<Pattern>> m_rules[256];
 };
 
 enum class PatternKind
-- 
cgit v1.2.3