Refactor CompiledTemplate to handle include/render internally

- render() now accepts Liquid::Context or Hash
- include/render handled internally using file_system from registers
- Only yields to block for truly external tags/filters
- Cleaner separation of concerns

.github/dependabot.yaml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: weekly

.github/workflows/liquid.yml

@@ -1,5 +1,5 @@
 name: Liquid
-on: [push]
+on: [push, pull_request]
 
 env:
   BUNDLE_JOBS: 4
@@ -9,34 +9,30 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
         entry:
-          - { ruby: 3.3, allowed-failure: false } # minimum supported
-          - { ruby: 3.4, allowed-failure: false, rubyopt: "--yjit" }
-          - { ruby: 4.0, allowed-failure: false } # latest stable
+          - { ruby: 3.0, allowed-failure: false } # minimum supported
+          - { ruby: 3.2, allowed-failure: false }
+          - { ruby: 3.3, allowed-failure: false }
+          - { ruby: 3.3, allowed-failure: false }
+          - { ruby: 3.4, allowed-failure: false } # latest
           - {
-              ruby: 4.0,
+              ruby: 3.4,
               allowed-failure: false,
               rubyopt: "--enable-frozen-string-literal",
             }
-          - { ruby: 4.0, allowed-failure: false, rubyopt: "--yjit" }
-          - { ruby: 4.0, allowed-failure: false, rubyopt: "--zjit" }
-          - { ruby: truffleruby, allowed-failure: false }
-
-          # Head can have failures due to being in development
-          - { ruby: head, allowed-failure: true }
+          - { ruby: 3.4, allowed-failure: false, rubyopt: "--yjit" }
+          - { ruby: ruby-head, allowed-failure: false }
           - {
-              ruby: head,
-              allowed-failure: true,
+              ruby: ruby-head,
+              allowed-failure: false,
               rubyopt: "--enable-frozen-string-literal",
             }
-          - { ruby: head, allowed-failure: true, rubyopt: "--yjit" }
-          - { ruby: head, allowed-failure: true, rubyopt: "--zjit" }
-    name: Test Ruby ${{ matrix.entry.ruby }} ${{ matrix.entry.rubyopt }} --${{ matrix.entry.allowed-failure && 'allowed-failure' || 'strict' }}
+          - { ruby: ruby-head, allowed-failure: false, rubyopt: "--yjit" }
+    name: Test Ruby ${{ matrix.entry.ruby }}
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-      - uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.entry.ruby }}
           bundler-cache: true
@@ -46,28 +42,11 @@ jobs:
         env:
           RUBYOPT: ${{ matrix.entry.rubyopt }}
 
-  spec:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_WITH: spec
-    steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-      - uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
-        with:
-          bundler-cache: true
-          bundler: latest
-      - name: Run liquid-spec for all adapters
-        run: |
-          for adapter in spec/*.rb; do
-            echo "=== Running $adapter ==="
-            bundle exec liquid-spec run "$adapter" --no-max-failures
-          done
-
   memory_profile:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-      - uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - run: bundle exec rake memory_profile:run

.rubocop_todo.yml

@@ -174,16 +174,7 @@ Style/WordArray:
 
 # Offense count: 117
 # This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, AllowCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 260
-
-Naming/PredicatePrefix:
-  Enabled: false
-
-# Offense count: 1
-# This is intentional - early return from begin/rescue in assignment context
-Lint/NoReturnInBeginEndBlocks:
-  Exclude:
-    - 'lib/liquid/standardfilters.rb'

.ruby-version

@@ -1 +1 @@
-4.0.2
+3.4.1

Gemfile

@@ -25,14 +25,7 @@ group :development do
 end
 
 group :test do
-  gem 'benchmark'
-  gem 'rubocop', '~> 1.82.0'
-  gem 'rubocop-shopify', '~> 2.18.0', require: false
+  gem 'rubocop', '~> 1.61.0'
+  gem 'rubocop-shopify', '~> 2.12.0', require: false
   gem 'rubocop-performance', require: false
 end
-
-group :spec do
-  # Includes the range resource-limit specs from https://github.com/Shopify/liquid-spec/pull/165.
-  gem 'liquid-spec', github: 'Shopify/liquid-spec', ref: '84bf25e0edbca5f7e530574788b0f875ab331f50'
-  gem 'activesupport', require: false
-end

History.md

@@ -1,33 +1,6 @@
 # Liquid Change Log
 
-## 5.14.0
-
-* Avoid materializing integer ranges in `for` and `tablerow` loops, and account for each visited range item [Ian Ker-Seymer]
-
-## 5.13.0
-
-* Add TruffleRuby in CI [Benoit Daloze]
-* Skip slow test raising many exceptions on non-CRuby [Benoit Daloze]
-* Reject bare-bracket syntax in strict2 and introduce `self` keyword by [Alok Swamy]
-* Add strict2_parse to assign and capture tags by [Alok Swamy]
-* Add strict2_parse to increment and decrement tags by [Alok Swamy]
-* Update liquid-spec adapters for `missing_features` [Ian Ker-Seymer]
-* Prevent `SelfDrop` context mutation across render boundaries [Guilherme Carreiro]
-* Fix `SelfDrop` equality [Guilherme Carreiro]
-* Let environment `self` shadow `SelfDrop` [Ian Ker-Seymer]
-
-## 5.11.0
-* Revert the Inline Snippets tag (#2001), treat its inclusion in the latest Liquid release as a bug, and allow for feedback on RFC#1916 to better support Liquid developers [Guilherme Carreiro]
-* Rename the `:rigid` error mode to `:strict2` and display a warning when users attempt to use the `:rigid` mode [Guilherme Carreiro]
-
-## 5.10.0
-* Introduce support for Inline Snippets [Julia Boutin]
-
-## 5.9.0
-* Introduce `:rigid` error mode for stricter, safer parsing of all tags [CP Clermont, Guilherme Carreiro]
-
-## 5.8.7
-* Expose body content in the `Doc` tag [James Meng]
+## 5.8.1 (unreleased)
 
 ## 5.8.1
 

OPTIMIZATION.md

@@ -0,0 +1,70 @@
+# Liquid Compiled Template Optimization Log
+
+This document tracks optimizations made to the compiled Liquid template engine.
+Each entry shows before/after code and measured impact.
+
+---
+
+## Baseline Measurement
+
+**Date:** 2024-12-31
+**Commit:** (pending profiler implementation)
+
+### Current State
+
+The compiled template engine generates Ruby code from Liquid templates.
+Before optimizations, here's a sample of generated code for a simple loop:
+
+```ruby
+# Template: {% for product in products %}{{ forloop.index }}: {{ product.name }}{% endfor %}
+
+->(assigns, __context__, __external__) do
+  __output__ = +""
+  
+  __coll1__ = assigns["products"]
+  __coll1__ = __coll1__.to_a if __coll1__.is_a?(Range)
+  __len3__ = __coll1__.respond_to?(:length) ? __coll1__.length : 0
+  __idx2__ = 0
+  catch(:__loop__break__) do
+    (__coll1__.respond_to?(:each) ? __coll1__ : []).each do |__item__|
+      catch(:__loop__continue__) do
+        assigns["product"] = __item__
+        assigns['forloop'] = {
+          'name' => "product-products",
+          'length' => __len3__,
+          'index' => __idx2__ + 1,
+          'index0' => __idx2__,
+          'rindex' => __len3__ - __idx2__,
+          'rindex0' => __len3__ - __idx2__ - 1,
+          'first' => __idx2__ == 0,
+          'last' => __idx2__ == __len3__ - 1,
+        }
+        __output__ << LR.output(LR.lookup(assigns["forloop"], "index", __context__))
+        __output__ << ": "
+        __output__ << LR.output(LR.lookup(assigns["product"], "name", __context__))
+      end
+      __idx2__ += 1
+    end
+  end
+  assigns.delete("product")
+  assigns.delete('forloop')
+  
+  __output__
+end
+```
+
+### Issues Identified
+
+1. **catch/throw overhead** - Used even when no break/continue in loop
+2. **Hash allocation per iteration** - 8 key/value pairs computed every time
+3. **respond_to? checks** - Redundant after type is known
+4. **LR.lookup for forloop** - Unnecessary indirection for known hash
+5. **String literals not frozen** - Allocates on each render
+6. **Output buffer grows dynamically** - No pre-allocation
+
+---
+
+## Optimization Log
+
+<!-- Entries will be added here as optimizations are implemented -->
+

README.md

@@ -99,14 +99,14 @@ Setting the error mode of Liquid lets you specify how strictly you want your tem
 Normally the parser is very lax and will accept almost anything without error. Unfortunately this can make
 it very hard to debug and can lead to unexpected behaviour.
 
-Liquid also comes with different parsers that can be used when editing templates to give better error messages
+Liquid also comes with a stricter parser that can be used when editing templates to give better error messages
 when templates are invalid. You can enable this new parser like this:
 
 ```ruby
-Liquid::Environment.default.error_mode = :strict2 # Raises a SyntaxError when invalid syntax is used in all tags
-Liquid::Environment.default.error_mode = :strict  # Raises a SyntaxError when invalid syntax is used in some tags
-Liquid::Environment.default.error_mode = :warn    # Adds strict errors to template.errors but continues as normal
-Liquid::Environment.default.error_mode = :lax     # The default mode, accepts almost anything.
+Liquid::Environment.default.error_mode = :strict
+Liquid::Environment.default.error_mode = :strict # Raises a SyntaxError when invalid syntax is used
+Liquid::Environment.default.error_mode = :warn # Adds strict errors to template.errors but continues as normal
+Liquid::Environment.default.error_mode = :lax # The default mode, accepts almost anything.
 ```
 
 If you want to set the error mode only on specific templates you can pass `:error_mode` as an option to `parse`:
@@ -149,13 +149,6 @@ template.render!({ 'x' => 1}, { strict_variables: true })
 #=> Liquid::UndefinedVariable: Liquid error: undefined variable y
 ```
 
-### Resource limits
-
-`render_score_limit` and `cumulative_render_score_limit` account for each item visited by
-integer-range `for` and `tablerow` loops, including loops with empty bodies. This bounds range
-iteration work when a score limit is configured; `render_length_limit` only bounds generated
-output and does not by itself limit CPU work for output-free loops.
-
 ### Usage tracking
 
 To help track usages of a feature or code path in production, we have released opt-in usage tracking. To enable this, we provide an empty `Liquid:: Usage.increment` method which you can customize to your needs. The feature is well suited to https://github.com/Shopify/statsd-instrument. However, the choice of implementation is up to you.

Rakefile

@@ -33,7 +33,7 @@ task :rubocop do
   end
 end
 
-desc('runs test suite with lax, strict, and strict2 parsers')
+desc('runs test suite with both strict and lax parsers')
 task :test do
   ENV['LIQUID_PARSER_MODE'] = 'lax'
   Rake::Task['base_test'].invoke
@@ -42,10 +42,6 @@ task :test do
   Rake::Task['base_test'].reenable
   Rake::Task['base_test'].invoke
 
-  ENV['LIQUID_PARSER_MODE'] = 'strict2'
-  Rake::Task['base_test'].reenable
-  Rake::Task['base_test'].invoke
-
   if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'truffleruby'
     ENV['LIQUID_PARSER_MODE'] = 'lax'
     Rake::Task['integration_test'].reenable
@@ -54,10 +50,6 @@ task :test do
     ENV['LIQUID_PARSER_MODE'] = 'strict'
     Rake::Task['integration_test'].reenable
     Rake::Task['integration_test'].invoke
-
-    ENV['LIQUID_PARSER_MODE'] = 'strict2'
-    Rake::Task['integration_test'].reenable
-    Rake::Task['integration_test'].invoke
   end
 end
 
@@ -88,13 +80,8 @@ namespace :benchmark do
     ruby "./performance/benchmark.rb strict"
   end
 
-  desc "Run the liquid benchmark with strict2 parsing"
-  task :strict2 do
-    ruby "./performance/benchmark.rb strict2"
-  end
-
-  desc "Run the liquid benchmark with lax, strict, and strict2 parsing"
-  task run: [:lax, :strict, :strict2]
+  desc "Run the liquid benchmark with both lax and strict parsing"
+  task run: [:lax, :strict]
 
   desc "Run unit benchmarks"
   namespace :unit do
@@ -148,11 +135,3 @@ end
 task :console do
   exec 'irb -I lib -r liquid'
 end
-
-desc('run liquid-spec suite across all adapters')
-task :spec do
-  Dir['./spec/*.rb'].sort.each do |adapter|
-    puts "=== Running #{adapter} ==="
-    sh 'bundle', 'exec', 'liquid-spec', 'run', adapter, '--no-max-failures'
-  end
-end

bin/render

@@ -1,46 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'liquid'
-
-class VirtualFileSystem
-  def initialize
-    snippet_1 = <<~LIQUID
-      <h1>
-        {{- greating | default: 'Hello' }}, {{ name | default: 'world' -}}!
-      </h1>
-    LIQUID
-    snippet_2 = <<~LIQUID
-      {%- for i in (1..5) -%}
-        > {{ i }}
-      {%- endfor -%}
-    LIQUID
-
-    @templates = {
-      'snippet-1' => snippet_1,
-      'snippet-2' => snippet_2,
-    }
-  end
-
-  def read_template_file(key)
-    @templates[key] || raise(Liquid::FileSystemError, "No such template '#{key}'")
-  end
-end
-
-def source
-  File.read(ARGV[0])
-rescue StandardError
-  'Usage: bin/render example/server/templates/index.liquid'
-end
-
-def assigns
-  {
-    'date' => Time.now,
-  }
-end
-
-puts Liquid::Template
-  .parse(source, error_mode: :strict2)
-  .tap { |t| t.registers[:file_system] = VirtualFileSystem.new }
-  .render(assigns)

lib/liquid.rb

@@ -65,7 +65,6 @@ require 'liquid/lexer'
 require 'liquid/parser'
 require 'liquid/i18n'
 require 'liquid/drop'
-require 'liquid/self_drop'
 require 'liquid/tablerowloop_drop'
 require 'liquid/forloop_drop'
 require 'liquid/extensions'
@@ -83,7 +82,6 @@ require 'liquid/resource_limits'
 require 'liquid/expression'
 require 'liquid/template'
 require 'liquid/condition'
-require 'liquid/range_slice'
 require 'liquid/utils'
 require 'liquid/tokenizer'
 require 'liquid/parse_context'
@@ -91,3 +89,4 @@ require 'liquid/partial_cache'
 require 'liquid/usage'
 require 'liquid/registers'
 require 'liquid/template_factory'
+require 'liquid/box'

lib/liquid/block_body.rb

@@ -99,9 +99,7 @@ module Liquid
         context.handle_error(exc, line_number)
       else
         error_message = context.handle_error(exc, line_number)
-        error_mode = context.registers.static[:template_error_mode]
-        suppress_error_text = blank_tag && error_mode != :strict2 && error_mode != :rigid
-        unless suppress_error_text # blank-tag suppression is kept for backwards compatibility outside strict2
+        unless blank_tag # conditional for backwards compatibility
           output << error_message
         end
       end

lib/liquid/box.rb

@@ -0,0 +1,507 @@
+# frozen_string_literal: true
+
+# Liquid::Box - Secure sandboxed execution environment for compiled Liquid templates
+#
+# On Ruby 4.0+, this uses the native Ruby::Box for true isolation.
+# On earlier Ruby versions, this provides a polyfill that WARNS about insecurity.
+#
+# == SECURITY WARNING
+#
+# The polyfill on Ruby < 4.0 provides NO REAL SECURITY. It's a compatibility shim
+# that allows code to run, but malicious templates could potentially escape.
+# Use Ruby 4.0+ in production for actual sandboxing.
+#
+# == Usage
+#
+#   template = Liquid::Template.parse("Hello {{ name }}!")
+#   compiled = template.compile_to_ruby
+#
+#   # compiled is a Liquid::CompiledTemplate which wraps a Box
+#   result = compiled.render({ "name" => "World" })
+#   # => "Hello World!"
+#
+#   # Access the generated Ruby code:
+#   puts compiled.source
+#
+
+module Liquid
+  # Check if we have Ruby 4.0's native Box AND it's enabled
+  # Ruby::Box may be defined but disabled (requires RUBY_BOX=1 env var before Ruby starts)
+  RUBY_BOX_AVAILABLE = begin
+    if defined?(Ruby::Box)
+      # Try to create a box to see if it's actually enabled
+      test_box = Ruby::Box.new
+      true
+    else
+      false
+    end
+  rescue RuntimeError => e
+    # Ruby::Box exists but is disabled
+    false
+  end
+
+  unless RUBY_BOX_AVAILABLE
+    # Warn once on load that we're using the insecure polyfill
+    warn "[Liquid::Box] WARNING: Ruby::Box not available or disabled. " \
+         "Using INSECURE polyfill. Compiled templates are NOT sandboxed! " \
+         "(Ruby 4.0+ with RUBY_BOX=1 required for secure execution)" if $VERBOSE
+  end
+
+  # Polyfill for Ruby::Box when not available (Ruby < 4.0)
+  # This provides the same API but NO SECURITY - it just evals code in the main environment.
+  module BoxPolyfill
+    class Box
+      def initialize
+        @constants = {}
+        @binding = TOPLEVEL_BINDING.dup
+      end
+
+      def eval(code)
+        ::Kernel.eval(code, @binding)
+      end
+
+      def const_get(name)
+        ::Object.const_get(name)
+      end
+    end
+  end
+
+  # Liquid::Box wraps either Ruby::Box (secure) or BoxPolyfill::Box (insecure)
+  #
+  # This provides a secure sandboxed environment for executing compiled Liquid templates.
+  # On Ruby 4.0+, templates run in true isolation with dangerous methods removed.
+  # On Ruby < 4.0, templates run without sandboxing (development/testing only).
+  #
+  class Box
+    attr_reader :box
+
+    class << self
+      # Returns true if we have real sandboxing (Ruby 4.0+)
+      def secure?
+        RUBY_BOX_AVAILABLE
+      end
+
+      # Create a pre-configured box for Liquid template execution.
+      # This is the recommended way to get a Box instance.
+      def create_for_liquid
+        box = new
+        box.load_liquid_runtime!
+        box.lock!
+        box
+      end
+    end
+
+    def initialize
+      @box = RUBY_BOX_AVAILABLE ? Ruby::Box.new : BoxPolyfill::Box.new
+      @locked = false
+      @user_constants = []
+      @warned_insecure = false
+    end
+
+    # Load code into the sandbox before locking.
+    # Use this to define filters, helpers, and the Liquid runtime.
+    def load_runtime(code)
+      raise "Cannot load runtime after lock!" if @locked
+      before = @box.eval("Object.constants")
+      @box.eval(code)
+      after = @box.eval("Object.constants")
+      @user_constants += (after - before).map(&:to_s)
+    end
+
+    # Load the standard Liquid runtime helpers (LR module).
+    # Call this before lock! to set up the execution environment.
+    # The runtime provides all helper methods that compiled templates use.
+    def load_liquid_runtime!
+      raise "Cannot load runtime after lock!" if @locked
+
+      if RUBY_BOX_AVAILABLE
+        # Add gem paths to box's load_path so it can find base64, bigdecimal, etc.
+        # These are safe, side-effect-free libs that only provide pure functions
+        setup_gem_load_paths!
+
+        # Load dependencies INTO the box - we need the actual libraries,
+        # not reimplementations, to handle all edge cases correctly
+        @box.require('cgi')
+        @box.require('base64')
+        @box.require('bigdecimal')
+        @box.require('bigdecimal/util')  # For String#to_d etc.
+        @box.require('date')  # For date filter
+        @box.require('time')  # For Time.parse
+
+        # Now load the runtime which captures method references from these
+        @box.require(RUNTIME_PATH)
+      else
+        # Polyfill: just require it normally
+        require 'cgi'
+        require 'base64'
+        require 'bigdecimal'
+        require 'bigdecimal/util'
+        require 'date'
+        require 'time'
+        require RUNTIME_PATH
+      end
+
+      # Track constants to preserve after lock
+      @user_constants << "LR"
+      @user_constants << "LiquidRuntime"
+      @user_constants << "CGI"
+      @user_constants << "Base64"
+      @user_constants << "BigDecimal"
+      @user_constants << "Date"
+      @user_constants << "DateTime"
+      @user_constants << "Time"
+      @user_constants << "Liquid"  # For Liquid::Compile::CompiledContext
+    end
+
+    # Add gem paths to the box's load_path so require works for gems
+    def setup_gem_load_paths!
+      return unless RUBY_BOX_AVAILABLE
+
+      # Find gem paths from the main environment's $LOAD_PATH
+      # and from Gem.path if available
+      gem_lib_paths = []
+
+      # Method 1: Find from $LOAD_PATH entries containing "gems"
+      $LOAD_PATH.each do |path|
+        gem_lib_paths << path if path.include?('/gems/')
+      end
+
+      # Method 2: Use Gem.path if available
+      if defined?(Gem) && Gem.respond_to?(:path)
+        Gem.path.each do |gem_path|
+          Dir.glob("#{gem_path}/gems/*/lib").each do |lib_path|
+            gem_lib_paths << lib_path
+          end
+        end
+      end
+
+      # Add unique paths to box's load_path
+      gem_lib_paths.uniq.each do |path|
+        @box.load_path << path unless @box.load_path.include?(path)
+      end
+    end
+
+    # Lock the sandbox. After this:
+    # - No more runtime can be loaded
+    # - Dangerous methods are removed (on Ruby 4.0+)
+    # - Templates can be compiled and executed
+    def lock!
+      return if @locked
+
+      if RUBY_BOX_AVAILABLE
+        apply_sandbox!
+      else
+        warn_insecure!
+      end
+
+      @locked = true
+    end
+
+    def locked?
+      @locked
+    end
+
+    # Returns true if this box provides real security (Ruby 4.0+)
+    def secure?
+      RUBY_BOX_AVAILABLE
+    end
+
+    # Evaluate code in the sandbox.
+    # Use this to compile templates into the sandbox.
+    def eval(code)
+      raise "Must call lock! before eval" unless @locked
+      warn_insecure! unless RUBY_BOX_AVAILABLE
+      @box.eval(code)
+    end
+
+    # Get a constant from the sandbox by name.
+    def const_get(name)
+      @box.const_get(name)
+    end
+
+    def [](name)
+      const_get(name)
+    end
+
+    private
+
+    def warn_insecure!
+      return if @warned_insecure
+      @warned_insecure = true
+
+      $stderr.puts <<~WARNING
+        ╔══════════════════════════════════════════════════════════════════════════════╗
+        ║ SECURITY WARNING: Liquid::Box running WITHOUT sandboxing                     ║
+        ║                                                                              ║
+        ║ Ruby::Box requires Ruby 4.0+. On earlier versions, compiled Liquid templates ║
+        ║ execute with FULL Ruby capabilities. This is NOT SECURE for untrusted input. ║
+        ║                                                                              ║
+        ║ For production use with untrusted templates, upgrade to Ruby 4.0+.           ║
+        ╚══════════════════════════════════════════════════════════════════════════════╝
+      WARNING
+    end
+
+    # Apply sandbox restrictions (Ruby 4.0+ only)
+    def apply_sandbox!
+      neuter_file_system!
+      neuter_process_control!
+      neuter_concurrency!
+      neuter_introspection!
+      neuter_serialization!
+      neuter_time!
+      neuter_environment!
+      neuter_kernel!
+      neuter_basic_object!
+      neuter_object!
+      neuter_main_singleton!
+      neuter_module!
+      cleanup_globals!
+      remove_dangerous_constants!
+    end
+
+    def neuter_file_system!
+      @box.eval(<<~'RUBY')
+        class << File
+          instance_methods(false).each { |m| undef_method(m) rescue nil }
+        end
+        class << IO
+          instance_methods(false).each { |m| undef_method(m) rescue nil }
+        end
+        class << Dir
+          instance_methods(false).each { |m| undef_method(m) rescue nil }
+        end
+        class IO
+          [:read, :write, :gets, :puts, :print, :readline, :readlines, :getc, :getbyte,
+           :sysread, :syswrite, :close, :eof, :eof?, :rewind, :seek].each do |m|
+            undef_method(m) rescue nil
+          end
+        end
+      RUBY
+    end
+
+    def neuter_process_control!
+      @box.eval(<<~'RUBY')
+        class << Process
+          instance_methods(false).each { |m| undef_method(m) rescue nil }
+        end
+        class << Signal
+          instance_methods(false).each { |m| undef_method(m) rescue nil }
+        end
+      RUBY
+    end
+
+    def neuter_concurrency!
+      @box.eval(<<~'RUBY')
+        class << Thread
+          [:new, :start, :fork, :kill, :exit, :pass, :stop, :main, :current, :list,
+           :abort_on_exception, :abort_on_exception=].each { |m| undef_method(m) rescue nil }
+        end
+        class << Fiber
+          [:new, :yield, :current].each { |m| undef_method(m) rescue nil }
+        end
+        if defined?(Ractor)
+          class << Ractor
+            instance_methods(false).each { |m| undef_method(m) rescue nil }
+          end
+        end
+      RUBY
+    end
+
+    def neuter_introspection!
+      @box.eval(<<~'RUBY')
+        class << ObjectSpace
+          instance_methods(false).each { |m| undef_method(m) rescue nil }
+        end
+        class << GC
+          instance_methods(false).each { |m| undef_method(m) rescue nil }
+        end
+        if defined?(RubyVM)
+          class << RubyVM
+            instance_methods(false).each { |m| undef_method(m) rescue nil }
+          end
+          if defined?(RubyVM::InstructionSequence)
+            class << RubyVM::InstructionSequence
+              instance_methods(false).each { |m| undef_method(m) rescue nil }
+            end
+          end
+        end
+        class << TracePoint
+          [:new, :stat, :trace].each { |m| undef_method(m) rescue nil }
+        end
+      RUBY
+    end
+
+    def neuter_serialization!
+      @box.eval(<<~'RUBY')
+        class << Marshal
+          [:dump, :load, :restore].each { |m| undef_method(m) rescue nil }
+        end
+      RUBY
+    end
+
+    def neuter_time!
+      # Time is mostly safe for date filters - only neuter methods that could be used
+      # to manipulate system state or sleep/wait.
+      # Keep: now, at, parse, mktime - needed for date filter
+      # Remove: nothing for now - Time is pure computation
+      #
+      # Note: If you want stricter isolation, templates should receive "now" via assigns
+      # @box.eval(<<~'RUBY')
+      #   class << Time
+      #     [:now, :new, :at, :mktime, :local, :utc, :gm].each { |m| undef_method(m) rescue nil }
+      #   end
+      # RUBY
+    end
+
+    def neuter_environment!
+      @box.eval(<<~'RUBY')
+        ENV.clear rescue nil
+        class << ENV
+          instance_methods(false).each { |m| undef_method(m) rescue nil }
+        end
+      RUBY
+    end
+
+    def neuter_kernel!
+      @box.eval(<<~'RUBY')
+        module Kernel
+          [:eval, :`, :system, :exec, :spawn, :fork, :binding,
+           :open, :require, :require_relative, :load, :autoload, :autoload?,
+           :gets, :readline, :readlines, :select, :test,
+           :trap, :exit, :exit!, :abort, :at_exit, :syscall, :sleep,
+           :puts, :print, :printf, :putc, :p, :pp, :warn,
+           :caller, :caller_locations, :set_trace_func, :trace_var, :untrace_var,
+           :global_variables, :local_variables,
+           :gem, :gem_original_require, :Pathname,
+          ].each { |m| undef_method(m) rescue nil }
+        end
+
+        class << Kernel
+          [:eval, :`, :system, :exec, :spawn, :fork, :binding,
+           :open, :require, :require_relative, :load,
+           :puts, :print, :p, :pp, :warn,
+          ].each { |m| undef_method(m) rescue nil }
+        end
+      RUBY
+    end
+
+    def neuter_basic_object!
+      @box.eval(<<~'RUBY')
+        class BasicObject
+          undef_method(:instance_eval) rescue nil
+          undef_method(:instance_exec) rescue nil
+          # Don't undef __send__ - it causes warnings and is equivalent to send
+          # which we already restrict via public_send
+        end
+      RUBY
+    end
+
+    def neuter_object!
+      @box.eval(<<~'RUBY')
+        class Object
+          # Keep public_send - it's safe (only calls public methods) and useful
+          [:gem, :gem_original_require, :require, :require_relative, :load,
+           :display, :define_singleton_method,
+           :instance_variable_set, :remove_instance_variable,
+           :extend, :send,
+          ].each { |m| undef_method(m) rescue nil }
+        end
+      RUBY
+    end
+
+    def neuter_main_singleton!
+      # 'using' is defined on main's singleton class, must remove before undef_method is gone
+      @box.eval(<<~'RUBY')
+        class << self
+          undef_method(:using) rescue nil
+        end
+      RUBY
+    end
+
+    def neuter_module!
+      @box.eval(<<~'RUBY')
+        class Module
+          undef_method(:refine) rescue nil
+          undef_method(:using) rescue nil
+          undef_method(:const_set) rescue nil
+          undef_method(:remove_const) rescue nil
+          undef_method(:include) rescue nil
+          undef_method(:prepend) rescue nil
+          undef_method(:extend) rescue nil
+          undef_method(:class_eval) rescue nil
+          undef_method(:module_eval) rescue nil
+          undef_method(:class_exec) rescue nil
+          undef_method(:module_exec) rescue nil
+          undef_method(:define_method) rescue nil
+          undef_method(:alias_method) rescue nil
+          undef_method(:module_function) rescue nil
+          undef_method(:prepend_features) rescue nil
+          undef_method(:append_features) rescue nil
+          undef_method(:extend_object) rescue nil
+          undef_method(:public) rescue nil
+          undef_method(:private) rescue nil
+          undef_method(:protected) rescue nil
+          undef_method(:attr) rescue nil
+          undef_method(:attr_reader) rescue nil
+          undef_method(:attr_writer) rescue nil
+          undef_method(:attr_accessor) rescue nil
+          # Remove escape hatches LAST
+          undef_method(:remove_method) rescue nil
+          undef_method(:undef_method) rescue nil
+          undef_method(:send) rescue nil
+          undef_method(:public_send) rescue nil
+        end
+
+        class Class
+          undef_method(:send) rescue nil
+          undef_method(:public_send) rescue nil
+        end
+      RUBY
+    end
+
+    def cleanup_globals!
+      @box.eval(<<~'RUBY')
+        $stdin = nil
+        $stdout = nil
+        $stderr = nil
+        $LOAD_PATH.clear rescue nil
+        $LOAD_PATH.freeze rescue nil
+        $LOADED_FEATURES.clear rescue nil
+        $LOADED_FEATURES.freeze rescue nil
+        ARGV.clear rescue nil
+        ARGV.freeze rescue nil
+      RUBY
+    end
+
+    def remove_dangerous_constants!
+      keep = %w[
+        BasicObject Object Module Class Kernel
+        String Integer Float Numeric Rational Complex
+        Array Hash Range Set
+        Symbol Regexp MatchData
+        TrueClass FalseClass NilClass
+        Proc Method UnboundMethod
+        Struct Data
+        Comparable Enumerable Enumerator
+        StandardError RuntimeError ArgumentError TypeError NameError
+        NoMethodError KeyError IndexError StopIteration FrozenError
+        ZeroDivisionError RangeError FloatDomainError LocalJumpError
+        Math Random
+        Exception SystemStackError
+      ] + @user_constants
+
+      @box.eval(<<~RUBY)
+        _keep = #{keep.inspect}
+        (Object.constants.map(&:to_s) - _keep).each do |c|
+          Object.send(:remove_const, c.to_sym) rescue nil
+        end
+        (Kernel.constants.map(&:to_s) - _keep).each do |c|
+          Kernel.send(:remove_const, c.to_sym) rescue nil
+        end
+      RUBY
+    end
+
+    # Path to the runtime file that gets loaded into the sandbox
+    RUNTIME_PATH = File.expand_path('compile/runtime.rb', __dir__)
+  end
+end

lib/liquid/compile.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+# Liquid Ruby Compiler
+#
+# This module provides the ability to compile Liquid templates to pure Ruby code.
+# Compiled templates execute in a secure sandbox using Liquid::Box (on Ruby 4.0+).
+#
+# ## Usage
+#
+#   template = Liquid::Template.parse("Hello, {{ name }}!")
+#   compiled = template.compile_to_ruby
+#
+#   # Render securely (sandboxed on Ruby 4.0+)
+#   result = compiled.render({ "name" => "World" })
+#   # => "Hello, World!"
+#
+#   # Access the generated Ruby source
+#   puts compiled.source
+#
+#   # Check security status
+#   compiled.secure?  # => true on Ruby 4.0+
+#
+# ## Security
+#
+# On Ruby 4.0+, compiled templates execute in a Ruby::Box sandbox that prevents:
+# - File system access (File, IO, Dir)
+# - Process control (system, exec, spawn, fork)
+# - Network access (Socket, Net::HTTP)
+# - Code loading (require, load, eval)
+# - Dangerous metaprogramming (define_method, const_set, send)
+#
+# On Ruby < 4.0, a polyfill is used that prints a security warning to STDERR.
+# The polyfill provides NO ACTUAL SECURITY - use Ruby 4.0+ in production.
+#
+# ## Performance Benefits
+#
+# Compiled templates are ~1.5x faster than interpreted Liquid because:
+#
+# 1. **No Context Object**: Variables accessed directly from assigns hash
+# 2. **No Filter Dispatch**: Filters compiled to direct Ruby calls
+# 3. **No Resource Limits**: No per-node overhead for limit tracking
+# 4. **Native Scoping**: Ruby's block scoping instead of manual stacks
+# 5. **Direct Concatenation**: Output built with << operations
+# 6. **Native Control Flow**: break/continue use Ruby's throw/catch
+# 7. **No to_liquid Calls**: Values used directly
+# 8. **No Profiling Hooks**: No profiler overhead
+#
+# ## Limitations
+#
+# - {% render %} and {% include %} resolved at compile time when possible
+# - Custom tags need explicit compiler implementations
+# - Custom filters must be available at runtime
+#
+module Liquid
+  module Compile
+    autoload :CompiledTemplate, 'liquid/compile/compiled_template'
+    autoload :CompiledContext, 'liquid/compile/compiled_context'
+    autoload :CodeGenerator, 'liquid/compile/code_generator'
+    autoload :RubyCompiler, 'liquid/compile/ruby_compiler'
+    autoload :ExpressionCompiler, 'liquid/compile/expression_compiler'
+    autoload :FilterCompiler, 'liquid/compile/filter_compiler'
+    autoload :VariableCompiler, 'liquid/compile/variable_compiler'
+    autoload :BlockBodyCompiler, 'liquid/compile/block_body_compiler'
+    autoload :ConditionCompiler, 'liquid/compile/condition_compiler'
+    autoload :SourceMapper, 'liquid/compile/source_mapper'
+
+    module Tags
+      autoload :IfCompiler, 'liquid/compile/tags/if_compiler'
+      autoload :UnlessCompiler, 'liquid/compile/tags/unless_compiler'
+      autoload :CaseCompiler, 'liquid/compile/tags/case_compiler'
+      autoload :ForCompiler, 'liquid/compile/tags/for_compiler'
+      autoload :AssignCompiler, 'liquid/compile/tags/assign_compiler'
+      autoload :CaptureCompiler, 'liquid/compile/tags/capture_compiler'
+      autoload :CycleCompiler, 'liquid/compile/tags/cycle_compiler'
+      autoload :IncrementCompiler, 'liquid/compile/tags/increment_compiler'
+      autoload :DecrementCompiler, 'liquid/compile/tags/decrement_compiler'
+      autoload :RawCompiler, 'liquid/compile/tags/raw_compiler'
+      autoload :EchoCompiler, 'liquid/compile/tags/echo_compiler'
+      autoload :BreakCompiler, 'liquid/compile/tags/break_compiler'
+      autoload :ContinueCompiler, 'liquid/compile/tags/continue_compiler'
+      autoload :CommentCompiler, 'liquid/compile/tags/comment_compiler'
+      autoload :TableRowCompiler, 'liquid/compile/tags/tablerow_compiler'
+      autoload :RenderCompiler, 'liquid/compile/tags/render_compiler'
+      autoload :IncludeCompiler, 'liquid/compile/tags/include_compiler'
+      autoload :IfchangedCompiler, 'liquid/compile/tags/ifchanged_compiler'
+    end
+  end
+end

lib/liquid/compile/block_body_compiler.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # BlockBodyCompiler compiles a BlockBody (a list of nodes) to Ruby code.
+    #
+    # A BlockBody contains:
+    # - String literals (text to output)
+    # - Variable expressions ({{ ... }})
+    # - Tags ({% ... %})
+    class BlockBodyCompiler
+      # Compile a BlockBody to Ruby code
+      # @param body [Liquid::BlockBody] The block body
+      # @param compiler [RubyCompiler] The main compiler instance
+      # @param code [CodeGenerator] The code generator
+      def self.compile(body, compiler, code)
+        return if body.nil?
+
+        nodelist = body.nodelist
+        return if nodelist.nil? || nodelist.empty?
+
+        nodelist.each do |node|
+          compile_node(node, compiler, code)
+        end
+      end
+
+      # Compile a single node
+      def self.compile_node(node, compiler, code)
+        case node
+        when String
+          compile_string(node, code)
+        when Variable
+          VariableCompiler.compile(node, compiler, code)
+        when Tag
+          compiler.send(:compile_tag, node, code)
+        else
+          raise CompileError, "Unknown node type in BlockBody: #{node.class}"
+        end
+      end
+
+      private
+
+      def self.compile_string(str, code)
+        return if str.empty?
+        code.line "__output__ << #{str.inspect}"
+      end
+    end
+  end
+end

lib/liquid/compile/code_generator.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # CodeGenerator provides a clean interface for building Ruby code strings
+    # with proper indentation and formatting.
+    class CodeGenerator
+      INDENT_SIZE = 2
+
+      def initialize
+        @lines = []
+        @indent_level = 0
+      end
+
+      # Add a line of code at the current indentation level
+      # @param text [String] The code to add
+      def line(text)
+        @lines << ("  " * @indent_level) + text
+      end
+
+      # Add a blank line
+      def blank_line
+        @lines << ""
+      end
+
+      # Add multiple lines (useful for multi-line strings)
+      # @param text [String] Multi-line string to add
+      def lines(text)
+        text.each_line do |l|
+          line(l.chomp)
+        end
+      end
+
+      # Increase indentation for a block
+      def indent
+        @indent_level += 1
+        yield
+        @indent_level -= 1
+      end
+
+      # Get the current indentation string
+      def current_indent
+        "  " * @indent_level
+      end
+
+      # Add raw code without indentation adjustment
+      def raw(text)
+        @lines << text
+      end
+
+      # Convert to final Ruby code string
+      def to_s
+        @lines.join("\n")
+      end
+
+      # Generate an inline expression (doesn't add to lines, returns string)
+      # @param expr [String] The expression
+      # @return [String] The expression wrapped appropriately
+      def self.inline(expr)
+        expr
+      end
+
+      # Generate a string literal
+      # @param str [String] The string to escape
+      # @return [String] Ruby string literal
+      def self.string_literal(str)
+        str.inspect
+      end
+
+      # Generate a safe variable name from a Liquid variable name
+      # @param name [String] The Liquid variable name
+      # @return [String] A safe Ruby variable name
+      def self.safe_var_name(name)
+        # Replace invalid characters with underscores
+        safe = name.to_s.gsub(/[^a-zA-Z0-9_]/, '_')
+        # Ensure it starts with a letter or underscore
+        safe = "_#{safe}" if safe =~ /\A\d/
+        safe
+      end
+    end
+  end
+end

lib/liquid/compile/compiled_context.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # CompiledContext is a lightweight context-like object for compiled templates.
+    #
+    # It duck-types to Liquid::Context well enough for Drops to work, providing:
+    # - Variable lookup via [] and find_variable
+    # - strict_variables flag
+    # - registers hash
+    # - evaluate method for expressions
+    #
+    # This allows Drops to access other variables and use context features
+    # while still running in compiled mode.
+    class CompiledContext
+      attr_reader :assigns, :registers
+      attr_accessor :strict_variables, :strict_filters
+
+      def initialize(assigns, registers: {}, strict_variables: false, strict_filters: false)
+        @assigns = assigns
+        @registers = registers.is_a?(Liquid::Registers) ? registers : Liquid::Registers.new(registers)
+        @strict_variables = strict_variables
+        @strict_filters = strict_filters
+      end
+
+      # Variable lookup - used by Drops to access other variables
+      def [](key)
+        @assigns[key.to_s]
+      end
+
+      # Find a variable by name
+      def find_variable(key)
+        result = @assigns[key.to_s]
+        result = result.to_liquid if result.respond_to?(:to_liquid)
+        result.context = self if result.respond_to?(:context=)
+        result
+      end
+
+      # Evaluate an expression (for Drops that need to evaluate sub-expressions)
+      def evaluate(expr)
+        case expr
+        when String, Integer, Float, TrueClass, FalseClass, NilClass
+          expr
+        when Liquid::VariableLookup
+          expr.evaluate(self)
+        else
+          expr
+        end
+      end
+
+      # Lookup and evaluate - handles Procs in assigns
+      def lookup_and_evaluate(obj, key)
+        value = obj[key]
+        value = value.call(self) if value.is_a?(Proc)
+        value
+      end
+
+      # Handle errors (simplified - just return message)
+      def handle_error(error, _line_number = nil)
+        error.message
+      end
+
+      # Check if execution should be interrupted
+      def interrupt?
+        false
+      end
+
+      # Stub for resource limits (no-op in compiled mode)
+      def resource_limits
+        @resource_limits ||= ResourceLimitStub.new
+      end
+    end
+
+    # Stub for resource limits in compiled mode
+    class ResourceLimitStub
+      def increment_render_score(_score); end
+      def increment_write_score(_output); end
+      def reached?; false; end
+    end
+  end
+end

lib/liquid/compile/compiled_template.rb

@@ -0,0 +1,349 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # CompiledTemplate represents a compiled Liquid template ready for secure execution.
+    #
+    # This class wraps generated Ruby code and provides a secure execution environment
+    # using Liquid::Box. On Ruby 4.0+, execution happens in a true sandbox. On earlier
+    # versions, a polyfill is used with a security warning.
+    #
+    # == Usage
+    #
+    #   template = Liquid::Template.parse("Hello, {{ name }}!")
+    #   compiled = template.compile_to_ruby
+    #
+    #   # Render with a Liquid::Context (preferred)
+    #   context = Liquid::Context.new({ "name" => "World" })
+    #   result = compiled.render(context)
+    #   # => "Hello, World!"
+    #
+    #   # Or render with a simple hash
+    #   result = compiled.render({ "name" => "World" })
+    #
+    class CompiledTemplate
+      attr_reader :source, :external_tags
+      attr_accessor :filter_handler
+
+      # @param source [String] The generated Ruby code
+      # @param external_tags [Hash] Map of variable names to Tag objects for runtime delegation
+      # @param has_external_filters [Boolean] Whether external filters are used
+      def initialize(source, external_tags = {}, has_external_filters = false)
+        @source = source
+        @external_tags = external_tags
+        @has_external_filters = has_external_filters
+        @filter_handler = nil
+        @proc = nil
+        @box = nil
+      end
+
+      # Returns true if this template has external tags that need runtime delegation
+      def has_external_tags?
+        !@external_tags.empty?
+      end
+
+      # Returns true if this template uses external filters
+      def has_external_filters?
+        @has_external_filters
+      end
+
+      # Returns true if execution will be sandboxed (Ruby 4.0+)
+      def secure?
+        Liquid::Box.secure?
+      end
+
+      # Render the compiled template.
+      #
+      # @param context_or_assigns [Liquid::Context, Hash] A Liquid context or hash of assigns
+      # @param registers [Hash] Registers (only used when passing a Hash)
+      # @param filter_handler [Object] Optional filter handler module
+      # @yield [call_type, *args] Called for external tags/filters only
+      # @return [String] The rendered output
+      #
+      def render(context_or_assigns = {}, registers: {}, filter_handler: nil, &block)
+        compiled_proc = to_proc
+        handler = filter_handler || @filter_handler
+
+        # Accept either a Liquid::Context or a Hash of assigns
+        if context_or_assigns.is_a?(Liquid::Context)
+          liquid_context = context_or_assigns
+          assigns = extract_assigns(liquid_context)
+          file_system = liquid_context.registers[:file_system]
+
+          # Build external handler that handles include/render internally
+          external_handler = build_external_handler(liquid_context, file_system, handler, &block)
+
+          # Use a wrapper context that delegates to the Liquid::Context
+          context = ContextWrapper.new(liquid_context)
+        else
+          assigns = context_or_assigns
+          file_system = registers[:file_system]
+
+          # Create a minimal context for Drop support
+          context = CompiledContext.new(assigns, registers: registers)
+
+          # Build external handler
+          external_handler = build_external_handler(nil, file_system, handler, &block)
+        end
+
+        compiled_proc.call(assigns, context, external_handler)
+      end
+
+      alias call render
+
+      def code
+        @source
+      end
+
+      def to_s
+        @source
+      end
+
+      def to_proc
+        @proc ||= compile_to_proc
+      end
+
+      private
+
+      def extract_assigns(liquid_context)
+        # Get the first environment (static_environments)
+        liquid_context.environments.first || {}
+      end
+
+      # Build the external call handler
+      # Handles :include and :render internally using file_system
+      # Yields to block for :tag and :filter if block given
+      def build_external_handler(liquid_context, file_system, filter_handler, &block)
+        external_tags = @external_tags
+
+        ->(call_type, *args) do
+          case call_type
+          when :include
+            handle_include(liquid_context, file_system, *args)
+
+          when :render
+            handle_render(liquid_context, file_system, *args)
+
+          when :tag
+            if block
+              block.call(call_type, *args)
+            else
+              handle_tag(liquid_context, external_tags, *args)
+            end
+
+          when :filter
+            if block
+              block.call(call_type, *args)
+            else
+              handle_filter(liquid_context, filter_handler, *args)
+            end
+
+          else
+            if block
+              block.call(call_type, *args)
+            else
+              raise ArgumentError, "Unknown external call type: #{call_type}"
+            end
+          end
+        end
+      end
+
+      def handle_include(liquid_context, file_system, template_name, variable, attrs, alias_name, assigns, context)
+        raise Liquid::FileSystemError, "Could not find asset #{template_name}" unless file_system
+
+        snippet_source = file_system.read_template_file(template_name)
+        snippet = Liquid::Template.parse(snippet_source, line_numbers: true)
+        snippet.name = template_name
+
+        # Include shares scope with parent
+        if liquid_context
+          # Set attributes in context
+          attrs&.each { |k, v| liquid_context[k] = v }
+
+          context_var_name = alias_name || template_name.to_s.split('/').last
+          if variable
+            if variable.is_a?(Array)
+              return variable.map do |item|
+                liquid_context[context_var_name] = item
+                snippet.render(liquid_context)
+              end.join
+            else
+              liquid_context[context_var_name] = variable
+            end
+          end
+
+          snippet.render(liquid_context)
+        else
+          # No liquid context - just use assigns
+          render_assigns = assigns.merge(attrs || {})
+          snippet.render(render_assigns)
+        end
+      end
+
+      def handle_render(liquid_context, file_system, template_name, variable, attrs, alias_name, is_for_loop, context)
+        raise Liquid::FileSystemError, "Could not find asset #{template_name}" unless file_system
+
+        snippet_source = file_system.read_template_file(template_name)
+        snippet = Liquid::Template.parse(snippet_source, line_numbers: true)
+        snippet.name = template_name
+
+        # Render creates isolated scope - only attrs are passed
+        render_assigns = attrs&.dup || {}
+        context_var_name = alias_name || template_name.to_s.split('/').last.sub(/\.liquid$/, '')
+
+        if variable
+          if is_for_loop && variable.is_a?(Array)
+            return variable.map do |item|
+              render_assigns[context_var_name] = item
+              if liquid_context
+                isolated_ctx = Liquid::Context.build(
+                  static_environments: render_assigns,
+                  registers: liquid_context.registers,
+                  rethrow_errors: false,
+                )
+                isolated_ctx.exception_renderer = liquid_context.exception_renderer
+                snippet.render(isolated_ctx)
+              else
+                snippet.render(render_assigns)
+              end
+            end.join
+          else
+            render_assigns[context_var_name] = variable
+          end
+        end
+
+        if liquid_context
+          isolated_ctx = Liquid::Context.build(
+            static_environments: render_assigns,
+            registers: liquid_context.registers,
+            rethrow_errors: false,
+          )
+          isolated_ctx.exception_renderer = liquid_context.exception_renderer
+          snippet.render(isolated_ctx)
+        else
+          snippet.render(render_assigns)
+        end
+      end
+
+      def handle_tag(liquid_context, external_tags, tag_var, tag_assigns)
+        tag = external_tags[tag_var]
+        return '' unless tag
+
+        if liquid_context
+          output = +''
+          tag.render_to_output_buffer(liquid_context, output)
+          output
+        else
+          # Create a minimal context
+          ctx = Liquid::Context.new([tag_assigns], {}, {}, false, nil, {}, Liquid::Environment.default)
+          output = +''
+          tag.render_to_output_buffer(ctx, output)
+          output
+        end
+      end
+
+      def handle_filter(liquid_context, filter_handler, filter_name, input, *filter_args)
+        # Try filter handler first
+        if filter_handler&.respond_to?(filter_name)
+          return filter_handler.public_send(filter_name, input, *filter_args)
+        end
+
+        # Try liquid context's strainer
+        if liquid_context
+          strainer = liquid_context.strainer
+          if strainer.class.invokable?(filter_name)
+            return strainer.invoke(filter_name, input, *filter_args)
+          end
+        end
+
+        # Return input unchanged if filter not found
+        input
+      end
+
+      def compile_to_proc
+        if Liquid::Box.secure?
+          compile_in_sandbox
+        else
+          compile_insecure
+        end
+      end
+
+      def compile_in_sandbox
+        @box ||= begin
+          box = Liquid::Box.new
+          box.load_liquid_runtime!
+          box.lock!
+          box
+        end
+
+        template_class_name = "CompiledTemplate_#{object_id}"
+        class_code = <<~RUBY
+          class #{template_class_name}
+            TEMPLATE_PROC = #{@source}
+
+            def self.render(*args, &block)
+              TEMPLATE_PROC.call(*args, &block)
+            end
+          end
+        RUBY
+
+        @box.eval(class_code)
+        template_class = @box[template_class_name]
+
+        ->(assigns, context, external_handler) do
+          template_class.render(assigns, context, external_handler)
+        end
+      end
+
+      def compile_insecure
+        warn_once_insecure unless Liquid::Box.secure?
+
+        require_relative 'runtime' unless defined?(::LR)
+
+        # rubocop:disable Security/Eval
+        eval(@source)
+        # rubocop:enable Security/Eval
+      end
+
+      def warn_once_insecure
+        return if @warned_insecure
+
+        @warned_insecure = true
+        warn "[SECURITY WARNING] Liquid compiled template running outside of Ruby::Box sandbox. " \
+             "On Ruby 4.0+, this runs in a secure sandbox. On earlier versions, be cautious " \
+             "about running untrusted templates."
+      end
+
+      # Wrapper around Liquid::Context for compiled template compatibility
+      class ContextWrapper
+        def initialize(liquid_context)
+          @liquid_context = liquid_context
+        end
+
+        def [](key)
+          @liquid_context[key]
+        end
+
+        def []=(key, value)
+          @liquid_context[key] = value
+        end
+
+        def key?(key)
+          @liquid_context.key?(key)
+        end
+
+        def registers
+          @liquid_context.registers
+        end
+
+        def strainer
+          @liquid_context.strainer
+        end
+
+        def handle_error(e, line_number = nil)
+          @liquid_context.handle_error(e, line_number)
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/condition_compiler.rb

@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # ConditionCompiler compiles Liquid conditions to Ruby boolean expressions.
+    #
+    # Handles:
+    # - Simple truthiness: {% if variable %}
+    # - Comparisons: {% if a == b %}, {% if a > b %}
+    # - Logical operators: {% if a and b %}, {% if a or b %}
+    # - Special checks: {% if a == blank %}, {% if a == empty %}
+    class ConditionCompiler
+      # Operator mappings from Liquid to Ruby
+      OPERATORS = {
+        '==' => '==',
+        '!=' => '!=',
+        '<>' => '!=',
+        '<' => '<',
+        '>' => '>',
+        '<=' => '<=',
+        '>=' => '>=',
+        'contains' => :contains,
+      }.freeze
+
+      # Compile a Condition to a Ruby boolean expression
+      # @param condition [Liquid::Condition] The condition
+      # @param compiler [RubyCompiler] The main compiler instance
+      # @return [String] Ruby code expression that evaluates to true/false
+      def self.compile(condition, compiler)
+        if condition.is_a?(ElseCondition)
+          return "true"
+        end
+
+        compile_condition_chain(condition, compiler)
+      end
+
+      private
+
+      def self.compile_condition_chain(condition, compiler)
+        # Compile the current condition
+        current = compile_single_condition(condition, compiler)
+
+        # Check for chained conditions (and/or)
+        if condition.child_condition
+          child = compile_condition_chain(condition.child_condition, compiler)
+          child_relation = condition.send(:child_relation)
+
+          case child_relation
+          when :and
+            "(#{current} && #{child})"
+          when :or
+            "(#{current} || #{child})"
+          else
+            current
+          end
+        else
+          current
+        end
+      end
+
+      def self.compile_single_condition(condition, compiler)
+        left = condition.left
+        op = condition.operator
+        right = condition.right
+
+        # If no operator, just check truthiness
+        # Inline: Liquid truthiness is "not nil and not false"
+        if op.nil?
+          left_expr = ExpressionCompiler.compile(left, compiler)
+          # For simple variable access, we can use a more compact form
+          # Complex expressions need temp variable to avoid double evaluation
+          if simple_expression?(left)
+            return "(#{left_expr} != nil && #{left_expr} != false)"
+          else
+            return "((__v__ = #{left_expr}) != nil && __v__ != false)"
+          end
+        end
+
+        # Compile left and right expressions
+        left_expr = compile_condition_value(left, compiler)
+        right_expr = compile_condition_value(right, compiler)
+
+        # Handle special operators
+        case OPERATORS[op]
+        when :contains
+          compile_contains(left_expr, right_expr, compiler)
+        when '=='
+          compile_equality(left, right, left_expr, right_expr, compiler)
+        when '!='
+          "!(#{compile_equality(left, right, left_expr, right_expr, compiler)})"
+        else
+          # Standard comparison
+          ruby_op = OPERATORS[op] || op
+          "(#{left_expr} #{ruby_op} #{right_expr} rescue false)"
+        end
+      end
+
+      def self.compile_condition_value(expr, compiler)
+        if expr.is_a?(Condition::MethodLiteral)
+          # For blank/empty checks, we return a special marker
+          # The equality handler will deal with this
+          ":__method_literal_#{expr.method_name}__"
+        else
+          ExpressionCompiler.compile(expr, compiler)
+        end
+      end
+
+      def self.compile_equality(left, right, left_expr, right_expr, compiler)
+        # Handle blank/empty method literals
+        if left.is_a?(Condition::MethodLiteral)
+          method_name = left.method_name
+          "(#{right_expr}.respond_to?(:#{method_name}) ? #{right_expr}.#{method_name} : nil)"
+        elsif right.is_a?(Condition::MethodLiteral)
+          method_name = right.method_name
+          "(#{left_expr}.respond_to?(:#{method_name}) ? #{left_expr}.#{method_name} : nil)"
+        else
+          "(#{left_expr} == #{right_expr})"
+        end
+      end
+
+      def self.compile_contains(left_expr, right_expr, compiler)
+        # The contains operator checks if left includes right
+        # For strings, right is converted to a string
+        "(lambda { |left, right| " \
+          "return false if left.nil? || right.nil? || !left.respond_to?(:include?); " \
+          "right = right.to_s if left.is_a?(String); " \
+          "left.include?(right) rescue false " \
+          "}.call(#{left_expr}, #{right_expr}))"
+      end
+
+      # Check if an expression is simple (doesn't need temp variable to avoid double evaluation)
+      def self.simple_expression?(expr)
+        case expr
+        when nil, true, false, Integer, Float, String
+          true
+        when VariableLookup
+          # Simple variable or property access is safe to evaluate twice
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/expression_compiler.rb

@@ -0,0 +1,155 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # ExpressionCompiler compiles Liquid expressions to Ruby code.
+    #
+    # Expressions include:
+    # - Literals: nil, true, false, strings, numbers
+    # - Variable lookups: foo, foo.bar, foo[0], foo["key"]
+    # - Ranges: (1..10), (start..end)
+    class ExpressionCompiler
+      # Compile an expression to a Ruby code string
+      # @param expr [Object] The parsed expression
+      # @param compiler [RubyCompiler] The main compiler instance
+      # @return [String] Ruby code that evaluates to the expression value
+      def self.compile(expr, compiler)
+        case expr
+        when nil
+          "nil"
+        when true
+          "true"
+        when false
+          "false"
+        when String
+          expr.inspect
+        when Integer, Float
+          expr.inspect
+        when Range
+          "(#{expr.begin.inspect}..#{expr.end.inspect})"
+        when VariableLookup
+          compile_variable_lookup(expr, compiler)
+        when RangeLookup
+          compile_range_lookup(expr, compiler)
+        when Condition::MethodLiteral
+          # Handle blank/empty method literals
+          compile_method_literal(expr, compiler)
+        else
+          raise CompileError, "Unknown expression type: #{expr.class} (#{expr.inspect})"
+        end
+      end
+
+      # Compile a variable lookup expression
+      # @param lookup [VariableLookup] The variable lookup
+      # @param compiler [RubyCompiler] The main compiler instance
+      # @return [String] Ruby code that evaluates to the variable value
+      def self.compile_variable_lookup(lookup, compiler)
+        # Start with the base variable
+        name = lookup.name
+
+        # Check for forloop property inlining
+        if name == 'forloop' && lookup.lookups.length == 1
+          loop_ctx = compiler.current_loop_context
+          if loop_ctx && loop_ctx[:idx_var]
+            inlined = compile_forloop_property(lookup.lookups.first, loop_ctx)
+            return inlined if inlined
+          end
+        end
+
+        # Handle dynamic name (expression in brackets)
+        base = if name.is_a?(VariableLookup) || name.is_a?(RangeLookup)
+          # Dynamic name like [expr].foo
+          "assigns[#{compile(name, compiler)}]"
+        elsif name.is_a?(String)
+          "assigns[#{name.inspect}]"
+        elsif name.is_a?(Integer)
+          "assigns[#{name.inspect}]"
+        else
+          compile(name, compiler)
+        end
+
+        # Apply each lookup in the chain
+        lookup.lookups.each_with_index do |key, index|
+          if key.is_a?(VariableLookup) || key.is_a?(RangeLookup)
+            # Dynamic key like foo[expr]
+            base = "LR.lookup(#{base}, #{compile(key, compiler)}, __context__)"
+          elsif key.is_a?(Integer)
+            # Numeric index like foo[0]
+            base = "LR.lookup(#{base}, #{key}, __context__)"
+          elsif key.is_a?(String)
+            # Always use LR.lookup which tries key access first,
+            # then falls back to method call for command methods (first, last, size)
+            base = "LR.lookup(#{base}, #{key.inspect}, __context__)"
+          else
+            base = "LR.lookup(#{base}, #{compile(key, compiler)}, __context__)"
+          end
+        end
+
+        base
+      end
+
+      # Inline forloop property access to avoid hash allocation
+      # @param prop [String] Property name (index, index0, first, last, etc.)
+      # @param loop_ctx [Hash] Loop context with idx_var, len_var, loop_name
+      # @return [String, nil] Inlined Ruby code or nil if can't inline
+      def self.compile_forloop_property(prop, loop_ctx)
+        idx = loop_ctx[:idx_var]
+        len = loop_ctx[:len_var]
+        name = loop_ctx[:loop_name]
+
+        case prop
+        when 'index'
+          "(#{idx} + 1)"
+        when 'index0'
+          idx
+        when 'rindex'
+          "(#{len} - #{idx})"
+        when 'rindex0'
+          "(#{len} - #{idx} - 1)"
+        when 'first'
+          "(#{idx} == 0)"
+        when 'last'
+          "(#{idx} == #{len} - 1)"
+        when 'length'
+          len
+        when 'name'
+          name ? name.inspect : "nil"
+        else
+          nil # Unknown property, fall back to hash lookup
+        end
+      end
+
+      # Compile a range lookup expression
+      # @param range [RangeLookup] The range lookup
+      # @param compiler [RubyCompiler] The main compiler instance
+      # @return [String] Ruby code that evaluates to the range
+      def self.compile_range_lookup(range, compiler)
+        start_expr = compile(range.start_obj, compiler)
+        end_expr = compile(range.end_obj, compiler)
+
+        # Convert to integers and create range
+        "(LR.to_integer(#{start_expr})...LR.to_integer(#{end_expr})).to_a"
+      end
+
+      # Compile a method literal (blank/empty)
+      def self.compile_method_literal(literal, compiler)
+        # These are used in conditions like `if foo == blank`
+        # They represent special method calls
+        literal.to_s.inspect
+      end
+
+      # Compile an expression for use in a condition
+      # @param expr [Object] The expression
+      # @param compiler [RubyCompiler] The main compiler
+      # @return [String] Ruby code for the condition value
+      def self.compile_for_condition(expr, compiler)
+        if expr.is_a?(Condition::MethodLiteral)
+          # Return the method name symbol for special handling
+          ":#{expr.method_name}"
+        else
+          compile(expr, compiler)
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/filter_compiler.rb

@@ -0,0 +1,230 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # FilterCompiler compiles Liquid filter chains to Ruby code.
+    #
+    # Filters are applied in sequence: {{ value | filter1: arg1 | filter2: arg2 }}
+    # becomes a chain of method calls on the value.
+    class FilterCompiler
+      # Standard filters that map directly to Ruby methods or simple expressions
+      SIMPLE_FILTERS = {
+        'size' => ->(input, _args, _kwargs, _compiler) { "(#{input}.respond_to?(:size) ? #{input}.size : 0)" },
+        'downcase' => ->(input, _args, _kwargs, _compiler) { "LR.to_s(#{input}).downcase" },
+        'upcase' => ->(input, _args, _kwargs, _compiler) { "LR.to_s(#{input}).upcase" },
+        'capitalize' => ->(input, _args, _kwargs, _compiler) { "LR.to_s(#{input}).capitalize" },
+        'strip' => ->(input, _args, _kwargs, _compiler) { "LR.to_s(#{input}).strip" },
+        'lstrip' => ->(input, _args, _kwargs, _compiler) { "LR.to_s(#{input}).lstrip" },
+        'rstrip' => ->(input, _args, _kwargs, _compiler) { "LR.to_s(#{input}).rstrip" },
+        'reverse' => ->(input, _args, _kwargs, _compiler) { "(#{input}.is_a?(Array) ? #{input}.reverse : LR.to_s(#{input}).reverse)" },
+        'first' => ->(input, _args, _kwargs, _compiler) { "(#{input}.respond_to?(:first) ? #{input}.first : nil)" },
+        'last' => ->(input, _args, _kwargs, _compiler) { "(#{input}.respond_to?(:last) ? #{input}.last : nil)" },
+        'uniq' => ->(input, _args, _kwargs, _compiler) { "(#{input}.respond_to?(:uniq) ? #{input}.uniq : #{input})" },
+        'compact' => ->(input, _args, _kwargs, _compiler) { "(#{input}.respond_to?(:compact) ? #{input}.compact : #{input})" },
+        'flatten' => ->(input, _args, _kwargs, _compiler) { "(#{input}.respond_to?(:flatten) ? #{input}.flatten : #{input})" },
+        'sort' => ->(input, _args, _kwargs, _compiler) { "(#{input}.respond_to?(:sort) ? #{input}.sort : #{input})" },
+        'abs' => ->(input, _args, _kwargs, _compiler) { "LR.to_number(#{input}).abs" },
+        'ceil' => ->(input, _args, _kwargs, _compiler) { "LR.to_number(#{input}).ceil.to_i" },
+        'floor' => ->(input, _args, _kwargs, _compiler) { "LR.to_number(#{input}).floor.to_i" },
+        'escape' => ->(input, _args, _kwargs, _compiler) { "(#{input}.nil? ? nil : LR.escape_html(#{input}))" },
+        'h' => ->(input, _args, _kwargs, _compiler) { "(#{input}.nil? ? nil : LR.escape_html(#{input}))" },
+        'url_encode' => ->(input, _args, _kwargs, _compiler) { "(#{input}.nil? ? nil : LR.url_encode(#{input}))" },
+        'url_decode' => ->(input, _args, _kwargs, _compiler) { "(#{input}.nil? ? nil : LR.url_decode(#{input}))" },
+        'base64_encode' => ->(input, _args, _kwargs, _compiler) { "LR.base64_encode(#{input})" },
+        'base64_decode' => ->(input, _args, _kwargs, _compiler) { "LR.base64_decode(#{input})" },
+        'base64_url_safe_encode' => ->(input, _args, _kwargs, _compiler) { "LR.base64_url_safe_encode(#{input})" },
+        'base64_url_safe_decode' => ->(input, _args, _kwargs, _compiler) { "LR.base64_url_safe_decode(#{input})" },
+        'strip_html' => ->(input, _args, _kwargs, _compiler) { "LR.strip_html(#{input})" },
+        'strip_newlines' => ->(input, _args, _kwargs, _compiler) { "LR.to_s(#{input}).gsub(/\\r?\\n/, '')" },
+        'newline_to_br' => ->(input, _args, _kwargs, _compiler) { "LR.to_s(#{input}).gsub(/\\r?\\n/, \"<br />\\n\")" },
+      }.freeze
+
+      # Filters with arguments that need special handling
+      # All use LR.method() calls to pre-loaded runtime
+      PARAMETERIZED_FILTERS = {
+        'append' => ->(input, args, _kwargs, compiler) {
+          arg = compile_arg(args[0], compiler)
+          "LR.to_s(#{input}) + LR.to_s(#{arg})"
+        },
+        'prepend' => ->(input, args, _kwargs, compiler) {
+          arg = compile_arg(args[0], compiler)
+          "LR.to_s(#{arg}) + LR.to_s(#{input})"
+        },
+        'plus' => ->(input, args, _kwargs, compiler) {
+          arg = compile_arg(args[0], compiler)
+          "(LR.to_number(#{input}) + LR.to_number(#{arg}))"
+        },
+        'minus' => ->(input, args, _kwargs, compiler) {
+          arg = compile_arg(args[0], compiler)
+          "(LR.to_number(#{input}) - LR.to_number(#{arg}))"
+        },
+        'times' => ->(input, args, _kwargs, compiler) {
+          arg = compile_arg(args[0], compiler)
+          "(LR.to_number(#{input}) * LR.to_number(#{arg}))"
+        },
+        'divided_by' => ->(input, args, _kwargs, compiler) {
+          arg = compile_arg(args[0], compiler)
+          "(LR.to_number(#{input}) / LR.to_number(#{arg}))"
+        },
+        'modulo' => ->(input, args, _kwargs, compiler) {
+          arg = compile_arg(args[0], compiler)
+          "(LR.to_number(#{input}) % LR.to_number(#{arg}))"
+        },
+        'round' => ->(input, args, _kwargs, compiler) {
+          if args.empty?
+            "LR.to_number(#{input}).round.to_i"
+          else
+            arg = compile_arg(args[0], compiler)
+            "LR.to_number(#{input}).round(LR.to_number(#{arg}))"
+          end
+        },
+        'at_least' => ->(input, args, _kwargs, compiler) {
+          arg = compile_arg(args[0], compiler)
+          "[LR.to_number(#{input}), LR.to_number(#{arg})].max"
+        },
+        'at_most' => ->(input, args, _kwargs, compiler) {
+          arg = compile_arg(args[0], compiler)
+          "[LR.to_number(#{input}), LR.to_number(#{arg})].min"
+        },
+        'default' => ->(input, args, kwargs, compiler) {
+          default_val = args.empty? ? "''" : compile_arg(args[0], compiler)
+          allow_false = kwargs && kwargs['allow_false'] ? "allow_false: #{compile_arg(kwargs['allow_false'], compiler)}" : ''
+          "LR.default(#{input}, #{default_val}#{allow_false.empty? ? '' : ', ' + allow_false})"
+        },
+        'split' => ->(input, args, _kwargs, compiler) {
+          pattern = args.empty? ? "' '" : compile_arg(args[0], compiler)
+          "LR.to_s(#{input}).split(LR.to_s(#{pattern}))"
+        },
+        'join' => ->(input, args, _kwargs, compiler) {
+          glue = args.empty? ? "' '" : compile_arg(args[0], compiler)
+          "(#{input}.is_a?(Array) ? #{input}.map { |i| LR.to_s(i) }.join(LR.to_s(#{glue})) : LR.to_s(#{input}))"
+        },
+        'replace' => ->(input, args, _kwargs, compiler) {
+          string = compile_arg(args[0], compiler)
+          replacement = args.length > 1 ? compile_arg(args[1], compiler) : "''"
+          "LR.to_s(#{input}).gsub(LR.to_s(#{string}), LR.to_s(#{replacement}))"
+        },
+        'replace_first' => ->(input, args, _kwargs, compiler) {
+          string = compile_arg(args[0], compiler)
+          replacement = args.length > 1 ? compile_arg(args[1], compiler) : "''"
+          "LR.to_s(#{input}).sub(LR.to_s(#{string}), LR.to_s(#{replacement}))"
+        },
+        'remove' => ->(input, args, _kwargs, compiler) {
+          string = compile_arg(args[0], compiler)
+          "LR.to_s(#{input}).gsub(LR.to_s(#{string}), '')"
+        },
+        'remove_first' => ->(input, args, _kwargs, compiler) {
+          string = compile_arg(args[0], compiler)
+          "LR.to_s(#{input}).sub(LR.to_s(#{string}), '')"
+        },
+        'truncate' => ->(input, args, _kwargs, compiler) {
+          length = args.empty? ? "50" : compile_arg(args[0], compiler)
+          ellipsis = args.length > 1 ? compile_arg(args[1], compiler) : "'...'"
+          "LR.truncate(#{input}, #{length}, #{ellipsis})"
+        },
+        'truncatewords' => ->(input, args, _kwargs, compiler) {
+          words = args.empty? ? "15" : compile_arg(args[0], compiler)
+          ellipsis = args.length > 1 ? compile_arg(args[1], compiler) : "'...'"
+          "LR.truncatewords(#{input}, #{words}, #{ellipsis})"
+        },
+        'slice' => ->(input, args, _kwargs, compiler) {
+          offset = compile_arg(args[0], compiler)
+          length = args.length > 1 ? compile_arg(args[1], compiler) : "1"
+          "LR.slice(#{input}, #{offset}, #{length})"
+        },
+        'map' => ->(input, args, _kwargs, compiler) {
+          property = compile_arg(args[0], compiler)
+          "(#{input}.is_a?(Array) ? #{input}.map { |item| item.respond_to?(:[]) ? item[#{property}] : nil } : [])"
+        },
+        'where' => ->(input, args, _kwargs, compiler) {
+          property = compile_arg(args[0], compiler)
+          if args.length > 1
+            target = compile_arg(args[1], compiler)
+            "(#{input}.is_a?(Array) ? #{input}.select { |item| item.respond_to?(:[]) && item[#{property}] == #{target} } : [])"
+          else
+            "(#{input}.is_a?(Array) ? #{input}.select { |item| item.respond_to?(:[]) && LR.truthy?(item[#{property}]) } : [])"
+          end
+        },
+        'reject' => ->(input, args, _kwargs, compiler) {
+          property = compile_arg(args[0], compiler)
+          if args.length > 1
+            target = compile_arg(args[1], compiler)
+            "(#{input}.is_a?(Array) ? #{input}.reject { |item| item.respond_to?(:[]) && item[#{property}] == #{target} } : [])"
+          else
+            "(#{input}.is_a?(Array) ? #{input}.reject { |item| item.respond_to?(:[]) && LR.truthy?(item[#{property}]) } : [])"
+          end
+        },
+        'concat' => ->(input, args, _kwargs, compiler) {
+          arr = compile_arg(args[0], compiler)
+          "(#{input}.is_a?(Array) ? #{input} + (#{arr}.respond_to?(:to_ary) ? #{arr}.to_ary : []) : [])"
+        },
+        'sort_natural' => ->(input, args, _kwargs, compiler) {
+          if args.empty?
+            "(#{input}.is_a?(Array) ? #{input}.sort_by { |a| a.to_s.downcase } : #{input})"
+          else
+            property = compile_arg(args[0], compiler)
+            "(#{input}.is_a?(Array) ? #{input}.sort_by { |a| a.respond_to?(:[]) ? a[#{property}].to_s.downcase : '' } : #{input})"
+          end
+        },
+        'date' => ->(input, args, _kwargs, compiler) {
+          format = compile_arg(args[0], compiler)
+          "LR.date(#{input}, #{format})"
+        },
+        'escape_once' => ->(input, _args, _kwargs, _compiler) {
+          "LR.escape_once(#{input})"
+        },
+      }.freeze
+
+      # Compile a filter chain
+      # @param input_expr [String] Ruby expression for the input value
+      # @param filters [Array] Array of filter definitions [name, args, kwargs]
+      # @param compiler [RubyCompiler] The main compiler instance
+      # @return [String] Ruby code that applies all filters
+      def self.compile(input_expr, filters, compiler)
+        result = input_expr
+
+        filters.each do |filter_name, filter_args, filter_kwargs|
+          result = compile_filter(result, filter_name, filter_args || [], filter_kwargs, compiler)
+        end
+
+        result
+      end
+
+      # Compile a single filter application
+      def self.compile_filter(input, name, args, kwargs, compiler)
+        if SIMPLE_FILTERS.key?(name)
+          SIMPLE_FILTERS[name].call(input, args, kwargs, compiler)
+        elsif PARAMETERIZED_FILTERS.key?(name)
+          PARAMETERIZED_FILTERS[name].call(input, args, kwargs, compiler)
+        else
+          # Fall back to a generic filter call
+          compile_generic_filter(input, name, args, kwargs, compiler)
+        end
+      end
+
+      # Compile a filter that's not built-in
+      # Yields [:filter, name, input, args] to the external handler
+      def self.compile_generic_filter(input, name, args, kwargs, compiler)
+        # Mark that we're using external filters
+        compiler.register_external_filter
+
+        compiled_args = args.map { |arg| compile_arg(arg, compiler) }
+
+        if kwargs && !kwargs.empty?
+          kwargs_hash = kwargs.map { |k, v| "#{k.inspect} => #{compile_arg(v, compiler)}" }.join(", ")
+          compiled_args << "{ #{kwargs_hash} }"
+        end
+
+        args_str = compiled_args.empty? ? "[]" : "[#{compiled_args.join(', ')}]"
+
+        # Yield to the external handler
+        "__external__.call(:filter, #{name.inspect}, #{input}, #{args_str})"
+      end
+
+      # Compile a filter argument
+      def self.compile_arg(arg, compiler)
+        ExpressionCompiler.compile(arg, compiler)
+      end
+    end
+  end
+end

lib/liquid/compile/ruby_compiler.rb

@@ -0,0 +1,418 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # RubyCompiler transforms a parsed Liquid template into pure Ruby code.
+    #
+    # The compiled code is a string that can be eval'd to create a proc/lambda
+    # that takes an assigns hash and returns the rendered output string.
+    #
+    # ## Optimization Opportunities
+    #
+    # The compiled Ruby code has several significant advantages over interpreted Liquid:
+    #
+    # 1. **No Context Object**: Instead of using a Context for variable lookups,
+    #    variables are extracted directly from the assigns hash and stored in
+    #    local Ruby variables. This eliminates hash lookups on every access.
+    #
+    # 2. **No Filter Invocation Overhead**: Filters are compiled to direct Ruby
+    #    method calls rather than going through context.invoke().
+    #
+    # 3. **No Resource Limits Tracking**: The compiled code doesn't track render
+    #    scores, write scores, or assign scores, eliminating per-node overhead.
+    #
+    # 4. **No Stack-based Scoping**: Ruby's native block scoping is used instead
+    #    of manually managing scope stacks with push/pop operations.
+    #
+    # 5. **Direct String Concatenation**: Output is built with direct << operations
+    #    rather than through render_to_output_buffer abstractions.
+    #
+    # 6. **Native Control Flow**: break/continue become Ruby's break/next,
+    #    eliminating interrupt objects and checks.
+    #
+    # 7. **No to_liquid Calls**: Values are used directly without conversion.
+    #
+    # 8. **Potential for Constant Folding**: Expressions with only literals
+    #    could be evaluated at compile time (future enhancement).
+    #
+    # 9. **Potential for Dead Code Elimination**: Unreachable branches like
+    #    `{% if false %}` could be removed (future enhancement).
+    #
+    # 10. **No Profiling Hooks**: No profiler overhead in the generated code.
+    #
+    # 11. **No Exception Rendering**: Errors propagate naturally rather than
+    #     being caught and rendered inline.
+    #
+    # ## Usage
+    #
+    #   template = Liquid::Template.parse("Hello, {{ name }}!")
+    #   ruby_code = template.compile_to_ruby
+    #   render_proc = eval(ruby_code)
+    #   result = render_proc.call({ "name" => "World" })
+    #   # => "Hello, World!"
+    #
+    class RubyCompiler
+      attr_reader :template, :options
+
+      # @param template [Liquid::Template] The parsed template to compile
+      # @param options [Hash] Compilation options
+      # @option options [Boolean] :strict_variables Raise on undefined variables (default: false)
+      # @option options [Boolean] :include_filters Include filter helper methods (default: true)
+      # @option options [Boolean] :debug Emit source comments for debugging (default: false)
+      # @option options [Object] :file_system File system for loading partials (default: template's environment)
+      def initialize(template, options = {})
+        @template = template
+        @options = {
+          strict_variables: false,
+          include_filters: true,
+          debug: false,
+          file_system: nil,
+        }.merge(options)
+        @var_counter = 0
+        @partials = {}        # Registered partials: name => method_name
+        @partial_sources = {} # Partial sources: name => source code
+        @partial_counter = 0
+        @external_tags = {}   # External tags: var_name => tag object
+        @external_tag_counter = 0
+        @has_external_filters = false  # Whether we need the filter helper
+        @loop_context_stack = []       # Stack of loop contexts for break/continue
+      end
+
+      # Push a loop context onto the stack (for nested loops)
+      # @param break_var [String, nil] Variable name for break flag, or nil if no break
+      # @param idx_var [String, nil] Variable name for loop index
+      # @param len_var [String, nil] Variable name for collection length
+      # @param loop_name [String, nil] Name of the loop (for forloop.name)
+      def push_loop_context(break_var: nil, idx_var: nil, len_var: nil, loop_name: nil)
+        @loop_context_stack.push({
+          break_var: break_var,
+          idx_var: idx_var,
+          len_var: len_var,
+          loop_name: loop_name
+        })
+      end
+
+      # Pop the current loop context
+      def pop_loop_context
+        @loop_context_stack.pop
+      end
+
+      # Get the current loop context (for break/continue compilation)
+      # @return [Hash, nil] Current loop context or nil if not in a loop
+      def current_loop_context
+        @loop_context_stack.last
+      end
+
+      # Mark that we have external filters
+      def register_external_filter
+        @has_external_filters = true
+      end
+
+      # Check if external filters are used
+      def has_external_filters?
+        @has_external_filters
+      end
+
+      # Register an external tag that will be called at runtime
+      # @param tag [Liquid::Tag] The tag to register
+      # @return [String] The variable name for this tag
+      def register_external_tag(tag)
+        @external_tag_counter += 1
+        var_name = "__ext_tag_#{@external_tag_counter}__"
+        @external_tags[var_name] = tag
+        var_name
+      end
+
+      # Get all registered external tags
+      # @return [Hash] Map of variable names to tag objects
+      def external_tags
+        @external_tags
+      end
+
+      # Get the file system for loading partials
+      def file_system
+        @options[:file_system] || @template.instance_variable_get(:@environment)&.file_system
+      end
+
+      # Load a partial source from the file system
+      # @param name [String] The partial name
+      # @return [String, nil] The partial source or nil if not found
+      def load_partial(name)
+        return @partial_sources[name] if @partial_sources.key?(name)
+
+        fs = file_system
+        return nil unless fs && fs.respond_to?(:read_template_file)
+
+        begin
+          source = fs.read_template_file(name)
+          @partial_sources[name] = source
+          source
+        rescue Liquid::FileSystemError
+          nil
+        end
+      end
+
+      # Register a partial and return its method name
+      # @param name [String] The partial name
+      # @param source [String] The partial source
+      # @return [String] The method name for this partial
+      def register_partial(name, source)
+        return @partials[name] if @partials.key?(name)
+
+        @partial_counter += 1
+        method_name = "__partial_#{@partial_counter}__"
+        @partials[name] = method_name
+        method_name
+      end
+
+      # Get all registered partials
+      def registered_partials
+        @partials
+      end
+
+      # Check if debug mode is enabled
+      def debug?
+        @options[:debug]
+      end
+
+      # Emit a debug comment with source location info
+      # This creates a lightweight source map that allows tracing errors
+      # back to the original Liquid source
+      def emit_debug_comment(code, node, description = nil)
+        return unless debug?
+
+        line_number = node.respond_to?(:line_number) ? node.line_number : nil
+        raw_markup = extract_raw_markup(node)
+
+        comment_parts = []
+        comment_parts << "LIQUID"
+        comment_parts << "L#{line_number}" if line_number
+        comment_parts << description if description
+        comment_parts << raw_markup.inspect if raw_markup && raw_markup.length < 80
+
+        code.line "# #{comment_parts.join(' | ')}"
+      end
+
+      # Extract the raw markup from a node for debug output
+      def extract_raw_markup(node)
+        case node
+        when Variable
+          "{{ #{node.raw} }}"
+        when Tag
+          if node.respond_to?(:raw)
+            "{% #{node.tag_name} #{node.raw} %}"
+          elsif node.respond_to?(:markup)
+            "{% #{node.tag_name} #{node.markup} %}"
+          else
+            "{% #{node.class.name.split('::').last.downcase} %}"
+          end
+        else
+          nil
+        end
+      end
+
+      # Compile the template to a Ruby code string
+      # @return [String] Ruby code that can be eval'd to create a render proc
+      # @return [Hash] If external tags are used, returns { code: String, external_tags: Hash }
+      def compile
+        code = CodeGenerator.new
+
+        # Add debug header if enabled
+        if debug?
+          code.line "# Compiled from Liquid template: #{@template.name || '(unnamed)'}"
+          code.line "# Debug mode enabled - comments contain source locations"
+          code.line "# Format: # LIQUID | L<line> | <description> | <source>"
+          code.blank_line
+        end
+
+        # First pass: compile the document body to discover partials and external tags
+        main_code = CodeGenerator.new
+        compile_node(@template.root, main_code)
+
+        # Lambda signature: (assigns, context, external_handler)
+        # - assigns: Hash of template variables
+        # - context: CompiledContext for Drop support
+        # - external_handler: Proc that handles [:tag, ...] and [:filter, ...] calls
+        code.line "->(assigns, __context__, __external__) do"
+
+        code.indent do
+          # Initialize the output buffer
+          code.line '__output__ = +""'
+          code.blank_line
+
+          # Compile partial methods (before main body so they're available)
+          compile_partials(code)
+
+          # Add the main body code
+          code.raw(main_code.to_s)
+
+          code.blank_line
+          code.line "__output__"
+        end
+        code.line "end"
+
+        code.to_s
+      end
+
+      # Compile all registered partials as inner methods
+      def compile_partials(code)
+        @partials.each do |name, method_name|
+          source = @partial_sources[name]
+          next unless source
+
+          code.line "# Partial: #{name}"
+          code.line "#{method_name} = ->(partial_assigns) do"
+          code.indent do
+            code.line "__partial_output__ = +''"
+            code.line "# Merge partial assigns with parent assigns"
+            code.line "__assigns_backup__ = assigns.dup"
+            code.line "assigns.merge!(partial_assigns)"
+            code.blank_line
+
+            # Parse and compile the partial
+            # Note: We need to handle this carefully to avoid circular references
+            begin
+              compile_partial_source(source, code)
+            rescue => e
+              code.line "# Error compiling partial: #{e.message.inspect}"
+              code.line "__partial_output__ << '[PARTIAL ERROR: ' + #{name.inspect} + ']'"
+            end
+
+            code.blank_line
+            code.line "# Restore assigns"
+            code.line "assigns.replace(__assigns_backup__)"
+            code.line "__partial_output__"
+          end
+          code.line "end"
+          code.blank_line
+        end
+      end
+
+      # Compile a partial source string
+      def compile_partial_source(source, code)
+        # Parse the partial source using the same environment
+        environment = @template.instance_variable_get(:@environment) || Liquid::Environment.default
+        parse_context = Liquid::ParseContext.new(environment: environment)
+        tokenizer = parse_context.new_tokenizer(source)
+        document = Liquid::Document.parse(tokenizer, parse_context)
+
+        # Compile the partial's body, but swap output variable
+        code.line "__saved_output__ = __output__"
+        code.line "__output__ = __partial_output__"
+
+        # Compile the document
+        BlockBodyCompiler.compile(document.body, self, code)
+
+        code.line "__output__ = __saved_output__"
+      end
+
+      # Generate a unique variable name for internal use
+      def generate_var_name(prefix = "v")
+        @var_counter += 1
+        "__#{prefix}#{@var_counter}__"
+      end
+
+      # Compile a single node
+      def compile_node(node, code)
+        case node
+        when Document
+          BlockBodyCompiler.compile(node.body, self, code)
+        when BlockBody
+          BlockBodyCompiler.compile(node, self, code)
+        when String
+          compile_string(node, code)
+        when Variable
+          emit_debug_comment(code, node, "variable")
+          VariableCompiler.compile(node, self, code)
+        when Tag
+          emit_debug_comment(code, node, node.class.name.split('::').last.downcase)
+          compile_tag(node, code)
+        else
+          raise CompileError, "Unknown node type: #{node.class}"
+        end
+      end
+
+      private
+
+      def compile_string(str, code)
+        return if str.empty?
+        if debug? && str.length < 40
+          code.line "# LIQUID | text | #{str.inspect}"
+        end
+        code.line "__output__ << #{str.inspect}"
+      end
+
+      def compile_tag(tag, code)
+        # First, check if the tag implements to_ruby (custom compilation)
+        if tag.respond_to?(:to_ruby)
+          tag.to_ruby(code, self)
+        # Then check for a built-in compiler class
+        elsif (compiler_class = find_tag_compiler(tag))
+          compiler_class.compile(tag, self, code)
+        else
+          # Unknown tag - yield to caller at runtime
+          compile_external_tag(tag, code)
+        end
+      end
+
+      def compile_external_tag(tag, code)
+        tag_var = register_external_tag(tag)
+        tag_name = tag.class.name.split('::').last
+        if debug?
+          code.line "# External tag: #{tag_name} (yields to caller)"
+        end
+        # Yield [:tag, tag_var, assigns] to the external handler
+        code.line "__output__ << __external__.call(:tag, #{tag_var.inspect}, assigns)"
+      end
+
+      def find_tag_compiler(tag)
+        case tag
+        when Liquid::Unless  # Check Unless before If since Unless < If
+          Tags::UnlessCompiler
+        when Liquid::If
+          Tags::IfCompiler
+        when Liquid::Case
+          Tags::CaseCompiler
+        when Liquid::For
+          Tags::ForCompiler
+        when Liquid::Assign
+          Tags::AssignCompiler
+        when Liquid::Capture
+          Tags::CaptureCompiler
+        when Liquid::Cycle
+          Tags::CycleCompiler
+        when Liquid::Increment
+          Tags::IncrementCompiler
+        when Liquid::Decrement
+          Tags::DecrementCompiler
+        when Liquid::Raw
+          Tags::RawCompiler
+        when Liquid::Echo
+          Tags::EchoCompiler
+        when Liquid::Break
+          Tags::BreakCompiler
+        when Liquid::Continue
+          Tags::ContinueCompiler
+        when Liquid::Comment, Liquid::InlineComment, Liquid::Doc
+          Tags::CommentCompiler
+        when Liquid::TableRow
+          Tags::TableRowCompiler
+        when Liquid::Render
+          Tags::RenderCompiler
+        when Liquid::Include
+          Tags::IncludeCompiler
+        when Liquid::Ifchanged
+          Tags::IfchangedCompiler
+        else
+          nil
+        end
+      end
+
+      # NOTE: compile_helper_methods was removed - helpers are now provided by the
+      # pre-loaded LR module (compile/runtime.rb). Templates call LR.to_s(), LR.lookup(), etc.
+    end
+
+    # Custom error for compilation issues
+    class CompileError < StandardError; end
+  end
+end

lib/liquid/compile/runtime.rb

@@ -0,0 +1,252 @@
+# frozen_string_literal: true
+
+# Liquid Compiled Template Runtime
+#
+# This module provides ALL helpers for compiled Liquid templates.
+# It is loaded into the sandbox BEFORE lock!, so these methods
+# are available to all compiled templates.
+#
+# Templates reference these as LR.method_name(args)
+#
+# == Security Note
+#
+# It is SAFE to expose side-effect-free, non-IO methods that don't leak
+# objects with dangerous methods. For example:
+#
+#   - CGI.escapeHTML(str) -> returns a String (safe)
+#   - Base64.strict_encode64(str) -> returns a String (safe)
+#   - BigDecimal(str) -> returns a Numeric (safe)
+#
+# These are pure functions that take values and return values.
+# They don't provide any capability to escape the sandbox.
+#
+# We capture METHOD REFERENCES (e.g., CGI.method(:escapeHTML)) before the
+# sandbox locks. This means templates can use the functionality without
+# having direct access to the CGI, Base64, or BigDecimal constants.
+#
+# Dependencies (CGI, Base64, BigDecimal) are loaded by box.rb into the
+# sandbox BEFORE this file runs. The constants are preserved after lock.
+
+module LR
+  # === Type Conversion ===
+
+  # Convert to string like Liquid does
+  def self.to_s(obj)
+    case obj
+    when nil then ''
+    when Array then obj.join
+    else obj.to_s
+    end
+  end
+
+  # Convert to number for arithmetic
+  # Use Kernel.BigDecimal to access from root namespace
+  def self.to_number(obj)
+    case obj
+    when Numeric then obj
+    when String
+      if obj.strip =~ /\A-?\d+\.\d+\z/
+        Kernel.BigDecimal(obj)
+      else
+        obj.to_i
+      end
+    else 0
+    end
+  end
+
+  # Convert to integer
+  def self.to_integer(obj)
+    return obj if obj.is_a?(Integer)
+    Integer(obj.to_s) rescue 0
+  end
+
+  # === Truthiness ===
+
+  # Liquid truthiness: only nil and false are falsy
+  def self.truthy?(obj)
+    obj != nil && obj != false
+  end
+
+  # === Output ===
+
+  # Output a value, converting to string safely (handles arrays recursively)
+  def self.output(obj)
+    case obj
+    when nil then ''
+    when Array then obj.map { |o| output(o) }.join
+    when BigDecimal
+      # Format BigDecimal like Liquid does - avoid scientific notation
+      obj.to_s('F')
+    else obj.to_s
+    end
+  end
+
+  # === Lookup ===
+
+  # Variable lookup - handles hash/array access, method calls, to_liquid, and drop context
+  def self.lookup(obj, key, context = nil)
+    return nil if obj.nil?
+
+    # Set context on Drops BEFORE accessing their methods
+    obj = obj.to_liquid if obj.respond_to?(:to_liquid)
+    obj.context = context if context && obj.respond_to?(:context=)
+
+    # Perform the lookup
+    result = if obj.respond_to?(:[]) && (obj.respond_to?(:key?) && obj.key?(key) || obj.respond_to?(:fetch) && key.is_a?(Integer))
+      obj[key]
+    elsif obj.respond_to?(key)
+      obj.public_send(key)
+    else
+      nil
+    end
+
+    # Convert result to liquid and set context for nested Drops
+    result = result.to_liquid if result.respond_to?(:to_liquid)
+    result.context = context if context && result.respond_to?(:context=)
+    result
+  end
+
+  # === HTML/URL Encoding ===
+  # Capture method references before sandbox locks - only the specific methods we need
+  CGI_ESCAPE_HTML = CGI.method(:escapeHTML)
+  CGI_ESCAPE = CGI.method(:escape)
+  CGI_UNESCAPE = CGI.method(:unescape)
+
+  HTML_ESCAPE_MAP = { '&' => '&amp;', '<' => '&lt;', '>' => '&gt;', '"' => '&quot;', "'" => '&#39;' }.freeze
+
+  def self.escape_html(obj)
+    CGI_ESCAPE_HTML.call(to_s(obj))
+  end
+
+  def self.url_encode(obj)
+    CGI_ESCAPE.call(to_s(obj))
+  end
+
+  def self.url_decode(obj)
+    CGI_UNESCAPE.call(to_s(obj))
+  end
+
+  def self.escape_once(obj)
+    # Only escape if not already escaped
+    to_s(obj).gsub(/["><']|&(?!([a-zA-Z]+|(#\d+));)/, HTML_ESCAPE_MAP)
+  end
+
+  # === Base64 ===
+  # Capture method references before sandbox locks
+  BASE64_ENCODE = Base64.method(:strict_encode64)
+  BASE64_DECODE = Base64.method(:strict_decode64)
+  BASE64_URL_ENCODE = Base64.method(:urlsafe_encode64)
+  BASE64_URL_DECODE = Base64.method(:urlsafe_decode64)
+
+  def self.base64_encode(obj)
+    BASE64_ENCODE.call(to_s(obj))
+  end
+
+  def self.base64_decode(obj)
+    BASE64_DECODE.call(to_s(obj))
+  end
+
+  def self.base64_url_safe_encode(obj)
+    BASE64_URL_ENCODE.call(to_s(obj))
+  end
+
+  def self.base64_url_safe_decode(obj)
+    BASE64_URL_DECODE.call(to_s(obj))
+  end
+
+  # === String Manipulation ===
+
+  def self.strip_html(obj)
+    to_s(obj).gsub(%r{<script.*?</script>|<!--.*?-->|<style.*?</style>}m, '').gsub(/<.*?>/m, '')
+  end
+
+  # Truncate string to length with ellipsis
+  def self.truncate(input, length = 50, ellipsis = '...')
+    str = to_s(input)
+    ell_str = to_s(ellipsis)
+    len = length.to_i
+    l = [len - ell_str.length, 0].max
+    str.length > len ? str[0, l] + ell_str : str
+  end
+
+  # Truncate to word count
+  def self.truncatewords(input, num_words = 15, ellipsis = '...')
+    max_words = [num_words.to_i, 1].max
+    words = to_s(input).split(' ', max_words + 1)
+    if words.length > max_words
+      words[0, max_words].join(' ') + to_s(ellipsis)
+    else
+      input.to_s
+    end
+  end
+
+  # === Date Formatting ===
+
+  def self.date(input, format)
+    return input if format.to_s.empty?
+    d = case input
+    when Time, Date then input
+    when 'now', 'today' then Time.now
+    when /\A\d+\z/, Integer then Time.at(input.to_i)
+    when String then (Time.parse(input) rescue input)
+    else input
+    end
+    d.respond_to?(:strftime) ? d.strftime(format.to_s) : input
+  end
+
+  # === Collection Helpers ===
+
+  # Convert to array for iteration - returns Array or empty Array
+  # This guarantees the result supports [], .length, .empty? without respond_to? checks
+  def self.to_array(collection)
+    case collection
+    when Array then collection
+    when Range then collection.to_a
+    when nil then EMPTY_ARRAY
+    else
+      collection.respond_to?(:to_a) ? collection.to_a : EMPTY_ARRAY
+    end
+  end
+
+  # Frozen empty array to avoid allocations
+  EMPTY_ARRAY = [].freeze
+
+  # Iterate safely, handling ranges and non-iterables
+  def self.iterate(collection)
+    case collection
+    when Range then collection.to_a
+    when nil then EMPTY_ARRAY
+    else collection.respond_to?(:each) ? collection : EMPTY_ARRAY
+    end
+  end
+
+  # Get collection length safely
+  def self.size(collection)
+    collection.respond_to?(:size) ? collection.size : 0
+  end
+
+  # === Default Filter ===
+
+  def self.default(input, default_value, allow_false: false)
+    if allow_false
+      (input.nil? || (input.respond_to?(:empty?) && input.empty?)) ? default_value : input
+    else
+      (!truthy?(input) || (input.respond_to?(:empty?) && input.empty?)) ? default_value : input
+    end
+  end
+
+  # === Array/String Slice ===
+
+  def self.slice(input, offset, length = 1)
+    off = to_integer(offset)
+    len = to_integer(length)
+    if input.is_a?(Array)
+      input.slice(off, len) || []
+    else
+      to_s(input).slice(off, len) || ''
+    end
+  end
+end
+
+# Alias for backwards compatibility
+LiquidRuntime = LR

lib/liquid/compile/source_mapper.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # SourceMapper provides utilities for mapping errors in compiled Ruby code
+    # back to the original Liquid source.
+    #
+    # When code is compiled with debug: true, comments are embedded that contain
+    # source location information. This class can parse those comments and
+    # help trace errors back to the original Liquid template.
+    #
+    # ## Usage
+    #
+    #   template = Liquid::Template.parse(source, line_numbers: true)
+    #   ruby_code = template.compile_to_ruby(debug: true)
+    #   render_proc = eval(ruby_code)
+    #
+    #   begin
+    #     result = render_proc.call(assigns)
+    #   rescue => e
+    #     location = SourceMapper.find_source_location(ruby_code, e)
+    #     puts "Error at Liquid line #{location[:liquid_line]}: #{location[:source]}"
+    #   end
+    #
+    class SourceMapper
+      # Pattern to match LIQUID debug comments
+      LIQUID_COMMENT_PATTERN = /^(\s*)# LIQUID(?: \| L(\d+))?(?: \| ([^|]+))?(?: \| (.+))?$/
+
+      # Parse compiled Ruby code and extract source mapping entries
+      # @param ruby_code [String] The compiled Ruby code with debug comments
+      # @return [Array<Hash>] Array of source mapping entries
+      def self.parse(ruby_code)
+        entries = []
+        ruby_line = 0
+
+        ruby_code.each_line do |line|
+          ruby_line += 1
+
+          if line =~ LIQUID_COMMENT_PATTERN
+            entries << {
+              ruby_line: ruby_line,
+              liquid_line: $2&.to_i,
+              type: $3&.strip,
+              source: parse_source_string($4),
+            }
+          end
+        end
+
+        entries
+      end
+
+      # Find the source location for an error based on Ruby line number
+      # @param ruby_code [String] The compiled Ruby code
+      # @param error [Exception] The exception that was raised
+      # @return [Hash, nil] Source location info or nil if not found
+      def self.find_source_location(ruby_code, error)
+        # Extract the line number from the error
+        ruby_line = extract_error_line(error)
+        return nil unless ruby_line
+
+        find_source_for_ruby_line(ruby_code, ruby_line)
+      end
+
+      # Find the source location for a specific Ruby line number
+      # @param ruby_code [String] The compiled Ruby code
+      # @param target_line [Integer] The Ruby line number
+      # @return [Hash, nil] Source location info or nil if not found
+      def self.find_source_for_ruby_line(ruby_code, target_line)
+        entries = parse(ruby_code)
+
+        # Find the closest LIQUID comment at or before the target line
+        closest = nil
+        entries.each do |entry|
+          break if entry[:ruby_line] > target_line
+          closest = entry
+        end
+
+        closest
+      end
+
+      # Format an error message with source location info
+      # @param ruby_code [String] The compiled Ruby code
+      # @param error [Exception] The exception
+      # @return [String] Formatted error message
+      def self.format_error(ruby_code, error)
+        location = find_source_location(ruby_code, error)
+
+        message = "#{error.class}: #{error.message}"
+
+        if location
+          liquid_line = location[:liquid_line] ? "line #{location[:liquid_line]}" : "unknown line"
+          source = location[:source] || location[:type] || "unknown"
+          message += "\n  in Liquid template at #{liquid_line}"
+          message += "\n  source: #{source}" if location[:source]
+        end
+
+        message
+      end
+
+      private
+
+      def self.extract_error_line(error)
+        # Look for (eval):N in backtrace
+        error.backtrace&.each do |frame|
+          if frame =~ /\(eval.*?\):(\d+)/
+            return $1.to_i
+          end
+        end
+        nil
+      end
+
+      def self.parse_source_string(str)
+        return nil unless str
+
+        # Remove surrounding quotes if present
+        str = str.strip
+        if str.start_with?('"') && str.end_with?('"')
+          # Unescape the string
+          begin
+            eval(str)
+          rescue
+            str[1..-2]
+          end
+        else
+          str
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/assign_compiler.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% assign var = expression %} tags
+      class AssignCompiler
+        def self.compile(tag, compiler, code)
+          var_name = tag.to
+          # Use VariableCompiler to get the expression with filters applied
+          value_expr = VariableCompiler.compile_to_expression(tag.from, compiler)
+
+          # Store in the assigns hash
+          code.line "assigns[#{var_name.inspect}] = #{value_expr}"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/break_compiler.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% break %} tags
+      #
+      # Break is implemented with a flag variable that's checked in the while condition.
+      # This avoids catch/throw overhead entirely.
+      #
+      # Generated code sets the break flag and uses `next` to exit the current iteration.
+      # The while loop condition checks the flag and exits if set.
+      class BreakCompiler
+        def self.compile(_tag, compiler, code)
+          loop_ctx = compiler.current_loop_context
+          if loop_ctx && loop_ctx[:break_var]
+            # Set the break flag and exit this iteration
+            code.line "#{loop_ctx[:break_var]} = true"
+            code.line "next"
+          else
+            # Fallback: shouldn't happen if contains_tag? works correctly
+            code.line "break"
+          end
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/capture_compiler.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% capture var %}...{% endcapture %} tags
+      #
+      # Captures the output of the block into a variable
+      class CaptureCompiler
+        def self.compile(tag, compiler, code)
+          var_name = tag.instance_variable_get(:@to)
+          capture_var = compiler.generate_var_name("capture")
+
+          # Save current output, create new buffer for capture
+          code.line "#{capture_var} = __output__"
+          code.line "__output__ = +''"
+
+          # Compile the body - access the @body BlockBody directly
+          body = tag.instance_variable_get(:@body)
+          if body
+            BlockBodyCompiler.compile(body, compiler, code)
+          end
+
+          # Save captured content and restore output buffer
+          code.line "assigns[#{var_name.inspect}] = __output__"
+          code.line "__output__ = #{capture_var}"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/case_compiler.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% case %} / {% when %} / {% else %} / {% endcase %} tags
+      class CaseCompiler
+        def self.compile(tag, compiler, code)
+          # Compile the case expression and store it in a variable
+          # to avoid evaluating it multiple times
+          case_var = compiler.generate_var_name("case")
+          case_expr = ExpressionCompiler.compile(tag.left, compiler)
+          code.line "#{case_var} = #{case_expr}"
+
+          blocks = tag.blocks
+          is_first = true
+          has_else = false
+
+          blocks.each do |block|
+            if block.else?
+              has_else = true
+              code.line "else"
+            else
+              # 'when' condition - compare case expression with the when value
+              when_expr = ExpressionCompiler.compile(block.right, compiler)
+
+              if is_first
+                code.line "if #{case_var} == #{when_expr}"
+                is_first = false
+              else
+                code.line "elsif #{case_var} == #{when_expr}"
+              end
+            end
+
+            code.indent do
+              if block.attachment
+                BlockBodyCompiler.compile(block.attachment, compiler, code)
+              end
+            end
+          end
+
+          code.line "end" unless blocks.empty?
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/comment_compiler.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% comment %}...{% endcomment %} tags
+      # Also handles inline_comment (#) and doc tags
+      #
+      # Comments produce no output
+      class CommentCompiler
+        def self.compile(_tag, _compiler, code)
+          # Comments produce no output
+          code.line "# (liquid comment)"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/continue_compiler.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% continue %} tags
+      #
+      # Continue is implemented with Ruby's native `next` statement.
+      # Since we use a while loop (not each), `next` correctly skips
+      # to the next iteration, but we must increment the index first.
+      class ContinueCompiler
+        def self.compile(_tag, compiler, code)
+          # Get the index variable from the loop context
+          loop_ctx = compiler.current_loop_context
+          if loop_ctx && loop_ctx[:idx_var]
+            # Increment index before next, otherwise we'd infinite loop
+            code.line "#{loop_ctx[:idx_var]} += 1"
+          end
+          code.line "next"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/cycle_compiler.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% cycle 'a', 'b', 'c' %} tags
+      #
+      # Cycles through a list of values, outputting the next one each iteration
+      class CycleCompiler
+        def self.compile(tag, compiler, code)
+          variables = tag.variables
+          name_expr = ExpressionCompiler.compile(tag.instance_variable_get(:@name), compiler)
+          is_named = tag.named?
+
+          cycle_var = compiler.generate_var_name("cycle")
+          key_var = compiler.generate_var_name("cycle_key")
+
+          # Initialize cycle storage if needed
+          code.line "assigns[:__cycle__] ||= {}"
+
+          # Get the cycle key
+          if is_named
+            code.line "#{key_var} = #{name_expr}"
+          else
+            code.line "#{key_var} = #{variables.object_id}"
+          end
+
+          # Get current index
+          code.line "#{cycle_var} = assigns[:__cycle__][#{key_var}].to_i"
+
+          # Get the value at current index
+          code.line "case #{cycle_var} % #{variables.size}"
+          variables.each_with_index do |var, idx|
+            var_expr = ExpressionCompiler.compile(var, compiler)
+            code.line "when #{idx} then __output__ << LR.to_s(#{var_expr})"
+          end
+          code.line "end"
+
+          # Increment counter
+          code.line "assigns[:__cycle__][#{key_var}] = #{cycle_var} + 1"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/decrement_compiler.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% decrement var %} tags
+      #
+      # Decrements a counter and outputs its value.
+      # Uses a separate namespace from regular assigns (shares with increment).
+      class DecrementCompiler
+        def self.compile(tag, compiler, code)
+          var_name = tag.variable_name
+
+          # Initialize counter storage if needed
+          code.line "assigns[:__counters__] ||= {}"
+
+          # Get current value (default 0), decrement it, output, then store
+          dec_var = compiler.generate_var_name("dec")
+          code.line "#{dec_var} = (assigns[:__counters__][#{var_name.inspect}] || 0) - 1"
+          code.line "assigns[:__counters__][#{var_name.inspect}] = #{dec_var}"
+          code.line "__output__ << #{dec_var}.to_s"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/echo_compiler.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% echo expression %} tags
+      #
+      # Same as {{ expression }} but usable in {% liquid %} blocks
+      class EchoCompiler
+        def self.compile(tag, compiler, code)
+          variable = tag.variable
+          VariableCompiler.compile(variable, compiler, code)
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/for_compiler.rb

@@ -0,0 +1,339 @@
+# frozen_string_literal: true
+
+require 'set'
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% for %} / {% else %} / {% endfor %} tags
+      #
+      # Supports:
+      # - Iteration: {% for item in collection %}
+      # - Limit/Offset: {% for item in collection limit:3 offset:2 %}
+      # - Reversed: {% for item in collection reversed %}
+      # - Forloop object: forloop.index, forloop.first, forloop.last, etc.
+      # - Else block: {% for item in collection %}...{% else %}empty{% endfor %}
+      #
+      # Optimizations:
+      # - Detects break/continue usage at compile time
+      # - Uses while loop with index for minimal overhead
+      # - Break implemented with flag variable (no catch/throw)
+      # - Continue implemented with next (native Ruby)
+      # - Avoids Hash allocation for forloop when not used
+      class ForCompiler
+        def self.compile(tag, compiler, code)
+          var_name = tag.variable_name
+          collection_expr = ExpressionCompiler.compile(tag.collection_name, compiler)
+
+          # Generate unique variable names for this loop
+          coll_var = compiler.generate_var_name("coll")
+          idx_var = compiler.generate_var_name("idx")
+          len_var = compiler.generate_var_name("len")
+
+          # Evaluate the collection and convert to array for indexed access
+          # After this, coll_var is guaranteed to be an Array (or nil)
+          code.line "#{coll_var} = #{collection_expr}"
+          code.line "#{coll_var} = LR.to_array(#{coll_var})"
+
+          # Handle limit and offset
+          if tag.from || tag.limit
+            compile_slice(tag, coll_var, compiler, code)
+          end
+
+          # Handle reversed
+          if tag.instance_variable_get(:@reversed)
+            code.line "#{coll_var} = #{coll_var}.reverse"
+          end
+
+          # Check if collection is empty for else block
+          for_block = tag.instance_variable_get(:@for_block)
+          else_block = tag.instance_variable_get(:@else_block)
+
+          if else_block
+            code.line "if #{coll_var}.nil? || #{coll_var}.empty?"
+            code.indent do
+              BlockBodyCompiler.compile(else_block, compiler, code)
+            end
+            code.line "else"
+            code.indent do
+              compile_loop(tag, var_name, coll_var, idx_var, len_var, for_block, compiler, code)
+            end
+            code.line "end"
+          else
+            code.line "if #{coll_var} && !#{coll_var}.empty?"
+            code.indent do
+              compile_loop(tag, var_name, coll_var, idx_var, len_var, for_block, compiler, code)
+            end
+            code.line "end"
+          end
+        end
+
+        private
+
+        def self.compile_slice(tag, coll_var, compiler, code)
+          from_expr = if tag.from == :continue
+            # Continue from previous offset - we'd need register tracking for this
+            # For now, default to 0
+            "0"
+          elsif tag.from
+            ExpressionCompiler.compile(tag.from, compiler)
+          else
+            "0"
+          end
+
+          if tag.limit
+            limit_expr = ExpressionCompiler.compile(tag.limit, compiler)
+            code.line "#{coll_var} = #{coll_var}[LR.to_integer(#{from_expr}), LR.to_integer(#{limit_expr})] || []"
+          else
+            code.line "#{coll_var} = #{coll_var}.drop(LR.to_integer(#{from_expr}))"
+          end
+        end
+
+        def self.compile_loop(tag, var_name, coll_var, idx_var, len_var, for_block, compiler, code)
+          # Analyze loop body for break/continue usage and forloop access
+          has_break = contains_tag?(for_block, Break)
+          forloop_props = detect_forloop_properties(for_block)
+          uses_forloop = !forloop_props.empty?
+
+          # Calculate length (needed for forloop or bounds checking)
+          code.line "#{len_var} = #{coll_var}.length"
+          code.line "#{idx_var} = 0"
+
+          # Break uses a flag variable - no catch/throw overhead
+          if has_break
+            break_var = compiler.generate_var_name("brk")
+            code.line "#{break_var} = false"
+            code.line "while #{idx_var} < #{len_var} && !#{break_var}"
+          else
+            code.line "while #{idx_var} < #{len_var}"
+          end
+
+          # Check if all forloop properties can be inlined (no hash needed)
+          inlinable_props = %w[index index0 rindex rindex0 first last length name]
+          needs_forloop_hash = uses_forloop && !forloop_props.all? { |p| inlinable_props.include?(p) }
+
+          code.indent do
+            # Set the loop variable directly from array index
+            code.line "assigns[#{var_name.inspect}] = #{coll_var}[#{idx_var}]"
+
+            # Only create forloop hash if we have properties that can't be inlined
+            if needs_forloop_hash
+              compile_forloop_hash(tag, idx_var, len_var, code)
+            end
+
+            # Compile the loop body
+            # The BreakCompiler/ContinueCompiler will emit the right code
+            # based on the context we pass through the compiler
+            compiler.push_loop_context(
+              break_var: has_break ? break_var : nil,
+              idx_var: idx_var,
+              len_var: len_var,
+              loop_name: tag.instance_variable_get(:@name)
+            )
+            BlockBodyCompiler.compile(for_block, compiler, code)
+            compiler.pop_loop_context
+
+            # Increment index
+            code.line "#{idx_var} += 1"
+          end
+          code.line "end"
+
+          # Clean up
+          code.line "assigns.delete(#{var_name.inspect})"
+          code.line "assigns.delete('forloop')" if needs_forloop_hash
+        end
+
+        def self.compile_forloop_hash(tag, idx_var, len_var, code)
+          loop_name = tag.instance_variable_get(:@name)
+          code.line "assigns['forloop'] = {"
+          code.indent do
+            code.line "'name' => #{loop_name.inspect},"
+            code.line "'length' => #{len_var},"
+            code.line "'index' => #{idx_var} + 1,"
+            code.line "'index0' => #{idx_var},"
+            code.line "'rindex' => #{len_var} - #{idx_var},"
+            code.line "'rindex0' => #{len_var} - #{idx_var} - 1,"
+            code.line "'first' => #{idx_var} == 0,"
+            code.line "'last' => #{idx_var} == #{len_var} - 1,"
+          end
+          code.line "}"
+        end
+
+        # Check if a block body contains a specific tag type (recursively)
+        def self.contains_tag?(body, tag_class)
+          return false if body.nil?
+          nodelist = body.nodelist
+          return false if nodelist.nil?
+
+          nodelist.any? do |node|
+            case node
+            when tag_class
+              true
+            when Block
+              # Check nested blocks (if, for, case, etc.)
+              contains_tag?(node.instance_variable_get(:@body), tag_class) ||
+                (node.respond_to?(:nodelist) && contains_tag_in_nodelist?(node.nodelist, tag_class))
+            when Tag
+              # Tags with blocks
+              check_tag_for_nested(node, tag_class)
+            else
+              false
+            end
+          end
+        end
+
+        def self.check_tag_for_nested(tag, tag_class)
+          # Check various block-holding tags
+          [:@for_block, :@else_block, :@body, :@consequent, :@alternative].each do |ivar|
+            if tag.instance_variable_defined?(ivar)
+              block = tag.instance_variable_get(ivar)
+              return true if contains_tag?(block, tag_class)
+            end
+          end
+
+          # Check If tag's blocks array
+          if tag.respond_to?(:blocks)
+            tag.blocks.each do |block|
+              if block.respond_to?(:attachment)
+                return true if contains_tag?(block.attachment, tag_class)
+              end
+            end
+          end
+
+          false
+        end
+
+        def self.contains_tag_in_nodelist?(nodelist, tag_class)
+          return false if nodelist.nil?
+          nodelist.any? { |n| n.is_a?(tag_class) || (n.is_a?(Tag) && check_tag_for_nested(n, tag_class)) }
+        end
+
+        # Check if the loop body accesses forloop variable
+        def self.uses_forloop_var?(body)
+          return false if body.nil?
+          nodelist = body.nodelist
+          return false if nodelist.nil?
+
+          nodelist.any? do |node|
+            case node
+            when Variable
+              # Check if variable references forloop
+              lookup = node.name
+              if lookup.is_a?(VariableLookup)
+                return true if lookup.name == 'forloop'
+              end
+              false
+            when Tag
+              # Recursively check tag bodies and conditions
+              check_tag_for_forloop(node)
+            else
+              false
+            end
+          end
+        end
+
+        def self.check_tag_for_forloop(tag)
+          # Check block bodies
+          [:@for_block, :@else_block, :@body, :@consequent, :@alternative].each do |ivar|
+            if tag.instance_variable_defined?(ivar)
+              block = tag.instance_variable_get(ivar)
+              return true if uses_forloop_var?(block)
+            end
+          end
+
+          # Check If/Unless/Case conditions
+          if tag.respond_to?(:blocks)
+            tag.blocks.each do |block|
+              # Check condition expressions
+              if block.respond_to?(:left) && variable_references_forloop?(block.left)
+                return true
+              end
+              if block.respond_to?(:right) && variable_references_forloop?(block.right)
+                return true
+              end
+              # Check block attachment (body)
+              if block.respond_to?(:attachment)
+                return true if uses_forloop_var?(block.attachment)
+              end
+            end
+          end
+
+          false
+        end
+
+        # Check if an expression references forloop variable
+        def self.variable_references_forloop?(expr)
+          case expr
+          when VariableLookup
+            expr.name == 'forloop'
+          when Variable
+            expr.name.is_a?(VariableLookup) && expr.name.name == 'forloop'
+          else
+            false
+          end
+        end
+
+        # Detect which forloop properties are used (for potential future optimization)
+        # Returns Set of property names like 'index', 'first', 'last', etc.
+        def self.detect_forloop_properties(body)
+          props = Set.new
+          collect_forloop_properties(body, props)
+          props
+        end
+
+        def self.collect_forloop_properties(body, props)
+          return if body.nil?
+          nodelist = body.nodelist
+          return if nodelist.nil?
+
+          nodelist.each do |node|
+            case node
+            when Variable
+              collect_forloop_from_variable(node, props)
+            when Tag
+              collect_forloop_from_tag(node, props)
+            end
+          end
+        end
+
+        def self.collect_forloop_from_variable(var, props)
+          lookup = var.name
+          if lookup.is_a?(VariableLookup) && lookup.name == 'forloop'
+            lookup.lookups.each do |prop|
+              props << prop if prop.is_a?(String)
+            end
+          end
+        end
+
+        def self.collect_forloop_from_tag(tag, props)
+          # Check block bodies
+          [:@for_block, :@else_block, :@body, :@consequent, :@alternative].each do |ivar|
+            if tag.instance_variable_defined?(ivar)
+              collect_forloop_properties(tag.instance_variable_get(ivar), props)
+            end
+          end
+
+          # Check conditions
+          if tag.respond_to?(:blocks)
+            tag.blocks.each do |block|
+              collect_forloop_from_condition(block, props) if block.respond_to?(:left)
+              collect_forloop_properties(block.attachment, props) if block.respond_to?(:attachment)
+            end
+          end
+        end
+
+        def self.collect_forloop_from_condition(condition, props)
+          [condition.left, condition.right].compact.each do |expr|
+            if expr.is_a?(VariableLookup) && expr.name == 'forloop'
+              expr.lookups.each do |prop|
+                props << prop if prop.is_a?(String)
+              end
+            end
+          end
+          # Check child conditions
+          collect_forloop_from_condition(condition.child_condition, props) if condition.respond_to?(:child_condition) && condition.child_condition
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/if_compiler.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% if %} / {% elsif %} / {% else %} / {% endif %} tags
+      class IfCompiler
+        def self.compile(tag, compiler, code)
+          blocks = tag.blocks
+
+          blocks.each_with_index do |block, index|
+            condition_expr = ConditionCompiler.compile(block, compiler)
+
+            if index == 0
+              code.line "if #{condition_expr}"
+            elsif block.else?
+              code.line "else"
+            else
+              code.line "elsif #{condition_expr}"
+            end
+
+            code.indent do
+              if block.attachment
+                BlockBodyCompiler.compile(block.attachment, compiler, code)
+              end
+            end
+          end
+
+          code.line "end"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/ifchanged_compiler.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% ifchanged %}...{% endifchanged %} tags
+      #
+      # Only outputs if the content has changed since last render
+      class IfchangedCompiler
+        def self.compile(tag, compiler, code)
+          capture_var = compiler.generate_var_name("ifchanged")
+
+          # Capture the block output
+          code.line "#{capture_var} = +''"
+          code.line "begin"
+          code.indent do
+            code.line "__saved_output__ = __output__"
+            code.line "__output__ = #{capture_var}"
+
+            # Compile the body
+            tag.nodelist.each do |body|
+              BlockBodyCompiler.compile(body, compiler, code)
+            end
+
+            code.line "__output__ = __saved_output__"
+          end
+          code.line "end"
+
+          # Only output if changed
+          code.line "if #{capture_var} != assigns[:__ifchanged__]"
+          code.indent do
+            code.line "assigns[:__ifchanged__] = #{capture_var}"
+            code.line "__output__ << #{capture_var}"
+          end
+          code.line "end"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/include_compiler.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% include 'partial' %} tags
+      #
+      # Include is deprecated in favor of render, but we support it for compatibility.
+      # Unlike render, include shares the outer scope with the partial.
+      #
+      # For static template names, the partial is loaded and inlined at compile time.
+      # For dynamic template names, a runtime fallback is generated.
+      class IncludeCompiler
+        def self.compile(tag, compiler, code)
+          template_name_expr = tag.template_name_expr
+          variable_name_expr = tag.variable_name_expr
+          attributes = tag.attributes
+          alias_name = tag.instance_variable_get(:@alias_name)
+
+          # Check if the template name is a static string
+          if template_name_expr.is_a?(String)
+            compile_static_include(tag, template_name_expr, compiler, code)
+          else
+            compile_dynamic_include(tag, compiler, code)
+          end
+        end
+
+        private
+
+        def self.compile_static_include(tag, template_name, compiler, code)
+          variable_name_expr = tag.variable_name_expr
+          attributes = tag.attributes
+          alias_name = tag.instance_variable_get(:@alias_name)
+
+          # Try to load the partial at compile time
+          partial_source = compiler.load_partial(template_name)
+
+          if partial_source
+            if compiler.debug?
+              code.line "# Inlined partial #{template_name.inspect} at compile time"
+              code.line "$stderr.puts '* WARN: Liquid file system access - inlined partial ' + #{template_name.inspect} + ' at compile time' if $VERBOSE"
+            end
+            # Generate a unique method name for this partial
+            method_name = compiler.register_partial(template_name, partial_source)
+            context_var_name = alias_name || template_name.split('/').last
+
+            # Include shares scope, so we just set variables directly
+            code.line "# Include: #{template_name}"
+
+            # Set attributes
+            attributes.each do |key, value|
+              value_expr = ExpressionCompiler.compile(value, compiler)
+              code.line "assigns[#{key.inspect}] = #{value_expr}"
+            end
+
+            # Set the context variable
+            if variable_name_expr
+              var_expr = ExpressionCompiler.compile(variable_name_expr, compiler)
+              var_var = compiler.generate_var_name("incvar")
+              code.line "#{var_var} = #{var_expr}"
+
+              # If it's an array, loop through it
+              code.line "if #{var_var}.is_a?(Array)"
+              code.indent do
+                code.line "#{var_var}.each do |__include_item__|"
+                code.indent do
+                  code.line "assigns[#{context_var_name.inspect}] = __include_item__"
+                  code.line "__output__ << #{method_name}({})"
+                end
+                code.line "end"
+              end
+              code.line "else"
+              code.indent do
+                code.line "assigns[#{context_var_name.inspect}] = #{var_var}"
+                code.line "__output__ << #{method_name}({})"
+              end
+              code.line "end"
+            else
+              # Try to find a variable with the same name as the template
+              code.line "assigns[#{context_var_name.inspect}] = assigns[#{template_name.inspect}] if assigns.key?(#{template_name.inspect})"
+              code.line "__output__ << #{method_name}({})"
+            end
+          else
+            # Partial not found at compile time
+            code.line "# Partial '#{template_name}' not found at compile time"
+            compile_dynamic_include(tag, compiler, code)
+          end
+        end
+
+        def self.compile_dynamic_include(tag, compiler, code)
+          template_name_expr = tag.template_name_expr
+          variable_name_expr = tag.variable_name_expr
+          attributes = tag.attributes
+          alias_name = tag.instance_variable_get(:@alias_name)
+
+          if compiler.debug?
+            code.line "# Dynamic include (template name from variable)"
+          end
+
+          name_expr = ExpressionCompiler.compile(template_name_expr, compiler)
+
+          # Build attributes hash
+          attrs_var = compiler.generate_var_name("attrs")
+          code.line "#{attrs_var} = {}"
+          attributes.each do |key, value|
+            value_expr = ExpressionCompiler.compile(value, compiler)
+            code.line "#{attrs_var}[#{key.inspect}] = #{value_expr}"
+          end
+
+          var_expr = variable_name_expr ? ExpressionCompiler.compile(variable_name_expr, compiler) : "nil"
+          alias_expr = alias_name ? alias_name.inspect : "nil"
+
+          # Call the external handler for dynamic includes
+          code.line "__output__ << __external__.call(:include, #{name_expr}, #{var_expr}, #{attrs_var}, #{alias_expr}, assigns, __context__)"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/increment_compiler.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% increment var %} tags
+      #
+      # Outputs the current counter value, then increments it.
+      # Uses a separate namespace from regular assigns (shares with decrement).
+      class IncrementCompiler
+        def self.compile(tag, compiler, code)
+          var_name = tag.variable_name
+
+          # Initialize counter storage if needed
+          code.line "assigns[:__counters__] ||= {}"
+
+          # Get current value (default 0), output it, then increment
+          inc_var = compiler.generate_var_name("inc")
+          code.line "#{inc_var} = assigns[:__counters__][#{var_name.inspect}] || 0"
+          code.line "__output__ << #{inc_var}.to_s"
+          code.line "assigns[:__counters__][#{var_name.inspect}] = #{inc_var} + 1"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/raw_compiler.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% raw %}...{% endraw %} tags
+      #
+      # Outputs the content as-is without parsing Liquid syntax
+      class RawCompiler
+        def self.compile(tag, compiler, code)
+          body = tag.instance_variable_get(:@body)
+          return if body.nil? || body.empty?
+
+          code.line "__output__ << #{body.inspect}"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/render_compiler.rb

@@ -0,0 +1,176 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% render 'partial' %} tags
+      #
+      # For static template names (string literals), the partial is loaded at
+      # compile time and inlined as a method.
+      #
+      # For dynamic template names (variables), a runtime fallback is generated
+      # that calls __render_dynamic__ which must be provided by the runtime.
+      class RenderCompiler
+        def self.compile(tag, compiler, code)
+          template_name_expr = tag.template_name_expr
+          variable_name_expr = tag.variable_name_expr
+          attributes = tag.attributes
+          alias_name = tag.alias_name
+          is_for_loop = tag.for_loop?
+
+          # Check if the template name is a static string
+          if template_name_expr.is_a?(String)
+            compile_static_render(tag, template_name_expr, compiler, code)
+          else
+            compile_dynamic_render(tag, compiler, code)
+          end
+        end
+
+        private
+
+        def self.compile_static_render(tag, template_name, compiler, code)
+          variable_name_expr = tag.variable_name_expr
+          attributes = tag.attributes
+          alias_name = tag.alias_name
+          is_for_loop = tag.for_loop?
+
+          # Try to load the partial at compile time
+          partial_source = compiler.load_partial(template_name)
+
+          if partial_source
+            if compiler.debug?
+              code.line "# Inlined partial #{template_name.inspect} at compile time"
+              code.line "$stderr.puts '* WARN: Liquid file system access - inlined partial ' + #{template_name.inspect} + ' at compile time' if $VERBOSE"
+            end
+            # Generate a unique method name for this partial
+            method_name = compiler.register_partial(template_name, partial_source)
+            context_var_name = alias_name || template_name.split('/').last
+
+            if is_for_loop && variable_name_expr
+              # Render for each item in collection
+              compile_for_loop_render(tag, method_name, context_var_name, compiler, code)
+            else
+              # Single render
+              compile_single_render(tag, method_name, context_var_name, compiler, code)
+            end
+          else
+            # Partial not found at compile time - generate runtime fallback
+            code.line "# Partial '#{template_name}' not found at compile time"
+            compile_dynamic_render(tag, compiler, code)
+          end
+        end
+
+        def self.compile_single_render(tag, method_name, context_var_name, compiler, code)
+          variable_name_expr = tag.variable_name_expr
+          attributes = tag.attributes
+
+          # Build the inner assigns hash
+          inner_assigns_var = compiler.generate_var_name("inner")
+          code.line "#{inner_assigns_var} = {}"
+
+          # Copy attributes
+          attributes.each do |key, value|
+            value_expr = ExpressionCompiler.compile(value, compiler)
+            code.line "#{inner_assigns_var}[#{key.inspect}] = #{value_expr}"
+          end
+
+          # Set the context variable if provided
+          if variable_name_expr
+            var_expr = ExpressionCompiler.compile(variable_name_expr, compiler)
+            code.line "#{inner_assigns_var}[#{context_var_name.inspect}] = #{var_expr}"
+          end
+
+          # Call the partial method
+          code.line "__output__ << #{method_name}(#{inner_assigns_var})"
+        end
+
+        def self.compile_for_loop_render(tag, method_name, context_var_name, compiler, code)
+          variable_name_expr = tag.variable_name_expr
+          attributes = tag.attributes
+          template_name = tag.template_name_expr
+
+          coll_var = compiler.generate_var_name("coll")
+          coll_expr = ExpressionCompiler.compile(variable_name_expr, compiler)
+          code.line "#{coll_var} = #{coll_expr}"
+
+          code.line "if #{coll_var}.respond_to?(:each) && #{coll_var}.respond_to?(:count)"
+          code.indent do
+            len_var = compiler.generate_var_name("len")
+            idx_var = compiler.generate_var_name("idx")
+            code.line "#{len_var} = #{coll_var}.count"
+            code.line "#{idx_var} = 0"
+
+            code.line "#{coll_var}.each do |__item__|"
+            code.indent do
+              inner_assigns_var = compiler.generate_var_name("inner")
+              code.line "#{inner_assigns_var} = {}"
+
+              # Copy attributes
+              attributes.each do |key, value|
+                value_expr = ExpressionCompiler.compile(value, compiler)
+                code.line "#{inner_assigns_var}[#{key.inspect}] = #{value_expr}"
+              end
+
+              # Set the context variable
+              code.line "#{inner_assigns_var}[#{context_var_name.inspect}] = __item__"
+
+              # Set forloop
+              code.line "#{inner_assigns_var}['forloop'] = {"
+              code.indent do
+                code.line "'name' => #{template_name.inspect},"
+                code.line "'length' => #{len_var},"
+                code.line "'index' => #{idx_var} + 1,"
+                code.line "'index0' => #{idx_var},"
+                code.line "'rindex' => #{len_var} - #{idx_var},"
+                code.line "'rindex0' => #{len_var} - #{idx_var} - 1,"
+                code.line "'first' => #{idx_var} == 0,"
+                code.line "'last' => #{idx_var} == #{len_var} - 1,"
+              end
+              code.line "}"
+
+              # Call the partial method
+              code.line "__output__ << #{method_name}(#{inner_assigns_var})"
+
+              code.line "#{idx_var} += 1"
+            end
+            code.line "end"
+          end
+          code.line "else"
+          code.indent do
+            # Single render if not a collection
+            compile_single_render(tag, method_name, context_var_name, compiler, code)
+          end
+          code.line "end"
+        end
+
+        def self.compile_dynamic_render(tag, compiler, code)
+          template_name_expr = tag.template_name_expr
+          variable_name_expr = tag.variable_name_expr
+          attributes = tag.attributes
+          alias_name = tag.alias_name
+          is_for_loop = tag.for_loop?
+
+          if compiler.debug?
+            code.line "# Dynamic render (template name from variable)"
+          end
+
+          name_expr = ExpressionCompiler.compile(template_name_expr, compiler)
+
+          # Build attributes hash
+          attrs_var = compiler.generate_var_name("attrs")
+          code.line "#{attrs_var} = {}"
+          attributes.each do |key, value|
+            value_expr = ExpressionCompiler.compile(value, compiler)
+            code.line "#{attrs_var}[#{key.inspect}] = #{value_expr}"
+          end
+
+          var_expr = variable_name_expr ? ExpressionCompiler.compile(variable_name_expr, compiler) : "nil"
+          alias_expr = alias_name ? alias_name.inspect : "nil"
+
+          # Call the external handler for dynamic renders
+          code.line "__output__ << __external__.call(:render, #{name_expr}, #{var_expr}, #{attrs_var}, #{alias_expr}, #{is_for_loop}, __context__)"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/tablerow_compiler.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% tablerow %} tags
+      #
+      # Creates HTML table rows from a collection
+      class TableRowCompiler
+        def self.compile(tag, compiler, code)
+          var_name = tag.variable_name
+          collection_expr = ExpressionCompiler.compile(tag.collection_name, compiler)
+          attributes = tag.attributes
+
+          # Generate unique variable names
+          coll_var = compiler.generate_var_name("coll")
+          idx_var = compiler.generate_var_name("idx")
+          len_var = compiler.generate_var_name("len")
+          cols_var = compiler.generate_var_name("cols")
+          row_var = compiler.generate_var_name("row")
+          col_var = compiler.generate_var_name("col")
+
+          # Get parameters from attributes hash
+          cols = attributes['cols']
+          cols_expr = cols ? ExpressionCompiler.compile(cols, compiler) : "nil"
+
+          # Evaluate the collection
+          code.line "#{coll_var} = #{collection_expr}"
+          code.line "#{coll_var} = #{coll_var}.to_a if #{coll_var}.is_a?(Range)"
+
+          # Handle limit and offset from attributes
+          offset = attributes['offset']
+          limit = attributes['limit']
+          if offset || limit
+            if offset
+              offset_expr = ExpressionCompiler.compile(offset, compiler)
+              if limit
+                limit_expr = ExpressionCompiler.compile(limit, compiler)
+                code.line "#{coll_var} = #{coll_var}.slice(LR.to_integer(#{offset_expr}), LR.to_integer(#{limit_expr})) || []"
+              else
+                code.line "#{coll_var} = #{coll_var}.drop(LR.to_integer(#{offset_expr}))"
+              end
+            elsif limit
+              limit_expr = ExpressionCompiler.compile(limit, compiler)
+              code.line "#{coll_var} = #{coll_var}.first(LR.to_integer(#{limit_expr}))"
+            end
+          end
+
+          # Setup loop variables
+          code.line "#{len_var} = #{coll_var}.respond_to?(:length) ? #{coll_var}.length : 0"
+          code.line "#{cols_var} = #{cols_expr} || #{len_var}"
+          code.line "#{idx_var} = 0"
+          code.line "#{row_var} = 1"
+          code.line "#{col_var} = 0"
+
+          body = tag.instance_variable_get(:@body)
+
+          # Output initial row (matches interpreter behavior: outputs before loop)
+          code.line "__output__ << \"<tr class=\\\"row1\\\">\\n\""
+
+          # The loop
+          code.line "(#{coll_var}.respond_to?(:each) ? #{coll_var} : []).each do |__item__|"
+          code.indent do
+            code.line "#{col_var} += 1"
+
+            # Output cell start
+            code.line "__output__ << \"<td class=\\\"col\#{#{col_var}}\\\">\""
+
+            # Set loop variables
+            code.line "assigns[#{var_name.inspect}] = __item__"
+            code.line "assigns['tablerowloop'] = {"
+            code.indent do
+              code.line "'length' => #{len_var},"
+              code.line "'index' => #{idx_var} + 1,"
+              code.line "'index0' => #{idx_var},"
+              code.line "'rindex' => #{len_var} - #{idx_var},"
+              code.line "'rindex0' => #{len_var} - #{idx_var} - 1,"
+              code.line "'first' => #{idx_var} == 0,"
+              code.line "'last' => #{idx_var} == #{len_var} - 1,"
+              code.line "'col' => #{col_var},"
+              code.line "'col0' => #{col_var} - 1,"
+              code.line "'row' => #{row_var},"
+              code.line "'col_first' => #{col_var} == 1,"
+              code.line "'col_last' => #{col_var} == #{cols_var},"
+            end
+            code.line "}"
+
+            # Compile the body
+            BlockBodyCompiler.compile(body, compiler, code)
+
+            # Output cell end
+            code.line "__output__ << '</td>'"
+
+            # End row and start new row if needed (but not on last item)
+            code.line "if #{col_var} == #{cols_var} && #{idx_var} != #{len_var} - 1"
+            code.indent do
+              code.line "__output__ << \"</tr>\\n<tr class=\\\"row\#{#{row_var} + 1}\\\">\""
+              code.line "#{col_var} = 0"
+              code.line "#{row_var} += 1"
+            end
+            code.line "end"
+
+            code.line "#{idx_var} += 1"
+          end
+          code.line "end"
+
+          # Close the final row
+          code.line "__output__ << \"</tr>\\n\""
+
+          # Clean up
+          code.line "assigns.delete(#{var_name.inspect})"
+          code.line "assigns.delete('tablerowloop')"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/tags/unless_compiler.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    module Tags
+      # Compiles {% unless %} / {% elsif %} / {% else %} / {% endunless %} tags
+      #
+      # Unless is like if, but the first condition is negated
+      class UnlessCompiler
+        def self.compile(tag, compiler, code)
+          blocks = tag.blocks
+
+          blocks.each_with_index do |block, index|
+            condition_expr = ConditionCompiler.compile(block, compiler)
+
+            if index == 0
+              # First block is negated (unless = if not)
+              code.line "unless #{condition_expr}"
+            elsif block.else?
+              code.line "else"
+            else
+              # Subsequent blocks (elsif) are normal
+              code.line "elsif #{condition_expr}"
+            end
+
+            code.indent do
+              if block.attachment
+                BlockBodyCompiler.compile(block.attachment, compiler, code)
+              end
+            end
+          end
+
+          code.line "end"
+        end
+      end
+    end
+  end
+end

lib/liquid/compile/variable_compiler.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Liquid
+  module Compile
+    # VariableCompiler compiles Liquid variable expressions ({{ ... }}) to Ruby code.
+    #
+    # A Variable consists of:
+    # - A name expression (the value to output)
+    # - Zero or more filters to apply
+    class VariableCompiler
+      # Compile a Variable node and append the result to the output buffer
+      # @param variable [Liquid::Variable] The variable node
+      # @param compiler [RubyCompiler] The main compiler instance
+      # @param code [CodeGenerator] The code generator
+      def self.compile(variable, compiler, code)
+        value_expr = compile_to_expression(variable, compiler)
+        code.line "__output__ << LR.output(#{value_expr})"
+      end
+
+      # Compile a Variable node to a Ruby expression (without output)
+      # @param variable [Liquid::Variable] The variable node
+      # @param compiler [RubyCompiler] The main compiler instance
+      # @return [String] Ruby code expression
+      def self.compile_to_expression(variable, compiler)
+        # Compile the base name expression
+        base_expr = ExpressionCompiler.compile(variable.name, compiler)
+
+        # Apply filters if any
+        if variable.filters && !variable.filters.empty?
+          FilterCompiler.compile(base_expr, variable.filters, compiler)
+        else
+          base_expr
+        end
+      end
+    end
+  end
+end

lib/liquid/condition.rb

@@ -48,8 +48,8 @@ module Liquid
       @@operators
     end
 
-    def self.parse_expression(parse_context, markup, safe: false)
-      @@method_literals[markup] || parse_context.parse_expression(markup, safe: safe)
+    def self.parse_expression(parse_context, markup)
+      @@method_literals[markup] || parse_context.parse_expression(markup)
     end
 
     attr_reader :attachment, :child_condition
@@ -113,67 +113,24 @@ module Liquid
 
     def equal_variables(left, right)
       if left.is_a?(MethodLiteral)
-        return call_method_literal(left, right)
+        if right.respond_to?(left.method_name)
+          return right.send(left.method_name)
+        else
+          return nil
+        end
       end
 
       if right.is_a?(MethodLiteral)
-        return call_method_literal(right, left)
+        if left.respond_to?(right.method_name)
+          return left.send(right.method_name)
+        else
+          return nil
+        end
       end
 
       left == right
     end
 
-    def call_method_literal(literal, value)
-      method_name = literal.method_name
-
-      # If the object responds to the method (e.g., ActiveSupport is loaded), use it
-      if value.respond_to?(method_name)
-        value.send(method_name)
-      else
-        # Emulate ActiveSupport's blank?/empty? to make Liquid invariant
-        # to whether ActiveSupport is loaded or not
-        case method_name
-        when :blank?
-          liquid_blank?(value)
-        when :empty?
-          liquid_empty?(value)
-        else
-          false
-        end
-      end
-    end
-
-    # Implement blank? semantics matching ActiveSupport
-    # blank? returns true for nil, false, empty strings, whitespace-only strings,
-    # empty arrays, and empty hashes
-    def liquid_blank?(value)
-      case value
-      when NilClass, FalseClass
-        true
-      when TrueClass, Numeric
-        false
-      when String
-        # Blank if empty or whitespace only (matches ActiveSupport)
-        value.empty? || value.match?(/\A\s*\z/)
-      when Array, Hash
-        value.empty?
-      else
-        # Fall back to empty? if available, otherwise false
-        value.respond_to?(:empty?) ? value.empty? : false
-      end
-    end
-
-    # Implement empty? semantics
-    # Note: nil is NOT empty. empty? checks if a collection has zero elements.
-    def liquid_empty?(value)
-      case value
-      when String, Array, Hash
-        value.empty?
-      else
-        value.respond_to?(:empty?) ? value.empty? : false
-      end
-    end
-
     def interpret_condition(left, right, op, context)
       # If the operator is empty this means that the decision statement is just
       # a single variable. We can just poll this variable from the context and
@@ -197,8 +154,8 @@ module Liquid
     end
 
     def deprecated_default_context
-      warn("DEPRECATION WARNING: Condition#evaluate without a context argument is deprecated " \
-        "and will be removed from Liquid 6.0.0.")
+      warn("DEPRECATION WARNING: Condition#evaluate without a context argument is deprecated" \
+        " and will be removed from Liquid 6.0.0.")
       Context.new
     end
 

lib/liquid/context.rb

@@ -184,16 +184,7 @@ module Liquid
     end
 
     def key?(key)
-      find_variable(key, raise_on_not_found: false) != nil
-    end
-
-    # Checks whether a variable is defined in any scope, including nil-valued keys.
-    # Unlike #key?, this uses Hash#key? so that variables explicitly set to nil
-    # are still considered defined.
-    def variable_defined?(key)
-      @scopes.any? { |s| s.key?(key) } ||
-        @environments.any? { |e| e.key?(key) } ||
-        @static_environments.any? { |e| e.key?(key) }
+      self[key] != nil
     end
 
     def evaluate(object)
@@ -206,21 +197,12 @@ module Liquid
       # path and find_index() is optimized in MRI to reduce object allocation
       index = @scopes.find_index { |s| s.key?(key) }
 
-      fallback_to_self_drop = key == Expression::SELF && index.nil?
-
       variable = if index
         lookup_and_evaluate(@scopes[index], key, raise_on_not_found: raise_on_not_found)
       else
-        try_variable_find_in_environments(
-          key,
-          raise_on_not_found: raise_on_not_found && !fallback_to_self_drop,
-        )
+        try_variable_find_in_environments(key, raise_on_not_found: raise_on_not_found)
       end
 
-      # `self` resolves to a SelfDrop (enabling `self['var']` lookups),
-      # but only after the normal environment lookup doesn't find a value.
-      return @self_drop ||= SelfDrop.new(self) if fallback_to_self_drop && variable.nil?
-
       # update variable's context before invoking #to_liquid
       variable.context = self if variable.respond_to?(:context=)
 

lib/liquid/drop.rb

@@ -31,7 +31,7 @@ module Liquid
 
     # Catch all for the method
     def liquid_method_missing(method)
-      return unless @context&.strict_variables
+      return nil unless @context&.strict_variables
       raise Liquid::UndefinedDropMethod, "undefined method #{method}"
     end
 

lib/liquid/environment.rb

@@ -34,7 +34,7 @@ module Liquid
       # @param file_system The default file system that is used
       #  to load templates from.
       # @param error_mode [Symbol] The default error mode for all templates
-      #  (either :strict2, :strict, :warn, or :lax).
+      #  (either :strict, :warn, or :lax).
       # @param exception_renderer [Proc] The exception renderer that is used to
       #   render exceptions.
       # @yieldparam environment [Environment] The environment instance that is being built.

lib/liquid/expression.rb

@@ -2,8 +2,6 @@
 
 module Liquid
   class Expression
-    SELF = 'self'
-
     LITERALS = {
       nil => nil,
       'nil' => nil,
@@ -30,10 +28,6 @@ module Liquid
     FLOAT_REGEX = /\A(-?\d+)\.\d+\z/
 
     class << self
-      def safe_parse(parser, ss = StringScanner.new(""), cache = nil)
-        parse(parser.expression, ss, cache)
-      end
-
       def parse(markup, ss = StringScanner.new(""), cache = nil)
         return unless markup
 
@@ -57,7 +51,7 @@ module Liquid
       end
 
       def inner_parse(markup, ss, cache)
-        if markup.start_with?("(") && markup.end_with?(")") && markup =~ RANGES_REGEX
+        if (markup.start_with?("(") && markup.end_with?(")")) && markup =~ RANGES_REGEX
           return RangeLookup.parse(
             Regexp.last_match(1),
             Regexp.last_match(2),

lib/liquid/i18n.rb

@@ -28,7 +28,7 @@ module Liquid
     def interpolate(name, vars)
       name.gsub(/%\{(\w+)\}/) do
         # raise TranslationError, "Undefined key #{$1} for interpolation in translation #{name}"  unless vars[$1.to_sym]
-        vars[Regexp.last_match(1).to_sym].to_s
+        (vars[Regexp.last_match(1).to_sym]).to_s
       end
     end
 

lib/liquid/locales/en.yml

@@ -20,7 +20,6 @@
       invalid_template_encoding: "Invalid template encoding"
       render: "Syntax error in tag 'render' - Template name must be a quoted string"
       table_row: "Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3"
-      table_row_invalid_attribute: "Invalid attribute '%{attribute}' in tablerow loop. Valid attributes are cols, limit, offset, and range"
       tag_never_closed: "'%{block_name}' tag was never closed"
       tag_termination: "Tag '%{token}' was not properly terminated with regexp: %{tag_end}"
       unexpected_else: "%{block_name} tag does not expect 'else' tag"

lib/liquid/parse_context.rb

@@ -38,7 +38,7 @@ module Liquid
 
     def new_parser(input)
       @string_scanner.string = input
-      Parser.new(@string_scanner, reject_bare_brackets: @error_mode == :strict2 || @error_mode == :rigid)
+      Parser.new(@string_scanner)
     end
 
     def new_tokenizer(source, start_line_number: nil, for_liquid_tag: false)
@@ -50,22 +50,7 @@ module Liquid
       )
     end
 
-    def safe_parse_expression(parser)
-      Expression.safe_parse(parser, @string_scanner, @expression_cache)
-    end
-
-    def parse_expression(markup, safe: false)
-      if !safe && @error_mode == :strict2
-        # parse_expression is a widely used API. To maintain backward
-        # compatibility while raising awareness about strict2 parser standards,
-        # the safe flag supports API users make a deliberate decision.
-        #
-        # In strict2 mode, markup MUST come from a string returned by the parser
-        # (e.g., parser.expression). We're not calling the parser here to
-        # prevent redundant parser overhead.
-        raise Liquid::InternalError, "unsafe parse_expression cannot be used in strict2 mode"
-      end
-
+    def parse_expression(markup)
       Expression.parse(markup, @string_scanner, @expression_cache)
     end
 

lib/liquid/parser.rb

@@ -2,11 +2,10 @@
 
 module Liquid
   class Parser
-    def initialize(input, reject_bare_brackets: false)
+    def initialize(input)
       ss = input.is_a?(StringScanner) ? input : StringScanner.new(input)
       @tokens = Lexer.tokenize(ss)
       @p      = 0 # pointer to current location
-      @reject_bare_brackets = reject_bare_brackets
     end
 
     def jump(point)
@@ -54,9 +53,6 @@ module Liquid
         str = consume
         str << variable_lookups
       when :open_square
-        if @reject_bare_brackets
-          raise SyntaxError, "Bare bracket access is not allowed. Use #{Expression::SELF}['...'] instead"
-        end
         str = consume.dup
         str << expression
         str << consume(:close_square)

lib/liquid/parser_switching.rb

@@ -2,25 +2,10 @@
 
 module Liquid
   module ParserSwitching
-    # Do not use this.
-    #
-    # It's basically doing the same thing the {#parse_with_selected_parser},
-    # except this will try the strict parser regardless of the error mode,
-    # and fall back to the lax parser if the error mode is lax or warn,
-    # except when in strict2 mode where it uses the strict2 parser.
-    #
-    # @deprecated Use {#parse_with_selected_parser} instead.
     def strict_parse_with_error_mode_fallback(markup)
-      return strict2_parse_with_error_context(markup) if strict2_mode?
-
       strict_parse_with_error_context(markup)
     rescue SyntaxError => e
       case parse_context.error_mode
-      when :rigid
-        rigid_warn
-        raise
-      when :strict2
-        raise
       when :strict
         raise
       when :warn
@@ -31,13 +16,11 @@ module Liquid
 
     def parse_with_selected_parser(markup)
       case parse_context.error_mode
-      when :rigid   then rigid_warn && strict2_parse_with_error_context(markup)
-      when :strict2 then strict2_parse_with_error_context(markup)
-      when :strict  then strict_parse_with_error_context(markup)
-      when :lax     then lax_parse(markup)
+      when :strict then strict_parse_with_error_context(markup)
+      when :lax    then lax_parse(markup)
       when :warn
         begin
-          strict2_parse_with_error_context(markup)
+          strict_parse_with_error_context(markup)
         rescue SyntaxError => e
           parse_context.warnings << e
           lax_parse(markup)
@@ -45,24 +28,8 @@ module Liquid
       end
     end
 
-    def strict2_mode?
-      parse_context.error_mode == :strict2 || parse_context.error_mode == :rigid
-    end
-
     private
 
-    def rigid_warn
-      Deprecations.warn(':rigid', ':strict2')
-    end
-
-    def strict2_parse_with_error_context(markup)
-      strict2_parse(markup)
-    rescue SyntaxError => e
-      e.line_number    = line_number
-      e.markup_context = markup_context(markup)
-      raise e
-    end
-
     def strict_parse_with_error_context(markup)
       strict_parse(markup)
     rescue SyntaxError => e

lib/liquid/range_slice.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Liquid
-  class RangeSlice
-    attr_reader :length
-
-    def initialize(range, from, to, resource_limits)
-      range_length = range.end - range.begin
-      range_length += 1 unless range.exclude_end?
-      range_length = 0 if range_length.negative?
-
-      start = [from, 0].max
-      finish = [to || range_length, range_length].min
-
-      @first = range.begin + start
-      @length = [finish - start, 0].max
-      @direction = 1
-      @resource_limits = resource_limits
-    end
-
-    def empty?
-      @length.zero?
-    end
-
-    def each
-      return enum_for(:each) unless block_given?
-
-      value = @first
-      @length.times do
-        @resource_limits.increment_render_score(1)
-        yield value
-        value += @direction
-      end
-    end
-
-    def reverse!
-      unless empty?
-        @first += @direction * (@length - 1)
-        @direction = -@direction
-      end
-      self
-    end
-  end
-end

lib/liquid/resource_limits.rb

@@ -2,39 +2,24 @@
 
 module Liquid
   class ResourceLimits
-    attr_accessor :render_length_limit,
-      :render_score_limit,
-      :assign_score_limit,
-      :cumulative_render_score_limit,
-      :cumulative_assign_score_limit
-    attr_reader :render_score,
-      :assign_score,
-      :cumulative_render_score,
-      :cumulative_assign_score
+    attr_accessor :render_length_limit, :render_score_limit, :assign_score_limit
+    attr_reader :render_score, :assign_score
 
     def initialize(limits)
-      @render_length_limit           = limits[:render_length_limit]
-      @render_score_limit            = limits[:render_score_limit]
-      @assign_score_limit            = limits[:assign_score_limit]
-      @cumulative_render_score_limit = limits[:cumulative_render_score_limit]
-      @cumulative_assign_score_limit = limits[:cumulative_assign_score_limit]
-      @cumulative_render_score = 0
-      @cumulative_assign_score = 0
+      @render_length_limit = limits[:render_length_limit]
+      @render_score_limit  = limits[:render_score_limit]
+      @assign_score_limit  = limits[:assign_score_limit]
       reset
     end
 
     def increment_render_score(amount)
       @render_score += amount
-      @cumulative_render_score += amount
       raise_limits_reached if @render_score_limit && @render_score > @render_score_limit
-      raise_limits_reached if @cumulative_render_score_limit && @cumulative_render_score > @cumulative_render_score_limit
     end
 
     def increment_assign_score(amount)
       @assign_score += amount
-      @cumulative_assign_score += amount
       raise_limits_reached if @assign_score_limit && @assign_score > @assign_score_limit
-      raise_limits_reached if @cumulative_assign_score_limit && @cumulative_assign_score > @cumulative_assign_score_limit
     end
 
     # update either render_length or assign_score based on whether or not the writes are captured
@@ -62,8 +47,6 @@ module Liquid
       @reached_limit = false
       @last_capture_length = nil
       @render_score = @assign_score = 0
-      raise_limits_reached if @cumulative_render_score_limit && @cumulative_render_score > @cumulative_render_score_limit
-      raise_limits_reached if @cumulative_assign_score_limit && @cumulative_assign_score > @cumulative_assign_score_limit
     end
 
     def with_capture

lib/liquid/self_drop.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Liquid
-  # @liquid_public_docs
-  # @liquid_type object
-  # @liquid_name self
-  # @liquid_summary
-  #   Provides access to variables through the current scope chain.
-  # @liquid_description
-  #   The `self` object resolves variables through the normal lookup hierarchy
-  #   (local > file > global) without exposing filters, interrupts, errors,
-  #   or other context internals. It's used when bare bracket notation
-  #   (`['variable']`) needs to be replaced with an explicit variable lookup.
-  #
-  #   If `self` is explicitly assigned as a local variable (e.g. `{% assign self = 'value' %}`),
-  #   then the local value takes precedence over the `self` object.
-  # @liquid_access global
-  class SelfDrop < Drop
-    def initialize(self_context)
-      super()
-      @self_context = self_context
-    end
-
-    def [](key)
-      @self_context.find_variable(key)
-    rescue UndefinedVariable
-      nil
-    end
-
-    def key?(key)
-      @self_context.variable_defined?(key)
-    end
-
-    def to_liquid
-      self
-    end
-
-    def ==(other)
-      other.is_a?(SelfDrop) && other.self_context.equal?(@self_context)
-    end
-
-    alias_method :eql?, :==
-
-    def hash
-      @self_context.object_id.hash
-    end
-
-    protected
-
-    attr_reader :self_context
-
-    undef context=
-  end
-end

lib/liquid/standardfilters.rb

@@ -8,19 +8,10 @@ module Liquid
     MAX_I32 = (1 << 31) - 1
     private_constant :MAX_I32
 
-    supports_64bit_indices = begin
-      [][1 << 33, 1 << 33]
-      true
-    rescue RangeError
-      false
-    end
-
-    INDEX_RANGE = if supports_64bit_indices
-      (-(1 << 63))..((1 << 63) - 1)
-    else
-      (-(1 << 31))..((1 << 31) - 1)
-    end
-    private_constant :INDEX_RANGE
+    MIN_I64 = -(1 << 63)
+    MAX_I64 = (1 << 63) - 1
+    I64_RANGE = MIN_I64..MAX_I64
+    private_constant :MIN_I64, :MAX_I64, :I64_RANGE
 
     HTML_ESCAPE = {
       '&' => '&amp;',
@@ -223,11 +214,11 @@ module Liquid
           Utils.to_s(input).slice(offset, length) || ''
         end
       rescue RangeError
-        if INDEX_RANGE.cover?(length) && INDEX_RANGE.cover?(offset)
+        if I64_RANGE.cover?(length) && I64_RANGE.cover?(offset)
           raise # unexpected error
         end
-        offset = offset.clamp(INDEX_RANGE)
-        length = length.clamp(INDEX_RANGE)
+        offset = offset.clamp(I64_RANGE)
+        length = length.clamp(I64_RANGE)
         retry
       end
     end
@@ -302,19 +293,6 @@ module Liquid
       input.split(pattern)
     end
 
-    # @liquid_public_docs
-    # @liquid_type filter
-    # @liquid_category string
-    # @liquid_summary
-    #   Removes leading and trailing whitespace and collapses consecutive whitespace to a single space.
-    # @liquid_syntax string | squish
-    # @liquid_return [string]
-    def squish(input)
-      return if input.nil?
-
-      Utils.to_s(input).strip.gsub(/\s+/, ' ')
-    end
-
     # @liquid_public_docs
     # @liquid_type filter
     # @liquid_category string
@@ -790,8 +768,6 @@ module Liquid
     # @liquid_syntax array | first
     # @liquid_return [untyped]
     def first(array)
-      # ActiveSupport returns "" for empty strings, not nil
-      return array[0] || "" if array.is_a?(String)
       array.first if array.respond_to?(:first)
     end
 
@@ -803,8 +779,6 @@ module Liquid
     # @liquid_syntax array | last
     # @liquid_return [untyped]
     def last(array)
-      # ActiveSupport returns "" for empty strings, not nil
-      return array[-1] || "" if array.is_a?(String)
       array.last if array.respond_to?(:last)
     end
 

lib/liquid/tag.rb

@@ -68,12 +68,8 @@ module Liquid
 
     private
 
-    def safe_parse_expression(parser)
-      parse_context.safe_parse_expression(parser)
-    end
-
-    def parse_expression(markup, safe: false)
-      parse_context.parse_expression(markup, safe: safe)
+    def parse_expression(markup)
+      parse_context.parse_expression(markup)
     end
   end
 end

lib/liquid/tags/assign.rb

@@ -9,17 +9,11 @@ module Liquid
   #   Creates a new variable.
   # @liquid_description
   #   You can create variables of any [basic type](/docs/api/liquid/basics#types), [object](/docs/api/liquid/objects), or object property.
-  #
-  #   > Caution:
-  #   > Predefined Liquid objects can be overridden by variables with the same name.
-  #   > To make sure that you can access all Liquid objects, make sure that your variable name doesn't match a predefined object's name.
   # @liquid_syntax
   #   {% assign variable_name = value %}
   # @liquid_syntax_keyword variable_name The name of the variable being created.
   # @liquid_syntax_keyword value The value you want to assign to the variable.
   class Assign < Tag
-    include ParserSwitching
-
     Syntax = /(#{VariableSignature}+)\s*=\s*(.*)\s*/om
 
     # @api private
@@ -31,10 +25,6 @@ module Liquid
 
     def initialize(tag_name, markup, parse_context)
       super
-      parse_with_selected_parser(markup)
-    end
-
-    def lax_parse(markup)
       if markup =~ Syntax
         @to   = Regexp.last_match(1)
         @from = Variable.new(Regexp.last_match(2), parse_context)
@@ -43,25 +33,6 @@ module Liquid
       end
     end
 
-    def strict_parse(markup)
-      lax_parse(markup)
-    end
-
-    def strict2_parse(markup)
-      unless markup =~ Syntax
-        self.class.raise_syntax_error(parse_context)
-      end
-
-      lhs = Regexp.last_match(1).strip
-      rhs = Regexp.last_match(2)
-
-      p = @parse_context.new_parser(lhs)
-      @to = p.consume(:id)
-      p.consume(:end_of_string)
-
-      @from = Variable.new(rhs, parse_context)
-    end
-
     def render_to_output_buffer(context, output)
       val = @from.render(context)
       context.scopes.last[@to] = val

lib/liquid/tags/capture.rb

@@ -9,10 +9,6 @@ module Liquid
   #   Creates a new variable with a string value.
   # @liquid_description
   #   You can create complex strings with Liquid logic and variables.
-  #
-  #   > Caution:
-  #   > Predefined Liquid objects can be overridden by variables with the same name.
-  #   > To make sure that you can access all Liquid objects, make sure that your variable name doesn't match a predefined object's name.
   # @liquid_syntax
   #   {% capture variable %}
   #     value
@@ -20,18 +16,10 @@ module Liquid
   # @liquid_syntax_keyword variable The name of the variable being created.
   # @liquid_syntax_keyword value The value you want to assign to the variable.
   class Capture < Block
-    include ParserSwitching
-
     Syntax = /(#{VariableSignature}+)/o
 
-    attr_reader :to
-
     def initialize(tag_name, markup, options)
       super
-      parse_with_selected_parser(markup)
-    end
-
-    def lax_parse(markup)
       if markup =~ Syntax
         @to = Regexp.last_match(1)
       else
@@ -39,16 +27,6 @@ module Liquid
       end
     end
 
-    def strict_parse(markup)
-      lax_parse(markup)
-    end
-
-    def strict2_parse(markup)
-      p = @parse_context.new_parser(markup.strip)
-      @to = p.consume(:id)
-      p.consume(:end_of_string)
-    end
-
     def render_to_output_buffer(context, output)
       context.resource_limits.with_capture do
         capture_output = render(context)

lib/liquid/tags/case.rb

@@ -31,7 +31,12 @@ module Liquid
     def initialize(tag_name, markup, options)
       super
       @blocks = []
-      parse_with_selected_parser(markup)
+
+      if markup =~ Syntax
+        @left = parse_expression(Regexp.last_match(1))
+      else
+        raise SyntaxError, options[:locale].t("errors.syntax.case")
+      end
     end
 
     def parse(tokens)
@@ -86,50 +91,9 @@ module Liquid
 
     private
 
-    def strict2_parse(markup)
-      parser = @parse_context.new_parser(markup)
-      @left = safe_parse_expression(parser)
-      parser.consume(:end_of_string)
-    end
-
-    def strict_parse(markup)
-      lax_parse(markup)
-    end
-
-    def lax_parse(markup)
-      if markup =~ Syntax
-        @left = parse_expression(Regexp.last_match(1))
-      else
-        raise SyntaxError, options[:locale].t("errors.syntax.case")
-      end
-    end
-
     def record_when_condition(markup)
       body = new_body
 
-      if strict2_mode?
-        parse_strict2_when(markup, body)
-      else
-        parse_lax_when(markup, body)
-      end
-    end
-
-    def parse_strict2_when(markup, body)
-      parser = @parse_context.new_parser(markup)
-
-      loop do
-        expr = Condition.parse_expression(parse_context, parser.expression, safe: true)
-        block = Condition.new(@left, '==', expr)
-        block.attach(body)
-        @blocks << block
-
-        break unless parser.id?('or') || parser.consume?(:comma)
-      end
-
-      parser.consume(:end_of_string)
-    end
-
-    def parse_lax_when(markup, body)
       while markup
         unless markup =~ WhenSyntax
           raise SyntaxError, options[:locale].t("errors.syntax.case_invalid_when")

lib/liquid/tags/cycle.rb

@@ -17,13 +17,23 @@ module Liquid
   class Cycle < Tag
     SimpleSyntax = /\A#{QuotedFragment}+/o
     NamedSyntax  = /\A(#{QuotedFragment})\s*\:\s*(.*)/om
-    UNNAMED_CYCLE_PATTERN = /\w+:0x\h{8}/
 
     attr_reader :variables
 
     def initialize(tag_name, markup, options)
       super
-      parse_with_selected_parser(markup)
+      case markup
+      when NamedSyntax
+        @variables = variables_from_string(Regexp.last_match(2))
+        @name      = parse_expression(Regexp.last_match(1))
+        @is_named = true
+      when SimpleSyntax
+        @variables = variables_from_string(markup)
+        @name      = @variables.to_s
+        @is_named = !@name.match?(/\w+:0x\h{8}/)
+      else
+        raise SyntaxError, options[:locale].t("errors.syntax.cycle")
+      end
     end
 
     def named?
@@ -55,82 +65,19 @@ module Liquid
 
     private
 
-    # cycle [name:] expression(, expression)*
-    def strict2_parse(markup)
-      p = @parse_context.new_parser(markup)
-
-      @variables = []
-
-      raise SyntaxError, options[:locale].t("errors.syntax.cycle") if p.look(:end_of_string)
-
-      first_expression = safe_parse_expression(p)
-      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(safe_parse_expression(p))
-      else
-        # cycle expr1, expr2, ...
-        @variables << maybe_dup_lookup(first_expression)
-      end
-
-      # Parse remaining comma-separated expressions
-      while p.consume?(:comma)
-        break if p.look(:end_of_string)
-
-        @variables << maybe_dup_lookup(safe_parse_expression(p))
-      end
-
-      p.consume(:end_of_string)
-
-      unless @is_named
-        @name = @variables.to_s
-        @is_named = !@name.match?(UNNAMED_CYCLE_PATTERN)
-      end
-    end
-
-    def strict_parse(markup)
-      lax_parse(markup)
-    end
-
-    def lax_parse(markup)
-      case markup
-      when NamedSyntax
-        @variables = variables_from_string(Regexp.last_match(2))
-        @name      = parse_expression(Regexp.last_match(1))
-        @is_named = true
-      when SimpleSyntax
-        @variables = variables_from_string(markup)
-        @name      = @variables.to_s
-        @is_named = !@name.match?(UNNAMED_CYCLE_PATTERN)
-      else
-        raise SyntaxError, options[:locale].t("errors.syntax.cycle")
-      end
-    end
-
     def variables_from_string(markup)
       markup.split(',').collect do |var|
         var =~ /\s*(#{QuotedFragment})\s*/o
         next unless Regexp.last_match(1)
 
+        # Expression Parser returns cached objects, and we need to dup them to
+        # start the cycle over for each new cycle call.
+        # Liquid-C does not have a cache, so we don't need to dup the object.
         var = parse_expression(Regexp.last_match(1))
-        maybe_dup_lookup(var)
+        var.is_a?(VariableLookup) ? var.dup : var
       end.compact
     end
 
-    # For backwards compatibility, whenever a lookup is used in an unnamed cycle,
-    # we make it so that the @variables.to_s produces different strings for cycles
-    # called with the same arguments (since @variables.to_s is used as the cycle counter key)
-    # This makes it so {% cycle a, b %} and {% cycle a, b %} have independent counters even if a and b share value.
-    # This is not true for literal values, {% cycle "a", "b" %} and {% cycle "a", "b" %} share the same counter.
-    # I was really scratching my head about this one, but migrating away from this would be more headache
-    # than it's worth. So we're keeping this quirk for now.
-    def maybe_dup_lookup(var)
-      var.is_a?(VariableLookup) ? var.dup : var
-    end
-
     class ParseTreeVisitor < Liquid::ParseTreeVisitor
       def children
         Array(@node.variables)

lib/liquid/tags/decrement.rb

@@ -7,10 +7,6 @@ module Liquid
   # @liquid_name decrement
   # @liquid_summary
   #   Creates a new variable, with a default value of -1, that's decreased by 1 with each subsequent call.
-  #
-  #   > Caution:
-  #   > Predefined Liquid objects can be overridden by variables with the same name.
-  #   > To make sure that you can access all Liquid objects, make sure that your variable name doesn't match a predefined object's name.
   # @liquid_description
   #   Variables that are declared with `decrement` are unique to the [layout](/themes/architecture/layouts), [template](/themes/architecture/templates),
   #   or [section](/themes/architecture/sections) file that they're created in. However, the variable is shared across
@@ -23,29 +19,13 @@ module Liquid
   #   {% decrement variable_name %}
   # @liquid_syntax_keyword variable_name The name of the variable being decremented.
   class Decrement < Tag
-    include ParserSwitching
-
     attr_reader :variable_name
 
     def initialize(tag_name, markup, options)
       super
-      parse_with_selected_parser(markup)
-    end
-
-    def lax_parse(markup)
       @variable_name = markup.strip
     end
 
-    def strict_parse(markup)
-      lax_parse(markup)
-    end
-
-    def strict2_parse(markup)
-      p = @parse_context.new_parser(markup.strip)
-      @variable_name = p.consume(:id)
-      p.consume(:end_of_string)
-    end
-
     def render_to_output_buffer(context, output)
       counter_environment = context.environments.first
       value = counter_environment[@variable_name] || 0

lib/liquid/tags/doc.rb

@@ -36,8 +36,6 @@ module Liquid
     end
 
     def parse(tokens)
-      @body = +""
-
       while (token = tokens.shift)
         tag_name = token =~ BlockBody::FullTokenPossiblyInvalid && Regexp.last_match(2)
 
@@ -45,10 +43,8 @@ module Liquid
 
         if tag_name == block_delimiter
           parse_context.trim_whitespace = (token[-3] == WhitespaceControl)
-          @body << Regexp.last_match(1) if Regexp.last_match(1) != ""
           return
         end
-        @body << token unless token.empty?
       end
 
       raise_tag_never_closed(block_name)
@@ -59,11 +55,11 @@ module Liquid
     end
 
     def blank?
-      @body.empty?
+      true
     end
 
     def nodelist
-      [@body]
+      []
     end
 
     private

lib/liquid/tags/for.rb

@@ -20,8 +20,8 @@ module Liquid
   # @liquid_syntax_keyword variable The current item in the array.
   # @liquid_syntax_keyword array The array to iterate over.
   # @liquid_syntax_keyword expression The expression to render for each iteration.
-  # @liquid_optional_param limit: [number] The number of iterations to perform.
-  # @liquid_optional_param offset: [number] The 1-based index to start iterating at.
+  # @liquid_optional_param limit [number] The number of iterations to perform.
+  # @liquid_optional_param offset [number] The 1-based index to start iterating at.
   # @liquid_optional_param range [untyped] A custom numeric range to iterate over.
   # @liquid_optional_param reversed [untyped] Iterate in reverse order.
   class For < Block
@@ -93,7 +93,7 @@ module Liquid
       raise SyntaxError, options[:locale].t("errors.syntax.for_invalid_in") unless p.id?('in')
 
       collection_name  = p.expression
-      @collection_name = parse_expression(collection_name, safe: true)
+      @collection_name = parse_expression(collection_name)
 
       @name     = "#{@variable_name}-#{collection_name}"
       @reversed = p.id?('reversed')
@@ -104,17 +104,13 @@ module Liquid
           raise SyntaxError, options[:locale].t("errors.syntax.for_invalid_attribute")
         end
         p.consume(:colon)
-        set_attribute(attribute, p.expression, safe: true)
+        set_attribute(attribute, p.expression)
       end
       p.consume(:end_of_string)
     end
 
     private
 
-    def strict2_parse(markup)
-      strict_parse(markup)
-    end
-
     def collection_segment(context)
       offsets = context.registers[:for] ||= {}
 
@@ -130,6 +126,7 @@ module Liquid
       end
 
       collection = context.evaluate(@collection_name)
+      collection = collection.to_a if collection.is_a?(Range)
 
       limit_value = context.evaluate(@limit)
       to = if limit_value.nil?
@@ -138,9 +135,7 @@ module Liquid
         Utils.to_integer(limit_value) + from
       end
 
-      segment = Utils.slice_collection_for_iteration(
-        collection, from, to, context.resource_limits, use_range_to_a: true
-      )
+      segment = Utils.slice_collection(collection, from, to)
       segment.reverse! if @reversed
 
       offsets[@name] = from + segment.length
@@ -179,16 +174,16 @@ module Liquid
       output
     end
 
-    def set_attribute(key, expr, safe: false)
+    def set_attribute(key, expr)
       case key
       when 'offset'
         @from = if expr == 'continue'
           :continue
         else
-          parse_expression(expr, safe: safe)
+          parse_expression(expr)
         end
       when 'limit'
-        @limit = parse_expression(expr, safe: safe)
+        @limit = parse_expression(expr)
       end
     end
 

lib/liquid/tags/if.rb

@@ -66,10 +66,6 @@ module Liquid
 
     private
 
-    def strict2_parse(markup)
-      strict_parse(markup)
-    end
-
     def push_block(tag, markup)
       block = if tag == 'else'
         ElseCondition.new
@@ -81,8 +77,8 @@ module Liquid
       block.attach(new_body)
     end
 
-    def parse_expression(markup, safe: false)
-      Condition.parse_expression(parse_context, markup, safe: safe)
+    def parse_expression(markup)
+      Condition.parse_expression(parse_context, markup)
     end
 
     def lax_parse(markup)
@@ -124,9 +120,9 @@ module Liquid
     end
 
     def parse_comparison(p)
-      a = parse_expression(p.expression, safe: true)
+      a = parse_expression(p.expression)
       if (op = p.consume?(:comparison))
-        b = parse_expression(p.expression, safe: true)
+        b = parse_expression(p.expression)
         Condition.new(a, op, b)
       else
         Condition.new(a)

lib/liquid/tags/include.rb

@@ -20,15 +20,31 @@ module Liquid
   class Include < Tag
     prepend Tag::Disableable
 
-    FOR = 'for'
-    SYNTAX = /(#{QuotedFragment}+)(\s+(with|#{FOR})\s+(#{QuotedFragment}+))?(\s+(?:as)\s+(#{VariableSegment}+))?/o
+    SYNTAX = /(#{QuotedFragment}+)(\s+(?:with|for)\s+(#{QuotedFragment}+))?(\s+(?:as)\s+(#{VariableSegment}+))?/o
     Syntax = SYNTAX
 
     attr_reader :template_name_expr, :variable_name_expr, :attributes
 
     def initialize(tag_name, markup, options)
       super
-      parse_with_selected_parser(markup)
+
+      if markup =~ SYNTAX
+
+        template_name = Regexp.last_match(1)
+        variable_name = Regexp.last_match(3)
+
+        @alias_name         = Regexp.last_match(5)
+        @variable_name_expr = variable_name ? parse_expression(variable_name) : nil
+        @template_name_expr = parse_expression(template_name)
+        @attributes         = {}
+
+        markup.scan(TagAttributes) do |key, value|
+          @attributes[key] = parse_expression(value)
+        end
+
+      else
+        raise SyntaxError, options[:locale].t("errors.syntax.include")
+      end
     end
 
     def parse(_tokens)
@@ -85,57 +101,6 @@ module Liquid
     alias_method :parse_context, :options
     private :parse_context
 
-    def for_loop?
-      @is_for_loop
-    end
-
-    def strict2_parse(markup)
-      p = @parse_context.new_parser(markup)
-
-      @template_name_expr = safe_parse_expression(p)
-      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)
-
-      p.consume?(:comma)
-
-      @attributes = {}
-      while p.look(:id)
-        key = p.consume
-        p.consume(:colon)
-        @attributes[key] = safe_parse_expression(p)
-        p.consume?(:comma)
-      end
-
-      p.consume(:end_of_string)
-    end
-
-    def strict_parse(markup)
-      lax_parse(markup)
-    end
-
-    def lax_parse(markup)
-      if markup =~ SYNTAX
-        template_name = Regexp.last_match(1)
-        with_or_for   = Regexp.last_match(3)
-        variable_name = Regexp.last_match(4)
-
-        @alias_name         = Regexp.last_match(6)
-        @variable_name_expr = variable_name ? parse_expression(variable_name) : nil
-        @template_name_expr = parse_expression(template_name)
-        @is_for_loop        = (with_or_for == FOR)
-        @attributes         = {}
-
-        markup.scan(TagAttributes) do |key, value|
-          @attributes[key] = parse_expression(value)
-        end
-
-      else
-        raise SyntaxError, options[:locale].t("errors.syntax.include")
-      end
-    end
-
     class ParseTreeVisitor < Liquid::ParseTreeVisitor
       def children
         [

lib/liquid/tags/increment.rb

@@ -7,10 +7,6 @@ module Liquid
   # @liquid_name increment
   # @liquid_summary
   #   Creates a new variable, with a default value of 0, that's increased by 1 with each subsequent call.
-  #
-  #   > Caution:
-  #   > Predefined Liquid objects can be overridden by variables with the same name.
-  #   > To make sure that you can access all Liquid objects, make sure that your variable name doesn't match a predefined object's name.
   # @liquid_description
   #   Variables that are declared with `increment` are unique to the [layout](/themes/architecture/layouts), [template](/themes/architecture/templates),
   #   or [section](/themes/architecture/sections) file that they're created in. However, the variable is shared across
@@ -23,29 +19,13 @@ module Liquid
   #   {% increment variable_name %}
   # @liquid_syntax_keyword variable_name The name of the variable being incremented.
   class Increment < Tag
-    include ParserSwitching
-
     attr_reader :variable_name
 
     def initialize(tag_name, markup, options)
       super
-      parse_with_selected_parser(markup)
-    end
-
-    def lax_parse(markup)
       @variable_name = markup.strip
     end
 
-    def strict_parse(markup)
-      lax_parse(markup)
-    end
-
-    def strict2_parse(markup)
-      p = @parse_context.new_parser(markup.strip)
-      @variable_name = p.consume(:id)
-      p.consume(:end_of_string)
-    end
-
     def render_to_output_buffer(context, output)
       counter_environment = context.environments.first
       value = counter_environment[@variable_name] || 0

lib/liquid/tags/render.rb

@@ -35,7 +35,22 @@ module Liquid
 
     def initialize(tag_name, markup, options)
       super
-      parse_with_selected_parser(markup)
+
+      raise SyntaxError, options[:locale].t("errors.syntax.render") unless markup =~ SYNTAX
+
+      template_name = Regexp.last_match(1)
+      with_or_for = Regexp.last_match(3)
+      variable_name = Regexp.last_match(4)
+
+      @alias_name = Regexp.last_match(6)
+      @variable_name_expr = variable_name ? parse_expression(variable_name) : nil
+      @template_name_expr = parse_expression(template_name)
+      @is_for_loop = (with_or_for == FOR)
+
+      @attributes = {}
+      markup.scan(TagAttributes) do |key, value|
+        @attributes[key] = parse_expression(value)
+      end
     end
 
     def for_loop?
@@ -84,55 +99,6 @@ module Liquid
       output
     end
 
-    # render (string) (with|for expression)? (as id)? (key: value)*
-    def strict2_parse(markup)
-      p = @parse_context.new_parser(markup)
-
-      @template_name_expr = parse_expression(strict2_template_name(p), safe: true)
-      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)
-
-      p.consume?(:comma)
-
-      @attributes = {}
-      while p.look(:id)
-        key = p.consume
-        p.consume(:colon)
-        @attributes[key] = safe_parse_expression(p)
-        p.consume?(:comma)
-      end
-
-      p.consume(:end_of_string)
-    end
-
-    def strict2_template_name(p)
-      p.consume(:string)
-    end
-
-    def strict_parse(markup)
-      lax_parse(markup)
-    end
-
-    def lax_parse(markup)
-      raise SyntaxError, options[:locale].t("errors.syntax.render") unless markup =~ SYNTAX
-
-      template_name = Regexp.last_match(1)
-      with_or_for = Regexp.last_match(3)
-      variable_name = Regexp.last_match(4)
-
-      @alias_name = Regexp.last_match(6)
-      @variable_name_expr = variable_name ? parse_expression(variable_name) : nil
-      @template_name_expr = parse_expression(template_name)
-      @is_for_loop = (with_or_for == FOR)
-
-      @attributes = {}
-      markup.scan(TagAttributes) do |key, value|
-        @attributes[key] = parse_expression(value)
-      end
-    end
-
     class ParseTreeVisitor < Liquid::ParseTreeVisitor
       def children
         [

lib/liquid/tags/table_row.rb

@@ -19,54 +19,17 @@ module Liquid
   # @liquid_syntax_keyword variable The current item in the array.
   # @liquid_syntax_keyword array The array to iterate over.
   # @liquid_syntax_keyword expression The expression to render.
-  # @liquid_optional_param cols: [number] The number of columns that the table should have.
-  # @liquid_optional_param limit: [number] The number of iterations to perform.
-  # @liquid_optional_param offset: [number] The 1-based index to start iterating at.
+  # @liquid_optional_param cols [number] The number of columns that the table should have.
+  # @liquid_optional_param limit [number] The number of iterations to perform.
+  # @liquid_optional_param offset [number] The 1-based index to start iterating at.
   # @liquid_optional_param range [untyped] A custom numeric range to iterate over.
   class TableRow < Block
     Syntax = /(\w+)\s+in\s+(#{QuotedFragment}+)/o
-    ALLOWED_ATTRIBUTES = ['cols', 'limit', 'offset', 'range'].freeze
 
     attr_reader :variable_name, :collection_name, :attributes
 
     def initialize(tag_name, markup, options)
       super
-      parse_with_selected_parser(markup)
-    end
-
-    def strict2_parse(markup)
-      p = @parse_context.new_parser(markup)
-
-      @variable_name = p.consume(:id)
-
-      unless p.id?("in")
-        raise SyntaxError, options[:locale].t("errors.syntax.for_invalid_in")
-      end
-
-      @collection_name = safe_parse_expression(p)
-
-      p.consume?(:comma)
-
-      @attributes = {}
-      while p.look(:id)
-        key = p.consume
-        unless ALLOWED_ATTRIBUTES.include?(key)
-          raise SyntaxError, options[:locale].t("errors.syntax.table_row_invalid_attribute", attribute: key)
-        end
-
-        p.consume(:colon)
-        @attributes[key] = safe_parse_expression(p)
-        p.consume?(:comma)
-      end
-
-      p.consume(:end_of_string)
-    end
-
-    def strict_parse(markup)
-      lax_parse(markup)
-    end
-
-    def lax_parse(markup)
       if markup =~ Syntax
         @variable_name   = Regexp.last_match(1)
         @collection_name = parse_expression(Regexp.last_match(2))
@@ -85,13 +48,12 @@ module Liquid
       from = @attributes.key?('offset') ? to_integer(context.evaluate(@attributes['offset'])) : 0
       to = @attributes.key?('limit') ? from + to_integer(context.evaluate(@attributes['limit'])) : nil
 
-      collection = Utils.slice_collection_for_iteration(collection, from, to, context.resource_limits, allow_endless: true)
+      collection = Utils.slice_collection(collection, from, to)
       length     = collection.length
 
       cols = @attributes.key?('cols') ? to_integer(context.evaluate(@attributes['cols'])) : length
 
       output << "<tr class=\"row1\">\n"
-      context.resource_limits.increment_write_score(output)
       context.stack do
         tablerowloop = Liquid::TablerowloopDrop.new(length, cols)
         context['tablerowloop'] = tablerowloop
@@ -102,7 +64,6 @@ module Liquid
           output << "<td class=\"col#{tablerowloop.col}\">"
           super
           output << '</td>'
-          context.resource_limits.increment_write_score(output)
 
           # Handle any interrupts if they exist.
           if context.interrupt?
@@ -112,7 +73,6 @@ module Liquid
 
           if tablerowloop.col_last && !tablerowloop.last
             output << "</tr>\n<tr class=\"row#{tablerowloop.row + 1}\">"
-            context.resource_limits.increment_write_score(output)
           end
 
           tablerowloop.send(:increment!)
@@ -120,7 +80,6 @@ module Liquid
       end
 
       output << "</tr>\n"
-      context.resource_limits.increment_write_score(output)
       output
     end
 

lib/liquid/template.rb

@@ -2,7 +2,7 @@
 
 module Liquid
   # Templates are central to liquid.
-  # Interpreting templates is a two step process. First you compile the
+  # Interpretating templates is a two step process. First you compile the
   # source code you got. During compile time some extensive error checking is performed.
   # your code should expect to get some SyntaxErrors.
   #
@@ -24,8 +24,7 @@ module Liquid
       # Sets how strict the parser should be.
       # :lax acts like liquid 2.5 and silently ignores malformed tags in most cases.
       # :warn is the default and will give deprecation warnings when invalid syntax is used.
-      # :strict enforces correct syntax for most tags
-      # :strict2 enforces correct syntax for all tags
+      # :strict will enforce correct syntax.
       def error_mode=(mode)
         Deprecations.warn("Template.error_mode=", "Environment#error_mode=")
         Environment.default.error_mode = mode
@@ -151,10 +150,8 @@ module Liquid
 
         c
       when Liquid::Drop
-        drop = args.shift
-        c    = Context.new([drop, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits, {}, @environment)
-        drop.context = c if drop.respond_to?(:context=)
-        c
+        drop         = args.shift
+        drop.context = Context.new([drop, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits, {}, @environment)
       when Hash
         Context.new([args.shift, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits, {}, @environment)
       when nil
@@ -189,20 +186,12 @@ module Liquid
 
       context.template_name ||= name
 
-      previous_error_mode = context.registers.static[:template_error_mode]
-      context.registers.static[:template_error_mode] = @error_mode
-
       begin
         # render the nodelist.
         @root.render_to_output_buffer(context, output || +'')
       rescue Liquid::MemoryError => e
         context.handle_error(e)
       ensure
-        if previous_error_mode
-          context.registers.static[:template_error_mode] = previous_error_mode
-        else
-          context.registers.static.delete(:template_error_mode)
-        end
         @errors = context.errors
       end
     end
@@ -216,6 +205,68 @@ module Liquid
       render(context, output: output)
     end
 
+    # Compile the template to Ruby code for fast, secure execution.
+    #
+    # Returns a CompiledTemplate that can be rendered repeatedly. On Ruby 4.0+,
+    # rendering happens in a secure sandbox. On earlier versions, a security
+    # warning is printed to STDERR.
+    #
+    # == Example
+    #
+    #   template = Liquid::Template.parse("Hello, {{ name }}!")
+    #   compiled = template.compile_to_ruby
+    #
+    #   # Render (fast, secure on Ruby 4.0+)
+    #   result = compiled.render({ "name" => "World" })
+    #   # => "Hello, World!"
+    #
+    #   # Access the generated Ruby source
+    #   puts compiled.source
+    #
+    #   # Check if execution is sandboxed
+    #   compiled.secure?  # => true on Ruby 4.0+
+    #
+    # == Options
+    #
+    # * <tt>:strict_variables</tt> - Raise on undefined variables (default: false)
+    # * <tt>:include_filters</tt> - Include helper methods for filters (default: true)
+    # * <tt>:debug</tt> - Include source comments in generated code (default: false)
+    #
+    # == Performance
+    #
+    # Compiled templates are ~1.5x faster than interpreted Liquid:
+    # * No Context object overhead
+    # * No filter invocation overhead (direct method calls)
+    # * No resource limits tracking
+    # * No stack-based scoping (uses Ruby's native scoping)
+    # * Direct string concatenation
+    #
+    # == Security
+    #
+    # On Ruby 4.0+, templates execute in a Ruby::Box sandbox that blocks:
+    # * File/network access
+    # * System calls (exec, spawn, fork)
+    # * Code loading (require, eval)
+    # * Dangerous metaprogramming
+    #
+    # On Ruby < 4.0, templates execute WITHOUT sandboxing.
+    # A warning is printed to STDERR on first execution.
+    #
+    # == Limitations
+    #
+    # * {% render %} and {% include %} resolved at compile time when possible
+    # * Custom tags need explicit compiler implementations
+    # * Custom filters must be available at runtime
+    #
+    def compile_to_ruby(options = {})
+      return nil if @root.nil?
+
+      require 'liquid/compile'
+      compiler = Compile::RubyCompiler.new(self, options)
+      code = compiler.compile
+      Compile::CompiledTemplate.new(code, compiler.external_tags, compiler.has_external_filters?)
+    end
+
     private
 
     def configure_options(options)
@@ -234,7 +285,6 @@ module Liquid
       end
 
       @warnings = parse_context.warnings
-      @error_mode = parse_context.error_mode
       parse_context
     end
 

lib/liquid/tokenizer.rb

@@ -117,7 +117,7 @@ module Liquid
       byte_a = byte_b = @ss.scan_byte
 
       while byte_b
-        byte_a = @ss.scan_byte while byte_a && byte_a != CLOSE_CURLEY && byte_a != OPEN_CURLEY
+        byte_a = @ss.scan_byte while byte_a && (byte_a != CLOSE_CURLEY && byte_a != OPEN_CURLEY)
 
         break unless byte_a
 

lib/liquid/utils.rb

@@ -2,9 +2,6 @@
 
 module Liquid
   module Utils
-    DECIMAL_REGEX = /\A-?\d+\.\d+\z/
-    UNIX_TIMESTAMP_REGEX = /\A\d+\z/
-
     def self.slice_collection(collection, from, to)
       if (from != 0 || !to.nil?) && collection.respond_to?(:load_slice)
         collection.load_slice(from, to)
@@ -13,26 +10,6 @@ module Liquid
       end
     end
 
-    # This is intentionally separate from slice_collection, whose Array-returning
-    # behavior is used outside of the iteration tags.
-    def self.slice_collection_for_iteration(
-      collection, from, to, resource_limits, allow_endless: false, use_range_to_a: false
-    )
-      if integer_range?(collection)
-        RangeSlice.new(collection, from, to, resource_limits)
-      elsif collection.is_a?(Range)
-        if use_range_to_a && range_method_overridden?(collection, :to_a)
-          # For historically honored custom Range#to_a. Charge the resulting
-          # selection before buffering it, just as for a custom #each.
-          slice_collection_for_iteration_using_each(collection.to_a, from, to, resource_limits)
-        else
-          slice_range_using_each(collection, from, to, resource_limits, allow_endless: allow_endless)
-        end
-      else
-        slice_collection(collection, from, to)
-      end
-    end
-
     def self.slice_collection_using_each(collection, from, to)
       segments = []
       index    = 0
@@ -58,55 +35,6 @@ module Liquid
       segments
     end
 
-    # Arithmetic slicing must not bypass a Range subclass's custom #each.
-    def self.integer_range?(collection)
-      collection.instance_of?(Range) && collection.begin.is_a?(Integer) && collection.end.is_a?(Integer)
-    end
-    private_class_method :integer_range?
-
-    # Preserve support for Ruby-supplied string ranges and custom Range#each.
-    # Their selected length cannot be inferred from integer bounds, but the tags
-    # need it before rendering for loop metadata, continuation offsets, and columns.
-    # Buffer the selection so we do not have to replay a potentially custom iterator.
-    def self.slice_range_using_each(collection, from, to, resource_limits, allow_endless:)
-      # TableRow historically accepted an endless subclass when its custom #each
-      # was finite, while For historically raised through Range#to_a.
-      if collection.end.nil? && !(allow_endless && (!to.nil? || range_method_overridden?(collection, :each)))
-        raise RangeError, "cannot convert endless range to an array"
-      end
-      if collection.begin.nil? && !range_method_overridden?(collection, :each)
-        raise TypeError, "can't iterate from NilClass"
-      end
-
-      slice_collection_for_iteration_using_each(collection, from, to, resource_limits)
-    end
-    private_class_method :slice_range_using_each
-
-    # Custom Range#each can make a nominally beginless range finite; standard
-    # beginless ranges were rejected before reaching this budgeted traversal.
-    def self.slice_collection_for_iteration_using_each(collection, from, to, resource_limits)
-      return [] if to && to <= from
-
-      segments = []
-      index = 0
-      collection.each do |item|
-        break if to && to <= index
-
-        # Charge preparation, including skipped offsets, before buffering; checking
-        # only while rendering the buffered values would leave this work unbudgeted.
-        resource_limits.increment_render_score(1)
-        segments << item if from <= index
-        index += 1
-      end
-      segments
-    end
-    private_class_method :slice_collection_for_iteration_using_each
-
-    def self.range_method_overridden?(collection, method_name)
-      collection.method(method_name).owner != Range.instance_method(method_name).owner
-    end
-    private_class_method :range_method_overridden?
-
     def self.to_integer(num)
       return num if num.is_a?(Integer)
       num = num.to_s
@@ -124,7 +52,7 @@ module Liquid
       when Numeric
         obj
       when String
-        DECIMAL_REGEX.match?(obj.strip) ? BigDecimal(obj) : obj.to_i
+        /\A-?\d+\.\d+\z/.match?(obj.strip) ? BigDecimal(obj) : obj.to_i
       else
         if obj.respond_to?(:to_number)
           obj.to_number
@@ -138,14 +66,14 @@ module Liquid
       return obj if obj.respond_to?(:strftime)
 
       if obj.is_a?(String)
-        return if obj.empty?
+        return nil if obj.empty?
         obj = obj.downcase
       end
 
       case obj
       when 'now', 'today'
         Time.now
-      when UNIX_TIMESTAMP_REGEX, Integer
+      when /\A\d+\z/, Integer
         Time.at(obj.to_i)
       when String
         Time.parse(obj)
@@ -164,8 +92,6 @@ module Liquid
 
     def self.to_s(obj, seen = {})
       case obj
-      when BigDecimal
-        obj.to_s("F")
       when Hash
         # If the custom hash implementation overrides `#to_s`, use their
         # custom implementation. Otherwise we use Liquid's default

lib/liquid/variable.rb

@@ -37,10 +37,6 @@ module Liquid
       @markup
     end
 
-    def ==(other)
-      self.class == other.class && name == other.name && filters == other.filters
-    end
-
     def markup_context(markup)
       "in \"{{#{markup}}}\""
     end
@@ -58,7 +54,7 @@ module Liquid
           next unless f =~ /\w+/
           filtername = Regexp.last_match(0)
           filterargs = f.scan(FilterArgsRegex).flatten
-          @filters << lax_parse_filter_expressions(filtername, filterargs)
+          @filters << parse_filter_expressions(filtername, filterargs)
         end
       end
     end
@@ -69,26 +65,15 @@ module Liquid
 
       return if p.look(:end_of_string)
 
-      @name = parse_context.safe_parse_expression(p)
+      @name = parse_context.parse_expression(p.expression)
       while p.consume?(:pipe)
         filtername = p.consume(:id)
         filterargs = p.consume?(:colon) ? parse_filterargs(p) : Const::EMPTY_ARRAY
-        @filters << lax_parse_filter_expressions(filtername, filterargs)
+        @filters << parse_filter_expressions(filtername, filterargs)
       end
       p.consume(:end_of_string)
     end
 
-    def strict2_parse(markup)
-      @filters = []
-      p = @parse_context.new_parser(markup)
-
-      return if p.look(:end_of_string)
-
-      @name = parse_context.safe_parse_expression(p)
-      @filters << strict2_parse_filter_expressions(p) while p.consume?(:pipe)
-      p.consume(:end_of_string)
-    end
-
     def parse_filterargs(p)
       # first argument
       filterargs = [p.argument]
@@ -137,7 +122,7 @@ module Liquid
 
     private
 
-    def lax_parse_filter_expressions(filter_name, unparsed_args)
+    def parse_filter_expressions(filter_name, unparsed_args)
       filter_args  = []
       keyword_args = nil
       unparsed_args.each do |a|
@@ -153,46 +138,6 @@ module Liquid
       result
     end
 
-    # Surprisingly, positional and keyword arguments can be mixed.
-    #
-    # filter = filtername [":" filterargs?]
-    # filterargs = argument ("," argument)*
-    # argument = (positional_argument | keyword_argument)
-    # positional_argument = expression
-    # keyword_argument = id ":" expression
-    def strict2_parse_filter_expressions(p)
-      filtername = p.consume(:id)
-      filter_args = []
-      keyword_args = {}
-
-      if p.consume?(:colon)
-        # Parse first argument (no leading comma)
-        argument(p, filter_args, keyword_args) unless end_of_arguments?(p)
-
-        # Parse remaining arguments (with leading commas) and optional trailing comma
-        argument(p, filter_args, keyword_args) while p.consume?(:comma) && !end_of_arguments?(p)
-      end
-
-      result = [filtername, filter_args]
-      result << keyword_args unless keyword_args.empty?
-      result
-    end
-
-    def argument(p, positional_arguments, keyword_arguments)
-      if p.look(:id) && p.look(:colon, 1)
-        key = p.consume(:id)
-        p.consume(:colon)
-        value = parse_context.safe_parse_expression(p)
-        keyword_arguments[key] = value
-      else
-        positional_arguments << parse_context.safe_parse_expression(p)
-      end
-    end
-
-    def end_of_arguments?(p)
-      p.look(:pipe) || p.look(:end_of_string)
-    end
-
     def evaluate_filter_expressions(context, filter_args, filter_kwargs)
       parsed_args = filter_args.map { |expr| context.evaluate(expr) }
       if filter_kwargs

lib/liquid/variable_lookup.rb

@@ -70,11 +70,6 @@ module Liquid
         elsif lookup_command?(i) && object.respond_to?(key)
           object = object.send(key).to_liquid
 
-        # Handle string first/last like ActiveSupport does (returns first/last character)
-        # ActiveSupport returns "" for empty strings, not nil
-        elsif lookup_command?(i) && object.is_a?(String) && (key == "first" || key == "last")
-          object = key == "first" ? (object[0] || "") : (object[-1] || "")
-
           # No key was present with the desired value and it wasn't one of the directly supported
           # keywords either. The only thing we got left is to return nil or
           # raise an exception if `strict_variables` option is set to true

lib/liquid/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Liquid
-  VERSION = "5.14.0"
+  VERSION = "5.8.6"
 end

performance/compile_benchmark.rb

@@ -0,0 +1,222 @@
+# frozen_string_literal: true
+
+# Benchmark comparing compiled Ruby code vs interpreted Liquid rendering
+#
+# Usage:
+#   ruby performance/compile_benchmark.rb
+#
+# This benchmark compares:
+# 1. Standard Liquid render (interpreted)
+# 2. Compiled Ruby render (compiled once, executed many times)
+# 3. Compile + render (includes compilation overhead)
+
+require 'benchmark/ips'
+require_relative 'ruby33_compat'  # Add peek_byte for Ruby 3.3 compatibility
+require_relative 'shopify/liquid'
+require_relative 'shopify/database'
+
+RubyVM::YJIT.enable if defined?(RubyVM::YJIT)
+
+# Combined filter handler that includes all Shopify filters
+class ShopifyFilterHandler
+  include JsonFilter
+  include MoneyFilter
+  include ShopFilter
+  include TagFilter
+  include WeightFilter
+end
+
+class CompileBenchmarkRunner
+  def initialize
+    @templates = []
+    @compiled_procs = []
+    @filter_handler = ShopifyFilterHandler.new
+
+    # Load test templates
+    load_templates
+  end
+
+  def load_templates
+    puts "Loading templates..."
+
+    test_dirs = Dir[__dir__ + '/tests/*']
+    test_dirs.each do |dir|
+      next unless File.directory?(dir)
+
+      Dir[dir + '/*.liquid'].each do |file|
+        next if File.basename(file) == 'theme.liquid'
+
+        source = File.read(file)
+        template = Liquid::Template.parse(source)
+
+        @templates << {
+          name: File.basename(file),
+          source: source,
+          template: template,
+          assigns: Database.tables.dup,
+        }
+      end
+    end
+
+    puts "Loaded #{@templates.size} templates"
+
+    # Pre-compile all templates
+    puts "Pre-compiling templates to Ruby..."
+    @templates.each do |t|
+      begin
+        compiled = t[:template].compile_to_ruby
+        compiled.filter_handler = @filter_handler  # Set the filter handler
+        t[:compiled] = compiled  # CompiledTemplate object
+        t[:ruby_code] = compiled.code
+        notes = []
+        notes << "#{compiled.external_tags.size} external tag(s)" if compiled.has_external_tags?
+        notes << "external filters" if compiled.has_external_filters?
+        puts "  #{t[:name]}: #{notes.join(', ')}" unless notes.empty?
+      rescue => e
+        puts "  Warning: Failed to compile #{t[:name]}: #{e.message}"
+        puts "    #{e.backtrace.first(3).join("\n    ")}"
+        t[:compiled] = nil
+      end
+    end
+
+    compilable = @templates.count { |t| t[:compiled] }
+    puts "Successfully compiled #{compilable}/#{@templates.size} templates"
+    puts
+  end
+
+  # Benchmark: Standard Liquid render
+  def render_interpreted
+    @templates.each do |t|
+      t[:template].render!(t[:assigns].dup)
+    end
+  end
+
+  # Benchmark: Compiled Ruby render (already compiled)
+  def render_compiled
+    @templates.each do |t|
+      next unless t[:compiled]
+      t[:compiled].call(t[:assigns].dup)
+    end
+  end
+
+  # Benchmark: Compile + render (includes compilation time)
+  def compile_and_render
+    @templates.each do |t|
+      compiled = t[:template].compile_to_ruby
+      compiled.filter_handler = @filter_handler
+      compiled.call(t[:assigns].dup)
+    end
+  end
+
+  # Show sample output comparison
+  def verify_output
+    puts "Verifying output equivalence..."
+
+    @templates.each do |t|
+      next unless t[:compiled]
+
+      assigns = t[:assigns].dup
+      interpreted = t[:template].render!(assigns.dup)
+      compiled = t[:compiled].call(assigns.dup)
+
+      if interpreted == compiled
+        puts "  ✓ #{t[:name]}: outputs match"
+      else
+        puts "  ✗ #{t[:name]}: outputs differ!"
+        puts "    Interpreted length: #{interpreted.length}"
+        puts "    Compiled length: #{compiled.length}"
+
+        # Show first difference
+        interpreted.chars.each_with_index do |c, i|
+          if compiled[i] != c
+            puts "    First diff at position #{i}:"
+            puts "      Interpreted: #{interpreted[i-10, 30].inspect}"
+            puts "      Compiled: #{compiled[i-10, 30].inspect}"
+            break
+          end
+        end
+      end
+    end
+    puts
+  end
+
+  # Show code size comparison
+  def show_stats
+    puts "Template Statistics:"
+    puts "=" * 60
+
+    total_liquid_size = 0
+    total_ruby_size = 0
+
+    @templates.each do |t|
+      next unless t[:ruby_code]
+
+      liquid_size = t[:source].length
+      ruby_size = t[:ruby_code].length
+
+      total_liquid_size += liquid_size
+      total_ruby_size += ruby_size
+
+      ratio = ruby_size.to_f / liquid_size
+      puts "  #{t[:name]}: Liquid=#{liquid_size}b, Ruby=#{ruby_size}b (#{ratio.round(1)}x)"
+    end
+
+    puts "-" * 60
+    puts "  Total: Liquid=#{total_liquid_size}b, Ruby=#{total_ruby_size}b"
+    puts
+  end
+
+  def run_benchmark
+    puts "Running benchmark..."
+    puts "=" * 60
+    puts
+
+    # Run quick timing to get approximate values for summary
+    iterations = 50
+
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    iterations.times { render_interpreted }
+    interpreted_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    iterations.times { render_compiled }
+    compiled_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+
+    speedup = interpreted_time / compiled_time
+
+    Benchmark.ips do |x|
+      x.time = 10
+      x.warmup = 5
+
+      x.report("Liquid render (interpreted):") do
+        render_interpreted
+      end
+
+      x.report("Ruby render (pre-compiled):") do
+        render_compiled
+      end
+
+      x.report("Compile + render:") do
+        compile_and_render
+      end
+
+      x.compare!
+    end
+
+    # Print clear summary
+    puts
+    puts "=" * 60
+    puts "SUMMARY:"
+    puts "  ✓ Pre-compiled Ruby is #{speedup.round(2)}x FASTER than interpreted Liquid"
+    puts
+    puts "  (The 'X slower' above means compared to the fastest option,"
+    puts "   which is pre-compiled Ruby. Higher i/s = faster.)"
+    puts "=" * 60
+  end
+end
+
+# Run the benchmark
+runner = CompileBenchmarkRunner.new
+runner.show_stats
+runner.verify_output
+runner.run_benchmark

performance/compile_profiler.rb

@@ -0,0 +1,319 @@
+# frozen_string_literal: true
+
+# Compile Profiler - Measure allocations and performance of compiled vs interpreted Liquid
+#
+# Usage:
+#   RUBY_BOX=1 ruby -W:no-experimental performance/compile_profiler.rb
+#
+# This tool measures:
+# - Allocation count (objects created during render)
+# - Time per render
+# - Comparison between interpreted and compiled
+#
+# Results are appended to ../timings.jsonl with git hash and timestamp
+#
+# REQUIRES Ruby 4.0+ with RUBY_BOX=1
+
+unless ENV['RUBY_BOX'] == '1'
+  $stderr.puts "\e[31mERROR: Must run with RUBY_BOX=1\e[0m"
+  $stderr.puts "Usage: RUBY_BOX=1 ruby -W:no-experimental performance/compile_profiler.rb"
+  exit 1
+end
+
+require 'json'
+require 'time'
+require_relative '../lib/liquid'
+require_relative '../lib/liquid/compile'
+
+unless Liquid::Box.secure?
+  $stderr.puts "\e[31mERROR: Ruby::Box not available. Requires Ruby 4.0+\e[0m"
+  exit 1
+end
+
+class CompileProfiler
+  COLORS = {
+    reset:   "\e[0m",
+    bold:    "\e[1m",
+    red:     "\e[31m",
+    green:   "\e[32m",
+    yellow:  "\e[33m",
+    blue:    "\e[34m",
+    magenta: "\e[35m",
+    cyan:    "\e[36m",
+    gray:    "\e[90m",
+  }.freeze
+
+  BOX_CHARS = {
+    tl: "╭", tr: "╮", bl: "╰", br: "╯",
+    h: "─", v: "│",
+    check: "✓", cross: "✗", arrow: "→", delta: "Δ",
+  }.freeze
+
+  TIMINGS_FILE = File.expand_path('../../timings.jsonl', __dir__)
+
+  def initialize
+    @results = {}
+    @git_hash = `git rev-parse --short HEAD 2>/dev/null`.strip
+    @git_hash = "unknown" if @git_hash.empty?
+    @timestamp = Time.now.utc.iso8601
+  end
+
+  def c(color, text)
+    "#{COLORS[color]}#{text}#{COLORS[:reset]}"
+  end
+
+  def box(title, width: 70)
+    puts
+    puts "#{BOX_CHARS[:tl]}#{BOX_CHARS[:h] * (width - 2)}#{BOX_CHARS[:tr]}"
+    puts "#{BOX_CHARS[:v]} #{c(:bold, title)}#{' ' * (width - 4 - title.length)} #{BOX_CHARS[:v]}"
+    yield if block_given?
+    puts "#{BOX_CHARS[:bl]}#{BOX_CHARS[:h] * (width - 2)}#{BOX_CHARS[:br]}"
+  end
+
+  # Calculate visible length (excluding ANSI codes)
+  def visible_length(str)
+    str.gsub(/\e\[[0-9;]*m/, '').length
+  end
+
+  def row(label, value, width: 70)
+    label_str = label.to_s
+    value_str = value.to_s
+    label_visible = visible_length(label_str)
+    value_visible = visible_length(value_str)
+    padding = width - 4 - label_visible - value_visible
+    padding = 1 if padding < 1
+    puts "#{BOX_CHARS[:v]} #{label_str}#{' ' * padding}#{value_str} #{BOX_CHARS[:v]}"
+  end
+
+  def separator(width: 70)
+    puts "#{BOX_CHARS[:v]}#{BOX_CHARS[:h] * (width - 2)}#{BOX_CHARS[:v]}"
+  end
+
+  def measure_allocations
+    GC.start
+    GC.disable
+    before = GC.stat(:total_allocated_objects)
+    yield
+    after = GC.stat(:total_allocated_objects)
+    GC.enable
+    after - before
+  end
+
+  def measure_time(iterations: 100)
+    GC.start
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    iterations.times { yield }
+    elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+    (elapsed / iterations * 1_000_000).round(2)  # microseconds
+  end
+
+  def measure_objects
+    before = ObjectSpace.count_objects.dup
+    yield
+    after = ObjectSpace.count_objects
+    
+    diff = {}
+    after.each do |k, v|
+      d = v - (before[k] || 0)
+      diff[k] = d if d > 0
+    end
+    diff
+  end
+
+  def profile_template(name, source, assigns, iterations: 100)
+    puts
+    puts c(:cyan, "#{BOX_CHARS[:arrow]} Profiling: #{c(:bold, name)}")
+    puts c(:gray, "  Template: #{source[0..60]}#{'...' if source.length > 60}")
+    
+    template = Liquid::Template.parse(source)
+    compiled = template.compile_to_ruby
+
+    # Warmup
+    10.times { template.render(assigns.dup) }
+    10.times { compiled.render(assigns.dup) }
+
+    # Measure interpreted
+    interp_allocs = measure_allocations { template.render(assigns.dup) }
+    interp_time = measure_time(iterations: iterations) { template.render(assigns.dup) }
+    interp_objects = measure_objects { template.render(assigns.dup) }
+
+    # Measure compiled
+    comp_allocs = measure_allocations { compiled.render(assigns.dup) }
+    comp_time = measure_time(iterations: iterations) { compiled.render(assigns.dup) }
+    comp_objects = measure_objects { compiled.render(assigns.dup) }
+
+    # Calculate deltas
+    alloc_delta = ((comp_allocs.to_f / interp_allocs - 1) * 100).round(1)
+    time_delta = ((comp_time / interp_time - 1) * 100).round(1)
+
+    alloc_color = alloc_delta < 0 ? :green : :red
+    time_color = time_delta < 0 ? :green : :red
+
+    box(name) do
+      # Header row
+      header = "#{' ' * 20}#{c(:gray, 'Interpreted')}  #{c(:cyan, 'Compiled')}  #{c(:yellow, 'Delta')}"
+      row(header, "")
+      separator
+      # Data rows with fixed-width columns
+      alloc_delta_str = "#{alloc_delta > 0 ? '+' : ''}#{alloc_delta}%"
+      time_delta_str = "#{time_delta > 0 ? '+' : ''}#{time_delta}%"
+      row("Allocations", "#{interp_allocs.to_s.rjust(11)}  #{comp_allocs.to_s.rjust(8)}  #{c(alloc_color, alloc_delta_str.rjust(7))}")
+      row("Time (μs)", "#{interp_time.to_s.rjust(11)}  #{comp_time.to_s.rjust(8)}  #{c(time_color, time_delta_str.rjust(7))}")
+      separator
+      row("Objects (compiled):", "")
+      comp_objects.sort_by { |_, v| -v }.first(3).each do |type, count|
+        row("  #{type}", count.to_s)
+      end
+    end
+
+    @results[name] = {
+      interp_allocs: interp_allocs,
+      comp_allocs: comp_allocs,
+      interp_time: interp_time,
+      comp_time: comp_time,
+      alloc_delta: alloc_delta,
+      time_delta: time_delta,
+    }
+  end
+
+  def print_summary
+    return if @results.empty?
+
+    width = 70
+    total_interp_allocs = @results.values.sum { |r| r[:interp_allocs] }
+    total_comp_allocs = @results.values.sum { |r| r[:comp_allocs] }
+    total_interp_time = @results.values.sum { |r| r[:interp_time] }
+    total_comp_time = @results.values.sum { |r| r[:comp_time] }
+
+    alloc_improvement = ((1 - total_comp_allocs.to_f / total_interp_allocs) * 100).round(1)
+    time_improvement = ((1 - total_comp_time / total_interp_time) * 100).round(1)
+
+    alloc_icon = alloc_improvement > 0 ? c(:green, BOX_CHARS[:check]) : c(:red, BOX_CHARS[:cross])
+    time_icon = time_improvement > 0 ? c(:green, BOX_CHARS[:check]) : c(:red, BOX_CHARS[:cross])
+    
+    alloc_text = "#{alloc_icon} Allocations: #{c(:bold, "#{alloc_improvement}%")} #{alloc_improvement > 0 ? 'fewer' : 'more'} (#{total_comp_allocs} vs #{total_interp_allocs})"
+    time_text = "#{time_icon} Time: #{c(:bold, "#{time_improvement}%")} #{time_improvement > 0 ? 'faster' : 'slower'} (#{total_comp_time.round(0)}μs vs #{total_interp_time.round(0)}μs)"
+
+    puts
+    puts "#{BOX_CHARS[:tl]}#{BOX_CHARS[:h] * (width - 2)}#{BOX_CHARS[:tr]}"
+    title = "SUMMARY"
+    title_pad = (width - 4 - title.length) / 2
+    puts "#{BOX_CHARS[:v]} #{' ' * title_pad}#{c(:bold, title)}#{' ' * (width - 4 - title_pad - title.length)} #{BOX_CHARS[:v]}"
+    puts "#{BOX_CHARS[:v]}#{BOX_CHARS[:h] * (width - 2)}#{BOX_CHARS[:v]}"
+    alloc_pad = width - 4 - visible_length(alloc_text)
+    puts "#{BOX_CHARS[:v]} #{alloc_text}#{' ' * alloc_pad} #{BOX_CHARS[:v]}"
+    time_pad = width - 4 - visible_length(time_text)
+    puts "#{BOX_CHARS[:v]} #{time_text}#{' ' * time_pad} #{BOX_CHARS[:v]}"
+    puts "#{BOX_CHARS[:bl]}#{BOX_CHARS[:h] * (width - 2)}#{BOX_CHARS[:br]}"
+
+    # Write to timings.jsonl
+    write_timings(total_interp_allocs, total_comp_allocs, total_interp_time, total_comp_time, 
+                  alloc_improvement, time_improvement)
+  end
+
+  def write_timings(total_interp_allocs, total_comp_allocs, total_interp_time, total_comp_time,
+                    alloc_improvement, time_improvement)
+    entry = {
+      timestamp: @timestamp,
+      git_hash: @git_hash,
+      ruby_version: RUBY_VERSION,
+      summary: {
+        alloc_improvement_pct: alloc_improvement,
+        time_improvement_pct: time_improvement,
+        total_interp_allocs: total_interp_allocs,
+        total_comp_allocs: total_comp_allocs,
+        total_interp_time_us: total_interp_time.round(2),
+        total_comp_time_us: total_comp_time.round(2),
+      },
+      benchmarks: @results.transform_values { |r|
+        {
+          interp_allocs: r[:interp_allocs],
+          comp_allocs: r[:comp_allocs],
+          interp_time_us: r[:interp_time],
+          comp_time_us: r[:comp_time],
+          alloc_delta_pct: r[:alloc_delta],
+          time_delta_pct: r[:time_delta],
+        }
+      }
+    }
+
+    File.open(TIMINGS_FILE, 'a') do |f|
+      f.puts JSON.generate(entry)
+    end
+
+    puts
+    puts c(:gray, "Results appended to #{TIMINGS_FILE}")
+  end
+
+  def run_all
+    puts c(:bold, "\n🔬 Liquid Compile Profiler")
+    puts c(:gray, "   Measuring allocations and performance...\n")
+
+    profile_template(
+      "Simple variable",
+      "Hello, {{ name }}!",
+      { "name" => "World" }
+    )
+
+    profile_template(
+      "Variable with filter",
+      "{{ name | upcase | prepend: 'Hello, ' | append: '!' }}",
+      { "name" => "world" }
+    )
+
+    profile_template(
+      "Simple loop",
+      "{% for item in items %}{{ item }} {% endfor %}",
+      { "items" => %w[a b c d e] }
+    )
+
+    profile_template(
+      "Loop with forloop",
+      "{% for item in items %}{{ forloop.index }}: {{ item }} {% endfor %}",
+      { "items" => %w[a b c d e] }
+    )
+
+    profile_template(
+      "Nested loop",
+      "{% for i in outer %}{% for j in inner %}{{ i }}.{{ j }} {% endfor %}{% endfor %}",
+      { "outer" => [1, 2, 3], "inner" => %w[a b c] }
+    )
+
+    profile_template(
+      "Conditionals",
+      "{% if show %}{% if big %}BIG{% else %}small{% endif %}{% else %}hidden{% endif %}",
+      { "show" => true, "big" => false }
+    )
+
+    profile_template(
+      "Property access",
+      "{{ user.profile.name }} - {{ user.profile.email }}",
+      { "user" => { "profile" => { "name" => "Alice", "email" => "[email protected]" } } }
+    )
+
+    profile_template(
+      "Complex template",
+      <<~LIQUID,
+        {% for product in products %}
+          {{ forloop.index }}. {{ product.name | upcase }}
+          {% if product.on_sale %}SALE: ${{ product.price | times: 0.8 }}{% else %}${{ product.price }}{% endif %}
+        {% endfor %}
+      LIQUID
+      { 
+        "products" => [
+          { "name" => "Widget", "price" => 100, "on_sale" => true },
+          { "name" => "Gadget", "price" => 200, "on_sale" => false },
+          { "name" => "Gizmo", "price" => 150, "on_sale" => true },
+        ]
+      }
+    )
+
+    print_summary
+  end
+end
+
+# Run the profiler
+if __FILE__ == $0
+  profiler = CompileProfiler.new
+  profiler.run_all
+end

performance/ruby33_compat.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Compatibility shim for Ruby 3.3
+# The Liquid library uses peek_byte and scan_byte which are only available in Ruby 3.4+
+
+require 'strscan'
+
+unless StringScanner.method_defined?(:peek_byte)
+  class StringScanner
+    def peek_byte
+      return nil if eos?
+      string.getbyte(pos)
+    end
+  end
+end
+
+unless StringScanner.method_defined?(:scan_byte)
+  class StringScanner
+    def scan_byte
+      return nil if eos?
+      byte = string.getbyte(pos)
+      self.pos += 1
+      byte
+    end
+  end
+end

spec/ruby_liquid.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-# Liquid Spec Adapter for Shopify/liquid (Ruby reference implementation)
-#
-# Run with: bundle exec liquid-spec run spec/ruby_liquid.rb
-
-$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
-require 'liquid'
-require_relative 'support/liquid_spec_adapter_helper'
-
-LiquidSpec.configure do |config|
-  config.missing_features = [
-    :activesupport,
-    :lax_parsing,
-    :shopify_filters,
-    :shopify_includes,
-    :shopify_blank,
-    :shopify_error_handling,
-    :shopify_error_format,
-    :shopify_string_access,
-  ]
-end
-
-# Compile a template string into a Liquid::Template
-LiquidSpec.compile do |ctx, source, options|
-  options[:error_mode] ||= :strict
-  ctx[:template] = Liquid::Template.parse(source, **options)
-end
-
-# Render a compiled template with the given context
-# @param ctx [Hash] adapter context containing :template
-# @param assigns [Hash] environment variables
-# @param options [Hash] :registers, :strict_errors, :exception_renderer
-LiquidSpec.render do |ctx, assigns, options|
-  registers = Liquid::Registers.new(options[:registers] || {})
-
-  context = Liquid::Context.build(
-    static_environments: assigns,
-    registers: registers,
-    rethrow_errors: options[:strict_errors],
-    resource_limits: LiquidSpecAdapterHelper.resource_limits(options),
-  )
-
-  context.exception_renderer = options[:exception_renderer] if options[:exception_renderer]
-
-  LiquidSpecAdapterHelper.with_frozen_time do
-    ctx[:template].render(context)
-  end
-end

spec/ruby_liquid_lax.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-# Liquid Spec Adapter for Shopify/liquid with lax parsing mode
-#
-# Run with: bundle exec liquid-spec run spec/ruby_liquid_lax.rb
-
-$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
-require 'liquid'
-require_relative 'support/liquid_spec_adapter_helper'
-
-LiquidSpec.configure do |config|
-  config.missing_features = [
-    :activesupport,
-    :shopify_filters,
-    :shopify_includes,
-    :shopify_blank,
-    :shopify_error_handling,
-    :shopify_error_format,
-    :shopify_string_access,
-  ]
-end
-
-# Compile a template string into a Liquid::Template
-LiquidSpec.compile do |ctx, source, options|
-  # Default to lax mode while still honoring specs that explicitly set error_mode.
-  options = { error_mode: :lax }.merge(options)
-  ctx[:template] = Liquid::Template.parse(source, **options)
-end
-
-# Render a compiled template with the given context
-LiquidSpec.render do |ctx, assigns, options|
-  registers = Liquid::Registers.new(options[:registers] || {})
-
-  context = Liquid::Context.build(
-    static_environments: assigns,
-    registers: registers,
-    rethrow_errors: options[:strict_errors],
-    resource_limits: LiquidSpecAdapterHelper.resource_limits(options),
-  )
-
-  context.exception_renderer = options[:exception_renderer] if options[:exception_renderer]
-
-  LiquidSpecAdapterHelper.with_frozen_time do
-    ctx[:template].render(context)
-  end
-end

spec/ruby_liquid_with_active_support.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-# Liquid Spec Adapter for Shopify/liquid with ActiveSupport loaded
-#
-# Run with: bundle exec liquid-spec run spec/ruby_liquid_with_active_support.rb
-
-$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
-require 'active_support/all'
-require 'liquid'
-require_relative 'support/liquid_spec_adapter_helper'
-
-LiquidSpec.configure do |config|
-  config.missing_features = [
-    :lax_parsing,
-    :shopify_filters,
-    :shopify_includes,
-    :shopify_blank,
-    :shopify_error_handling,
-    :shopify_error_format,
-    :shopify_string_access,
-  ]
-end
-
-# Compile a template string into a Liquid::Template
-LiquidSpec.compile do |ctx, source, options|
-  options[:error_mode] ||= :strict
-  ctx[:template] = Liquid::Template.parse(source, **options)
-end
-
-# Render a compiled template with the given context
-# @param ctx [Hash] adapter context containing :template
-# @param assigns [Hash] environment variables
-# @param options [Hash] :registers, :strict_errors, :exception_renderer
-LiquidSpec.render do |ctx, assigns, options|
-  registers = Liquid::Registers.new(options[:registers] || {})
-
-  context = Liquid::Context.build(
-    static_environments: assigns,
-    registers: registers,
-    rethrow_errors: options[:strict_errors],
-    resource_limits: LiquidSpecAdapterHelper.resource_limits(options),
-  )
-
-  context.exception_renderer = options[:exception_renderer] if options[:exception_renderer]
-
-  LiquidSpecAdapterHelper.with_frozen_time do
-    ctx[:template].render(context)
-  end
-end

spec/ruby_liquid_yjit.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-# Liquid Spec Adapter for Shopify/liquid with YJIT + strict mode + ActiveSupport
-#
-# Run with: bundle exec liquid-spec run spec/ruby_liquid_yjit.rb
-
-$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
-
-# Enable YJIT if available
-if defined?(RubyVM::YJIT) && RubyVM::YJIT.respond_to?(:enable)
-  RubyVM::YJIT.enable
-end
-
-require 'active_support/all'
-require 'liquid'
-require_relative 'support/liquid_spec_adapter_helper'
-
-LiquidSpec.configure do |config|
-  config.missing_features = [
-    :lax_parsing,
-    :shopify_filters,
-    :shopify_includes,
-    :shopify_blank,
-    :shopify_error_handling,
-    :shopify_error_format,
-    :shopify_string_access,
-  ]
-end
-
-# Compile a template string into a Liquid::Template
-LiquidSpec.compile do |ctx, source, options|
-  # Force strict mode
-  options = { error_mode: :strict }.merge(options)
-  ctx[:template] = Liquid::Template.parse(source, **options)
-end
-
-# Render a compiled template with the given context
-LiquidSpec.render do |ctx, assigns, options|
-  registers = Liquid::Registers.new(options[:registers] || {})
-
-  context = Liquid::Context.build(
-    static_environments: assigns,
-    registers: registers,
-    rethrow_errors: options[:strict_errors],
-    resource_limits: LiquidSpecAdapterHelper.resource_limits(options),
-  )
-
-  context.exception_renderer = options[:exception_renderer] if options[:exception_renderer]
-
-  LiquidSpecAdapterHelper.with_frozen_time do
-    ctx[:template].render(context)
-  end
-end

spec/support/liquid_spec_adapter_helper.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module LiquidSpecAdapterHelper
-  extend self
-
-  def resource_limits(render_options)
-    return unless render_options[:resource_limits]
-
-    Liquid::ResourceLimits.new({}).tap do |limits|
-      render_options[:resource_limits].each do |key, value|
-        limits.public_send(:"#{key}=", value)
-      end
-    end
-  end
-
-  def with_frozen_time(&block)
-    original_tz = ENV['TZ']
-    ENV['TZ'] = 'UTC'
-
-    Liquid::Spec::TimeFreezer.freeze(Liquid::Spec::AdapterRunner::TEST_TIME, &block)
-  ensure
-    ENV['TZ'] = original_tz
-  end
-end

test/integration/assign_test.rb

@@ -97,46 +97,6 @@ class AssignTest < Minitest::Test
     assert_equal(12, assign_score_of('int' => 123, 'str' => 'abcd'))
   end
 
-  def test_assign_with_valid_identifier_in_strict2
-    assert_template_result("hello", "{% assign my_var = 'hello' %}{{ my_var }}", error_mode: :strict2)
-  end
-
-  def test_assign_with_hyphen_in_strict2
-    assert_template_result("hello", "{% assign my-var = 'hello' %}{{ my-var }}", error_mode: :strict2)
-  end
-
-  def test_assign_rejects_parentheses_in_variable_name_in_strict2
-    assert_raises(Liquid::SyntaxError) do
-      Liquid::Template.parse("{% assign (a(b(c) = 1234 %}", error_mode: :strict2)
-    end
-  end
-
-  def test_assign_rejects_brackets_in_variable_name_in_strict2
-    assert_raises(Liquid::SyntaxError) do
-      Liquid::Template.parse("{% assign [x.y] = 'hello' %}", error_mode: :strict2)
-    end
-  end
-
-  def test_assign_rejects_dot_in_variable_name_in_strict2
-    assert_raises(Liquid::SyntaxError) do
-      Liquid::Template.parse("{% assign a.b = 'hello' %}", error_mode: :strict2)
-    end
-  end
-
-  def test_assign_rejects_numeric_variable_name_in_strict2
-    assert_raises(Liquid::SyntaxError) do
-      Liquid::Template.parse("{% assign 1abc = 'hello' %}", error_mode: :strict2)
-    end
-  end
-
-  def test_assign_allows_invalid_names_in_lax
-    assert_template_result("1234", "{% assign (a(b(c) = 1234 %}{{ self['(a(b(c)'] }}", error_mode: :lax)
-  end
-
-  def test_assign_with_filter_in_strict2
-    assert_template_result("HELLO", "{% assign my_var = 'hello' | upcase %}{{ my_var }}", error_mode: :strict2)
-  end
-
   private
 
   class ObjectWrapperDrop < Liquid::Drop

test/integration/blank_body_error_handling_test.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class BlankBodyErrorHandlingTest < Minitest::Test
-  COMPARISON_ERROR = 'Liquid error (line 1): comparison of Integer with String failed'
-  INVALID_INTEGER_ERROR = 'Liquid error (line 1): invalid integer'
-
-  def render_inline(source, error_mode:, assigns: {})
-    Liquid::Template.parse(source, line_numbers: true, error_mode: error_mode).render(assigns, render_errors: true)
-  end
-
-  def assert_render_raises(source, error_mode:, assigns: {}, message: nil)
-    error = assert_raises(Liquid::ArgumentError) do
-      Liquid::Template.parse(source, line_numbers: true, error_mode: error_mode).render!(assigns)
-    end
-    assert_includes(error.message, message) if message
-  end
-
-  def test_blank_if_body_suppresses_inline_error_text_in_lax_and_strict
-    [:lax, :strict].each do |mode|
-      assert_equal('', render_inline('{% if 5 > "x" %}{% endif %}', error_mode: mode))
-    end
-  end
-
-  def test_blank_unless_body_suppresses_inline_error_text_in_lax_and_strict
-    [:lax, :strict].each do |mode|
-      assert_equal('', render_inline('{% unless 5 > "x" %} {% endunless %}', error_mode: mode))
-    end
-  end
-
-  def test_blank_for_body_suppresses_inline_error_text_in_lax_and_strict
-    [:lax, :strict].each do |mode|
-      assert_equal('', render_inline('{% for i in (1..3) offset: xs %}{% endfor %}', error_mode: mode, assigns: { 'xs' => 'bad' }))
-    end
-  end
-
-  def test_strict2_blank_if_body_shows_inline_error_text
-    assert_equal(COMPARISON_ERROR, render_inline('{% if 5 > "x" %}{% endif %}', error_mode: :strict2))
-  end
-
-  def test_strict2_whitespace_if_body_shows_inline_error_text
-    assert_equal(COMPARISON_ERROR, render_inline('{% if 5 > "x" %}   {% endif %}', error_mode: :strict2))
-  end
-
-  def test_strict2_assign_if_body_shows_inline_error_text
-    assert_equal(COMPARISON_ERROR, render_inline('{% if 5 > "x" %}{% assign a = 1 %}{% endif %}', error_mode: :strict2))
-  end
-
-  def test_strict2_comment_if_body_shows_inline_error_text
-    assert_equal(COMPARISON_ERROR, render_inline('{% if 5 > "x" %}{% comment %}c{% endcomment %}{% endif %}', error_mode: :strict2))
-  end
-
-  def test_strict2_capture_if_body_shows_inline_error_text
-    assert_equal(COMPARISON_ERROR, render_inline('{% if 5 > "x" %}{% capture c %}text{% endcapture %}{% endif %}', error_mode: :strict2))
-  end
-
-  def test_strict2_blank_unless_body_shows_inline_error_text
-    assert_equal(COMPARISON_ERROR, render_inline('{% unless 5 > "x" %} {% endunless %}', error_mode: :strict2))
-  end
-
-  def test_strict2_blank_for_body_shows_inline_error_text
-    assert_equal(INVALID_INTEGER_ERROR, render_inline('{% for i in (1..3) offset: xs %}{% endfor %}', error_mode: :strict2, assigns: { 'xs' => 'bad' }))
-  end
-
-  def test_nonblank_bodies_show_inline_error_text_in_all_modes
-    [:lax, :strict, :strict2].each do |mode|
-      assert_equal(COMPARISON_ERROR, render_inline('{% if 5 > "x" %}{% echo 1 %}{% endif %}', error_mode: mode))
-      assert_equal(COMPARISON_ERROR, render_inline('{% if 5 > "x" %}{{ "" }}{% endif %}', error_mode: mode))
-      assert_equal(COMPARISON_ERROR, render_inline('{% if 5 > "x" %}{% else %}E{% endif %}', error_mode: mode))
-    end
-  end
-
-  def test_raised_errors_are_not_swallowed_by_blank_if_body
-    [:lax, :strict, :strict2].each do |mode|
-      assert_render_raises('{% if 5 > "x" %}{% endif %}', error_mode: mode, message: 'comparison of Integer with String failed')
-    end
-  end
-
-  def test_raised_errors_are_not_swallowed_by_blank_for_body
-    [:lax, :strict, :strict2].each do |mode|
-      assert_render_raises('{% for i in (1..3) offset: xs %}{% endfor %}', error_mode: mode, assigns: { 'xs' => 'bad' }, message: 'invalid integer')
-    end
-  end
-end

test/integration/capture_test.rb

@@ -6,11 +6,7 @@ class CaptureTest < Minitest::Test
   include Liquid
 
   def test_captures_block_content_in_variable
-    assert_template_result("test string", "{% capture var %}test string{% endcapture %}{{var}}", {})
-  end
-
-  def test_captures_block_content_in_quoted_variable_in_lax
-    assert_template_result("test string", "{% capture 'var' %}test string{% endcapture %}{{var}}", {}, error_mode: :lax)
+    assert_template_result("test string", "{% capture 'var' %}test string{% endcapture %}{{var}}", {})
   end
 
   def test_capture_with_hyphen_in_variable_name
@@ -53,35 +49,4 @@ class CaptureTest < Minitest::Test
     t.render!
     assert_equal(9, t.resource_limits.assign_score)
   end
-
-  def test_capture_with_valid_identifier_in_strict2
-    assert_template_result("hello", "{% capture my_var %}hello{% endcapture %}{{ my_var }}", error_mode: :strict2)
-  end
-
-  def test_capture_with_hyphen_in_strict2
-    assert_template_result("hello", "{% capture my-var %}hello{% endcapture %}{{ my-var }}", error_mode: :strict2)
-  end
-
-  def test_capture_rejects_parentheses_in_variable_name_in_strict2
-    assert_raises(Liquid::SyntaxError) do
-      Liquid::Template.parse("{% capture (x[y %}hello{% endcapture %}", error_mode: :strict2)
-    end
-  end
-
-  def test_capture_rejects_dot_in_variable_name_in_strict2
-    assert_raises(Liquid::SyntaxError) do
-      Liquid::Template.parse("{% capture a.b %}hello{% endcapture %}", error_mode: :strict2)
-    end
-  end
-
-  def test_capture_rejects_numeric_variable_name_in_strict2
-    assert_raises(Liquid::SyntaxError) do
-      Liquid::Template.parse("{% capture 1abc %}hello{% endcapture %}", error_mode: :strict2)
-    end
-  end
-
-  def test_capture_allows_invalid_names_in_lax
-    t = Liquid::Template.parse("{% capture (x[y %}hello{% endcapture %}", error_mode: :lax)
-    assert_equal("(x[y", t.root.nodelist.first.to)
-  end
 end

test/integration/context_test.rb

@@ -296,8 +296,8 @@ class ContextTest < Minitest::Test
   end
 
   def test_access_variable_with_hash_notation
-    assert_template_result('baz', '{{ foo }}', { "foo" => "baz" })
-    assert_template_result('baz', '{{ self[bar] }}', { 'foo' => 'baz', 'bar' => 'foo' })
+    assert_template_result('baz', '{{ ["foo"] }}', { "foo" => "baz" })
+    assert_template_result('baz', '{{ [bar] }}', { 'foo' => 'baz', 'bar' => 'foo' })
   end
 
   def test_access_hashes_with_hash_access_variables
@@ -632,28 +632,13 @@ class ContextTest < Minitest::Test
   end
 
   def test_has_key_will_not_add_an_error_for_missing_keys
-    with_error_modes(:strict) do
+    with_error_mode(:strict) do
       context = Context.new
       context.key?('unknown')
       assert_empty(context.errors)
     end
   end
 
-  def test_key_lookup_will_raise_for_missing_keys_when_strict_variables_is_enabled
-    context = Context.new
-    context.strict_variables = true
-    assert_raises(Liquid::UndefinedVariable) do
-      context['unknown']
-    end
-  end
-
-  def test_has_key_will_not_raise_for_missing_keys_when_strict_variables_is_enabled
-    context = Context.new
-    context.strict_variables = true
-    refute(context.key?('unknown'))
-    assert_empty(context.errors)
-  end
-
   def test_context_always_uses_static_registers
     registers = {
       my_register: :my_value,

test/integration/error_handling_test.rb

@@ -67,7 +67,7 @@ class ErrorHandlingTest < Minitest::Test
   end
 
   def test_unrecognized_operator
-    with_error_modes(:strict) do
+    with_error_mode(:strict) do
       assert_raises(SyntaxError) do
         Liquid::Template.parse(' {% if 1 =! 2 %}ok{% endif %} ')
       end
@@ -265,13 +265,11 @@ class ErrorHandlingTest < Minitest::Test
   end
 
   def test_bug_compatible_silencing_of_errors_in_blank_nodes
-    with_error_modes(:lax, :strict) do
-      output = Liquid::Template.parse("{% assign x = 0 %}{% if 1 < '2' %}not blank{% assign x = 3 %}{% endif %}{{ x }}").render
-      assert_equal("Liquid error: comparison of Integer with String failed0", output)
+    output = Liquid::Template.parse("{% assign x = 0 %}{% if 1 < '2' %}not blank{% assign x = 3 %}{% endif %}{{ x }}").render
+    assert_equal("Liquid error: comparison of Integer with String failed0", output)
 
-      output = Liquid::Template.parse("{% assign x = 0 %}{% if 1 < '2' %}{% assign x = 3 %}{% endif %}{{ x }}").render
-      assert_equal("0", output)
-    end
+    output = Liquid::Template.parse("{% assign x = 0 %}{% if 1 < '2' %}{% assign x = 3 %}{% endif %}{{ x }}").render
+    assert_equal("0", output)
   end
 
   def test_syntax_error_is_raised_with_template_name

test/integration/expression_test.rb

@@ -26,12 +26,8 @@ class ExpressionTest < Minitest::Test
   def test_float
     assert_template_result("-17.42", "{{ -17.42 }}")
     assert_template_result("2.5", "{{ 2.5 }}")
-
-    with_error_modes(:lax) do
-      assert_expression_result(0.0, "0.....5")
-      assert_expression_result(0.0, "-0..1")
-    end
-
+    assert_expression_result(0.0, "0.....5")
+    assert_expression_result(0.0, "-0..1")
     assert_expression_result(1.5, "1.5")
 
     # this is a unfortunate quirky behavior of Liquid
@@ -65,7 +61,6 @@ class ExpressionTest < Minitest::Test
     assert_template_result(
       "",
       "{{ - 'theme.css' - }}",
-      error_mode: :lax,
     )
   end
 
@@ -152,35 +147,6 @@ class ExpressionTest < Minitest::Test
     assert(parse_context.instance_variable_get(:@expression_cache).nil?)
   end
 
-  def test_safe_parse_with_variable_lookup
-    parse_context = Liquid::ParseContext.new
-    parser = parse_context.new_parser('product.title')
-    result = Liquid::Expression.safe_parse(parser)
-
-    assert_instance_of(Liquid::VariableLookup, result)
-    assert_equal('product', result.name)
-    assert_equal(['title'], result.lookups)
-  end
-
-  def test_safe_parse_with_number
-    parse_context = Liquid::ParseContext.new
-    parser = parse_context.new_parser('42')
-    result = Liquid::Expression.safe_parse(parser)
-
-    assert_equal(42, result)
-  end
-
-  def test_safe_parse_raises_syntax_error_for_invalid_expression
-    parse_context = Liquid::ParseContext.new
-    parser = parse_context.new_parser('')
-
-    error = assert_raises(Liquid::SyntaxError) do
-      Liquid::Expression.safe_parse(parser)
-    end
-
-    assert_match(/is not a valid expression/, error.message)
-  end
-
   private
 
   def assert_expression_result(expect, markup, **assigns)

test/integration/hash_rendering_test.rb

@@ -88,11 +88,17 @@ class HashRenderingTest < Minitest::Test
   end
 
   def test_rendering_hash_with_custom_to_s_method_uses_custom_to_s
-    assert_template_result("kewl", "{{ my_hash }}", { "my_hash" => HashWithCustomToS.new })
+    my_hash = Class.new(Hash) do
+      def to_s
+        "kewl"
+      end
+    end.new
+
+    assert_template_result("kewl", "{{ my_hash }}", { "my_hash" => my_hash })
   end
 
   def test_rendering_hash_without_custom_to_s_uses_default_inspect
-    my_hash = HashWithoutCustomToS.new
+    my_hash = Class.new(Hash).new
     my_hash[:foo] = :bar
 
     assert_template_result("{:foo=>:bar}", "{{ my_hash }}", { "my_hash" => my_hash })

test/integration/parsing_quirks_test.rb

@@ -31,18 +31,18 @@ class ParsingQuirksTest < Minitest::Test
   def test_error_on_empty_filter
     assert(Template.parse("{{test}}"))
 
-    with_error_modes(:lax) do
+    with_error_mode(:lax) do
       assert(Template.parse("{{|test}}"))
     end
 
-    with_error_modes(:strict) do
+    with_error_mode(:strict) do
       assert_raises(SyntaxError) { Template.parse("{{|test}}") }
       assert_raises(SyntaxError) { Template.parse("{{test |a|b|}}") }
     end
   end
 
   def test_meaningless_parens_error
-    with_error_modes(:strict) do
+    with_error_mode(:strict) do
       assert_raises(SyntaxError) do
         markup = "a == 'foo' or (b == 'bar' and c == 'baz') or false"
         Template.parse("{% if #{markup} %} YES {% endif %}")
@@ -51,7 +51,7 @@ class ParsingQuirksTest < Minitest::Test
   end
 
   def test_unexpected_characters_syntax_error
-    with_error_modes(:strict) do
+    with_error_mode(:strict) do
       assert_raises(SyntaxError) do
         markup = "true && false"
         Template.parse("{% if #{markup} %} YES {% endif %}")
@@ -70,7 +70,7 @@ class ParsingQuirksTest < Minitest::Test
   end
 
   def test_meaningless_parens_lax
-    with_error_modes(:lax) do
+    with_error_mode(:lax) do
       assigns = { 'b' => 'bar', 'c' => 'baz' }
       markup  = "a == 'foo' or (b == 'bar' and c == 'baz') or false"
       assert_template_result(' YES ', "{% if #{markup} %} YES {% endif %}", assigns)
@@ -78,7 +78,7 @@ class ParsingQuirksTest < Minitest::Test
   end
 
   def test_unexpected_characters_silently_eat_logic_lax
-    with_error_modes(:lax) do
+    with_error_mode(:lax) do
       markup = "true && false"
       assert_template_result(' YES ', "{% if #{markup} %} YES {% endif %}")
       markup = "false || true"
@@ -93,7 +93,7 @@ class ParsingQuirksTest < Minitest::Test
   end
 
   def test_unanchored_filter_arguments
-    with_error_modes(:lax) do
+    with_error_mode(:lax) do
       assert_template_result('hi', "{{ 'hi there' | split$$$:' ' | first }}")
 
       assert_template_result('x', "{{ 'X' | downcase) }}")
@@ -106,14 +106,14 @@ class ParsingQuirksTest < Minitest::Test
   end
 
   def test_invalid_variables_work
-    with_error_modes(:lax) do
+    with_error_mode(:lax) do
       assert_template_result('bar', "{% assign 123foo = 'bar' %}{{ 123foo }}")
       assert_template_result('123', "{% assign 123 = 'bar' %}{{ 123 }}")
     end
   end
 
   def test_extra_dots_in_ranges
-    with_error_modes(:lax) do
+    with_error_mode(:lax) do
       assert_template_result('12345', "{% for i in (1...5) %}{{ i }}{% endfor %}")
     end
   end
@@ -133,7 +133,7 @@ class ParsingQuirksTest < Minitest::Test
   end
 
   def test_incomplete_expression
-    with_error_modes(:lax) do
+    with_error_mode(:lax) do
       assert_template_result("false", "{{ false - }}")
       assert_template_result("false", "{{ false > }}")
       assert_template_result("false", "{{ false < }}")

test/integration/security_test.rb

@@ -44,43 +44,33 @@ class SecurityTest < Minitest::Test
   end
 
   def test_does_not_permanently_add_filters_to_symbol_table
-    assert_no_new_symbols do
-      # MRI imprecisely marks objects found on the C stack, which can result
-      # in uninitialized memory being marked. This can even result in the test failing
-      # deterministically for a given compilation of ruby. Using a separate thread will
-      # keep these writes of the symbol pointer on a separate stack that will be garbage
-      # collected after Thread#join.
-      Thread.new do
-        test = %( {{ "some_string" | a_bad_filter }} )
-        Template.parse(test).render!
-        nil
-      end.join
+    current_symbols = Symbol.all_symbols
 
-      GC.start
-    end
+    # MRI imprecisely marks objects found on the C stack, which can result
+    # in uninitialized memory being marked. This can even result in the test failing
+    # deterministically for a given compilation of ruby. Using a separate thread will
+    # keep these writes of the symbol pointer on a separate stack that will be garbage
+    # collected after Thread#join.
+    Thread.new do
+      test = %( {{ "some_string" | a_bad_filter }} )
+      Template.parse(test).render!
+      nil
+    end.join
+
+    GC.start
+
+    assert_equal([], (Symbol.all_symbols - current_symbols))
   end
 
   def test_does_not_add_drop_methods_to_symbol_table
-    assigns = { 'drop' => Drop.new }
-    method_names = Array.new(3) { |index| "untrusted_drop_method_#{object_id}_#{index}" }
-
-    method_names.each do |method_name|
-      assert_equal("", Template.parse("{{ drop.#{method_name} }}").render!(assigns))
-    end
-
-    # JITs can intern internal metadata; untrusted Drop method names must not be interned.
-    assert_equal([], Symbol.all_symbols.map(&:to_s) & method_names)
-  end
-
-  def assert_no_new_symbols
-    # Run once to trigger any first-time initialization which might create some symbols,
-    # for example autoload or lazy method parsing might create symbols on first execution.
-    yield
-
-    # Ensure no new symbols for further runs, i.e. the code does not leak symbols
     current_symbols = Symbol.all_symbols
-    yield
-    assert_equal([], Symbol.all_symbols - current_symbols)
+
+    assigns = { 'drop' => Drop.new }
+    assert_equal("", Template.parse("{{ drop.custom_method_1 }}", assigns).render!)
+    assert_equal("", Template.parse("{{ drop.custom_method_2 }}", assigns).render!)
+    assert_equal("", Template.parse("{{ drop.custom_method_3 }}", assigns).render!)
+
+    assert_equal([], (Symbol.all_symbols - current_symbols))
   end
 
   def test_max_depth_nested_blocks_does_not_raise_exception

test/integration/self_drop_context_test.rb

@@ -1,120 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class SelfDropContextTest < Minitest::Test
-  include Liquid
-
-  def test_self_drop_passed_as_render_param_preserves_original_scope
-    source = <<~LIQUID
-      {%- assign var = 42 -%}
-      {%- assign s = self -%}
-      {%- render "snippet1", other_self: s -%}
-    LIQUID
-
-    partials = {
-      'snippet1' => <<~LIQUID,
-        {%- assign var = 43 -%}
-        {{- other_self.var }}|{{ self.var -}}
-      LIQUID
-    }
-
-    assert_template_result('42|43', source, partials: partials)
-  end
-
-  def test_self_drop_in_render_without_passing_resolves_inner_scope
-    source = <<~LIQUID
-      {%- assign var = 42 -%}
-      {%- render "snippet1" -%}
-    LIQUID
-
-    partials = {
-      'snippet1' => <<~LIQUID,
-        {%- assign var = 99 -%}
-        {{- self.var -}}
-      LIQUID
-    }
-
-    assert_template_result('99', source, partials: partials)
-  end
-
-  def test_self_drop_passed_to_nested_renders_preserves_each_level
-    source = <<~LIQUID
-      {%- assign a = 1 -%}
-      {%- assign s1 = self -%}
-      {%- render "snippet1", outer: s1 -%}
-    LIQUID
-
-    partials = {
-      'snippet1' => <<~LIQUID,
-        {%- assign a = 2 -%}
-        {%- assign s2 = self -%}
-        {%- render "snippet2", outer: outer, middle: s2 -%}
-      LIQUID
-      'snippet2' => <<~LIQUID,
-        {%- assign a = 3 -%}
-        {{- outer.a }}|{{ middle.a }}|{{ self.a -}}
-      LIQUID
-    }
-
-    assert_template_result('1|2|3', source, partials: partials)
-  end
-
-  def test_self_drop_reflects_variables_assigned_after_creation
-    source = <<~LIQUID
-      {%- assign s = self -%}
-      {%- assign x = 42 %}{{ s.x -}}
-    LIQUID
-
-    assert_template_result('42', source)
-  end
-
-  def test_self_drop_context_setter_is_undefined
-    context = Context.new
-    drop = SelfDrop.new(context)
-    refute(drop.respond_to?(:context=))
-
-    assert_template_result('42', '{{ self.x }}', { 'x' => 42 })
-  end
-
-  def test_self_drop_repeated_lookups_compare_equal_for_same_context
-    context = Context.new
-    drop = context.find_variable("self")
-    cached_drop = context.find_variable("self")
-
-    assert_same(drop, cached_drop)
-    assert_equal(drop.object_id, cached_drop.object_id)
-    assert_equal(drop, cached_drop)
-  end
-
-  def test_assigned_self_drop_compares_equal_to_itself
-    assert_template_result('T', '{% assign s = self %}{% if s == s %}T{% else %}F{% endif %}')
-  end
-
-  def test_distinct_self_assignments_compare_equal_for_same_context
-    assert_template_result('T', '{% assign a = self %}{% assign b = self %}{% if a == b %}T{% else %}F{% endif %}')
-  end
-
-  def test_bare_self_compares_equal_to_bare_self
-    assert_template_result('T', '{% if self == self %}T{% else %}F{% endif %}')
-  end
-
-  def test_self_drop_with_strict_variables_does_not_raise_for_defined_var
-    t = Template.parse('{{ self.x }}')
-    result = t.render({ 'x' => 42 }, strict_variables: true)
-    assert_equal('42', result)
-  end
-
-  def test_self_drop_with_strict_variables_returns_nil_for_undefined_var
-    t = Template.parse('{{ self.x }}')
-    result = t.render({}, strict_variables: true)
-    assert_equal('', result)
-  end
-
-  def test_self_drop_can_be_passed_as_bare_drop_to_render
-    t = Template.parse('{{ self.x }}')
-    drop = SelfDrop.new(Context.new({ 'x' => 42 }))
-    result = t.render(drop)
-    assert_equal('42', result)
-  end
-end

test/integration/standard_filter_test.rb

@@ -116,7 +116,7 @@ class StandardFiltersTest < Minitest::Test
   end
 
   def test_slice_on_arrays
-    input = 'foobar'.split('')
+    input = 'foobar'.split(//)
     assert_equal(%w(o o b), @filters.slice(input, 1, 3))
     assert_equal(%w(o o b a r), @filters.slice(input, 1, 1000))
     assert_equal(%w(), @filters.slice(input, 1, 0))
@@ -164,13 +164,6 @@ class StandardFiltersTest < Minitest::Test
     assert_equal(['A', 'Z'], @filters.split('A1Z', 1))
   end
 
-  def test_squish_filter
-    assert_equal("foo bar boo", Liquid::Template.parse(%({{ " foo   bar
-\t   boo   " | squish }})).render)
-    assert_equal("", Liquid::Template.parse('{{ nil | squish }}').render)
-    assert_equal("", Liquid::Template.parse('{{ " " | squish }}').render)
-  end
-
   def test_escape
     assert_equal('&lt;strong&gt;', @filters.escape('<strong>'))
     assert_equal('1', @filters.escape(1))
@@ -301,7 +294,13 @@ class StandardFiltersTest < Minitest::Test
   end
 
   def test_join_calls_to_liquid_on_each_element
-    assert_equal('i did it, i did it', @filters.join([CustomToLiquidDrop.new('i did it'), CustomToLiquidDrop.new('i did it')], ", "))
+    drop = Class.new(Liquid::Drop) do
+      def to_liquid
+        'i did it'
+      end
+    end
+
+    assert_equal('i did it, i did it', @filters.join([drop.new, drop.new], ", "))
   end
 
   def test_sort
@@ -634,40 +633,6 @@ class StandardFiltersTest < Minitest::Test
     assert_nil(@filters.last([]))
   end
 
-  def test_first_last_on_strings
-    # Ruby's String class does not have first/last methods by default.
-    # ActiveSupport adds String#first and String#last to return the first/last character.
-    # Liquid must work without ActiveSupport, so the first/last filters handle strings specially.
-    #
-    # This enables template patterns like:
-    #   {{ product.title | first }}  => "S" (for "Snowboard")
-    #   {{ customer.name | last }}   => "h" (for "Smith")
-    #
-    # Note: ActiveSupport returns "" for empty strings, not nil.
-    assert_equal('f', @filters.first('foo'))
-    assert_equal('o', @filters.last('foo'))
-    assert_equal('', @filters.first(''))
-    assert_equal('', @filters.last(''))
-  end
-
-  def test_first_last_on_unicode_strings
-    # Unicode strings should return the first/last grapheme cluster (character),
-    # not the first/last byte. Ruby's String#[] handles this correctly with index 0/-1.
-    # This ensures international text works properly:
-    #   {{ korean_name | first }} => "고" (not a partial byte sequence)
-    assert_equal('고', @filters.first('고스트빈'))
-    assert_equal('빈', @filters.last('고스트빈'))
-  end
-
-  def test_first_last_on_strings_via_template
-    # Integration test to verify the filter works end-to-end in templates.
-    # Empty strings return empty output (nil renders as empty string).
-    assert_template_result('f', '{{ name | first }}', { 'name' => 'foo' })
-    assert_template_result('o', '{{ name | last }}', { 'name' => 'foo' })
-    assert_template_result('', '{{ name | first }}', { 'name' => '' })
-    assert_template_result('', '{{ name | last }}', { 'name' => '' })
-  end
-
   def test_replace
     assert_equal('b b b b', @filters.replace('a a a a', 'a', 'b'))
     assert_equal('2 2 2 2', @filters.replace('1 1 1 1', 1, 2))
@@ -1181,8 +1146,6 @@ class StandardFiltersTest < Minitest::Test
   end
 
   def test_all_filters_never_raise_non_liquid_exception
-    skip("too slow on non-CRuby due to many exceptions") unless RUBY_ENGINE == 'ruby'
-
     test_drop = TestDrop.new(value: "test")
     test_drop.context = Context.new
     test_enum = TestEnumerable.new
@@ -1339,7 +1302,7 @@ class StandardFiltersTest < Minitest::Test
     assert_equal(1, @filters.sum(input, true))
     assert_equal(0.2, @filters.sum(input, 1.0))
     assert_equal(-0.3, @filters.sum(input, 1))
-    assert_equal(0.4, @filters.sum(input, 1..5))
+    assert_equal(0.4, @filters.sum(input, (1..5)))
     assert_equal(0, @filters.sum(input, nil))
     assert_equal(0, @filters.sum(input, ""))
   end

test/integration/tags/cycle_tag_test.rb

@@ -3,10 +3,20 @@
 require 'test_helper'
 
 class CycleTagTest < Minitest::Test
+  def test_simple_cycle
+    template = <<~LIQUID
+      {%- cycle '1', '2', '3' -%}
+      {%- cycle '1', '2', '3' -%}
+      {%- cycle '1', '2', '3' -%}
+    LIQUID
+
+    assert_template_result("123", template)
+  end
+
   def test_simple_cycle_inside_for_loop
     template = <<~LIQUID
       {%- for i in (1..3) -%}
-        {%- cycle '1', '2', '3' -%}
+        {% cycle '1', '2', '3' %}
       {%- endfor -%}
     LIQUID
 
@@ -26,155 +36,13 @@ class CycleTagTest < Minitest::Test
     assert_template_result("123", template)
   end
 
-  def test_cycle_named_groups_string
-    template = <<~LIQUID
-      {%- for i in (1..3) -%}
-        {%- cycle 'placeholder1': 1, 2, 3 -%}
-        {%- cycle 'placeholder2': 1, 2, 3 -%}
-      {%- endfor -%}
-    LIQUID
-
-    assert_template_result("112233", template)
-  end
-
-  def test_cycle_named_groups_vlookup
-    template = <<~LIQUID
-      {%- assign placeholder1 = 'placeholder1' -%}
-      {%- assign placeholder2 = 'placeholder2' -%}
-      {%- for i in (1..3) -%}
-        {%- cycle placeholder1: 1, 2, 3 -%}
-        {%- cycle placeholder2: 1, 2, 3 -%}
-      {%- endfor -%}
-    LIQUID
-
-    assert_template_result("112233", template)
-  end
-
-  def test_unnamed_cycle_have_independent_counters_when_used_with_lookups
+  def test_cycle_tag_always_resets_cycle
     template = <<~LIQUID
       {%- assign a = "1" -%}
-      {%- for i in (1..3) -%}
-        {%- cycle a, "2" -%}
-        {%- cycle a, "2" -%}
-      {%- endfor -%}
+      {%- cycle a, "2" -%}
+      {%- cycle a, "2" -%}
     LIQUID
 
-    assert_template_result("112211", template)
-  end
-
-  def test_unnamed_cycle_dependent_counter_when_used_with_literal_values
-    template = <<~LIQUID
-      {%- cycle "1", "2" -%}
-      {%- cycle "1", "2" -%}
-      {%- cycle "1", "2" -%}
-    LIQUID
-
-    assert_template_result("121", template)
-  end
-
-  def test_optional_trailing_comma
-    template = <<~LIQUID
-      {%- cycle "1", "2", -%}
-      {%- cycle "1", "2", -%}
-      {%- cycle "1", "2", -%}
-      {%- cycle "1", -%}
-    LIQUID
-
-    assert_template_result("1211", template)
-  end
-
-  def test_cycle_tag_without_arguments
-    error = assert_raises(Liquid::SyntaxError) do
-      Template.parse("{% cycle %}")
-    end
-
-    assert_match(/Syntax Error in 'cycle' - Valid syntax: cycle \[name :\] var/, error.message)
-  end
-
-  def test_cycle_tag_with_error_mode
-    # QuotedFragment is more permissive than what Parser#expression allows.
-    template1 = "{% assign 5 = 'b' %}{% cycle .5, .4 %}"
-    template2 = "{% cycle .5: 'a', 'b' %}"
-
-    with_error_modes(:lax, :strict) do
-      assert_template_result("b", template1)
-      assert_template_result("a", template2)
-    end
-
-    with_error_modes(:strict2) do
-      error1 = assert_raises(Liquid::SyntaxError) { Template.parse(template1) }
-      error2 = assert_raises(Liquid::SyntaxError) { Template.parse(template2) }
-
-      assert_match(/Liquid syntax error:/, error1.message)
-      assert_match(/Liquid syntax error: \[:dot, "."\] is not a valid expression/, error2.message)
-    end
-  end
-
-  def test_cycle_with_trailing_elements
-    assignments = "{% assign a = 'A' %}{% assign n = 'N' %}"
-
-    template1 = "#{assignments}{% cycle       'a'  'b', 'c' %}"
-    template2 = "#{assignments}{% cycle name: 'a'  'b', 'c' %}"
-    template3 = "#{assignments}{% cycle name: 'a', 'b'  'c' %}"
-    template4 = "#{assignments}{% cycle n  e: 'a', 'b', 'c' %}"
-    template5 = "#{assignments}{% cycle n  e  'a', 'b', 'c' %}"
-
-    with_error_modes(:lax, :strict) do
-      assert_template_result("a", template1)
-      assert_template_result("a", template2)
-      assert_template_result("a", template3)
-      assert_template_result("N", template4)
-      assert_template_result("N", template5)
-    end
-
-    with_error_modes(:strict2) do
-      error1 = assert_raises(Liquid::SyntaxError) { Template.parse(template1) }
-      error2 = assert_raises(Liquid::SyntaxError) { Template.parse(template2) }
-      error3 = assert_raises(Liquid::SyntaxError) { Template.parse(template3) }
-      error4 = assert_raises(Liquid::SyntaxError) { Template.parse(template4) }
-      error5 = assert_raises(Liquid::SyntaxError) { Template.parse(template5) }
-
-      expected_error = /Expected end_of_string but found/
-
-      assert_match(expected_error, error1.message)
-      assert_match(expected_error, error2.message)
-      assert_match(expected_error, error3.message)
-      assert_match(expected_error, error4.message)
-      assert_match(expected_error, error5.message)
-    end
-  end
-
-  def test_cycle_name_with_invalid_expression
-    template = <<~LIQUID
-      {% for i in (1..3) %}
-        {% cycle foo=>bar: "a", "b" %}
-      {% endfor %}
-    LIQUID
-
-    with_error_modes(:lax, :strict) do
-      refute_nil(Template.parse(template))
-    end
-
-    with_error_modes(:strict2) do
-      error = assert_raises(Liquid::SyntaxError) { Template.parse(template) }
-      assert_match(/Unexpected character =/, error.message)
-    end
-  end
-
-  def test_cycle_variable_with_invalid_expression
-    template = <<~LIQUID
-      {% for i in (1..3) %}
-        {% cycle foo=>bar, "a", "b" %}
-      {% endfor %}
-    LIQUID
-
-    with_error_modes(:lax, :strict) do
-      refute_nil(Template.parse(template))
-    end
-
-    with_error_modes(:strict2) do
-      error = assert_raises(Liquid::SyntaxError) { Template.parse(template) }
-      assert_match(/Unexpected character =/, error.message)
-    end
+    assert_template_result("11", template)
   end
 end

test/integration/tags/for_tag_test.rb

@@ -465,85 +465,4 @@ HERE
 
     assert(context.registers[:for_stack].empty?)
   end
-
-  def test_integer_range_is_not_materialized_and_charges_empty_iterations
-    range = bounded_integer_range_with_tripwires
-    template = Template.parse('{% for i in numbers %}{% endfor %}')
-    template.resource_limits.render_score_limit = 3
-
-    assert_raises(Liquid::MemoryError) { template.render!('numbers' => range) }
-
-    assert(template.resource_limits.reached?)
-    assert_equal(4, template.resource_limits.render_score)
-  end
-
-  def test_integer_range_uses_arithmetic_offsets_reversal_and_metadata
-    range = bounded_integer_range_with_tripwires
-    template = Template.parse(
-      '{% for i in numbers reversed offset:997 limit:2 %}{{ forloop.length }}:{{ i }}{% endfor %}',
-    )
-    template.resource_limits.render_score_limit = 10
-
-    assert_equal('2:9992:998', template.render!('numbers' => range))
-  end
-
-  def test_range_scores_cannot_be_bypassed_by_repeated_renders
-    template = Template.parse('{% for i in (1..2) %}{% endfor %}')
-    template.resource_limits.cumulative_render_score_limit = 3
-    assert_equal('', template.render!)
-    assert_raises(Liquid::MemoryError) { template.render! }
-  end
-
-  def test_range_break_charges_only_visited_items_and_preserves_full_metadata
-    range = bounded_integer_range_with_tripwires
-    template = Template.parse(
-      '{% for i in numbers reversed %}{{ forloop.length }}:{{ i }}{% break %}{% endfor %}',
-    )
-    template.resource_limits.render_score_limit = 10
-
-    assert_equal('1000:1000', template.render!('numbers' => range))
-    assert_operator(template.resource_limits.render_score, :<=, 10)
-  end
-
-  def test_range_subclass_uses_its_custom_each
-    range = Class.new(Range) do
-      def each
-        yield 10
-        yield 20
-      end
-    end.new(nil, 3)
-
-    assert_template_result('1020', '{% for i in numbers %}{{ i }}{% endfor %}', { 'numbers' => range })
-  end
-
-  def test_range_subclass_custom_to_a_is_honored_for_finite_and_open_bounds
-    range_class = Class.new(Range) do
-      def to_a
-        [42]
-      end
-    end
-
-    [range_class.new(1, 3), range_class.new(nil, 3), range_class.new(1, nil)].each do |range|
-      assert_template_result('42', '{% for i in numbers %}{{ i }}{% endfor %}', { 'numbers' => range })
-    end
-  end
-
-  def test_endless_range_remains_unsupported_with_a_limit
-    template = Template.parse('{% for i in numbers limit:2 %}{{ i }}{% endfor %}')
-
-    assert_raises(RangeError) { template.render!('numbers' => (1..)) }
-  end
-
-  def test_endless_range_subclass_with_custom_each_remains_unsupported
-    range = Class.new(Range) do
-      def each
-        yield 10
-        yield 20
-      end
-    end.new(1, nil)
-
-    assert_raises(RangeError) do
-      Template.parse('{% for i in numbers %}{{ i }}{% endfor %}').render!('numbers' => range)
-    end
-  end
 end

test/integration/tags/include_tag_test.rb

@@ -204,32 +204,6 @@ class IncludeTagTest < Minitest::Test
     )
   end
 
-  def test_strict2_parsing_errors
-    with_error_modes(:lax, :strict) do
-      assert_template_result(
-        'hello value1 value2',
-        '{% include "snippet" !!! arg1: "value1" ~~~ arg2: "value2" %}',
-        partials: { 'snippet' => 'hello {{ arg1 }} {{ arg2 }}' },
-      )
-    end
-
-    with_error_modes(:strict2) do
-      assert_syntax_error(
-        '{% include "snippet" !!! arg1: "value1" ~~~ arg2: "value2" %}',
-      )
-      assert_syntax_error(
-        '{% include "snippet" | filter %}',
-      )
-    end
-  end
-
-  def test_optional_commas
-    partials = { 'snippet' => 'hello {{ arg1 }} {{ arg2 }}' }
-    assert_template_result('hello value1 value2', '{% include "snippet", arg1: "value1", arg2: "value2" %}', partials: partials)
-    assert_template_result('hello value1 value2', '{% include "snippet"  arg1: "value1", arg2: "value2" %}', partials: partials)
-    assert_template_result('hello value1 value2', '{% include "snippet"  arg1: "value1"  arg2: "value2" %}', partials: partials)
-  end
-
   def test_include_tag_caches_second_read_of_same_partial
     file_system = CountingFileSystem.new
     environment = Liquid::Environment.build(file_system: file_system)
@@ -303,13 +277,13 @@ class IncludeTagTest < Minitest::Test
     assert_raises(Liquid::SyntaxError) do
       Template.parse("{% include template %}", error_mode: :strict, environment: env).render!("template" => '{{ "X" || downcase }}')
     end
-    with_error_modes(:lax) do
+    with_error_mode(:lax) do
       assert_equal('x', Template.parse("{% include template %}", error_mode: :strict, include_options_blacklist: true, environment: env).render!("template" => '{{ "X" || downcase }}'))
     end
     assert_raises(Liquid::SyntaxError) do
       Template.parse("{% include template %}", error_mode: :strict, include_options_blacklist: [:locale], environment: env).render!("template" => '{{ "X" || downcase }}')
     end
-    with_error_modes(:lax) do
+    with_error_mode(:lax) do
       assert_equal('x', Template.parse("{% include template %}", error_mode: :strict, include_options_blacklist: [:error_mode], environment: env).render!("template" => '{{ "X" || downcase }}'))
     end
   end
@@ -400,88 +374,4 @@ class IncludeTagTest < Minitest::Test
       render_errors: true,
     )
   end
-
-  def test_include_template_with_invalid_expression
-    template = "{% include foo=>bar %}"
-
-    with_error_modes(:lax, :strict) do
-      refute_nil(Template.parse(template))
-    end
-
-    with_error_modes(:strict2) do
-      error = assert_raises(Liquid::SyntaxError) { Template.parse(template) }
-      assert_match(/Unexpected character =/, error.message)
-    end
-  end
-
-  def test_include_with_invalid_expression
-    template = '{% include "snippet" with foo=>bar %}'
-
-    with_error_modes(:lax, :strict) do
-      refute_nil(Template.parse(template))
-    end
-
-    with_error_modes(:strict2) do
-      error = assert_raises(Liquid::SyntaxError) { Template.parse(template) }
-      assert_match(/Unexpected character =/, error.message)
-    end
-  end
-
-  def test_include_attribute_with_invalid_expression
-    template = '{% include "snippet", key: foo=>bar %}'
-
-    with_error_modes(:lax, :strict) do
-      refute_nil(Template.parse(template))
-    end
-
-    with_error_modes(:strict2) do
-      error = assert_raises(Liquid::SyntaxError) { Template.parse(template) }
-      assert_match(/Unexpected character =/, error.message)
-    end
-  end
-
-  def test_include_for_loop_true_with_for_keyword
-    with_error_modes(:lax, :strict, :strict2) do
-      template = Template.parse("{% include 'product' for products %}")
-      include_node = template.root.nodelist.first
-
-      assert(include_node.for_loop?, "Expected for_loop? to be true for 'for' keyword")
-    end
-  end
-
-  def test_include_for_loop_false_with_with_keyword
-    with_error_modes(:lax, :strict, :strict2) do
-      template = Template.parse("{% include 'product' with product %}")
-      include_node = template.root.nodelist.first
-
-      refute(include_node.for_loop?, "Expected for_loop? to be false for 'with' keyword")
-    end
-  end
-
-  def test_include_for_loop_false_without_keyword
-    with_error_modes(:lax, :strict, :strict2) do
-      template = Template.parse("{% include 'header' %}")
-      include_node = template.root.nodelist.first
-
-      refute(include_node.for_loop?, "Expected for_loop? to be false when no keyword")
-    end
-  end
-
-  def test_include_for_loop_with_alias
-    with_error_modes(:lax, :strict, :strict2) do
-      template = Template.parse("{% include 'product' for products as item %}")
-      include_node = template.root.nodelist.first
-
-      assert(include_node.for_loop?, "Expected for_loop? to be true for 'for' with alias")
-    end
-  end
-
-  def test_include_with_keyword_and_alias
-    with_error_modes(:lax, :strict, :strict2) do
-      template = Template.parse("{% include 'product' with products[0] as item %}")
-      include_node = template.root.nodelist.first
-
-      refute(include_node.for_loop?, "Expected for_loop? to be false for 'with' with alias")
-    end
-  end
 end # IncludeTagTest

test/integration/tags/increment_tag_test.rb

@@ -27,50 +27,4 @@ class IncrementTagTest < Minitest::Test
       '{%decrement starboard %}',
     )
   end
-
-  def test_increment_strict2_rejects_invalid_variable_name
-    assert_raises(Liquid::SyntaxError) do
-      Template.parse('{% increment foo bar %}', error_mode: :strict2)
-    end
-  end
-
-  def test_increment_strict2_rejects_variable_starting_with_number
-    assert_raises(Liquid::SyntaxError) do
-      Template.parse('{% increment 11aa %}', error_mode: :strict2)
-    end
-  end
-
-  def test_increment_strict2_accepts_valid_variable_name
-    template = Template.parse('{% increment my-var %}', error_mode: :strict2)
-    assert_equal('0', template.render)
-  end
-
-  def test_decrement_strict2_rejects_invalid_variable_name
-    assert_raises(Liquid::SyntaxError) do
-      Template.parse('{% decrement foo bar %}', error_mode: :strict2)
-    end
-  end
-
-  def test_decrement_strict2_rejects_variable_starting_with_number
-    assert_raises(Liquid::SyntaxError) do
-      Template.parse('{% decrement 11aa %}', error_mode: :strict2)
-    end
-  end
-
-  def test_decrement_strict2_accepts_valid_variable_name
-    template = Template.parse('{% decrement my-var %}', error_mode: :strict2)
-    assert_equal('-1', template.render)
-  end
-
-  def test_increment_strict2_rejects_empty_variable_name
-    assert_raises(Liquid::SyntaxError) do
-      Template.parse('{% increment %}', error_mode: :strict2)
-    end
-  end
-
-  def test_decrement_strict2_rejects_empty_variable_name
-    assert_raises(Liquid::SyntaxError) do
-      Template.parse('{% decrement %}', error_mode: :strict2)
-    end
-  end
 end

test/integration/tags/render_tag_test.rb

@@ -105,33 +105,7 @@ class RenderTagTest < Minitest::Test
     assert_syntax_error("{% assign name = 'snippet' %}{% render name %}")
   end
 
-  def test_strict2_parsing_errors
-    with_error_modes(:lax, :strict) do
-      assert_template_result(
-        'hello value1 value2',
-        '{% render "snippet" !!! arg1: "value1" ~~~ arg2: "value2" %}',
-        partials: { 'snippet' => 'hello {{ arg1 }} {{ arg2 }}' },
-      )
-    end
-
-    with_error_modes(:strict2) do
-      assert_syntax_error(
-        '{% render "snippet" !!! arg1: "value1" ~~~ arg2: "value2" %}',
-      )
-      assert_syntax_error(
-        '{% render "snippet" | filter %}',
-      )
-    end
-  end
-
-  def test_optional_commas
-    partials = { 'snippet' => 'hello {{ arg1 }} {{ arg2 }}' }
-    assert_template_result('hello value1 value2', '{% render "snippet", arg1: "value1", arg2: "value2" %}', partials: partials)
-    assert_template_result('hello value1 value2', '{% render "snippet"  arg1: "value1", arg2: "value2" %}', partials: partials)
-    assert_template_result('hello value1 value2', '{% render "snippet"  arg1: "value1"  arg2: "value2" %}', partials: partials)
-  end
-
-  def test_render_tag_caches_second_read_of_same_partial
+  def test_include_tag_caches_second_read_of_same_partial
     file_system = StubFileSystem.new('snippet' => 'echo')
     assert_equal(
       'echoecho',
@@ -174,16 +148,16 @@ class RenderTagTest < Minitest::Test
   def test_increment_is_isolated_between_renders
     assert_template_result(
       '010',
-      '{% increment port %}{% increment port %}{% render "incr" %}',
-      partials: { 'incr' => '{% increment port %}' },
+      '{% increment %}{% increment %}{% render "incr" %}',
+      partials: { 'incr' => '{% increment %}' },
     )
   end
 
   def test_decrement_is_isolated_between_renders
     assert_template_result(
       '-1-2-1',
-      '{% decrement port %}{% decrement port %}{% render "decr" %}',
-      partials: { 'decr' => '{% decrement port %}' },
+      '{% decrement %}{% decrement %}{% render "decr" %}',
+      partials: { 'decr' => '{% decrement %}' },
     )
   end
 
@@ -314,30 +288,4 @@ class RenderTagTest < Minitest::Test
       render_errors: true,
     )
   end
-
-  def test_render_with_invalid_expression
-    template = '{% render "snippet" with foo=>bar %}'
-
-    with_error_modes(:lax, :strict) do
-      refute_nil(Template.parse(template))
-    end
-
-    with_error_modes(:strict2) do
-      error = assert_raises(Liquid::SyntaxError) { Template.parse(template) }
-      assert_match(/Unexpected character =/, error.message)
-    end
-  end
-
-  def test_render_attribute_with_invalid_expression
-    template = '{% render "snippet", key: foo=>bar %}'
-
-    with_error_modes(:lax, :strict) do
-      refute_nil(Template.parse(template))
-    end
-
-    with_error_modes(:strict2) do
-      error = assert_raises(Liquid::SyntaxError) { Template.parse(template) }
-      assert_match(/Unexpected character =/, error.message)
-    end
-  end
 end