Fix Wollok lexer: entity list is shared between lexer instances

lib/rouge/lexers/wollok.rb

@@ -14,8 +14,6 @@ class Wollok < RegexLexer
       entity_name = /[a-zA-Z][a-zA-Z0-9]*/
       variable_naming = /_?#{entity_name}/
 
-      entities = []
-
       state :whitespaces_and_comments do
         rule %r/\s+/m, Text::Whitespace
         rule %r(//.*$), Comment::Single
@@ -98,6 +96,12 @@ def any(expressions)
         rule %r/\(|\)|=/, Text
         rule %r/,/, Punctuation
       end
+
+      private
+
+      def entities
+        @entities ||= []
+      end
     end
   end
 end

spec/lexers/wollok_spec.rb

@@ -13,4 +13,21 @@
       assert_guess :filename => 'foo.wpgm'
     end
   end
+
+  describe 'lexing' do
+    it 'does not share entity list between instances' do
+      a = Rouge::Lexers::Wollok.new
+      b = Rouge::Lexers::Wollok.new
+
+      # If "foo" is defined as object, it is recognized as Name.Class.
+      result_a1 = a.lex('object foo {}').to_a
+      assert_equal result_a1[2].first, Token['Name.Class']
+      result_a2 = a.lex('foo.bar()').to_a
+      assert_equal result_a2[0].first, Token['Name.Class']
+
+      # If "foo" is undefined, it is recognized as Keyword.Variable.
+      result_b1 = b.lex('foo.bar()').to_a
+      assert_equal result_b1[0].first, Token['Keyword.Variable']
+    end
+  end
 end