From 5fa3083152d187c7174776f8caff42ab77b23cdf Mon Sep 17 00:00:00 2001
From: qrczak <unknown>
Date: Fri, 27 Apr 2001 19:35:50 +0000
Subject: [PATCH] [project @ 2001-04-27 19:35:50 by qrczak] Add builtin rules
 for {intToInt,wordToWord}{8,16,32}# applied to literals.

---
 ghc/compiler/basicTypes/Literal.lhs |   24 ++++++++++++++++++++----
 ghc/compiler/prelude/PrelRules.lhs  |   11 ++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/ghc/compiler/basicTypes/Literal.lhs b/ghc/compiler/basicTypes/Literal.lhs
index 3d1f220..206df95 100644
--- a/ghc/compiler/basicTypes/Literal.lhs
+++ b/ghc/compiler/basicTypes/Literal.lhs
@@ -14,7 +14,10 @@ module Literal
 
 	, inIntRange, inWordRange, tARGET_MAX_INT, inCharRange
 
-	, word2IntLit, int2WordLit, char2IntLit, int2CharLit
+	, word2IntLit, int2WordLit
+	, intToInt8Lit, intToInt16Lit, intToInt32Lit
+	, wordToWord8Lit, wordToWord16Lit, wordToWord32Lit
+	, char2IntLit, int2CharLit
 	, float2IntLit, int2FloatLit, double2IntLit, int2DoubleLit
 	, addr2IntLit, int2AddrLit, float2DoubleLit, double2FloatLit
 	) where
@@ -35,6 +38,8 @@ import Util		( thenCmp )
 
 import Ratio 		( numerator )
 import FastString	( uniqueOfFS, lengthFS )
+import Int		( Int8,  Int16,  Int32 )
+import Word		( Word8, Word16, Word32 )
 import Char		( ord, chr )
 \end{code}
 
@@ -156,9 +161,13 @@ inCharRange c =  c >= 0 && c <= tARGET_MAX_CHAR
 	Coercions
 	~~~~~~~~~
 \begin{code}
-word2IntLit, int2WordLit, char2IntLit, int2CharLit,
- float2IntLit, int2FloatLit, double2IntLit, int2DoubleLit,
- addr2IntLit, int2AddrLit, float2DoubleLit, double2FloatLit :: Literal -> Literal
+word2IntLit, int2WordLit,
+  intToInt8Lit, intToInt16Lit, intToInt32Lit,
+  wordToWord8Lit, wordToWord16Lit, wordToWord32Lit,
+  char2IntLit, int2CharLit,
+  float2IntLit, int2FloatLit, double2IntLit, int2DoubleLit,
+  addr2IntLit, int2AddrLit, float2DoubleLit, double2FloatLit
+  :: Literal -> Literal
 
 word2IntLit (MachWord w) 
   | w > tARGET_MAX_INT = MachInt (w - tARGET_MAX_WORD - 1)
@@ -168,6 +177,13 @@ int2WordLit (MachInt i)
   | i < 0     = MachWord (1 + tARGET_MAX_WORD + i)	-- (-1)  --->  tARGET_MAX_WORD
   | otherwise = MachWord i
 
+intToInt8Lit    (MachInt  i) = MachInt  (toInteger (fromInteger i :: Int8))
+intToInt16Lit   (MachInt  i) = MachInt  (toInteger (fromInteger i :: Int16))
+intToInt32Lit   (MachInt  i) = MachInt  (toInteger (fromInteger i :: Int32))
+wordToWord8Lit  (MachWord w) = MachWord (toInteger (fromInteger w :: Word8))
+wordToWord16Lit (MachWord w) = MachWord (toInteger (fromInteger w :: Word16))
+wordToWord32Lit (MachWord w) = MachWord (toInteger (fromInteger w :: Word32))
+
 char2IntLit (MachChar c) = MachInt  (toInteger c)
 int2CharLit (MachInt  i) = MachChar (fromInteger i)
 
diff --git a/ghc/compiler/prelude/PrelRules.lhs b/ghc/compiler/prelude/PrelRules.lhs
index f9af8b0..4e0bb74 100644
--- a/ghc/compiler/prelude/PrelRules.lhs
+++ b/ghc/compiler/prelude/PrelRules.lhs
@@ -20,7 +20,10 @@ import CoreSyn
 import Id		( mkWildId )
 import Literal		( Literal(..), isLitLitLit, mkMachInt, mkMachWord
 			, literalType
-			, word2IntLit, int2WordLit, char2IntLit, int2CharLit
+			, word2IntLit, int2WordLit
+			, intToInt8Lit, intToInt16Lit, intToInt32Lit
+			, wordToWord8Lit, wordToWord16Lit, wordToWord32Lit
+			, char2IntLit, int2CharLit
 			, float2IntLit, int2FloatLit, double2IntLit, int2DoubleLit
 			, addr2IntLit, int2AddrLit, float2DoubleLit, double2FloatLit
 			)
@@ -84,6 +87,12 @@ primOpRule op
 	-- coercions
     primop_rule Word2IntOp 	= oneLit (litCoerce word2IntLit     op_name)
     primop_rule Int2WordOp 	= oneLit (litCoerce int2WordLit     op_name)
+    primop_rule IntToInt8Op 	= oneLit (litCoerce intToInt8Lit    op_name)
+    primop_rule IntToInt16Op 	= oneLit (litCoerce intToInt16Lit   op_name)
+    primop_rule IntToInt32Op 	= oneLit (litCoerce intToInt32Lit   op_name)
+    primop_rule WordToWord8Op 	= oneLit (litCoerce wordToWord8Lit  op_name)
+    primop_rule WordToWord16Op 	= oneLit (litCoerce wordToWord16Lit op_name)
+    primop_rule WordToWord32Op 	= oneLit (litCoerce wordToWord32Lit op_name)
     primop_rule OrdOp   	= oneLit (litCoerce char2IntLit     op_name)
     primop_rule ChrOp    	= oneLit (litCoerce int2CharLit	    op_name)
     primop_rule Float2IntOp	= oneLit (litCoerce float2IntLit    op_name)
-- 
1.7.10.4