Changeset 12460 for src/Pugs/Exp.hs

Timestamp:

08/19/06 15:27:26 (2 years ago)

Author:

audreyt

Message:

* Pugs.AST now imports Pugs.Exp.

Files:

• src/Pugs/Exp.hs (modified) (5 diffs)

src/Pugs/Exp.hs

@@ -7 +7 @@
 module Pugs.Exp where
 
-import Data.Generics.Basics hiding (cast)
-import qualified Data.Typeable as Typeable
 import Pugs.Internals
-import qualified Pugs.AST as OldAST
+import {-# SOURCE #-} qualified Pugs.AST.Internals as OldAST
 import Pugs.Val
+import Pugs.Types (Var)
 
 
@@ -17 +16 @@
 type ExpVal = Val
 type ExpCapt = Capt Exp
+
+newtype ExpEmeritus = MkExpEmeritus { ee :: OldAST.Exp }
+
+instance Eq ExpEmeritus where _ == _ = True
+instance Ord ExpEmeritus where compare _ _ = EQ
+instance Show ExpEmeritus where show _ = "<Exp.Emeritus>"
 
 -- | AST for an expression.
@@ -29 +34 @@
     | EFlatten  [Exp]                  -- ^ Wrapper for expressions forced into
                                        --   slurpy context
-    | EE OldAST.Exp
-    deriving (Show, Eq, Ord, Data, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}
+    | EE ExpEmeritus
+    deriving (Show, Eq, Ord, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}
 
 
@@ -48 +53 @@
     | CWhen        Exp  Code            -- ^ when
     | CForeign                          -- ^ &statement_control:<mycontrol>
-    deriving (Show, Eq, Ord, Data, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}
+    deriving (Show, Eq, Ord, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}
+
+-- | General purpose mapping from identifiers to values.
+type Table = Map ID Val
 
 -- | AST for a statement. The top level of an AST is a list of Stmt.
@@ -55 +63 @@
     , pragmas    :: Table
     , expression :: Exp
-    } deriving (Show, Eq, Ord, Data, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}
+    } deriving (Show, Eq, Ord, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}
 
 -- | Carry over last pragmas and create a new statement out of an expression