github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-24 15:35:14 +03:00
Code Issues Projects Releases Wiki Activity

Correct a conflict that got committed.

Browse Source
This commit is contained in:
Rob Rix 2016-09-14 16:39:33 -04:00
parent e4505a8be0
commit 1df89950ab
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Term/Arbitrary.hs
View File

@ -26,13 +26,8 @@ arbitraryTermSize = cata (succ . sum) . toTerm
-- Instances -- Instances
<<<<<<< HEAD
type instance Base (ArbitraryTerm leaf annotation) = CofreeF (Syntax leaf) annotation
instance Corecursive (ArbitraryTerm leaf annotation) where embed = ArbitraryTerm
=======
type instance Base (ArbitraryTerm leaf annotation) = TermF (Syntax leaf) annotation type instance Base (ArbitraryTerm leaf annotation) = TermF (Syntax leaf) annotation
instance Unfoldable (ArbitraryTerm leaf annotation) where embed (a :< s) = ArbitraryTerm a s instance Unfoldable (ArbitraryTerm leaf annotation) where embed (a :< s) = ArbitraryTerm a s
>>>>>>> master
instance (Eq leaf, Eq annotation, Arbitrary leaf, Arbitrary annotation) => Arbitrary (ArbitraryTerm leaf annotation) where instance (Eq leaf, Eq annotation, Arbitrary leaf, Arbitrary annotation) => Arbitrary (ArbitraryTerm leaf annotation) where
arbitrary = sized $ \ n -> do arbitrary = sized $ \ n -> do