From 84b8addb632784490640da1495fd14c8edf5f84d Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 17 Feb 2014 12:45:53 -0800
Subject: [PATCH] Organize spec helper files

---
 spec/helpers/equals_pointer.h         | 38 +++++++++++++++++++++++++++
 spec/{ => helpers}/stream_methods.h   |  0
 spec/spec_helper.h                    | 34 ++----------------------
 tree_sitter.xcodeproj/project.pbxproj |  4 ++-
 4 files changed, 43 insertions(+), 33 deletions(-)
 create mode 100644 spec/helpers/equals_pointer.h
 rename spec/{ => helpers}/stream_methods.h (100%)

diff --git a/spec/helpers/equals_pointer.h b/spec/helpers/equals_pointer.h
new file mode 100644
index 00000000..c5a4b8cd
--- /dev/null
+++ b/spec/helpers/equals_pointer.h
@@ -0,0 +1,38 @@
+#ifndef tree_sitter_equals_pointer_h
+#define tree_sitter_equals_pointer_h
+
+#include <string>
+
+namespace snowhouse {
+    using namespace std;
+    
+    template<typename ExpectedType>
+    struct EqualsPointerConstraint : Expression<EqualsPointerConstraint<ExpectedType>>
+    {
+        EqualsPointerConstraint(const ExpectedType& expected) : expected(expected) {}
+        
+        template<typename ActualType>
+        bool operator()(const ActualType& actual) const {
+            return *expected == *actual;
+        }
+        
+        ExpectedType expected;
+    };
+    
+    template<typename ExpectedType>
+    struct Stringizer<EqualsPointerConstraint<ExpectedType>>
+    {
+        static string ToString(const EqualsPointerConstraint<ExpectedType>& constraint) {
+            ostringstream builder;
+            builder << "pointer to " << snowhouse::Stringize(constraint.expected);
+            return builder.str();
+        }
+    };
+    
+    template<typename ExpectedType>
+    inline EqualsPointerConstraint<ExpectedType> EqualsPointer(const ExpectedType& expected) {
+        return EqualsPointerConstraint<ExpectedType>(expected);
+    }
+}
+
+#endif
diff --git a/spec/stream_methods.h b/spec/helpers/stream_methods.h
similarity index 100%
rename from spec/stream_methods.h
rename to spec/helpers/stream_methods.h
diff --git a/spec/spec_helper.h b/spec/spec_helper.h
index 3ae4fa3f..6f1b3a43 100644
--- a/spec/spec_helper.h
+++ b/spec/spec_helper.h
@@ -2,8 +2,8 @@
 #define __tree_sitter_spec_helper_h__
 
 #include "bandit/bandit.h"
-#include "stream_methods.h"
-#include <iostream>
+#include "helpers/stream_methods.h"
+#include "helpers/equals_pointer.h"
 #include "compiler.h"
 
 using namespace tree_sitter;
@@ -13,36 +13,6 @@ using namespace bandit;
 #define START_TEST go_bandit([]() {
 #define END_TEST });
 
-namespace snowhouse {
-    template<typename ExpectedType>
-    struct EqualsPointerConstraint : Expression<EqualsPointerConstraint<ExpectedType>>
-    {
-        EqualsPointerConstraint(const ExpectedType& expected) : expected(expected) {}
-        
-        template<typename ActualType>
-        bool operator()(const ActualType& actual) const {
-            return *expected == *actual;
-        }
-        
-        ExpectedType expected;
-    };
-    
-    template<typename ExpectedType>
-    struct Stringizer<EqualsPointerConstraint<ExpectedType>>
-    {
-        static string ToString(const EqualsPointerConstraint<ExpectedType>& constraint) {
-            ostringstream builder;
-            builder << "pointer to " << snowhouse::Stringize(constraint.expected);
-            return builder.str();
-        }
-    };
-
-    template<typename ExpectedType>
-    inline EqualsPointerConstraint<ExpectedType> EqualsPointer(const ExpectedType& expected) {
-        return EqualsPointerConstraint<ExpectedType>(expected);
-    }
-}
-
 string src_dir();
 
 #endif
diff --git a/tree_sitter.xcodeproj/project.pbxproj b/tree_sitter.xcodeproj/project.pbxproj
index 4d7dcd37..99818dc8 100644
--- a/tree_sitter.xcodeproj/project.pbxproj
+++ b/tree_sitter.xcodeproj/project.pbxproj
@@ -101,6 +101,7 @@
 		1225CC6318765693000D4723 /* prepare_grammar_spec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = prepare_grammar_spec.cpp; sourceTree = "<group>"; };
 		1236A7C318B287DC00593ABB /* character_range.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = character_range.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		1236A7C918B2A79F00593ABB /* rule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rule.h; sourceTree = "<group>"; };
+		1236A7CA18B2ABB900593ABB /* equals_pointer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = equals_pointer.h; sourceTree = "<group>"; };
 		1251209A1830145300C9B56A /* rule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rule.cpp; sourceTree = "<group>"; };
 		125120A218307FFD00C9B56A /* test_grammars.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = test_grammars.h; path = spec/fixtures/grammars/test_grammars.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		125120A3183083BD00C9B56A /* arithmetic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = arithmetic.cpp; path = spec/fixtures/grammars/arithmetic.cpp; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
@@ -268,8 +269,9 @@
 			isa = PBXGroup;
 			children = (
 				12AB4663188DCB9800DE79DF /* stream_methods.h */,
+				1236A7CA18B2ABB900593ABB /* equals_pointer.h */,
 			);
-			name = helpers;
+			path = helpers;
 			sourceTree = "<group>";
 		};
 		12D1369F18357066005F3369 /* rules */ = {