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,145 @@
1
+ # -*- coding: utf-8 -*- #
2
+ # frozen_string_literal: true
3
+
4
+ module Rouge
5
+ module Lexers
6
+ load_lexer 'xpath.rb'
7
+ class XQuery < XPath
8
+ title 'XQuery'
9
+ desc 'XQuery 3.1: An XML Query Language'
10
+ tag 'xquery'
11
+ filenames '*.xquery', '*.xq'
12
+ mimetypes 'application/xquery'
13
+
14
+ def self.keywords
15
+ @keywords ||= Regexp.union super, Regexp.union(%w(
16
+ xquery encoding version declare module
17
+ namespace copy-namespaces boundary-space construction
18
+ default collation base-uri preserve strip
19
+ ordering ordered unordered order empty greatest least
20
+ preserve no-preserve inherit no-inherit
21
+ decimal-format decimal-separator grouping-separator
22
+ infinity minus-sign NaN percent per-mille
23
+ zero-digit digit pattern-separator exponent-separator
24
+ import schema at element option
25
+ function external context item
26
+ typeswitch switch case
27
+ try catch
28
+ validate lax strict type
29
+ document element attribute text comment processing-instruction
30
+ for let where order group by return
31
+ allowing tumbling stable sliding window
32
+ start end only when previous next count collation
33
+ ascending descending
34
+ ))
35
+ end
36
+
37
+ # Mixin states:
38
+
39
+ state :tags do
40
+ rule %r/<#{XPath.qName}/, Name::Tag, :start_tag
41
+ rule %r/<!--/, Comment, :xml_comment
42
+ rule %r/<\?.*?\?>/, Comment::Preproc
43
+ rule %r/<!\[CDATA\[.*?\]\]>/, Comment::Preproc
44
+ rule %r/&\S*?;/, Name::Entity
45
+ end
46
+
47
+ # Lexical states:
48
+
49
+ prepend :root do
50
+ mixin :tags
51
+
52
+ rule %r/\{/, Punctuation
53
+ rule %r/\}`?/ do
54
+ token Punctuation
55
+ if stack.length > 1
56
+ pop!
57
+ end
58
+ end
59
+
60
+ rule %r/(namespace)(\s+)(#{XPath.ncName})/ do
61
+ groups Keyword, Text::Whitespace, Name::Namespace
62
+ end
63
+
64
+ rule %r/(#{XQuery.keywords})\b/, Keyword
65
+ rule %r/;/, Punctuation
66
+ rule %r/%/, Keyword::Declaration, :annotation
67
+
68
+ rule %r/(\(#)(\s*)(#{XPath.eqName})/ do
69
+ groups Comment::Preproc, Text::Whitespace, Name::Tag
70
+ push :pragma
71
+ end
72
+
73
+ rule %r/``\[/, Str, :str_constructor
74
+ end
75
+
76
+ state :annotation do
77
+ mixin :commentsAndWhitespace
78
+ rule XPath.eqName, Keyword::Declaration, :pop!
79
+ end
80
+
81
+ state :pragma do
82
+ mixin :commentsAndWhitespace
83
+ rule %r/#\)/, Comment::Preproc, :pop!
84
+ rule %r/./, Comment::Preproc
85
+ end
86
+
87
+ # https://www.w3.org/TR/xquery-31/#id-string-constructors
88
+ state :str_constructor do
89
+ rule %r/`\{/, Punctuation, :root
90
+ rule %r/\]``/, Str, :pop!
91
+ rule %r/[^`\]]+/m, Str
92
+ rule %r/[`\]]/, Str
93
+ end
94
+
95
+ state :xml_comment do
96
+ rule %r/[^-]+/m, Comment
97
+ rule %r/-->/, Comment, :pop!
98
+ rule %r/-/, Comment
99
+ end
100
+
101
+ state :start_tag do
102
+ rule %r/\s+/m, Text::Whitespace
103
+ rule %r/([\w.:-]+\s*=)(")/m do
104
+ groups Name::Attribute, Str
105
+ push :quot_attr
106
+ end
107
+ rule %r/([\w.:-]+\s*=)(')/m do
108
+ groups Name::Attribute, Str
109
+ push :apos_attr
110
+ end
111
+ rule %r/>/, Name::Tag, :tag_content
112
+ rule %r(/>), Name::Tag, :pop!
113
+ end
114
+
115
+ state :quot_attr do
116
+ rule %r/"/, Str, :pop!
117
+ rule %r/\{\{/, Str
118
+ rule %r/\{/, Punctuation, :root
119
+ rule %r/[^"{>]+/m, Str
120
+ end
121
+
122
+ state :apos_attr do
123
+ rule %r/'/, Str, :pop!
124
+ rule %r/\{\{/, Str
125
+ rule %r/\{/, Punctuation, :root
126
+ rule %r/[^'{>]+/m, Str
127
+ end
128
+
129
+ state :tag_content do
130
+ rule %r/\s+/m, Text::Whitespace
131
+ mixin :tags
132
+
133
+ rule %r/(\{\{|\}\})/, Text
134
+ rule %r/\{/, Punctuation, :root
135
+
136
+ rule %r/[^{}<&]/, Text
137
+
138
+ rule %r(</#{XPath.qName}(\s*)>) do
139
+ token Name::Tag
140
+ pop! 2 # pop self and tag_start
141
+ end
142
+ end
143
+ end
144
+ end
145
+ end
@@ -78,38 +78,38 @@ module Rouge
78
78
  start { reset_indent }
79
79
 
80
80
  state :basic do
81
- rule /#.*$/, Comment::Single
81
+ rule %r/#.*$/, Comment::Single
82
82
  end
83
83
 
84
84
  state :root do
85
85
  mixin :basic
86
86
 
87
- rule /\n+/, Text
87
+ rule %r/\n+/, Text
88
88
 
89
89
  # trailing or pre-comment whitespace
90
- rule /[ ]+(?=#|$)/, Text
90
+ rule %r/[ ]+(?=#|$)/, Text
91
91
 
92
- rule /^%YAML\b/ do
92
+ rule %r/^%YAML\b/ do
93
93
  token Name::Tag
94
94
  reset_indent
95
95
  push :yaml_directive
96
96
  end
97
97
 
98
- rule /^%TAG\b/ do
98
+ rule %r/^%TAG\b/ do
99
99
  token Name::Tag
100
100
  reset_indent
101
101
  push :tag_directive
102
102
  end
103
103
 
104
104
  # doc-start and doc-end indicators
105
- rule /^(?:---|\.\.\.)(?= |$)/ do
105
+ rule %r/^(?:---|\.\.\.)(?= |$)/ do
106
106
  token Name::Namespace
107
107
  reset_indent
108
108
  push :block_line
109
109
  end
110
110
 
111
111
  # indentation spaces
112
- rule /[ ]*(?!\s|$)/ do |m|
112
+ rule %r/[ ]*(?!\s|$)/ do |m|
113
113
  text, err = save_indent(m[0])
114
114
  token Text, text
115
115
  token Error, err
@@ -120,7 +120,7 @@ module Rouge
120
120
  state :indentation do
121
121
  rule(/\s*?\n/) { token Text; pop! 2 }
122
122
  # whitespace preceding block collection indicators
123
- rule /[ ]+(?=[-:?](?:[ ]|$))/ do |m|
123
+ rule %r/[ ]+(?=[-:?](?:[ ]|$))/ do |m|
124
124
  token Text
125
125
  continue_indent(m[0])
126
126
  end
@@ -138,8 +138,8 @@ module Rouge
138
138
  # indented line in the block context
139
139
  state :block_line do
140
140
  # line end
141
- rule /[ ]*(?=#|$)/, Text, :pop!
142
- rule /[ ]+/, Text
141
+ rule %r/[ ]*(?=#|$)/, Text, :pop!
142
+ rule %r/[ ]+/, Text
143
143
  # tags, anchors, and aliases
144
144
  mixin :descriptors
145
145
  # block collections and scalars
@@ -148,7 +148,7 @@ module Rouge
148
148
  mixin :flow_nodes
149
149
 
150
150
  # a plain scalar
151
- rule /(?=#{plain_scalar_start}|[?:-][^ \t\n\r\f\v])/ do
151
+ rule %r/(?=#{plain_scalar_start}|[?:-][^ \t\n\r\f\v])/ do
152
152
  token Name::Variable
153
153
  push :plain_scalar_in_block_context
154
154
  end
@@ -156,7 +156,7 @@ module Rouge
156
156
 
157
157
  state :descriptors do
158
158
  # a full-form tag
159
- rule /!<[0-9A-Za-z;\/?:@&=+$,_.!~*'()\[\]%-]+>/, Keyword::Type
159
+ rule %r/!<[0-9A-Za-z;\/?:@&=+$,_.!~*'()\[\]%-]+>/, Keyword::Type
160
160
 
161
161
  # a tag in the form '!', '!suffix' or '!handle!suffix'
162
162
  rule %r(
@@ -165,21 +165,21 @@ module Rouge
165
165
  )x, Keyword::Type
166
166
 
167
167
  # an anchor
168
- rule /&[\w-]+/, Name::Label
168
+ rule %r/&[\w-]+/, Name::Label
169
169
 
170
170
  # an alias
171
- rule /\*[\w-]+/, Name::Variable
171
+ rule %r/\*[\w-]+/, Name::Variable
172
172
  end
173
173
 
174
174
  state :block_nodes do
175
175
  # implicit key
176
- rule /((?:\w[\w -]*)?)(:)(?=\s|$)/ do |m|
176
+ rule %r/((?:\w[\w -]*)?)(:)(?=\s|$)/ do |m|
177
177
  groups Name::Attribute, Punctuation::Indicator
178
178
  set_indent m[0], :implicit => true
179
179
  end
180
180
 
181
181
  # literal and folded scalars
182
- rule /[\|>]/ do
182
+ rule %r/[\|>][+-]?/ do
183
183
  token Punctuation::Indicator
184
184
  push :block_scalar_content
185
185
  push :block_scalar_header
@@ -187,39 +187,39 @@ module Rouge
187
187
  end
188
188
 
189
189
  state :flow_nodes do
190
- rule /\[/, Punctuation::Indicator, :flow_sequence
191
- rule /\{/, Punctuation::Indicator, :flow_mapping
192
- rule /'/, Str::Single, :single_quoted_scalar
193
- rule /"/, Str::Double, :double_quoted_scalar
190
+ rule %r/\[/, Punctuation::Indicator, :flow_sequence
191
+ rule %r/\{/, Punctuation::Indicator, :flow_mapping
192
+ rule %r/'/, Str::Single, :single_quoted_scalar
193
+ rule %r/"/, Str::Double, :double_quoted_scalar
194
194
  end
195
195
 
196
196
  state :flow_collection do
197
- rule /\s+/m, Text
197
+ rule %r/\s+/m, Text
198
198
  mixin :basic
199
- rule /[?:,]/, Punctuation::Indicator
199
+ rule %r/[?:,]/, Punctuation::Indicator
200
200
  mixin :descriptors
201
201
  mixin :flow_nodes
202
202
 
203
- rule /(?=#{plain_scalar_start})/ do
203
+ rule %r/(?=#{plain_scalar_start})/ do
204
204
  push :plain_scalar_in_flow_context
205
205
  end
206
206
  end
207
207
 
208
208
  state :flow_sequence do
209
- rule /\]/, Punctuation::Indicator, :pop!
209
+ rule %r/\]/, Punctuation::Indicator, :pop!
210
210
  mixin :flow_collection
211
211
  end
212
212
 
213
213
  state :flow_mapping do
214
- rule /\}/, Punctuation::Indicator, :pop!
214
+ rule %r/\}/, Punctuation::Indicator, :pop!
215
215
  mixin :flow_collection
216
216
  end
217
217
 
218
218
  state :block_scalar_content do
219
- rule /\n+/, Text
219
+ rule %r/\n+/, Text
220
220
 
221
221
  # empty lines never dedent, but they might be part of the scalar.
222
- rule /^[ ]+$/ do |m|
222
+ rule %r/^[ ]+$/ do |m|
223
223
  text = m[0]
224
224
  indent_size = text.size
225
225
 
@@ -231,7 +231,7 @@ module Rouge
231
231
 
232
232
  # TODO: ^ doesn't actually seem to affect the match at all.
233
233
  # Find a way to work around this limitation.
234
- rule /^[ ]*/ do |m|
234
+ rule %r/^[ ]*/ do |m|
235
235
  token Text
236
236
 
237
237
  indent_size = m[0].size
@@ -246,7 +246,7 @@ module Rouge
246
246
  end
247
247
  end
248
248
 
249
- rule /[^\n\r\f\v]+/, Name::Constant
249
+ rule %r/[^\n\r\f\v]+/, Str
250
250
  end
251
251
 
252
252
  state :block_scalar_header do
@@ -271,46 +271,46 @@ module Rouge
271
271
 
272
272
  state :ignored_line do
273
273
  mixin :basic
274
- rule /[ ]+/, Text
275
- rule /\n/, Text, :pop!
274
+ rule %r/[ ]+/, Text
275
+ rule %r/\n/, Text, :pop!
276
276
  end
277
277
 
278
278
  state :quoted_scalar_whitespaces do
279
279
  # leading and trailing whitespace is ignored
280
- rule /^[ ]+/, Text
281
- rule /[ ]+$/, Text
280
+ rule %r/^[ ]+/, Text
281
+ rule %r/[ ]+$/, Text
282
282
 
283
- rule /\n+/m, Text
283
+ rule %r/\n+/m, Text
284
284
 
285
- rule /[ ]+/, Name::Variable
285
+ rule %r/[ ]+/, Name::Variable
286
286
  end
287
287
 
288
288
  state :single_quoted_scalar do
289
289
  mixin :quoted_scalar_whitespaces
290
- rule /\\'/, Str::Escape
291
- rule /'/, Str, :pop!
292
- rule /[^\s']+/, Str
290
+ rule %r/\\'/, Str::Escape
291
+ rule %r/'/, Str, :pop!
292
+ rule %r/[^\s']+/, Str
293
293
  end
294
294
 
295
295
  state :double_quoted_scalar do
296
- rule /"/, Str, :pop!
296
+ rule %r/"/, Str, :pop!
297
297
  mixin :quoted_scalar_whitespaces
298
298
  # escapes
299
- rule /\\[0abt\tn\nvfre "\\N_LP]/, Str::Escape
300
- rule /\\(?:x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
299
+ rule %r/\\[0abt\tn\nvfre "\\N_LP]/, Str::Escape
300
+ rule %r/\\(?:x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
301
301
  Str::Escape
302
- rule /[^ \t\n\r\f\v"\\]+/, Str
302
+ rule %r/[^ \t\n\r\f\v"\\]+/, Str
303
303
  end
304
304
 
305
305
  state :plain_scalar_in_block_context_new_line do
306
- rule /^[ ]+\n/, Text
307
- rule /\n+/m, Text
308
- rule /^(?=---|\.\.\.)/ do
306
+ rule %r/^[ ]+\n/, Text
307
+ rule %r/\n+/m, Text
308
+ rule %r/^(?=---|\.\.\.)/ do
309
309
  pop! 3
310
310
  end
311
311
 
312
312
  # dedent detection
313
- rule /^[ ]*/ do |m|
313
+ rule %r/^[ ]*/ do |m|
314
314
  token Text
315
315
  pop!
316
316
 
@@ -327,34 +327,36 @@ module Rouge
327
327
 
328
328
  state :plain_scalar_in_block_context do
329
329
  # the : indicator ends a scalar
330
- rule /[ ]*(?=:[ \n]|:$)/, Text, :pop!
331
- rule /[ ]*:/, Str
332
- rule /[ ]+(?=#)/, Text, :pop!
333
- rule /[ ]+$/, Text
330
+ rule %r/[ ]*(?=:[ \n]|:$)/, Text, :pop!
331
+ rule %r/[ ]*:\S+/, Str
332
+ rule %r/[ ]+(?=#)/, Text, :pop!
333
+ rule %r/[ ]+$/, Text
334
334
  # check for new documents or dedents at the new line
335
- rule /\n+/ do
335
+ rule %r/\n+/ do
336
336
  token Text
337
337
  push :plain_scalar_in_block_context_new_line
338
338
  end
339
339
 
340
- rule /[ ]+/, Str
340
+ rule %r/[ ]+/, Str
341
341
  rule SPECIAL_VALUES, Name::Constant
342
+ rule %r/\d+(?:\.\d+)?(?=(\r?\n)| +#)/, Literal::Number, :pop!
343
+
342
344
  # regular non-whitespace characters
343
- rule /[^\s:]+/, Str
345
+ rule %r/[^\s:]+/, Str
344
346
  end
345
347
 
346
348
  state :plain_scalar_in_flow_context do
347
- rule /[ ]*(?=[,:?\[\]{}])/, Text, :pop!
348
- rule /[ ]+(?=#)/, Text, :pop!
349
- rule /^[ ]+/, Text
350
- rule /[ ]+$/, Text
351
- rule /\n+/, Text
352
- rule /[ ]+/, Name::Variable
353
- rule /[^\s,:?\[\]{}]+/, Name::Variable
349
+ rule %r/[ ]*(?=[,:?\[\]{}])/, Text, :pop!
350
+ rule %r/[ ]+(?=#)/, Text, :pop!
351
+ rule %r/^[ ]+/, Text
352
+ rule %r/[ ]+$/, Text
353
+ rule %r/\n+/, Text
354
+ rule %r/[ ]+/, Name::Variable
355
+ rule %r/[^\s,:?\[\]{}]+/, Name::Variable
354
356
  end
355
357
 
356
358
  state :yaml_directive do
357
- rule /([ ]+)(\d+\.\d+)/ do
359
+ rule %r/([ ]+)(\d+\.\d+)/ do
358
360
  groups Text, Num
359
361
  goto :ignored_line
360
362
  end
@@ -15,7 +15,7 @@ module Rouge
15
15
  # so we assume you're not using leading spaces that aren't tabs,
16
16
  # and just replace them here.
17
17
  if lexer.tag == 'make'
18
- code.gsub! /^ /, "\t"
18
+ code.gsub! %r/^ /, "\t"
19
19
  end
20
20
 
21
21
  formatter = rouge_formatter(lexer)
@@ -102,21 +102,21 @@ module Rouge
102
102
  callback ||= case next_state
103
103
  when :pop!
104
104
  proc do |stream|
105
- puts " yielding #{tok.qualname}, #{stream[0].inspect}" if @debug
105
+ puts " yielding: #{tok.qualname}, #{stream[0].inspect}" if @debug
106
106
  @output_stream.call(tok, stream[0])
107
107
  puts " popping stack: 1" if @debug
108
108
  @stack.pop or raise 'empty stack!'
109
109
  end
110
110
  when :push
111
111
  proc do |stream|
112
- puts " yielding #{tok.qualname}, #{stream[0].inspect}" if @debug
112
+ puts " yielding: #{tok.qualname}, #{stream[0].inspect}" if @debug
113
113
  @output_stream.call(tok, stream[0])
114
114
  puts " pushing :#{@stack.last.name}" if @debug
115
115
  @stack.push(@stack.last)
116
116
  end
117
117
  when Symbol
118
118
  proc do |stream|
119
- puts " yielding #{tok.qualname}, #{stream[0].inspect}" if @debug
119
+ puts " yielding: #{tok.qualname}, #{stream[0].inspect}" if @debug
120
120
  @output_stream.call(tok, stream[0])
121
121
  state = @states[next_state] || self.class.get_state(next_state)
122
122
  puts " pushing :#{state.name}" if @debug
@@ -124,7 +124,7 @@ module Rouge
124
124
  end
125
125
  when nil
126
126
  proc do |stream|
127
- puts " yielding #{tok.qualname}, #{stream[0].inspect}" if @debug
127
+ puts " yielding: #{tok.qualname}, #{stream[0].inspect}" if @debug
128
128
  @output_stream.call(tok, stream[0])
129
129
  end
130
130
  else
@@ -183,18 +183,18 @@ module Rouge
183
183
  # Define a new state for this lexer with the given name.
184
184
  # The block will be evaluated in the context of a {StateDSL}.
185
185
  def self.state(name, &b)
186
- name = name.to_s
186
+ name = name.to_sym
187
187
  state_definitions[name] = StateDSL.new(name, &b)
188
188
  end
189
189
 
190
190
  def self.prepend(name, &b)
191
- name = name.to_s
191
+ name = name.to_sym
192
192
  dsl = state_definitions[name] or raise "no such state #{name.inspect}"
193
193
  replace_state(name, dsl.prepended(&b))
194
194
  end
195
195
 
196
196
  def self.append(name, &b)
197
- name = name.to_s
197
+ name = name.to_sym
198
198
  dsl = state_definitions[name] or raise "no such state #{name.inspect}"
199
199
  replace_state(name, dsl.appended(&b))
200
200
  end
@@ -204,7 +204,7 @@ module Rouge
204
204
  return name if name.is_a? State
205
205
 
206
206
  states[name.to_sym] ||= begin
207
- defn = state_definitions[name.to_s] or raise "unknown state: #{name.inspect}"
207
+ defn = state_definitions[name.to_sym] or raise "unknown state: #{name.inspect}"
208
208
  defn.to_state(self)
209
209
  end
210
210
  end
@@ -263,6 +263,7 @@ module Rouge
263
263
 
264
264
  until stream.eos?
265
265
  if @debug
266
+ puts
266
267
  puts "lexer: #{self.class.tag}"
267
268
  puts "stack: #{stack.map(&:name).map(&:to_sym).inspect}"
268
269
  puts "stream: #{stream.peek(20).inspect}"
@@ -289,11 +290,11 @@ module Rouge
289
290
  def step(state, stream)
290
291
  state.rules.each do |rule|
291
292
  if rule.is_a?(State)
292
- puts " entering mixin #{rule.name}" if @debug
293
+ puts " entering: mixin :#{rule.name}" if @debug
293
294
  return true if step(rule, stream)
294
- puts " exiting mixin #{rule.name}" if @debug
295
+ puts " exiting: mixin :#{rule.name}" if @debug
295
296
  else
296
- puts " trying #{rule.inspect}" if @debug
297
+ puts " trying: #{rule.inspect}" if @debug
297
298
 
298
299
  # XXX HACK XXX
299
300
  # StringScanner's implementation of ^ is b0rken.
@@ -303,14 +304,14 @@ module Rouge
303
304
  next if rule.beginning_of_line && !stream.beginning_of_line?
304
305
 
305
306
  if (size = stream.skip(rule.re))
306
- puts " got #{stream[0].inspect}" if @debug
307
+ puts " got: #{stream[0].inspect}" if @debug
307
308
 
308
309
  instance_exec(stream, &rule.callback)
309
310
 
310
311
  if size.zero?
311
312
  @null_steps += 1
312
313
  if @null_steps > MAX_NULL_SCANS
313
- puts " too many scans without consuming the string!" if @debug
314
+ puts " warning: too many scans without consuming the string!" if @debug
314
315
  return false
315
316
  end
316
317
  else
@@ -352,20 +353,20 @@ module Rouge
352
353
  end
353
354
  end
354
355
 
355
- # Delegate the lex to another lexer. The #lex method will be called
356
- # with `:continue` set to true, so that #reset! will not be called.
357
- # In this way, a single lexer can be repeatedly delegated to while
358
- # maintaining its own internal state stack.
356
+ # Delegate the lex to another lexer. We use the `continue_lex` method
357
+ # so that #reset! will not be called. In this way, a single lexer
358
+ # can be repeatedly delegated to while maintaining its own internal
359
+ # state stack.
359
360
  #
360
361
  # @param [#lex] lexer
361
362
  # The lexer or lexer class to delegate to
362
363
  # @param [String] text
363
364
  # The text to delegate. This defaults to the last matched string.
364
365
  def delegate(lexer, text=nil)
365
- puts " delegating to #{lexer.inspect}" if @debug
366
+ puts " delegating to: #{lexer.inspect}" if @debug
366
367
  text ||= @current_stream[0]
367
368
 
368
- lexer.lex(text, :continue => true) do |tok, val|
369
+ lexer.continue_lex(text) do |tok, val|
369
370
  puts " delegated token: #{tok.inspect}, #{val.inspect}" if @debug
370
371
  yield_token(tok, val)
371
372
  end
@@ -388,7 +389,7 @@ module Rouge
388
389
  self.state
389
390
  end
390
391
 
391
- puts " pushing :#{push_state.name}" if @debug
392
+ puts " pushing: :#{push_state.name}" if @debug
392
393
  stack.push(push_state)
393
394
  end
394
395
 
@@ -408,7 +409,7 @@ module Rouge
408
409
  def goto(state_name)
409
410
  raise 'empty stack!' if stack.empty?
410
411
 
411
- puts " going to state :#{state_name} " if @debug
412
+ puts " going to: state :#{state_name} " if @debug
412
413
  stack[-1] = get_state(state_name)
413
414
  end
414
415
 
@@ -421,21 +422,21 @@ module Rouge
421
422
 
422
423
  # Check if `state_name` is in the state stack.
423
424
  def in_state?(state_name)
424
- state_name = state_name.to_s
425
+ state_name = state_name.to_sym
425
426
  stack.any? do |state|
426
- state.name == state_name.to_s
427
+ state.name == state_name.to_sym
427
428
  end
428
429
  end
429
430
 
430
431
  # Check if `state_name` is the state on top of the state stack.
431
432
  def state?(state_name)
432
- state_name.to_s == state.name
433
+ state_name.to_sym == state.name
433
434
  end
434
435
 
435
436
  private
436
437
  def yield_token(tok, val)
437
438
  return if val.nil? || val.empty?
438
- puts " yielding #{tok.qualname}, #{val.inspect}" if @debug
439
+ puts " yielding: #{tok.qualname}, #{val.inspect}" if @debug
439
440
  @output_stream.yield(tok, val)
440
441
  end
441
442
  end