diff options
-rw-r--r-- | ghc/compiler/parser/Lex.lhs | 9 | ||||
-rw-r--r-- | ghc/compiler/utils/StringBuffer.lhs | 14 |
2 files changed, 12 insertions, 11 deletions
diff --git a/ghc/compiler/parser/Lex.lhs b/ghc/compiler/parser/Lex.lhs index ba2ed1fd63..c86721c9f6 100644 --- a/ghc/compiler/parser/Lex.lhs +++ b/ghc/compiler/parser/Lex.lhs @@ -369,7 +369,8 @@ lexer cont buf s@(PState{ }) -- first, start a new lexeme and lose all the whitespace - = tab line bol atbol (stepOverLexeme buf) + = _scc_ "Lexer" + tab line bol atbol (stepOverLexeme buf) where line = srcLocLine loc @@ -509,7 +510,6 @@ lexBOL cont buf s@(PState{ lexToken :: (Token -> P a) -> Int# -> P a lexToken cont glaexts buf = --trace "lexToken" $ - _scc_ "Lexer" case currentChar# buf of -- special symbols ---------------------------------------------------- @@ -864,9 +864,10 @@ after_lexnum cont glaexts i buf lex_cstring cont buf = case expandUntilMatch (stepOverLexeme buf) "\'\'" of - buf' -> cont (ITlitlit (lexemeToFastString + Just buf' -> cont (ITlitlit (lexemeToFastString (setCurrentPos# buf' (negateInt# 2#)))) - (mergeLexemes buf buf') + (mergeLexemes buf buf') + Nothing -> lexError "unterminated ``" buf ------------------------------------------------------------------------------ -- Character Classes diff --git a/ghc/compiler/utils/StringBuffer.lhs b/ghc/compiler/utils/StringBuffer.lhs index 115d36c509..b6b728fa45 100644 --- a/ghc/compiler/utils/StringBuffer.lhs +++ b/ghc/compiler/utils/StringBuffer.lhs @@ -415,16 +415,16 @@ scanNumLit acc (StringBuffer fo l# s# c#) = | otherwise -> (acc,StringBuffer fo l# s# c#) -expandUntilMatch :: StringBuffer -> String -> StringBuffer +expandUntilMatch :: StringBuffer -> String -> Maybe StringBuffer expandUntilMatch (StringBuffer fo l# s# c#) str = loop c# str where - loop c# [] = StringBuffer fo l# s# c# - loop c# ((C# x#):xs) - | indexCharOffAddr# fo c# `eqChar#` x# - = loop (c# +# 1#) xs - | otherwise - = loop (c# +# 1#) str + loop c# [] = Just (StringBuffer fo l# s# c#) + loop c# ((C# x#):xs) = + case indexCharOffAddr# fo c# of + ch# | ch# `eqChar#` '\NUL'# && c# >=# l# -> Nothing + | ch# `eqChar#` x# -> loop (c# +# 1#) xs + | otherwise -> loop (c# +# 1#) str \end{code} |