Changeset 12072 for src/Pugs/Val

Timestamp:

08/10/06 14:50:18 (2 years ago)

Author:

gaal

Message:

* New vv prim to convert oldvals to VV form
* A little documentation in Pugs.Val
* PureBit?
* PureInt? to Infinity and beyond

Location:

src/Pugs/Val

Files:

• Bit.hs (added)
• Int.hs (modified) (1 diff)
• Str.hs (modified) (2 diffs)

src/Pugs/Val/Int.hs

@@ -4 +4 @@
 import qualified Data.ByteString.Char8 as Char8
 
-instance ((:>:) PureInt) Integer where cast = MkInt
-instance ((:<:) PureInt) Integer where castBack (MkInt i) = i
+instance ((:>:) PureInt) Integer where cast = IFinite
+instance ((:<:) PureInt) Integer where
+    castBack (IFinite i) = i
+    castBack INotANumber = error "NaN"
+    castBack (IInfinite SPositive) = error "+Infinity"
+    castBack (IInfinite SNegative) = error "-Infinity"
 
-instance ((:>:) PureInt) Int where cast = MkInt . toInteger
+-- ugh, duplicate from above? lose, lose.
+instance ((:>:) PureInt) Int where cast = IFinite . toInteger 
+instance ((:<:) PureInt) Int where
+    castBack (IFinite i) = fromInteger i
+    castBack INotANumber = error "NaN"
+    castBack (IInfinite SPositive) = error "+Infinity"
+    castBack (IInfinite SNegative) = error "-Infinity"
 
-newtype PureInt = MkInt Integer
-    deriving (Typeable, Show, Eq, Ord, Data, (:>:) Integer, (:<:) Integer)
+data Sign
+    = SPositive
+    | SNegative
+    deriving (Show, Eq, Ord, Data, Typeable)
+
+data PureInt
+    = IFinite      !Integer
+    | IInfinite    !Sign
+    | INotANumber
+    deriving (Typeable, Show, Eq, Ord, Data)
+
+instance (:>:) Integer PureInt where
+instance (:<:) Integer PureInt where
+
 
 {- regretfully, I couldn't find a way to put this here w/o circularity.

src/Pugs/Val/Str.hs

@@ -3 +3 @@
 import Pugs.Internals
 import qualified Data.ByteString.Char8 as Char8
+
+--import {-# SOURCE #-} Pugs.Val
 
 instance ((:>:) String) ByteString where cast = Char8.unpack
@@ -10 +12 @@
     deriving (Typeable, Show, Eq, Ord, Data, (:>:) String, (:<:) String, (:>:) ByteString, (:<:) ByteString)
 
-{- regretfully, I couldn't find a way to put this here w/o circularity.
+{- regretfully, I couldn't find a way to put this here w/o circularity. - }
 instance ICoercible P PureStr where
     asStr  = cast
--}
+{ - -}
 
 parseInt :: PureStr -> Int