From 3f0494851dca471f4b6bde04373d98bb3df4e805 Mon Sep 17 00:00:00 2001 From: simonm Date: Wed, 11 Feb 1998 14:15:07 +0000 Subject: [PATCH] [project @ 1998-02-11 14:15:07 by simonm] Back-out fix for layout processing in pragmas. It broke things. --- ghc/compiler/parser/hslexer.flex | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/ghc/compiler/parser/hslexer.flex b/ghc/compiler/parser/hslexer.flex index ef02cfd..432625a 100644 --- a/ghc/compiler/parser/hslexer.flex +++ b/ghc/compiler/parser/hslexer.flex @@ -315,34 +315,28 @@ NL [\n\r] "{-#"{WS}*"INTERFACE" { PUSH_STATE(UserPragma); - forgetindent = TRUE; RETURN(INTERFACE_UPRAGMA); } "{-#"{WS}*"SPECIALI"[SZ]E { PUSH_STATE(UserPragma); - forgetindent = TRUE; RETURN(SPECIALISE_UPRAGMA); } "{-#"{WS}*"INLINE" { PUSH_STATE(UserPragma); - forgetindent = TRUE; RETURN(INLINE_UPRAGMA); } "{-#"{WS}*"MAGIC_UNFOLDING" { PUSH_STATE(UserPragma); - forgetindent = TRUE; RETURN(MAGIC_UNFOLDING_UPRAGMA); } "{-#"{WS}*"GENERATE_SPECS" { /* these are handled by hscpp */ nested_comments =1; - forgetindent = TRUE; PUSH_STATE(Comment); } "{-#"{WS}*"OPTIONS" { /* these are for the driver! */ nested_comments =1; - forgetindent = TRUE; PUSH_STATE(Comment); } "{-#"{WS}*"SOURCE"{WS}*"#"?"-}" { @@ -361,15 +355,7 @@ NL [\n\r] nested_comments = 1; PUSH_STATE(Comment); } -"#-}" { POP_STATE; - forgetindent=FALSE; - /* don't want any layout processing here, - * so just use 'return' instead of 'RETURN', - * remembering to set hssttok. - */ - hssttok = -1; - return(END_UPRAGMA); - } +"#-}" { POP_STATE; RETURN(END_UPRAGMA); } %{ /* -- 1.7.10.4