Changeset 15297 for src/Pugs/AST.hs

Timestamp:

02/18/07 15:59:02 (21 months ago)

Author:

audreyt

Message:

* Revert the previous patch; everything back to normal.

Files:

• src/Pugs/AST.hs (modified) (4 diffs)

src/Pugs/AST.hs

@@ -1 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances -foverloaded-strings #-}
+{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances #-}
 
 {-|
@@ -216 +216 @@
 mergeStmts x y = Stmts x y
 
-isImplicitTopic :: ID -> Bool
+isImplicitTopic :: String -> Bool
 isImplicitTopic "subst" = True
 isImplicitTopic "match" = True
@@ -234 +234 @@
 
 _underscore :: ID
-_underscore = _cast "_"
+_underscore = cast "_" 
 
 newPackage :: String -> String -> [String] -> [String] -> Exp
@@ -244 +244 @@
             (Just $ Val (VType $ mkType cls))
             [ Syn "named"
-                [ Val (_VStr "is")
-                , Val (VList $ map castV classes)
+                [ Val (VStr "is")
+                , Val (VList $ map VStr classes)
                 ]
             , Syn "named"
-                [ Val (_VStr "does")
-                , Val (VList $ map castV roles)
+                [ Val (VStr "does")
+                , Val (VList $ map VStr roles)
                 ]
             , Syn "named"
-                [ Val (_VStr "name")
-                , Val (castV name)
+                [ Val (VStr "name")
+                , Val (VStr name)
                 ]
             , Syn "named"
-                [ Val (_VStr "attrs")
+                [ Val (VStr "attrs")
                 , Syn "\\{}" [Noop]
                 ]