X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2Fhslexer.flex;h=eea945c9683e22955dcd597f11cbb89e4a0024f1;hp=fc1b66b5ca7fd898bfbae43ef306c11f9df8c4d1;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hpb=967cc47f37cb93a5e2b6df7822c9a646f0428247

diff --git a/ghc/compiler/parser/hslexer.flex b/ghc/compiler/parser/hslexer.flex
index fc1b66b..eea945c 100644
--- a/ghc/compiler/parser/hslexer.flex
+++ b/ghc/compiler/parser/hslexer.flex
@@ -394,11 +394,15 @@ NL  	    	    	[\n\r]
 <Code,GlaExt>"hiding"		{ RETURN(HIDING); }
 <Code,GlaExt>"qualified"	{ RETURN(QUALIFIED); }
 
+<Code,GlaExt>"forall"		{ RETURN(FORALL); }
+
 <Code,GlaExt>"_scc_"		{ RETURN(SCC); }
 <GlaExt>"_ccall_"		{ RETURN(CCALL); }
 <GlaExt>"_ccall_GC_"		{ RETURN(CCALL_GC); }
 <GlaExt>"_casm_"		{ RETURN(CASM); }
 <GlaExt>"_casm_GC_"		{ RETURN(CASM_GC); }
+<GlaExt>"(#"			{ RETURN(OUNBOXPAREN); }
+<GlaExt>"#)"			{ RETURN(CUNBOXPAREN); }
 <GlaExt>"foreign"		{ RETURN(FOREIGN); }
 <GlaExt>"export"		{ RETURN(EXPORT); }
 <GlaExt>"label"			{ RETURN(LABEL); }
@@ -406,7 +410,9 @@ NL  	    	    	[\n\r]
 <GlaExt>"_stdcall"		{ RETURN(STDCALL); }
 <GlaExt>"_ccall"		{ RETURN(C_CALL); }
 <GlaExt>"_pascal"	        { RETURN(PASCAL); }
-<GlaExt>"_fastcall"	        { RETURN(FASTCALL); }
+<GlaExt>"stdcall"		{ RETURN(STDCALL); }
+<GlaExt>"ccall"			{ RETURN(C_CALL); }
+<GlaExt>"pascal"	        { RETURN(PASCAL); }
 <GlaExt>"dynamic"	        { RETURN(DYNAMIC); }
 
 %{
@@ -426,6 +432,7 @@ NL  	    	    	[\n\r]
 <Code,GlaExt>"`"		{ RETURN(BQUOTE); }
 <Code,GlaExt>"_"		{ RETURN(WILDCARD); }
 
+<Code,GlaExt>"."		{ RETURN(DOT); }
 <Code,GlaExt>".."		{ RETURN(DOTDOT); }
 <Code,GlaExt,UserPragma>"::"	{ RETURN(DCOLON); }
 <Code,GlaExt,UserPragma>"="	{ RETURN(EQUAL); }