From d5abb0fa758323299cb0f7ab30a55ee83afdc8f5 Mon Sep 17 00:00:00 2001
From: Rob Rix <robrix@github.com>
Date: Fri, 18 Oct 2019 20:11:38 -0400
Subject: [PATCH] Revert "Abstract term injection & projection."

This reverts commit 694164d3d4fc773686c0f61db9e2ae516da55ff5.
---
 src/Data/Term.hs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Data/Term.hs b/src/Data/Term.hs
index 3335467f0..dcac590eb 100644
--- a/src/Data/Term.hs
+++ b/src/Data/Term.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE FunctionalDependencies, RankNTypes, ScopedTypeVariables, TypeFamilies, TypeOperators #-}
 module Data.Term
 ( Term(..)
+, injectTerm
+, projectTerm
 , guardTerm
 , TermF(..)
 , termSize
@@ -11,9 +13,7 @@ module Data.Term
 , IsTerm(..)
 , termAnnotation
 , termOut
-, projectTerm
 , termIn
-, injectTerm
 ) where
 
 import Prologue
@@ -28,6 +28,9 @@ import           Text.Show
 -- | A Term with an abstract syntax tree and an annotation.
 newtype Term syntax ann = Term { unTerm :: TermF syntax ann (Term syntax ann) }
 
+projectTerm :: (f :< syntax) => Term (Sum syntax) ann -> Maybe (f (Term (Sum syntax) ann))
+projectTerm = Sum.project . termOut
+
 guardTerm :: (f :< syntax, Alternative m)
           => Term (Sum syntax) ann
           -> m (f (Term (Sum syntax) ann))
@@ -65,6 +68,9 @@ termSize :: (Foldable f, Functor f) => Term f annotation -> Int
 termSize = cata size where
   size (In _ syntax) = 1 + sum syntax
 
+injectTerm :: (f :< syntax) => ann -> f (Term (Sum syntax) ann) -> Term (Sum syntax) ann
+injectTerm a = termIn a . Sum.inject
+
 
 hoistTerm :: Functor f => (forall a. f a -> g a) -> Term f a -> Term g a
 hoistTerm f = go where go (Term r) = Term (hoistTermF f (fmap go r))
@@ -172,17 +178,10 @@ termAnnotation = termFAnnotation . toTermF
 termOut :: IsTerm term => term ann -> Syntax term (term ann)
 termOut = termFOut . toTermF
 
-projectTerm :: (f :< syntax, Sum syntax ~ Syntax term, IsTerm term) => term ann -> Maybe (f (term ann))
-projectTerm = Sum.project . termOut
-
-
 -- | Build a term from its annotation and syntax.
 termIn :: IsTerm term => ann -> Syntax term (term ann) -> term ann
 termIn = fmap fromTermF . In
 
-injectTerm :: (f :< syntax, Sum syntax ~ Syntax term, IsTerm term) => ann -> f (term ann) -> term ann
-injectTerm a = termIn a . Sum.inject
-
 
 instance IsTerm (Term syntax) where
   type Syntax (Term syntax) = syntax