morte 1.6.10 → 1.6.11
raw patch · 2 files changed
+33/−250 lines, 2 filesdep ~tastyPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: tasty
API changes (from Hackage documentation)
+ Morte.Lexer: instance GHC.Base.Functor Morte.Lexer.AlexLastAcc
Files
- dist/build/Morte/Lexer.hs +31/−248
- morte.cabal +2/−2
dist/build/Morte/Lexer.hs view
@@ -61,10 +61,7 @@ alex_deflt :: AlexAddr alex_deflt = AlexA# "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x2e\x00\x2e\x00\x30\x00\x30\x00\x32\x00\x32\x00\x34\x00\x34\x00\x36\x00\x36\x00\x38\x00\x38\x00\x3a\x00\x3a\x00\x3c\x00\x3c\x00\x40\x00\x40\x00\x44\x00\x44\x00\x48\x00\x48\x00\x4c\x00\x4c\x00\x50\x00\x50\x00\x54\x00\x54\x00\x58\x00\x58\x00\x5c\x00\x5c\x00\x5f\x00\x5f\x00\xff\xff\xff\xff\x66\x00\x66\x00\x97\x00\x97\x00\x97\x00\x97\x00\x96\x00\x96\x00\x96\x00\x96\x00\x95\x00\x95\x00\x95\x00\x95\x00\x8d\x00\x8d\x00\x8d\x00\x8d\x00\x88\x00\x88\x00\x88\x00\x88\x00\x87\x00\x87\x00\x87\x00\x87\x00\x86\x00\x86\x00\x86\x00\x85\x00\x85\x00\x85\x00\xff\xff\xff\xff\xff\xff\xff\xff\x69\x00\x69\x00\x69\x00\xff\xff\xff\xff\x69\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x85\x00\x86\x00\x87\x00\x88\x00\x8d\x00\x8d\x00\x8d\x00\x8d\x00\x8d\x00\x8d\x00\x8d\x00\x8d\x00\x8d\x00\x8d\x00\x86\x00\x85\x00\x95\x00\x96\x00\x97\x00"# -alex_accept = listArray (0::Int,151) [AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccSkip,AlexAcc 46,AlexAccSkip,AlexAcc 45,AlexAcc 44,AlexAcc 43,AlexAcc 42,AlexAcc 41,AlexAcc 40,AlexAcc 39,AlexAcc 38,AlexAcc 37,AlexAcc 36,AlexAcc 35,AlexAcc 34,AlexAcc 33,AlexAcc 32,AlexAcc 31,AlexAcc 30,AlexAcc 29,AlexAcc 28,AlexAcc 27,AlexAcc 26,AlexAcc 25,AlexAcc 24,AlexAcc 23,AlexAcc 22,AlexAcc 21,AlexAcc 20,AlexAcc 19,AlexAcc 18,AlexAcc 17,AlexAcc 16,AlexAcc 15,AlexAcc 14,AlexAcc 13,AlexAcc 12,AlexAcc 11,AlexAcc 10,AlexAcc 9,AlexAcc 8,AlexAcc 7,AlexAcc 6,AlexAcc 5,AlexAcc 4,AlexAcc 3,AlexAcc 2,AlexAcc 1,AlexAcc 0]--alex_actions = array (0::Int,47) [(46,alex_action_1),(45,alex_action_3),(44,alex_action_4),(43,alex_action_5),(42,alex_action_6),(41,alex_action_7),(40,alex_action_8),(39,alex_action_8),(38,alex_action_9),(37,alex_action_10),(36,alex_action_10),(35,alex_action_11),(34,alex_action_11),(33,alex_action_12),(32,alex_action_12),(31,alex_action_12),(30,alex_action_12),(29,alex_action_12),(28,alex_action_12),(27,alex_action_12),(26,alex_action_12),(25,alex_action_12),(24,alex_action_12),(23,alex_action_12),(22,alex_action_12),(21,alex_action_12),(20,alex_action_12),(19,alex_action_13),(18,alex_action_14),(17,alex_action_15),(16,alex_action_16),(15,alex_action_17),(14,alex_action_18),(13,alex_action_18),(12,alex_action_18),(11,alex_action_18),(10,alex_action_18),(9,alex_action_18),(8,alex_action_18),(7,alex_action_18),(6,alex_action_18),(5,alex_action_18),(4,alex_action_18),(3,alex_action_18),(2,alex_action_19),(1,alex_action_20),(0,alex_action_21)]-+alex_accept = listArray (0::Int,151) [AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccNone,AlexAccSkip,AlexAcc (alex_action_1),AlexAccSkip,AlexAcc (alex_action_3),AlexAcc (alex_action_4),AlexAcc (alex_action_5),AlexAcc (alex_action_6),AlexAcc (alex_action_7),AlexAcc (alex_action_8),AlexAcc (alex_action_8),AlexAcc (alex_action_9),AlexAcc (alex_action_10),AlexAcc (alex_action_10),AlexAcc (alex_action_11),AlexAcc (alex_action_11),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_12),AlexAcc (alex_action_13),AlexAcc (alex_action_14),AlexAcc (alex_action_15),AlexAcc (alex_action_16),AlexAcc (alex_action_17),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_18),AlexAcc (alex_action_19),AlexAcc (alex_action_20),AlexAcc (alex_action_21)] {-# LINE 69 "src/Morte/Lexer.x" #-} @@ -209,231 +206,8 @@ {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "<built-in>" #-}-{-# LINE 1 "<command-line>" #-}-{-# LINE 11 "<command-line>" #-}-# 1 "/nix/store/86mc2lskzs78wfi3ds9663z06rpp3fbv-glibc-2.25-dev/include/stdc-predef.h" 1 3 4--# 17 "/nix/store/86mc2lskzs78wfi3ds9663z06rpp3fbv-glibc-2.25-dev/include/stdc-predef.h" 3 4--------------------------------------------{-# LINE 11 "<command-line>" #-}-{-# LINE 1 "/nix/store/s0hpng652hsn40jy4kjdh1x0jm86dx9l-ghc-8.0.2/lib/ghc-8.0.2/include/ghcversion.h" #-}------------------{-# LINE 11 "<command-line>" #-}-{-# LINE 1 "/tmp/nix-build-alex-3.2.1.drv-0/ghc1344_0/ghc_2.h" #-}------------------------------------------------------------------------------------------------------------------------------------------------------------+{-# LINE 18 "<built-in>" #-}+{-# LINE 1 "/Users/gabriel/.stack/programs/x86_64-osx/ghc-7.10.3/lib/ghc-7.10.3/include/ghcversion.h" #-} @@ -452,7 +226,7 @@ -{-# LINE 11 "<command-line>" #-}+{-# LINE 19 "<built-in>" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -- ----------------------------------------------------------------------------- -- ALEX TEMPLATE@@ -463,6 +237,7 @@ -- ----------------------------------------------------------------------------- -- INTERNALS and main scanner engine + {-# LINE 21 "templates/GenericTemplate.hs" #-} @@ -477,6 +252,7 @@ #define GTE(n,m) (n >=# m) #define EQ(n,m) (n ==# m) #endif+ {-# LINE 51 "templates/GenericTemplate.hs" #-} @@ -504,7 +280,7 @@ {-# INLINE alexIndexInt32OffAddr #-}-alexIndexInt32OffAddr (AlexA# arr) off =+alexIndexInt32OffAddr (AlexA# arr) off = #ifdef WORDS_BIGENDIAN narrow32Int# i where@@ -550,30 +326,30 @@ alexScanUser user input (I# (sc)) = case alex_scan_tkn user input 0# input sc AlexNone of- (AlexNone, input') ->- case alexGetByte input of- Nothing ->+ (AlexNone, input') ->+ case alexGetByte input of+ Nothing -> AlexEOF- Just _ ->+ Just _ -> AlexError input' - (AlexLastSkip input'' len, _) ->+ (AlexLastSkip input'' len, _) -> - AlexSkip input'' len+ AlexSkip input'' len - (AlexLastAcc k input''' len, _) ->+ (AlexLastAcc k input''' len, _) -> - AlexToken input''' len (alex_actions ! k)+ AlexToken input''' len k -- Push the input through the DFA, remembering the most recent accepting@@ -581,13 +357,13 @@ alex_scan_tkn user orig_input len input s last_acc = input `seq` -- strict in the input- let- new_acc = (check_accs (alex_accept `quickIndex` (I# (s))))+ let + new_acc = (check_accs (alex_accept `quickIndex` (I# (s)))) in new_acc `seq` case alexGetByte input of Nothing -> (new_acc, input)- Just (c, new_input) ->+ Just (c, new_input) -> @@ -596,7 +372,7 @@ base = alexIndexInt32OffAddr alex_base s offset = (base +# ord_c) check = alexIndexInt16OffAddr alex_check offset-+ new_s = if GTE(offset,0#) && EQ(check,ord_c) then alexIndexInt16OffAddr alex_table offset else alexIndexInt16OffAddr alex_deflt s@@ -613,14 +389,21 @@ check_accs (AlexAccNone) = last_acc check_accs (AlexAcc a ) = AlexLastAcc a input (I# (len)) check_accs (AlexAccSkip) = AlexLastSkip input (I# (len))+ {-# LINE 198 "templates/GenericTemplate.hs" #-} -data AlexLastAcc+data AlexLastAcc a = AlexNone- | AlexLastAcc !Int !AlexInput !Int- | AlexLastSkip !AlexInput !Int+ | AlexLastAcc a !AlexInput !Int+ | AlexLastSkip !AlexInput !Int -data AlexAcc user+instance Functor AlexLastAcc where+ fmap _ AlexNone = AlexNone+ fmap f (AlexLastAcc x y z) = AlexLastAcc (f x) y z+ fmap _ (AlexLastSkip x y) = AlexLastSkip x y++data AlexAcc a user = AlexAccNone- | AlexAcc Int+ | AlexAcc a | AlexAccSkip+
morte.cabal view
@@ -1,5 +1,5 @@ Name: morte-Version: 1.6.10+Version: 1.6.11 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1@@ -93,7 +93,7 @@ mtl >= 2.2 && < 2.3 , QuickCheck >= 2.8.1 && < 2.11, system-filepath >= 0.3.1 && < 0.5 ,- tasty >= 0.11 && < 0.12,+ tasty >= 0.11 && < 0.13, tasty-hunit >= 0.9 && < 0.10, tasty-quickcheck >= 0.8.4 && < 0.10, transformers >= 0.2.0.0 && < 0.6 ,