Changeset 10059 for src/Pugs/Lexer.hs

Timestamp:

04/23/06 14:04:21 (3 years ago)

Author:

audreyt

Message:

* Third-party cleanup #1:

• Remove most of Parsec from our source tree;

the remaining Expr.hs and Token.hs will be reimplemented
to support true dynamic Perl 6 operator precedence parsing
with "is looser", "is parsed" and friends.

• Remove Dimitry Golubovsky's UnicodeC.c from our tree. (This touches pretty most of the .hs file.)

* Update dependency to GHC 6.4.1, because UnicodeC.c and the

Unicode-aware Parsec was not there in 6.4.0.

Files:

• src/Pugs/Lexer.hs (modified) (4 diffs)

src/Pugs/Lexer.hs

@@ -1 +1 @@
 {-# OPTIONS_GHC -fglasgow-exts -fvia-C -optc-w #-}
-{-# OPTIONS_GHC -#include "../UnicodeC.h" #-}
 
 {-|
@@ -30 +29 @@
 import Pugs.AST
 import Pugs.Rule
-import Pugs.Rule.Language
 import Pugs.Types
 import Pugs.Parser.Types
@@ -79 +77 @@
 angles     = P.angles     perl6Lexer
 balanced   :: CharParser st String
-balanced   = P.balanced   perl6Lexer
+balanced   = P.balanced
 balancedDelim :: Char -> Char
-balancedDelim = P.balancedDelim perl6Lexer
+balancedDelim = P.balancedDelim
 decimal    :: CharParser st Integer
 decimal    = P.decimal    perl6Lexer
@@ -107 +105 @@
 ruleVerbatimIdentifier :: GenParser Char st String
 ruleVerbatimIdentifier = (<?> "identifier") $ do
-    c  <- identStart perl6Def
-    cs <- many (identLetter perl6Def)
+    c  <- P.identStart perl6Def
+    cs <- many (P.identLetter perl6Def)
     return (c:cs)