Changeset 20058 for src/Pugs/Parser/Operator.hs

Timestamp:

03/04/08 22:06:31 (9 months ago)

Author:

gbacon

Message:

Build the library, but the executable still doesn't link. Why aren't we building an Executable with cabal?

Files:

• src/Pugs/Parser/Operator.hs (modified) (2 diffs)

src/Pugs/Parser/Operator.hs

@@ -27 +27 @@
 
 newtype OpName = MkOpName ID
-    deriving (Show, Eq, Typeable, (:>:) String, (:>:) ByteString, (:<:) ByteString, (:>:) ID)
+    deriving (Show, Eq, Typeable, (:>:) String, (:>:) ByteString, (:<:) ByteString, (:>:) ID, (:<:) String, (:<:) ID)
 
 instance Ord OpName where
     compare (MkOpName MkID{ idKey = a, idBuf = x }) (MkOpName MkID{ idKey = b, idBuf = y })
         = compare (Buf.length y) (Buf.length x) `mappend` compare b a
+
+instance ((:<:) OpName) ByteString where
+    castBack (MkOpName id) = castBack id
 
 -- Not yet transcribed into a full optable parser with dynamic precedence
@@ -650 +653 @@
             notFollowedBy (char '(' <|> (char ':' >> char ':'))
             possiblyApplyMacro $ App (Var var) Nothing []
-        parseOneTerm (name, categ) = do
+        parseOneTerm (name :: OpName, categ) = do
             symbol (cast name)
             return MkVar