diff options
Diffstat (limited to 'Master/texmf-dist/tex/lualatex/piton/piton.lua')
| -rw-r--r-- | Master/texmf-dist/tex/lualatex/piton/piton.lua | 2314 |
1 files changed, 1309 insertions, 1005 deletions
diff --git a/Master/texmf-dist/tex/lualatex/piton/piton.lua b/Master/texmf-dist/tex/lualatex/piton/piton.lua index 6ec0442b73c..6bfe1a837fb 100644 --- a/Master/texmf-dist/tex/lualatex/piton/piton.lua +++ b/Master/texmf-dist/tex/lualatex/piton/piton.lua @@ -20,49 +20,48 @@ -- ------------------------------------------- -- -- This file is part of the LuaLaTeX package 'piton'. -piton_version = "3.0b" -- 2024/05/23 +piton_version = "4.1" -- 2024/10/18 -if piton.comment_latex == nil then piton.comment_latex = ">" end + + +piton.comment_latex = piton.comment_latex or ">" piton.comment_latex = "#" .. piton.comment_latex -function piton.open_brace () - tex.sprint("{") -end -function piton.close_brace () - tex.sprint("}") -end -local function sprintL3 ( s ) - tex.sprint ( luatexbase.catcodetables.expl , s ) +local sprintL3 +function sprintL3 ( s ) + tex.sprint ( luatexbase.catcodetables.expl , s ) end local P, S, V, C, Ct, Cc = lpeg.P, lpeg.S, lpeg.V, lpeg.C, lpeg.Ct, lpeg.Cc local Cs , Cg , Cmt , Cb = lpeg.Cs, lpeg.Cg , lpeg.Cmt , lpeg.Cb -local R = lpeg.R -local function Q ( pattern ) +local B , R = lpeg.B , lpeg.R +local Q +function Q ( pattern ) return Ct ( Cc ( luatexbase.catcodetables.CatcodeTableOther ) * C ( pattern ) ) end -local function L ( pattern ) - return Ct ( C ( pattern ) ) +local L +function L ( pattern ) return + Ct ( C ( pattern ) ) end -local function Lc ( string ) - return Cc ( { luatexbase.catcodetables.expl , string } ) +local Lc +function Lc ( string ) return + Cc ( { luatexbase.catcodetables.expl , string } ) end -local function K ( style , pattern ) - return - Lc ( "{\\PitonStyle{" .. style .. "}{" ) - * Q ( pattern ) - * Lc "}}" +local K +function K ( style , pattern ) return + Lc ( [[ {\PitonStyle{ ]] .. style .. "}{" ) + * Q ( pattern ) + * Lc "}}" end -local function WithStyle ( style , pattern ) - return - Ct ( Cc "Open" * Cc ( "{\\PitonStyle{" .. style .. "}{" ) * Cc "}}" ) - * pattern - * Ct ( Cc "Close" ) +local WithStyle +function WithStyle ( style , pattern ) return + Ct ( Cc "Open" * Cc ( [[{\PitonStyle{]] .. style .. "}{" ) * Cc "}}" ) + * pattern + * Ct ( Cc "Close" ) end Escape = P ( false ) EscapeClean = P ( false ) -if piton.begin_escape ~= nil -then +if piton.begin_escape then Escape = P ( piton.begin_escape ) * L ( ( 1 - P ( piton.end_escape ) ) ^ 1 ) @@ -73,13 +72,12 @@ then * P ( piton.end_escape ) end EscapeMath = P ( false ) -if piton.begin_escape_math ~= nil -then +if piton.begin_escape_math then EscapeMath = P ( piton.begin_escape_math ) * Lc "\\ensuremath{" * L ( ( 1 - P(piton.end_escape_math) ) ^ 1 ) - * Lc ( "}" ) + * Lc "}" * P ( piton.end_escape_math ) end lpeg.locale(lpeg) @@ -91,7 +89,7 @@ local letter = alpha + "_" + "â" + "à" + "ç" + "é" + "è" + "ê" + "ë" + " local alphanum = letter + digit local identifier = letter * alphanum ^ 0 -local Identifier = K ( 'Identifier' , identifier ) +local Identifier = K ( 'Identifier.Internal' , identifier ) local Number = K ( 'Number' , ( digit ^ 1 * P "." * # ( 1 - P "." ) * digit ^ 0 @@ -100,1006 +98,1177 @@ local Number = * ( S "eE" * S "+-" ^ -1 * digit ^ 1 ) ^ -1 + digit ^ 1 ) -local Word +local lpeg_central = 1 - S " '\"\r[({})]" - digit if piton.begin_escape then - if piton.begin_escape_math then - Word = Q ( ( 1 - space - piton.begin_escape - piton.end_escape - - piton.begin_escape_math - piton.end_escape_math - - S "'\"\r[({})]" - digit ) ^ 1 ) - else - Word = Q ( ( 1 - space - piton.begin_escape - piton.end_escape - - S "'\"\r[({})]" - digit ) ^ 1 ) - end -else - if piton.begin_escape_math then - Word = Q ( ( 1 - space - piton.begin_escape_math - piton.end_escape_math - - S "'\"\r[({})]" - digit ) ^ 1 ) - else - Word = Q ( ( 1 - space - S "'\"\r[({})]" - digit ) ^ 1 ) - end + lpeg_central = lpeg_central - piton.begin_escape +end +if piton.begin_escape_math then + lpeg_central = lpeg_central - piton.begin_escape_math end +local Word = Q ( lpeg_central ^ 1 ) local Space = Q " " ^ 1 local SkipSpace = Q " " ^ 0 local Punct = Q ( S ".,:;!" ) -local Tab = "\t" * Lc "\\l__piton_tab_tl" -local SpaceIndentation = Lc "\\__piton_an_indentation_space:" * Q " " +local Tab = "\t" * Lc [[ \__piton_tab: ]] +local SpaceIndentation = Lc [[ \__piton_leading_space: ]] * Q " " local Delim = Q ( S "[({})]" ) -local VisualSpace = space * Lc "\\l__piton_space_tl" +local SpaceInString = space * Lc [[ \l__piton_space_in_string_tl ]] local LPEG0 = { } local LPEG1 = { } local LPEG2 = { } local LPEG_cleaner = { } -local function Compute_braces ( lpeg_string ) return - P { "E" , - E = - ( - "{" * V "E" * "}" - + - lpeg_string - + - ( 1 - S "{}" ) - ) ^ 0 - } +local Compute_braces +function Compute_braces ( lpeg_string ) return + P { "E" , + E = + ( + "{" * V "E" * "}" + + + lpeg_string + + + ( 1 - S "{}" ) + ) ^ 0 + } end -local function Compute_DetectedCommands ( lang , braces ) return - Ct ( Cc "Open" - * C ( piton.ListCommands * P "{" ) +local Compute_DetectedCommands +function Compute_DetectedCommands ( lang , braces ) return + Ct ( + Cc "Open" + * C ( piton.DetectedCommands * space ^ 0 * P "{" ) * Cc "}" ) - * ( braces / (function ( s ) return LPEG1[lang] : match ( s ) end ) ) + * ( braces + / ( function ( s ) + if s ~= '' then return + LPEG1[lang] : match ( s ) + end + end ) + ) * P "}" * Ct ( Cc "Close" ) end -local function Compute_LPEG_cleaner ( lang , braces ) return - Ct ( ( piton.ListCommands * "{" - * ( braces - / ( function ( s ) return LPEG_cleaner[lang] : match ( s ) end ) ) +local Compute_LPEG_cleaner +function Compute_LPEG_cleaner ( lang , braces ) return + Ct ( ( piton.DetectedCommands * "{" + * ( braces + / ( function ( s ) + if s ~= '' then return + LPEG_cleaner[lang] : match ( s ) + end + end ) + ) * "}" + EscapeClean + C ( P ( 1 ) ) ) ^ 0 ) / table.concat end +local ParseAgain +function ParseAgain ( code ) + if code ~= '' then return + LPEG1[piton.language] : match ( code ) + end +end local Beamer = P ( false ) local BeamerBeginEnvironments = P ( true ) local BeamerEndEnvironments = P ( true ) -local list_beamer_env = - { "uncoverenv" , "onlyenv" , "visibleenv" , - "invisibleenv" , "alertenv" , "actionenv" } -local BeamerNamesEnvironments = P ( false ) -for _ , x in ipairs ( list_beamer_env ) do - BeamerNamesEnvironments = BeamerNamesEnvironments + x +piton.BeamerEnvironments = P ( false ) +for _ , x in ipairs ( piton.beamer_environments ) do + piton.BeamerEnvironments = piton.BeamerEnvironments + x end BeamerBeginEnvironments = ( space ^ 0 * L ( - P "\\begin{" * BeamerNamesEnvironments * "}" + P [[\begin{]] * piton.BeamerEnvironments * "}" * ( "<" * ( 1 - P ">" ) ^ 0 * ">" ) ^ -1 ) * "\r" ) ^ 0 BeamerEndEnvironments = ( space ^ 0 * - L ( P "\\end{" * BeamerNamesEnvironments * "}" ) + L ( P [[\end{]] * piton.BeamerEnvironments * "}" ) * "\r" ) ^ 0 -local function Compute_Beamer ( lang , braces ) - local lpeg = L ( P "\\pause" * ( "[" * ( 1 - P "]" ) ^ 0 * "]" ) ^ -1 ) +local Compute_Beamer +function Compute_Beamer ( lang , braces ) + local lpeg = L ( P [[\pause]] * ( "[" * ( 1 - P "]" ) ^ 0 * "]" ) ^ -1 ) lpeg = lpeg + Ct ( Cc "Open" - * C ( ( P "\\uncover" + "\\only" + "\\alert" + "\\visible" - + "\\invisible" + "\\action" ) + * C ( piton.BeamerCommands * ( "<" * ( 1 - P ">" ) ^ 0 * ">" ) ^ -1 * P "{" ) * Cc "}" ) - * ( braces / ( function ( s ) return LPEG1[lang] : match ( s ) end ) ) + * ( braces / + ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) ) * "}" * Ct ( Cc "Close" ) lpeg = lpeg + - L ( P "\\alt" * "<" * ( 1 - P ">" ) ^ 0 * ">" * "{" ) - * K ( 'ParseAgain.noCR' , braces ) + L ( P [[\alt]] * "<" * ( 1 - P ">" ) ^ 0 * ">{" ) + * ( braces / + ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) ) * L ( P "}{" ) - * K ( 'ParseAgain.noCR' , braces ) + * ( braces / + ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) ) * L ( P "}" ) lpeg = lpeg + - L ( ( P "\\temporal" ) * "<" * ( 1 - P ">" ) ^ 0 * ">" * "{" ) - * K ( 'ParseAgain.noCR' , braces ) + L ( P [[\temporal]] * "<" * ( 1 - P ">" ) ^ 0 * ">{" ) + * ( braces + / ( function ( s ) + if s ~= '' then return LPEG1[lang] : match ( s ) end end ) ) * L ( P "}{" ) - * K ( 'ParseAgain.noCR' , braces ) + * ( braces + / ( function ( s ) + if s ~= '' then return LPEG1[lang] : match ( s ) end end ) ) * L ( P "}{" ) - * K ( 'ParseAgain.noCR' , braces ) + * ( braces + / ( function ( s ) + if s ~= '' then return LPEG1[lang] : match ( s ) end end ) ) * L ( P "}" ) - for _ , x in ipairs ( list_beamer_env ) do - lpeg = lpeg + - Ct ( Cc "Open" - * C ( - P ( "\\begin{" .. x .. "}" ) - * ( "<" * ( 1 - P ">") ^ 0 * ">" ) ^ -1 - ) - * Cc ( "\\end{" .. x .. "}" ) + for _ , x in ipairs ( piton.beamer_environments ) do + lpeg = lpeg + + Ct ( Cc "Open" + * C ( + P ( [[\begin{]] .. x .. "}" ) + * ( "<" * ( 1 - P ">") ^ 0 * ">" ) ^ -1 + ) + * Cc ( [[\end{]] .. x .. "}" ) + ) + * ( + ( ( 1 - P ( [[\end{]] .. x .. "}" ) ) ^ 0 ) + / ( function ( s ) + if s ~= '' then return + LPEG1[lang] : match ( s ) + end + end ) ) - * ( - ( ( 1 - P ( "\\end{" .. x .. "}" ) ) ^ 0 ) - / ( function ( s ) return LPEG1[lang] : match ( s ) end ) - ) - * P ( "\\end{" .. x .. "}" ) - * Ct ( Cc "Close" ) + * P ( [[\end{]] .. x .. "}" ) + * Ct ( Cc "Close" ) end return lpeg end local CommentMath = P "$" * K ( 'Comment.Math' , ( 1 - S "$\r" ) ^ 1 ) * P "$" -- $ local PromptHastyDetection = - ( # ( P ">>>" + "..." ) * Lc '\\__piton_prompt:' ) ^ -1 + ( # ( P ">>>" + "..." ) * Lc [[ \__piton_prompt: ]] ) ^ -1 local Prompt = K ( 'Prompt' , ( ( P ">>>" + "..." ) * P " " ^ -1 ) ^ -1 ) local EOL = P "\r" * ( - ( space ^ 0 * -1 ) + space ^ 0 * -1 + Ct ( Cc "EOL" * - Ct ( - Lc "\\__piton_end_line:" + Ct ( Lc [[ \__piton_end_line: ]] * BeamerEndEnvironments - * BeamerBeginEnvironments - * PromptHastyDetection - * Lc "\\__piton_newline: \\__piton_begin_line:" - * Prompt + * + ( + -1 + + + BeamerBeginEnvironments + * PromptHastyDetection + * Lc [[ \__piton_newline:\__piton_begin_line: ]] + * Prompt + ) ) ) ) * ( SpaceIndentation ^ 0 * # ( 1 - S " \r" ) ) ^ -1 local CommentLaTeX = - P(piton.comment_latex) - * Lc "{\\PitonStyle{Comment.LaTeX}{\\ignorespaces" + P ( piton.comment_latex ) + * Lc [[{\PitonStyle{Comment.LaTeX}{\ignorespaces]] * L ( ( 1 - P "\r" ) ^ 0 ) * Lc "}}" * ( EOL + -1 ) -local Operator = - K ( 'Operator' , - P "!=" + "<>" + "==" + "<<" + ">>" + "<=" + ">=" + ":=" + "//" + "**" - + S "-~+/*%=<>&.@|" ) - -local OperatorWord = - K ( 'Operator.Word' , P "in" + "is" + "and" + "or" + "not" ) +do + local Operator = + K ( 'Operator' , + P "!=" + "<>" + "==" + "<<" + ">>" + "<=" + ">=" + ":=" + "//" + "**" + + S "-~+/*%=<>&.@|" ) -local Keyword = - K ( 'Keyword' , - P "as" + "assert" + "break" + "case" + "class" + "continue" + "def" + - "del" + "elif" + "else" + "except" + "exec" + "finally" + "for" + "from" + - "global" + "if" + "import" + "lambda" + "non local" + "pass" + "return" + - "try" + "while" + "with" + "yield" + "yield from" ) - + K ( 'Keyword.Constant' , P "True" + "False" + "None" ) + local OperatorWord = + K ( 'Operator.Word' , P "in" + "is" + "and" + "or" + "not" ) + local For = K ( 'Keyword' , P "for" ) + * Space + * Identifier + * Space + * K ( 'Keyword' , P "in" ) -local Builtin = - K ( 'Name.Builtin' , - P "__import__" + "abs" + "all" + "any" + "bin" + "bool" + "bytearray" + - "bytes" + "chr" + "classmethod" + "compile" + "complex" + "delattr" + - "dict" + "dir" + "divmod" + "enumerate" + "eval" + "filter" + "float" + - "format" + "frozenset" + "getattr" + "globals" + "hasattr" + "hash" + - "hex" + "id" + "input" + "int" + "isinstance" + "issubclass" + "iter" + - "len" + "list" + "locals" + "map" + "max" + "memoryview" + "min" + "next" - + "object" + "oct" + "open" + "ord" + "pow" + "print" + "property" + - "range" + "repr" + "reversed" + "round" + "set" + "setattr" + "slice" + - "sorted" + "staticmethod" + "str" + "sum" + "super" + "tuple" + "type" + - "vars" + "zip" ) + local Keyword = + K ( 'Keyword' , + P "as" + "assert" + "break" + "case" + "class" + "continue" + "def" + + "del" + "elif" + "else" + "except" + "exec" + "finally" + "for" + "from" + + "global" + "if" + "import" + "lambda" + "non local" + "pass" + "return" + + "try" + "while" + "with" + "yield" + "yield from" ) + + K ( 'Keyword.Constant' , P "True" + "False" + "None" ) -local Exception = - K ( 'Exception' , - P "ArithmeticError" + "AssertionError" + "AttributeError" + - "BaseException" + "BufferError" + "BytesWarning" + "DeprecationWarning" + - "EOFError" + "EnvironmentError" + "Exception" + "FloatingPointError" + - "FutureWarning" + "GeneratorExit" + "IOError" + "ImportError" + - "ImportWarning" + "IndentationError" + "IndexError" + "KeyError" + - "KeyboardInterrupt" + "LookupError" + "MemoryError" + "NameError" + - "NotImplementedError" + "OSError" + "OverflowError" + - "PendingDeprecationWarning" + "ReferenceError" + "ResourceWarning" + - "RuntimeError" + "RuntimeWarning" + "StopIteration" + "SyntaxError" + - "SyntaxWarning" + "SystemError" + "SystemExit" + "TabError" + "TypeError" - + "UnboundLocalError" + "UnicodeDecodeError" + "UnicodeEncodeError" + - "UnicodeError" + "UnicodeTranslateError" + "UnicodeWarning" + - "UserWarning" + "ValueError" + "VMSError" + "Warning" + "WindowsError" + - "ZeroDivisionError" + "BlockingIOError" + "ChildProcessError" + - "ConnectionError" + "BrokenPipeError" + "ConnectionAbortedError" + - "ConnectionRefusedError" + "ConnectionResetError" + "FileExistsError" + - "FileNotFoundError" + "InterruptedError" + "IsADirectoryError" + - "NotADirectoryError" + "PermissionError" + "ProcessLookupError" + - "TimeoutError" + "StopAsyncIteration" + "ModuleNotFoundError" + - "RecursionError" ) + local Builtin = + K ( 'Name.Builtin' , + P "__import__" + "abs" + "all" + "any" + "bin" + "bool" + "bytearray" + + "bytes" + "chr" + "classmethod" + "compile" + "complex" + "delattr" + + "dict" + "dir" + "divmod" + "enumerate" + "eval" + "filter" + "float" + + "format" + "frozenset" + "getattr" + "globals" + "hasattr" + "hash" + + "hex" + "id" + "input" + "int" + "isinstance" + "issubclass" + "iter" + + "len" + "list" + "locals" + "map" + "max" + "memoryview" + "min" + "next" + + "object" + "oct" + "open" + "ord" + "pow" + "print" + "property" + + "range" + "repr" + "reversed" + "round" + "set" + "setattr" + "slice" + + "sorted" + "staticmethod" + "str" + "sum" + "super" + "tuple" + "type" + + "vars" + "zip" ) -local RaiseException = K ( 'Keyword' , P "raise" ) * SkipSpace * Exception * Q "(" - -local Decorator = K ( 'Name.Decorator' , P "@" * letter ^ 1 ) -local DefClass = - K ( 'Keyword' , "class" ) * Space * K ( 'Name.Class' , identifier ) -local ImportAs = - K ( 'Keyword' , "import" ) - * Space - * K ( 'Name.Namespace' , identifier * ( "." * identifier ) ^ 0 ) - * ( - ( Space * K ( 'Keyword' , "as" ) * Space - * K ( 'Name.Namespace' , identifier ) ) - + - ( SkipSpace * Q "," * SkipSpace - * K ( 'Name.Namespace' , identifier ) ) ^ 0 - ) -local FromImport = - K ( 'Keyword' , "from" ) - * Space * K ( 'Name.Namespace' , identifier ) - * Space * K ( 'Keyword' , "import" ) -local PercentInterpol = - K ( 'String.Interpol' , - P "%" - * ( "(" * alphanum ^ 1 * ")" ) ^ -1 - * ( S "-#0 +" ) ^ 0 - * ( digit ^ 1 + "*" ) ^ -1 - * ( "." * ( digit ^ 1 + "*" ) ) ^ -1 - * ( S "HlL" ) ^ -1 - * S "sdfFeExXorgiGauc%" - ) -local SingleShortString = - WithStyle ( 'String.Short' , - Q ( P "f'" + "F'" ) - * ( - K ( 'String.Interpol' , "{" ) - * K ( 'Interpol.Inside' , ( 1 - S "}':" ) ^ 0 ) - * Q ( P ":" * ( 1 - S "}:'" ) ^ 0 ) ^ -1 - * K ( 'String.Interpol' , "}" ) - + - VisualSpace - + - Q ( ( P "\\'" + "{{" + "}}" + 1 - S " {}'" ) ^ 1 ) - ) ^ 0 - * Q "'" - + - Q ( P "'" + "r'" + "R'" ) - * ( Q ( ( P "\\'" + 1 - S " '\r%" ) ^ 1 ) - + VisualSpace - + PercentInterpol - + Q "%" - ) ^ 0 - * Q "'" ) - -local DoubleShortString = - WithStyle ( 'String.Short' , - Q ( P "f\"" + "F\"" ) - * ( - K ( 'String.Interpol' , "{" ) - * K ( 'Interpol.Inside' , ( 1 - S "}\":" ) ^ 0 ) - * ( K ( 'String.Interpol' , ":" ) * Q ( (1 - S "}:\"") ^ 0 ) ) ^ -1 - * K ( 'String.Interpol' , "}" ) - + - VisualSpace - + - Q ( ( P "\\\"" + "{{" + "}}" + 1 - S " {}\"" ) ^ 1 ) - ) ^ 0 - * Q "\"" - + - Q ( P "\"" + "r\"" + "R\"" ) - * ( Q ( ( P "\\\"" + 1 - S " \"\r%" ) ^ 1 ) - + VisualSpace - + PercentInterpol - + Q "%" - ) ^ 0 - * Q "\"" ) + local Exception = + K ( 'Exception' , + P "ArithmeticError" + "AssertionError" + "AttributeError" + + "BaseException" + "BufferError" + "BytesWarning" + "DeprecationWarning" + + "EOFError" + "EnvironmentError" + "Exception" + "FloatingPointError" + + "FutureWarning" + "GeneratorExit" + "IOError" + "ImportError" + + "ImportWarning" + "IndentationError" + "IndexError" + "KeyError" + + "KeyboardInterrupt" + "LookupError" + "MemoryError" + "NameError" + + "NotImplementedError" + "OSError" + "OverflowError" + + "PendingDeprecationWarning" + "ReferenceError" + "ResourceWarning" + + "RuntimeError" + "RuntimeWarning" + "StopIteration" + "SyntaxError" + + "SyntaxWarning" + "SystemError" + "SystemExit" + "TabError" + "TypeError" + + "UnboundLocalError" + "UnicodeDecodeError" + "UnicodeEncodeError" + + "UnicodeError" + "UnicodeTranslateError" + "UnicodeWarning" + + "UserWarning" + "ValueError" + "VMSError" + "Warning" + "WindowsError" + + "ZeroDivisionError" + "BlockingIOError" + "ChildProcessError" + + "ConnectionError" + "BrokenPipeError" + "ConnectionAbortedError" + + "ConnectionRefusedError" + "ConnectionResetError" + "FileExistsError" + + "FileNotFoundError" + "InterruptedError" + "IsADirectoryError" + + "NotADirectoryError" + "PermissionError" + "ProcessLookupError" + + "TimeoutError" + "StopAsyncIteration" + "ModuleNotFoundError" + + "RecursionError" ) -local ShortString = SingleShortString + DoubleShortString -local braces = - Compute_braces - ( - Q ( P "\"" + "r\"" + "R\"" + "f\"" + "F\"" ) - * ( "\"" * ( P "\\\"" + 1 - S "\"" ) ^ 0 * "\"" ) - + - Q ( P '\'' + 'r\'' + 'R\'' + 'f\'' + 'F\'' ) - * ( '\'' * ( P '\\\'' + 1 - S '\'' ) ^ 0 * '\'' ) - ) -if piton.beamer then Beamer = Compute_Beamer ( 'python' , braces ) end -DetectedCommands = Compute_DetectedCommands ( 'python' , braces ) -LPEG_cleaner['python'] = Compute_LPEG_cleaner ( 'python' , braces ) -local SingleLongString = - WithStyle ( 'String.Long' , - ( Q ( S "fF" * P "'''" ) - * ( - K ( 'String.Interpol' , "{" ) - * K ( 'Interpol.Inside' , ( 1 - S "}:\r" - "'''" ) ^ 0 ) - * Q ( P ":" * (1 - S "}:\r" - "'''" ) ^ 0 ) ^ -1 - * K ( 'String.Interpol' , "}" ) - + - Q ( ( 1 - P "'''" - S "{}'\r" ) ^ 1 ) - + - EOL - ) ^ 0 - + - Q ( ( S "rR" ) ^ -1 * "'''" ) - * ( - Q ( ( 1 - P "'''" - S "\r%" ) ^ 1 ) - + - PercentInterpol - + - P "%" - + - EOL - ) ^ 0 + local RaiseException = K ( 'Keyword' , P "raise" ) * SkipSpace * Exception * Q "(" + local Decorator = K ( 'Name.Decorator' , P "@" * letter ^ 1 ) + local DefClass = + K ( 'Keyword' , "class" ) * Space * K ( 'Name.Class' , identifier ) + local ImportAs = + K ( 'Keyword' , "import" ) + * Space + * K ( 'Name.Namespace' , identifier * ( "." * identifier ) ^ 0 ) + * ( + ( Space * K ( 'Keyword' , "as" ) * Space + * K ( 'Name.Namespace' , identifier ) ) + + + ( SkipSpace * Q "," * SkipSpace + * K ( 'Name.Namespace' , identifier ) ) ^ 0 + ) + local FromImport = + K ( 'Keyword' , "from" ) + * Space * K ( 'Name.Namespace' , identifier ) + * Space * K ( 'Keyword' , "import" ) + local PercentInterpol = + K ( 'String.Interpol' , + P "%" + * ( "(" * alphanum ^ 1 * ")" ) ^ -1 + * ( S "-#0 +" ) ^ 0 + * ( digit ^ 1 + "*" ) ^ -1 + * ( "." * ( digit ^ 1 + "*" ) ) ^ -1 + * ( S "HlL" ) ^ -1 + * S "sdfFeExXorgiGauc%" ) - * Q "'''" ) + local SingleShortString = + WithStyle ( 'String.Short' , + Q ( P "f'" + "F'" ) + * ( + K ( 'String.Interpol' , "{" ) + * K ( 'Interpol.Inside' , ( 1 - S "}':" ) ^ 0 ) + * Q ( P ":" * ( 1 - S "}:'" ) ^ 0 ) ^ -1 + * K ( 'String.Interpol' , "}" ) + + + SpaceInString + + + Q ( ( P "\\'" + "\\\\" + "{{" + "}}" + 1 - S " {}'" ) ^ 1 ) + ) ^ 0 + * Q "'" + + + Q ( P "'" + "r'" + "R'" ) + * ( Q ( ( P "\\'" + "\\\\" + 1 - S " '\r%" ) ^ 1 ) + + SpaceInString + + PercentInterpol + + Q "%" + ) ^ 0 + * Q "'" ) + local DoubleShortString = + WithStyle ( 'String.Short' , + Q ( P "f\"" + "F\"" ) + * ( + K ( 'String.Interpol' , "{" ) + * K ( 'Interpol.Inside' , ( 1 - S "}\":" ) ^ 0 ) + * ( K ( 'String.Interpol' , ":" ) * Q ( (1 - S "}:\"") ^ 0 ) ) ^ -1 + * K ( 'String.Interpol' , "}" ) + + + SpaceInString + + + Q ( ( P "\\\"" + "\\\\" + "{{" + "}}" + 1 - S " {}\"" ) ^ 1 ) + ) ^ 0 + * Q "\"" + + + Q ( P "\"" + "r\"" + "R\"" ) + * ( Q ( ( P "\\\"" + "\\\\" + 1 - S " \"\r%" ) ^ 1 ) + + SpaceInString + + PercentInterpol + + Q "%" + ) ^ 0 + * Q "\"" ) -local DoubleLongString = - WithStyle ( 'String.Long' , + local ShortString = SingleShortString + DoubleShortString + local braces = + Compute_braces ( - Q ( S "fF" * "\"\"\"" ) - * ( - K ( 'String.Interpol', "{" ) - * K ( 'Interpol.Inside' , ( 1 - S "}:\r" - "\"\"\"" ) ^ 0 ) - * Q ( ":" * (1 - S "}:\r" - "\"\"\"" ) ^ 0 ) ^ -1 - * K ( 'String.Interpol' , "}" ) - + - Q ( ( 1 - S "{}\"\r" - "\"\"\"" ) ^ 1 ) - + - EOL - ) ^ 0 - + - Q ( S "rR" ^ -1 * "\"\"\"" ) - * ( - Q ( ( 1 - P "\"\"\"" - S "%\r" ) ^ 1 ) - + - PercentInterpol - + - P "%" - + - EOL - ) ^ 0 + ( P "\"" + "r\"" + "R\"" + "f\"" + "F\"" ) + * ( P "\\\"" + 1 - S "\"" ) ^ 0 * "\"" + + + ( P '\'' + 'r\'' + 'R\'' + 'f\'' + 'F\'' ) + * ( P '\\\'' + 1 - S '\'' ) ^ 0 * '\'' ) - * Q "\"\"\"" - ) -local LongString = SingleLongString + DoubleLongString -local StringDoc = - K ( 'String.Doc' , P "r" ^ -1 * "\"\"\"" ) - * ( K ( 'String.Doc' , (1 - P "\"\"\"" - "\r" ) ^ 0 ) * EOL - * Tab ^ 0 - ) ^ 0 - * K ( 'String.Doc' , ( 1 - P "\"\"\"" - "\r" ) ^ 0 * "\"\"\"" ) -local Comment = - WithStyle ( 'Comment' , - Q "#" * ( CommentMath + Q ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0 ) -- $ - * ( EOL + -1 ) -local expression = - P { "E" , - E = ( "'" * ( P "\\'" + 1 - S "'\r" ) ^ 0 * "'" - + "\"" * ( P "\\\"" + 1 - S "\"\r" ) ^ 0 * "\"" - + "{" * V "F" * "}" - + "(" * V "F" * ")" - + "[" * V "F" * "]" - + ( 1 - S "{}()[]\r," ) ) ^ 0 , - F = ( "{" * V "F" * "}" - + "(" * V "F" * ")" - + "[" * V "F" * "]" - + ( 1 - S "{}()[]\r\"'" ) ) ^ 0 - } -local Params = - P { "E" , - E = ( V "F" * ( Q "," * V "F" ) ^ 0 ) ^ -1 , - F = SkipSpace * ( Identifier + Q "*args" + Q "**kwargs" ) * SkipSpace + if piton.beamer then Beamer = Compute_Beamer ( 'python' , braces ) end + DetectedCommands = Compute_DetectedCommands ( 'python' , braces ) + LPEG_cleaner.python = Compute_LPEG_cleaner ( 'python' , braces ) + local SingleLongString = + WithStyle ( 'String.Long' , + ( Q ( S "fF" * P "'''" ) * ( - K ( 'InitialValues' , "=" * expression ) - + Q ":" * SkipSpace * K ( 'Name.Type' , identifier ) - ) ^ -1 - } -local DefFunction = - K ( 'Keyword' , "def" ) - * Space - * K ( 'Name.Function.Internal' , identifier ) - * SkipSpace - * Q "(" * Params * Q ")" - * SkipSpace - * ( Q "->" * SkipSpace * K ( 'Name.Type' , identifier ) ) ^ -1 - * K ( 'ParseAgain.noCR' , ( 1 - S ":\r" ) ^ 0 ) - * Q ":" - * ( SkipSpace - * ( EOL + CommentLaTeX + Comment ) -- in all cases, that contains an EOL - * Tab ^ 0 - * SkipSpace - * StringDoc ^ 0 -- there may be additional docstrings - ) ^ -1 -local ExceptionInConsole = Exception * Q ( ( 1 - P "\r" ) ^ 0 ) * EOL -local Main = - space ^ 1 * -1 - + space ^ 0 * EOL - + Space - + Tab - + Escape + EscapeMath - + CommentLaTeX - + Beamer - + DetectedCommands - + LongString - + Comment - + ExceptionInConsole - + Delim - + Operator - + OperatorWord * ( Space + Punct + Delim + EOL + -1 ) - + ShortString - + Punct - + FromImport - + RaiseException - + DefFunction - + DefClass - + Keyword * ( Space + Punct + Delim + EOL + -1 ) - + Decorator - + Builtin * ( Space + Punct + Delim + EOL + -1 ) - + Identifier - + Number - + Word -LPEG1['python'] = Main ^ 0 -LPEG2['python'] = - Ct ( - ( space ^ 0 * "\r" ) ^ -1 - * BeamerBeginEnvironments - * PromptHastyDetection - * Lc '\\__piton_begin_line:' - * Prompt - * SpaceIndentation ^ 0 - * LPEG1['python'] - * -1 - * Lc '\\__piton_end_line:' - ) -local Delim = Q ( P "[|" + "|]" + S "[()]" ) -local Punct = Q ( S ",:;!" ) -local cap_identifier = R "AZ" * ( R "az" + R "AZ" + S "_'" + digit ) ^ 0 -local Constructor = K ( 'Name.Constructor' , cap_identifier ) -local ModuleType = K ( 'Name.Type' , cap_identifier ) -local identifier = ( R "az" + "_" ) * ( R "az" + R "AZ" + S "_'" + digit ) ^ 0 -local Identifier = K ( 'Identifier' , identifier ) -local expression_for_fields = - P { "E" , - E = ( "{" * V "F" * "}" - + "(" * V "F" * ")" - + "[" * V "F" * "]" - + "\"" * ( P "\\\"" + 1 - S "\"\r" ) ^ 0 * "\"" - + "'" * ( P "\\'" + 1 - S "'\r" ) ^ 0 * "'" - + ( 1 - S "{}()[]\r;" ) ) ^ 0 , - F = ( "{" * V "F" * "}" - + "(" * V "F" * ")" - + "[" * V "F" * "]" - + ( 1 - S "{}()[]\r\"'" ) ) ^ 0 - } -local OneFieldDefinition = - ( K ( 'Keyword' , "mutable" ) * SkipSpace ) ^ -1 - * K ( 'Name.Field' , identifier ) * SkipSpace - * Q ":" * SkipSpace - * K ( 'Name.Type' , expression_for_fields ) - * SkipSpace - -local OneField = - K ( 'Name.Field' , identifier ) * SkipSpace - * Q "=" * SkipSpace - * ( expression_for_fields - / ( function ( s ) return LPEG1['ocaml'] : match ( s ) end ) + K ( 'String.Interpol' , "{" ) + * K ( 'Interpol.Inside' , ( 1 - S "}:\r" - "'''" ) ^ 0 ) + * Q ( P ":" * (1 - S "}:\r" - "'''" ) ^ 0 ) ^ -1 + * K ( 'String.Interpol' , "}" ) + + + Q ( ( 1 - P "'''" - S "{}'\r" ) ^ 1 ) + + + EOL + ) ^ 0 + + + Q ( ( S "rR" ) ^ -1 * "'''" ) + * ( + Q ( ( 1 - P "'''" - S "\r%" ) ^ 1 ) + + + PercentInterpol + + + P "%" + + + EOL + ) ^ 0 + ) + * Q "'''" ) + local DoubleLongString = + WithStyle ( 'String.Long' , + ( + Q ( S "fF" * "\"\"\"" ) + * ( + K ( 'String.Interpol', "{" ) + * K ( 'Interpol.Inside' , ( 1 - S "}:\r" - "\"\"\"" ) ^ 0 ) + * Q ( ":" * (1 - S "}:\r" - "\"\"\"" ) ^ 0 ) ^ -1 + * K ( 'String.Interpol' , "}" ) + + + Q ( ( 1 - S "{}\"\r" - "\"\"\"" ) ^ 1 ) + + + EOL + ) ^ 0 + + + Q ( S "rR" ^ -1 * "\"\"\"" ) + * ( + Q ( ( 1 - P "\"\"\"" - S "%\r" ) ^ 1 ) + + + PercentInterpol + + + P "%" + + + EOL + ) ^ 0 + ) + * Q "\"\"\"" ) - * SkipSpace - -local Record = - Q "{" * SkipSpace - * - ( - OneFieldDefinition * ( Q ";" * SkipSpace * OneFieldDefinition ) ^ 0 + local LongString = SingleLongString + DoubleLongString + local StringDoc = + K ( 'String.Doc' , P "r" ^ -1 * "\"\"\"" ) + * ( K ( 'String.Doc' , (1 - P "\"\"\"" - "\r" ) ^ 0 ) * EOL + * Tab ^ 0 + ) ^ 0 + * K ( 'String.Doc' , ( 1 - P "\"\"\"" - "\r" ) ^ 0 * "\"\"\"" ) + local Comment = + WithStyle + ( 'Comment' , + Q "#" * ( CommentMath + Q ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0 -- $ + ) + * ( EOL + -1 ) + local expression = + P { "E" , + E = ( "'" * ( P "\\'" + 1 - S "'\r" ) ^ 0 * "'" + + "\"" * ( P "\\\"" + 1 - S "\"\r" ) ^ 0 * "\"" + + "{" * V "F" * "}" + + "(" * V "F" * ")" + + "[" * V "F" * "]" + + ( 1 - S "{}()[]\r," ) ) ^ 0 , + F = ( "{" * V "F" * "}" + + "(" * V "F" * ")" + + "[" * V "F" * "]" + + ( 1 - S "{}()[]\r\"'" ) ) ^ 0 + } + local Params = + P { "E" , + E = ( V "F" * ( Q "," * V "F" ) ^ 0 ) ^ -1 , + F = SkipSpace * ( Identifier + Q "*args" + Q "**kwargs" ) * SkipSpace + * ( + K ( 'InitialValues' , "=" * expression ) + + Q ":" * SkipSpace * K ( 'Name.Type' , identifier ) + ) ^ -1 + } + local DefFunction = + K ( 'Keyword' , "def" ) + * Space + * K ( 'Name.Function.Internal' , identifier ) + * SkipSpace + * Q "(" * Params * Q ")" + * SkipSpace + * ( Q "->" * SkipSpace * K ( 'Name.Type' , identifier ) ) ^ -1 + * ( C ( ( 1 - S ":\r" ) ^ 0 ) / ParseAgain ) + * Q ":" + * ( SkipSpace + * ( EOL + CommentLaTeX + Comment ) -- in all cases, that contains an EOL + * Tab ^ 0 + * SkipSpace + * StringDoc ^ 0 -- there may be additional docstrings + ) ^ -1 + local ExceptionInConsole = Exception * Q ( ( 1 - P "\r" ) ^ 0 ) * EOL + local EndKeyword + = Space + Punct + Delim + EOL + Beamer + DetectedCommands + Escape + + EscapeMath + -1 + local Main = + space ^ 0 * EOL -- faut-il le mettre en commentaire ? + + Space + + Tab + + Escape + EscapeMath + + CommentLaTeX + + Beamer + + DetectedCommands + + LongString + + Comment + + ExceptionInConsole + + Delim + + Operator + + OperatorWord * EndKeyword + + ShortString + + Punct + + FromImport + + RaiseException + + DefFunction + + DefClass + + For + + Keyword * EndKeyword + + Decorator + + Builtin * EndKeyword + + Identifier + + Number + + Word + LPEG1.python = Main ^ 0 + LPEG2.python = + Ct ( + ( space ^ 0 * "\r" ) ^ -1 + * BeamerBeginEnvironments + * PromptHastyDetection + * Lc [[ \__piton_begin_line: ]] + * Prompt + * SpaceIndentation ^ 0 + * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0 + * -1 + * Lc [[ \__piton_end_line: ]] + ) +end +do + local SkipSpace = ( Q " " + EOL ) ^ 0 + local Space = ( Q " " + EOL ) ^ 1 + local braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" ) + if piton.beamer then + Beamer = Compute_Beamer ( 'ocaml' , braces ) + end + DetectedCommands = Compute_DetectedCommands ( 'ocaml' , braces ) + local Q + function Q ( pattern ) return + Ct ( Cc ( luatexbase.catcodetables.CatcodeTableOther ) * C ( pattern ) ) + + Beamer + DetectedCommands + EscapeMath + Escape + end + local K + function K ( style , pattern ) return + Lc ( [[ {\PitonStyle{ ]] .. style .. "}{" ) + * Q ( pattern ) + * Lc "}}" + end + local WithStyle + function WithStyle ( style , pattern ) return + Ct ( Cc "Open" * Cc ( [[{\PitonStyle{]] .. style .. "}{" ) * Cc "}}" ) + * ( pattern + Beamer + DetectedCommands + EscapeMath + Escape ) + * Ct ( Cc "Close" ) + end + local balanced_parens = + P { "E" , E = ( "(" * V "E" * ")" + ( 1 - S "()" ) ) ^ 0 } + local ocaml_string = + Q "\"" + * ( + SpaceInString + - OneField * ( Q ";" * SkipSpace * OneField ) ^ 0 - ) - * - Q "}" -local DotNotation = - ( - K ( 'Name.Module' , cap_identifier ) - * Q "." - * ( Identifier + Constructor + Q "(" + Q "[" + Q "{" ) + Q ( ( 1 - S " \"\r" ) ^ 1 ) + - Identifier - * Q "." - * K ( 'Name.Field' , identifier ) - ) - * ( Q "." * K ( 'Name.Field' , identifier ) ) ^ 0 -local Operator = - K ( 'Operator' , - P "!=" + "<>" + "==" + "<<" + ">>" + "<=" + ">=" + ":=" + "||" + "&&" + - "//" + "**" + ";;" + "::" + "->" + "+." + "-." + "*." + "/." - + S "-~+/*%=<>&@|" ) - -local OperatorWord = - K ( 'Operator.Word' , - P "and" + "asr" + "land" + "lor" + "lsl" + "lxor" + "mod" + "or" ) - -local Keyword = - K ( 'Keyword' , - P "assert" + "and" + "as" + "begin" + "class" + "constraint" + "done" - + "downto" + "do" + "else" + "end" + "exception" + "external" + "for" + - "function" + "functor" + "fun" + "if" + "include" + "inherit" + "initializer" - + "in" + "lazy" + "let" + "match" + "method" + "module" + "mutable" + "new" + - "object" + "of" + "open" + "private" + "raise" + "rec" + "sig" + "struct" + - "then" + "to" + "try" + "type" + "value" + "val" + "virtual" + "when" + - "while" + "with" ) - + K ( 'Keyword.Constant' , P "true" + "false" ) - -local Builtin = - K ( 'Name.Builtin' , P "not" + "incr" + "decr" + "fst" + "snd" ) -local Exception = - K ( 'Exception' , - P "Division_by_zero" + "End_of_File" + "Failure" + "Invalid_argument" + - "Match_failure" + "Not_found" + "Out_of_memory" + "Stack_overflow" + - "Sys_blocked_io" + "Sys_error" + "Undefined_recursive_module" ) -local Char = - K ( 'String.Short' , "'" * ( ( 1 - P "'" ) ^ 0 + "\\'" ) * "'" ) -braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" ) -if piton.beamer then - Beamer = Compute_Beamer ( 'ocaml' , "\"" * ( 1 - S "\"" ) ^ 0 * "\"" ) -end -DetectedCommands = Compute_DetectedCommands ( 'ocaml' , braces ) -LPEG_cleaner['ocaml'] = Compute_LPEG_cleaner ( 'ocaml' , braces ) -local ocaml_string = - Q "\"" - * ( - VisualSpace - + - Q ( ( 1 - S " \"\r" ) ^ 1 ) - + - EOL - ) ^ 0 - * Q "\"" -local String = WithStyle ( 'String.Long' , ocaml_string ) -local ext = ( R "az" + "_" ) ^ 0 -local open = "{" * Cg ( ext , 'init' ) * "|" -local close = "|" * C ( ext ) * "}" -local closeeq = - Cmt ( close * Cb ( 'init' ) , - function ( s , i , a , b ) return a == b end ) -local QuotedStringBis = - WithStyle ( 'String.Long' , + EOL + ) ^ 0 + * Q "\"" + local String = WithStyle ( 'String.Long' , ocaml_string ) + local ext = ( R "az" + "_" ) ^ 0 + local open = "{" * Cg ( ext , 'init' ) * "|" + local close = "|" * C ( ext ) * "}" + local closeeq = + Cmt ( close * Cb ( 'init' ) , + function ( s , i , a , b ) return a == b end ) + local QuotedStringBis = + WithStyle ( 'String.Long' , + ( + Space + + + Q ( ( 1 - S " \r" ) ^ 1 ) + + + EOL + ) ^ 0 ) + local QuotedString = + C ( open * ( 1 - closeeq ) ^ 0 * close ) / + ( function ( s ) return QuotedStringBis : match ( s ) end ) + local Comment = + WithStyle ( 'Comment' , + P { + "A" , + A = Q "(*" + * ( V "A" + + Q ( ( 1 - S "\r$\"" - "(*" - "*)" ) ^ 1 ) -- $ + + ocaml_string + + "$" * K ( 'Comment.Math' , ( 1 - S "$\r" ) ^ 1 ) * "$" -- $ + + EOL + ) ^ 0 + * Q "*)" + } ) + local Delim = Q ( P "[|" + "|]" + S "[()]" ) + local Punct = Q ( S ",:;!" ) + local cap_identifier = R "AZ" * ( R "az" + R "AZ" + S "_'" + digit ) ^ 0 + local Constructor = + K ( 'Name.Constructor' , + Q "`" ^ -1 * cap_identifier + + Q "::" + + Q "[" * SkipSpace * Q "]" ) + local ModuleType = K ( 'Name.Type' , cap_identifier ) + local OperatorWord = + K ( 'Operator.Word' , + P "asr" + "land" + "lor" + "lsl" + "lxor" + "mod" + "or" ) + local governing_keyword = P "and" + "begin" + "class" + "constraint" + + "end" + "external" + "functor" + "include" + "inherit" + "initializer" + + "in" + "let" + "method" + "module" + "object" + "open" + "rec" + "sig" + + "struct" + "type" + "val" + local Keyword = + K ( 'Keyword' , + P "assert" + "as" + "done" + "downto" + "do" + "else" + "exception" + + "for" + "function" + "fun" + "if" + "lazy" + "match" + "mutable" + + "new" + "of" + "private" + "raise" + "then" + "to" + "try" + + "virtual" + "when" + "while" + "with" ) + + K ( 'Keyword.Constant' , P "true" + "false" ) + + K ( 'Keyword.Governing', governing_keyword ) + local EndKeyword + = Space + Punct + Delim + EOL + Beamer + DetectedCommands + Escape + + EscapeMath + -1 + local identifier = ( R "az" + "_" ) * ( R "az" + R "AZ" + S "_'" + digit ) ^ 0 + - ( OperatorWord + Keyword ) * EndKeyword + local Identifier = K ( 'Identifier.Internal' , identifier ) + local Char = + K ( 'String.Short', + P "'" * ( - Space - + - Q ( ( 1 - S " \r" ) ^ 1 ) - + - EOL - ) ^ 0 ) -local QuotedString = - C ( open * ( 1 - closeeq ) ^ 0 * close ) / - ( function ( s ) return QuotedStringBis : match ( s ) end ) -local Comment = - WithStyle ( 'Comment' , - P { - "A" , - A = Q "(*" - * ( V "A" - + Q ( ( 1 - S "\r$\"" - "(*" - "*)" ) ^ 1 ) -- $ - + ocaml_string - + "$" * K ( 'Comment.Math' , ( 1 - S "$\r" ) ^ 1 ) * "$" -- $ - + EOL - ) ^ 0 - * Q "*)" - } ) -local balanced_parens = - P { "E" , E = ( "(" * V "E" * ")" + 1 - S "()" ) ^ 0 } -local Argument = - K ( 'Identifier' , identifier ) - + Q "(" * SkipSpace - * K ( 'Identifier' , identifier ) * SkipSpace + ( 1 - S "'\\" ) + + "\\" + * ( S "\\'ntbr \"" + + digit * digit * digit + + P "x" * ( digit + R "af" + R "AF" ) + * ( digit + R "af" + R "AF" ) + * ( digit + R "af" + R "AF" ) + + P "o" * R "03" * R "07" * R "07" ) + ) + * "'" ) + local TypeParameter = + K ( 'TypeParameter' , + "'" * Q"_" ^ -1 * alpha ^ 1 * ( # ( 1 - P "'" ) + -1 ) ) + local expression_for_fields_type = + P { "E" , + E = ( "{" * V "F" * "}" + + "(" * V "F" * ")" + + TypeParameter + + ( 1 - S "{}()[]\r;" ) ) ^ 0 , + F = ( "{" * V "F" * "}" + + "(" * V "F" * ")" + + ( 1 - S "{}()[]\r\"'" ) + TypeParameter ) ^ 0 + } + local expression_for_fields_value = + P { "E" , + E = ( "{" * V "F" * "}" + + "(" * V "F" * ")" + + "[" * V "F" * "]" + + String + QuotedString + Char + + ( 1 - S "{}()[]\r;" ) ) ^ 0 , + F = ( "{" * V "F" * "}" + + "(" * V "F" * ")" + + "[" * V "F" * "]" + + ( 1 - S "{}()[]\r\"'" )) ^ 0 + } + local OneFieldDefinition = + ( K ( 'Keyword' , "mutable" ) * SkipSpace ) ^ -1 + * K ( 'Name.Field' , identifier ) * SkipSpace * Q ":" * SkipSpace - * K ( 'Name.Type' , balanced_parens ) * SkipSpace - * Q ")" -local DefFunction = - K ( 'Keyword' , "let open" ) - * Space - * K ( 'Name.Module' , cap_identifier ) - + - K ( 'Keyword' , P "let rec" + "let" + "and" ) - * Space - * K ( 'Name.Function.Internal' , identifier ) - * Space - * ( - Q "=" * SkipSpace * K ( 'Keyword' , "function" ) + * K ( 'TypeExpression' , expression_for_fields_type ) + * SkipSpace + local OneField = + K ( 'Name.Field' , identifier ) * SkipSpace + * Q "=" * SkipSpace + * ( expression_for_fields_value / ParseAgain ) + * SkipSpace + local Record = + Q "{" * SkipSpace + * + ( + OneFieldDefinition + * ( Q ";" * SkipSpace * ( Comment * SkipSpace ) ^ 0 * OneFieldDefinition ) ^ 0 + - Argument - * ( SkipSpace * Argument ) ^ 0 - * ( - SkipSpace - * Q ":" - * K ( 'Name.Type' , ( 1 - P "=" ) ^ 0 ) - ) ^ -1 + OneField * ( Q ";" * SkipSpace * ( Comment * SkipSpace ) ^ 0 * OneField ) ^ 0 ) -local DefModule = - K ( 'Keyword' , "module" ) * Space - * + * SkipSpace + * Q ";" ^ -1 + * SkipSpace + * Comment ^ -1 + * SkipSpace + * Q "}" + local DotNotation = ( - K ( 'Keyword' , "type" ) * Space - * K ( 'Name.Type' , cap_identifier ) - + - K ( 'Name.Module' , cap_identifier ) * SkipSpace - * - ( - Q "(" * SkipSpace + K ( 'Name.Module' , cap_identifier ) + * Q "." + * ( Identifier + Constructor + Q "(" + Q "[" + Q "{" ) ^ -1 + + + Identifier + * Q "." + * K ( 'Name.Field' , identifier ) + ) + * ( Q "." * K ( 'Name.Field' , identifier ) ) ^ 0 + local Operator = + K ( 'Operator' , + P "!=" + "<>" + "==" + "<<" + ">>" + "<=" + ">=" + ":=" + "||" + "&&" + + "//" + "**" + ";;" + "->" + "+." + "-." + "*." + "/." + + S "-~+/*%=<>&@|" ) + local Builtin = + K ( 'Name.Builtin' , P "not" + "incr" + "decr" + "fst" + "snd" + "ref" ) + local Exception = + K ( 'Exception' , + P "Division_by_zero" + "End_of_File" + "Failure" + "Invalid_argument" + + "Match_failure" + "Not_found" + "Out_of_memory" + "Stack_overflow" + + "Sys_blocked_io" + "Sys_error" + "Undefined_recursive_module" ) + LPEG_cleaner.ocaml = Compute_LPEG_cleaner ( 'ocaml' , braces ) + local Argument = + ( Q "~" * Identifier * Q ":" * SkipSpace ) ^ -1 + * + ( K ( 'Identifier.Internal' , identifier ) + + Q "(" * SkipSpace + * K ( 'Identifier.Internal' , identifier ) * SkipSpace + * Q ":" * SkipSpace + * K ( 'TypeExpression' , balanced_parens ) * SkipSpace + * Q ")" + ) + local DefFunction = + K ( 'Keyword.Governing' , "let open" ) + * Space + * K ( 'Name.Module' , cap_identifier ) + + + K ( 'Keyword.Governing' , P "let rec" + "let" + "and" ) + * Space + * K ( 'Name.Function.Internal' , identifier ) + * Space + * ( + Q "=" * SkipSpace * K ( 'Keyword' , "function" ) + + + Argument + * ( SkipSpace * Argument ) ^ 0 + * ( + SkipSpace + * Q ":" + * K ( 'TypeExpression' , ( 1 - P "=" ) ^ 0 ) + ) ^ -1 + ) + local DefModule = + K ( 'Keyword.Governing' , "module" ) * Space + * + ( + K ( 'Keyword.Governing' , "type" ) * Space + * K ( 'Name.Type' , cap_identifier ) + + + K ( 'Name.Module' , cap_identifier ) * SkipSpace + * + ( + Q "(" * SkipSpace + * K ( 'Name.Module' , cap_identifier ) * SkipSpace + * Q ":" * SkipSpace + * K ( 'Name.Type' , cap_identifier ) * SkipSpace + * + ( + Q "," * SkipSpace + * K ( 'Name.Module' , cap_identifier ) * SkipSpace + * Q ":" * SkipSpace + * K ( 'Name.Type' , cap_identifier ) * SkipSpace + ) ^ 0 + * Q ")" + ) ^ -1 + * + ( + Q "=" * SkipSpace + * K ( 'Name.Module' , cap_identifier ) * SkipSpace + * Q "(" * K ( 'Name.Module' , cap_identifier ) * SkipSpace - * Q ":" * SkipSpace - * K ( 'Name.Type' , cap_identifier ) * SkipSpace - * + * ( - Q "," * SkipSpace - * K ( 'Name.Module' , cap_identifier ) * SkipSpace - * Q ":" * SkipSpace - * K ( 'Name.Type' , cap_identifier ) * SkipSpace + Q "," + * + K ( 'Name.Module' , cap_identifier ) * SkipSpace ) ^ 0 * Q ")" - ) ^ -1 - * - ( - Q "=" * SkipSpace - * K ( 'Name.Module' , cap_identifier ) * SkipSpace - * Q "(" - * K ( 'Name.Module' , cap_identifier ) * SkipSpace - * - ( - Q "," - * - K ( 'Name.Module' , cap_identifier ) * SkipSpace - ) ^ 0 - * Q ")" - ) ^ -1 - ) - + - K ( 'Keyword' , P "include" + "open" ) - * Space * K ( 'Name.Module' , cap_identifier ) -local TypeParameter = K ( 'TypeParameter' , "'" * alpha * # ( 1 - P "'" ) ) -local Main = - space ^ 1 * -1 - + space ^ 0 * EOL - + Space - + Tab - + Escape + EscapeMath - + Beamer - + DetectedCommands - + TypeParameter - + String + QuotedString + Char - + Comment - + Delim - + Operator - + Punct - + FromImport - + Exception - + DefFunction - + DefModule - + Record - + Keyword * ( Space + Punct + Delim + EOL + -1 ) - + OperatorWord * ( Space + Punct + Delim + EOL + -1 ) - + Builtin * ( Space + Punct + Delim + EOL + -1 ) - + DotNotation - + Constructor - + Identifier - + Number - + Word + ) ^ -1 + ) + + + K ( 'Keyword.Governing' , P "include" + "open" ) + * Space + * K ( 'Name.Module' , cap_identifier ) + local DefType = + K ( 'Keyword.Governing' , "type" ) + * Space + * K ( 'TypeExpression' , Q ( 1 - P "=" ) ^ 1 ) + * SkipSpace + * ( Q "+=" + Q "=" ) + * SkipSpace + * ( + Record + + + WithStyle + ( + 'TypeExpression' , + ( + ( EOL + Q ( 1 - P ";;" - governing_keyword ) ) ^ 0 + * ( # ( governing_keyword ) + Q ";;" ) + ) + ) + ) + local Main = + space ^ 0 * EOL + + Space + + Tab + + Escape + EscapeMath + + Beamer + + DetectedCommands + + TypeParameter + + String + QuotedString + Char + + Comment + + Operator + + Q "~" * Identifier * ( Q ":" ) ^ -1 + + Q ":" * # (1 - P ":") * SkipSpace + * K ( 'TypeExpression' , balanced_parens ) * SkipSpace * Q ")" + + Exception + + DefType + + DefFunction + + DefModule + + Record + + Keyword * EndKeyword + + OperatorWord * EndKeyword + + Builtin * EndKeyword + + DotNotation + + Constructor + + Identifier + + Punct + + Delim + + Number + + Word + LPEG1.ocaml = Main ^ 0 + LPEG2.ocaml = + Ct ( + ( P ":" + Identifier * SkipSpace * Q ":" ) + * SkipSpace + * K ( 'TypeExpression' , ( 1 - P "\r" ) ^ 0 ) + + + ( space ^ 0 * "\r" ) ^ -1 + * BeamerBeginEnvironments + * Lc [[ \__piton_begin_line: ]] + * SpaceIndentation ^ 0 + * ( ( space * Lc [[ \__piton_trailing_space: ]] ) ^ 1 * -1 + + space ^ 0 * EOL + + Main + ) ^ 0 + * -1 + * Lc [[ \__piton_end_line: ]] + ) +end +do + local Delim = Q ( S "{[()]}" ) + local Punct = Q ( S ",:;!" ) + local identifier = letter * alphanum ^ 0 -LPEG1['ocaml'] = Main ^ 0 -LPEG2['ocaml'] = - Ct ( - ( space ^ 0 * "\r" ) ^ -1 - * BeamerBeginEnvironments - * Lc '\\__piton_begin_line:' - * SpaceIndentation ^ 0 - * LPEG1['ocaml'] - * -1 - * Lc '\\__piton_end_line:' - ) -local Delim = Q ( S "{[()]}" ) -local Punct = Q ( S ",:;!" ) -local identifier = letter * alphanum ^ 0 + local Operator = + K ( 'Operator' , + P "!=" + "==" + "<<" + ">>" + "<=" + ">=" + "||" + "&&" + + S "-~+/*%=<>&.@|!" ) -local Operator = - K ( 'Operator' , - P "!=" + "==" + "<<" + ">>" + "<=" + ">=" + "||" + "&&" - + S "-~+/*%=<>&.@|!" ) + local Keyword = + K ( 'Keyword' , + P "alignas" + "asm" + "auto" + "break" + "case" + "catch" + "class" + + "const" + "constexpr" + "continue" + "decltype" + "do" + "else" + "enum" + + "extern" + "for" + "goto" + "if" + "nexcept" + "private" + "public" + + "register" + "restricted" + "return" + "static" + "static_assert" + + "struct" + "switch" + "thread_local" + "throw" + "try" + "typedef" + + "union" + "using" + "virtual" + "volatile" + "while" + ) + + K ( 'Keyword.Constant' , P "default" + "false" + "NULL" + "nullptr" + "true" ) -local Keyword = - K ( 'Keyword' , - P "alignas" + "asm" + "auto" + "break" + "case" + "catch" + "class" + - "const" + "constexpr" + "continue" + "decltype" + "do" + "else" + "enum" + - "extern" + "for" + "goto" + "if" + "nexcept" + "private" + "public" + - "register" + "restricted" + "return" + "static" + "static_assert" + - "struct" + "switch" + "thread_local" + "throw" + "try" + "typedef" + - "union" + "using" + "virtual" + "volatile" + "while" - ) - + K ( 'Keyword.Constant' , P "default" + "false" + "NULL" + "nullptr" + "true" ) + local Builtin = + K ( 'Name.Builtin' , + P "alignof" + "malloc" + "printf" + "scanf" + "sizeof" ) -local Builtin = - K ( 'Name.Builtin' , - P "alignof" + "malloc" + "printf" + "scanf" + "sizeof" ) + local Type = + K ( 'Name.Type' , + P "bool" + "char" + "char16_t" + "char32_t" + "double" + "float" + "int" + + "int8_t" + "int16_t" + "int32_t" + "int64_t" + "long" + "short" + "signed" + + "unsigned" + "void" + "wchar_t" ) * Q "*" ^ 0 -local Type = - K ( 'Name.Type' , - P "bool" + "char" + "char16_t" + "char32_t" + "double" + "float" + "int" + - "int8_t" + "int16_t" + "int32_t" + "int64_t" + "long" + "short" + "signed" - + "unsigned" + "void" + "wchar_t" ) * Q "*" ^ 0 + local DefFunction = + Type + * Space + * Q "*" ^ -1 + * K ( 'Name.Function.Internal' , identifier ) + * SkipSpace + * # P "(" + local DefClass = + K ( 'Keyword' , "class" ) * Space * K ( 'Name.Class' , identifier ) + String = + WithStyle ( 'String.Long' , + Q "\"" + * ( SpaceInString + + K ( 'String.Interpol' , + "%" * ( S "difcspxXou" + "ld" + "li" + "hd" + "hi" ) + ) + + Q ( ( P "\\\"" + 1 - S " \"" ) ^ 1 ) + ) ^ 0 + * Q "\"" + ) + local braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" ) + if piton.beamer then Beamer = Compute_Beamer ( 'c' , braces ) end + DetectedCommands = Compute_DetectedCommands ( 'c' , braces ) + LPEG_cleaner.c = Compute_LPEG_cleaner ( 'c' , braces ) + local Preproc = K ( 'Preproc' , "#" * ( 1 - P "\r" ) ^ 0 ) * ( EOL + -1 ) + local Comment = + WithStyle ( 'Comment' , + Q "//" * ( CommentMath + Q ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0 ) -- $ + * ( EOL + -1 ) -local DefFunction = - Type - * Space - * Q "*" ^ -1 - * K ( 'Name.Function.Internal' , identifier ) - * SkipSpace - * # P "(" -local DefClass = - K ( 'Keyword' , "class" ) * Space * K ( 'Name.Class' , identifier ) -String = - WithStyle ( 'String.Long' , - Q "\"" - * ( VisualSpace - + K ( 'String.Interpol' , - "%" * ( S "difcspxXou" + "ld" + "li" + "hd" + "hi" ) + local LongComment = + WithStyle ( 'Comment' , + Q "/*" + * ( CommentMath + Q ( ( 1 - P "*/" - S "$\r" ) ^ 1 ) + EOL ) ^ 0 + * Q "*/" + ) -- $ + local EndKeyword + = Space + Punct + Delim + EOL + Beamer + DetectedCommands + Escape + + EscapeMath + -1 + local Main = + space ^ 0 * EOL + + Space + + Tab + + Escape + EscapeMath + + CommentLaTeX + + Beamer + + DetectedCommands + + Preproc + + Comment + LongComment + + Delim + + Operator + + String + + Punct + + DefFunction + + DefClass + + Type * ( Q "*" ^ -1 + EndKeyword ) + + Keyword * EndKeyword + + Builtin * EndKeyword + + Identifier + + Number + + Word + LPEG1.c = Main ^ 0 + LPEG2.c = + Ct ( + ( space ^ 0 * P "\r" ) ^ -1 + * BeamerBeginEnvironments + * Lc [[ \__piton_begin_line: ]] + * SpaceIndentation ^ 0 + * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0 + * -1 + * Lc [[ \__piton_end_line: ]] + ) +end +do + local LuaKeyword + function LuaKeyword ( name ) return + Lc [[ {\PitonStyle{Keyword}{ ]] + * Q ( Cmt ( + C ( letter * alphanum ^ 0 ) , + function ( s , i , a ) return string.upper ( a ) == name end ) - + Q ( ( P "\\\"" + 1 - S " \"" ) ^ 1 ) - ) ^ 0 - * Q "\"" + ) + * Lc "}}" + end + local identifier = + letter * ( alphanum + "-" ) ^ 0 + + P '"' * ( ( 1 - P '"' ) ^ 1 ) * '"' + local Operator = + K ( 'Operator' , P "=" + "!=" + "<>" + ">=" + ">" + "<=" + "<" + S "*+/" ) + local Set + function Set ( list ) + local set = { } + for _ , l in ipairs ( list ) do set[l] = true end + return set + end + local set_keywords = Set + { + "ADD" , "AFTER" , "ALL" , "ALTER" , "AND" , "AS" , "ASC" , "BETWEEN" , "BY" , + "CHANGE" , "COLUMN" , "CREATE" , "CROSS JOIN" , "DELETE" , "DESC" , "DISTINCT" , + "DROP" , "EXCEPT" , "FROM" , "GROUP" , "HAVING" , "IN" , "INNER" , + "INSERT" , "INTERSECT" , "INTO" , "IS" , "JOIN" , "LEFT" , "LIKE" , "LIMIT" , + "MERGE" , "NOT" , "NULL" , "OFFSET" , "ON" , "OR" , "ORDER" , "OVER" , + "RIGHT" , "SELECT" , "SET" , "TABLE" , "THEN" , "TRUNCATE" , "UNION" , + "UPDATE" , "VALUES" , "WHEN" , "WHERE" , "WITH" + } + local set_builtins = Set + { + "AVG" , "COUNT" , "CHAR_LENGHT" , "CONCAT" , "CURDATE" , "CURRENT_DATE" , + "DATE_FORMAT" , "DAY" , "LOWER" , "LTRIM" , "MAX" , "MIN" , "MONTH" , "NOW" , + "RANK" , "ROUND" , "RTRIM" , "SUBSTRING" , "SUM" , "UPPER" , "YEAR" + } + local Identifier = + C ( identifier ) / + ( + function ( s ) + if set_keywords[string.upper(s)] then return + { [[{\PitonStyle{Keyword}{]] } , + { luatexbase.catcodetables.other , s } , + { "}}" } + else + if set_builtins[string.upper(s)] then return + { [[{\PitonStyle{Name.Builtin}{]] } , + { luatexbase.catcodetables.other , s } , + { "}}" } + else return + { [[{\PitonStyle{Name.Field}{]] } , + { luatexbase.catcodetables.other , s } , + { "}}" } + end + end + end ) -braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" ) -if piton.beamer then Beamer = Compute_Beamer ( 'c' , braces ) end -DetectedCommands = Compute_DetectedCommands ( 'c' , braces ) -LPEG_cleaner['c'] = Compute_LPEG_cleaner ( 'c' , braces ) -local Preproc = K ( 'Preproc' , "#" * ( 1 - P "\r" ) ^ 0 ) * ( EOL + -1 ) -local Comment = - WithStyle ( 'Comment' , - Q "//" * ( CommentMath + Q ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0 ) -- $ - * ( EOL + -1 ) + local String = K ( 'String.Long' , "'" * ( 1 - P "'" ) ^ 1 * "'" ) + local braces = Compute_braces ( "'" * ( 1 - P "'" ) ^ 1 * "'" ) + if piton.beamer then Beamer = Compute_Beamer ( 'sql' , braces ) end + DetectedCommands = Compute_DetectedCommands ( 'sql' , braces ) + LPEG_cleaner.sql = Compute_LPEG_cleaner ( 'sql' , braces ) + local Comment = + WithStyle ( 'Comment' , + Q "--" -- syntax of SQL92 + * ( CommentMath + Q ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0 ) -- $ + * ( EOL + -1 ) -local LongComment = - WithStyle ( 'Comment' , - Q "/*" - * ( CommentMath + Q ( ( 1 - P "*/" - S "$\r" ) ^ 1 ) + EOL ) ^ 0 - * Q "*/" - ) -- $ -local Main = - space ^ 1 * -1 - + space ^ 0 * EOL - + Space - + Tab - + Escape + EscapeMath - + CommentLaTeX - + Beamer - + DetectedCommands - + Preproc - + Comment + LongComment - + Delim - + Operator - + String - + Punct - + DefFunction - + DefClass - + Type * ( Q "*" ^ -1 + Space + Punct + Delim + EOL + -1 ) - + Keyword * ( Space + Punct + Delim + EOL + -1 ) - + Builtin * ( Space + Punct + Delim + EOL + -1 ) - + Identifier - + Number - + Word -LPEG1['c'] = Main ^ 0 -LPEG2['c'] = - Ct ( - ( space ^ 0 * P "\r" ) ^ -1 - * BeamerBeginEnvironments - * Lc '\\__piton_begin_line:' - * SpaceIndentation ^ 0 - * LPEG1['c'] - * -1 - * Lc '\\__piton_end_line:' - ) -local function LuaKeyword ( name ) -return - Lc [[{\PitonStyle{Keyword}{]] - * Q ( Cmt ( - C ( identifier ) , - function ( s , i , a ) return string.upper ( a ) == name end - ) - ) - * Lc "}}" -end -local identifier = - letter * ( alphanum + "-" ) ^ 0 - + '"' * ( ( alphanum + space - '"' ) ^ 1 ) * '"' + local LongComment = + WithStyle ( 'Comment' , + Q "/*" + * ( CommentMath + Q ( ( 1 - P "*/" - S "$\r" ) ^ 1 ) + EOL ) ^ 0 + * Q "*/" + ) -- $ + local EndKeyword + = Space + Punct + Delim + EOL + Beamer + DetectedCommands + Escape + + EscapeMath + -1 + local TableField = + K ( 'Name.Table' , identifier ) + * Q "." + * K ( 'Name.Field' , identifier ) -local Operator = - K ( 'Operator' , P "=" + "!=" + "<>" + ">=" + ">" + "<=" + "<" + S "*+/" ) -local function Set ( list ) - local set = { } - for _, l in ipairs ( list ) do set[l] = true end - return set -end + local OneField = + ( + Q ( "(" * ( 1 - P ")" ) ^ 0 * ")" ) + + + K ( 'Name.Table' , identifier ) + * Q "." + * K ( 'Name.Field' , identifier ) + + + K ( 'Name.Field' , identifier ) + ) + * ( + Space * LuaKeyword "AS" * Space * K ( 'Name.Field' , identifier ) + ) ^ -1 + * ( Space * ( LuaKeyword "ASC" + LuaKeyword "DESC" ) ) ^ -1 -local set_keywords = Set - { - "ADD" , "AFTER" , "ALL" , "ALTER" , "AND" , "AS" , "ASC" , "BETWEEN" , "BY" , - "CHANGE" , "COLUMN" , "CREATE" , "CROSS JOIN" , "DELETE" , "DESC" , "DISTINCT" , - "DROP" , "FROM" , "GROUP" , "HAVING" , "IN" , "INNER" , "INSERT" , "INTO" , "IS" , - "JOIN" , "LEFT" , "LIKE" , "LIMIT" , "MERGE" , "NOT" , "NULL" , "ON" , "OR" , - "ORDER" , "OVER" , "RIGHT" , "SELECT" , "SET" , "TABLE" , "THEN" , "TRUNCATE" , - "UNION" , "UPDATE" , "VALUES" , "WHEN" , "WHERE" , "WITH" - } + local OneTable = + K ( 'Name.Table' , identifier ) + * ( + Space + * LuaKeyword "AS" + * Space + * K ( 'Name.Table' , identifier ) + ) ^ -1 -local set_builtins = Set - { - "AVG" , "COUNT" , "CHAR_LENGHT" , "CONCAT" , "CURDATE" , "CURRENT_DATE" , - "DATE_FORMAT" , "DAY" , "LOWER" , "LTRIM" , "MAX" , "MIN" , "MONTH" , "NOW" , - "RANK" , "ROUND" , "RTRIM" , "SUBSTRING" , "SUM" , "UPPER" , "YEAR" - } -local Identifier = - C ( identifier ) / - ( - function (s) - if set_keywords[string.upper(s)] -- the keywords are case-insensitive in SQL - then return { "{\\PitonStyle{Keyword}{" } , - { luatexbase.catcodetables.other , s } , - { "}}" } - else if set_builtins[string.upper(s)] - then return { "{\\PitonStyle{Name.Builtin}{" } , - { luatexbase.catcodetables.other , s } , - { "}}" } - else return { "{\\PitonStyle{Name.Field}{" } , - { luatexbase.catcodetables.other , s } , - { "}}" } - end - end - end - ) -local String = K ( 'String.Long' , "'" * ( 1 - P "'" ) ^ 1 * "'" ) -braces = Compute_braces ( String ) -if piton.beamer then Beamer = Compute_Beamer ( 'sql' , braces ) end -DetectedCommands = Compute_DetectedCommands ( 'sql' , braces ) -LPEG_cleaner['sql'] = Compute_LPEG_cleaner ( 'sql' , braces ) -local Comment = - WithStyle ( 'Comment' , - Q "--" -- syntax of SQL92 - * ( CommentMath + Q ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0 ) -- $ - * ( EOL + -1 ) + local WeCatchTableNames = + LuaKeyword "FROM" + * ( Space + EOL ) + * OneTable * ( SkipSpace * Q "," * SkipSpace * OneTable ) ^ 0 + + ( + LuaKeyword "JOIN" + LuaKeyword "INTO" + LuaKeyword "UPDATE" + + LuaKeyword "TABLE" + ) + * ( Space + EOL ) * OneTable + local EndKeyword + = Space + Punct + Delim + EOL + Beamer + + DetectedCommands + Escape + EscapeMath + -1 + local Main = + space ^ 0 * EOL + + Space + + Tab + + Escape + EscapeMath + + CommentLaTeX + + Beamer + + DetectedCommands + + Comment + LongComment + + Delim + + Operator + + String + + Punct + + WeCatchTableNames + + ( TableField + Identifier ) * ( Space + Operator + Punct + Delim + EOL + -1 ) + + Number + + Word + LPEG1.sql = Main ^ 0 + LPEG2.sql = + Ct ( + ( space ^ 0 * "\r" ) ^ -1 + * BeamerBeginEnvironments + * Lc [[ \__piton_begin_line: ]] + * SpaceIndentation ^ 0 + * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0 + * -1 + * Lc [[ \__piton_end_line: ]] + ) +end +do + local Punct = Q ( S ",:;!\\" ) -local LongComment = - WithStyle ( 'Comment' , - Q "/*" - * ( CommentMath + Q ( ( 1 - P "*/" - S "$\r" ) ^ 1 ) + EOL ) ^ 0 - * Q "*/" - ) -- $ -local TableField = - K ( 'Name.Table' , identifier ) - * Q "." - * K ( 'Name.Field' , identifier ) + local Comment = + WithStyle ( 'Comment' , + Q "#" + * ( CommentMath + Q ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0 -- $ + ) + * ( EOL + -1 ) -local OneField = - ( - Q ( "(" * ( 1 - P ")" ) ^ 0 * ")" ) - + - K ( 'Name.Table' , identifier ) - * Q "." - * K ( 'Name.Field' , identifier ) - + - K ( 'Name.Field' , identifier ) - ) - * ( - Space * LuaKeyword "AS" * Space * K ( 'Name.Field' , identifier ) - ) ^ -1 - * ( Space * ( LuaKeyword "ASC" + LuaKeyword "DESC" ) ) ^ -1 + local String = + WithStyle ( 'String.Short' , + Q "\"" + * ( SpaceInString + + Q ( ( P "\\\"" + 1 - S " \"" ) ^ 1 ) + ) ^ 0 + * Q "\"" + ) + local braces = Compute_braces ( P "\"" * ( P "\\\"" + 1 - P "\"" ) ^ 1 * "\"" ) -local OneTable = - K ( 'Name.Table' , identifier ) - * ( - Space - * LuaKeyword "AS" - * Space - * K ( 'Name.Table' , identifier ) - ) ^ -1 + if piton.beamer then Beamer = Compute_Beamer ( 'minimal' , braces ) end -local WeCatchTableNames = - LuaKeyword "FROM" - * ( Space + EOL ) - * OneTable * ( SkipSpace * Q "," * SkipSpace * OneTable ) ^ 0 - + ( - LuaKeyword "JOIN" + LuaKeyword "INTO" + LuaKeyword "UPDATE" - + LuaKeyword "TABLE" - ) - * ( Space + EOL ) * OneTable -local Main = - space ^ 1 * -1 - + space ^ 0 * EOL - + Space - + Tab - + Escape + EscapeMath - + CommentLaTeX - + Beamer - + DetectedCommands - + Comment + LongComment - + Delim - + Operator - + String - + Punct - + WeCatchTableNames - + ( TableField + Identifier ) * ( Space + Operator + Punct + Delim + EOL + -1 ) - + Number - + Word -LPEG1['sql'] = Main ^ 0 -LPEG2['sql'] = - Ct ( - ( space ^ 0 * "\r" ) ^ -1 - * BeamerBeginEnvironments - * Lc [[ \__piton_begin_line: ]] - * SpaceIndentation ^ 0 - * LPEG1['sql'] - * -1 - * Lc [[ \__piton_end_line: ]] - ) -local Punct = Q ( S ",:;!\\" ) + DetectedCommands = Compute_DetectedCommands ( 'minimal' , braces ) -local Comment = - WithStyle ( 'Comment' , - Q "#" - * ( CommentMath + Q ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0 -- $ - ) - * ( EOL + -1 ) + LPEG_cleaner.minimal = Compute_LPEG_cleaner ( 'minimal' , braces ) -local String = - WithStyle ( 'String.Short' , - Q "\"" - * ( VisualSpace - + Q ( ( P "\\\"" + 1 - S " \"" ) ^ 1 ) - ) ^ 0 - * Q "\"" - ) + local identifier = letter * alphanum ^ 0 -braces = Compute_braces ( String ) -if piton.beamer then Beamer = Compute_Beamer ( 'minimal' , braces ) end + local Identifier = K ( 'Identifier.Internal' , identifier ) -DetectedCommands = Compute_DetectedCommands ( 'minimal' , braces ) + local Delim = Q ( S "{[()]}" ) -LPEG_cleaner['minimal'] = Compute_LPEG_cleaner ( 'minimal' , braces ) + local Main = + space ^ 0 * EOL + + Space + + Tab + + Escape + EscapeMath + + CommentLaTeX + + Beamer + + DetectedCommands + + Comment + + Delim + + String + + Punct + + Identifier + + Number + + Word + LPEG1.minimal = Main ^ 0 -local identifier = letter * alphanum ^ 0 + LPEG2.minimal = + Ct ( + ( space ^ 0 * "\r" ) ^ -1 + * BeamerBeginEnvironments + * Lc [[ \__piton_begin_line: ]] + * SpaceIndentation ^ 0 + * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0 + * -1 + * Lc [[ \__piton_end_line: ]] + ) +end +do -local Identifier = K ( 'Identifier' , identifier ) + local braces = + P { "E" , + E = ( "{" * V "E" * "}" + ( 1 - S "{}" ) ) ^ 0 + } -local Delim = Q ( S "{[()]}" ) + if piton.beamer then Beamer = Compute_Beamer ( 'verbatim' , braces ) end -local Main = - space ^ 1 * -1 - + space ^ 0 * EOL - + Space - + Tab - + Escape + EscapeMath - + CommentLaTeX - + Beamer - + DetectedCommands - + Comment - + Delim - + String - + Punct - + Identifier - + Number - + Word + DetectedCommands = Compute_DetectedCommands ( 'verbatim' , braces ) -LPEG1['minimal'] = Main ^ 0 + LPEG_cleaner.verbatim = Compute_LPEG_cleaner ( 'verbatim' , braces ) + local lpeg_central = 1 - S " \\\r" + if piton.begin_escape then + lpeg_central = lpeg_central - piton.begin_escape + end + if piton.begin_escape_math then + lpeg_central = lpeg_central - piton.begin_escape_math + end + local Word = Q ( lpeg_central ^ 1 ) -LPEG2['minimal'] = - Ct ( - ( space ^ 0 * "\r" ) ^ -1 - * BeamerBeginEnvironments - * Lc [[ \__piton_begin_line: ]] - * SpaceIndentation ^ 0 - * LPEG1['minimal'] - * -1 - * Lc [[ \__piton_end_line: ]] - ) + local Main = + space ^ 0 * EOL + + Space + + Tab + + Escape + EscapeMath + + Beamer + + DetectedCommands + + Q [[\]] + + Word + LPEG1.verbatim = Main ^ 0 + LPEG2.verbatim = + Ct ( + ( space ^ 0 * "\r" ) ^ -1 + * BeamerBeginEnvironments + * Lc [[ \__piton_begin_line: ]] + * SpaceIndentation ^ 0 + * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0 + * -1 + * Lc [[ \__piton_end_line: ]] + ) +end function piton.Parse ( language , code ) + piton.language = language local t = LPEG2[language] : match ( code ) - if t == nil - then - sprintL3 [[ \__piton_error_or_warning:n { syntax~error } ]] + if t == nil then + sprintL3 [[ \__piton_error_or_warning:n { SyntaxError } ]] return -- to exit in force the function end local left_stack = {} @@ -1132,7 +1301,9 @@ function piton.Parse ( language , code ) end end end -function piton.ParseFile ( language , name , first_line , last_line , split ) + +function piton.ParseFile + ( lang , name , first_line , last_line , splittable , split ) local s = '' local i = 0 for line in io.lines ( name ) do @@ -1152,21 +1323,26 @@ function piton.ParseFile ( language , name , first_line , last_line , split ) end end if split == 1 then - piton.GobbleSplitParse ( language , 0 , s ) + piton.RetrieveGobbleSplitParse ( lang , 0 , splittable , s ) else - sprintL3 [[ \bool_if:NT \g__piton_footnote_bool \savenotes \vtop \bgroup ]] - piton.Parse ( language , s ) - sprintL3 - [[\vspace{2.5pt}\egroup\bool_if:NT\g__piton_footnote_bool\endsavenotes\par]] + piton.RetrieveGobbleParse ( lang , 0 , splittable , s ) end end +function piton.RetrieveGobbleParse ( lang , n , splittable , code ) + local s + s = ( ( P " " ^ 0 * "\r" ) ^ -1 * C ( P ( 1 ) ^ 0 ) * -1 ) : match ( code ) + piton.GobbleParse ( lang , n , splittable , s ) +end function piton.ParseBis ( lang , code ) local s = ( Cs ( ( P '##' / '#' + 1 ) ^ 0 ) ) : match ( code ) return piton.Parse ( lang , s ) end function piton.ParseTer ( lang , code ) - local s = ( Cs ( ( P [[\__piton_breakable_space: ]] / ' ' + 1 ) ^ 0 ) ) - : match ( code ) + local s + s = ( Cs ( ( P [[\__piton_breakable_space: ]] / ' ' + 1 ) ^ 0 ) ) + : match ( code ) + s = ( Cs ( ( P [[\__piton_leading_space: ]] / '' + 1 ) ^ 0 ) ) + : match ( s ) return piton.Parse ( lang , s ) end local AutoGobbleLPEG = @@ -1193,18 +1369,20 @@ local TabsAutoGobbleLPEG = local EnvGobbleLPEG = ( ( 1 - P "\r" ) ^ 0 * "\r" ) ^ 0 * Ct ( C " " ^ 0 * -1 ) / table.getn -local function remove_before_cr ( input_string ) - local match_result = ( P "\r" ) : match ( input_string ) - if match_result then - return string.sub ( input_string , match_result ) - else - return input_string - end +local remove_before_cr +function remove_before_cr ( input_string ) + local match_result = ( P "\r" ) : match ( input_string ) + if match_result then return + string.sub ( input_string , match_result ) + else return + input_string + end end -local function gobble ( n , code ) +local gobble +function gobble ( n , code ) code = remove_before_cr ( code ) - if n == 0 then - return code + if n == 0 then return + code else if n == -1 then n = AutoGobbleLPEG : match ( code ) @@ -1217,10 +1395,9 @@ local function gobble ( n , code ) end end end - if n == 0 then - return code - else - return + if n == 0 then return + code + else return ( Ct ( ( 1 - P "\r" ) ^ (-n) * C ( ( 1 - P "\r" ) ^ 0 ) * ( C "\r" * ( 1 - P "\r" ) ^ (-n) * C ( ( 1 - P "\r" ) ^ 0 ) @@ -1230,41 +1407,78 @@ local function gobble ( n , code ) end end end -function piton.GobbleParse ( lang , n , code ) +function piton.GobbleParse ( lang , n , splittable , code ) + piton.ComputeLinesStatus ( code , splittable ) piton.last_code = gobble ( n , code ) piton.last_language = lang - sprintL3 [[ \bool_if:NT \g__piton_footnote_bool \savenotes \vtop \bgroup ]] + piton.CountLines ( piton.last_code ) + sprintL3 [[ \bool_if:NT \g__piton_footnote_bool \savenotes ]] piton.Parse ( lang , piton.last_code ) - sprintL3 - [[\vspace{2.5pt}\egroup\bool_if:NT\g__piton_footnote_bool\endsavenotes\par]] + sprintL3 [[ \vspace{2.5pt} ]] + sprintL3 [[ \bool_if:NT \g__piton_footnote_bool \endsavenotes ]] + sprintL3 [[ \par ]] if piton.write and piton.write ~= '' then - local file = assert ( io.open ( piton.write , piton.write_mode ) ) - file:write ( piton.get_last_code ( ) ) - file:close ( ) + local file = io.open ( piton.write , piton.write_mode ) + if file then + file : write ( piton.get_last_code ( ) ) + file : close ( ) + else + sprintL3 [[ \__piton_error_or_warning:n { FileError } ]] + end end end -function piton.GobbleSplitParse ( lang , n , code ) - P { "E" , - E = ( V "F" - * ( P " " ^ 0 * "\r" - / ( function ( x ) sprintL3 [[ \__piton_incr_visual_line: ]] end ) - ) ^ 1 - / ( function ( x ) - sprintL3 [[ \l__piton_split_separation_tl \int_gzero:N \g__piton_line_int ]] - end ) - ) ^ 0 * V "F" , - F = C ( V "G" ^ 0 ) - / ( function ( x ) piton.GobbleParse ( lang , 0 , x ) end ) , - G = ( 1 - P "\r" ) ^ 0 * "\r" - ( P " " ^ 0 * "\r" ) - } : match ( gobble ( n , code ) ) +function piton.GobbleSplitParse ( lang , n , splittable , code ) + local chunks + chunks = + ( + Ct ( + ( + P " " ^ 0 * "\r" + + + C ( ( ( 1 - P "\r" ) ^ 1 * "\r" - ( P " " ^ 0 * "\r" ) ) ^ 1 ) + ) ^ 0 + ) + ) : match ( gobble ( n , code ) ) + sprintL3 [[ \begingroup ]] + sprintL3 + ( + [[ \PitonOptions { split-on-empty-lines = false, gobble = 0, ]] + .. "language = " .. lang .. "," + .. "splittable = " .. splittable .. "}" + ) + for k , v in pairs ( chunks ) do + if k > 1 then + sprintL3 [[ \l__piton_split_separation_tl ]] + end + tex.sprint + ( + [[\begin{]] .. piton.env_used_by_split .. "}\r" + .. v + .. [[\end{]] .. piton.env_used_by_split .. "}" + ) + end + sprintL3 [[ \endgroup ]] +end +function piton.RetrieveGobbleSplitParse ( lang , n , splittable , code ) + local s + s = ( ( P " " ^ 0 * "\r" ) ^ -1 * C ( P ( 1 ) ^ 0 ) * -1 ) : match ( code ) + piton.GobbleSplitParse ( lang , n , splittable , s ) end +piton.string_between_chunks = + [[ \par \l__piton_split_separation_tl \mode_leave_vertical: ]] + .. [[ \int_gzero:N \g__piton_line_int ]] function piton.get_last_code ( ) return LPEG_cleaner[piton.last_language] : match ( piton.last_code ) end function piton.CountLines ( code ) local count = 0 - for i in code : gmatch ( "\r" ) do count = count + 1 end - sprintL3 ( [[ \int_set:Nn \l__piton_nb_lines_int { ]] .. count .. '}' ) + count = + ( Ct ( ( ( 1 - P "\r" ) ^ 0 * C "\r" ) ^ 0 + * ( ( 1 - P "\r" ) ^ 1 * Cc "\r" ) ^ -1 + * -1 + ) / table.getn + ) : match ( code ) + sprintL3 ( string.format ( [[ \int_set:Nn \l__piton_nb_lines_int { %i } ]] , count ) ) end function piton.CountNonEmptyLines ( code ) local count = 0 @@ -1275,21 +1489,24 @@ function piton.CountNonEmptyLines ( code ) * -1 ) / table.getn ) : match ( code ) - sprintL3 ( [[ \int_set:Nn \l__piton_nb_non_empty_lines_int { ]] .. count .. '}' ) + sprintL3 + ( string.format ( [[ \int_set:Nn \l__piton_nb_non_empty_lines_int { %i } ]] , count ) ) end function piton.CountLinesFile ( name ) local count = 0 for line in io.lines ( name ) do count = count + 1 end - sprintL3 ( [[ \int_set:Nn \l__piton_nb_lines_int { ]] .. count .. '}' ) + sprintL3 + ( string.format ( [[ \int_set:Nn \l__piton_nb_lines_int { %i } ]], count ) ) end function piton.CountNonEmptyLinesFile ( name ) local count = 0 - for line in io.lines ( name ) - do if not ( ( P " " ^ 0 * -1 ) : match ( line ) ) then + for line in io.lines ( name ) do + if not ( ( P " " ^ 0 * -1 ) : match ( line ) ) then count = count + 1 - end + end end - sprintL3 ( [[ \int_set:Nn \l__piton_nb_non_empty_lines_int { ]] .. count .. '}' ) + sprintL3 + ( string.format ( [[ \int_set:Nn \l__piton_nb_non_empty_lines_int { % i } ]] , count ) ) end function piton.ComputeRange(marker_beginning,marker_end,file_name) local s = ( Cs ( ( P '##' / '#' + 1 ) ^ 0 ) ) : match ( marker_beginning ) @@ -1297,58 +1514,135 @@ function piton.ComputeRange(marker_beginning,marker_end,file_name) local first_line = -1 local count = 0 local last_found = false - for line in io.lines ( file_name ) - do if first_line == -1 - then if string.sub ( line , 1 , #s ) == s - then first_line = count - end - else if string.sub ( line , 1 , #t ) == t - then last_found = true - break - end - end - count = count + 1 + for line in io.lines ( file_name ) do + if first_line == -1 then + if string.sub ( line , 1 , #s ) == s then + first_line = count + end + else + if string.sub ( line , 1 , #t ) == t then + last_found = true + break + end + end + count = count + 1 end - if first_line == -1 - then sprintL3 [[ \__piton_error_or_warning:n { begin~marker~not~found } ]] - else if last_found == false - then sprintL3 [[ \__piton_error_or_warning:n { end~marker~not~found } ]] - end + if first_line == -1 then + sprintL3 [[ \__piton_error_or_warning:n { begin~marker~not~found } ]] + else + if last_found == false then + sprintL3 [[ \__piton_error_or_warning:n { end~marker~not~found } ]] + end end sprintL3 ( [[ \int_set:Nn \l__piton_first_line_int { ]] .. first_line .. ' + 2 }' .. [[ \int_set:Nn \l__piton_last_line_int { ]] .. count .. ' }' ) end +function piton.ComputeLinesStatus ( code , splittable ) + local lpeg_line_beamer + if piton.beamer then + lpeg_line_beamer = + space ^ 0 + * P [[\begin{]] * piton.BeamerEnvironments * "}" + * ( "<" * ( 1 - P ">" ) ^ 0 * ">" ) ^ -1 + + + space ^ 0 + * P [[\end{]] * piton.BeamerEnvironments * "}" + else + lpeg_line_beamer = P ( false ) + end + local lpeg_empty_lines = + Ct ( + ( lpeg_line_beamer * "\r" + + + P " " ^ 0 * "\r" * Cc ( 0 ) + + + ( 1 - P "\r" ) ^ 0 * "\r" * Cc ( 1 ) + ) ^ 0 + * + ( lpeg_line_beamer + ( 1 - P "\r" ) ^ 1 * Cc ( 1 ) ) ^ -1 + ) + * -1 + local lpeg_all_lines = + Ct ( + ( lpeg_line_beamer * "\r" + + + ( 1 - P "\r" ) ^ 0 * "\r" * Cc ( 1 ) + ) ^ 0 + * + ( lpeg_line_beamer + ( 1 - P "\r" ) ^ 1 * Cc ( 1 ) ) ^ -1 + ) + * -1 + piton.empty_lines = lpeg_empty_lines : match ( code ) + local lines_status + local s = splittable + if splittable < 0 then s = - splittable end + if splittable > 0 then + lines_status = lpeg_all_lines : match ( code ) + else + lines_status = lpeg_empty_lines : match ( code ) + for i , x in ipairs ( lines_status ) do + if x == 0 then + for j = 1 , s - 1 do + if i + j > #lines_status then break end + if lines_status[i+j] == 0 then break end + lines_status[i+j] = 2 + end + for j = 1 , s - 1 do + if i - j == 1 then break end + if lines_status[i-j-1] == 0 then break end + lines_status[i-j-1] = 2 + end + end + end + end + for j = 1 , s - 1 do + if j > #lines_status then break end + if lines_status[j] == 0 then break end + lines_status[j] = 2 + end + for j = 1 , s - 1 do + if #lines_status - j == 0 then break end + if lines_status[#lines_status - j] == 0 then break end + lines_status[#lines_status - j] = 2 + end + piton.lines_status = lines_status +end function piton.new_language ( lang , definition ) lang = string.lower ( lang ) local alpha , digit = lpeg.alpha , lpeg.digit local extra_letters = { "@" , "_" , "$" } -- $ function add_to_letter ( c ) - if c ~= " " then table.insert ( extra_letters , c ) end + if c ~= " " then table.insert ( extra_letters , c ) end end function add_to_digit ( c ) - if c ~= " " then digit = digit + c end + if c ~= " " then digit = digit + c end end local other = S ":_@+-*/<>!?;.()[]~^=#&\"\'\\$" -- $ local extra_others = { } function add_to_other ( c ) - if c ~= " " then - extra_others[c] = true - other = other + P "c" - end + if c ~= " " then + extra_others[c] = true + other = other + P ( c ) + end + end + local def_table + if ( S ", " ^ 0 * -1 ) : match ( definition ) then + def_table = {} + else + local strict_braces = + P { "E" , + E = ( "{" * V "F" * "}" + ( 1 - S ",{}" ) ) ^ 0 , + F = ( "{" * V "F" * "}" + ( 1 - S "{}" ) ) ^ 0 + } + local cut_definition = + P { "E" , + E = Ct ( V "F" * ( "," * V "F" ) ^ 0 ) , + F = Ct ( space ^ 0 * C ( alpha ^ 1 ) * space ^ 0 + * ( "=" * space ^ 0 * C ( strict_braces ) ) ^ -1 ) + } + def_table = cut_definition : match ( definition ) end - local strict_braces = - P { "E" , - E = ( "{" * V "F" * "}" + ( 1 - S ",{}" ) ) ^ 0 , - F = ( "{" * V "F" * "}" + ( 1 - S "{}" ) ) ^ 0 - } - local cut_definition = - P { "E" , - E = Ct ( V "F" * ( "," * V "F" ) ^ 0 ) , - F = Ct ( space ^ 0 * C ( alpha ^ 1 ) * space ^ 0 - * ( "=" * space ^ 0 * C ( strict_braces ) ) ^ -1 ) - } - local def_table = cut_definition : match ( definition ) local tex_braced_arg = "{" * C ( ( 1 - P "}" ) ^ 0 ) * "}" local tex_arg = tex_braced_arg + C ( 1 ) local tex_option_arg = "[" * C ( ( 1 - P "]" ) ^ 0 ) * "]" + Cc ( nil ) @@ -1413,7 +1707,7 @@ function piton.new_language ( lang , definition ) + "Ï" + "Î" + "Ô" + "Û" + "Ü" local alphanum = letter + digit local identifier = letter * alphanum ^ 0 - local Identifier = K ( 'Identifier' , identifier ) + local Identifier = K ( 'Identifier.Internal' , identifier ) local split_clist = P { "E" , E = ( "[" * ( 1 - P "]" ) ^ 0 * "]" ) ^ -1 @@ -1422,11 +1716,13 @@ function piton.new_language ( lang , definition ) * ( P "}" ) ^ 1 * space ^ 0 , F = space ^ 0 * C ( letter * alphanum ^ 0 + other ^ 1 ) * space ^ 0 } - local function keyword_to_lpeg ( name ) - return + local keyword_to_lpeg + function keyword_to_lpeg ( name ) return Q ( Cmt ( C ( identifier ) , - function(s,i,a) return string.upper(a) == string.upper(name) end + function ( s , i , a ) return + string.upper ( a ) == string.upper ( name ) + end ) ) end @@ -1440,7 +1736,7 @@ function piton.new_language ( lang , definition ) then local keywords = P ( false ) local style = [[\PitonStyle{Keyword}]] - if x[1] == "moredirectives" then style = [[ \PitonStyle{Directive} ]] end + if x[1] == "moredirectives" then style = [[\PitonStyle{Directive}]] end style = tex_option_arg : match ( x[2] ) or style local n = tonumber ( style ) if n then @@ -1466,6 +1762,7 @@ function piton.new_language ( lang , definition ) end end local long_string = P ( false ) + local Long_string = P ( false ) local LongString = P (false ) local central_pattern = P ( false ) for _ , x in ipairs ( def_table ) do @@ -1483,23 +1780,27 @@ function piton.new_language ( lang , definition ) central_pattern = P ( arg3 .. arg3 ) + central_pattern end if arg1 == "m" - then prefix = lpeg.B ( 1 - letter - ")" - "]" ) + then prefix = B ( 1 - letter - ")" - "]" ) else prefix = P ( true ) end + long_string = long_string + + prefix + * arg3 + * ( space + central_pattern ) ^ 0 + * arg4 local pattern = prefix * Q ( arg3 ) - * ( VisualSpace + Q ( central_pattern ^ 1 ) + EOL ) ^ 0 + * ( SpaceInString + Q ( central_pattern ^ 1 ) + EOL ) ^ 0 * Q ( arg4 ) - long_string = long_string + pattern + Long_string = Long_string + pattern LongString = LongString + Ct ( Cc "Open" * Cc ( "{" .. arg2 .. "{" ) * Cc "}}" ) * pattern * Ct ( Cc "Close" ) end end - - local braces = Compute_braces ( String ) + local braces = Compute_braces ( long_string ) if piton.beamer then Beamer = Compute_Beamer ( lang , braces ) end DetectedCommands = Compute_DetectedCommands ( lang , braces ) @@ -1519,7 +1820,7 @@ function piton.new_language ( lang , definition ) CommentDelim = CommentDelim + Ct ( Cc "Open" * Cc ( "{" .. arg2 .. "{" ) * Cc "}}" ) - * Q ( arg3 ) + * Q ( arg3 ) * ( CommentMath + Q ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0 -- $ * Ct ( Cc "Close" ) * ( EOL + -1 ) @@ -1563,7 +1864,11 @@ function piton.new_language ( lang , definition ) = args_for_moredelims : match ( x[2] ) local MyFun = Q if arg1 == "*" or arg1 == "**" then - MyFun = function ( x ) return K ( 'ParseAgain.noCR' , x ) end + function MyFun ( x ) + if x ~= '' then return + LPEG1[lang] : match ( x ) + end + end end local left_delim if arg2 : match "i" then @@ -1599,8 +1904,7 @@ function piton.new_language ( lang , definition ) local Delim = Q ( S "{[()]}" ) local Punct = Q ( S "=,:;!\\'\"" ) local Main = - space ^ 1 * -1 - + space ^ 0 * EOL + space ^ 0 * EOL + Space + Tab + Escape + EscapeMath @@ -1613,7 +1917,7 @@ function piton.new_language ( lang , definition ) + PrefixedKeyword + Keyword * ( -1 + # ( 1 - alphanum ) ) + Punct - + K ( 'Identifier' , letter * alphanum ^ 0 ) + + K ( 'Identifier.Internal' , letter * alphanum ^ 0 ) + Number + Word LPEG1[lang] = Main ^ 0 @@ -1621,11 +1925,11 @@ function piton.new_language ( lang , definition ) Ct ( ( space ^ 0 * P "\r" ) ^ -1 * BeamerBeginEnvironments - * Lc [[\__piton_begin_line:]] + * Lc [[ \__piton_begin_line: ]] * SpaceIndentation ^ 0 - * LPEG1[lang] + * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0 * -1 - * Lc [[\__piton_end_line:]] + * Lc [[ \__piton_end_line: ]] ) if left_tag then local Tag = Ct ( Cc "Open" * Cc ( "{" .. style_tag .. "{" ) * Cc "}}" ) @@ -1649,7 +1953,7 @@ function piton.new_language ( lang , definition ) + PrefixedKeyword + Keyword * ( -1 + # ( 1 - alphanum ) ) + Punct - + K ( 'Identifier' , letter * alphanum ^ 0 ) + + K ( 'Identifier.Internal' , letter * alphanum ^ 0 ) + Number + Word LPEG0[lang] = MainWithoutTag ^ 0 @@ -1666,11 +1970,11 @@ function piton.new_language ( lang , definition ) Ct ( ( space ^ 0 * P "\r" ) ^ -1 * BeamerBeginEnvironments - * Lc [[\__piton_begin_line:]] + * Lc [[ \__piton_begin_line: ]] * SpaceIndentation ^ 0 * LPEG1[lang] * -1 - * Lc [[\__piton_end_line:]] + * Lc [[ \__piton_end_line: ]] ) end end |