Merge remote-tracking branch 'origin/data-class' into version3

Makefile_pakcs

@@ -83,9 +83,9 @@ pl: .curry/pakcs/$(ALLLIBS).pl $(LIB_PL)
 .curry/%.acy: %.curry
 	"$(CYMAKE)" --acy $(CYMAKEPARAMS) $(subst /,.,$*) -D__PAKCS__=$(shell printf '%d%02d' $(MAJORVERSION) $(MINORVERSION))
 
-# generate all Prolog translations:
+# generate all Prolog translation (without binding optimization):
 .curry/pakcs/%.pl: .curry/%.fcy
-	rm -f $@ && "$(PAKCS)" --nocypm --quiet :compile $(subst /,.,$*) :quit
+	rm -f $@ && "$(PAKCS)" -Dbindingoptimization=no --nocypm --quiet :compile $(subst /,.,$*) :quit
 
 ##############################################################################
 # create HTML documentation files for system libraries

Prelude.curry

@@ -18,7 +18,7 @@ module Prelude
   , Bool (..), Ordering (..), Maybe (..), Either (..)
 
   -- * Type Classes
-  , Eq (..) , Ord (..)
+  , Data(..), Eq (..) , Ord (..)
   , Show (..), ShowS, shows, showChar, showString, showParen
   , Read (..), ReadS, reads, readParen, read, lex
   , Bounded (..), Enum (..)
@@ -100,6 +100,53 @@ data Ordering = LT | EQ | GT
 
 infix 4 ==, /=
 
+class Data a where
+  (===)  :: a -> a -> Bool
+  aValue :: a
+
+instance Data Char where
+  (===) = (==)
+  aValue = a where a free
+
+instance Data Int where
+  (===) = (==)
+  aValue = a where a free
+
+instance Data Float where
+  (===) = (==)
+  aValue = a where a free
+
+instance Data a => Data [a] where
+  []     === []     = True
+  []     === (_:_)  = False
+  (_:_)  === []     = False
+  (x:xs) === (y:ys) = x === y && xs === ys
+
+  aValue = [] ? (aValue:aValue)
+
+instance Data () where
+  () === () = True
+  aValue = ()
+
+instance (Data a, Data b) => Data (a, b) where
+  (a1, b1) === (a2, b2) = a1 === a2 && b1 === b2
+  aValue = (aValue, aValue)
+
+instance (Data a, Data b, Data c) => Data (a, b, c) where
+  (a1, b1, c1) === (a2, b2, c2) = a1 === a2 && b1 === b2 && c1 === c2
+  aValue = (aValue, aValue, aValue)
+
+instance (Data a, Data b, Data c, Data d) => Data (a, b, c, d) where
+  (a1, b1, c1, d1) === (a2, b2, c2, d2) =
+    a1 === a2 && b1 === b2 && c1 === c2 && d1 === d2
+  aValue = (aValue, aValue, aValue, aValue)
+
+instance (Data a, Data b, Data c, Data d, Data e) => Data (a, b, c, d, e) where
+  (a1, b1, c1, d1, e1) === (a2, b2, c2, d2, e2) =
+    a1 === a2 && b1 === b2 && c1 === c2 && d1 === d2 && e1 === e2
+  aValue = (aValue, aValue, aValue, aValue, aValue)
+
+
 class Eq a where
   (==), (/=) :: a -> a -> Bool
 
@@ -1933,7 +1980,6 @@ doSolve b | b = return ()
 --- `(e1 =:= e2)` is satisfiable if both sides `e1` and `e2` can be
 --- reduced to a unifiable data term (i.e., a term without defined
 --- function symbols).
---TODO: note
 (=:=) :: a -> a -> Bool
 (=:=) external
 
@@ -1979,7 +2025,7 @@ anyOf :: [a] -> a
 anyOf = foldr1 (?)
 
 --- Evaluates to a fresh free variable.
-unknown :: _
+unknown :: Data a => a
 unknown = let x free in x
 
 --- A non-reducible polymorphic function.

Test/Prop.curry

@@ -106,7 +106,7 @@ _ ==> _ = propUndefinedError "==>"
 --- `solutionOf p` returns (non-deterministically) a solution
 --- of predicate `p`. This operation is useful to test solutions
 --- of predicates.
-solutionOf :: (a -> Bool) -> a
+--solutionOf :: Data a => (a -> Bool) -> a
 solutionOf pred = pred x &> x where x free
 
 --- The property `is x p` is satisfied if `x` has a deterministic value

test.sh

@@ -3,7 +3,7 @@
 
 CURRYBIN="../bin"
 
-ALLTESTS="Combinatorial Nat ShowS Sort"
+ALLTESTS="ShowS Sort"
 
 VERBOSE=no
 if [ "$1" = "-v" ] ; then