lib/rouge/lexers/hcl.rb in rouge-3.4.1 vs lib/rouge/lexers/hcl.rb in rouge-3.5.0

- old
+ new

@@ -14,23 +14,23 @@ rule %r([^*/]+), Comment::Multiline rule %r([*/]), Comment::Multiline end state :comments_and_whitespace do - rule /\s+/, Text + rule %r/\s+/, Text rule %r(//.*?$), Comment::Single rule %r(#.*?$), Comment::Single rule %r(/[*]), Comment::Multiline, :multiline_comment end state :primitives do - rule /[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?([kKmMgG]b?)?/, Num::Float - rule /[0-9]+([kKmMgG]b?)?/, Num::Integer + rule %r/[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?([kKmMgG]b?)?/, Num::Float + rule %r/[0-9]+([kKmMgG]b?)?/, Num::Integer - rule /"/, Str::Double, :dq - rule /'/, Str::Single, :sq - rule /(<<-?)(\s*)(\'?)(\\?)(\w+)(\3)/ do |m| + rule %r/"/, Str::Double, :dq + rule %r/'/, Str::Single, :sq + rule %r/(<<-?)(\s*)(\'?)(\\?)(\w+)(\3)/ do |m| groups Operator, Text, Str::Heredoc, Str::Heredoc, Name::Constant, Str::Heredoc @heredocstr = Regexp.escape(m[5]) push :heredoc end end @@ -59,15 +59,15 @@ state :root do mixin :comments_and_whitespace mixin :primitives - rule /\{/ do + rule %r/\{/ do token Punctuation push :hash end - rule /\[/ do + rule %r/\[/ do token Punctuation push :array end rule id do |m| @@ -91,64 +91,64 @@ end state :composite do mixin :comments_and_whitespace - rule /[{]/ do + rule %r/[{]/ do token Punctuation pop! push :hash end - rule /[\[]/ do + rule %r/[\[]/ do token Punctuation pop! push :array end mixin :root - rule //, Text, :pop! + rule %r//, Text, :pop! end state :hash do mixin :comments_and_whitespace - rule /\=/, Punctuation - rule /\}/, Punctuation, :pop! + rule %r/\=/, Punctuation + rule %r/\}/, Punctuation, :pop! mixin :root end state :array do mixin :comments_and_whitespace - rule /,/, Punctuation - rule /\]/, Punctuation, :pop! + rule %r/,/, Punctuation + rule %r/\]/, Punctuation, :pop! mixin :root end state :dq do - rule /[^\\"]+/, Str::Double - rule /\\"/, Str::Escape - rule /"/, Str::Double, :pop! + rule %r/[^\\"]+/, Str::Double + rule %r/\\"/, Str::Escape + rule %r/"/, Str::Double, :pop! end state :sq do - rule /[^\\']+/, Str::Single - rule /\\'/, Str::Escape - rule /'/, Str::Single, :pop! + rule %r/[^\\']+/, Str::Single + rule %r/\\'/, Str::Escape + rule %r/'/, Str::Single, :pop! end state :heredoc do - rule /\n/, Str::Heredoc, :heredoc_nl - rule /[^$\n]+/, Str::Heredoc - rule /[$]/, Str::Heredoc + rule %r/\n/, Str::Heredoc, :heredoc_nl + rule %r/[^$\n]+/, Str::Heredoc + rule %r/[$]/, Str::Heredoc end state :heredoc_nl do - rule /\s*(\w+)\s*\n/ do |m| + rule %r/\s*(\w+)\s*\n/ do |m| if m[1] == @heredocstr token Name::Constant pop! 2 else token Str::Heredoc