|
1 | 1 | -- -----------------------------------------------------------------------------
|
2 |
| --- |
| 2 | +-- |
3 | 3 | -- ParseMonad.hs, part of Alex
|
4 | 4 | --
|
5 | 5 | -- (c) Simon Marlow 2003
|
@@ -49,7 +49,7 @@ alexGetChar (_, _ ,_ : _, _) = undefined -- hide compiler warning
|
49 | 49 | alexGetByte :: AlexInput -> Maybe (Byte,AlexInput)
|
50 | 50 | alexGetByte (p,c,(b:bs),s) = Just (b,(p,c,bs,s))
|
51 | 51 | alexGetByte (_,_,[],[]) = Nothing
|
52 |
| -alexGetByte (p,_,[],(c:s)) = let p' = alexMove p c |
| 52 | +alexGetByte (p,_,[],(c:s)) = let p' = alexMove p c |
53 | 53 | (b:bs) = UTF8.encode c
|
54 | 54 | in p' `seq` Just (b, (p', c, bs, s))
|
55 | 55 |
|
@@ -121,24 +121,24 @@ failP str = P $ \PState{ input = (p,_,_,_) } -> Left (Just p,str)
|
121 | 121 |
|
122 | 122 | lookupSMac :: (AlexPosn,String) -> P CharSet
|
123 | 123 | lookupSMac (posn,smac)
|
124 |
| - = P $ \s@PState{ smac_env = senv } -> |
| 124 | + = P $ \s@PState{ smac_env = senv } -> |
125 | 125 | case Map.lookup smac senv of
|
126 | 126 | Just ok -> Right (s,ok)
|
127 | 127 | Nothing -> Left (Just posn, "unknown set macro: $" ++ smac)
|
128 | 128 |
|
129 | 129 | lookupRMac :: String -> P RExp
|
130 |
| -lookupRMac rmac |
131 |
| - = P $ \s@PState{ rmac_env = renv } -> |
| 130 | +lookupRMac rmac |
| 131 | + = P $ \s@PState{ rmac_env = renv } -> |
132 | 132 | case Map.lookup rmac renv of
|
133 | 133 | Just ok -> Right (s,ok)
|
134 | 134 | Nothing -> Left (Nothing, "unknown regex macro: %" ++ rmac)
|
135 | 135 |
|
136 | 136 | newSMac :: String -> CharSet -> P ()
|
137 |
| -newSMac smac set |
| 137 | +newSMac smac set |
138 | 138 | = P $ \s -> Right (s{smac_env = Map.insert smac set (smac_env s)}, ())
|
139 | 139 |
|
140 | 140 | newRMac :: String -> RExp -> P ()
|
141 |
| -newRMac rmac rexp |
| 141 | +newRMac rmac rexp |
142 | 142 | = P $ \s -> Right (s{rmac_env = Map.insert rmac rexp (rmac_env s)}, ())
|
143 | 143 |
|
144 | 144 | setStartCode :: StartCode -> P ()
|
|
0 commit comments