Changeset 17047

Timestamp:

07/14/07 04:45:22 (15 months ago)

Author:

audreyt

Message:

* Final batch of HPC-inspired toplevel removals:

Pugs.AST.Pads.diffPads
Pugs.AST.Utils.getMapIndex
Pugs.Internals.ID.hashList

(moved to a local definition in Pugs.Parser.Charnames)

Pugs.Lexer.balanced
Pugs.Lexer.ruleWhiteSpaceLine (and ruleEndOfLine)

Location:

src/Pugs

Files:

• AST/Pad.hs (modified) (3 diffs)
• AST/Utils.hs (modified) (1 diff)
• Internals/ID.hs (modified) (2 diffs)
• Lexer.hs (modified) (5 diffs)
• Parser/Charnames.hs (modified) (2 diffs)

src/Pugs/AST/Pad.hs

@@ -1 +1 @@
 {-# OPTIONS_GHC -fglasgow-exts -fparr #-}
 module Pugs.AST.Pad (
-  mkPad, diffPads, unionPads, padKeys, filterPad, adjustPad, mergePadEntry,
+  mkPad, unionPads, padKeys, filterPad, adjustPad, mergePadEntry,
   mergeLexPads, readMPad, writeMPad, appendMPad, modifyMPad, newMPad
 ) where
@@ -51 +51 @@
     return $ MkMPad (addressOf tvar) tvar
 
+{-
 {-|
 Return the difference between two 'Pad's.
@@ -62 +63 @@
     diffPadEntry x y | x == y    = Nothing
                      | otherwise = Just x
+-}
 
 {-|

src/Pugs/AST/Utils.hs

@@ -33 +33 @@
             Nothing    -> errIndex def idx
         (a:_) -> return a
-
-getMapIndex :: Int -> Maybe a -> Eval (IntMap a) -> Maybe (Eval b) -> Eval a
-getMapIndex idx def doList _ | idx < 0 = do
-    -- first, check if the list is at least abs(idx) long.
-    list <- doList
-    if IntMap.member (abs (idx+1)) list
-        then return . fromJust
-            $ IntMap.lookup (idx `mod` (IntMap.size list)) list
-        else errIndex def idx
--- now we are all positive; either extend or return
-getMapIndex idx def doList ext = do
-    list <- doList
-    case IntMap.lookup idx list of
-        Just a  -> return a
-        Nothing -> case ext of
-            Just doExt -> do { doExt ; getMapIndex idx def doList Nothing }
-            Nothing    -> errIndex def idx
 
 {-|

src/Pugs/Internals/ID.hs

@@ -2 +2 @@
 
 module Pugs.Internals.ID (
-    ID(..), bufToID,
-    hashNew, hashList,
+    ID(..), bufToID, hashNew,
     __, (+++), nullID, 
 ) where
@@ -76 +75 @@
 hashNew = H.new (==) (UTF8.hash)
 
-{-# INLINE hashList #-}
-hashList :: [(ByteString, a)] -> IO (H.HashTable ByteString a)
-hashList = H.fromList (UTF8.hash)
-
 {-# NOINLINE _BufToID #-}
 _BufToID :: H.HashTable ByteString ID

src/Pugs/Lexer.hs

@@ -13 +13 @@
     wordAlpha, wordAny, isWordAlpha, isWordAny,
     maybeParens, parens, whiteSpace, mandatoryWhiteSpace, lexeme, identifier, identLetter,
-    braces, brackets, angles, balanced, balancedDelim, decimal,
-
-    ruleVerbatimIdentifier, ruleDelimitedIdentifier, ruleQualifiedIdentifier, ruleWhiteSpaceLine,
+    braces, brackets, angles, balancedDelim, decimal,
+
+    ruleVerbatimIdentifier, ruleDelimitedIdentifier, ruleQualifiedIdentifier,
 
     symbol, interpolatingStringLiteral, escapeCode,
@@ -131 +131 @@
 #endif
 
+{-
 -- balanced: parses an open/close delimited expression of any non-alphanumeric character
 balanced :: RuleParser String
@@ -140 +141 @@
     return contents
 
-{-
 -- The \b rule.
 _ruleWordBoundary :: RuleParser ()
@@ -190 +190 @@
     return (c:cs)
 
+{-
 {-|
 Match any amount of whitespace (not including newlines), followed by a newline
@@ -205 +206 @@
 ruleEndOfLine :: RuleParser ()
 ruleEndOfLine = choice [ do { char '\n'; return () }, eof ]
+-}
 
 symbol :: String -> RuleParser String

src/Pugs/Parser/Charnames.hs

@@ -23 +23 @@
 
 import qualified Data.HashTable as H
-import UTF8 (unsafePackAddress)
+import UTF8 (unsafePackAddress, hash)
 
 -- If we don't have Perl 5, support for names in the 0x00 - 0xFF range only.
@@ -290 +290 @@
     , (unsafePackAddress 35 "LATIN SMALL LETTER Y WITH DIAERESIS"#, 0x00FF)
     ]
+    where
+    hashList :: [(ByteString, a)] -> IO (H.HashTable ByteString a)
+    hashList = H.fromList hash
+
 #endif