Changeset 15165 for src/Pugs/Parser

Timestamp:

02/02/07 04:10:20 (22 months ago)

Author:

audreyt

Message:

* Filetest operators are now removed; use smartmatch against Pairs instead:

-e 'README'

!-e 'README'

becomes:

'README':e
'README':!e

Files:

• src/Pugs/Parser/Operator.hs (modified) (5 diffs)

src/Pugs/Parser/Operator.hs

@@ -52 +52 @@
     : (optOps (r_opt tights)        -- Named Unary (user-definable)
       ++ preOps (r_named tights Set.\\ opWords " true not ")
-      ++ fileTestOps
       )
     : staticLevels
@@ -103 +102 @@
     , preOps (opWords " true not ")                              -- Loose unary
     ]
-
-fileTestOps :: [RuleOperator Exp]
-fileTestOps = optSymOps (Set.fromAscList (map (MkOpName . cast . (\x -> ['-', x])) fileTestOperatorNames))
 
 infixAssignmentOps :: Set OpName
@@ -304 +300 @@
             = sig == SArray || sig == SArrayMulti
 matchSlurpy _ = False
-
-fileTestOperatorNames :: String
-fileTestOperatorNames = "ABCMORSTWXbcdefgkloprstuwxz"
 
 circumOps, rightSyn, chainOps, matchOps, nonSyn, listSyn, preSyn, optPreSyn, preOps, preSymOps, optSymOps, postOps, optOps, leftOps, rightOps, nonOps, listOps :: Set OpName -> [RuleOperator Exp]
@@ -348 +341 @@
     where
     lookAheadLiterals
-        | "-" <- name =
-            -- Horrible, horrible kluge to make "-e" etc work across prec levels.
-            (try parseFileTestOp >>= makeFileTestOp)
-                <|> conOp fullName
         | isWordAny (last name) = choice autoquoters
         | otherwise = conOp fullName
@@ -359 +348 @@
         , conOp fullName
         ]
-    parseFileTestOp = do
-        rv <- oneOf fileTestOperatorNames
-        lookAhead (satisfy (not . isWordAny))
-        whiteSpace
-        return rv
     fullName
         | isAlpha (head name)