lib/rouge/lexers/make.rb in rouge-0.4.0 vs lib/rouge/lexers/make.rb in rouge-0.5.0

@@ -27,71 +27,71 @@
       end
 
       start { @shell.reset! }
 
       state :root do
-        rule /\s+/, 'Text'
+        rule /\s+/, Text
 
-        rule /#.*?\n/, 'Comment'
+        rule /#.*?\n/, Comment
 
         rule /(export)(\s+)(?=[a-zA-Z0-9_\${}\t -]+\n)/ do
-          group 'Keyword'; group 'Text'
+          group Keyword; group Text
           push :export
         end
 
-        rule /export\s+/, 'Keyword'
+        rule /export\s+/, Keyword
 
         # assignment
         rule /([a-zA-Z0-9_${}.-]+)(\s*)([!?:+]?=)/m do |m|
-          token 'Name.Variable', m[1]
-          token 'Text', m[2]
-          token 'Operator', m[3]
+          token Name::Variable, m[1]
+          token Text, m[2]
+          token Operator, m[3]
           push :shell_line
         end
 
-        rule /"(\\\\|\\.|[^"\\])*"/, 'Literal.String.Double'
-        rule /'(\\\\|\\.|[^'\\])*'/, 'Literal.String.Single'
+        rule /"(\\\\|\\.|[^"\\])*"/, Str::Double
+        rule /'(\\\\|\\.|[^'\\])*'/, Str::Single
         rule /([^\n:]+)(:+)([ \t]*)/ do
-          group 'Name.Label'; group 'Operator'; group 'Text'
+          group Name::Label; group Operator; group Text
           push :block_header
         end
       end
 
       state :export do
-        rule /[\w\${}-]/, 'Name.Variable'
-        rule /\n/, 'Text', :pop!
-        rule /\s+/, 'Text'
+        rule /[\w\${}-]/, Name::Variable
+        rule /\n/, Text, :pop!
+        rule /\s+/, Text
       end
 
       state :block_header do
-        rule /[^,\\\n#]+/, 'Name.Function'
-        rule /,/, 'Punctuation'
-        rule /#.*?/, 'Comment'
-        rule /\\\n/, 'Text'
-        rule /\\./, 'Text'
+        rule /[^,\\\n#]+/, Name::Function
+        rule /,/, Punctuation
+        rule /#.*?/, Comment
+        rule /\\\n/, Text
+        rule /\\./, Text
         rule /\n/ do
-          token 'Text'
-          pop!; push :block_body
+          token Text
+          goto :block_body
         end
       end
 
       state :block_body do
         rule /(\t[\t ]*)([@-]?)/ do |m|
-          group 'Text'; group 'Punctuation'
+          group Text; group Punctuation
           push :shell_line
         end
 
         rule(//) { @shell.reset!; pop! }
       end
 
       state :shell do
         # macro interpolation
-        rule /\$\(\s*[a-z_]\w*\s*\)/i, 'Name.Variable'
+        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'
+          group Name::Function; group Text
+          group Name::Builtin; group Text
           push :shell_expr
         end
 
         rule(/\\./m) { delegate @shell }
         stop = /\$\(|\(|\)|\n|\\/
@@ -99,15 +99,15 @@
         rule(stop) { delegate @shell }
       end
 
       state :shell_expr do
         rule(/\(/) { delegate @shell; push }
-        rule /\)/, 'Name.Variable', :pop!
+        rule /\)/, Name::Variable, :pop!
         mixin :shell
       end
 
       state :shell_line do
-        rule /\n/, 'Text', :pop!
+        rule /\n/, Text, :pop!
         mixin :shell
       end
     end
   end
 end