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

Timestamp:

08/01/08 13:56:05 (5 months ago)

Author:

audreyt

Message:

* Import Pugs 6.2.13.11 from Hackage into our source tree.
* Highlights:

• Much faster startup time
• Slightly faster compilation time (mostly due to refactored Pugs.AST.Internals)
• Portable-to-Win32 readline thanks to Haskeline

Files:

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

src/Pugs/Parser/Operator.hs

@@ -10 +10 @@
 import qualified Data.Set as Set
 import qualified Data.Map as Map
-import qualified UTF8 as Buf
+import qualified Data.ByteString.UTF8 as Str
+import qualified Data.ByteString.Char8 as Buf -- XXX
 import qualified Data.HashTable as H
 import GHC.Int (Int32(I32#))
@@ -30 +31 @@
 
 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
+    compare (MkOpName x) (MkOpName y)
+        = compare (Buf.length (idBuf y)) (Buf.length (idBuf x)) `mappend` compare (idKey y) (idKey x)
 
 instance ((:<:) OpName) ByteString where