X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fcmm%2FCmmLex.x;h=42243258c52fe5ce84cc6c698ae25c87a61d604c;hp=7724565bdd8b1a25e5613fcf6e34c12a4e1afe16;hb=f4b727487a65e6b611bbaafbd2207bd63a8df706;hpb=831a35dd00faff195cf938659c2dd736192b865f

diff --git a/compiler/cmm/CmmLex.x b/compiler/cmm/CmmLex.x
index 7724565..4224325 100644
--- a/compiler/cmm/CmmLex.x
+++ b/compiler/cmm/CmmLex.x
@@ -11,8 +11,8 @@
 -----------------------------------------------------------------------------
 
 {
-{-# OPTIONS -Wwarn #-}
--- The above warning supression flag is a temporary kludge.
+{-# 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
@@ -269,7 +269,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
@@ -300,7 +300,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
@@ -309,7 +309,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
 
 -- -----------------------------------------------------------------------------