Merge pull request #91 from AjayBrahmakshatriya/master

Add support for nd_vars and Merge pattern matchers

include/blocks/block_replacer.h

@@ -8,13 +8,20 @@ class block_replacer : public block_visitor {
 public:
 	using block_visitor::visit;
 	std::shared_ptr<block> node;
+
+	// optional generic exact replacing mechanism
+	std::shared_ptr<block> to_replace;
+	std::shared_ptr<block> replace_with;
+
 	template <typename T = expr>
 	typename T::Ptr rewrite(typename T::Ptr ptr) {
 		auto tmp = node;
 		node = nullptr;
 		ptr->accept(this);
 		auto ret = to<T>(node);
 		node = tmp;
+		if (to_replace != nullptr && ret == to_replace)
+			return to<T>(replace_with);
 		return ret;
 	}
 	void unary_helper(std::shared_ptr<unary_expr> a);

include/blocks/expr.h

@@ -729,10 +729,8 @@ class member_access_expr : public expr {
 	}
 };
 
-class addr_of_expr : public expr {
-public:
-	expr::Ptr expr1;
-
+class addr_of_expr: public unary_expr {
+public:	
 	typedef std::shared_ptr<addr_of_expr> Ptr;
 	virtual void dump(std::ostream &oss, int) override;
 	virtual void accept(block_visitor *a) override {

include/blocks/matchers/matchers.h

@@ -0,0 +1,22 @@
+#ifndef BLOCKS_MATCHERS_H
+#define BLOCKS_MATCHERS_H
+#include "blocks/matchers/patterns.h"
+#include "blocks/block.h"
+#include <map>
+
+namespace block {
+namespace matcher {
+
+struct match {
+	block::Ptr node;
+	std::map<std::string, block::Ptr> captures;
+};
+
+std::vector<match> find_all_matches(std::shared_ptr<pattern> p, block::Ptr node);
+bool check_match(std::shared_ptr<pattern> p, block::Ptr node, std::map<std::string, block::Ptr>& captures);
+
+}
+}
+
+
+#endif