rouge 1.1.0 → 1.2.0

data/lib/rouge/lexers/http.rb

@@ -25,10 +25,12 @@ module Rouge
           ([^ ]+)([ ]+)                     # path
           (HTTPS?)(/)(1[.][01])(\r?\n|$)  # http version
         )ox do
-          group Name::Function; group Text
-          group Name::Namespace; group Text
-          group Keyword; group Operator
-          group Num; group Text
+          groups(
+            Name::Function, Text,
+            Name::Namespace, Text,
+            Keyword, Operator, Num, Text
+          )
+
           push :headers
         end
 
@@ -38,10 +40,11 @@ module Rouge
           (\d{3})([ ]+)               # status
           ([^\r\n]+)(\r?\n|$)       # status message
         )x do
-          group Keyword; group Operator
-          group Num; group Text
-          group Num; group Text
-          group Name::Exception; group Text
+          groups(
+            Keyword, Operator, Num, Text,
+            Num, Text,
+            Name::Exception, Text
+          )
           push :headers
         end
       end
@@ -54,13 +57,11 @@ module Rouge
             @content_type = value.split(';')[0].downcase
           end
 
-          group Name::Attribute; group Text
-          group Punctuation; group Text
-          group Str; group Text
+          groups Name::Attribute, Text, Punctuation, Text, Str, Text
         end
 
         rule /([^\r\n]+)(\r?\n|$)/ do
-          group Str; group Text
+          groups Str, Text
         end
 
         rule /\r?\n/, Text, :content

data/lib/rouge/lexers/ini.rb

@@ -24,8 +24,7 @@ module Rouge
         mixin :basic
 
         rule /(#{identifier})(\s*)(=)/ do
-          group Name::Property; group Text
-          group Punctuation
+          groups Name::Property, Text, Punctuation
           push :value
         end
 

data/lib/rouge/lexers/java.rb

@@ -48,8 +48,7 @@ module Rouge
         rule /"(\\\\|\\"|[^"])*"/, Str
         rule /'(?:\\.|[^\\]|\\u[0-9a-f]{4})'/, Str::Char
         rule /(\.)(#{id})/ do
-          group Operator
-          group Name::Attribute
+          groups Operator, Name::Attribute
         end
         rule /#{id}:/, Name::Label
         rule /\$?#{id}/, Name

data/lib/rouge/lexers/lua.rb

@@ -86,7 +86,7 @@ module Rouge
       state :function_name do
         rule /\s+/, Text
         rule %r((?:([A-Za-z_][A-Za-z0-9_]*)(\.))?([A-Za-z_][A-Za-z0-9_]*)) do
-          group Name::Class; group Punctuation; group Name::Function
+          groups Name::Class, Punctuation, Name::Function
           pop!
         end
         # inline function

data/lib/rouge/lexers/make.rb

@@ -34,7 +34,7 @@ module Rouge
         rule /#.*?\n/, Comment
 
         rule /(export)(\s+)(?=[a-zA-Z0-9_\${}\t -]+\n)/ do
-          group Keyword; group Text
+          groups Keyword, Text
           push :export
         end
 
@@ -51,7 +51,7 @@ module Rouge
         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
@@ -76,7 +76,7 @@ module Rouge
 
       state :block_body do
         rule /(\t[\t ]*)([@-]?)/ do |m|
-          group Text; group Punctuation
+          groups Text, Punctuation
           push :shell_line
         end
 
@@ -88,8 +88,7 @@ module Rouge
         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
 

data/lib/rouge/lexers/markdown.rb

@@ -66,9 +66,7 @@ module Rouge
           (\[) (#{edot}+?) (\]) # the reference
           (\s*) (:) # colon
         )x do
-          group Text
-          group Punctuation; group Str::Symbol; group Punctuation
-          group Text; group Punctuation
+          groups Text, Punctuation, Str::Symbol, Punctuation, Text, Punctuation
 
           push :title
           push :url
@@ -76,9 +74,7 @@ module Rouge
 
         # links and images
         rule /(!?\[)(#{edot}+?)(\])/ do
-          group Punctuation
-          group Name::Variable
-          group Punctuation
+          groups Punctuation, Name::Variable, Punctuation
           push :link
         end
 
@@ -105,9 +101,7 @@ module Rouge
 
       state :link do
         rule /(\[)(#{edot}*?)(\])/ do
-          group Punctuation
-          group Str::Symbol
-          group Punctuation
+          groups Punctuation, Str::Symbol, Punctuation
           pop!
         end
 
@@ -127,9 +121,7 @@ module Rouge
 
         # the url
         rule /(<)(#{edot}*?)(>)/ do
-          group Name::Tag
-          group Str::Other
-          group Name::Tag
+          groups Name::Tag, Str::Other, Name::Tag
           pop!
         end
 

data/lib/rouge/lexers/matlab.rb

@@ -0,0 +1,71 @@
+module Rouge
+  module Lexers
+    class Matlab < RegexLexer
+      desc "Matlab"
+      tag 'matlab'
+      aliases 'm'
+      filenames '*.m'
+      mimetypes 'text/x-matlab', 'application/x-matlab'
+
+      def self.analyze_text(text)
+        return 0.4 if text.match(/^\s*% /) # % comments are a dead giveaway
+      end
+
+      def self.keywords
+        @keywords = Set.new %w(
+          break case catch classdef continue else elseif end for function
+          global if otherwise parfor persistent return spmd switch try while
+        )
+      end
+
+      def self.builtins
+        load Pathname.new(__FILE__).dirname.join('matlab/builtins.rb')
+        self.builtins
+      end
+
+      state :root do
+        rule /\s+/m, Text # Whitespace
+        rule %r([{]%.*?%[}])m, Comment::Multiline
+        rule /%.*$/, Comment::Single
+        rule /([.][.][.])(.*?)$/ do
+          groups(Keyword, Comment)
+        end
+
+        rule /^(!)(.*?)(?=%|$)/ do |m|
+          token Keyword, m[1]
+          delegate Shell, m[2]
+        end
+
+
+        rule /[a-zA-Z][_a-zA-Z0-9]*/m do |m|
+          match = m[0]
+          if self.class.keywords.include? match
+            token Keyword
+          elsif self.class.builtins.include? match
+            token Name::Builtin
+          else
+            token Name
+          end
+        end
+
+        rule %r{[(){};:,\/\\\]\[]}, Punctuation
+
+        rule /~=|==|<<|>>|[-~+\/*%=<>&^|.]/, Operator
+
+
+        rule /(\d+\.\d*|\d*\.\d+)(e[+-]?[0-9]+)?/i, Num::Float
+        rule /\d+e[+-]?[0-9]+/i, Num::Float
+        rule /\d+L/, Num::Integer::Long
+        rule /\d+/, Num::Integer
+
+        rule /'/, Str::Single, :string
+      end
+
+      state :string do
+        rule /[^']+/, Str::Single
+        rule /''/, Str::Escape
+        rule /'/, Str::Single, :pop!
+      end
+    end
+  end
+end

data/lib/rouge/lexers/matlab/builtins.rb

@@ -0,0 +1,10 @@
+# automatically generated by `rake builtins:matlab`
+module Rouge
+  module Lexers
+    class Matlab
+      def self.builtins
+        @builtins ||= Set.new %w(ans clc diary format home iskeyword more commandhistory commandwindow accumarray blkdiag diag eye false freqspace linspace logspace meshgrid ndgrid ones rand true zeros cat horzcat vertcat colon end ind2sub sub2ind length ndims numel size height width iscolumn isempty ismatrix isrow isscalar isvector blkdiag circshift ctranspose diag flip flipdim fliplr flipud ipermute permute repmat reshape rot90 shiftdim issorted sort sortrows squeeze transpose vectorize plus uplus minus uminus times rdivide ldivide power mtimes mrdivide mldivide mpower cumprod cumsum diff prod sum ceil fix floor idivide mod rem round relationaloperators eq ge gt le lt ne isequal isequaln logicaloperatorselementwise logicaloperatorsshortcircuit and not or xor all any false find islogical logical true intersect ismember issorted setdiff setxor union unique join innerjoin outerjoin bitand bitcmp bitget bitor bitset bitshift bitxor swapbytes specialcharacters colon double single int8 int16 int32 int64 uint8 uint16 uint32 uint64 cast typecast isinteger isfloat isnumeric isreal isfinite isinf isnan eps flintmax inf intmax intmin nan realmax realmin blanks cellstr char iscellstr ischar sprintf strcat strjoin ischar isletter isspace isstrprop sscanf strfind strrep strsplit strtok validatestring symvar regexp regexpi regexprep regexptranslate strcmp strcmpi strncmp strncmpi blanks deblank strtrim lower upper strjust categorical iscategorical categories iscategory isordinal isprotected addcats mergecats removecats renamecats reordercats summary countcats isundefined table array2table cell2table struct2table table2array table2cell table2struct readtable writetable istable height width summary intersect ismember setdiff setxor unique union join innerjoin outerjoin sortrows stack unstack ismissing standardizemissing varfun rowfun struct fieldnames getfield isfield isstruct orderfields rmfield setfield arrayfun structfun cell2struct struct2cell cell cell2mat cell2struct celldisp cellfun cellplot cellstr iscell iscellstr mat2cell num2cell strjoin strsplit struct2cell function_handle feval func2str str2func localfunctions functions timeseriesclass addevent delevent gettsafteratevent gettsafterevent gettsatevent gettsbeforeatevent gettsbeforeevent gettsbetweenevents gettscollection isemptytscollection lengthtscollection settscollection sizetscollection tscollection addsampletocollection addts delsamplefromcollection getabstimetscollection getsampleusingtimetscollection gettimeseriesnames horzcattscollection removets resampletscollection setabstimetscollection settimeseriesnames vertcattscollection is isa iscategorical iscell iscellstr ischar isfield isfloat ishghandle isinteger isjava islogical isnumeric isobject isreal isscalar isstr isstruct istable isvector class validateattributes whos char int2str mat2str num2str str2double str2num native2unicode unicode2native base2dec bin2dec dec2base dec2bin dec2hex hex2dec hex2num num2hex table2array table2cell table2struct array2table cell2table struct2table cell2mat cell2struct cellstr mat2cell num2cell struct2cell datenum datevec datestr now clock date calendar eomday weekday addtodate etime plus uplus minus uminus times rdivide ldivide power mtimes mrdivide mldivide mpower cumprod cumsum diff prod sum ceil fix floor idivide mod rem round sin sind asin asind sinh asinh cos cosd acos acosd cosh acosh tan tand atan atand atan2 atan2d tanh atanh csc cscd acsc acscd csch acsch sec secd asec asecd sech asech cot cotd acot acotd coth acoth hypot exp expm1 log log10 log1p log2 nextpow2 nthroot pow2 reallog realpow realsqrt sqrt abs angle complex conj cplxpair i imag isreal j real sign unwrap factor factorial gcd isprime lcm nchoosek perms primes rat poly polyder polyeig polyfit polyint polyval polyvalm residue roots airy besselh besseli besselj besselk bessely beta betainc betaincinv betaln ellipj ellipke erf erfc erfcinv erfcx erfinv expint gamma gammainc gammaincinv gammaln legendre psi cart2pol cart2sph pol2cart sph2cart eps flintmax i j inf pi nan isfinite isinf isnan compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson cross dot kron surfnorm tril triu transpose cond condest funm inv linsolve lscov lsqnonneg pinv rcond mldivide mrdivide chol ichol cholupdate ilu lu qr qrdelete qrinsert qrupdate planerot ldl cdf2rdf rsf2csf gsvd svd balance cdf2rdf condeig eig eigs gsvd hess ordeig ordqz ordschur poly polyeig qz rsf2csf schur sqrtm ss2tf svd svds cond condeig det norm normest null orth rank rcond rref subspace trace expm logm sqrtm bsxfun arrayfun accumarray mpower corrcoef cov max mean median min mode std var rand randn randi randperm rng interp1 griddedinterpolantclass pchip spline ppval mkpp unmkpp padecoef interpft interp2 interp3 interpn griddedinterpolantclass ndgrid meshgrid griddata griddatan scatteredinterpolantclass fminbnd fminsearch fzero lsqnonneg optimget optimset ode45 ode15s ode23 ode113 ode23t ode23tb ode23s ode15i decic odextend odeget odeset deval bvp4c bvp5c bvpinit bvpxtend bvpget bvpset deval dde23 ddesd ddensd ddeget ddeset deval pdepe pdeval integral integral2 integral3 quadgk quad2d cumtrapz trapz polyint del2 diff gradient polyder abs angle cplxpair fft fft2 fftn fftshift fftw ifft ifft2 ifftn ifftshift nextpow2 unwrap conv conv2 convn deconv detrend filter filter2 spdiags speye sprand sprandn sprandsym sparse spconvert issparse nnz nonzeros nzmax spalloc spfun spones spparms spy find full amd colamd colperm dmperm randperm symamd symrcm condest eigs ichol ilu normest spaugment sprank svds bicg bicgstab bicgstabl cgs gmres lsqr minres pcg qmr symmlq tfqmr etree etreeplot gplot symbfact treelayout treeplot unmesh triangulationclass tetramesh trimesh triplot trisurf delaunaytriangulationclass delaunay delaunayn tetramesh trimesh triplot trisurf triangulationclass delaunaytriangulationclass dsearchn tsearchn delaunay delaunayn convhull convhulln patch trisurf patch voronoi voronoin polyarea inpolygon rectint plot plotyy plot3 loglog semilogx semilogy errorbar fplot ezplot ezplot3 linespec colorspec bar bar3 barh bar3h hist histc rose pareto area pie pie3 stem stairs stem3 scatter scatter3 spy plotmatrix polar rose compass ezpolar linespec colorspec contour contourf contourc contour3 contourslice ezcontour ezcontourf feather quiver compass quiver3 streamslice streamline surf surfc surface surfl surfnorm mesh meshc meshz waterfall ribbon contour3 peaks cylinder ellipsoid sphere pcolor surf2patch ezsurf ezsurfc ezmesh ezmeshc contourslice flow isocaps isocolors isonormals isosurface reducepatch reducevolume shrinkfaces slice smooth3 subvolume volumebounds coneplot curl divergence interpstreamspeed stream2 stream3 streamline streamparticles streamribbon streamslice streamtube fill fill3 patch surf2patch movie noanimate drawnow refreshdata frame2im getframe im2frame comet comet3 title xlabel ylabel zlabel clabel datetick texlabel legend colorbar xlim ylim zlim box grid daspect pbaspect axes axis subplot hold gca cla annotation text legend title xlabel ylabel zlabel datacursormode ginput gtext colormap colormapeditor colorbar brighten contrast shading graymon caxis hsv2rgb rgb2hsv rgbplot spinmap colordef whitebg hidden pan reset rotate rotate3d selectmoveresize zoom datacursormode figurepalette plotbrowser plotedit plottools propertyeditor showplottool brush datacursormode linkdata refreshdata view makehgtform viewmtx cameratoolbar campan camzoom camdolly camlookat camorbit campos camproj camroll camtarget camup camva camlight light lightangle lighting diffuse material specular alim alpha alphamap image imagesc imread imwrite imfinfo imformats frame2im im2frame im2java ind2rgb rgb2ind imapprox dither cmpermute cmunique print printopt printdlg printpreview orient savefig openfig hgexport hgsave hgload saveas gca gcf gcbf gcbo gco ancestor allchild findall findfigs findobj gobjects ishghandle copyobj delete get set propedit rootobject figure axes image light line patch rectangle surface text annotation set get hggroup hgtransform makehgtform figure gcf close clf refresh newplot shg closereq dragrect drawnow rbbox opengl axes hold ishold newplot linkaxes linkprop refreshdata waitfor get set if for parfor switch try while break continue end pause return edit input publish notebook grabcode snapnow function nargin nargout varargin varargout narginchk nargoutchk validateattributes validatestring inputparserclass inputname persistent genvarname isvarname namelengthmax assignin global isglobal try error warning lastwarn assert oncleanup dbclear dbcont dbdown dbquit dbstack dbstatus dbstep dbstop dbtype dbup checkcode keyboard mlintrpt edit echo eval evalc evalin feval run builtin depdir depfun mfilename pcode timerclass clear clearvars disp openvar who whos load save matfile workspace importdata uiimport csvread csvwrite dlmread dlmwrite fileread textread textscan readtable writetable type xlsfinfo xlsread xlswrite readtable writetable fclose feof ferror fgetl fgets fopen fprintf fread frewind fscanf fseek ftell fwrite exifread im2java imfinfo imread imwrite tiffclass nccreate ncdisp ncinfo ncread ncreadatt ncwrite ncwriteatt ncwriteschema netcdf h5create h5disp h5info h5read h5readatt h5write h5writeatt hdfinfo hdfread hdf fitsdisp fitsinfo fitsread fitswrite multibandread multibandwrite cdfepoch cdfinfo cdfread cdfwrite todatenum cdflib audioinfo audioread audiowrite mmfileinfo movie2avi videoreaderclass videowriterclass audiodevinfo audioplayer audiorecorder sound soundsc beep lin2mu mu2lin xmlread xmlwrite xslt dispmemmapfile getmemmapfile memmapfile dir ls pwd fileattrib exist isdir type visdiff what which cd copyfile delete recycle mkdir movefile rmdir open winopen filebrowser fileparts fullfile filemarker filesep tempdir tempname matlabroot toolboxdir gunzip gzip tar untar unzip zip addpath rmpath path savepath userpath genpath pathsep pathtool restoredefaultpath clipboard computer dos getenv perl setenv system unix winqueryreg ftpclass sendmail urlread urlwrite web instrcallback instrfind instrfindall readasync record serial serialbreak stopasync guide figure axes uicontrol uitable uipanel uibuttongroup actxcontrol uimenu uicontextmenu uitoolbar uipushtool uitoggletool dialog errordlg helpdlg msgbox questdlg uigetpref uisetpref waitbar warndlg export2wsdlg inputdlg listdlg uisetcolor uisetfont printdlg printpreview uigetdir uigetfile uiopen uiputfile uisave align movegui getpixelposition setpixelposition listfonts textwrap uistack guidata guihandles openfig getappdata isappdata rmappdata setappdata uiresume uiwait waitfor waitforbuttonpress addpref getpref ispref rmpref setpref classdef class isa isequal isobject enumeration events methods properties classdef import properties isprop dynamicprops methods ismethod handle hgsetget dynamicprops isa events empty superclasses enumeration save load saveobj loadobj cat horzcat vertcat empty disp display numel size end subsref subsasgn subsindex substruct metaclass try addcausemexception getreportmexception lastmexception rethrowmexception throwmexception throwascallermexception mexception bench cputime memory profile profsave tic timeit toc clear inmem memory pack whos functiontests runtests builddocsearchdb javaarray javaclasspath javaaddpath javarmpath javachk isjava usejava javamethod javamethodedt javaobject javaobjectedt cell class clear depfun exist fieldnames im2java import inmem inspect isa methods methodsview which net enablenetfromnetworkdrive cell begininvoke endinvoke combine remove removeall bitand bitor bitxor bitnot mexext inmem actxserver actxcontrol actxcontrollist actxcontrolselect iscom addproperty deleteproperty inspect fieldnames methods methodsview invoke isevent eventlisteners registerevent unregisterallevents unregisterevent isinterface interfaces release move execute getchararray putchararray getfullmatrix putfullmatrix getvariable getworkspacedata putworkspacedata maximizecommandwindow minimizecommandwindow actxgetrunningserver enableservice callsoapservice createclassfromwsdl createsoapmessage parsesoapresponse loadlibrary unloadlibrary libisloaded calllib libfunctions libfunctionsview libstruct libpointer mexext inmem mex dbmex mex dbmex ver computer mexext dbmex inmem mex mexext checkin checkout cmopts customverctrl undocheckout verctrl matlabwindows matlabunix exit quit matlabrc startup finish prefdir preferences ismac ispc isstudent isunix javachk license usejava ver verlessthan version doc help docsearch lookfor demo echodemo)
+      end
+    end
+  end
+end

data/lib/rouge/lexers/nginx.rb

@@ -10,7 +10,7 @@ module Rouge
 
       state :root do
         rule /(include)(\s+)([^\s;]+)/ do
-          group Keyword; group Text; group Name
+          groups Keyword, Text, Name
         end
 
         rule id, Keyword, :statement
@@ -43,8 +43,7 @@ module Rouge
 
         # host/port
         rule /([a-z0-9.-]+)(:)([0-9]+)/i do
-          group Name::Function; group Punctuation
-          group Num::Integer
+          groups Name::Function, Punctuation, Num::Integer
         end
 
         # mimetype
@@ -52,7 +51,7 @@ module Rouge
 
         rule /[0-9]+[kmg]?\b/i, Num::Integer
         rule /(~)(\s*)([^\s{]+)/ do
-          group Punctuation; group Text; group Str::Regex
+          groups Punctuation, Text, Str::Regex
         end
 
         rule /[:=~]/, Punctuation

data/lib/rouge/lexers/objective_c.rb

@@ -27,7 +27,7 @@ module Rouge
       end
 
       def self.analyze_text(text)
-        return 1 if text =~ /@(end|implementation|protocol)\b/
+        return 1 if text =~ /@(end|implementation|protocol|property)\b/
 
         id = /[a-z$_][a-z0-9$_]*/i
         return 0.4 if text =~ %r(

data/lib/rouge/lexers/ocaml.rb

@@ -0,0 +1,109 @@
+module Rouge
+  module Lexers
+    class OCaml < RegexLexer
+      desc 'Objective CAML (ocaml.org)'
+      tag 'ocaml'
+      filenames '*.ml', '*.mli', '*.mll', '*.mly'
+      mimetypes 'text/x-ocaml'
+
+      def self.keywords
+        @keywords ||= Set.new %w(
+          as assert begin class constraint do done downto else end
+          exception external false for fun function functor if in include
+          inherit initializer lazy let match method module mutable new
+          object of open private raise rec sig struct then to true try
+          type value val virtual when while with
+        )
+      end
+
+      def self.keyopts
+        @keyopts ||= Set.new %w(
+          != # & && ( ) * \+ , - -. -> . .. : :: := :> ; ;; < <- =
+          > >] >} ? ?? [ [< [> [| ] _ ` { {< | |] } ~
+        )
+      end
+
+      def self.word_operators
+        @word_operators ||= Set.new %w(and asr land lor lsl lxor mod or)
+      end
+
+      def self.primitives
+        @primitives ||= Set.new %w(unit int float bool string char list array)
+      end
+
+      operator = %r([\[\];,{}_()!$%&*+./:<=>?@^|~-]+)
+      id = /[a-z][\w']*/i
+      upper_id = /[A-Z][\w']*/
+
+      state :root do
+        rule /\s+/m, Text
+        rule /false|true|[(][)]|\[\]/, Name::Builtin::Pseudo
+        rule /#{upper_id}(?=\s*[.])/, Name::Namespace, :dotted
+        rule upper_id, Name::Class
+        rule /[(][*](?![)])/, Comment, :comment
+        rule id do |m|
+          match = m[0]
+          if self.class.keywords.include? match
+            token Keyword
+          elsif self.class.word_operators.include? match
+            token Operator::Word
+          elsif self.class.primitives.include? match
+            token Keyword::Type
+          else
+            token Name
+          end
+        end
+
+        rule operator do |m|
+          match = m[0]
+          if self.class.keyopts.include? match
+            token Punctuation
+          else
+            token Operator
+          end
+        end
+
+        rule /-?\d[\d_]*(.[\d_]*)?(e[+-]?\d[\d_]*)/i, Num::Float
+        rule /0x\h[\h_]*/i, Num::Hex
+        rule /0o[0-7][0-7_]*/i, Num::Oct
+        rule /0b[01][01_]*/i, Num::Bin
+        rule /\d[\d_]*/, Num::Integer
+
+        rule /'(?:(\\[\\"'ntbr ])|(\\[0-9]{3})|(\\x\h{2}))'/, Str::Char
+        rule /'[.]'/, Str::Char
+        rule /'/, Keyword
+        rule /"/, Str::Double, :string
+        rule /[~?]#{id}/, Name::Variable
+      end
+
+      state :comment do
+        rule /[^(*)]+/, Comment
+        rule(/[(][*]/) { token Comment; push }
+        rule /[*][)]/, Comment, :pop!
+        rule /[(*)]/, Comment
+      end
+
+      state :string do
+        rule /[^\\"]+/, Str::Double
+        mixin :escape_sequence
+        rule /\\\n/, Str::Double
+        rule /"/, Str::Double, :pop!
+      end
+
+      state :escape_sequence do
+        rule /\\[\\"'ntbr]/, Str::Escape
+        rule /\\\d{3}/, Str::Escape
+        rule /\\x\h{2}/, Str::Escape
+      end
+
+      state :dotted do
+        rule /\s+/m, Text
+        rule /[.]/, Punctuation
+        rule /#{upper_id}(?=\s*[.])/, Name::Namespace
+        rule upper_id, Name::Class, :pop!
+        rule id, Name, :pop!
+      end
+    end
+  end
+end
+

data/lib/rouge/lexers/perl.rb

@@ -67,9 +67,7 @@ module Rouge
         rule /(?:#{keywords.join('|')})\b/, Keyword
 
         rule /(format)(\s+)([a-zA-Z0-9_]+)(\s*)(=)(\s*\n)/ do
-          group Keyword; group Text
-          group Name; group Text
-          group Punctuation; group Text
+          groups Keyword, Text, Name, Text, Punctuation, Text
 
           push :format
         end
@@ -166,8 +164,7 @@ module Rouge
 
         # argument declaration
         rule /(\([$@%]*\))(\s*)/ do
-          group Punctuation
-          group Text
+          groups Punctuation, Text
         end
 
         rule /.*?{/, Punctuation, :pop!

data/lib/rouge/lexers/php.rb

@@ -74,7 +74,7 @@ module Rouge
         rule %r(/\*\*.*?\*/)m, Str::Doc
         rule %r(/\*.*?\*/)m, Comment::Multiline
         rule /(->|::)(\s*)([a-zA-Z_][a-zA-Z0-9_]*)/ do
-          group Operator; group Text; group Name::Attribute
+          groups Operator, Text, Name::Attribute
         end
 
         rule /[~!%^&*+=\|:.<>\/?@-]+/, Operator
@@ -82,17 +82,17 @@ module Rouge
         rule /class\b/, Keyword, :classname
         # anonymous functions
         rule /(function)(\s*)(?=\()/ do
-          group Keyword; group Text
+          groups Keyword, Text
         end
 
         # named functions
         rule /(function)(\s+)(&?)(\s*)/ do
-          group Keyword; group Text; group Operator; group Text
+          groups Keyword, Text, Operator, Text
           push :funcname
         end
 
         rule /(const)(\s+)([a-zA-Z_]\w*)/i do
-          group Keyword; group Text; group Name::Constant
+          groups Keyword, Text, Name::Constant
         end
 
         rule /(true|false|null)\b/, Keyword::Constant
@@ -141,7 +141,7 @@ module Rouge
         rule /\{\$\{/, Str::Interpol, :interp_double
         rule /\{(?=\$)/, Str::Interpol, :interp_single
         rule /(\{)(\S+)(\})/ do
-          group Str::Interpol; group Name::Variable; group Str::Interpol
+          groups Str::Interpol, Name::Variable, Str::Interpol
         end
 
         rule /[${\\]+/, Str::Double