Changeset 5892

Timestamp:

07/29/05 18:47:27 (3 years ago)

Author:

bsmith

svk:copy_cache_prev:

7758

Message:

Added parseNatOrRat function to Pugs.Parser.Number.
Added module exports to Pugs.Parser so only it needs to be imported.

Location:

src/Pugs

Files:

• AST/Internals.hs (modified) (3 diffs)
• Class.hs (modified) (1 diff)
• Parser.hs (modified) (1 diff)
• Parser/Number.hs (modified) (1 diff)
• Parser/Program.hs (modified) (1 diff)

src/Pugs/AST/Internals.hs

@@ -71 +71 @@
 import Pugs.Internals
 import Pugs.Context
-import Pugs.Rule
 import Pugs.Types
 import Pugs.Cont hiding (shiftT, resetT)
@@ -408 +407 @@
         return str
     doCast (VStr s)     = return $
-        case ( runParser naturalOrRat () "" s ) of
+        case ( parseNatOrRat s ) of
             Left _   -> 0 % 1
             Right rv -> case rv of
@@ -432 +431 @@
     doCast (VStr "NaN") = return $ 0/0
     doCast (VStr s)     = return $
-        case ( runParser naturalOrRat () "" s ) of
+        case ( parseNatOrRat s ) of
             Left _   -> 0
             Right rv -> case rv of

src/Pugs/Class.hs

@@ -13 +13 @@
 
 module Pugs.Class where
-import AST
-import Internals
+import Pugs.AST
+import Pugs.Internals
 
 {-

src/Pugs/Parser.hs

@@ -15 +15 @@
     possiblyExit,
     mkPos,
+
+    module Pugs.Lexer,
+    module Pugs.Parser.Types,
+    module Pugs.Parser.Unsafe,
 ) where
 import Pugs.Internals

src/Pugs/Parser/Number.hs

@@ -2 +2 @@
 
 module Pugs.Parser.Number (
+    parseNatOrRat,
     naturalOrRat,
 ) where
 import Pugs.Internals
 import Pugs.Rule
+
+parseNatOrRat :: String -> Either ParseError (Either Integer (Ratio Integer))
+parseNatOrRat s = runParser naturalOrRat () "" s
 
 naturalOrRat :: GenParser Char st (Either Integer (Ratio Integer))

src/Pugs/Parser/Program.hs

@@ -5 +5 @@
 import Pugs.Internals
 import Pugs.AST
-import Pugs.Lexer
+
+import Pugs.Parser
 import Pugs.Rule
 import Pugs.Rule.Error
-
-import Pugs.Parser
-import Pugs.Parser.Types
-import Pugs.Parser.Unsafe
 
 parseProgram :: Env -> FilePath -> String -> Env