diff options
| author | David Waern <david.waern@gmail.com> | 2011-06-13 17:04:02 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2011-06-13 17:04:02 +0000 |
| commit | a14dbda0655025e2a9a9929147075282c1795dfd (patch) | |
| tree | 71502f8d11a8a3d206d979a23d001530a28b273f /compiler/parser/Lexer.x | |
| parent | f06a106aa9e18670093d755bd47f5cc0f0e0bfb1 (diff) | |
| parent | 3bb66cc52ced70cd7081fb8a2e32a1005528d5a0 (diff) | |
| download | haskell-a14dbda0655025e2a9a9929147075282c1795dfd.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Diffstat (limited to 'compiler/parser/Lexer.x')
| -rw-r--r-- | compiler/parser/Lexer.x | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x index 76a02d6c60..43a400471e 100644 --- a/compiler/parser/Lexer.x +++ b/compiler/parser/Lexer.x @@ -483,6 +483,7 @@ data Token | ITlanguage_prag | ITvect_prag | ITvect_scalar_prag + | ITnovect_prag | ITdotdot -- reserved symbols | ITcolon @@ -2281,7 +2282,8 @@ oneWordPrags = Map.fromList([("rules", rulePrag), ("core", token ITcore_prag), ("unpack", token ITunpack_prag), ("ann", token ITann_prag), - ("vectorize", token ITvect_prag)]) + ("vectorize", token ITvect_prag), + ("novectorize", token ITnovect_prag)]) twoWordPrags = Map.fromList([("inline conlike", token (ITinline_prag Inline ConLike)), ("notinline conlike", token (ITinline_prag NoInline ConLike)), @@ -2307,6 +2309,7 @@ clean_pragma prag = canon_ws (map toLower (unprefix prag)) "noinline" -> "notinline" "specialise" -> "specialize" "vectorise" -> "vectorize" + "novectorise" -> "novectorize" "constructorlike" -> "conlike" _ -> prag' canon_ws s = unwords (map canonical (words s)) |