Changeset 14062 for src/Pugs/Lexer.hs

Timestamp:

10/08/06 12:38:10 (2 years ago)

Author:

audreyt

Message:

* Don't actually keep track of prevChar, instead keep track

of the last time we've seen a whitespace character.
This makes parsing quite a bit faster.

Files:

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

src/Pugs/Lexer.hs

@@ -21 +21 @@
     rule, verbatimRule, literalRule,
     tryRule, tryVerbatimRule,
-    tryChoice, ruleComma, ruleWs,
+    tryChoice, ruleComma, 
 
     ruleScope, ruleTrait, ruleTraitName, ruleBareTrait, ruleType,
@@ -32 +32 @@
 import Pugs.Parser.Types
 import Pugs.Parser.Charnames
+import Text.ParserCombinators.Parsec.Pos (sourceColumn, sourceLine)
 
 identStart, identLetter :: RuleParser Char
@@ -133 +134 @@
     return contents
 
+{-
 -- The \b rule.
 _ruleWordBoundary :: RuleParser ()
@@ -154 +156 @@
                 SpaceClass  -> whiteSpace
                 _           -> return ()
+-}
 
 {-|
@@ -200 +203 @@
 symbol s = try $ do
     rv <- string s
-    let ahead  = if isWordAny lastCh then aheadWord else aheadSym
-        lastCh = last rv
+    let lastCh = last s
+        ahead  = if isWordAny lastCh then aheadWord else aheadSym
     choice [ lookAhead (satisfy (ahead lastCh)), eof >> return ' ' ]
     whiteSpace
@@ -530 +533 @@
 simpleSpace :: RuleParser ()
 simpleSpace = do
-    skipMany1 (satisfy (isSpace))
+    skipMany1 (satisfy isSpace)
+    pos <- getPosition
+    modify (\s -> s{ s_wsLine = sourceLine pos, s_wsColumn = sourceColumn pos })
 
 multiLineComment :: RuleParser ()