language-lua 0.11.0 → 0.11.0.1
raw patch · 3 files changed
+9/−5 lines, 3 filesdep ~alex-toolsdep ~basedep ~bytestringPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: alex-tools, base, bytestring, text
API changes (from Hackage documentation)
- Language.Lua.Annotated.Parser: instance Language.Lua.Annotated.Parser.HasRange a => Language.Lua.Annotated.Parser.HasRange (GHC.Base.Maybe a)
+ Language.Lua.Annotated.Parser: instance Language.Lua.Annotated.Parser.HasRange a => Language.Lua.Annotated.Parser.HasRange (GHC.Maybe.Maybe a)
- Language.Lua.Annotated.Syntax: Binop :: a -> (Binop a) -> (Exp a) -> (Exp a) -> Exp a
+ Language.Lua.Annotated.Syntax: Binop :: a -> Binop a -> Exp a -> Exp a -> Exp a
- Language.Lua.Annotated.Syntax: Block :: a -> [Stat a] -> (Maybe [Exp a]) -> Block a
+ Language.Lua.Annotated.Syntax: Block :: a -> [Stat a] -> Maybe [Exp a] -> Block a
- Language.Lua.Annotated.Syntax: Do :: a -> (Block a) -> Stat a
+ Language.Lua.Annotated.Syntax: Do :: a -> Block a -> Stat a
- Language.Lua.Annotated.Syntax: EFunDef :: a -> (FunDef a) -> Exp a
+ Language.Lua.Annotated.Syntax: EFunDef :: a -> FunDef a -> Exp a
- Language.Lua.Annotated.Syntax: ExpField :: a -> (Exp a) -> (Exp a) -> TableField a
+ Language.Lua.Annotated.Syntax: ExpField :: a -> Exp a -> Exp a -> TableField a
- Language.Lua.Annotated.Syntax: Field :: a -> (Exp a) -> TableField a
+ Language.Lua.Annotated.Syntax: Field :: a -> Exp a -> TableField a
- Language.Lua.Annotated.Syntax: ForIn :: a -> [Name a] -> [Exp a] -> (Block a) -> Stat a
+ Language.Lua.Annotated.Syntax: ForIn :: a -> [Name a] -> [Exp a] -> Block a -> Stat a
- Language.Lua.Annotated.Syntax: ForRange :: a -> (Name a) -> (Exp a) -> (Exp a) -> (Maybe (Exp a)) -> (Block a) -> Stat a
+ Language.Lua.Annotated.Syntax: ForRange :: a -> Name a -> Exp a -> Exp a -> Maybe (Exp a) -> Block a -> Stat a
- Language.Lua.Annotated.Syntax: FunAssign :: a -> (FunName a) -> (FunBody a) -> Stat a
+ Language.Lua.Annotated.Syntax: FunAssign :: a -> FunName a -> FunBody a -> Stat a
- Language.Lua.Annotated.Syntax: FunBody :: a -> [Name a] -> (Maybe a) -> (Block a) -> FunBody a
+ Language.Lua.Annotated.Syntax: FunBody :: a -> [Name a] -> Maybe a -> Block a -> FunBody a
- Language.Lua.Annotated.Syntax: FunCall :: a -> (FunCall a) -> Stat a
+ Language.Lua.Annotated.Syntax: FunCall :: a -> FunCall a -> Stat a
- Language.Lua.Annotated.Syntax: FunDef :: a -> (FunBody a) -> FunDef a
+ Language.Lua.Annotated.Syntax: FunDef :: a -> FunBody a -> FunDef a
- Language.Lua.Annotated.Syntax: FunName :: a -> (Name a) -> [Name a] -> (Maybe (Name a)) -> FunName a
+ Language.Lua.Annotated.Syntax: FunName :: a -> Name a -> [Name a] -> Maybe (Name a) -> FunName a
- Language.Lua.Annotated.Syntax: Goto :: a -> (Name a) -> Stat a
+ Language.Lua.Annotated.Syntax: Goto :: a -> Name a -> Stat a
- Language.Lua.Annotated.Syntax: If :: a -> [(Exp a, Block a)] -> (Maybe (Block a)) -> Stat a
+ Language.Lua.Annotated.Syntax: If :: a -> [(Exp a, Block a)] -> Maybe (Block a) -> Stat a
- Language.Lua.Annotated.Syntax: Label :: a -> (Name a) -> Stat a
+ Language.Lua.Annotated.Syntax: Label :: a -> Name a -> Stat a
- Language.Lua.Annotated.Syntax: LocalAssign :: a -> [Name a] -> (Maybe [Exp a]) -> Stat a
+ Language.Lua.Annotated.Syntax: LocalAssign :: a -> [Name a] -> Maybe [Exp a] -> Stat a
- Language.Lua.Annotated.Syntax: LocalFunAssign :: a -> (Name a) -> (FunBody a) -> Stat a
+ Language.Lua.Annotated.Syntax: LocalFunAssign :: a -> Name a -> FunBody a -> Stat a
- Language.Lua.Annotated.Syntax: MethodCall :: a -> (PrefixExp a) -> (Name a) -> (FunArg a) -> FunCall a
+ Language.Lua.Annotated.Syntax: MethodCall :: a -> PrefixExp a -> Name a -> FunArg a -> FunCall a
- Language.Lua.Annotated.Syntax: NamedField :: a -> (Name a) -> (Exp a) -> TableField a
+ Language.Lua.Annotated.Syntax: NamedField :: a -> Name a -> Exp a -> TableField a
- Language.Lua.Annotated.Syntax: NormalFunCall :: a -> (PrefixExp a) -> (FunArg a) -> FunCall a
+ Language.Lua.Annotated.Syntax: NormalFunCall :: a -> PrefixExp a -> FunArg a -> FunCall a
- Language.Lua.Annotated.Syntax: PEFunCall :: a -> (FunCall a) -> PrefixExp a
+ Language.Lua.Annotated.Syntax: PEFunCall :: a -> FunCall a -> PrefixExp a
- Language.Lua.Annotated.Syntax: PEVar :: a -> (Var a) -> PrefixExp a
+ Language.Lua.Annotated.Syntax: PEVar :: a -> Var a -> PrefixExp a
- Language.Lua.Annotated.Syntax: Paren :: a -> (Exp a) -> PrefixExp a
+ Language.Lua.Annotated.Syntax: Paren :: a -> Exp a -> PrefixExp a
- Language.Lua.Annotated.Syntax: PrefixExp :: a -> (PrefixExp a) -> Exp a
+ Language.Lua.Annotated.Syntax: PrefixExp :: a -> PrefixExp a -> Exp a
- Language.Lua.Annotated.Syntax: Repeat :: a -> (Block a) -> (Exp a) -> Stat a
+ Language.Lua.Annotated.Syntax: Repeat :: a -> Block a -> Exp a -> Stat a
- Language.Lua.Annotated.Syntax: Select :: a -> (PrefixExp a) -> (Exp a) -> Var a
+ Language.Lua.Annotated.Syntax: Select :: a -> PrefixExp a -> Exp a -> Var a
- Language.Lua.Annotated.Syntax: SelectName :: a -> (PrefixExp a) -> (Name a) -> Var a
+ Language.Lua.Annotated.Syntax: SelectName :: a -> PrefixExp a -> Name a -> Var a
- Language.Lua.Annotated.Syntax: TableArg :: a -> (Table a) -> FunArg a
+ Language.Lua.Annotated.Syntax: TableArg :: a -> Table a -> FunArg a
- Language.Lua.Annotated.Syntax: TableConst :: a -> (Table a) -> Exp a
+ Language.Lua.Annotated.Syntax: TableConst :: a -> Table a -> Exp a
- Language.Lua.Annotated.Syntax: Unop :: a -> (Unop a) -> (Exp a) -> Exp a
+ Language.Lua.Annotated.Syntax: Unop :: a -> Unop a -> Exp a -> Exp a
- Language.Lua.Annotated.Syntax: VarName :: a -> (Name a) -> Var a
+ Language.Lua.Annotated.Syntax: VarName :: a -> Name a -> Var a
- Language.Lua.Annotated.Syntax: While :: a -> (Exp a) -> (Block a) -> Stat a
+ Language.Lua.Annotated.Syntax: While :: a -> Exp a -> Block a -> Stat a
- Language.Lua.Syntax: Block :: [Stat] -> (Maybe [Exp]) -> Block
+ Language.Lua.Syntax: Block :: [Stat] -> Maybe [Exp] -> Block
- Language.Lua.Syntax: ForRange :: Name -> Exp -> Exp -> (Maybe Exp) -> Block -> Stat
+ Language.Lua.Syntax: ForRange :: Name -> Exp -> Exp -> Maybe Exp -> Block -> Stat
- Language.Lua.Syntax: FunName :: Name -> [Name] -> (Maybe Name) -> FunName
+ Language.Lua.Syntax: FunName :: Name -> [Name] -> Maybe Name -> FunName
- Language.Lua.Syntax: If :: [(Exp, Block)] -> (Maybe Block) -> Stat
+ Language.Lua.Syntax: If :: [(Exp, Block)] -> Maybe Block -> Stat
- Language.Lua.Syntax: LocalAssign :: [Name] -> (Maybe [Exp]) -> Stat
+ Language.Lua.Syntax: LocalAssign :: [Name] -> Maybe [Exp] -> Stat
Files
- CHANGELOG.md +4/−0
- language-lua.cabal +3/−3
- src/Language/Lua/LexerUtils.hs +2/−2
CHANGELOG.md view
@@ -1,5 +1,9 @@ ## Changelog +#### 0.11.0.1++- Update to work with newer base+ #### 0.11.0 - Migrates custom lexer logic to `alex-tools` package
language-lua.cabal view
@@ -3,7 +3,7 @@ Description: Lua 5.3 lexer, parser and pretty-printer. -Version: 0.11.0+Version: 0.11.0.1 Synopsis: Lua parser and pretty-printer Homepage: http://github.com/glguy/language-lua Bug-reports: http://github.com/glguy/language-lua/issues@@ -48,7 +48,7 @@ Language.Lua.LexerUtils, Language.Lua.Utils - Build-depends: base >= 4.5 && < 4.12,+ Build-depends: base >= 4.5 && < 4.14, deepseq, array >= 0.4 && < 0.6, bytestring >= 0.10 && < 0.11,@@ -64,7 +64,7 @@ Default-language: Haskell2010 Hs-source-dirs: tests Main-is: Main.hs- Build-depends: base >= 4.5 && < 4.12,+ Build-depends: base >= 4.5 && < 4.14, deepseq, directory, filepath,
src/Language/Lua/LexerUtils.hs view
@@ -41,7 +41,7 @@ -- the closing character for a string. unterminatedString :: Action Mode [Lexeme Token] unterminatedString =- do StringMode _strTy _errs inp0 <- getLexerState+ do ~(StringMode _strTy _errs inp0) <- getLexerState setLexerState NormalMode longToken inp0 TokUntermString @@ -57,7 +57,7 @@ invalidEsc = do inp1 <- startInput inp2 <- endInput- StringMode m errs inp0 <- getLexerState+ ~(StringMode m errs inp0) <- getLexerState let err = SourceRange { sourceFrom = inputPos inp1 , sourceTo = inputPrev inp2