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
@@ -26,16 +26,16 @@ module Rouge
26
26
  end
27
27
 
28
28
  state :directive_as_csharp do
29
- rule /\s*#>\s*/m, Name::Tag, :pop!
29
+ rule %r/\s*#>\s*/m, Name::Tag, :pop!
30
30
  rule %r(.*?(?=\s*#>\s*))m do
31
31
  delegate CSharp
32
32
  end
33
33
  end
34
34
 
35
35
  state :directive_tag do
36
- rule /\s+/m, Text
37
- rule /[\w.:-]+\s*=/m, Name::Attribute, :attr
38
- rule /[\w]+\s*/m, Name::Attribute
36
+ rule %r/\s+/m, Text
37
+ rule %r/[\w.:-]+\s*=/m, Name::Attribute, :attr
38
+ rule %r/\w+\s*/m, Name::Attribute
39
39
  rule %r(/?\s*#>), Name::Tag, :pop!
40
40
  end
41
41
  end
@@ -0,0 +1,104 @@
1
+ # -*- coding: utf-8 -*- #
2
+ # frozen_string_literal: true
3
+
4
+ module Rouge
5
+ module Lexers
6
+ class BPF < RegexLexer
7
+ title "BPF"
8
+ desc "BPF bytecode syntax"
9
+ tag 'bpf'
10
+
11
+ TYPE_KEYWORDS = %w(
12
+ u8 u16 u32 u64 ll
13
+ ).join('|')
14
+
15
+ MISC_KEYWORDS = %w(
16
+ be16 be32 be64 exit lock
17
+ ).join('|')
18
+
19
+ state :root do
20
+ # Calls to helpers
21
+ rule %r/(call)(\s+)(\d+)/i do
22
+ groups Keyword, Text::Whitespace, Literal::Number::Integer
23
+ end
24
+
25
+ # Unconditional jumps
26
+ rule %r/(goto)(\s*)(\+\d+)?(\s*)(<?\w+>?)/i do
27
+ groups Keyword, Text::Whitespace, Literal::Number::Integer, Text::Whitespace, Name::Label
28
+ end
29
+
30
+ # Conditional jumps
31
+ rule %r/(if)(\s+)(r\d+)(\s*)([s!=<>]+)(\s*)(0x\h+|[-]?\d+)(\s*)(goto)(\s*)(\+\d+)?(\s*)(<?\w+>?)/i do
32
+ groups Keyword, Text::Whitespace, Name, Text::Whitespace, Operator, Text::Whitespace, Literal::Number, Text::Whitespace, Keyword, Text::Whitespace, Literal::Number::Integer, Text::Whitespace, Name::Label
33
+ end
34
+ rule %r/(if)(\s+)(r\d+)(\s*)([s!=<>]+)(\s*)(r\d+)(\s*)(goto)(\s*)(\+\d+)?(\s*)(<?\w+>?)/i do
35
+ groups Keyword, Text::Whitespace, Name, Text::Whitespace, Operator, Text::Whitespace, Name, Text::Whitespace, Keyword, Text::Whitespace, Literal::Number::Integer, Text::Whitespace, Name::Label
36
+ end
37
+
38
+ # Dereferences
39
+ rule %r/(\*)(\s*)(\()(#{TYPE_KEYWORDS})(\s*)(\*)(\))/i do
40
+ groups Operator, Text::Whitespace, Punctuation, Keyword::Type, Text::Whitespace, Operator, Punctuation
41
+ push :address
42
+ end
43
+
44
+ # Operators
45
+ rule %r/[+-\/\*&|><^s]{0,3}=/i, Operator
46
+
47
+ # Registers
48
+ rule %r/([+-]?)(r\d+)/i do
49
+ groups Punctuation, Name
50
+ end
51
+
52
+ # Comments
53
+ rule %r/\/\//, Comment::Single, :linecomment
54
+ rule %r/\/\*/, Comment::Multiline, :multilinescomment
55
+
56
+ rule %r/#{MISC_KEYWORDS}/i, Keyword
57
+
58
+ # Literals and global objects (maps) refered by name
59
+ rule %r/(0x\h+|[-]?\d+)(\s*)(ll)?/i do
60
+ groups Literal::Number, Text::Whitespace, Keyword::Type
61
+ end
62
+ rule %r/(\w+)(\s*)(ll)/i do
63
+ groups Name, Text::Whitespace, Keyword::Type
64
+ end
65
+
66
+ # Labels
67
+ rule %r/(\w+)(\s*)(:)/i do
68
+ groups Name::Label, Text::Whitespace, Punctuation
69
+ end
70
+
71
+ rule %r{.}m, Text
72
+ end
73
+
74
+ state :address do
75
+ # Address is offset from register
76
+ rule %r/(\()(r\d+)(\s*)([+-])(\s*)(\d+)(\))/i do
77
+ groups Punctuation, Name, Text::Whitespace, Operator, Text::Whitespace, Literal::Number::Integer, Punctuation
78
+ pop!
79
+ end
80
+
81
+ # Address is array subscript
82
+ rule %r/(\w+)(\[)(\d+)(\])/i do
83
+ groups Name, Punctuation, Literal::Number::Integer, Punctuation
84
+ pop!
85
+ end
86
+ rule %r/(\w+)(\[)(r\d+)(\])/i do
87
+ groups Name, Punctuation, Name, Punctuation
88
+ pop!
89
+ end
90
+ end
91
+
92
+ state :linecomment do
93
+ rule %r/\n/, Comment::Single, :pop!
94
+ rule %r/.+/, Comment::Single
95
+ end
96
+
97
+ state :multilinescomment do
98
+ rule %r/\*\//, Comment::Multiline, :pop!
99
+ rule %r/([^\*\/]+)/, Comment::Multiline
100
+ rule %r/([\*\/])/, Comment::Multiline
101
+ end
102
+ end
103
+ end
104
+ end
@@ -0,0 +1,53 @@
1
+ # -*- coding: utf-8 -*- #
2
+ # frozen_string_literal: true
3
+
4
+ module Rouge
5
+ module Lexers
6
+ class Brainfuck < RegexLexer
7
+ tag 'brainfuck'
8
+ filenames '*.b', '*.bf'
9
+ mimetypes 'text/x-brainfuck'
10
+
11
+ title "Brainfuck"
12
+ desc "The Brainfuck programming language"
13
+
14
+ start { push :bol }
15
+
16
+ state :bol do
17
+ rule %r/\s+/m, Text
18
+ rule %r/\[/, Comment::Multiline, :comment_multi
19
+ rule(//) { pop! }
20
+ end
21
+
22
+ state :root do
23
+ rule %r/\]/, Error
24
+ rule %r/\[/, Punctuation, :loop
25
+
26
+ mixin :comment_single
27
+ mixin :commands
28
+ end
29
+
30
+ state :comment_multi do
31
+ rule %r/\[/, Comment::Multiline, :comment_multi
32
+ rule %r/\]/, Comment::Multiline, :pop!
33
+ rule %r/[^\[\]]+?/m, Comment::Multiline
34
+ end
35
+
36
+ state :comment_single do
37
+ rule %r/[^><+\-.,\[\]]+/, Comment::Single
38
+ end
39
+
40
+ state :loop do
41
+ rule %r/\[/, Punctuation, :loop
42
+ rule %r/\]/, Punctuation, :pop!
43
+ mixin :comment_single
44
+ mixin :commands
45
+ end
46
+
47
+ state :commands do
48
+ rule %r/[><]+/, Name::Builtin
49
+ rule %r/[+\-.,]+/, Name::Function
50
+ end
51
+ end
52
+ end
53
+ end
@@ -60,22 +60,22 @@ module Rouge
60
60
  )\s*(?=\()/ix
61
61
 
62
62
  state :root do
63
- rule /\n/, Text
64
- rule /[^\S\n]+/, Text
65
- rule /\/\/.*$/, Comment::Single
66
- rule /[\[\]:(),;]/, Punctuation
67
- rule /(?<=[^\wа-яё]|^)\&.*$/, Keyword::Declaration
68
- rule /[-+\/=<>*%=<>.?&]/, Operator
69
- rule /(?<=[^\wа-яё]|^)\#.*$/, Keyword::Declaration
63
+ rule %r/\n/, Text
64
+ rule %r/[^\S\n]+/, Text
65
+ rule %r(//.*$), Comment::Single
66
+ rule %r/[\[\]:(),;]/, Punctuation
67
+ rule %r/(?<=[^\wа-яё]|^)\&.*$/, Keyword::Declaration
68
+ rule %r/[-+\/*%=<>.?&]/, Operator
69
+ rule %r/(?<=[^\wа-яё]|^)\#.*$/, Keyword::Declaration
70
70
  rule KEYWORDS, Keyword
71
71
  rule BUILTINS, Name::Builtin
72
- rule /[\wа-яё_][\wа-яё0-9_]*/i, Name::Variable
72
+ rule %r/[\wа-яё][\wа-яё]*/i, Name::Variable
73
73
 
74
74
  #literals
75
- rule /\b((\h{8}-(\h{4}-){3}\h{12})|\d+\.?\d*)\b/, Literal::Number
76
- rule /\'.*\'/, Literal::Date
77
- rule /".*?("|$)/, Literal::String::Single
78
- rule /(?<=[^\wа-яё]|^)\|((?!\"\").)*?(\"|$)/, Literal::String
75
+ rule %r/\b((\h{8}-(\h{4}-){3}\h{12})|\d+\.?\d*)\b/, Literal::Number
76
+ rule %r/\'.*\'/, Literal::Date
77
+ rule %r/".*?("|$)/, Literal::String::Single
78
+ rule %r/(?<=[^\wа-яё]|^)\|((?!\"\").)*?(\"|$)/, Literal::String
79
79
  end
80
80
  end
81
81
  end
@@ -65,8 +65,8 @@ module Rouge
65
65
  state :expr_bol do
66
66
  mixin :inline_whitespace
67
67
 
68
- rule /#if\s0/, Comment, :if_0
69
- rule /#/, Comment::Preproc, :macro
68
+ rule %r/#if\s0/, Comment, :if_0
69
+ rule %r/#/, Comment::Preproc, :macro
70
70
 
71
71
  rule(//) { pop! }
72
72
  end
@@ -74,41 +74,41 @@ module Rouge
74
74
  # :expr_bol is the same as :bol but without labels, since
75
75
  # labels can only appear at the beginning of a statement.
76
76
  state :bol do
77
- rule /#{id}:(?!:)/, Name::Label
77
+ rule %r/#{id}:(?!:)/, Name::Label
78
78
  mixin :expr_bol
79
79
  end
80
80
 
81
81
  state :inline_whitespace do
82
- rule /[ \t\r]+/, Text
83
- rule /\\\n/, Text # line continuation
82
+ rule %r/[ \t\r]+/, Text
83
+ rule %r/\\\n/, Text # line continuation
84
84
  rule %r(/(\\\n)?[*].*?[*](\\\n)?/)m, Comment::Multiline
85
85
  end
86
86
 
87
87
  state :whitespace do
88
- rule /\n+/m, Text, :bol
88
+ rule %r/\n+/m, Text, :bol
89
89
  rule %r(//(\\.|.)*?$), Comment::Single, :bol
90
90
  mixin :inline_whitespace
91
91
  end
92
92
 
93
93
  state :expr_whitespace do
94
- rule /\n+/m, Text, :expr_bol
94
+ rule %r/\n+/m, Text, :expr_bol
95
95
  mixin :whitespace
96
96
  end
97
97
 
98
98
  state :statements do
99
99
  mixin :whitespace
100
- rule /(u8|u|U|L)?"/, Str, :string
100
+ rule %r/(u8|u|U|L)?"/, Str, :string
101
101
  rule %r((u8|u|U|L)?'(\\.|\\[0-7]{1,3}|\\x[a-f0-9]{1,2}|[^\\'\n])')i, Str::Char
102
102
  rule %r((\d+[.]\d*|[.]?\d+)e[+-]?\d+[lu]*)i, Num::Float
103
103
  rule %r(\d+e[+-]?\d+[lu]*)i, Num::Float
104
- rule /0x[0-9a-f]+[lu]*/i, Num::Hex
105
- rule /0[0-7]+[lu]*/i, Num::Oct
106
- rule /\d+[lu]*/i, Num::Integer
104
+ rule %r/0x[0-9a-f]+[lu]*/i, Num::Hex
105
+ rule %r/0[0-7]+[lu]*/i, Num::Oct
106
+ rule %r/\d+[lu]*/i, Num::Integer
107
107
  rule %r(\*/), Error
108
108
  rule %r([~!%^&*+=\|?:<>/-]), Operator
109
- rule /[()\[\],.]/, Punctuation
110
- rule /\bcase\b/, Keyword, :case
111
- rule /(?:true|false|NULL)\b/, Name::Builtin
109
+ rule %r/[()\[\],.;]/, Punctuation
110
+ rule %r/\bcase\b/, Keyword, :case
111
+ rule %r/(?:true|false|NULL)\b/, Name::Builtin
112
112
  rule id do |m|
113
113
  name = m[0]
114
114
 
@@ -127,19 +127,17 @@ module Rouge
127
127
  end
128
128
 
129
129
  state :case do
130
- rule /:/, Punctuation, :pop!
130
+ rule %r/:/, Punctuation, :pop!
131
131
  mixin :statements
132
132
  end
133
133
 
134
134
  state :root do
135
135
  mixin :expr_whitespace
136
-
137
- # functions
138
136
  rule %r(
139
137
  ([\w*\s]+?[\s*]) # return arguments
140
138
  (#{id}) # function name
141
139
  (\s*\([^;]*?\)) # signature
142
- (#{ws})({) # open brace
140
+ (#{ws}?)({|;) # open brace or semicolon
143
141
  )mx do |m|
144
142
  # TODO: do this better.
145
143
  recurse m[1]
@@ -147,66 +145,45 @@ module Rouge
147
145
  recurse m[3]
148
146
  recurse m[4]
149
147
  token Punctuation, m[5]
150
- push :function
151
- end
152
-
153
- # function declarations
154
- rule %r(
155
- ([\w*\s]+?[\s*]) # return arguments
156
- (#{id}) # function name
157
- (\s*\([^;]*?\)) # signature
158
- (#{ws})(;) # semicolon
159
- )mx do |m|
160
- # TODO: do this better.
161
- recurse m[1]
162
- token Name::Function, m[2]
163
- recurse m[3]
164
- recurse m[4]
165
- token Punctuation, m[5]
166
- push :statement
148
+ if m[5] == ?{
149
+ push :function
150
+ end
167
151
  end
168
-
169
- rule(//) { push :statement }
170
- end
171
-
172
- state :statement do
173
- rule /;/, Punctuation, :pop!
174
- mixin :expr_whitespace
152
+ rule %r/\{/, Punctuation, :function
175
153
  mixin :statements
176
- rule /[{}]/, Punctuation
177
154
  end
178
155
 
179
156
  state :function do
180
157
  mixin :whitespace
181
158
  mixin :statements
182
- rule /;/, Punctuation
183
- rule /{/, Punctuation, :function
184
- rule /}/, Punctuation, :pop!
159
+ rule %r/;/, Punctuation
160
+ rule %r/{/, Punctuation, :function
161
+ rule %r/}/, Punctuation, :pop!
185
162
  end
186
163
 
187
164
  state :string do
188
- rule /"/, Str, :pop!
189
- rule /\\([\\abfnrtv"']|x[a-fA-F0-9]{2,4}|[0-7]{1,3})/, Str::Escape
190
- rule /[^\\"\n]+/, Str
191
- rule /\\\n/, Str
192
- rule /\\/, Str # stray backslash
165
+ rule %r/"/, Str, :pop!
166
+ rule %r/\\([\\abfnrtv"']|x[a-fA-F0-9]{2,4}|[0-7]{1,3})/, Str::Escape
167
+ rule %r/[^\\"\n]+/, Str
168
+ rule %r/\\\n/, Str
169
+ rule %r/\\/, Str # stray backslash
193
170
  end
194
171
 
195
172
  state :macro do
196
173
  # NB: pop! goes back to :bol
197
- rule /\n/, Comment::Preproc, :pop!
174
+ rule %r/\n/, Comment::Preproc, :pop!
198
175
  rule %r([^/\n\\]+), Comment::Preproc
199
- rule /\\./m, Comment::Preproc
176
+ rule %r/\\./m, Comment::Preproc
200
177
  mixin :inline_whitespace
201
178
  rule %r(/), Comment::Preproc
202
179
  end
203
180
 
204
181
  state :if_0 do
205
182
  # NB: no \b here, to cover #ifdef and #ifndef
206
- rule /^\s*#if/, Comment, :if_0
207
- rule /^\s*#\s*el(?:se|if)/, Comment, :pop!
208
- rule /^\s*#\s*endif\b.*?(?<!\\)\n/m, Comment, :pop!
209
- rule /.*?\n/, Comment
183
+ rule %r/^\s*#if/, Comment, :if_0
184
+ rule %r/^\s*#\s*el(?:se|if)/, Comment, :pop!
185
+ rule %r/^\s*#\s*endif\b.*?(?<!\\)\n/m, Comment, :pop!
186
+ rule %r/.*?\n/, Comment
210
187
  end
211
188
  end
212
189
  end
@@ -11,34 +11,6 @@ module Rouge
11
11
  title "Ceylon"
12
12
  desc 'Say more, more clearly.'
13
13
 
14
- keywords = %w(
15
- break case catch continue else finally for in
16
- if return switch this throw try while is exists dynamic
17
- nonempty then outer assert let
18
- )
19
-
20
- keywords_declaration = %w(
21
- abstracts extends satisfies super given of out assign
22
- )
23
-
24
- keywords_type = %w(
25
- function value void new
26
- )
27
-
28
- keywords_namespace = %w(
29
- assembly module package
30
- )
31
-
32
- keywords_constant = %w(
33
- true false null
34
- )
35
-
36
- annotations = %w(
37
- shared abstract formal default actual variable deprecated small
38
- late literal doc by see throws optional license tagged final native
39
- annotation sealed
40
- )
41
-
42
14
  state :whitespace do
43
15
  rule %r([^\S\n]+), Text
44
16
  rule %r(//.*?\n), Comment::Single
@@ -59,14 +31,14 @@ module Rouge
59
31
  rule %r((abstracts|extends|satisfies|super|given|of|out|assign)\b), Keyword::Declaration
60
32
 
61
33
  rule %r((function|value|void|new)\b), Keyword::Type
62
-
34
+
63
35
  rule %r((assembly|module|package)(\s+)) do
64
36
  groups Keyword::Namespace, Text
65
37
  push :import
66
38
  end
67
-
39
+
68
40
  rule %r((true|false|null)\b), Keyword::Constant
69
-
41
+
70
42
  rule %r((class|interface|object|alias)(\s+)) do
71
43
  groups Keyword::Declaration, Text
72
44
  push :class
@@ -76,7 +48,7 @@ module Rouge
76
48
  groups Keyword::Namespace, Text
77
49
  push :import
78
50
  end
79
-
51
+
80
52
  rule %r("(\\\\|\\"|[^"])*"), Literal::String
81
53
  rule %r('\\.'|'[^\\]'|'\\\{#[0-9a-fA-F]{4}\}'), Literal::String::Char
82
54
  rule %r(".*``.*``.*"', String::Interpol
@@ -86,7 +58,7 @@ module Rouge
86
58
  rule %r([a-zA-Z_]\w*:), Name::Label
87
59
  rule %r((\\I[a-z]|[A-Z])\w*), Name::Decorator
88
60
  rule %r([a-zA-Z_]\w*), Name
89
- rule %r([~^*!%&\[\](){}<>|+=:;,./?-`]), Operator
61
+ rule %r([~^*!%&\[\](){}<>|+=:;,./?`-]), Operator
90
62
  rule %r(\d{1,3}(_\d{3})+\.\d{1,3}(_\d{3})+[kMGTPmunpf]?), Literal::Number::Float
91
63
  rule %r(\d{1,3}(_\d{3})+\.[0-9]+([eE][+-]?[0-9]+)?[kMGTPmunpf]?),
92
64
  Literal::Number::Float
@@ -112,7 +84,7 @@ module Rouge
112
84
  rule %r([a-z][\w.]*), Name::Namespace, :pop!
113
85
  rule %r("(\\\\|\\"|[^"])*"), Literal::String, :pop!
114
86
  end
115
-
87
+
116
88
  state :comment do
117
89
  rule %r([^*/]), Comment.Multiline
118
90
  rule %r(/\*), Comment::Multiline, :push!