diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ cabal test ParseSyntaxFiles: ParseSyntaxFiles.hs - cabal install HXT + cabal install HXT regex-posix ghc --make -Wall ParseSyntaxFiles.hs # requires HXT >= 9.0.0 clean: diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ - Haskell - Haxe - Html +- Idris - Ini - Isocpp - Java diff --git a/Text/Highlighting/Kate/Syntax.hs b/Text/Highlighting/Kate/Syntax.hs --- a/Text/Highlighting/Kate/Syntax.hs +++ b/Text/Highlighting/Kate/Syntax.hs @@ -60,6 +60,7 @@ import qualified Text.Highlighting.Kate.Syntax.Haskell as Haskell import qualified Text.Highlighting.Kate.Syntax.Haxe as Haxe import qualified Text.Highlighting.Kate.Syntax.Html as Html +import qualified Text.Highlighting.Kate.Syntax.Idris as Idris import qualified Text.Highlighting.Kate.Syntax.Ini as Ini import qualified Text.Highlighting.Kate.Syntax.Isocpp as Isocpp import qualified Text.Highlighting.Kate.Syntax.Java as Java @@ -134,11 +135,11 @@ -- | List of supported languages. languages :: [String] -languages = ["Abc","Actionscript","Ada","Agda","Alert","Alert_indent","Apache","Asn1","Asp","Awk","Bash","Bibtex","Boo","C","Changelog","Clojure","Cmake","Coffee","Coldfusion","Commonlisp","Cpp","Cs","Css","Curry","D","Diff","Djangotemplate","Dockerfile","Dot","Doxygen","Doxygenlua","Dtd","Eiffel","Email","Erlang","Fasm","Fortran","Fsharp","Gcc","Glsl","Gnuassembler","Go","Haskell","Haxe","Html","Ini","Isocpp","Java","Javadoc","Javascript","Json","Jsp","Julia","Latex","Lex","Lilypond","LiterateCurry","LiterateHaskell","Lua","M4","Makefile","Mandoc","Markdown","Mathematica","Matlab","Maxima","Mediawiki","Metafont","Mips","Modelines","Modula2","Modula3","Monobasic","Nasm","Noweb","Objectivec","Objectivecpp","Ocaml","Octave","Opencl","Pascal","Perl","Php","Pike","Postscript","Prolog","Pure","Python","R","Relaxng","Relaxngcompact","Rest","Rhtml","Roff","Ruby","Rust","Scala","Scheme","Sci","Sed","Sgml","Sql","SqlMysql","SqlPostgresql","Tcl","Tcsh","Texinfo","Verilog","Vhdl","Xml","Xorg","Xslt","Xul","Yacc","Yaml","Zsh"] +languages = ["Abc","Actionscript","Ada","Agda","Alert","Alert_indent","Apache","Asn1","Asp","Awk","Bash","Bibtex","Boo","C","Changelog","Clojure","Cmake","Coffee","Coldfusion","Commonlisp","Cpp","Cs","Css","Curry","D","Diff","Djangotemplate","Dockerfile","Dot","Doxygen","Doxygenlua","Dtd","Eiffel","Email","Erlang","Fasm","Fortran","Fsharp","Gcc","Glsl","Gnuassembler","Go","Haskell","Haxe","Html","Idris","Ini","Isocpp","Java","Javadoc","Javascript","Json","Jsp","Julia","Latex","Lex","Lilypond","LiterateCurry","LiterateHaskell","Lua","M4","Makefile","Mandoc","Markdown","Mathematica","Matlab","Maxima","Mediawiki","Metafont","Mips","Modelines","Modula2","Modula3","Monobasic","Nasm","Noweb","Objectivec","Objectivecpp","Ocaml","Octave","Opencl","Pascal","Perl","Php","Pike","Postscript","Prolog","Pure","Python","R","Relaxng","Relaxngcompact","Rest","Rhtml","Roff","Ruby","Rust","Scala","Scheme","Sci","Sed","Sgml","Sql","SqlMysql","SqlPostgresql","Tcl","Tcsh","Texinfo","Verilog","Vhdl","Xml","Xorg","Xslt","Xul","Yacc","Yaml","Zsh"] -- | List of language extensions. languageExtensions :: [(String, String)] -languageExtensions = [("Abc", Abc.syntaxExtensions), ("Actionscript", Actionscript.syntaxExtensions), ("Ada", Ada.syntaxExtensions), ("Agda", Agda.syntaxExtensions), ("Alert", Alert.syntaxExtensions), ("Alert_indent", Alert_indent.syntaxExtensions), ("Apache", Apache.syntaxExtensions), ("Asn1", Asn1.syntaxExtensions), ("Asp", Asp.syntaxExtensions), ("Awk", Awk.syntaxExtensions), ("Bash", Bash.syntaxExtensions), ("Bibtex", Bibtex.syntaxExtensions), ("Boo", Boo.syntaxExtensions), ("C", C.syntaxExtensions), ("Changelog", Changelog.syntaxExtensions), ("Clojure", Clojure.syntaxExtensions), ("Cmake", Cmake.syntaxExtensions), ("Coffee", Coffee.syntaxExtensions), ("Coldfusion", Coldfusion.syntaxExtensions), ("Commonlisp", Commonlisp.syntaxExtensions), ("Cpp", Cpp.syntaxExtensions), ("Cs", Cs.syntaxExtensions), ("Css", Css.syntaxExtensions), ("Curry", Curry.syntaxExtensions), ("D", D.syntaxExtensions), ("Diff", Diff.syntaxExtensions), ("Djangotemplate", Djangotemplate.syntaxExtensions), ("Dockerfile", Dockerfile.syntaxExtensions), ("Dot", Dot.syntaxExtensions), ("Doxygen", Doxygen.syntaxExtensions), ("Doxygenlua", Doxygenlua.syntaxExtensions), ("Dtd", Dtd.syntaxExtensions), ("Eiffel", Eiffel.syntaxExtensions), ("Email", Email.syntaxExtensions), ("Erlang", Erlang.syntaxExtensions), ("Fasm", Fasm.syntaxExtensions), ("Fortran", Fortran.syntaxExtensions), ("Fsharp", Fsharp.syntaxExtensions), ("Gcc", Gcc.syntaxExtensions), ("Glsl", Glsl.syntaxExtensions), ("Gnuassembler", Gnuassembler.syntaxExtensions), ("Go", Go.syntaxExtensions), ("Haskell", Haskell.syntaxExtensions), ("Haxe", Haxe.syntaxExtensions), ("Html", Html.syntaxExtensions), ("Ini", Ini.syntaxExtensions), ("Isocpp", Isocpp.syntaxExtensions), ("Java", Java.syntaxExtensions), ("Javadoc", Javadoc.syntaxExtensions), ("Javascript", Javascript.syntaxExtensions), ("Json", Json.syntaxExtensions), ("Jsp", Jsp.syntaxExtensions), ("Julia", Julia.syntaxExtensions), ("Latex", Latex.syntaxExtensions), ("Lex", Lex.syntaxExtensions), ("Lilypond", Lilypond.syntaxExtensions), ("LiterateCurry", LiterateCurry.syntaxExtensions), ("LiterateHaskell", LiterateHaskell.syntaxExtensions), ("Lua", Lua.syntaxExtensions), ("M4", M4.syntaxExtensions), ("Makefile", Makefile.syntaxExtensions), ("Mandoc", Mandoc.syntaxExtensions), ("Markdown", Markdown.syntaxExtensions), ("Mathematica", Mathematica.syntaxExtensions), ("Matlab", Matlab.syntaxExtensions), ("Maxima", Maxima.syntaxExtensions), ("Mediawiki", Mediawiki.syntaxExtensions), ("Metafont", Metafont.syntaxExtensions), ("Mips", Mips.syntaxExtensions), ("Modelines", Modelines.syntaxExtensions), ("Modula2", Modula2.syntaxExtensions), ("Modula3", Modula3.syntaxExtensions), ("Monobasic", Monobasic.syntaxExtensions), ("Nasm", Nasm.syntaxExtensions), ("Noweb", Noweb.syntaxExtensions), ("Objectivec", Objectivec.syntaxExtensions), ("Objectivecpp", Objectivecpp.syntaxExtensions), ("Ocaml", Ocaml.syntaxExtensions), ("Octave", Octave.syntaxExtensions), ("Opencl", Opencl.syntaxExtensions), ("Pascal", Pascal.syntaxExtensions), ("Perl", Perl.syntaxExtensions), ("Php", Php.syntaxExtensions), ("Pike", Pike.syntaxExtensions), ("Postscript", Postscript.syntaxExtensions), ("Prolog", Prolog.syntaxExtensions), ("Pure", Pure.syntaxExtensions), ("Python", Python.syntaxExtensions), ("R", R.syntaxExtensions), ("Relaxng", Relaxng.syntaxExtensions), ("Relaxngcompact", Relaxngcompact.syntaxExtensions), ("Rest", Rest.syntaxExtensions), ("Rhtml", Rhtml.syntaxExtensions), ("Roff", Roff.syntaxExtensions), ("Ruby", Ruby.syntaxExtensions), ("Rust", Rust.syntaxExtensions), ("Scala", Scala.syntaxExtensions), ("Scheme", Scheme.syntaxExtensions), ("Sci", Sci.syntaxExtensions), ("Sed", Sed.syntaxExtensions), ("Sgml", Sgml.syntaxExtensions), ("Sql", Sql.syntaxExtensions), ("SqlMysql", SqlMysql.syntaxExtensions), ("SqlPostgresql", SqlPostgresql.syntaxExtensions), ("Tcl", Tcl.syntaxExtensions), ("Tcsh", Tcsh.syntaxExtensions), ("Texinfo", Texinfo.syntaxExtensions), ("Verilog", Verilog.syntaxExtensions), ("Vhdl", Vhdl.syntaxExtensions), ("Xml", Xml.syntaxExtensions), ("Xorg", Xorg.syntaxExtensions), ("Xslt", Xslt.syntaxExtensions), ("Xul", Xul.syntaxExtensions), ("Yacc", Yacc.syntaxExtensions), ("Yaml", Yaml.syntaxExtensions), ("Zsh", Zsh.syntaxExtensions)] +languageExtensions = [("Abc", Abc.syntaxExtensions), ("Actionscript", Actionscript.syntaxExtensions), ("Ada", Ada.syntaxExtensions), ("Agda", Agda.syntaxExtensions), ("Alert", Alert.syntaxExtensions), ("Alert_indent", Alert_indent.syntaxExtensions), ("Apache", Apache.syntaxExtensions), ("Asn1", Asn1.syntaxExtensions), ("Asp", Asp.syntaxExtensions), ("Awk", Awk.syntaxExtensions), ("Bash", Bash.syntaxExtensions), ("Bibtex", Bibtex.syntaxExtensions), ("Boo", Boo.syntaxExtensions), ("C", C.syntaxExtensions), ("Changelog", Changelog.syntaxExtensions), ("Clojure", Clojure.syntaxExtensions), ("Cmake", Cmake.syntaxExtensions), ("Coffee", Coffee.syntaxExtensions), ("Coldfusion", Coldfusion.syntaxExtensions), ("Commonlisp", Commonlisp.syntaxExtensions), ("Cpp", Cpp.syntaxExtensions), ("Cs", Cs.syntaxExtensions), ("Css", Css.syntaxExtensions), ("Curry", Curry.syntaxExtensions), ("D", D.syntaxExtensions), ("Diff", Diff.syntaxExtensions), ("Djangotemplate", Djangotemplate.syntaxExtensions), ("Dockerfile", Dockerfile.syntaxExtensions), ("Dot", Dot.syntaxExtensions), ("Doxygen", Doxygen.syntaxExtensions), ("Doxygenlua", Doxygenlua.syntaxExtensions), ("Dtd", Dtd.syntaxExtensions), ("Eiffel", Eiffel.syntaxExtensions), ("Email", Email.syntaxExtensions), ("Erlang", Erlang.syntaxExtensions), ("Fasm", Fasm.syntaxExtensions), ("Fortran", Fortran.syntaxExtensions), ("Fsharp", Fsharp.syntaxExtensions), ("Gcc", Gcc.syntaxExtensions), ("Glsl", Glsl.syntaxExtensions), ("Gnuassembler", Gnuassembler.syntaxExtensions), ("Go", Go.syntaxExtensions), ("Haskell", Haskell.syntaxExtensions), ("Haxe", Haxe.syntaxExtensions), ("Html", Html.syntaxExtensions), ("Idris", Idris.syntaxExtensions), ("Ini", Ini.syntaxExtensions), ("Isocpp", Isocpp.syntaxExtensions), ("Java", Java.syntaxExtensions), ("Javadoc", Javadoc.syntaxExtensions), ("Javascript", Javascript.syntaxExtensions), ("Json", Json.syntaxExtensions), ("Jsp", Jsp.syntaxExtensions), ("Julia", Julia.syntaxExtensions), ("Latex", Latex.syntaxExtensions), ("Lex", Lex.syntaxExtensions), ("Lilypond", Lilypond.syntaxExtensions), ("LiterateCurry", LiterateCurry.syntaxExtensions), ("LiterateHaskell", LiterateHaskell.syntaxExtensions), ("Lua", Lua.syntaxExtensions), ("M4", M4.syntaxExtensions), ("Makefile", Makefile.syntaxExtensions), ("Mandoc", Mandoc.syntaxExtensions), ("Markdown", Markdown.syntaxExtensions), ("Mathematica", Mathematica.syntaxExtensions), ("Matlab", Matlab.syntaxExtensions), ("Maxima", Maxima.syntaxExtensions), ("Mediawiki", Mediawiki.syntaxExtensions), ("Metafont", Metafont.syntaxExtensions), ("Mips", Mips.syntaxExtensions), ("Modelines", Modelines.syntaxExtensions), ("Modula2", Modula2.syntaxExtensions), ("Modula3", Modula3.syntaxExtensions), ("Monobasic", Monobasic.syntaxExtensions), ("Nasm", Nasm.syntaxExtensions), ("Noweb", Noweb.syntaxExtensions), ("Objectivec", Objectivec.syntaxExtensions), ("Objectivecpp", Objectivecpp.syntaxExtensions), ("Ocaml", Ocaml.syntaxExtensions), ("Octave", Octave.syntaxExtensions), ("Opencl", Opencl.syntaxExtensions), ("Pascal", Pascal.syntaxExtensions), ("Perl", Perl.syntaxExtensions), ("Php", Php.syntaxExtensions), ("Pike", Pike.syntaxExtensions), ("Postscript", Postscript.syntaxExtensions), ("Prolog", Prolog.syntaxExtensions), ("Pure", Pure.syntaxExtensions), ("Python", Python.syntaxExtensions), ("R", R.syntaxExtensions), ("Relaxng", Relaxng.syntaxExtensions), ("Relaxngcompact", Relaxngcompact.syntaxExtensions), ("Rest", Rest.syntaxExtensions), ("Rhtml", Rhtml.syntaxExtensions), ("Roff", Roff.syntaxExtensions), ("Ruby", Ruby.syntaxExtensions), ("Rust", Rust.syntaxExtensions), ("Scala", Scala.syntaxExtensions), ("Scheme", Scheme.syntaxExtensions), ("Sci", Sci.syntaxExtensions), ("Sed", Sed.syntaxExtensions), ("Sgml", Sgml.syntaxExtensions), ("Sql", Sql.syntaxExtensions), ("SqlMysql", SqlMysql.syntaxExtensions), ("SqlPostgresql", SqlPostgresql.syntaxExtensions), ("Tcl", Tcl.syntaxExtensions), ("Tcsh", Tcsh.syntaxExtensions), ("Texinfo", Texinfo.syntaxExtensions), ("Verilog", Verilog.syntaxExtensions), ("Vhdl", Vhdl.syntaxExtensions), ("Xml", Xml.syntaxExtensions), ("Xorg", Xorg.syntaxExtensions), ("Xslt", Xslt.syntaxExtensions), ("Xul", Xul.syntaxExtensions), ("Yacc", Yacc.syntaxExtensions), ("Yaml", Yaml.syntaxExtensions), ("Zsh", Zsh.syntaxExtensions)] -- | Returns a list of languages appropriate for the given file extension. languagesByExtension :: String -> [String] @@ -154,7 +155,7 @@ -- extension (if unique). -- The parsers read the input lazily and parse line by line; -- results are returned immediately. --- Supported languages: @abc@, @actionscript@, @ada@, @agda@, @alert@, @alert_indent@, @apache@, @asn1@, @asp@, @awk@, @bash@, @bibtex@, @boo@, @c@, @changelog@, @clojure@, @cmake@, @coffee@, @coldfusion@, @commonlisp@, @cpp@, @cs@, @css@, @curry@, @d@, @diff@, @djangotemplate@, @dockerfile@, @dot@, @doxygen@, @doxygenlua@, @dtd@, @eiffel@, @email@, @erlang@, @fasm@, @fortran@, @fsharp@, @gcc@, @glsl@, @gnuassembler@, @go@, @haskell@, @haxe@, @html@, @ini@, @isocpp@, @java@, @javadoc@, @javascript@, @json@, @jsp@, @julia@, @latex@, @lex@, @lilypond@, @literatecurry@, @literatehaskell@, @lua@, @m4@, @makefile@, @mandoc@, @markdown@, @mathematica@, @matlab@, @maxima@, @mediawiki@, @metafont@, @mips@, @modelines@, @modula2@, @modula3@, @monobasic@, @nasm@, @noweb@, @objectivec@, @objectivecpp@, @ocaml@, @octave@, @opencl@, @pascal@, @perl@, @php@, @pike@, @postscript@, @prolog@, @pure@, @python@, @r@, @relaxng@, @relaxngcompact@, @rest@, @rhtml@, @roff@, @ruby@, @rust@, @scala@, @scheme@, @sci@, @sed@, @sgml@, @sql@, @sqlmysql@, @sqlpostgresql@, @tcl@, @tcsh@, @texinfo@, @verilog@, @vhdl@, @xml@, @xorg@, @xslt@, @xul@, @yacc@, @yaml@, @zsh@. +-- Supported languages: @abc@, @actionscript@, @ada@, @agda@, @alert@, @alert_indent@, @apache@, @asn1@, @asp@, @awk@, @bash@, @bibtex@, @boo@, @c@, @changelog@, @clojure@, @cmake@, @coffee@, @coldfusion@, @commonlisp@, @cpp@, @cs@, @css@, @curry@, @d@, @diff@, @djangotemplate@, @dockerfile@, @dot@, @doxygen@, @doxygenlua@, @dtd@, @eiffel@, @email@, @erlang@, @fasm@, @fortran@, @fsharp@, @gcc@, @glsl@, @gnuassembler@, @go@, @haskell@, @haxe@, @html@, @idris@, @ini@, @isocpp@, @java@, @javadoc@, @javascript@, @json@, @jsp@, @julia@, @latex@, @lex@, @lilypond@, @literatecurry@, @literatehaskell@, @lua@, @m4@, @makefile@, @mandoc@, @markdown@, @mathematica@, @matlab@, @maxima@, @mediawiki@, @metafont@, @mips@, @modelines@, @modula2@, @modula3@, @monobasic@, @nasm@, @noweb@, @objectivec@, @objectivecpp@, @ocaml@, @octave@, @opencl@, @pascal@, @perl@, @php@, @pike@, @postscript@, @prolog@, @pure@, @python@, @r@, @relaxng@, @relaxngcompact@, @rest@, @rhtml@, @roff@, @ruby@, @rust@, @scala@, @scheme@, @sci@, @sed@, @sgml@, @sql@, @sqlmysql@, @sqlpostgresql@, @tcl@, @tcsh@, @texinfo@, @verilog@, @vhdl@, @xml@, @xorg@, @xslt@, @xul@, @yacc@, @yaml@, @zsh@. highlightAs :: String -- ^ Language syntax (e.g. "haskell") or extension (e.g. "hs"). -> String -- ^ Source code to highlight -> [SourceLine] -- ^ List of highlighted source lines @@ -211,6 +212,7 @@ "haskell" -> Haskell.highlight "haxe" -> Haxe.highlight "html" -> Html.highlight + "idris" -> Idris.highlight "ini" -> Ini.highlight "isocpp" -> Isocpp.highlight "java" -> Java.highlight diff --git a/Text/Highlighting/Kate/Syntax/Idris.hs b/Text/Highlighting/Kate/Syntax/Idris.hs new file mode 100644 --- /dev/null +++ b/Text/Highlighting/Kate/Syntax/Idris.hs @@ -0,0 +1,172 @@ +{- This module was generated from data in the Kate syntax + highlighting file idris.xml, version 1.0, by Alexander Shabalin -} + +module Text.Highlighting.Kate.Syntax.Idris + (highlight, parseExpression, syntaxName, syntaxExtensions) +where +import Text.Highlighting.Kate.Types +import Text.Highlighting.Kate.Common +import Text.ParserCombinators.Parsec hiding (State) +import Control.Monad.State +import Data.Char (isSpace) +import qualified Data.Set as Set + +-- | Full name of language. +syntaxName :: String +syntaxName = "Idris" + +-- | Filename extensions for this language. +syntaxExtensions :: String +syntaxExtensions = "*.idr" + +-- | Highlight source code using this syntax definition. +highlight :: String -> [SourceLine] +highlight input = evalState (mapM parseSourceLine $ lines input) startingState + +parseSourceLine :: String -> State SyntaxState SourceLine +parseSourceLine = mkParseSourceLine (parseExpression Nothing) + +-- | Parse an expression using appropriate local context. +parseExpression :: Maybe (String,String) + -> KateParser Token +parseExpression mbcontext = do + (lang,cont) <- maybe currentContext return mbcontext + result <- parseRules (lang,cont) + optional $ do eof + updateState $ \st -> st{ synStPrevChar = '\n' } + pEndLine + return result + +startingState = SyntaxState {synStContexts = [("Idris","code")], synStLineNumber = 0, synStPrevChar = '\n', synStPrevNonspace = False, synStContinuation = False, synStCaseSensitive = True, synStKeywordCaseSensitive = True, synStCaptures = []} + +pEndLine = do + updateState $ \st -> st{ synStPrevNonspace = False } + context <- currentContext + contexts <- synStContexts `fmap` getState + st <- getState + if length contexts >= 2 + then case context of + _ | synStContinuation st -> updateState $ \st -> st{ synStContinuation = False } + ("Idris","code") -> return () + ("Idris","declaration") -> (popContext) >> pEndLine + ("Idris","directive") -> (popContext) >> pEndLine + ("Idris","char") -> (popContext) >> pEndLine + ("Idris","string") -> return () + ("Idris","line comment") -> (popContext) >> pEndLine + ("Idris","block comment") -> return () + _ -> return () + else return () + +withAttribute attr txt = do + when (null txt) $ fail "Parser matched no text" + updateState $ \st -> st { synStPrevChar = last txt + , synStPrevNonspace = synStPrevNonspace st || not (all isSpace txt) } + return (attr, txt) + +list_keywords = Set.fromList $ words $ "abstract auto case class codata covering data default do dsl else if implicit import impossible in index_first index_next infix infixl infixr instance lambda let module mututal namespace of parameters partial pattern postulate prefix private proof public record rewrite static syntax tactics term then total using variable where with" +list_directives = Set.fromList $ words $ "access assert_total default dynamic elim error_handlers error_reverse flag hide include language lib link name provide reflection" +list_tactics = Set.fromList $ words $ "applyTactic attack compute exact fill focus induction intro intros let refine reflect rewrite solve trivial try" + +regex_'2d'2d'2d'2a'5b'5e'21'23'5c'24'25'26'5c'2a'5c'2b'2f'3c'3d'3e'5c'3f'5c'40'5c'5e'5c'7c'7e'5c'2e'3a'5d'3f = compileRegex True "---*[^!#\\$%&\\*\\+/<=>\\?\\@\\^\\|~\\.:]?" +regex_'5c'7c'5c'7c'5c'7c'5b'5e'5c'2d'21'23'5c'24'25'26'5c'2a'5c'2b'2f'3c'3d'3e'5c'3f'5c'40'5c'5e'5c'7c'7e'5c'2e'3a'5d'3f = compileRegex True "\\|\\|\\|[^\\-!#\\$%&\\*\\+/<=>\\?\\@\\^\\|~\\.:]?" +regex_'5cs'2a'28'5ba'2dz'5d'2b'5cs'2b'29'2a'28'5bA'2dZa'2dz'5d'5bA'2dZa'2dz0'2d9'5f'5d'2a'27'2a'7c'5c'28'5b'5c'2d'21'23'5c'24'25'26'5c'2a'5c'2b'5c'2e'2f'3c'3d'3e'5c'3f'40'5c'5c'5e'5c'7c'7e'3a'5d'2b'5c'29'29'5cs'2a'3a = compileRegex True "\\s*([a-z]+\\s+)*([A-Za-z][A-Za-z0-9_]*'*|\\([\\-!#\\$%&\\*\\+\\./<=>\\?@\\\\^\\|~:]+\\))\\s*:" +regex_0'5bXx'5d'5b0'2d9A'2dFa'2df'5d'2b = compileRegex True "0[Xx][0-9A-Fa-f]+" +regex_'5cd'2b'5c'2e'5cd'2b'28'5beE'5d'5b'2d'2b'5d'3f'5cd'2b'29'3f = compileRegex True "\\d+\\.\\d+([eE][-+]?\\d+)?" +regex_'28'5bA'2dZ'5d'5ba'2dzA'2dZ0'2d9'5f'5d'2a'27'2a'7c'5f'5c'7c'5f'29 = compileRegex True "([A-Z][a-zA-Z0-9_]*'*|_\\|_)" +regex_'5ba'2dz'5d'5ba'2dzA'2dZ0'2d9'5f'5d'2a'27'2a = compileRegex True "[a-z][a-zA-Z0-9_]*'*" +regex_'5c'3f'5ba'2dz'5d'5bA'2dZa'2dz0'2d9'5f'5d'2b'27'2a = compileRegex True "\\?[a-z][A-Za-z0-9_]+'*" +regex_'28'3a'7c'3d'3e'7c'5c'2d'3e'7c'3c'5c'2d'29 = compileRegex True "(:|=>|\\->|<\\-)" +regex_'28'5b'5c'2d'21'23'5c'24'25'26'5c'2a'5c'2b'5c'2e'2f'3c'3d'3e'5c'3f'40'5c'5c'5e'5c'7c'7e'3a'5d'2b'7c'5cb'5f'5cb'29 = compileRegex True "([\\-!#\\$%&\\*\\+\\./<=>\\?@\\\\^\\|~:]+|\\b_\\b)" +regex_'60'5bA'2dZa'2dz'5d'5bA'2dZa'2dz0'2d9'5f'5d'2a'27'2a'60 = compileRegex True "`[A-Za-z][A-Za-z0-9_]*'*`" +regex_'5ba'2dz'5d'5bA'2dZa'2dz0'2d9'5f'5d'2a'27'2a = compileRegex True "[a-z][A-Za-z0-9_]*'*" +regex_'5c'28'5b'5c'2d'21'23'5c'24'25'26'5c'2a'5c'2b'5c'2e'2f'3c'3d'3e'5c'3f'40'5c'5c'5e'5c'7c'7e'3a'5d'2b'5c'29 = compileRegex True "\\([\\-!#\\$%&\\*\\+\\./<=>\\?@\\\\^\\|~:]+\\)" +regex_'5c'5c'2e = compileRegex True "\\\\." +regex_'22 = compileRegex True "\"" + +parseRules ("Idris","code") = + (((pRegExpr regex_'2d'2d'2d'2a'5b'5e'21'23'5c'24'25'26'5c'2a'5c'2b'2f'3c'3d'3e'5c'3f'5c'40'5c'5e'5c'7c'7e'5c'2e'3a'5d'3f >>= withAttribute CommentTok) >>~ pushContext ("Idris","line comment")) + <|> + ((pRegExpr regex_'5c'7c'5c'7c'5c'7c'5b'5e'5c'2d'21'23'5c'24'25'26'5c'2a'5c'2b'2f'3c'3d'3e'5c'3f'5c'40'5c'5e'5c'7c'7e'5c'2e'3a'5d'3f >>= withAttribute CommentTok) >>~ pushContext ("Idris","line comment")) + <|> + ((pDetect2Chars False '{' '-' >>= withAttribute CommentTok) >>~ pushContext ("Idris","block comment")) + <|> + ((pColumn 0 >> lookAhead (pRegExpr regex_'5cs'2a'28'5ba'2dz'5d'2b'5cs'2b'29'2a'28'5bA'2dZa'2dz'5d'5bA'2dZa'2dz0'2d9'5f'5d'2a'27'2a'7c'5c'28'5b'5c'2d'21'23'5c'24'25'26'5c'2a'5c'2b'5c'2e'2f'3c'3d'3e'5c'3f'40'5c'5c'5e'5c'7c'7e'3a'5d'2b'5c'29'29'5cs'2a'3a) >> pushContext ("Idris","declaration") >> currentContext >>= parseRules)) + <|> + ((pKeyword " \n\t.():!+,-<=>%&*/;?[]^{|}~\\" list_keywords >>= withAttribute KeywordTok)) + <|> + ((pDetectChar False '%' >>= withAttribute KeywordTok) >>~ pushContext ("Idris","directive")) + <|> + ((pKeyword " \n\t.():!+,-<=>%&*/;?[]^{|}~\\" list_tactics >>= withAttribute KeywordTok)) + <|> + ((pDetectChar False '\'' >>= withAttribute CharTok) >>~ pushContext ("Idris","char")) + <|> + ((pDetectChar False '"' >>= withAttribute StringTok) >>~ pushContext ("Idris","string")) + <|> + ((pInt >>= withAttribute DecValTok)) + <|> + ((pRegExpr regex_0'5bXx'5d'5b0'2d9A'2dFa'2df'5d'2b >>= withAttribute BaseNTok)) + <|> + ((pRegExpr regex_0'5bXx'5d'5b0'2d9A'2dFa'2df'5d'2b >>= withAttribute BaseNTok)) + <|> + ((pRegExpr regex_'5cd'2b'5c'2e'5cd'2b'28'5beE'5d'5b'2d'2b'5d'3f'5cd'2b'29'3f >>= withAttribute FloatTok)) + <|> + ((pRegExpr regex_'28'5bA'2dZ'5d'5ba'2dzA'2dZ0'2d9'5f'5d'2a'27'2a'7c'5f'5c'7c'5f'29 >>= withAttribute DataTypeTok)) + <|> + ((pRegExpr regex_'5ba'2dz'5d'5ba'2dzA'2dZ0'2d9'5f'5d'2a'27'2a >>= withAttribute NormalTok)) + <|> + ((pRegExpr regex_'5c'3f'5ba'2dz'5d'5bA'2dZa'2dz0'2d9'5f'5d'2b'27'2a >>= withAttribute OtherTok)) + <|> + ((pRegExpr regex_'28'3a'7c'3d'3e'7c'5c'2d'3e'7c'3c'5c'2d'29 >>= withAttribute OtherTok)) + <|> + ((pRegExpr regex_'28'5b'5c'2d'21'23'5c'24'25'26'5c'2a'5c'2b'5c'2e'2f'3c'3d'3e'5c'3f'40'5c'5c'5e'5c'7c'7e'3a'5d'2b'7c'5cb'5f'5cb'29 >>= withAttribute FunctionTok)) + <|> + ((pRegExpr regex_'60'5bA'2dZa'2dz'5d'5bA'2dZa'2dz0'2d9'5f'5d'2a'27'2a'60 >>= withAttribute FunctionTok)) + <|> + (currentContext >>= \x -> guard (x == ("Idris","code")) >> pDefault >>= withAttribute NormalTok)) + +parseRules ("Idris","declaration") = + (((pKeyword " \n\t.():!+,-<=>%&*/;?[]^{|}~\\" list_keywords >>= withAttribute KeywordTok)) + <|> + ((pRegExpr regex_'28'5bA'2dZ'5d'5ba'2dzA'2dZ0'2d9'5f'5d'2a'27'2a'7c'5f'5c'7c'5f'29 >>= withAttribute DataTypeTok)) + <|> + ((pRegExpr regex_'5ba'2dz'5d'5bA'2dZa'2dz0'2d9'5f'5d'2a'27'2a >>= withAttribute FunctionTok)) + <|> + ((pRegExpr regex_'5c'28'5b'5c'2d'21'23'5c'24'25'26'5c'2a'5c'2b'5c'2e'2f'3c'3d'3e'5c'3f'40'5c'5c'5e'5c'7c'7e'3a'5d'2b'5c'29 >>= withAttribute FunctionTok)) + <|> + ((pDetectChar False ':' >>= withAttribute OtherTok) >>~ (popContext)) + <|> + (currentContext >>= \x -> guard (x == ("Idris","declaration")) >> pDefault >>= withAttribute NormalTok)) + +parseRules ("Idris","directive") = + (((pKeyword " \n\t.():!+,-<=>%&*/;?[]^{|}~\\" list_keywords >>= withAttribute KeywordTok)) + <|> + ((pKeyword " \n\t.():!+,-<=>%&*/;?[]^{|}~\\" list_directives >>= withAttribute KeywordTok)) + <|> + (currentContext >>= \x -> guard (x == ("Idris","directive")) >> pDefault >>= withAttribute NormalTok)) + +parseRules ("Idris","char") = + (((pRegExpr regex_'5c'5c'2e >>= withAttribute CharTok)) + <|> + ((pDetectChar False '\'' >>= withAttribute CharTok) >>~ (popContext)) + <|> + (currentContext >>= \x -> guard (x == ("Idris","char")) >> pDefault >>= withAttribute CharTok)) + +parseRules ("Idris","string") = + (((pRegExpr regex_'5c'5c'2e >>= withAttribute StringTok)) + <|> + ((pRegExpr regex_'22 >>= withAttribute StringTok) >>~ (popContext)) + <|> + (currentContext >>= \x -> guard (x == ("Idris","string")) >> pDefault >>= withAttribute StringTok)) + +parseRules ("Idris","line comment") = + (currentContext >>= \x -> guard (x == ("Idris","line comment")) >> pDefault >>= withAttribute CommentTok) + +parseRules ("Idris","block comment") = + (((pDetect2Chars False '-' '}' >>= withAttribute CommentTok) >>~ (popContext)) + <|> + ((pDetect2Chars False '{' '-' >>= withAttribute CommentTok) >>~ pushContext ("Idris","block comment")) + <|> + (currentContext >>= \x -> guard (x == ("Idris","block comment")) >> pDefault >>= withAttribute CommentTok)) + + +parseRules x = parseRules ("Idris","code") <|> fail ("Unknown context" ++ show x) diff --git a/Text/Highlighting/Kate/Syntax/Isocpp.hs b/Text/Highlighting/Kate/Syntax/Isocpp.hs --- a/Text/Highlighting/Kate/Syntax/Isocpp.hs +++ b/Text/Highlighting/Kate/Syntax/Isocpp.hs @@ -101,7 +101,7 @@ regex_operator'5cs'2a'22'22_'5b'5f0'2d9A'2dZa'2dz'5d'2a'5cb = compileRegex True "operator\\s*\"\" [_0-9A-Za-z]*\\b" regex_'5b'5c'2b'5c'2d'5d'3f0x'5b0'2d9A'2dFa'2df'5d'28'27'3f'5b0'2d9A'2dFa'2df'5d'2b'29'2a'28'5bUu'5d'5bLl'5d'7b0'2c2'7d'7c'5bLl'5d'7b0'2c2'7d'5bUu'5d'3f'7c'5f'5b'5f0'2d9A'2dZa'2dz'5d'2a'29'3f'5cb = compileRegex True "[\\+\\-]?0x[0-9A-Fa-f]('?[0-9A-Fa-f]+)*([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\\b" regex_0'5bBb'5d'5b01'5d'28'27'3f'5b01'5d'2b'29'2a'28'5bUu'5d'5bLl'5d'7b0'2c2'7d'7c'5bLl'5d'7b0'2c2'7d'5bUu'5d'3f'7c'5f'5b'5f0'2d9A'2dZa'2dz'5d'2a'29'3f'5cb = compileRegex True "0[Bb][01]('?[01]+)*([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\\b" -regex_'5b'5c'2b'5c'2d'5d'3f'28'5b0'2d9'5d'2b'5bEe'5d'5b'5c'2b'5c'2d'5d'3f'5b0'2d9'5d'2b'7c'28'5b0'2d9'5d'2b'5c'2e'7c'5c'2e'5b0'2d9'5d'2b'7c'5b0'2d9'5d'2b'5c'2e'5b0'2d9'5d'2b'29'28'5bEe'5d'5b'5c'2b'5c'2d'5d'3f'5b0'2d9'5d'2b'29'3f'29'5bFfLl'5d'3f = compileRegex True "[\\+\\-]?([0-9]+[Ee][\\+\\-]?[0-9]+|([0-9]+\\.|\\.[0-9]+|[0-9]+\\.[0-9]+)([Ee][\\+\\-]?[0-9]+)?)[FfLl]?" +regex_'5b'5c'2b'5c'2d'5d'3f'28'5b0'2d9'5d'2b'5bEe'5d'5b'5c'2b'5c'2d'5d'3f'5b0'2d9'5d'2b'7c'28'5b0'2d9'5d'2a'5c'2e'5b0'2d9'5d'2b'7c'5b0'2d9'5d'2b'5c'2e'5b0'2d9'5d'2a'29'28'5bEe'5d'5b'5c'2b'5c'2d'5d'3f'5b0'2d9'5d'2b'29'3f'29'5bFfLl'5d'3f = compileRegex True "[\\+\\-]?([0-9]+[Ee][\\+\\-]?[0-9]+|([0-9]*\\.[0-9]+|[0-9]+\\.[0-9]*)([Ee][\\+\\-]?[0-9]+)?)[FfLl]?" regex_'5b'5c'2b'5c'2d'5d'3f0'27'3f'5b0'2d7'5d'28'27'3f'5b0'2d7'5d'2b'29'2a'28'5bUu'5d'5bLl'5d'7b0'2c2'7d'7c'5bLl'5d'7b0'2c2'7d'5bUu'5d'3f'7c'5f'5b'5f0'2d9A'2dZa'2dz'5d'2a'29'3f'5cb = compileRegex True "[\\+\\-]?0'?[0-7]('?[0-7]+)*([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\\b" regex_'5b'5c'2b'5c'2d'5d'3f'280'7c'5b1'2d9'5d'28'27'3f'5b0'2d9'5d'2b'29'2a'29'28'5bUu'5d'5bLl'5d'7b0'2c2'7d'7c'5bLl'5d'7b0'2c2'7d'5bUu'5d'3f'7c'5f'5b'5f0'2d9A'2dZa'2dz'5d'2a'29'3f'5cb = compileRegex True "[\\+\\-]?(0|[1-9]('?[0-9]+)*)([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\\b" regex_'5b'5c'2b'5c'2d'5d'3f'280x'3f'7c'5b1'2d9'5d'5b0'2d9'5d'2a'29'5b0'2d9A'2dZa'2dz'5d'5b'5f0'2d9A'2dZa'2dz'5d'2a'5cb = compileRegex True "[\\+\\-]?(0x?|[1-9][0-9]*)[0-9A-Za-z][_0-9A-Za-z]*\\b" @@ -173,7 +173,7 @@ <|> ((pRegExpr regex_0'5bBb'5d'5b01'5d'28'27'3f'5b01'5d'2b'29'2a'28'5bUu'5d'5bLl'5d'7b0'2c2'7d'7c'5bLl'5d'7b0'2c2'7d'5bUu'5d'3f'7c'5f'5b'5f0'2d9A'2dZa'2dz'5d'2a'29'3f'5cb >>= withAttribute BaseNTok)) <|> - ((pRegExpr regex_'5b'5c'2b'5c'2d'5d'3f'28'5b0'2d9'5d'2b'5bEe'5d'5b'5c'2b'5c'2d'5d'3f'5b0'2d9'5d'2b'7c'28'5b0'2d9'5d'2b'5c'2e'7c'5c'2e'5b0'2d9'5d'2b'7c'5b0'2d9'5d'2b'5c'2e'5b0'2d9'5d'2b'29'28'5bEe'5d'5b'5c'2b'5c'2d'5d'3f'5b0'2d9'5d'2b'29'3f'29'5bFfLl'5d'3f >>= withAttribute FloatTok)) + ((pRegExpr regex_'5b'5c'2b'5c'2d'5d'3f'28'5b0'2d9'5d'2b'5bEe'5d'5b'5c'2b'5c'2d'5d'3f'5b0'2d9'5d'2b'7c'28'5b0'2d9'5d'2a'5c'2e'5b0'2d9'5d'2b'7c'5b0'2d9'5d'2b'5c'2e'5b0'2d9'5d'2a'29'28'5bEe'5d'5b'5c'2b'5c'2d'5d'3f'5b0'2d9'5d'2b'29'3f'29'5bFfLl'5d'3f >>= withAttribute FloatTok)) <|> ((pRegExpr regex_'5b'5c'2b'5c'2d'5d'3f0'27'3f'5b0'2d7'5d'28'27'3f'5b0'2d7'5d'2b'29'2a'28'5bUu'5d'5bLl'5d'7b0'2c2'7d'7c'5bLl'5d'7b0'2c2'7d'5bUu'5d'3f'7c'5f'5b'5f0'2d9A'2dZa'2dz'5d'2a'29'3f'5cb >>= withAttribute BaseNTok)) <|> diff --git a/Text/Highlighting/Kate/Types.hs b/Text/Highlighting/Kate/Types.hs --- a/Text/Highlighting/Kate/Types.hs +++ b/Text/Highlighting/Kate/Types.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, CPP #-} +{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, CPP, DeriveDataTypeable #-} {- | Module : Text.Highlighting.Kate.Types Copyright : Copyright (C) 2008 John MacFarlane @@ -15,6 +15,8 @@ import Text.ParserCombinators.Parsec import Data.Word import Text.Printf +import Data.Data (Data) +import Data.Typeable (Typeable) -- | A context: pair of syntax name and context name. type Context = (String, String) @@ -66,7 +68,7 @@ | RegionMarkerTok | ErrorTok | NormalTok - deriving (Read, Show, Eq, Enum) + deriving (Read, Show, Eq, Enum, Data, Typeable) -- | A line of source, list of labeled source items. type SourceLine = [Token] @@ -79,7 +81,7 @@ , tokenBold :: Bool , tokenItalic :: Bool , tokenUnderline :: Bool - } deriving (Show, Read) + } deriving (Show, Read, Data, Typeable) defStyle :: TokenStyle defStyle = TokenStyle { @@ -90,7 +92,7 @@ , tokenUnderline = False } -data Color = RGB Word8 Word8 Word8 deriving (Show, Read) +data Color = RGB Word8 Word8 Word8 deriving (Show, Read, Data, Typeable) class ToColor a where toColor :: a -> Maybe Color @@ -128,7 +130,7 @@ , backgroundColor :: Maybe Color , lineNumberColor :: Maybe Color , lineNumberBackgroundColor :: Maybe Color - } deriving (Read, Show) + } deriving (Read, Show, Data, Typeable) -- | Options for formatting source code. data FormatOptions = FormatOptions{ diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,15 @@ +highlighting-kate 0.5.12 (19 Mar 2015) + + * Added Data and Typeable instances for types used in pandoc's + ReaderOptions and WriterOptions (Shahbaz Youssefi). + * Bumped blaze-html upper bounds (RyanGlScott). + * Added idris syntax definition (Alexander Shabalin). + * Added regex-posix install to 'make prep' step (@johguenther). + * Modified isocpp.xml to fix float parsing. The float regex in + isocpp.xml seems to work fine with Kate's regex engine, but gives + different results with pcre. Added isocpp.xml.patch to keep track of + the divergence from upstream. + highlighting-kate 0.5.11.1 (19 Dec 2014) * Fixed rest.xml regex (#54). diff --git a/highlighting-kate.cabal b/highlighting-kate.cabal --- a/highlighting-kate.cabal +++ b/highlighting-kate.cabal @@ -1,5 +1,5 @@ Name: highlighting-kate -Version: 0.5.11.1 +Version: 0.5.12 Cabal-Version: >= 1.10 Build-Type: Simple Category: Text @@ -105,7 +105,7 @@ cpp-options: -D_PCRE_LIGHT else Build-depends: regex-pcre-builtin >= 0.94.4.8.8.35 - Build-Depends: parsec, mtl, blaze-html >= 0.4.2 && < 0.8, utf8-string + Build-Depends: parsec, mtl, blaze-html >= 0.4.2 && < 0.9, utf8-string Exposed-Modules: Text.Highlighting.Kate Text.Highlighting.Kate.Syntax Text.Highlighting.Kate.Types @@ -159,6 +159,7 @@ Text.Highlighting.Kate.Syntax.Haskell Text.Highlighting.Kate.Syntax.Haxe Text.Highlighting.Kate.Syntax.Html + Text.Highlighting.Kate.Syntax.Idris Text.Highlighting.Kate.Syntax.Ini Text.Highlighting.Kate.Syntax.Isocpp Text.Highlighting.Kate.Syntax.Java @@ -241,7 +242,7 @@ Executable Highlight Main-Is: Highlight.hs - Build-Depends: base, containers, blaze-html >= 0.4.2 && < 0.8, filepath, + Build-Depends: base, containers, blaze-html >= 0.4.2 && < 0.9, filepath, highlighting-kate Hs-Source-Dirs: extra Default-Language: Haskell98 @@ -263,5 +264,5 @@ Main-Is: test-highlighting-kate.hs Hs-Source-Dirs: tests build-depends: base >= 4, directory, highlighting-kate, filepath, - process, Diff, containers, blaze-html >= 0.4.2 && < 0.8 + process, Diff, containers, blaze-html >= 0.4.2 && < 0.9 default-language: Haskell98 diff --git a/xml/idris.xml b/xml/idris.xml new file mode 100644 --- /dev/null +++ b/xml/idris.xml @@ -0,0 +1,170 @@ + + + + + + + abstract + auto + case + class + codata + covering + data + default + do + dsl + else + if + implicit + import + impossible + in + index_first + index_next + infix + infixl + infixr + instance + lambda + let + module + mututal + namespace + of + parameters + partial + pattern + postulate + prefix + private + proof + public + record + rewrite + static + syntax + tactics + term + then + total + using + variable + where + with + + + access + assert_total + default + dynamic + elim + error_handlers + error_reverse + flag + hide + include + language + lib + link + name + provide + reflection + + + applyTactic + attack + compute + exact + fill + focus + induction + intro + intros + let + refine + reflect + rewrite + solve + trivial + try + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/isocpp.xml b/xml/isocpp.xml --- a/xml/isocpp.xml +++ b/xml/isocpp.xml @@ -191,7 +191,7 @@ - + diff --git a/xml/isocpp.xml.patch b/xml/isocpp.xml.patch new file mode 100644 --- /dev/null +++ b/xml/isocpp.xml.patch @@ -0,0 +1,13 @@ +diff --git a/xml/isocpp.xml b/xml/isocpp.xml +index 88e7b88..2d2da8a 100644 +--- a/xml/isocpp.xml ++++ b/xml/isocpp.xml +@@ -191,7 +191,7 @@ + + + +- ++ + + + diff --git a/xml/rest.xml.patch b/xml/rest.xml.patch new file mode 100644 --- /dev/null +++ b/xml/rest.xml.patch @@ -0,0 +1,13 @@ +diff --git a/xml/rest.xml b/xml/rest.xml +index 1c86f00..a61b16b 100644 +--- a/xml/rest.xml ++++ b/xml/rest.xml +@@ -3,7 +3,7 @@ + [ + + ++ + ]> +