X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fcmm%2FCmmLex.x;h=50e9aea9e8832aca034dd6ede992054f78e271e4;hp=0adb610bb3b160959d0d3aa3a23bac81fe91aa7e;hb=5289f5d85610f71625a439747a09384876655eb5;hpb=7fc749a43b4b6b85d234fa95d4928648259584f4

diff --git a/compiler/cmm/CmmLex.x b/compiler/cmm/CmmLex.x
index 0adb610..50e9aea 100644
--- a/compiler/cmm/CmmLex.x
+++ b/compiler/cmm/CmmLex.x
@@ -11,8 +11,9 @@
 -----------------------------------------------------------------------------
 
 {
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
+{-# LANGUAGE BangPatterns #-}
+{-# OPTIONS -Wwarn -w #-}
+-- The above -Wwarn supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
 --     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
@@ -22,8 +23,6 @@ module CmmLex (
    CmmToken(..), cmmlex,
   ) where
 
-#include "HsVersions.h"
-
 import Cmm
 import Lexer
 
@@ -76,7 +75,7 @@ $white_no_nl+		;
 -- single-line line pragmas, of the form
 --    # <line> "<file>" <extra-stuff> \n
 <line_prag> $digit+			{ setLine line_prag1 }
-<line_prag1> \" ($printable # \")* \"	{ setFile line_prag2 }
+<line_prag1> \" [^\"]* \"	{ setFile line_prag2 }
 <line_prag2> .*				{ pop }
 
 <0> {
@@ -95,7 +94,8 @@ $white_no_nl+		;
   "&&"			{ kw CmmT_BoolAnd }
   "||"			{ kw CmmT_BoolOr }
   
-  R@decimal		{ global_regN VanillaReg }
+  P@decimal		{ global_regN (\n -> VanillaReg n VGcPtr) }
+  R@decimal		{ global_regN (\n -> VanillaReg n VNonGcPtr) }
   F@decimal		{ global_regN FloatReg }
   D@decimal		{ global_regN DoubleReg }
   L@decimal		{ global_regN LongReg }
@@ -159,6 +159,7 @@ data CmmToken
   | CmmT_bits64
   | CmmT_float32
   | CmmT_float64
+  | CmmT_gcptr
   | CmmT_GlobalReg GlobalReg
   | CmmT_Name	   FastString
   | CmmT_String	   String
@@ -236,7 +237,15 @@ reservedWordsFM = listToUFM $
 	( "bits32",		CmmT_bits32 ),
 	( "bits64",		CmmT_bits64 ),
 	( "float32",		CmmT_float32 ),
-	( "float64",		CmmT_float64 )
+	( "float64",		CmmT_float64 ),
+-- New forms
+	( "b8",			CmmT_bits8 ),
+	( "b16",		CmmT_bits16 ),
+	( "b32",		CmmT_bits32 ),
+	( "b64",		CmmT_bits64 ),
+	( "f32",		CmmT_float32 ),
+	( "f64",		CmmT_float64 ),
+	( "gcptr",		CmmT_gcptr )
 	]
 
 tok_decimal span buf len 
@@ -259,7 +268,7 @@ tok_string str = CmmT_String (read str)
 setLine :: Int -> Action
 setLine code span buf len = do
   let line = parseUnsignedInteger buf len 10 octDecDigit
-  setSrcLoc (mkSrcLoc (srcSpanFile span) (fromIntegral line - 1) 0)
+  setSrcLoc (mkSrcLoc (srcSpanFile span) (fromIntegral line - 1) 1)
 	-- subtract one: the line number refers to the *following* line
   -- trace ("setLine "  ++ show line) $ do
   popLexState
@@ -290,7 +299,7 @@ lexToken = do
   sc <- getLexState
   case alexScan inp sc of
     AlexEOF -> do let span = mkSrcSpan loc1 loc1
-		  setLastToken span 0 0
+		  setLastToken span 0
 		  return (L span CmmT_EOF)
     AlexError (loc2,_) -> do failLocMsgP loc1 loc2 "lexical error"
     AlexSkip inp2 _ -> do
@@ -299,7 +308,7 @@ lexToken = do
     AlexToken inp2@(end,buf2) len t -> do
 	setInput inp2
 	let span = mkSrcSpan loc1 end
-	span `seq` setLastToken span len len
+	span `seq` setLastToken span len
 	t span buf len
 
 -- -----------------------------------------------------------------------------