rouge 4.6.1 → 5.0.0

data/lib/rouge/lexers/robot_framework.rb

@@ -27,7 +27,7 @@ module Rouge
           "test setup", "test teardown", "test template", "variables"
         ]
       end
-      
+
       def self.settings_with_args
         @settings_with_args ||= Set.new [
           "arguments", "default tags", "documentation", "force tags",
@@ -93,7 +93,7 @@ module Rouge
           @col = @col + 1
           push :args
         end
-        
+
         rule %r/ ?\|/, Text::Whitespace
       end
 
@@ -129,17 +129,17 @@ module Rouge
         rule %r/([A-Z]+(?: [A-Z]+)?)(:?)/i do |m|
           match = m[1].downcase
           @next = if self.class.settings_with_keywords.include? match
-                    :keyword
-                  elsif self.class.settings_with_args.include? match
-                    :args
-                  end
+            :keyword
+          elsif self.class.settings_with_args.include? match
+            :args
+          end
           groups Name::Builtin::Pseudo, Punctuation
         end
       end
 
       state :section_tests do
         mixin :section_include
-        
+
         rule %r/[$@&%{}]+/, Name::Label
         rule %r/( )(?![ |])/, Name::Label
 
@@ -155,15 +155,15 @@ module Rouge
 
       state :section_keywords do
         mixin :section_include
-  
+
         rule %r/[$@&%]\{/ do
           token Name::Variable
           push :var
         end
-        
+
         rule %r/[$@&%{}]+/, Name::Label
         rule %r/( )(?![ |])/, Name::Label
-        
+
         rule id, Name::Label
       end
 
@@ -185,7 +185,7 @@ module Rouge
       state :keyword do
         rule %r/(\[)([A-Z]+(?: [A-Z]+)?)(\])/i do |m|
           groups Punctuation, Name::Builtin::Pseudo, Punctuation
-          
+
           match = m[2].downcase
           @is_template = true if match == "template"
           if self.class.settings_with_keywords.include? match
@@ -229,7 +229,7 @@ module Rouge
         rule %r/[$@&%]+/, Str
         rule %r/( )(?![ |])/, Str
         rule id, Str
-        
+
         mixin :return
       end
 

data/lib/rouge/lexers/{coq.rb → rocq.rb}

@@ -3,11 +3,15 @@
 
 module Rouge
   module Lexers
-    class Coq < RegexLexer
-      title "Coq"
-      desc 'Coq (coq.inria.fr)'
-      tag 'coq'
-      mimetypes 'text/x-coq'
+    class Rocq < RegexLexer
+      title "Rocq"
+      desc 'The Rocq Prover (rocq-prover.org)'
+      tag 'rocq'
+
+      # Coq was renamed to Rocq
+      # https://github.com/rocq-prover/rfcs/blob/coq-roadmap/text/069-coq-roadmap.md#change-of-name-coq---the-rocq-prover
+      aliases 'coq'
+      mimetypes 'text/x-coq', 'text/x-rocq'
 
       def self.gallina
         @gallina ||= Set.new %w(
@@ -38,7 +42,7 @@ module Rouge
           edestruct constructor econstructor eexists exists
           f_equal refine instantiate revert simpl
           specialize generalize dependent red induction
-          beta iota zeta delta exfalso autorewrite setoid_rewrite
+          beta iota zeta delta exfalso autorewrite
           compute vm_compute native_compute
         )
       end
@@ -176,6 +180,8 @@ module Rouge
         rule %r(:=|=>|;|:>|:|::|_), Punctuation
         rule %r(->|/\\|\\/|;|:>|[⇒→↔⇔≔≡∀∃∧∨¬⊤⊥⊢⊨∈λ]), Operator
 
+        # [jneen] TODO: it is not ideal that we don't actually yield all of the
+        # consumed text here.
         rule id do |m|
           @name = m[0]
           @id_dotted = false
@@ -251,5 +257,8 @@ module Rouge
         end
       end
     end
+
+    # legacy
+    Coq = Rocq
   end
 end

data/lib/rouge/lexers/ruby.rb

@@ -106,7 +106,7 @@ module Rouge
       end
 
       keywords = %w(
-        BEGIN END alias begin break case defined\? do else elsif end
+        BEGIN END alias begin break case defined? do else elsif end
         ensure for if in next redo rescue raise retry return super then
         undef unless until when while yield
       )
@@ -186,8 +186,18 @@ module Rouge
 
         mixin :strings
 
-        rule %r/(?:#{keywords.join('|')})(?=\W|$)/, Keyword, :expr_start
-        rule %r/(?:#{keywords_pseudo.join('|')})\b/, Keyword::Pseudo, :expr_start
+        rule %r/\w+[?]?/ do |m|
+          if keywords.include?(m[0])
+            token Keyword
+          elsif keywords_pseudo.include?(m[0])
+            token Keyword::Pseudo
+          else
+            fallthrough!
+          end
+
+          push :expr_start
+        end
+
         rule %r/(not|and|or)\b/, Operator::Word, :expr_start
 
         rule %r(
@@ -208,10 +218,26 @@ module Rouge
           push :classname
         end
 
-        rule %r/(?:#{builtins_q.join('|')})[?]/, Name::Builtin, :expr_start
-        rule %r/(?:#{builtins_b.join('|')})!/,  Name::Builtin, :expr_start
-        rule %r/(?<!\.)(?:#{builtins_g.join('|')})\b/,
-          Name::Builtin, :method_call
+        rule %r/(\w+)([?!])?/ do |m|
+          if m[2] == "?" && builtins_q.include?(m[1])
+            token Name::Builtin
+          elsif m[2] == "!" && builtins_b.include?(m[1])
+            token Name::Builtin
+          else
+            fallthrough!
+          end
+
+          push :expr_start
+        end
+
+        rule %r/(?<![.])\w+/ do |m|
+          if builtins_g.include?(m[0])
+            token Name::Builtin
+            push :method_call
+          else
+            fallthrough!
+          end
+        end
 
         mixin :has_heredocs
 

data/lib/rouge/lexers/rust.rb

@@ -253,6 +253,7 @@ module Rouge
       state :string do
         rule %r/"/, Str, :pop!
         rule escapes, Str::Escape
+        rule %r/\\\n[ \t\r\n]*/, Str::Escape
         rule %r/[^"\\]+/m, Str
       end
     end

data/lib/rouge/lexers/sas.rb

@@ -13,13 +13,13 @@ module Rouge
         # from Data step statements - SAS 9.4 Statements reference
         # http://support.sas.com/documentation/cdl/en/lestmtsref/68024/PDF/default/lestmtsref.pdf
         @data_step_statements ||= Set.new %w(
-          ABORT ARRAY ATTRIB BY CALL CARDS CARDS4 CATNAME CHECKPOINT 
+          ABORT ARRAY ATTRIB BY CALL CARDS CARDS4 CATNAME CHECKPOINT
           EXECUTE_ALWAYS CONTINUE DATA DATALINES DATALINES4 DELETE DESCRIBE
           DISPLAY DM DO UNTIL WHILE DROP END ENDSAS ERROR EXECUTE FILE FILENAME
           FOOTNOTE FORMAT GO TO IF THEN ELSE INFILE INFORMAT INPUT
           KEEP LABEL LEAVE LENGTH LIBNAME LINK LIST LOCK LOSTCARD MERGE
           MISSING MODIFY OPTIONS OUTPUT PAGE PUT PUTLOG REDIRECT REMOVE RENAME
-          REPLACE RESETLINE RETAIN RETURN RUN SASFILE SELECT SET SKIP STOP         
+          REPLACE RESETLINE RETAIN RETURN RUN SASFILE SELECT SET SKIP STOP
           SYSECHO TITLE UPDATE WHERE WINDOW X
          )
       # label:
@@ -137,193 +137,192 @@ module Rouge
         )
       end
 
-      def self.proc_keywords 
+      def self.proc_keywords
         # Create a hash with keywords for common PROCs, keyed by PROC name
         @proc_keywords ||= {}
 
-	@proc_keywords["SQL"] ||= Set.new %w(
-            ALTER TABLE CONNECT CREATE INDEX VIEW DELETE DESCRIBE DISCONNECT DROP EXECUTE
-            INSERT RESET SELECT UPDATE VALIDATE ADD CONSTRAINT DROP FOREIGN KEY PRIMARY
-            MODIFY LIKE AS ORDER BY USING FROM INTO SET VALUES RESET DISTINCT UNIQUE
-            WHERE GROUP HAVING LEFT RIGHT INNER JOIN ON
-          )
+        @proc_keywords["SQL"] ||= Set.new %w(
+          ALTER TABLE CONNECT CREATE INDEX VIEW DELETE DESCRIBE DISCONNECT DROP EXECUTE
+          INSERT RESET SELECT UPDATE VALIDATE ADD CONSTRAINT FOREIGN KEY PRIMARY
+          MODIFY LIKE AS ORDER BY USING FROM INTO SET VALUES DISTINCT UNIQUE
+          WHERE GROUP HAVING LEFT RIGHT INNER JOIN ON
+        )
         # from SAS 9.4 SQL Procedure User's Guide
 
-	@proc_keywords["MEANS"] ||= Set.new %w(
-            BY CLASS FREQ ID OUTPUT OUT TYPES VAR WAYS WEIGHT
-            ATTRIB FORMAT LABEL WHERE
-            DESCENDING NOTSORTED 
-            NOTHREADS NOTRAP PCTLDEF SUMSIZE THREADS CLASSDATA COMPLETETYPES
-            EXCLUSIVE MISSING FW MAXDEC NONOBS NOPRINT ORDER FORMATTED FREQ
-            UNFORMATTED PRINT PRINTALLTYPES PRINTIDVARS STACKODSOUTPUT
-            CHARTYPE DESCENDTYPES IDMIN
-            ALPHA EXCLNPWGT QMARKERS QMETHOD QNTLDEF VARDEF
-            CLM CSS CV KURTOSIS KURT LCLM MAX MEAN MIN MODE N
-            NMISS RANGE SKEWNESS SKEW STDDEV STD STDERR SUM SUMWGT UCLM USS VAR
-            MEDIAN P50 Q1 P25 Q3 P75 P1 P90 P5 P95 P10 P99 P20 P30 P40 P60 P70
-            P80 QRANGE
-            PROBT PRT T
-            ASCENDING GROUPINTERNAL MLF PRELOADFMT
-            MAXID AUTOLABEL AUTONAME KEEPLEN LEVELS NOINHERIT
-          )
+        @proc_keywords["MEANS"] ||= Set.new %w(
+          BY CLASS FREQ ID OUTPUT OUT TYPES VAR WAYS WEIGHT
+          ATTRIB FORMAT LABEL WHERE
+          DESCENDING NOTSORTED
+          NOTHREADS NOTRAP PCTLDEF SUMSIZE THREADS CLASSDATA COMPLETETYPES
+          EXCLUSIVE MISSING FW MAXDEC NONOBS NOPRINT ORDER FORMATTED
+          UNFORMATTED PRINT PRINTALLTYPES PRINTIDVARS STACKODSOUTPUT
+          CHARTYPE DESCENDTYPES IDMIN
+          ALPHA EXCLNPWGT QMARKERS QMETHOD QNTLDEF VARDEF
+          CLM CSS CV KURTOSIS KURT LCLM MAX MEAN MIN MODE N
+          NMISS RANGE SKEWNESS SKEW STDDEV STD STDERR SUM SUMWGT UCLM USS
+          MEDIAN P50 Q1 P25 Q3 P75 P1 P90 P5 P95 P10 P99 P20 P30 P40 P60 P70
+          P80 QRANGE
+          PROBT PRT T
+          ASCENDING GROUPINTERNAL MLF PRELOADFMT
+          MAXID AUTOLABEL AUTONAME KEEPLEN LEVELS NOINHERIT
+        )
         # from BASE SAS 9.4 Procedures Guide, Fifth Edition
 
-	@proc_keywords["DATASETS"] ||= Set.new %w(
-            AGE APPEND ATTRIB AUDIT CHANGE CONTENTS COPY DELETE EXCHANGE
-            EXCLUDE FORMAT IC CREATE DELETE REACTIVATE INDEX CENTILES INFORMAT
-            INITIATE LABEL LOG MODIFY REBUILD RENAME REPAIR RESUME SAVE SELECT
-            SUSPEND TERMINATE USER_VAR XATTR ADD OPTIONS REMOVE SET
-          )
+        @proc_keywords["DATASETS"] ||= Set.new %w(
+          AGE APPEND ATTRIB AUDIT CHANGE CONTENTS COPY DELETE EXCHANGE
+          EXCLUDE FORMAT IC CREATE REACTIVATE INDEX CENTILES INFORMAT
+          INITIATE LABEL LOG MODIFY REBUILD RENAME REPAIR RESUME SAVE SELECT
+          SUSPEND TERMINATE USER_VAR XATTR ADD OPTIONS REMOVE SET
+        )
         # from BASE SAS 9.4 Procedures Guide, Fifth Edition
 
-	@proc_keywords["SORT"] ||= Set.new %w(
-            BY DESCENDING KEY ASCENDING ASC DESC DATECOPY FORCE OVERWRITE 
-            PRESORTED SORTSIZE TAGSORT DUPOUT OUT UNIQUEOUT NODUPKEY NOUNIQUEKEY 
-            NOTHREADS THREADS EQUALS NOEQUALS
-            ATTRIB FORMAT LABEL WHERE
-          )
+        @proc_keywords["SORT"] ||= Set.new %w(
+          BY DESCENDING KEY ASCENDING ASC DESC DATECOPY FORCE OVERWRITE
+          PRESORTED SORTSIZE TAGSORT DUPOUT OUT UNIQUEOUT NODUPKEY NOUNIQUEKEY
+          NOTHREADS THREADS EQUALS NOEQUALS
+          ATTRIB FORMAT LABEL WHERE
+        )
         # from BASE SAS 9.4 Procedures Guide, Fifth Edition
 
-	@proc_keywords["PRINT"] ||= Set.new %w(
-            BY DESCENDING NOTSORTED PAGEBY SUMBY ID STYLE SUM VAR CONTENTS DATA
-            GRANDTOTAL_LABEL HEADING LABEL SPLIT SUMLABEL NOSUMLABEL
-            BLANKLINE COUNT DOUBLE N NOOBS OBS ROUND
-            ROWS UNIFORM WIDTH
-            ATTRIB FORMAT LABEL WHERE
-          )
+        @proc_keywords["PRINT"] ||= Set.new %w(
+          BY DESCENDING NOTSORTED PAGEBY SUMBY ID STYLE SUM VAR CONTENTS DATA
+          GRANDTOTAL_LABEL HEADING LABEL SPLIT SUMLABEL NOSUMLABEL
+          BLANKLINE COUNT DOUBLE N NOOBS OBS ROUND
+          ROWS UNIFORM WIDTH
+          ATTRIB FORMAT WHERE
+        )
         # from BASE SAS 9.4 Procedures Guide, Fifth Edition
 
-	@proc_keywords["APPEND"] ||= Set.new %w(
-            BASE APPENDVER DATA ENCRYPTKEY FORCE GETSORT NOWARN
-            ATTRIB FORMAT LABEL WHERE
-          )
+        @proc_keywords["APPEND"] ||= Set.new %w(
+          BASE APPENDVER DATA ENCRYPTKEY FORCE GETSORT NOWARN
+          ATTRIB FORMAT LABEL WHERE
+        )
         # from BASE SAS 9.4 Procedures Guide, Fifth Edition
 
-	@proc_keywords["TRANSPOSE"] ||= Set.new %w(
-            DELIMITER LABEL LET NAME OUT PREFIX SUFFIX BY DESCENDING NOTSORTED
-            COPY ID IDLABEL VAR INDB
-            ATTRIB FORMAT LABEL WHERE
-          )
+        @proc_keywords["TRANSPOSE"] ||= Set.new %w(
+          DELIMITER LABEL LET NAME OUT PREFIX SUFFIX BY DESCENDING NOTSORTED
+          COPY ID IDLABEL VAR INDB
+          ATTRIB FORMAT WHERE
+        )
         # from BASE SAS 9.4 Procedures Guide, Fifth Edition
 
-	@proc_keywords["FREQ"] ||= Set.new %w(
-            BY EXACT OUTPUT TABLES TEST WEIGHT
-            COMPRESS DATA FORMCHAR NLEVELS NOPRINT ORDER PAGE FORMATTED FREQ 
-            INTERNAL
-            AGREE BARNARD BINOMIAL BIN CHISQ COMOR EQOR ZELEN FISHER JT KAPPA
-            KENTB TAUB LRCHI MCNEM MEASURES MHCHI OR ODDSRATIO PCHI PCORR RELRISK
-            RISKDIFF SCORR SMDCR SMDRC STUTC TAUC TREND WTKAP WTKAPPA
-            OUT AJCHI ALL BDCHI CMH CMH1 CMH2 CMHCOR CMHGA CMHRMS COCHQ CONTGY
-            CRAMV EQKAP EQWKP GAMMA GS GAILSIMON LAMCR LAMDAS LAMRC LGOR LGRRC1
-            LGRRC2 MHOR MHRRC1 MHRRC2 N NMISS PHI PLCORR RDIF1 RDIF2 RISKDIFF1
-            RISKDIFF2 RRC1 RELRISK1 RRC2 RELRISK2 RSK1 RISK1 RSK11 RISK11 RSK12
-            RISK12 RSK21 RISK21 RSK22 RISK22 TSYMM BOWKER U UCR URC
-            CELLCHI2 CUMCOL DEVIATION EXPECTED MISSPRINT PEARSONREF PRINTWKTS
-            SCOROUT SPARSE STDRES TOTPCT
-            CONTENTS CROSSLIST FORMAT LIST MAXLEVELS NOCOL NOCUM NOFREQ NOPERCENT
-            NOPRINT NOROW NOSPARSE NOWARN PLOTS OUT OUTCUM OUTEXPECT OUTPCT
-            ZEROS
-          )
+        @proc_keywords["FREQ"] ||= Set.new %w(
+          BY EXACT OUTPUT TABLES TEST WEIGHT
+          COMPRESS DATA FORMCHAR NLEVELS NOPRINT ORDER PAGE FORMATTED FREQ
+          INTERNAL
+          AGREE BARNARD BINOMIAL BIN CHISQ COMOR EQOR ZELEN FISHER JT KAPPA
+          KENTB TAUB LRCHI MCNEM MEASURES MHCHI OR ODDSRATIO PCHI PCORR RELRISK
+          RISKDIFF SCORR SMDCR SMDRC STUTC TAUC TREND WTKAP WTKAPPA
+          OUT AJCHI ALL BDCHI CMH CMH1 CMH2 CMHCOR CMHGA CMHRMS COCHQ CONTGY
+          CRAMV EQKAP EQWKP GAMMA GS GAILSIMON LAMCR LAMDAS LAMRC LGOR LGRRC1
+          LGRRC2 MHOR MHRRC1 MHRRC2 N NMISS PHI PLCORR RDIF1 RDIF2 RISKDIFF1
+          RISKDIFF2 RRC1 RELRISK1 RRC2 RELRISK2 RSK1 RISK1 RSK11 RISK11 RSK12
+          RISK12 RSK21 RISK21 RSK22 RISK22 TSYMM BOWKER U UCR URC
+          CELLCHI2 CUMCOL DEVIATION EXPECTED MISSPRINT PEARSONREF PRINTWKTS
+          SCOROUT SPARSE STDRES TOTPCT
+          CONTENTS CROSSLIST FORMAT LIST MAXLEVELS NOCOL NOCUM NOFREQ NOPERCENT NOROW NOSPARSE NOWARN PLOTS OUTCUM OUTEXPECT OUTPCT
+          ZEROS
+        )
         # from Base SAS 9.4 Procedures Guide: Statistical Procedures, Fourth Edition
 
-	@proc_keywords["CORR"] ||= Set.new %w(
-            BY FREQ ID PARTIAL VAR WEIGHT WITH
-            DATA OUTH OUTK OUTP OUTPLC OUTPLS OUTS
-            EXCLNPWGHT FISHER HOEFFDING KENDALL NOMISS PEARSON POLYCHORIC
-            POLYSERIAL ALPHA COV CSSCP SINGULAR SSCP VARDEF PLOTS MATRIX SCATTER
-            BEST NOCORR NOPRINT NOPROB NOSIMPLE RANK
-          )
+        @proc_keywords["CORR"] ||= Set.new %w(
+          BY FREQ ID PARTIAL VAR WEIGHT WITH
+          DATA OUTH OUTK OUTP OUTPLC OUTPLS OUTS
+          EXCLNPWGHT FISHER HOEFFDING KENDALL NOMISS PEARSON POLYCHORIC
+          POLYSERIAL ALPHA COV CSSCP SINGULAR SSCP VARDEF PLOTS MATRIX SCATTER
+          BEST NOCORR NOPRINT NOPROB NOSIMPLE RANK
+        )
         # from Base SAS 9.4 Procedures Guide: Statistical Procedures, Fourth Edition
 
-	@proc_keywords["REPORT"] ||= Set.new %w(
-            BREAK BY DESCENDING NOTSORTED COLUMN COMPUTE STYLE LINE ENDCOMP
-            CALL DEFINE _ROW_ FREQ RBREAK WEIGHT
-            ATTRIB FORMAT LABEL WHERE
-            DATA NOALIAS NOCENTER NOCOMPLETECOLS NOCOMPLETEROWS NOTHREADS 
-            NOWINDOWS OUT PCTLDEF THREADS WINDOWS COMPLETECOLS NOCOMPLETECOLS
-            COMPLETEROWS NOCOMPLETEROWS CONTENTS SPANROWS COMMAND HELP PROMPT
-            BOX BYPAGENO CENTER NOCENTER COLWIDTH FORMCHAR LS MISSING PANELS PS
-            PSPACE SHOWALL SPACING WRAP EXCLNPWGT QMARKERS QMETHOD QNTLDEF VARDEF
-            NAMED NOHEADER SPLIT HEADLINE HEADSKIP LIST NOEXEC OUTREPT PROFILE
-            REPORT
-            COLOR DOL DUL OL PAGE SKIP SUMMARIZE SUPPRESS UL
-            BLINK COMMAND HIGHLIGHT RVSVIDEO MERGE REPLACE URL URLBP URLP
-            AFTER BEFORE _PAGE_ LEFT RIGHT CHARACTER LENGTH
-            EXCLUSIVE MISSING MLF ORDER DATA FORMATTED FREQ INTERNAL PRELOADFMT
-            WIDTH
-            ACROSS ANALYSIS COMPUTED DISPLAY GROUP ORDER
-            CONTENTS FLOW ID NOPRINT NOZERO PAGE
-            CSS CV MAX MEAN MIN MODE N NMISS PCTN PCTSUM RANGE STD STDERR SUM
-            SUMWGT USS VAR
-            MEDIAN P50 Q1 P25 Q3 P75 P1 P90 P5 P95 P10 P99 P20 P30 P40 P60 P70
-            P80 QRANGE
-            PROBT PRT T
-          )
+        @proc_keywords["REPORT"] ||= Set.new %w(
+          BREAK BY DESCENDING NOTSORTED COLUMN COMPUTE STYLE LINE ENDCOMP
+          CALL DEFINE _ROW_ FREQ RBREAK WEIGHT
+          ATTRIB FORMAT LABEL WHERE
+          DATA NOALIAS NOCENTER NOCOMPLETECOLS NOCOMPLETEROWS NOTHREADS
+          NOWINDOWS OUT PCTLDEF THREADS WINDOWS COMPLETECOLS
+          COMPLETEROWS CONTENTS SPANROWS COMMAND HELP PROMPT
+          BOX BYPAGENO CENTER COLWIDTH FORMCHAR LS MISSING PANELS PS
+          PSPACE SHOWALL SPACING WRAP EXCLNPWGT QMARKERS QMETHOD QNTLDEF VARDEF
+          NAMED NOHEADER SPLIT HEADLINE HEADSKIP LIST NOEXEC OUTREPT PROFILE
+          REPORT
+          COLOR DOL DUL OL PAGE SKIP SUMMARIZE SUPPRESS UL
+          BLINK HIGHLIGHT RVSVIDEO MERGE REPLACE URL URLBP URLP
+          AFTER BEFORE _PAGE_ LEFT RIGHT CHARACTER LENGTH
+          EXCLUSIVE MLF ORDER FORMATTED INTERNAL PRELOADFMT
+          WIDTH
+          ACROSS ANALYSIS COMPUTED DISPLAY GROUP FLOW ID NOPRINT NOZERO
+          CSS CV MAX MEAN MIN MODE N NMISS PCTN PCTSUM RANGE STD STDERR SUM
+          SUMWGT USS VAR
+          MEDIAN P50 Q1 P25 Q3 P75 P1 P90 P5 P95 P10 P99 P20 P30 P40 P60 P70
+          P80 QRANGE
+          PROBT PRT T
+        )
         # from BASE SAS 9.4 Procedures Guide, Fifth Edition
 
-	@proc_keywords["METALIB"] ||= Set.new %w(
-            OMR DBAUTH DBUSER DBPASSWORD EXCLUDE SELECT READ FOLDER FOLDERID
-            IMPACT_LIMIT NOEXEC PREFIX REPORT UPDATE_RULE DELETE NOADD NODELDUP
-            NOUPDATE
-            LIBID LIBRARY LIBURI
-            TYPE DETAIL SUMMARY
-          )
+        @proc_keywords["METALIB"] ||= Set.new %w(
+          OMR DBAUTH DBUSER DBPASSWORD EXCLUDE SELECT READ FOLDER FOLDERID
+          IMPACT_LIMIT NOEXEC PREFIX REPORT UPDATE_RULE DELETE NOADD NODELDUP
+          NOUPDATE
+          LIBID LIBRARY LIBURI
+          TYPE DETAIL SUMMARY
+        )
         # from SAS 9.4 Language Interfaces to Metadata, Third Edition
 
-	@proc_keywords["GCHART"] ||= Set.new %w(
-            DATA ANNOTATE GOUT IMAGEMAP BLOCK HBAR HBAR3D VBAR VBAR3D PIE PIE3D
-            DONUT STAR ANNO
-            BY NOTE FORMAT LABEL WHERE
-            BLOCKMAX CAXIS COUTLINE CTEXT LEGEND NOHEADING NOLEGEND PATTERNID
-            GROUP MIDPOINT SUBGROUP WOUTLINE DESCRIPTION NAME DISCRETE LEVELS
-            OLD MISSING HTML_LEGEND HTML URL FREQ G100 SUMVAR TYPE
-            CAUTOREF CERROR CFRAME CLM CREF FRAME NOFRAME GSPACE IFRAME
-            IMAGESTYLE TILE FIT LAUTOREF NOSYMBOL PATTERNID SHAPE SPACE
-            SUBOUTSIDE WAUTOREF WIDTH WOUTLINE WREF
-            ASCENDING AUTOREF CLIPREF DESCENDING FRONTREF GAXIS MAXIS MINOR
-            NOAXIS NOBASEREF NOZERO RANGE AXIS REF CFREQ CFREQLABEL NONE CPERCENT
-            CPERCENTLABEL ERRORBAR BARS BOTH TOP FREQLABEL INSIDE MEAN MEANLABEL
-            NOSTATS OUTSIDE PERCENT PERCENTLABEL PERCENTSUM SUM
-            CFILL COUTLINE DETAIL_RADIUS EXPLODE FILL SOLID X INVISIBLE NOHEADING
-            RADIUS WOUTLINE DETAIL_THRESHOLD DETAIL_PERCENT DETAIL_SLICE
-            DETAIL_VALUE DONUTPCT LABEL ACROSS DOWN GROUP NOGROUPHEADING SUBGROUP
-            MATCHCOLOR OTHERCOLOR OTHERLABEL PERCENT ARROW PLABEL PPERCENT SLICE
-            VALUE
-            ANGLE ASCENDING CLOCKWISE DESCENDING JSTYLE
-            NOCONNECT STARMAX STARMIN 
-          )
+        @proc_keywords["GCHART"] ||= Set.new %w(
+          DATA ANNOTATE GOUT IMAGEMAP BLOCK HBAR HBAR3D VBAR VBAR3D PIE PIE3D
+          DONUT STAR ANNO
+          BY NOTE FORMAT LABEL WHERE
+          BLOCKMAX CAXIS COUTLINE CTEXT LEGEND NOHEADING NOLEGEND PATTERNID
+          GROUP MIDPOINT SUBGROUP WOUTLINE DESCRIPTION NAME DISCRETE LEVELS
+          OLD MISSING HTML_LEGEND HTML URL FREQ G100 SUMVAR TYPE
+          CAUTOREF CERROR CFRAME CLM CREF FRAME NOFRAME GSPACE IFRAME
+          IMAGESTYLE TILE FIT LAUTOREF NOSYMBOL SHAPE SPACE
+          SUBOUTSIDE WAUTOREF WIDTH WREF
+          ASCENDING AUTOREF CLIPREF DESCENDING FRONTREF GAXIS MAXIS MINOR
+          NOAXIS NOBASEREF NOZERO RANGE AXIS REF CFREQ CFREQLABEL NONE CPERCENT
+          CPERCENTLABEL ERRORBAR BARS BOTH TOP FREQLABEL INSIDE MEAN MEANLABEL
+          NOSTATS OUTSIDE PERCENT PERCENTLABEL PERCENTSUM SUM
+          CFILL DETAIL_RADIUS EXPLODE FILL SOLID X INVISIBLE
+          RADIUS DETAIL_THRESHOLD DETAIL_PERCENT DETAIL_SLICE
+          DETAIL_VALUE DONUTPCT ACROSS DOWN NOGROUPHEADING
+          MATCHCOLOR OTHERCOLOR OTHERLABEL ARROW PLABEL PPERCENT SLICE
+          VALUE
+          ANGLE CLOCKWISE JSTYLE
+          NOCONNECT STARMAX STARMIN
+        )
         # from SAS GRAPH 9.4 Reference, Fourth Edition
 
-	@proc_keywords["GPLOT"] ||= Set.new %w(
-            DATA ANNOTATE GOUT IMAGEMAP UNIFORM BUBBLE BUBBLE2 PLOT PLOT2
-            BCOLOR BFILL BFONT BLABEL BSCALE AREA RADIUS BSIZE DESCRIPTION NAME
-            AUTOHREF CAUTOHREF CHREF HAXIS HMINOR HREF HREVERSE HZERO LAUTOHREF
-            LHREF WAUTOHREF WHREF HTML URL
-            CAXIS CFRAME CTEXT DATAORDER FRAME NOFRAME FRONTREF GRID IFRAME
-            IMAGESTYLE TILE FIT NOAXIS
-            AUTOVREF CAUTOVREF CVREF LAUTOVREF LVREF VAXIS VMINOR VREF VREVERSE
-            VZERO WAUTOVREF WVREF
-            CBASELINE COUTLINE
-            AREAS GRID LEGEND NOLASTAREA NOLEGEND OVERLAY REGEQN SKIPMISS
-          )
+        @proc_keywords["GPLOT"] ||= Set.new %w(
+          DATA ANNOTATE GOUT IMAGEMAP UNIFORM BUBBLE BUBBLE2 PLOT PLOT2
+          BCOLOR BFILL BFONT BLABEL BSCALE AREA RADIUS BSIZE DESCRIPTION NAME
+          AUTOHREF CAUTOHREF CHREF HAXIS HMINOR HREF HREVERSE HZERO LAUTOHREF
+          LHREF WAUTOHREF WHREF HTML URL
+          CAXIS CFRAME CTEXT DATAORDER FRAME NOFRAME FRONTREF GRID IFRAME
+          IMAGESTYLE TILE FIT NOAXIS
+          AUTOVREF CAUTOVREF CVREF LAUTOVREF LVREF VAXIS VMINOR VREF VREVERSE
+          VZERO WAUTOVREF WVREF
+          CBASELINE COUTLINE
+          AREAS LEGEND NOLASTAREA NOLEGEND OVERLAY REGEQN SKIPMISS
+        )
         # from SAS GRAPH 9.4 Reference, Fourth Edition
 
-	@proc_keywords["REG"] ||= Set.new %w(
-            MODEL BY FREQ ID VAR WEIGHT ADD CODE DELETE MTEST OUTPUT PAINT
-            PLOT PRINT REFIT RESTRICT REWEIGHT STORE TEST
-          )
-         # from SAS/STAT 15.1 User's Guide
-
-	@proc_keywords["SGPLOT"] ||= Set.new %w(
-            STYLEATTRS BAND X Y UPPER LOWER BLOCK BUBBLE DENSITY DOT DROPLINE
-            ELLIPSE ELLIPSEPARM FRINGE GRADLEGEND HBAR HBARBASIC HBARPARM
-            HBOX HEATMAP HEATMAPPARM HIGHLOW HISTOGRAM HLINE INSET KEYLEGEND
-            LINEPARM LOESS NEEDLE PBSPLINE POLYGON REFLINE REG SCATTER SERIES
-            SPLINE STEP SYMBOLCHAR SYMBOLIMAGE TEXT VBAR VBARBASIC VBARPARM
-            VBOX VECTOR VLINE WATERFALL XAXIS X2AXIS XAXISTABLE YAXIS Y2AXIS
-            YAXISTABLE
-          )
-         # from ODS Graphics: Procedures Guide, Sixth Edition
+        @proc_keywords["REG"] ||= Set.new %w(
+          MODEL BY FREQ ID VAR WEIGHT ADD CODE DELETE MTEST OUTPUT PAINT
+          PLOT PRINT REFIT RESTRICT REWEIGHT STORE TEST
+        )
+        # from SAS/STAT 15.1 User's Guide
+
+        @proc_keywords["SGPLOT"] ||= Set.new %w(
+          STYLEATTRS BAND X Y UPPER LOWER BLOCK BUBBLE DENSITY DOT DROPLINE
+          ELLIPSE ELLIPSEPARM FRINGE GRADLEGEND HBAR HBARBASIC HBARPARM
+          HBOX HEATMAP HEATMAPPARM HIGHLOW HISTOGRAM HLINE INSET KEYLEGEND
+          LINEPARM LOESS NEEDLE PBSPLINE POLYGON REFLINE REG SCATTER SERIES
+          SPLINE STEP SYMBOLCHAR SYMBOLIMAGE TEXT VBAR VBARBASIC VBARPARM
+          VBOX VECTOR VLINE WATERFALL XAXIS X2AXIS XAXISTABLE YAXIS Y2AXIS
+          YAXISTABLE
+        )
+
+        # from ODS Graphics: Procedures Guide, Sixth Edition
         return @proc_keywords
       end
 
@@ -334,7 +333,7 @@ module Rouge
         @sas_proc_names ||= Set.new %w(
           ACCESS ACECLUS ADAPTIVEREG ALLELE ANOM ANOVA APPEND APPSRV ARIMA
           AUTHLIB AUTOREG BCHOICE BOM BOXPLOT BTL BUILD CALENDAR CALIS CALLRFC
-          CANCORR CANDISC CAPABILITY CASECONTROL CATALOG CATMOD CDISC CDISC
+          CANCORR CANDISC CAPABILITY CASECONTROL CATALOG CATMOD CDISC
           CHART CIMPORT CLP CLUSTER COMPARE COMPILE COMPUTAB CONTENTS CONVERT
           COPULA COPY CORR CORRESP COUNTREG CPM CPORT CUSUM CV2VIEW DATEKEYS
           DATASETS DATASOURCE DB2EXT DB2UTIL DBCSTAB DBF DBLOAD DELETE DIF
@@ -433,7 +432,7 @@ module Rouge
         # The OF operator should also be highlighted (Language Reference p49)
         rule %r/\b(of)\b/i, Operator::Word
         rule %r/\b(like)\b/i, Operator::Word # Language Ref p181
-      
+
         rule %r/\d+/, Num::Integer
 
         rule %r/\$/, Keyword::Type
@@ -467,7 +466,7 @@ module Rouge
 
         rule %r/@/, Str::Symbol # line hold specifiers
         rule %r/\?/, Str::Symbol # used for format modifiers
-        
+
         rule %r/[^\s]+/, Text # Fallback for anything we haven't matched so far
       end
 
@@ -483,7 +482,7 @@ module Rouge
           else
             groups Keyword, Text, Name
           end
-        
+
           push :proc
         end
 
@@ -541,7 +540,7 @@ module Rouge
       # PROCS
       state :proc do
         rule %r/(quit|run)/i, Keyword, :pop!
-        
+
         mixin :basics
         rule %r/\w+/ do |m|
           if self.class.data_step_statements.include? m[0].upcase

data/lib/rouge/lexers/sass/common.rb

@@ -67,7 +67,7 @@ module Rouge
         rule(id) do |m|
           if CSS.builtins.include? m[0]
             token Name::Builtin
-          elsif CSS.constants.include? m[0]
+          elsif CSS.colors.include? m[0]
             token Name::Constant
           else
             token Name

data/lib/rouge/lexers/sass.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'sass/common'
+
 module Rouge
   module Lexers
-    load_lexer 'sass/common.rb'
-
     class Sass < SassCommon
       include Indentation
 

data/lib/rouge/lexers/scss.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
+require_relative 'sass/common'
+
 module Rouge
   module Lexers
-    load_lexer 'sass/common.rb'
-
     class Scss < SassCommon
       title "SCSS"
       desc "SCSS stylesheets (sass-lang.com)"

data/lib/rouge/lexers/sed.rb

@@ -70,7 +70,7 @@ module Rouge
         mixin :addr_range
       end
 
-      edot = /\\.|./m
+      edot = /\\.|[^\\]/m
 
       state :command do
         mixin :whitespace