Simplify render/include tags following PR review feedback

lib/liquid/tags/include.rb

@@ -88,20 +88,9 @@ module Liquid
       p = @parse_context.new_parser(markup)
 
       @template_name_expr = safe_parse_expression(p)
-      with_or_for = p.id?("for") || p.id?("with") || nil
-      @variable_name_expr = nil
-      if with_or_for
-        @variable_name_expr = safe_parse_expression(p)
-      end
+      @variable_name_expr = safe_parse_expression(p) if p.id?("for") || p.id?("with")
+      @alias_name         = p.consume(:id) if p.id?("as")
 
-      alias_name = nil
-      if p.id?("as")
-        alias_name = p.consume(:id)
-      end
-
-      @alias_name = alias_name
-
-      # optional comma
       p.consume?(:comma)
 
       @attributes = {}
@@ -109,7 +98,7 @@ module Liquid
         key = p.consume
         p.consume(:colon)
         @attributes[key] = safe_parse_expression(p)
-        p.consume?(:comma) # optional comma
+        p.consume?(:comma)
       end
 
       p.consume(:end_of_string)
@@ -121,7 +110,6 @@ module Liquid
 
     def lax_parse(markup)
       if markup =~ SYNTAX
-
         template_name = Regexp.last_match(1)
         variable_name = Regexp.last_match(3)
 

lib/liquid/tags/render.rb

@@ -89,21 +89,11 @@ module Liquid
       p = @parse_context.new_parser(markup)
 
       @template_name_expr = parse_expression(rigid_template_name(p), safe: true)
-      @variable_name_expr = nil
-      with_or_for = p.id?("for") || p.id?("with") || nil
-      if with_or_for
-        @variable_name_expr = safe_parse_expression(p)
-      end
+      with_or_for         = p.id?("for") || p.id?("with")
+      @variable_name_expr = safe_parse_expression(p) if with_or_for
+      @alias_name         = p.consume(:id) if p.id?("as")
+      @is_for_loop        = (with_or_for == FOR)
 
-      alias_name = nil
-      if p.id?("as")
-        alias_name = p.consume(:id)
-      end
-
-      @alias_name = alias_name
-      @is_for_loop = (with_or_for == FOR)
-
-      # optional comma
       p.consume?(:comma)
 
       @attributes = {}
@@ -111,7 +101,7 @@ module Liquid
         key = p.consume
         p.consume(:colon)
         @attributes[key] = safe_parse_expression(p)
-        p.consume?(:comma) # optional comma
+        p.consume?(:comma)
       end
 
       p.consume(:end_of_string)

lib/liquid/tags/table_row.rb

@@ -45,7 +45,6 @@ module Liquid
 
       @collection_name = safe_parse_expression(p)
 
-      # optional comma
       p.consume?(:comma)
 
       @attributes = {}
@@ -57,7 +56,7 @@ module Liquid
 
         p.consume(:colon)
         @attributes[key] = safe_parse_expression(p)
-        p.consume?(:comma) # optional comma
+        p.consume?(:comma)
       end
 
       p.consume(:end_of_string)