Changeset 12317 for src/Pugs/Lexer.hs

Timestamp:

08/16/06 19:28:24 (2 years ago)

Author:

audreyt

Message:

* Glorious refactoring of the Var type.

Previously, Var is type synonym to String, and all package

lookups, OUTER

handling, sigil and twigil parsing etc were done in an extremely adhoc way with String operations.

Now we split Var into several parts.
Take "&Moose::Elk::infix:<antler>" as an example:

v_sigil

VarSigil? -- SScalar

v_twigil

VarTwigil? -- TNone

v_package

Pkg -- ["Moose", "Elk"]

v_categ

VarCateg? -- C_infix

v_name

ID -- "antler"

The names are stored as interned ByteStrings? for fast comparison.

All involved types are changed from String to new types as well,

such as (envPackage

Pkg).

Files:

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

src/Pugs/Lexer.hs

@@ -31 +31 @@
 import Pugs.Types
 import Pugs.Parser.Types
-import qualified Text.ParserCombinators.Parsec.Char as C (satisfy)
-
+
+identStart, identLetter :: RuleParser Char
 identStart  = satisfy isWordAlpha
 identLetter = satisfy isWordAny
@@ -49 +49 @@
 maybeParens p = choice [ parens p, p ]
 
+parens, braces, angles, brackets :: RuleParser a -> RuleParser a
 parens p        = between (symbol "(") (symbol ")") p
 braces p        = between (symbol "{") (symbol "}") p
@@ -132 +133 @@
 
 -- The \b rule.
-ruleWordBoundary :: RuleParser ()
-ruleWordBoundary = do
+_ruleWordBoundary :: RuleParser ()
+_ruleWordBoundary = do
     prev <- getPrevCharClass
     case prev of
@@ -236 +237 @@
         = homogenConcat (Val (VStr (x ++ y)) : xs)
     homogenConcat (x:xs)
-        = App (Var "&infix:~") Nothing [x, homogenConcat xs]
+        = App (_Var "&infix:~") Nothing [x, homogenConcat xs]
     
     stringList :: Int -> RuleParser [Exp]
@@ -451 +452 @@
 -----------------------------------------------------------
 -- naturalOrFloat :: CharParser st (Either Integer Double)
-naturalOrFloat  = lexeme (natFloat) <?> "number"
+naturalOrFloat  = lexeme natFloat   <?> "number"
 
 float           = lexeme floating   <?> "float"