summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitryIvanov <>2016-12-10 09:40:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2016-12-10 09:40:00 (GMT)
commitcf58b1d3fb6137ef00ba5694cbb7dab80f6311dd (patch)
tree46896d833d238d8a48044715a1bdaa107fef046f
parent0fba921aea7c3a9d68e5d1aa2faac231a890fdc0 (diff)
version 0.13.50.13.5
-rw-r--r--src/Yi/Lexer/common.hsinc4
-rw-r--r--yi-mode-haskell.cabal4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Yi/Lexer/common.hsinc b/src/Yi/Lexer/common.hsinc
index bb00f31..6063c04 100644
--- a/src/Yi/Lexer/common.hsinc
+++ b/src/Yi/Lexer/common.hsinc
@@ -36,7 +36,11 @@ alexScanUser' user input (I# (sc))
Nothing -> (AlexEOF, lookahead)
Just _ -> (AlexError input', lookahead)
(AlexLastSkip input'' len, _, lookahead) -> (AlexSkip input'' len, lookahead)
+#if MIN_TOOL_VERSION_alex(3,2,0)
+ (AlexLastAcc k input'' len, _, lookahead) -> (AlexToken input'' len (alex_actions ! k), lookahead)
+#else
(AlexLastAcc k input'' len, _, lookahead) -> (AlexToken input'' len k, lookahead)
+#endif
-- Same as alex_scan_tkn, but also return the length of lookahead.
diff --git a/yi-mode-haskell.cabal b/yi-mode-haskell.cabal
index 5181426..75d698b 100644
--- a/yi-mode-haskell.cabal
+++ b/yi-mode-haskell.cabal
@@ -3,7 +3,7 @@
-- see: https://github.com/sol/hpack
name: yi-mode-haskell
-version: 0.13.4
+version: 0.13.5
synopsis: Yi editor haskell mode
category: Yi
homepage: https://github.com/yi-editor/yi#readme
@@ -36,6 +36,8 @@ library
, yi-core
, yi-language
, yi-rope
+ build-tools:
+ alex >= 3.0.3 && < 3.2.0 || >= 3.2.1
exposed-modules:
Yi.Config.Default.HaskellMode
Yi.Lexer.Haskell