Rename Parser#expression_node -> Parser#expression

lib/liquid/parser.rb

@@ -47,7 +47,7 @@ module Liquid
       tok[0] == type
     end
 
-    def expression_node
+    def expression
       parse_expression(expression_string)
     end
 

lib/liquid/tags/case.rb

@@ -85,7 +85,7 @@ module Liquid
 
     def parse_markup(markup)
       parser = @parse_context.new_parser(markup)
-      @left = parser.expression_node
+      @left = parser.expression
       parser.consume(:end_of_string)
     end
 
@@ -99,7 +99,7 @@ module Liquid
       parser = @parse_context.new_parser(markup)
 
       loop do
-        expr = parser.expression_node
+        expr = parser.expression
         block = Condition.new(@left, '==', expr)
         block.attach(body)
         @blocks << block

lib/liquid/tags/cycle.rb

@@ -61,14 +61,14 @@ module Liquid
 
       raise SyntaxError, options[:locale].t("errors.syntax.cycle") if p.look(:end_of_string)
 
-      first_expression = p.expression_node
+      first_expression = p.expression
       if p.look(:colon)
         # cycle name: expr1, expr2, ...
         @name = first_expression
         @is_named = true
         p.consume(:colon)
         # After the colon, parse the first variable (required for named cycles)
-        @variables << maybe_dup_lookup(p.expression_node)
+        @variables << maybe_dup_lookup(p.expression)
       else
         # cycle expr1, expr2, ...
         @variables << maybe_dup_lookup(first_expression)
@@ -78,7 +78,7 @@ module Liquid
       while p.consume?(:comma)
         break if p.look(:end_of_string)
 
-        @variables << maybe_dup_lookup(p.expression_node)
+        @variables << maybe_dup_lookup(p.expression)
       end
 
       p.consume(:end_of_string)

lib/liquid/tags/include.rb

@@ -84,8 +84,8 @@ module Liquid
     def parse_markup(markup)
       p = @parse_context.new_parser(markup)
 
-      @template_name_expr = p.expression_node
-      @variable_name_expr = p.expression_node if p.id?("for") || p.id?("with")
+      @template_name_expr = p.expression
+      @variable_name_expr = p.expression if p.id?("for") || p.id?("with")
       @alias_name         = p.consume(:id) if p.id?("as")
 
       p.consume?(:comma)
@@ -94,7 +94,7 @@ module Liquid
       while p.look(:id)
         key = p.consume
         p.consume(:colon)
-        @attributes[key] = p.expression_node
+        @attributes[key] = p.expression
         p.consume?(:comma)
       end
 

lib/liquid/tags/render.rb

@@ -89,7 +89,7 @@ module Liquid
 
       @template_name_expr = template_name(p)
       with_or_for         = p.id?("for") || p.id?("with")
-      @variable_name_expr = p.expression_node if with_or_for
+      @variable_name_expr = p.expression if with_or_for
       @alias_name         = p.consume(:id) if p.id?("as")
       @is_for_loop        = (with_or_for == FOR)
 
@@ -99,7 +99,7 @@ module Liquid
       while p.look(:id)
         key = p.consume
         p.consume(:colon)
-        @attributes[key] = p.expression_node
+        @attributes[key] = p.expression
         p.consume?(:comma)
       end
 

lib/liquid/tags/table_row.rb

@@ -42,7 +42,7 @@ module Liquid
         raise SyntaxError, options[:locale].t("errors.syntax.for_invalid_in")
       end
 
-      @collection_name = p.expression_node
+      @collection_name = p.expression
 
       p.consume?(:comma)
 
@@ -54,7 +54,7 @@ module Liquid
         end
 
         p.consume(:colon)
-        @attributes[key] = p.expression_node
+        @attributes[key] = p.expression
         p.consume?(:comma)
       end
 

lib/liquid/variable.rb

@@ -47,7 +47,7 @@ module Liquid
 
       return if p.look(:end_of_string)
 
-      @name = p.expression_node
+      @name = p.expression
       @filters << parse_filter_expressions(p) while p.consume?(:pipe)
       p.consume(:end_of_string)
     end
@@ -121,10 +121,10 @@ module Liquid
       if p.look(:id) && p.look(:colon, 1)
         key = p.consume(:id)
         p.consume(:colon)
-        value = p.expression_node
+        value = p.expression
         keyword_arguments[key] = value
       else
-        positional_arguments << p.expression_node
+        positional_arguments << p.expression
       end
     end