From 52bcee1fa452a898b3d23a2d2d89ad35605f978f Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Tue, 8 May 2001 11:55:24 +0000
Subject: [PATCH] [project @ 2001-05-08 11:55:24 by simonmar] Fix setSrcLocP

---
 ghc/compiler/parser/Lex.lhs |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ghc/compiler/parser/Lex.lhs b/ghc/compiler/parser/Lex.lhs
index 8172459..1d02739 100644
--- a/ghc/compiler/parser/Lex.lhs
+++ b/ghc/compiler/parser/Lex.lhs
@@ -16,7 +16,7 @@ An example that provokes the error is
 --------------------------------------------------------
 
 \begin{code}
-
+{-# OPTIONS -#include "hs_ctype.h" #-}
 module Lex (
 
 	ifaceParseErr, srcParseErr,
@@ -397,8 +397,7 @@ lexer cont buf s@(PState{
 		})
 
 	-- first, start a new lexeme and lose all the whitespace
-  =  _scc_ "Lexer" 
-  tab line bol atbol (stepOverLexeme buf)
+  =  tab line bol atbol (stepOverLexeme buf)
   where
 	line = srcLocLine loc
 
@@ -702,7 +701,7 @@ lex_char :: (Int# -> Int -> P a) -> Int# -> P a
 lex_char cont glaexts buf
   = case currentChar# buf of
 	'\\'# -> lex_escape (cont glaexts) (incLexeme buf)
-	c | is_any c -> cont glaexts (I# (ord# c)) (incLexeme buf)
+	c | is_string c -> cont glaexts (I# (ord# c)) (incLexeme buf)
 	other -> charError buf
 
 char_end cont glaexts c buf
@@ -742,10 +741,7 @@ lex_escape cont buf
 			    (c,buf2):_ -> cont (ord c) buf2
 			    [] -> charError buf'
 
-after_charnum cont i buf
-  = if i >= 0 && i <= 0x10FFFF
-	then cont (fromInteger i) buf
-	else charError buf
+after_charnum cont i buf = cont (fromInteger i) buf
 
 readNum cont buf is_digit base conv = read buf 0
   where read buf i 
@@ -920,7 +916,7 @@ lex_id cont glaexts buf =
 
  let lexeme  = lexemeToFastString buf' in
 
- case _scc_ "Lex.haskellKeyword" lookupUFM haskellKeywordsFM lexeme of {
+ case _scc_ "haskellKeyword" lookupUFM haskellKeywordsFM lexeme of {
  	Just kwd_token -> --trace ("hkeywd: "++_UNPK_(lexeme)) $
 			  cont kwd_token buf';
  	Nothing        -> 
@@ -1021,7 +1017,7 @@ lex_id3 cont glaexts mod buf just_a_conid
       new_buf     = mergeLexemes buf buf'
       is_a_qvarid = cont (mk_qvar_token mod lexeme) new_buf
      in
-     case _scc_ "Lex.haskellKeyword" lookupUFM haskellKeywordsFM lexeme of {
+     case _scc_ "haskellKeyword" lookupUFM haskellKeywordsFM lexeme of {
     	    Nothing          -> is_a_qvarid ;
 
     	    Just kwd_token | isSpecial kwd_token   -- special ids (as, qualified, hiding) shouldn't be
@@ -1180,8 +1176,12 @@ lexError str buf s@PState{ loc = loc }
 getSrcLocP :: P SrcLoc
 getSrcLocP buf s@(PState{ loc = loc }) = POk s loc
 
+-- use a temporary SrcLoc for the duration of the argument
 setSrcLocP :: SrcLoc -> P a -> P a
-setSrcLocP new_loc p buf s = p buf s{ loc=new_loc }
+setSrcLocP new_loc p buf s = 
+  case p buf s{ loc=new_loc } of
+	POk _ a   -> POk s a
+	PFailed e -> PFailed e
 
 getSrcFile :: P FAST_STRING
 getSrcFile buf s@(PState{ loc = loc }) = POk s (srcLocFile loc)
-- 
1.7.10.4