|
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 |
|
@@ -140,24 +140,24 @@ failP str = P $ \PState{ input = (p,_,_,_) } -> Left (Just p,str) |
140 | 140 |
|
141 | 141 | lookupSMac :: (AlexPosn,String) -> P CharSet |
142 | 142 | lookupSMac (posn,smac) |
143 | | - = P $ \s@PState{ smac_env = senv } -> |
| 143 | + = P $ \s@PState{ smac_env = senv } -> |
144 | 144 | case Map.lookup smac senv of |
145 | 145 | Just ok -> Right (s,ok) |
146 | 146 | Nothing -> Left (Just posn, "unknown set macro: $" ++ smac) |
147 | 147 |
|
148 | 148 | lookupRMac :: String -> P RExp |
149 | | -lookupRMac rmac |
150 | | - = P $ \s@PState{ rmac_env = renv } -> |
| 149 | +lookupRMac rmac |
| 150 | + = P $ \s@PState{ rmac_env = renv } -> |
151 | 151 | case Map.lookup rmac renv of |
152 | 152 | Just ok -> Right (s,ok) |
153 | 153 | Nothing -> Left (Nothing, "unknown regex macro: %" ++ rmac) |
154 | 154 |
|
155 | 155 | newSMac :: String -> CharSet -> P () |
156 | | -newSMac smac set |
| 156 | +newSMac smac set |
157 | 157 | = P $ \s -> Right (s{smac_env = Map.insert smac set (smac_env s)}, ()) |
158 | 158 |
|
159 | 159 | newRMac :: String -> RExp -> P () |
160 | | -newRMac rmac rexp |
| 160 | +newRMac rmac rexp |
161 | 161 | = P $ \s -> Right (s{rmac_env = Map.insert rmac rexp (rmac_env s)}, ()) |
162 | 162 |
|
163 | 163 | setStartCode :: StartCode -> P () |
|
0 commit comments