summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScottWest <>2013-03-06 22:05:05 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2013-03-06 22:05:05 (GMT)
commit437c1004113d1cc72c288a5a2b30283338286509 (patch)
tree7a277b5cc149330a99e926ad688c646b30f7ee3f
parent2ddd0025544406f27553036ca09d026d6de2a304 (diff)
version 0.1.2HEAD0.1.2master
-rw-r--r--Language/Eiffel/Util.hs3
-rw-r--r--dist/build/Language/Eiffel/Parser/Lex.hs40
-rw-r--r--language-eiffel.cabal2
3 files changed, 22 insertions, 23 deletions
diff --git a/Language/Eiffel/Util.hs b/Language/Eiffel/Util.hs
index dde3516..15b108d 100644
--- a/Language/Eiffel/Util.hs
+++ b/Language/Eiffel/Util.hs
@@ -499,9 +499,6 @@ renameType r t = error $ "renameType: rename " ++ show r ++
-- | Rename everything in a class.
renameAll :: [RenameClause] -> AbsClas body exp -> AbsClas body exp
renameAll renames cls = renamed
- -- | Map.size (featureMap cls) == Map.size (featureMap renamed) = renamed
- -- | otherwise = error $ "renameAll: changed number of entries: " ++
- -- show (Map.keys $ featureMap cls, Map.keys $ featureMap renamed, renames, className cls)
where
renamed = foldr renameClass cls renames
diff --git a/dist/build/Language/Eiffel/Parser/Lex.hs b/dist/build/Language/Eiffel/Parser/Lex.hs
index 53cf713..069d41c 100644
--- a/dist/build/Language/Eiffel/Parser/Lex.hs
+++ b/dist/build/Language/Eiffel/Parser/Lex.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP,MagicHash #-}
+{-# LANGUAGE CPP,MagicHash,BangPatterns #-}
{-# LINE 1 "Language/Eiffel/Parser/Lex.x" #-}
{-# LANGUAGE OverloadedStrings #-}
@@ -80,6 +80,7 @@ import GlaExts
#endif
{-# LINE 1 "templates/wrappers.hs" #-}
{-# LINE 1 "templates/wrappers.hs" #-}
+{-# LINE 1 "<built-in>" #-}
{-# LINE 1 "<command-line>" #-}
{-# LINE 1 "templates/wrappers.hs" #-}
-- -----------------------------------------------------------------------------
@@ -102,7 +103,7 @@ type Byte = Word8
-- -----------------------------------------------------------------------------
-- The input type
-{-# LINE 72 "templates/wrappers.hs" #-}
+{-# LINE 71 "templates/wrappers.hs" #-}
type AlexInput = (AlexPosn, -- current position,
@@ -121,9 +122,9 @@ alexGetByte (p,_,cs) | ByteString.null cs = Nothing
in p' `seq` cs' `seq` Just (b, (p', c, cs'))
-{-# LINE 103 "templates/wrappers.hs" #-}
+{-# LINE 102 "templates/wrappers.hs" #-}
-{-# LINE 118 "templates/wrappers.hs" #-}
+{-# LINE 117 "templates/wrappers.hs" #-}
-- -----------------------------------------------------------------------------
-- Token positions
@@ -151,7 +152,7 @@ alexMove (AlexPn a l c) _ = AlexPn (a+1) l (c+1)
-- -----------------------------------------------------------------------------
-- Default monad
-{-# LINE 231 "templates/wrappers.hs" #-}
+{-# LINE 230 "templates/wrappers.hs" #-}
-- -----------------------------------------------------------------------------
@@ -246,15 +247,15 @@ token t input len = return (t input len)
-- -----------------------------------------------------------------------------
-- Basic wrapper
-{-# LINE 346 "templates/wrappers.hs" #-}
+{-# LINE 345 "templates/wrappers.hs" #-}
-- -----------------------------------------------------------------------------
-- Basic wrapper, ByteString version
-{-# LINE 364 "templates/wrappers.hs" #-}
+{-# LINE 363 "templates/wrappers.hs" #-}
-{-# LINE 377 "templates/wrappers.hs" #-}
+{-# LINE 376 "templates/wrappers.hs" #-}
-- -----------------------------------------------------------------------------
@@ -262,13 +263,13 @@ token t input len = return (t input len)
-- Adds text positions to the basic model.
-{-# LINE 394 "templates/wrappers.hs" #-}
+{-# LINE 393 "templates/wrappers.hs" #-}
-- -----------------------------------------------------------------------------
-- Posn wrapper, ByteString version
-{-# LINE 409 "templates/wrappers.hs" #-}
+{-# LINE 408 "templates/wrappers.hs" #-}
-- -----------------------------------------------------------------------------
@@ -734,6 +735,7 @@ alex_action_20 = withPos (tokConst EOF)
alex_action_21 = withPos (tokConst LexError)
{-# LINE 1 "templates/GenericTemplate.hs" #-}
{-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
{-# LINE 1 "<command-line>" #-}
{-# LINE 1 "templates/GenericTemplate.hs" #-}
-- -----------------------------------------------------------------------------
@@ -761,10 +763,10 @@ alexIndexInt16OffAddr (AlexA# arr) off =
#ifdef WORDS_BIGENDIAN
narrow16Int# i
where
- i = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
- high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
- low = int2Word# (ord# (indexCharOffAddr# arr off'))
- off' = off *# 2#
+ !i = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
+ !high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
+ !low = int2Word# (ord# (indexCharOffAddr# arr off'))
+ !off' = off *# 2#
#else
indexInt16OffAddr# arr off
#endif
@@ -861,12 +863,12 @@ alex_scan_tkn user orig_input len input s last_acc =
let
- (base) = alexIndexInt32OffAddr alex_base s
- ((I# (ord_c))) = fromIntegral c
- (offset) = (base +# ord_c)
- (check) = alexIndexInt16OffAddr alex_check offset
+ (!(base)) = alexIndexInt32OffAddr alex_base s
+ (!((I# (ord_c)))) = fromIntegral c
+ (!(offset)) = (base +# ord_c)
+ (!(check)) = alexIndexInt16OffAddr alex_check offset
- (new_s) = if (offset >=# 0#) && (check ==# ord_c)
+ (!(new_s)) = if (offset >=# 0#) && (check ==# ord_c)
then alexIndexInt16OffAddr alex_table offset
else alexIndexInt16OffAddr alex_deflt s
in
diff --git a/language-eiffel.cabal b/language-eiffel.cabal
index 043bee4..ea19c7e 100644
--- a/language-eiffel.cabal
+++ b/language-eiffel.cabal
@@ -7,7 +7,7 @@ Name: language-eiffel
-- The package version. See the Haskell package versioning policy
-- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
-- standards guiding when and how versions should be incremented.
-Version: 0.1.1
+Version: 0.1.2
-- A short (one-line) description of the package.
Synopsis: Parser and pretty printer for the Eiffel language.