fix some ruby warnings

ole · Jun 10, 2017 · 4a9e3c9 · 4a9e3c9
1 parent 4a642bd
commit 4a9e3c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/rouge/lexers/elixir.rb b/lib/rouge/lexers/elixir.rb
@@ -20,7 +20,7 @@ class Elixir < RegexLexer
         rule /#.*$/, Comment::Single
         rule %r{\b(case|cond|end|bc|lc|if|unless|try|loop|receive|fn|defmodule|
              defp?|defprotocol|defimpl|defrecord|defmacrop?|defdelegate|
-             defexception|exit|raise|throw|unless|after|rescue|catch|else)\b(?![?!])|
+             defexception|exit|raise|throw|after|rescue|catch|else)\b(?![?!])|
              (?<!\.)\b(do|\-\>)\b}x, Keyword
         rule /\b(import|require|use|recur|quote|unquote|super|refer)\b(?![?!])/, Keyword::Namespace
         rule /(?<!\.)\b(and|not|or|when|xor|in)\b/, Operator::Word

diff --git a/lib/rouge/lexers/praat.rb b/lib/rouge/lexers/praat.rb
@@ -166,7 +166,7 @@ def self.analyze_text(text)
           push :comma_list
         end
 
-        rule /[\s\n]/,    Text, :pop!
+        rule /[\s]/,    Text, :pop!
       end
 
       state :procedure_call do
@@ -175,7 +175,7 @@ def self.analyze_text(text)
         rule /(:|\s*\()/, Punctuation, :pop!
 
         rule /'/,            Name::Function
-        rule /[^:\('\n\s]+/, Name::Function
+        rule /[^:\('\s]+/, Name::Function
 
         rule /(?=\s+)/ do
           token Text
@@ -187,7 +187,7 @@ def self.analyze_text(text)
       state :procedure_definition do
         rule /(:|\s*\()/, Punctuation, :pop!
 
-        rule /[^:\(\n\s]+/, Name::Function
+        rule /[^:\(\s]+/, Name::Function
 
         rule /(\s+)/, Text, :pop!
       end

diff --git a/lib/rouge/regex_lexer.rb b/lib/rouge/regex_lexer.rb
@@ -46,6 +46,7 @@ def initialize(name, &defn)
         @name = name
         @defn = defn
         @rules = []
+        @loaded = false
       end
 
       def to_state(lexer_class)
@@ -300,7 +301,7 @@ def step(state, stream)
           # the most common, for now...
           next if rule.beginning_of_line && !stream.beginning_of_line?
 
-          if size = stream.skip(rule.re)
+          if (size = stream.skip(rule.re))
             puts "    got #{stream[0].inspect}" if @debug
 
             instance_exec(stream, &rule.callback)