diff --git a/Gemfile b/Gemfile index 3c6dfef..c10cabc 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,6 @@ group :test do gem 'rubocop', '>=0.32.0' platform :mri do - gem 'liquid-c', github: 'Shopify/liquid-c', ref: '35e9aee48d639ae1d3ac9ba77616aca9800eab7d' + gem 'liquid-c', github: 'Shopify/liquid-c', ref: '2570693d8d03faa0df9160ec74348a7149436df3' end end diff --git a/lib/liquid/tag.rb b/lib/liquid/tag.rb index 8375477..06970c1 100644 --- a/lib/liquid/tag.rb +++ b/lib/liquid/tag.rb @@ -1,7 +1,7 @@ module Liquid class Tag - attr_reader :nodelist, :tag_name, :line_number, :options - alias_method :parse_context, :options + attr_reader :nodelist, :tag_name, :line_number, :parse_context + alias_method :options, :parse_context include ParserSwitching class << self @@ -17,7 +17,7 @@ module Liquid def initialize(tag_name, markup, parse_context) @tag_name = tag_name @markup = markup - @options = parse_context + @parse_context = parse_context @line_number = parse_context.line_number end diff --git a/lib/liquid/variable.rb b/lib/liquid/variable.rb index b96181a..5c62ffd 100644 --- a/lib/liquid/variable.rb +++ b/lib/liquid/variable.rb @@ -12,14 +12,14 @@ module Liquid class Variable FilterParser = /(?:\s+|#{QuotedFragment}|#{ArgumentSeparator})+/o attr_accessor :filters, :name, :line_number - attr_reader :options - alias_method :parse_context, :options + attr_reader :parse_context + alias_method :options, :parse_context include ParserSwitching def initialize(markup, parse_context) @markup = markup @name = nil - @options = parse_context + @parse_context = parse_context @line_number = parse_context.line_number parse_with_selected_parser(markup)