lib/rouge/lexers/make.rb in rouge-1.1.0 vs lib/rouge/lexers/make.rb in rouge-1.2.0
- old
+ new
@@ -32,11 +32,11 @@
rule /\s+/, Text
rule /#.*?\n/, Comment
rule /(export)(\s+)(?=[a-zA-Z0-9_\${}\t -]+\n)/ do
- group Keyword; group Text
+ groups Keyword, Text
push :export
end
rule /export\s+/, Keyword
@@ -49,11 +49,11 @@
end
rule /"(\\\\|\\.|[^"\\])*"/, Str::Double
rule /'(\\\\|\\.|[^'\\])*'/, Str::Single
rule /([^\n:]+)(:+)([ \t]*)/ do
- group Name::Label; group Operator; group Text
+ groups Name::Label, Operator, Text
push :block_header
end
end
state :export do
@@ -74,11 +74,11 @@
end
end
state :block_body do
rule /(\t[\t ]*)([@-]?)/ do |m|
- group Text; group Punctuation
+ groups Text, Punctuation
push :shell_line
end
rule(//) { @shell.reset!; pop! }
end
@@ -86,11 +86,10 @@
state :shell do
# macro interpolation
rule /\$\(\s*[a-z_]\w*\s*\)/i, Name::Variable
# $(shell ...)
rule /(\$\()(\s*)(shell)(\s+)/m do
- group Name::Function; group Text
- group Name::Builtin; group Text
+ groups Name::Function, Text, Name::Builtin, Text
push :shell_expr
end
rule(/\\./m) { delegate @shell }
stop = /\$\(|\(|\)|\n|\\/