rouge 3.3.0 → 3.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (216) hide show
  1. checksums.yaml +5 -5
  2. data/Gemfile +15 -3
  3. data/lib/rouge.rb +49 -41
  4. data/lib/rouge/cli.rb +64 -15
  5. data/lib/rouge/demos/ada +26 -0
  6. data/lib/rouge/demos/armasm +12 -0
  7. data/lib/rouge/demos/batchfile +3 -0
  8. data/lib/rouge/demos/bbcbasic +6 -0
  9. data/lib/rouge/demos/bpf +7 -0
  10. data/lib/rouge/demos/brainfuck +5 -0
  11. data/lib/rouge/demos/cmhg +8 -0
  12. data/lib/rouge/demos/cuda +11 -0
  13. data/lib/rouge/demos/cython +6 -0
  14. data/lib/rouge/demos/epp +4 -0
  15. data/lib/rouge/demos/escape +3 -0
  16. data/lib/rouge/demos/gdscript +18 -0
  17. data/lib/rouge/demos/hocon +8 -0
  18. data/lib/rouge/demos/magik +6 -0
  19. data/lib/rouge/demos/mason +22 -0
  20. data/lib/rouge/demos/msgtrans +4 -0
  21. data/lib/rouge/demos/openedge +4 -0
  22. data/lib/rouge/demos/opentype_feature_file +6 -0
  23. data/lib/rouge/demos/plist +1 -132
  24. data/lib/rouge/demos/powershell +12 -48
  25. data/lib/rouge/demos/reasonml +12 -0
  26. data/lib/rouge/demos/sas +13 -0
  27. data/lib/rouge/demos/supercollider +11 -0
  28. data/lib/rouge/demos/xojo +14 -0
  29. data/lib/rouge/demos/xpath +2 -0
  30. data/lib/rouge/demos/xquery +22 -0
  31. data/lib/rouge/formatter.rb +37 -1
  32. data/lib/rouge/formatters/html.rb +20 -2
  33. data/lib/rouge/formatters/html_line_table.rb +53 -0
  34. data/lib/rouge/formatters/html_linewise.rb +6 -11
  35. data/lib/rouge/formatters/html_table.rb +20 -31
  36. data/lib/rouge/formatters/terminal256.rb +1 -0
  37. data/lib/rouge/formatters/tex.rb +92 -0
  38. data/lib/rouge/guessers/disambiguation.rb +25 -0
  39. data/lib/rouge/guessers/glob_mapping.rb +1 -1
  40. data/lib/rouge/guessers/modeline.rb +1 -1
  41. data/lib/rouge/guessers/source.rb +1 -1
  42. data/lib/rouge/lexer.rb +64 -14
  43. data/lib/rouge/lexers/abap.rb +11 -11
  44. data/lib/rouge/lexers/actionscript.rb +34 -34
  45. data/lib/rouge/lexers/ada.rb +162 -0
  46. data/lib/rouge/lexers/apache.rb +8 -8
  47. data/lib/rouge/lexers/apple_script.rb +15 -14
  48. data/lib/rouge/lexers/armasm.rb +145 -0
  49. data/lib/rouge/lexers/awk.rb +25 -25
  50. data/lib/rouge/lexers/batchfile.rb +164 -0
  51. data/lib/rouge/lexers/bbcbasic.rb +112 -0
  52. data/lib/rouge/lexers/biml.rb +4 -4
  53. data/lib/rouge/lexers/bpf.rb +104 -0
  54. data/lib/rouge/lexers/brainfuck.rb +53 -0
  55. data/lib/rouge/lexers/bsl.rb +12 -12
  56. data/lib/rouge/lexers/c.rb +34 -57
  57. data/lib/rouge/lexers/ceylon.rb +6 -34
  58. data/lib/rouge/lexers/cfscript.rb +26 -26
  59. data/lib/rouge/lexers/clojure.rb +14 -14
  60. data/lib/rouge/lexers/cmake.rb +14 -14
  61. data/lib/rouge/lexers/cmhg.rb +34 -0
  62. data/lib/rouge/lexers/coffeescript.rb +43 -35
  63. data/lib/rouge/lexers/common_lisp.rb +37 -37
  64. data/lib/rouge/lexers/conf.rb +6 -6
  65. data/lib/rouge/lexers/console.rb +3 -3
  66. data/lib/rouge/lexers/coq.rb +18 -18
  67. data/lib/rouge/lexers/cpp.rb +12 -9
  68. data/lib/rouge/lexers/crystal.rb +70 -70
  69. data/lib/rouge/lexers/csharp.rb +28 -29
  70. data/lib/rouge/lexers/css.rb +23 -23
  71. data/lib/rouge/lexers/cuda.rb +35 -0
  72. data/lib/rouge/lexers/cython.rb +151 -0
  73. data/lib/rouge/lexers/d.rb +59 -59
  74. data/lib/rouge/lexers/dart.rb +33 -33
  75. data/lib/rouge/lexers/diff.rb +8 -4
  76. data/lib/rouge/lexers/digdag.rb +1 -1
  77. data/lib/rouge/lexers/docker.rb +11 -11
  78. data/lib/rouge/lexers/dot.rb +16 -16
  79. data/lib/rouge/lexers/eiffel.rb +20 -20
  80. data/lib/rouge/lexers/elixir.rb +34 -30
  81. data/lib/rouge/lexers/elm.rb +29 -29
  82. data/lib/rouge/lexers/epp.rb +51 -0
  83. data/lib/rouge/lexers/erb.rb +4 -4
  84. data/lib/rouge/lexers/escape.rb +58 -0
  85. data/lib/rouge/lexers/factor.rb +40 -40
  86. data/lib/rouge/lexers/fortran.rb +32 -32
  87. data/lib/rouge/lexers/fsharp.rb +30 -30
  88. data/lib/rouge/lexers/gdscript.rb +171 -0
  89. data/lib/rouge/lexers/gherkin.rb +16 -14
  90. data/lib/rouge/lexers/glsl.rb +1 -5
  91. data/lib/rouge/lexers/go.rb +2 -2
  92. data/lib/rouge/lexers/graphql.rb +77 -60
  93. data/lib/rouge/lexers/groovy.rb +23 -25
  94. data/lib/rouge/lexers/hack.rb +1 -1
  95. data/lib/rouge/lexers/haml.rb +25 -29
  96. data/lib/rouge/lexers/handlebars.rb +31 -20
  97. data/lib/rouge/lexers/haskell.rb +66 -65
  98. data/lib/rouge/lexers/hcl.rb +25 -25
  99. data/lib/rouge/lexers/hocon.rb +86 -0
  100. data/lib/rouge/lexers/html.rb +32 -31
  101. data/lib/rouge/lexers/http.rb +4 -4
  102. data/lib/rouge/lexers/hylang.rb +14 -14
  103. data/lib/rouge/lexers/idlang.rb +32 -32
  104. data/lib/rouge/lexers/igorpro.rb +31 -31
  105. data/lib/rouge/lexers/ini.rb +12 -12
  106. data/lib/rouge/lexers/io.rb +7 -7
  107. data/lib/rouge/lexers/irb.rb +5 -5
  108. data/lib/rouge/lexers/java.rb +28 -24
  109. data/lib/rouge/lexers/javascript.rb +57 -61
  110. data/lib/rouge/lexers/jinja.rb +34 -20
  111. data/lib/rouge/lexers/json.rb +50 -11
  112. data/lib/rouge/lexers/json_doc.rb +2 -2
  113. data/lib/rouge/lexers/jsonnet.rb +18 -18
  114. data/lib/rouge/lexers/jsp.rb +30 -30
  115. data/lib/rouge/lexers/jsx.rb +16 -16
  116. data/lib/rouge/lexers/julia.rb +181 -58
  117. data/lib/rouge/lexers/kotlin.rb +14 -7
  118. data/lib/rouge/lexers/lasso.rb +50 -50
  119. data/lib/rouge/lexers/liquid.rb +76 -53
  120. data/lib/rouge/lexers/literate_coffeescript.rb +2 -2
  121. data/lib/rouge/lexers/literate_haskell.rb +5 -5
  122. data/lib/rouge/lexers/llvm.rb +23 -16
  123. data/lib/rouge/lexers/lua.rb +3 -3
  124. data/lib/rouge/lexers/m68k.rb +18 -19
  125. data/lib/rouge/lexers/magik.rb +127 -0
  126. data/lib/rouge/lexers/make.rb +56 -34
  127. data/lib/rouge/lexers/markdown.rb +55 -38
  128. data/lib/rouge/lexers/mason.rb +115 -0
  129. data/lib/rouge/lexers/mathematica.rb +11 -11
  130. data/lib/rouge/lexers/matlab.rb +23 -16
  131. data/lib/rouge/lexers/moonscript.rb +3 -3
  132. data/lib/rouge/lexers/mosel.rb +63 -63
  133. data/lib/rouge/lexers/msgtrans.rb +26 -0
  134. data/lib/rouge/lexers/mxml.rb +18 -18
  135. data/lib/rouge/lexers/nasm.rb +24 -25
  136. data/lib/rouge/lexers/nginx.rb +14 -14
  137. data/lib/rouge/lexers/nim.rb +3 -2
  138. data/lib/rouge/lexers/nix.rb +43 -43
  139. data/lib/rouge/lexers/objective_c.rb +43 -48
  140. data/lib/rouge/lexers/ocaml.rb +28 -64
  141. data/lib/rouge/lexers/ocaml/common.rb +53 -0
  142. data/lib/rouge/lexers/openedge.rb +429 -0
  143. data/lib/rouge/lexers/opentype_feature_file.rb +113 -0
  144. data/lib/rouge/lexers/pascal.rb +4 -4
  145. data/lib/rouge/lexers/perl.rb +98 -68
  146. data/lib/rouge/lexers/php.rb +66 -44
  147. data/lib/rouge/lexers/php/builtins.rb +181 -174
  148. data/lib/rouge/lexers/plain_text.rb +1 -1
  149. data/lib/rouge/lexers/plist.rb +14 -14
  150. data/lib/rouge/lexers/pony.rb +19 -19
  151. data/lib/rouge/lexers/powershell.rb +184 -638
  152. data/lib/rouge/lexers/praat.rb +75 -75
  153. data/lib/rouge/lexers/prolog.rb +26 -20
  154. data/lib/rouge/lexers/prometheus.rb +30 -30
  155. data/lib/rouge/lexers/properties.rb +12 -12
  156. data/lib/rouge/lexers/protobuf.rb +22 -22
  157. data/lib/rouge/lexers/puppet.rb +32 -32
  158. data/lib/rouge/lexers/python.rb +52 -52
  159. data/lib/rouge/lexers/q.rb +12 -12
  160. data/lib/rouge/lexers/qml.rb +12 -12
  161. data/lib/rouge/lexers/r.rb +12 -13
  162. data/lib/rouge/lexers/racket.rb +22 -22
  163. data/lib/rouge/lexers/reasonml.rb +65 -0
  164. data/lib/rouge/lexers/ruby.rb +72 -70
  165. data/lib/rouge/lexers/rust.rb +38 -35
  166. data/lib/rouge/lexers/sas.rb +563 -0
  167. data/lib/rouge/lexers/sass.rb +8 -8
  168. data/lib/rouge/lexers/sass/common.rb +40 -40
  169. data/lib/rouge/lexers/scala.rb +63 -37
  170. data/lib/rouge/lexers/scheme.rb +18 -18
  171. data/lib/rouge/lexers/scss.rb +3 -3
  172. data/lib/rouge/lexers/sed.rb +30 -30
  173. data/lib/rouge/lexers/shell.rb +62 -53
  174. data/lib/rouge/lexers/sieve.rb +8 -8
  175. data/lib/rouge/lexers/slim.rb +26 -26
  176. data/lib/rouge/lexers/smalltalk.rb +33 -33
  177. data/lib/rouge/lexers/smarty.rb +19 -19
  178. data/lib/rouge/lexers/sml.rb +67 -67
  179. data/lib/rouge/lexers/sqf.rb +1 -1
  180. data/lib/rouge/lexers/sql.rb +21 -21
  181. data/lib/rouge/lexers/supercollider.rb +116 -0
  182. data/lib/rouge/lexers/swift.rb +46 -43
  183. data/lib/rouge/lexers/tap.rb +20 -20
  184. data/lib/rouge/lexers/tcl.rb +27 -27
  185. data/lib/rouge/lexers/terraform.rb +13 -13
  186. data/lib/rouge/lexers/tex.rb +19 -19
  187. data/lib/rouge/lexers/toml.rb +19 -19
  188. data/lib/rouge/lexers/tulip.rb +36 -36
  189. data/lib/rouge/lexers/turtle.rb +35 -38
  190. data/lib/rouge/lexers/vala.rb +18 -18
  191. data/lib/rouge/lexers/vb.rb +27 -27
  192. data/lib/rouge/lexers/verilog.rb +25 -27
  193. data/lib/rouge/lexers/vhdl.rb +11 -11
  194. data/lib/rouge/lexers/viml.rb +14 -14
  195. data/lib/rouge/lexers/vue.rb +9 -9
  196. data/lib/rouge/lexers/wollok.rb +26 -26
  197. data/lib/rouge/lexers/xml.rb +17 -21
  198. data/lib/rouge/lexers/xojo.rb +61 -0
  199. data/lib/rouge/lexers/xpath.rb +332 -0
  200. data/lib/rouge/lexers/xquery.rb +145 -0
  201. data/lib/rouge/lexers/yaml.rb +63 -61
  202. data/lib/rouge/plugins/redcarpet.rb +1 -1
  203. data/lib/rouge/regex_lexer.rb +26 -25
  204. data/lib/rouge/tex_theme_renderer.rb +132 -0
  205. data/lib/rouge/theme.rb +4 -0
  206. data/lib/rouge/themes/bw.rb +41 -0
  207. data/lib/rouge/themes/magritte.rb +78 -0
  208. data/lib/rouge/themes/monokai_sublime.rb +2 -1
  209. data/lib/rouge/themes/pastie.rb +1 -1
  210. data/lib/rouge/themes/thankful_eyes.rb +1 -1
  211. data/lib/rouge/themes/tulip.rb +1 -1
  212. data/lib/rouge/token.rb +30 -22
  213. data/lib/rouge/util.rb +2 -2
  214. data/lib/rouge/version.rb +1 -1
  215. data/rouge.gemspec +4 -3
  216. metadata +61 -6
@@ -0,0 +1,113 @@
1
+ # -*- coding: utf-8 -*- #
2
+ # frozen_string_literal: true
3
+
4
+ module Rouge
5
+ module Lexers
6
+ class OpenTypeFeatureFile < RegexLexer
7
+ title "OpenType Feature File"
8
+ desc "Feature specifications for an OpenType font (adobe-type-tools.github.io/afdko)"
9
+ tag 'opentype_feature_file'
10
+ aliases 'fea', 'opentype', 'opentypefeature'
11
+ filenames '*.fea'
12
+
13
+ def self.keywords
14
+ @keywords ||= %w(
15
+ Ascender Attach CapHeight CaretOffset CodePageRange Descender FontRevision FSType
16
+ GlyphClassDef HorizAxis.BaseScriptList HorizAxis.BaseTagList HorizAxis.MinMax
17
+ IgnoreBaseGlyphs IgnoreLigatures IgnoreMarks LigatureCaretByDev LigatureCaretByIndex
18
+ LigatureCaretByPos LineGap MarkAttachClass MarkAttachmentType NULL Panose RightToLeft
19
+ TypoAscender TypoDescender TypoLineGap UnicodeRange UseMarkFilteringSet Vendor
20
+ VertAdvanceY VertAxis.BaseScriptList VertAxis.BaseTagList VertAxis.MinMax VertOriginY
21
+ VertTypoAscender VertTypoDescender VertTypoLineGap WeightClass WidthClass XHeight
22
+
23
+ anchorDef anchor anonymous anon by contour cursive device enumerate enum
24
+ exclude_dflt featureNames feature from ignore include_dflt include languagesystem
25
+ language lookupflag lookup markClass mark nameid name parameters position pos required
26
+ reversesub rsub script sizemenuname substitute subtable sub table useExtension
27
+ valueRecordDef winAscent winDescent
28
+ )
29
+ end
30
+
31
+
32
+ identifier = %r/[a-z_][a-z0-9\/_]*/i
33
+
34
+ state :root do
35
+ rule %r/\s+/m, Text::Whitespace
36
+ rule %r/#.*$/, Comment
37
+
38
+ # feature <tag>
39
+ rule %r/(anonymous|anon|feature|lookup|table)((?:\s)+)/ do
40
+ groups Keyword, Text
41
+ push :featurename
42
+ end
43
+ # } <tag> ;
44
+ rule %r/(\})((?:\s)*)/ do
45
+ groups Punctuation, Text
46
+ push :featurename
47
+ end
48
+ # solve include( ../path)
49
+ rule %r/(include)/i, Keyword, :includepath
50
+
51
+ rule %r/[\-\[\]\/(){},.:;=%*<>']/, Punctuation
52
+
53
+ rule %r/`.*?/, Str::Backtick
54
+ rule %r/\"/, Str, :dqs
55
+
56
+ # classes, start with @<nameOfClass>
57
+ rule %r/@#{identifier}/, Name::Class
58
+
59
+ # using negative lookbehind so we don't match property names
60
+ rule %r/(?<!\.)#{identifier}/ do |m|
61
+ if self.class.keywords.include? m[0]
62
+ token Keyword
63
+ else
64
+ token Name
65
+ end
66
+ end
67
+
68
+ rule identifier, Name
69
+ rule %r/-?\d+/, Num::Integer
70
+ end
71
+
72
+ state :featurename do
73
+ rule identifier, Name::Function, :pop!
74
+ end
75
+
76
+ state :includepath do
77
+ rule %r/\s+/, Text::Whitespace
78
+ rule %r/\)/, Punctuation, :pop!
79
+ rule %r/\(/, Punctuation
80
+ rule %r/[a-z0-9\/_.]*/i, Str
81
+ end
82
+
83
+ state :strings do
84
+ rule %r/(\([a-z0-9_]+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?/i, Str
85
+ end
86
+
87
+ state :strings_double do
88
+ rule %r/[^\\"%\n]+/, Str
89
+ mixin :strings
90
+ end
91
+
92
+ state :escape do
93
+ rule %r(\\
94
+ ( [\\abfnrtv"']
95
+ | \n
96
+ | N{[a-zA-z][a-zA-Z ]+[a-zA-Z]}
97
+ | u[a-fA-F0-9]{4}
98
+ | U[a-fA-F0-9]{8}
99
+ | x[a-fA-F0-9]{2}
100
+ | [0-7]{1,3}
101
+ )
102
+ )x, Str::Escape
103
+ end
104
+
105
+ state :dqs do
106
+ rule %r/"/, Str, :pop!
107
+ mixin :escape
108
+ mixin :strings_double
109
+ end
110
+
111
+ end
112
+ end
113
+ end
@@ -40,7 +40,7 @@ module Rouge
40
40
 
41
41
  state :whitespace do
42
42
  # Spaces
43
- rule /\s+/m, Text
43
+ rule %r/\s+/m, Text
44
44
  # // Comments
45
45
  rule %r((//).*$\n?), Comment::Single
46
46
  # -- Comments
@@ -57,9 +57,9 @@ module Rouge
57
57
  rule %r{((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?}, Num
58
58
  rule %r{[~!@#\$%\^&\*\(\)\+`\-={}\[\]:;<>\?,\.\/\|\\]}, Punctuation
59
59
  rule %r{'([^']|'')*'}, Str
60
- rule /(true|false|nil)\b/i, Name::Builtin
61
- rule /\b(#{keywords.join('|')})\b/i, Keyword
62
- rule /\b(#{keywords_type.join('|')})\b/i, Keyword::Type
60
+ rule %r/(true|false|nil)\b/i, Name::Builtin
61
+ rule %r/\b(#{keywords.join('|')})\b/i, Keyword
62
+ rule %r/\b(#{keywords_type.join('|')})\b/i, Keyword::Type
63
63
  rule id, Name
64
64
  end
65
65
  end
@@ -65,117 +65,136 @@ module Rouge
65
65
  end
66
66
 
67
67
  state :root do
68
- rule /#.*?$/, Comment::Single
69
- rule /^=[a-zA-Z0-9]+\s+.*?\n=cut/m, Comment::Multiline
70
- rule /(?:#{keywords.join('|')})\b/, Keyword
68
+ rule %r/#.*?$/, Comment::Single
69
+ rule %r/^=[a-zA-Z0-9]+\s+.*?\n=cut/m, Comment::Multiline
70
+ rule %r/(?:#{keywords.join('|')})\b/, Keyword
71
71
 
72
- rule /(format)(\s+)([a-zA-Z0-9_]+)(\s*)(=)(\s*\n)/ do
72
+ rule %r/(format)(\s+)([a-zA-Z0-9_]+)(\s*)(=)(\s*\n)/ do
73
73
  groups Keyword, Text, Name, Text, Punctuation, Text
74
74
 
75
75
  push :format
76
76
  end
77
77
 
78
- rule /(?:eq|lt|gt|le|ge|ne|not|and|or|cmp)\b/, Operator::Word
78
+ rule %r/(?:eq|lt|gt|le|ge|ne|not|and|or|cmp)\b/, Operator::Word
79
79
 
80
- # common delimiters
81
- rule %r(s/(\\\\|\\/|[^/])*/(\\\\|\\/|[^/])*/[msixpodualngc]*), re_tok
82
- rule %r(s!(\\\\|\\!|[^!])*!(\\\\|\\!|[^!])*![msixpodualngc]*), re_tok
83
- rule %r(s\\(\\\\|[^\\])*\\(\\\\|[^\\])*\\[msixpodualngc]*), re_tok
84
- rule %r(s@(\\\\|\\@|[^@])*@(\\\\|\\@|[^@])*@[msixpodualngc]*), re_tok
85
- rule %r(s%(\\\\|\\%|[^%])*%(\\\\|\\%|[^%])*%[msixpodualngc]*), re_tok
80
+ # substitution/transliteration: balanced delimiters
81
+ rule %r((?:s|tr|y){(\\\\|\\}|[^}])*}\s*), re_tok, :balanced_regex
82
+ rule %r((?:s|tr|y)<(\\\\|\\>|[^>])*>\s*), re_tok, :balanced_regex
83
+ rule %r((?:s|tr|y)\[(\\\\|\\\]|[^\]])*\]\s*), re_tok, :balanced_regex
84
+ rule %r[(?:s|tr|y)\((\\\\|\\\)|[^\)])*\)\s*], re_tok, :balanced_regex
86
85
 
87
- # balanced delimiters
88
- rule %r(s{(\\\\|\\}|[^}])*}\s*), re_tok, :balanced_regex
89
- rule %r(s<(\\\\|\\>|[^>])*>\s*), re_tok, :balanced_regex
90
- rule %r(s\[(\\\\|\\\]|[^\]])*\]\s*), re_tok, :balanced_regex
91
- rule %r[s\((\\\\|\\\)|[^\)])*\)\s*], re_tok, :balanced_regex
86
+ # substitution/transliteration: arbitrary non-whitespace delimiters
87
+ rule %r((?:s|tr|y)\s*([^\w\s])((\\\\|\\\1)|[^\1])*?\1((\\\\|\\\1)|[^\1])*?\1[msixpodualngcr]*)m, re_tok
88
+ rule %r((?:s|tr|y)\s+(\w)((\\\\|\\\1)|[^\1])*?\1((\\\\|\\\1)|[^\1])*?\1[msixpodualngcr]*)m, re_tok
92
89
 
90
+ # matches: common case, m-optional
93
91
  rule %r(m?/(\\\\|\\/|[^/\n])*/[msixpodualngc]*), re_tok
94
92
  rule %r(m(?=[/!\\{<\[\(@%\$])), re_tok, :balanced_regex
95
93
 
96
- # Perl allows any non-whitespace character to delimit
97
- # a regex when `m` is used.
98
- rule %r(m(\S).*\1[msixpodualngc]*), re_tok
94
+ # arbitrary non-whitespace delimiters
95
+ rule %r(m\s*([^\w\s])((\\\\|\\\1)|[^\1])*?\1[msixpodualngc]*)m, re_tok
96
+ rule %r(m\s+(\w)((\\\\|\\\1)|[^\1])*?\1[msixpodualngc]*)m, re_tok
97
+
99
98
  rule %r(((?<==~)|(?<=\())\s*/(\\\\|\\/|[^/])*/[msixpodualngc]*),
100
99
  re_tok, :balanced_regex
101
100
 
102
- rule /\s+/, Text
103
- rule /(?:#{builtins.join('|')})\b/, Name::Builtin
104
- rule /((__(DATA|DIE|WARN)__)|(STD(IN|OUT|ERR)))\b/,
101
+ rule %r/\s+/, Text
102
+ rule %r/(?:#{builtins.join('|')})\b/, Name::Builtin
103
+ rule %r/((__(DIE|WARN)__)|(DATA|STD(IN|OUT|ERR)))\b/,
105
104
  Name::Builtin::Pseudo
106
105
 
107
- rule /<<([\'"]?)([a-zA-Z_][a-zA-Z0-9_]*)\1;?\n.*?\n\2\n/m, Str
106
+ rule %r/<<([\'"]?)([a-zA-Z_][a-zA-Z0-9_]*)\1;?\n.*?\n\2\n/m, Str
108
107
 
109
- rule /__END__\b/, Comment::Preproc, :end_part
110
- rule /\$\^[ADEFHILMOPSTWX]/, Name::Variable::Global
111
- rule /\$[\\"'\[\]&`+*.,;=%~?@$!<>(^\|\/-](?!\w)/, Name::Variable::Global
112
- rule /[-+\/*%=<>&^\|!\\~]=?/, Operator
113
- rule /[$@%#]+/, Name::Variable, :varname
108
+ rule %r/(__(END|DATA)__)\b/, Comment::Preproc, :end_part
109
+ rule %r/\$\^[ADEFHILMOPSTWX]/, Name::Variable::Global
110
+ rule %r/\$[\\"'\[\]&`+*.,;=%~?@$!<>(^\|\/-](?!\w)/, Name::Variable::Global
111
+ rule %r/[-+\/*%=<>&^\|!\\~]=?/, Operator
112
+ rule %r/[$@%#]+/, Name::Variable, :varname
114
113
 
115
- rule /0_?[0-7]+(_[0-7]+)*/, Num::Oct
116
- rule /0x[0-9A-Fa-f]+(_[0-9A-Fa-f]+)*/, Num::Hex
117
- rule /0b[01]+(_[01]+)*/, Num::Bin
118
- rule /(\d*(_\d*)*\.\d+(_\d*)*|\d+(_\d*)*\.\d+(_\d*)*)(e[+-]?\d+)?/i,
114
+ rule %r/0_?[0-7]+(_[0-7]+)*/, Num::Oct
115
+ rule %r/0x[0-9A-Fa-f]+(_[0-9A-Fa-f]+)*/, Num::Hex
116
+ rule %r/0b[01]+(_[01]+)*/, Num::Bin
117
+ rule %r/(\d*(_\d*)*\.\d+(_\d*)*|\d+(_\d*)*\.\d+(_\d*)*)(e[+-]?\d+)?/i,
119
118
  Num::Float
120
- rule /\d+(_\d*)*e[+-]?\d+(_\d*)*/i, Num::Float
121
- rule /\d+(_\d+)*/, Num::Integer
122
-
123
- rule /'(\\\\|\\'|[^'])*'/, Str
124
- rule /"(\\\\|\\"|[^"])*"/, Str
125
- rule /`(\\\\|\\`|[^`])*`/, Str::Backtick
126
- rule /<([^\s>]+)>/, re_tok
127
- rule /(q|qq|qw|qr|qx)\{/, Str::Other, :cb_string
128
- rule /(q|qq|qw|qr|qx)\(/, Str::Other, :rb_string
129
- rule /(q|qq|qw|qr|qx)\[/, Str::Other, :sb_string
130
- rule /(q|qq|qw|qr|qx)</, Str::Other, :lt_string
131
- rule /(q|qq|qw|qr|qx)([^a-zA-Z0-9])(.|\n)*?\2/, Str::Other
132
-
133
- rule /package\s+/, Keyword, :modulename
134
- rule /sub\s+/, Keyword, :funcname
135
- rule /\[\]|\*\*|::|<<|>>|>=|<=|<=>|={3}|!=|=~|!~|&&?|\|\||\.{1,3}/,
119
+ rule %r/\d+(_\d*)*e[+-]?\d+(_\d*)*/i, Num::Float
120
+ rule %r/\d+(_\d+)*/, Num::Integer
121
+
122
+ rule %r/'/, Punctuation, :sq
123
+ rule %r/"/, Punctuation, :dq
124
+ rule %r/`/, Punctuation, :bq
125
+ rule %r/<([^\s>]+)>/, re_tok
126
+ rule %r/(q|qq|qw|qr|qx)\{/, Str::Other, :cb_string
127
+ rule %r/(q|qq|qw|qr|qx)\(/, Str::Other, :rb_string
128
+ rule %r/(q|qq|qw|qr|qx)\[/, Str::Other, :sb_string
129
+ rule %r/(q|qq|qw|qr|qx)</, Str::Other, :lt_string
130
+ rule %r/(q|qq|qw|qr|qx)([^a-zA-Z0-9])(.|\n)*?\2/, Str::Other
131
+
132
+ rule %r/package\s+/, Keyword, :modulename
133
+ rule %r/sub\s+/, Keyword, :funcname
134
+ rule %r/\[\]|\*\*|::|<<|>>|>=|<=|<=>|={3}|!=|=~|!~|&&?|\|\||\.{1,3}/,
136
135
  Operator
137
- rule /[()\[\]:;,<>\/?{}]/, Punctuation
136
+ rule %r/[()\[\]:;,<>\/?{}]/, Punctuation
138
137
  rule(/(?=\w)/) { push :name }
139
138
  end
140
139
 
141
140
  state :format do
142
- rule /\.\n/, Str::Interpol, :pop!
143
- rule /.*?\n/, Str::Interpol
141
+ rule %r/\.\n/, Str::Interpol, :pop!
142
+ rule %r/.*?\n/, Str::Interpol
144
143
  end
145
144
 
146
145
  state :name_common do
147
- rule /\w+::/, Name::Namespace
148
- rule /[\w:]+/, Name::Variable, :pop!
146
+ rule %r/\w+::/, Name::Namespace
147
+ rule %r/[\w:]+/, Name::Variable, :pop!
149
148
  end
150
149
 
151
150
  state :varname do
152
- rule /\s+/, Text
153
- rule /\{/, Punctuation, :pop! # hash syntax
154
- rule /\)|,/, Punctuation, :pop! # arg specifier
151
+ rule %r/\s+/, Text
152
+ rule %r/\{/, Punctuation, :pop! # hash syntax
153
+ rule %r/\)|,/, Punctuation, :pop! # arg specifier
155
154
  mixin :name_common
156
155
  end
157
156
 
158
157
  state :name do
159
158
  mixin :name_common
160
- rule /[A-Z_]+(?=[^a-zA-Z0-9_])/, Name::Constant, :pop!
159
+ rule %r/[A-Z_]+(?=[^a-zA-Z0-9_])/, Name::Constant, :pop!
161
160
  rule(/(?=\W)/) { pop! }
162
161
  end
163
162
 
164
163
  state :modulename do
165
- rule /[a-z_]\w*/i, Name::Namespace, :pop!
164
+ rule %r/[a-z_]\w*/i, Name::Namespace, :pop!
166
165
  end
167
166
 
168
167
  state :funcname do
169
- rule /[a-zA-Z_]\w*[!?]?/, Name::Function
170
- rule /\s+/, Text
168
+ rule %r/[a-zA-Z_]\w*[!?]?/, Name::Function
169
+ rule %r/\s+/, Text
171
170
 
172
171
  # argument declaration
173
- rule /(\([$@%]*\))(\s*)/ do
172
+ rule %r/(\([$@%]*\))(\s*)/ do
174
173
  groups Punctuation, Text
175
174
  end
176
175
 
177
- rule /.*?{/, Punctuation, :pop!
178
- rule /;/, Punctuation, :pop!
176
+ rule %r/.*?{/, Punctuation, :pop!
177
+ rule %r/;/, Punctuation, :pop!
178
+ end
179
+
180
+ state :sq do
181
+ rule %r/\\[']/, Str::Escape
182
+ rule %r/[^\\']+/, Str::Single
183
+ rule %r/'/, Punctuation, :pop!
184
+ end
185
+
186
+ state :dq do
187
+ mixin :string_intp
188
+ rule %r/\\[\\tnr"]/, Str::Escape
189
+ rule %r/[^\\"]+?/, Str::Double
190
+ rule %r/"/, Punctuation, :pop!
191
+ end
192
+
193
+ state :bq do
194
+ mixin :string_intp
195
+ rule %r/\\[\\tnr`]/, Str::Escape
196
+ rule %r/[^\\`]+?/, Str::Backtick
197
+ rule %r/`/, Punctuation, :pop!
179
198
  end
180
199
 
181
200
  [[:cb, '\{', '\}'],
@@ -184,17 +203,28 @@ module Rouge
184
203
  [:lt, '<', '>']].each do |name, open, close|
185
204
  tok = Str::Other
186
205
  state :"#{name}_string" do
187
- rule /\\[#{open}#{close}\\]/, tok
188
- rule /\\/, tok
206
+ rule %r/\\[#{open}#{close}\\]/, tok
207
+ rule %r/\\/, tok
189
208
  rule(/#{open}/) { token tok; push }
190
- rule /#{close}/, tok, :pop!
191
- rule /[^#{open}#{close}\\]+/, tok
209
+ rule %r/#{close}/, tok, :pop!
210
+ rule %r/[^#{open}#{close}\\]+/, tok
192
211
  end
193
212
  end
194
213
 
214
+ state :in_interp do
215
+ rule %r/}/, Str::Interpol, :pop!
216
+ rule %r/\s+/, Text
217
+ rule %r/[a-z_]\w*/i, Str::Interpol
218
+ end
219
+
220
+ state :string_intp do
221
+ rule %r/[$@][{]/, Str::Interpol, :in_interp
222
+ rule %r/[$@][a-z_]\w*/i, Str::Interpol
223
+ end
224
+
195
225
  state :end_part do
196
226
  # eat the rest of the stream
197
- rule /.+/m, Comment::Preproc, :pop!
227
+ rule %r/.+/m, Comment::Preproc, :pop!
198
228
  end
199
229
  end
200
230
  end
@@ -29,7 +29,7 @@ module Rouge
29
29
  end
30
30
 
31
31
  def self.builtins
32
- load Pathname.new(__FILE__).dirname.join('php/builtins.rb')
32
+ load File.join(__dir__, 'php/builtins.rb')
33
33
  self.builtins
34
34
  end
35
35
 
@@ -72,7 +72,7 @@ module Rouge
72
72
  while endforeach global __FILE__ endif list __LINE__ endswitch
73
73
  new __sleep endwhile not array __wakeup E_ALL NULL final
74
74
  php_user_filter interface implements public private protected
75
- abstract clone try catch throw this use namespace yield
75
+ abstract clone try catch finally throw this use namespace yield
76
76
  )
77
77
  end
78
78
 
@@ -91,49 +91,57 @@ module Rouge
91
91
  end
92
92
 
93
93
  state :template do
94
- rule /<\?(php|=)?/, Comment::Preproc, :php
94
+ rule %r/<\?(php|=)?/, Comment::Preproc, :php
95
95
  rule(/.*?(?=<\?)|.*/m) { delegate parent }
96
96
  end
97
97
 
98
98
  state :php do
99
- rule /\?>/, Comment::Preproc, :pop!
99
+ rule %r/\?>/, Comment::Preproc, :pop!
100
100
  # heredocs
101
- rule /<<<('?)(#{id})\1\n.*?\n\2;?\n/im, Str::Heredoc
102
- rule /\s+/, Text
103
- rule /#.*?$/, Comment::Single
101
+ rule %r/<<<('?)(#{id})\1\n.*?\n\s*\2;?/im, Str::Heredoc
102
+ rule %r/\s+/, Text
103
+ rule %r/#.*?$/, Comment::Single
104
104
  rule %r(//.*?$), Comment::Single
105
- # empty comment, otherwise seen as the start of a docstring
106
- rule %r(/\*\*/), Comment::Multiline
107
- rule %r(/\*\*.*?\*/)m, Str::Doc
105
+ rule %r(/\*\*(?!/).*?\*/)m, Comment::Doc
108
106
  rule %r(/\*.*?\*/)m, Comment::Multiline
109
- rule /(->|::)(\s*)(#{id})/ do
107
+
108
+ rule %r/(->|::)(\s*)(#{id})/ do
110
109
  groups Operator, Text, Name::Attribute
111
110
  end
112
111
 
113
- rule /[~!%^&*+=\|:.<>\/?@-]+/, Operator
114
- rule /[\[\]{}();,]/, Punctuation
115
- rule /class\b/, Keyword, :classname
112
+ rule %r/[~!%^&*+=\|:.<>\/?@-]+/, Operator
113
+ rule %r/[\[\]{}();,]/, Punctuation
114
+ rule %r/(class|interface|trait)(\s+)(#{nsid})/ do
115
+ groups Keyword::Declaration, Text, Name::Class
116
+ end
117
+ rule %r/(use)(\s+)(function|const|)(\s*)(#{nsid})/ do
118
+ groups Keyword::Namespace, Text, Keyword::Namespace, Text, Name::Namespace
119
+ push :use
120
+ end
121
+ rule %r/(namespace)(\s+)(#{nsid})/ do
122
+ groups Keyword::Namespace, Text, Name::Namespace
123
+ end
116
124
  # anonymous functions
117
- rule /(function)(\s*)(?=\()/ do
125
+ rule %r/(function)(\s*)(?=\()/ do
118
126
  groups Keyword, Text
119
127
  end
120
128
 
121
129
  # named functions
122
- rule /(function)(\s+)(&?)(\s*)/ do
130
+ rule %r/(function)(\s+)(&?)(\s*)/ do
123
131
  groups Keyword, Text, Operator, Text
124
132
  push :funcname
125
133
  end
126
134
 
127
- rule /(const)(\s+)(#{id})/i do
135
+ rule %r/(const)(\s+)(#{id})/i do
128
136
  groups Keyword, Text, Name::Constant
129
137
  end
130
138
 
131
- rule /(true|false|null)\b/, Keyword::Constant
132
- rule /\$\{\$+#{id}\}/i, Name::Variable
133
- rule /\$+#{id}/i, Name::Variable
139
+ rule %r/(true|false|null)\b/, Keyword::Constant
140
+ rule %r/\$\{\$+#{id}\}/i, Name::Variable
141
+ rule %r/\$+#{id}/i, Name::Variable
134
142
 
135
143
  # may be intercepted for builtin highlighting
136
- rule /\\?#{nsid}/i do |m|
144
+ rule %r/\\?#{nsid}/i do |m|
137
145
  name = m[0]
138
146
 
139
147
  if self.class.keywords.include? name
@@ -145,48 +153,62 @@ module Rouge
145
153
  end
146
154
  end
147
155
 
148
- rule /(\d+\.\d*|\d*\.\d+)(e[+-]?\d+)?/i, Num::Float
149
- rule /\d+e[+-]?\d+/i, Num::Float
150
- rule /0[0-7]+/, Num::Oct
151
- rule /0x[a-f0-9]+/i, Num::Hex
152
- rule /\d+/, Num::Integer
153
- rule /'([^'\\]*(?:\\.[^'\\]*)*)'/, Str::Single
154
- rule /`([^`\\]*(?:\\.[^`\\]*)*)`/, Str::Backtick
155
- rule /"/, Str::Double, :string
156
+ rule %r/(\d+\.\d*|\d*\.\d+)(e[+-]?\d+)?/i, Num::Float
157
+ rule %r/\d+e[+-]?\d+/i, Num::Float
158
+ rule %r/0[0-7]+/, Num::Oct
159
+ rule %r/0x[a-f0-9]+/i, Num::Hex
160
+ rule %r/\d+/, Num::Integer
161
+ rule %r/'([^'\\]*(?:\\.[^'\\]*)*)'/, Str::Single
162
+ rule %r/`([^`\\]*(?:\\.[^`\\]*)*)`/, Str::Backtick
163
+ rule %r/"/, Str::Double, :string
156
164
  end
157
-
158
- state :classname do
159
- rule /\s+/, Text
160
- rule /#{nsid}/, Name::Class, :pop!
165
+
166
+ state :use do
167
+ rule %r/(\s+)(as)(\s+)(#{id})/ do
168
+ groups Text, Keyword, Text, Name
169
+ :pop!
170
+ end
171
+ rule %r/\\\{/, Operator, :uselist
172
+ rule %r/;/, Punctuation, :pop!
173
+ end
174
+
175
+ state :uselist do
176
+ rule %r/\s+/, Text
177
+ rule %r/,/, Operator
178
+ rule %r/\}/, Operator, :pop!
179
+ rule %r/(as)(\s+)(#{id})/ do
180
+ groups Keyword, Text, Name
181
+ end
182
+ rule %r/#{id}/, Name::Namespace
161
183
  end
162
184
 
163
185
  state :funcname do
164
- rule /#{id}/, Name::Function, :pop!
186
+ rule %r/#{id}/, Name::Function, :pop!
165
187
  end
166
188
 
167
189
  state :string do
168
- rule /"/, Str::Double, :pop!
169
- rule /[^\\{$"]+/, Str::Double
170
- rule /\\([nrt\"$\\]|[0-7]{1,3}|x[0-9A-Fa-f]{1,2})/,
190
+ rule %r/"/, Str::Double, :pop!
191
+ rule %r/[^\\{$"]+/, Str::Double
192
+ rule %r/\\([nrt\"$\\]|[0-7]{1,3}|x[0-9A-Fa-f]{1,2})/,
171
193
  Str::Escape
172
- rule /\$#{id}(\[\S+\]|->#{id})?/, Name::Variable
194
+ rule %r/\$#{id}(\[\S+\]|->#{id})?/, Name::Variable
173
195
 
174
- rule /\{\$\{/, Str::Interpol, :interp_double
175
- rule /\{(?=\$)/, Str::Interpol, :interp_single
176
- rule /(\{)(\S+)(\})/ do
196
+ rule %r/\{\$\{/, Str::Interpol, :interp_double
197
+ rule %r/\{(?=\$)/, Str::Interpol, :interp_single
198
+ rule %r/(\{)(\S+)(\})/ do
177
199
  groups Str::Interpol, Name::Variable, Str::Interpol
178
200
  end
179
201
 
180
- rule /[${\\]+/, Str::Double
202
+ rule %r/[${\\]+/, Str::Double
181
203
  end
182
204
 
183
205
  state :interp_double do
184
- rule /\}\}/, Str::Interpol, :pop!
206
+ rule %r/\}\}/, Str::Interpol, :pop!
185
207
  mixin :php
186
208
  end
187
209
 
188
210
  state :interp_single do
189
- rule /\}/, Str::Interpol, :pop!
211
+ rule %r/\}/, Str::Interpol, :pop!
190
212
  mixin :php
191
213
  end
192
214
  end