From 7196a2d58e09871683c399580e10a181303880d3 Mon Sep 17 00:00:00 2001 From: Florian Weingarten Date: Fri, 17 Oct 2014 23:15:04 +0000 Subject: [PATCH] Avoid parallel assignments --- example/server/liquid_servlet.rb | 3 ++- lib/liquid/condition.rb | 13 +++++++++---- lib/liquid/variable.rb | 3 ++- test/unit/strainer_unit_test.rb | 3 ++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/example/server/liquid_servlet.rb b/example/server/liquid_servlet.rb index 794d66b..ac0483f 100644 --- a/example/server/liquid_servlet.rb +++ b/example/server/liquid_servlet.rb @@ -11,7 +11,8 @@ class LiquidServlet < WEBrick::HTTPServlet::AbstractServlet private def handle(type, req, res) - @request, @response = req, res + @request = req + @response = res @request.path_info =~ /(\w+)\z/ @action = $1 || 'index' diff --git a/lib/liquid/condition.rb b/lib/liquid/condition.rb index 21d0149..d6dec68 100644 --- a/lib/liquid/condition.rb +++ b/lib/liquid/condition.rb @@ -28,7 +28,9 @@ module Liquid attr_accessor :left, :operator, :right def initialize(left = nil, operator = nil, right = nil) - @left, @operator, @right = left, operator, right + @left = left + @operator = operator + @right = right @child_relation = nil @child_condition = nil end @@ -47,11 +49,13 @@ module Liquid end def or(condition) - @child_relation, @child_condition = :or, condition + @child_relation = :or + @child_condition = condition end def and(condition) - @child_relation, @child_condition = :and, condition + @child_relation = :and + @child_condition = condition end def attach(attachment) @@ -94,7 +98,8 @@ module Liquid # return this as the result. return context[left] if op == nil - left, right = context[left], context[right] + left = context[left] + right = context[right] operation = self.class.operators[op] || raise(Liquid::ArgumentError.new("Unknown operator #{op}")) diff --git a/lib/liquid/variable.rb b/lib/liquid/variable.rb index 30eb33c..d237078 100644 --- a/lib/liquid/variable.rb +++ b/lib/liquid/variable.rb @@ -36,7 +36,8 @@ module Liquid def lax_parse(markup) @filters = [] if markup =~ /(#{QuotedFragment})(.*)/om - name_markup, filter_markup = $1, $2 + name_markup = $1 + filter_markup = $2 @name = Expression.parse(name_markup) if filter_markup =~ /#{FilterSeparator}\s*(.*)/om filters = $1.scan(FilterParser) diff --git a/test/unit/strainer_unit_test.rb b/test/unit/strainer_unit_test.rb index 68099b3..ff2ea35 100644 --- a/test/unit/strainer_unit_test.rb +++ b/test/unit/strainer_unit_test.rb @@ -57,7 +57,8 @@ class StrainerUnitTest < Minitest::Test end def test_strainer_uses_a_class_cache_to_avoid_method_cache_invalidation - a, b = Module.new, Module.new + a = Module.new + b = Module.new strainer = Strainer.create(nil, [a,b]) assert_kind_of Strainer, strainer assert_kind_of a, strainer