WIP

.rubocop.yml

@@ -1,16 +1,132 @@
 inherit_from:
-  - https://shopify.github.io/ruby-style-guide/rubocop.yml
   - .rubocop_todo.yml
-
-require: rubocop-performance
-
-Performance:
-  Enabled: true
+  - ./.rubocop_todo.yml
 
 AllCops:
   Exclude:
-    - 'vendor/bundle/**/*'
-      
+    - 'performance/shopify/*'
+    - 'pkg/**'
+
+Metrics/BlockNesting:
+  Max: 3
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Lint/AmbiguousOperator:
+  Enabled: false
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+
+Lint/ParenthesesAsGroupedExpression:
+  Enabled: false
+
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+Style/AndOr:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+Style/NumericLiterals:
+  Enabled: false
+
+Layout/SpaceInsideArrayLiteralBrackets:
+  Enabled: false
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Style/FormatString:
+  Enabled: false
+
+Layout/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/RaiseArgs:
+  Enabled: false
+
+Style/PreferredHashMethods:
+  Enabled: false
+
+Style/RegexpLiteral:
+  Enabled: false
+
+Style/SymbolLiteral:
+  Enabled: false
+
+Performance/Count:
+  Enabled: false
+
+Naming/ConstantName:
+  Enabled: false
+
+Layout/CaseIndentation:
+  Enabled: false
+
+Style/ClassVars:
+  Enabled: false
+
+Style/PerlBackrefs:
+  Enabled: false
+
+Style/TrivialAccessors:
+  AllowPredicates: true
+
+Style/WordArray:
+  Enabled: false
+
 Naming/MethodName:
   Exclude:
-    - 'example/server/liquid_servlet.rb'
+    - 'example/server/liquid_servlet.rb'

.rubocop_todo.yml

@@ -1,37 +1,23 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-29 12:16:25 +1000 using RuboCop version 0.74.0.
+# on 2019-04-22 19:11:24 -0400 using RuboCop version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 13
+# Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
   Exclude:
-    - 'lib/liquid/condition.rb'
-    - 'lib/liquid/expression.rb'
-    - 'performance/shopify/comment_form.rb'
-    - 'performance/shopify/database.rb'
-    - 'performance/shopify/paginate.rb'
-    - 'test/unit/context_unit_test.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
-Layout/ExtraSpacing:
-  Exclude:
-    - 'performance/shopify/paginate.rb'
+    - 'liquid.gemspec'
 
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: squiggly, active_support, powerpack, unindent
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
 Layout/IndentHeredoc:
   Exclude:
     - 'test/integration/tags/for_tag_test.rb'
@@ -46,62 +32,6 @@ Layout/MultilineMethodCallBraceLayout:
     - 'test/integration/error_handling_test.rb'
     - 'test/unit/strainer_unit_test.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'lib/liquid/condition.rb'
-    - 'performance/shopify/paginate.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceBeforeBlockBraces:
-  Exclude:
-    - 'example/server/server.rb'
-    - 'lib/liquid/variable.rb'
-    - 'test/integration/drop_test.rb'
-    - 'test/integration/standard_filter_test.rb'
-    - 'test/integration/tags/if_else_tag_test.rb'
-
-# Offense count: 19
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBrackets: space, no_space
-Layout/SpaceInsideArrayLiteralBrackets:
-  Exclude:
-    - 'test/integration/drop_test.rb'
-    - 'test/integration/standard_filter_test.rb'
-    - 'test/integration/tags/for_tag_test.rb'
-    - 'test/integration/tags/include_tag_test.rb'
-    - 'test/integration/tags/standard_tag_test.rb'
-    - 'test/unit/context_unit_test.rb'
-
-# Offense count: 2
-Lint/AmbiguousOperator:
-  Exclude:
-    - 'test/unit/condition_unit_test.rb'
-
-# Offense count: 16
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'lib/liquid/block_body.rb'
-    - 'lib/liquid/lexer.rb'
-    - 'lib/liquid/standardfilters.rb'
-    - 'lib/liquid/tags/for.rb'
-    - 'lib/liquid/tags/if.rb'
-    - 'lib/liquid/tags/include.rb'
-    - 'lib/liquid/tags/raw.rb'
-    - 'lib/liquid/variable.rb'
-    - 'performance/profile.rb'
-    - 'test/test_helper.rb'
-    - 'test/unit/tokenizer_unit_test.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -110,184 +40,145 @@ Lint/InheritException:
   Exclude:
     - 'lib/liquid/interrupts.rb'
 
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'lib/liquid/condition.rb'
-    - 'lib/liquid/context.rb'
-    - 'lib/liquid/document.rb'
-    - 'lib/liquid/parse_context.rb'
-    - 'lib/liquid/template.rb'
-    - 'performance/shopify/json_filter.rb'
-    - 'test/integration/filter_test.rb'
-    - 'test/integration/render_profiling_test.rb'
-    - 'test/integration/variable_test.rb'
-    - 'test/unit/condition_unit_test.rb'
-
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'example/server/liquid_servlet.rb'
-    - 'test/integration/blank_test.rb'
-    - 'test/integration/error_handling_test.rb'
-    - 'test/integration/filter_test.rb'
-    - 'test/integration/output_test.rb'
-    - 'test/integration/standard_filter_test.rb'
-    - 'test/integration/tags/include_tag_test.rb'
-    - 'test/unit/strainer_unit_test.rb'
-
-# Offense count: 2
-Lint/UselessAssignment:
-  Exclude:
-    - 'performance/shopify/database.rb'
-
 # Offense count: 1
 # Configuration parameters: CheckForMethodsWithNoSideEffects.
 Lint/Void:
   Exclude:
     - 'lib/liquid/parse_context.rb'
 
-# Offense count: 95
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 294
+# Offense count: 53
+Metrics/AbcSize:
+  Max: 56
 
-# Offense count: 44
-Naming/ConstantName:
+# Offense count: 12
+Metrics/CyclomaticComplexity:
+  Max: 13
+
+# Offense count: 112
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 38
+
+# Offense count: 8
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 52
+# Configuration parameters: Blacklist.
+# Blacklist: END, (?-mix:EO[A-Z]{1})
+Naming/HeredocDelimiterNaming:
   Exclude:
-    - 'lib/liquid.rb'
-    - 'lib/liquid/block_body.rb'
-    - 'lib/liquid/tags/assign.rb'
-    - 'lib/liquid/tags/capture.rb'
-    - 'lib/liquid/tags/case.rb'
-    - 'lib/liquid/tags/cycle.rb'
-    - 'lib/liquid/tags/for.rb'
+    - 'test/integration/assign_test.rb'
+    - 'test/integration/capture_test.rb'
+    - 'test/integration/trim_mode_test.rb'
+
+# Offense count: 23
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - 'example/server/example_servlet.rb'
+    - 'lib/liquid/condition.rb'
+    - 'lib/liquid/context.rb'
+    - 'lib/liquid/standardfilters.rb'
     - 'lib/liquid/tags/if.rb'
-    - 'lib/liquid/tags/include.rb'
-    - 'lib/liquid/tags/raw.rb'
-    - 'lib/liquid/tags/table_row.rb'
+    - 'lib/liquid/utils.rb'
     - 'lib/liquid/variable.rb'
-    - 'performance/shopify/comment_form.rb'
-    - 'performance/shopify/paginate.rb'
-    - 'test/integration/tags/include_tag_test.rb'
-
-# Offense count: 2
-# Configuration parameters: .
-# SupportedStyles: snake_case, camelCase
-Naming/MethodName:
-  EnforcedStyle: snake_case
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, conditionals
-Style/AndOr:
-  Exclude:
-    - 'lib/liquid/i18n.rb'
-    - 'lib/liquid/tags/table_row.rb'
-    - 'lib/liquid/tokenizer.rb'
-
-# Offense count: 40
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'test/integration/error_handling_test.rb'
     - 'test/integration/filter_test.rb'
-    - 'test/integration/render_profiling_test.rb'
     - 'test/integration/standard_filter_test.rb'
-    - 'test/integration/tags/echo_test.rb'
-    - 'test/integration/tags/increment_tag_test.rb'
-    - 'test/integration/tags/standard_tag_test.rb'
+    - 'test/integration/tags/for_tag_test.rb'
     - 'test/integration/template_test.rb'
     - 'test/unit/condition_unit_test.rb'
-    - 'test/unit/context_unit_test.rb'
 
-# Offense count: 5
-Style/ClassVars:
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: prefer_alias, prefer_alias_method
+Style/Alias:
   Exclude:
-    - 'lib/liquid/condition.rb'
-    - 'lib/liquid/strainer.rb'
-    - 'lib/liquid/template.rb'
+    - 'lib/liquid/drop.rb'
+    - 'lib/liquid/i18n.rb'
+    - 'lib/liquid/profiler/hooks.rb'
+    - 'lib/liquid/standardfilters.rb'
+    - 'lib/liquid/tag.rb'
+    - 'lib/liquid/tags/include.rb'
+    - 'lib/liquid/variable.rb'
 
-# Offense count: 2
+# Offense count: 22
+Style/CommentedKeyword:
+  Enabled: false
+
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
     - 'lib/liquid/errors.rb'
-    - 'performance/shopify/shop_filter.rb'
 
 # Offense count: 1
-# Configuration parameters: AllowCoercion.
 Style/DateTime:
   Exclude:
     - 'test/unit/context_unit_test.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
-Style/EachWithObject:
-  Exclude:
-    - 'performance/shopify/database.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
 Style/EmptyCaseCondition:
   Exclude:
+    - 'lib/liquid/block_body.rb'
     - 'lib/liquid/lexer.rb'
 
-# Offense count: 1
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: each, for
-Style/For:
+# SupportedStyles: compact, expanded
+Style/EmptyMethod:
   Exclude:
-    - 'performance/shopify/shop_filter.rb'
+    - 'lib/liquid/tag.rb'
+    - 'lib/liquid/tags/comment.rb'
+    - 'lib/liquid/tags/include.rb'
+    - 'test/integration/tags/include_tag_test.rb'
+    - 'test/unit/context_unit_test.rb'
 
-# Offense count: 9
+# Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: format, sprintf, percent
-Style/FormatString:
+Style/Encoding:
+  Exclude:
+    - 'lib/liquid/version.rb'
+    - 'liquid.gemspec'
+    - 'test/integration/standard_filter_test.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
+  Exclude:
+    - 'Rakefile'
+    - 'liquid.gemspec'
+
+# Offense count: 7
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
   Exclude:
-    - 'example/server/example_servlet.rb'
-    - 'performance/shopify/money_filter.rb'
-    - 'performance/shopify/weight_filter.rb'
     - 'test/integration/filter_test.rb'
     - 'test/integration/hash_ordering_test.rb'
 
-# Offense count: 115
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# Offense count: 30
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreMacros, IgnoredMethods, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, EnforcedStyle.
-# SupportedStyles: require_parentheses, omit_parentheses
-Style/MethodCallWithArgsParentheses:
+# Offense count: 14
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
   Exclude:
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'lib/liquid/block_body.rb'
-    - 'lib/liquid/parser.rb'
+    - 'lib/liquid/condition.rb'
+    - 'lib/liquid/lexer.rb'
+    - 'lib/liquid/strainer.rb'
+    - 'lib/liquid/tags/assign.rb'
+    - 'lib/liquid/tags/capture.rb'
+    - 'lib/liquid/tags/case.rb'
     - 'lib/liquid/tags/for.rb'
-    - 'liquid.gemspec'
-    - 'performance/shopify/database.rb'
-    - 'performance/shopify/liquid.rb'
-    - 'test/test_helper.rb'
-    - 'test/unit/condition_unit_test.rb'
-    - 'test/unit/tags/if_tag_unit_test.rb'
+    - 'lib/liquid/tags/include.rb'
+    - 'lib/liquid/tags/raw.rb'
+    - 'lib/liquid/tags/table_row.rb'
+    - 'lib/liquid/variable.rb'
+    - 'test/unit/tokenizer_unit_test.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -297,17 +188,27 @@ Style/Next:
   Exclude:
     - 'lib/liquid/tags/for.rb'
 
-# Offense count: 52
+# Offense count: 4
 # Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Enabled: false
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/liquid/context.rb'
+    - 'lib/liquid/forloop_drop.rb'
+    - 'lib/liquid/standardfilters.rb'
+    - 'lib/liquid/tablerowloop_drop.rb'
 
-# Offense count: 33
+# Offense count: 14
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  Enabled: false
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'lib/liquid/tags/if.rb'
+    - 'liquid.gemspec'
+    - 'test/integration/assign_test.rb'
+    - 'test/integration/standard_filter_test.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -315,52 +216,21 @@ Style/RedundantSelf:
   Exclude:
     - 'lib/liquid/strainer.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/liquid/file_system.rb'
-    - 'lib/liquid/standardfilters.rb'
-    - 'performance/shopify/shop_filter.rb'
-    - 'test/unit/condition_unit_test.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
-# Whitelist: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'lib/liquid/drop.rb'
-    - 'lib/liquid/strainer.rb'
-    - 'lib/liquid/tokenizer.rb'
-
-# Offense count: 10
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAsExpressionSeparator.
 Style/Semicolon:
   Exclude:
-    - 'performance/shopify/database.rb'
     - 'test/integration/error_handling_test.rb'
     - 'test/integration/template_test.rb'
     - 'test/unit/context_unit_test.rb'
 
-# Offense count: 1
+# Offense count: 7
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: use_perl_names, use_english_names
-Style/SpecialGlobalVars:
-  Exclude:
-    - 'performance/shopify/liquid.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiteralsInInterpolation:
-  Exclude:
-    - 'performance/shopify/tag_filter.rb'
+# Configuration parameters: MinSize.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -371,33 +241,6 @@ Style/TernaryParentheses:
     - 'lib/liquid/context.rb'
     - 'lib/liquid/utils.rb'
 
-# Offense count: 21
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArrayLiteral:
-  Exclude:
-    - 'lib/liquid/parse_tree_visitor.rb'
-    - 'lib/liquid/tags/include.rb'
-    - 'test/integration/parse_tree_visitor_test.rb'
-    - 'test/integration/standard_filter_test.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'lib/liquid/condition.rb'
-    - 'lib/liquid/lexer.rb'
-    - 'lib/liquid/standardfilters.rb'
-    - 'performance/shopify/comment_form.rb'
-    - 'performance/shopify/database.rb'
-    - 'performance/shopify/paginate.rb'
-    - 'performance/theme_runner.rb'
-    - 'test/integration/output_test.rb'
-    - 'test/unit/context_unit_test.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/UnneededPercentQ:
@@ -409,3 +252,9 @@ Style/UnneededPercentQ:
 Style/WhileUntilModifier:
   Exclude:
     - 'lib/liquid/tags/case.rb'
+
+# Offense count: 648
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 294

.travis.yml

@@ -1,30 +1,31 @@
 language: ruby
-cache: bundler
 
 rvm:
+  - 2.1
+  - 2.2
+  - 2.3
   - 2.4
   - 2.5
-  - &latest_ruby 2.6
-  - 2.7
   - ruby-head
   - jruby-head
-  - truffleruby
+#  - rbx-2
+
+sudo: false
+
+addons:
+  apt:
+    packages:
+    - libgmp3-dev
 
 matrix:
-  include:
-    - rvm: *latest_ruby
-      script: bundle exec rake memory_profile:run
-      name: Profiling Memory Usage
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: truffleruby
 
-branches:
-  only:
-    - master
-    - gh-pages
-    - /.*-stable/
+install:
+  - bundle install
+
+script: bundle exec rake
 
 notifications:
   disable: true

Gemfile

@@ -5,21 +5,23 @@ end
 
 gemspec
 
+
 group :benchmark, :test do
   gem 'benchmark-ips'
   gem 'memory_profiler'
-  gem 'terminal-table'
 
-  install_if -> { RUBY_PLATFORM !~ /mingw|mswin|java/ && RUBY_ENGINE != 'truffleruby' } do
+  install_if -> { RUBY_PLATFORM !~ /mingw|mswin|java/ } do
     gem 'stackprof'
   end
 end
 
 group :test do
-  gem 'rubocop', '~> 0.74.0', require: false
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '~> 0.53.0'
+  gem 'awesome_print'
+  gem 'pry'
+  gem 'byebug'
 
-  platform :mri, :truffleruby do
-    gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'master'
+  platform :mri do
+    gem 'liquid-c', github: 'Shopify/liquid-c', ref: '9168659de45d6d576fce30c735f857e597fa26f6'
   end
 end

Rakefile

@@ -19,10 +19,8 @@ task :warn_test do
 end
 
 task :rubocop do
-  if RUBY_ENGINE == 'ruby'
-    require 'rubocop/rake_task'
-    RuboCop::RakeTask.new
-  end
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
 end
 
 desc 'runs test suite with both strict and lax parsers'
@@ -34,8 +32,8 @@ task :test do
   Rake::Task['base_test'].reenable
   Rake::Task['base_test'].invoke
 
-  if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'truffleruby'
-    ENV['LIQUID_C'] = '1'
+  if RUBY_ENGINE == 'ruby'
+    ENV['LIQUID-C'] = '1'
 
     ENV['LIQUID_PARSER_MODE'] = 'lax'
     Rake::Task['base_test'].reenable
@@ -47,6 +45,17 @@ task :test do
   end
 end
 
+desc 'runs the test suite using the superfluid compiler'
+Rake::TestTask.new(:test_superfluid) do |t|
+  t.libs << '.' << 'lib' << 'test'
+  t.test_files = FileList['test/integration/**/*_test.rb']
+  t.verbose = false
+
+  ENV['LIQUID_PARSER_MODE'] = 'strict'
+  ENV['LIQUID-C'] = '1'
+  ENV['SUPERFLUID'] = '1'
+end
+
 task gem: :build
 task :build do
   system "gem build liquid.gemspec"
@@ -73,6 +82,11 @@ namespace :benchmark do
   task :strict do
     ruby "./performance/benchmark.rb strict"
   end
+
+  desc "Run the liquid benchmark with strict parsing"
+  task :superfluid do
+    ruby "./performance/benchmark.rb superfluid"
+  end
 end
 
 namespace :profile do

lib/liquid.rb

@@ -74,7 +74,6 @@ require 'liquid/condition'
 require 'liquid/utils'
 require 'liquid/tokenizer'
 require 'liquid/parse_context'
-require 'liquid/partial_cache'
 
 # Load all the tags of the standard library
 #

lib/liquid/block_body.rb

@@ -1,7 +1,6 @@
 module Liquid
   class BlockBody
-    LiquidTagToken = /\A\s*(\w+)\s*(.*?)\z/o
-    FullToken = /\A#{TagStart}#{WhitespaceControl}?(\s*)(\w+)(\s*)(.*?)#{WhitespaceControl}?#{TagEnd}\z/om
+    FullToken = /\A#{TagStart}#{WhitespaceControl}?\s*(\w+)\s*(.*?)#{WhitespaceControl}?#{TagEnd}\z/om
     ContentOfVariable = /\A#{VariableStart}#{WhitespaceControl}?(.*?)#{WhitespaceControl}?#{VariableEnd}\z/om
     WhitespaceOrNothing = /\A\s*\z/
     TAGSTART = "{%".freeze
@@ -14,42 +13,8 @@ module Liquid
       @blank = true
     end
 
-    def parse(tokenizer, parse_context, &block)
+    def parse(tokenizer, parse_context)
       parse_context.line_number = tokenizer.line_number
-
-      if tokenizer.for_liquid_tag
-        parse_for_liquid_tag(tokenizer, parse_context, &block)
-      else
-        parse_for_document(tokenizer, parse_context, &block)
-      end
-    end
-
-    private def parse_for_liquid_tag(tokenizer, parse_context)
-      while token = tokenizer.shift
-        unless token.empty? || token =~ WhitespaceOrNothing
-          unless token =~ LiquidTagToken
-            # line isn't empty but didn't match tag syntax, yield and let the
-            # caller raise a syntax error
-            return yield token, token
-          end
-          tag_name = $1
-          markup = $2
-          unless tag = registered_tags[tag_name]
-            # end parsing if we reach an unknown tag and let the caller decide
-            # determine how to proceed
-            return yield tag_name, markup
-          end
-          new_tag = tag.parse(tag_name, markup, tokenizer, parse_context)
-          @blank &&= new_tag.blank?
-          @nodelist << new_tag
-        end
-        parse_context.line_number = tokenizer.line_number
-      end
-
-      yield nil, nil
-    end
-
-    private def parse_for_document(tokenizer, parse_context, &block)
       while token = tokenizer.shift
         next if token.empty?
         case
@@ -58,20 +23,9 @@ module Liquid
           unless token =~ FullToken
             raise_missing_tag_terminator(token, parse_context)
           end
-          tag_name = $2
-          markup = $4
-
-          if parse_context.line_number
-            # newlines inside the tag should increase the line number,
-            # particularly important for multiline {% liquid %} tags
-            parse_context.line_number += $1.count("\n".freeze) + $3.count("\n".freeze)
-          end
-
-          if tag_name == 'liquid'.freeze
-            liquid_tag_tokenizer = Tokenizer.new(markup, line_number: parse_context.line_number, for_liquid_tag: true)
-            next parse_for_liquid_tag(liquid_tag_tokenizer, parse_context, &block)
-          end
-
+          tag_name = $1
+          markup = $2
+          # fetch the tag from registered blocks
           unless tag = registered_tags[tag_name]
             # end parsing if we reach an unknown tag and let the caller decide
             # determine how to proceed
@@ -143,7 +97,7 @@ module Liquid
         end
         idx += 1
 
-        raise_if_resource_limits_reached(context, output.bytesize - previous_output_size)
+        context.raise_if_resource_limits_reached(output.bytesize - previous_output_size)
       end
 
       output
@@ -160,12 +114,6 @@ module Liquid
       output << context.handle_error(e, line_number)
     end
 
-    def raise_if_resource_limits_reached(context, length)
-      context.resource_limits.render_length += length
-      return unless context.resource_limits.reached?
-      raise MemoryError.new("Memory limits exceeded".freeze)
-    end
-
     def create_variable(token, parse_context)
       token.scan(ContentOfVariable) do |content|
         markup = content.first

lib/liquid/condition.rb

@@ -29,7 +29,7 @@ module Liquid
       @@operators
     end
 
-    attr_reader :attachment, :child_condition
+    attr_reader :attachment, :child_condition, :child_relation
     attr_accessor :left, :operator, :right
 
     def initialize(left = nil, operator = nil, right = nil)
@@ -81,10 +81,6 @@ module Liquid
       "#<Condition #{[@left, @operator, @right].compact.join(' '.freeze)}>"
     end
 
-    protected
-
-    attr_reader :child_relation
-
     private
 
     def equal_variables(left, right)

lib/liquid/context.rb

@@ -12,27 +12,17 @@ module Liquid
   #
   #   context['bob']  #=> nil  class Context
   class Context
-    attr_reader :scopes, :errors, :registers, :environments, :resource_limits, :static_registers, :static_environments
+    attr_reader :scopes, :errors, :registers, :environments, :resource_limits
     attr_accessor :exception_renderer, :template_name, :partial, :global_filter, :strict_variables, :strict_filters
 
-    # rubocop:disable Metrics/ParameterLists
-    def self.build(environments: {}, outer_scope: {}, registers: {}, rethrow_errors: false, resource_limits: nil, static_registers: {}, static_environments: {})
-      new(environments, outer_scope, registers, rethrow_errors, resource_limits, static_registers, static_environments)
-    end
-
-    def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false, resource_limits = nil, static_registers = {}, static_environments = {})
-      @environments = [environments]
-      @environments.flatten!
-
-      @static_environments = [static_environments].flat_map(&:freeze).freeze
-      @scopes              = [(outer_scope || {})]
-      @registers           = registers
-      @static_registers    = static_registers.freeze
-      @errors              = []
-      @partial             = false
-      @strict_variables    = false
-      @resource_limits     = resource_limits || ResourceLimits.new(Template.default_resource_limits)
-      @base_scope_depth    = 0
+    def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false, resource_limits = nil)
+      @environments     = [environments].flatten
+      @scopes           = [(outer_scope || {})]
+      @registers        = registers
+      @errors           = []
+      @partial          = false
+      @strict_variables = false
+      @resource_limits  = resource_limits || ResourceLimits.new(Template.default_resource_limits)
       squash_instance_assigns_with_environments
 
       @this_stack_used = false
@@ -46,7 +36,16 @@ module Liquid
       @filters = []
       @global_filter = nil
     end
-    # rubocop:enable Metrics/ParameterLists
+
+    def raise_argument_error(message)
+      raise Liquid::ArgumentError, message
+    end
+
+    def raise_if_resource_limits_reached(length)
+      resource_limits.render_length += length
+      return unless resource_limits.reached?
+      raise MemoryError.new("Memory limits exceeded".freeze)
+    end
 
     def warnings
       @warnings ||= []
@@ -100,7 +99,7 @@ module Liquid
     # Push new local scope on the stack. use <tt>Context#stack</tt> instead
     def push(new_scope = {})
       @scopes.unshift(new_scope)
-      check_overflow
+      raise StackLevelError, "Nesting too deep".freeze if @scopes.length > Block::MAX_DEPTH
     end
 
     # Merge a hash of variables in the current local scope
@@ -137,25 +136,6 @@ module Liquid
       @this_stack_used = old_stack_used
     end
 
-    # Creates a new context inheriting resource limits, filters, environment etc.,
-    # but with an isolated scope.
-    def new_isolated_subcontext
-      check_overflow
-
-      Context.build(
-        resource_limits: resource_limits,
-        static_environments: static_environments,
-        static_registers: static_registers
-      ).tap do |subcontext|
-        subcontext.base_scope_depth = base_scope_depth + 1
-        subcontext.exception_renderer = exception_renderer
-        subcontext.filters = @filters
-        subcontext.strainer = nil
-        subcontext.errors = errors
-        subcontext.warnings = warnings
-      end
-    end
-
     def clear_instance_assigns
       @scopes[0] = {}
     end
@@ -194,13 +174,25 @@ module Liquid
       # This was changed from find() to find_index() because this is a very hot
       # path and find_index() is optimized in MRI to reduce object allocation
       index = @scopes.find_index { |s| s.key?(key) }
+      scope = @scopes[index] if index
 
-      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)
+      variable = nil
+
+      if scope.nil?
+        @environments.each do |e|
+          variable = lookup_and_evaluate(e, key, raise_on_not_found: raise_on_not_found)
+          # When lookup returned a value OR there is no value but the lookup also did not raise
+          # then it is the value we are looking for.
+          if !variable.nil? || @strict_variables && raise_on_not_found
+            scope = e
+            break
+          end
+        end
       end
 
+      scope ||= @environments.last || @scopes.last
+      variable ||= lookup_and_evaluate(scope, key, raise_on_not_found: raise_on_not_found)
+
       variable = variable.to_liquid
       variable.context = self if variable.respond_to?(:context=)
 
@@ -221,38 +213,8 @@ module Liquid
       end
     end
 
-    protected
-
-    attr_writer :base_scope_depth, :warnings, :errors, :strainer, :filters
-
     private
 
-    attr_reader :base_scope_depth
-
-    def try_variable_find_in_environments(key, raise_on_not_found:)
-      @environments.each do |environment|
-        found_variable = lookup_and_evaluate(environment, key, raise_on_not_found: raise_on_not_found)
-        if !found_variable.nil? || @strict_variables && raise_on_not_found
-          return found_variable
-        end
-      end
-      @static_environments.each do |environment|
-        found_variable = lookup_and_evaluate(environment, key, raise_on_not_found: raise_on_not_found)
-        if !found_variable.nil? || @strict_variables && raise_on_not_found
-          return found_variable
-        end
-      end
-      nil
-    end
-
-    def check_overflow
-      raise StackLevelError, "Nesting too deep".freeze if overflow?
-    end
-
-    def overflow?
-      base_scope_depth + @scopes.length > Block::MAX_DEPTH
-    end
-
     def internal_error
       # raise and catch to set backtrace and cause on exception
       raise Liquid::InternalError, 'internal'

lib/liquid/locales/en.yml

@@ -22,6 +22,5 @@
       tag_never_closed: "'%{block_name}' tag was never closed"
       meta_syntax_error: "Liquid syntax error: #{e.message}"
       table_row: "Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3"
-      render: "Syntax error in tag 'render' - Template name must be a quoted string"
     argument:
       include: "Argument error in tag 'include' - Illegal template name"

lib/liquid/partial_cache.rb

@@ -1,18 +0,0 @@
-module Liquid
-  class PartialCache
-    def self.load(template_name, context:, parse_context:)
-      cached_partials = (context.registers[:cached_partials] ||= {})
-      cached = cached_partials[template_name]
-      return cached if cached
-
-      file_system = (context.registers[:file_system] ||= Liquid::Template.file_system)
-      source = file_system.read_template_file(template_name)
-      parse_context.partial = true
-
-      partial = Liquid::Template.parse(source, parse_context)
-      cached_partials[template_name] = partial
-    ensure
-      parse_context.partial = false
-    end
-  end
-end

lib/liquid/profiler.rb

@@ -44,7 +44,7 @@ module Liquid
     include Enumerable
 
     class Timing
-      attr_reader :code, :partial, :line_number, :children, :total_time, :self_time
+      attr_reader :code, :partial, :line_number, :children
 
       def initialize(node, partial)
         @code        = node.respond_to?(:raw) ? node.raw : node
@@ -63,18 +63,6 @@ module Liquid
 
       def finish
         @end_time = Time.now
-        @total_time = @end_time - @start_time
-        if @children.size == 0
-          @self_time = @total_time
-        else
-          total_children_time = 0
-
-          @children.each do |child|
-            total_children_time += child.total_time
-          end
-
-          @self_time = @total_time - total_children_time
-        end
       end
 
       def render_time

lib/liquid/range_lookup.rb

@@ -15,6 +15,8 @@ module Liquid
       @end_obj = end_obj
     end
 
+    attr_reader :start_obj, :end_obj
+
     def evaluate(context)
       start_int = to_integer(context.evaluate(@start_obj))
       end_int = to_integer(context.evaluate(@end_obj))

lib/liquid/superfluid.rb

@@ -0,0 +1,632 @@
+require 'ap'
+
+require 'pry'
+
+require 'stackprof'
+
+AwesomePrint.defaults = {
+  raw: true
+}
+
+module Liquid
+  Liquid::BlockBody.class_eval do
+    def render_to_output_buffer(context, output)
+
+      ruby = Compiler.compile(@nodelist)
+      
+      if false
+        puts
+        puts "--------------------------- GENERATED RUBY -"
+        line_number = 1
+        puts(ruby.lines.map do |line|
+          "#{line_number}\t#{line}".tap { line_number += 1}
+        end)
+        puts "--------------------------- /GENERATED RUBY -"
+      end
+
+      instructions = RubyVM::InstructionSequence.compile(ruby)
+
+      output_io = StringIO.new
+      instructions.eval.call(output_io, context, Condition)
+
+      output << output_io.string
+    end
+  end
+
+  class SuperfluidError < Exception
+  end
+
+  class Output
+    attr_reader :string, :indent_level
+
+    def initialize(initial_indent)
+      @string = ''.dup
+      @indent_level = initial_indent
+      @indent_str = " " * initial_indent * 2
+    end
+
+    def line(string)
+      @string << @indent_str << string << "\n"
+    end
+
+    def echo(string)
+      output << "liquid_out.write(to_output(#{string}))"
+    end
+
+    def indent(&block)
+      output.indent(&block)
+    end
+
+    def indent
+      @indent_level += 1
+      @indent_str = " " * @indent_level * 2
+      yield
+      @indent_level -= 1
+      @indent_str = " " * @indent_level * 2
+    end
+  end
+
+  class Compiler
+    class << self
+      def compile(template)
+        compiler = new
+        compiler.compile(template)
+        compiler.ruby
+      end
+    end
+
+    def initialize
+      @variables = Set.new
+      @output = Output.new(2)
+      @blank = false
+    end
+
+    def ruby
+      [
+        header,
+        @output.string,
+        trailer
+      ].join("\n")
+    end
+
+
+    def header
+      <<~RUBY
+      module Warning
+        def warn(*)
+        end
+      end
+
+      class ForloopDrop
+        def initialize(name, length, parentloop)
+          @name = name
+          @length = length
+          @parentloop = parentloop
+          @index = 0
+        end
+
+        attr_accessor :parentloop
+
+        def [](value)
+          case value
+          when "length"
+            @length
+          when "name"
+            @name
+          when "index"
+            @index + 1
+          when "index0"
+            @index
+          when "rindex"
+            @length - @index
+          when "rindex0"
+            @length - @index - 1
+          when "first"
+            @index == 0
+          when "last"
+            @index == @length - 1
+          when "parentloop"
+            @parentloop
+          end
+        end
+
+        def to_liquid
+          self
+        end
+
+        def key?(*)
+          true
+        end
+
+        private
+
+        def increment!
+          @index += 1
+        end
+      end
+
+      def slice_collection(collection, from, limit)
+        to = if limit.nil?
+          nil
+        else
+          limit + from
+        end
+
+        if (from != 0 || !to.nil?) && collection.respond_to?(:load_slice)
+          collection.load_slice(from, to)
+        else
+          slice_collection_using_each(collection, from, to)
+        end
+      end
+
+      def slice_collection_using_each(collection, from, to)
+        segments = []
+        index = 0
+
+        if collection.is_a?(String)
+          return collection.empty? ? [] : [collection]
+        end
+        return [] unless collection.respond_to?(:each)
+
+        collection.each do |item|
+          if to && to <= index
+            break
+          end
+
+          if from <= index
+            segments << item
+          end
+
+          index += 1
+        end
+
+        segments
+      end
+
+      def apply_operator(left, operator, right)
+        if left.respond_to?(operator) && right.respond_to?(operator) && !left.is_a?(Hash) && !right.is_a?(Hash)
+          begin
+            left.send(operator, right)
+          rescue ::ArgumentError => e
+            raise @context.raise_argument_error(e.message)
+          end
+        end
+      end
+
+      def contains?(left, right)
+        if left && right && left.respond_to?(:include?)
+          right = right.to_s if left.is_a?(String)
+          left.include?(right)
+        else
+          false
+        end
+      end
+
+      class GlobalVariableLookup
+        def method_missing(method_name, *)
+          nil
+        end
+
+        def to_output(value)
+          output = if value.is_a?(Array)
+            value.join
+          elsif value == nil
+          else
+            value.to_s
+          end
+          @context.apply_global_filter(output)
+        end
+
+        def run(liquid_out, context, condition)
+          @condition = condition
+          @context = context
+          @for_offsets = {}
+          @cycle_values = {}
+          @context.registers[:for_stack] = []
+          @context.registers[:cycle] ||= {}
+          @if_changed_last = nil
+          @prev_output_size = 0
+          #{hoisted_variables}
+      RUBY
+    end
+
+    def trailer
+      <<~RUBY
+          end
+        end
+        GlobalVariableLookup.new.method(:run)
+      RUBY
+    end
+
+    def hoisted_variables
+      @variables.map do |variable|
+        normal_name = unvar(variable)
+        "#{variable} = @context.find_variable(#{normal_name.inspect}, raise_on_not_found: false)"
+      end.join("\n")
+    end
+
+    def compile(node)
+      old_blank = @blank
+      @blank = if node.respond_to?(:blank?)
+        node.blank?
+      elsif !(node.is_a?(String) && node =~ /\A\s*\z/)
+        false
+      else
+        @blank
+      end
+
+      case node
+      when Liquid::Document, Liquid::BlockBody
+        node.nodelist.collect(&method(:compile))
+      when Array
+        node.collect(&method(:compile))
+      when Liquid::Variable
+        compile_variable(node)
+      when Liquid::For
+        compile_for(node)
+      when Liquid::If
+        compile_if(node)
+      when Liquid::Ifchanged
+        compile_if_changed(node)
+      when Liquid::Template
+        compile(node.root)
+      when Liquid::Assign
+        compile_assign(node)
+      when Liquid::Case
+        compile_case(node)
+      when Liquid::Capture
+        compile_capture(node)
+      when String
+        compile_echo_literal(node)
+      when Liquid::Break
+        line "break" if @in_loop
+      when Liquid::Continue
+        line "next" if @in_loop
+      when Liquid::Cycle
+        compile_cycle(node)
+      when Liquid::Raw
+        compile_raw(node)
+      when Liquid::Increment
+        compile_increment(node)
+      when Liquid::Decrement
+        compile_decrement(node)
+      when Liquid::Comment
+      else
+        raise SuperfluidError, "Unknown node type #{node.inspect}"
+      end
+
+      @blank = old_blank
+    end
+
+    def compile_for(node)
+      variable_name = node.variable_name
+
+      collection_name = node.collection_name
+
+      iter_target_expr = case collection_name
+      when Liquid::VariableLookup
+        make_variable_lookup_expr(collection_name)
+      when Range
+        collection_name
+      when Liquid::RangeLookup
+        start_expr = make_variable_expr(collection_name.start_obj)
+        end_expr = make_variable_expr(collection_name.end_obj)
+        line "start = #{start_expr}"
+        line "@context.raise_argument_error('bad value for range') unless start.respond_to?(:to_i)"
+        line "start = #{start_expr}.to_i"
+
+        line "finish = #{end_expr}"
+        line "@context.raise_argument_error('bad value for range') unless finish.respond_to?(:to_i)"
+        line "finish = #{end_expr}.to_i"
+
+        "start..finish"
+      when Liquid::Expression::MethodLiteral
+        '[]'
+      else
+        raise SuperfluidError, "Unknown iteration target: #{collection_name.inspect}"
+      end
+
+      from_expr = if node.from == :continue
+        "@for_offsets['#{node.name}'].to_i"
+      elsif node.from
+        make_variable_expr(node.from)
+      else
+        '0'
+      end
+
+      limit_expr = node.limit ? make_variable_expr(node.limit) : 'nil'
+      line "from = #{from_expr}"
+      line "limit = #{limit_expr}"
+      line "@context.raise_argument_error('invalid integer') unless from.is_a?(Integer)"
+      line "@context.raise_argument_error('invalid integer') unless !limit || limit.is_a?(Integer)"
+
+      line "segment = slice_collection(#{iter_target_expr}, from, limit)"
+      line "segment.reverse!" if node.reversed
+
+      forloop = var('forloop')
+      hoist_var('forloop')
+      line "#{forloop} = ForloopDrop.new('#{node.name}', segment.length, #{forloop})"
+
+      line "if segment.any?"
+      indent do
+        line "segment.each do |#{var(variable_name)}|"
+          indent do
+            line "@context['forloop'] = #{forloop}"
+
+
+            old_in_loop = @in_loop
+            compile(node.for_block)
+            @in_loop = old_in_loop
+
+            line "#{forloop}.send(:increment!)"
+          end
+        line "end"
+      end
+      line "else"
+      indent do
+        compile(node.else_block) if node.else_block
+      end
+      line "end"
+
+      line "@for_offsets['#{node.name}'] = from + segment.length"
+      line "#{forloop} = #{forloop}.parentloop"
+    end
+
+    def compile_if(node)
+      if_condition = node.blocks.first
+      line "if #{make_condition_expr(if_condition)}"
+      indent { if_condition.attachment.nodelist.each(&method(:compile)) }
+
+      node.blocks.drop(1).each do |condition|
+        if condition.left != nil
+          line "elsif #{make_condition_expr(condition)}"
+        else
+          line "else"
+        end
+        indent { condition.attachment.nodelist.each(&method(:compile)) }
+      end
+
+      line "end"
+    end
+
+    def compile_if_changed(node)
+      line "if_changed = lambda do |; liquid_out|"
+      indent do
+        line "liquid_out = StringIO.new"
+        node.nodelist.each(&method(:compile))
+        line "liquid_out.string"
+      end
+      line "end.call"
+
+      line "if if_changed != @if_changed_last"
+      indent { echo "if_changed" }
+      line "end"
+
+      line "@if_changed_last = if_changed"
+    end
+
+    def compile_capture(node)
+      line "#{var(node.to)} = lambda do |; liquid_out|"
+      hoist_var(node.to)
+      indent do
+        line "liquid_out = StringIO.new"
+        node.nodelist.each(&method(:compile))
+        line "liquid_out.string"
+      end
+      line "end.call"
+    end
+
+    def make_condition_expr(node)
+      condition = make_sub_condition_expr(node)
+      if node.child_condition
+        "(#{condition} #{node.child_relation} #{make_condition_expr(node.child_condition)})"
+      else
+        condition
+      end
+    end
+
+    def make_sub_condition_expr(node)
+      return make_variable_expr(node.left) unless node.operator
+
+      operator = node.operator
+      operator = "!=" if operator == "<>"
+
+      if operator == "=="
+        if node.left.is_a?(Liquid::Expression::MethodLiteral) &&
+          node.right.is_a?(Liquid::Expression::MethodLiteral)
+          return "false"
+        elsif node.right.is_a?(Liquid::Expression::MethodLiteral)
+          target = make_variable_expr(node.left)
+          message = node.right.method_name.inspect
+          return "#{target}.respond_to?(#{message}) ? #{target}.send(#{message}) : nil"
+        elsif node.left.is_a?(Liquid::Expression::MethodLiteral)
+          target = make_variable_expr(node.right)
+          message = node.left.method_name.inspect
+          return "#{target}.respond_to?(#{message}) ? #{target}.send(#{message}) : nil"
+        end
+      end
+
+      left = make_variable_expr(node.left)
+      right = make_variable_expr(node.right)
+
+      case operator
+      when "contains"
+        "contains?(#{left}, #{right})"
+      else
+        "apply_operator(#{left}, #{operator.inspect}, #{right})"
+      end
+    end
+
+    def compile_case(node)
+      line 'if false' # HACK
+      else_nodes, if_nodes = node.blocks.partition { |n| n.is_a?(Liquid::ElseCondition) }
+      raise SuperfluidError, 'Too many else nodes' if else_nodes.count > 1
+      else_node = else_nodes.first
+
+      if_nodes.each do |condition|
+        left = make_variable_expr(condition.left)
+        right = make_variable_expr(condition.right)
+        line "elsif #{left} #{condition.operator} #{right}"
+        indent { condition.attachment.nodelist.each(&method(:compile)) }
+      end
+
+      if else_node
+        line "else"
+        indent { else_node.attachment.nodelist.each(&method(:compile)) }
+      end
+
+      line "end"
+    end
+
+    def compile_cycle(node)
+      key = node.name
+      key = key.name if key.is_a?(Liquid::VariableLookup)
+
+      line "key = #{key.inspect}"
+      line "iteration = context.registers[:cycle][key].to_i"
+      line "@cycle_values[key] ||= #{node.variables}"
+
+      line "val = @cycle_values[key][iteration]"
+      echo 'val'
+      line "context.registers[:cycle][key] = (iteration + 1) % #{node.variables.size}"
+    end
+
+    def compile_raw(node)
+      echo "#{node.body.inspect}"
+    end
+
+    def compile_increment(node)
+      line "value = context.environments.first[#{node.variable.inspect}] ||= 0"
+      line "@context.environments.first[#{node.variable.inspect}] = value + 1"
+      echo "value"
+    end
+
+    def compile_decrement(node)
+      line "value = context.environments.first[#{node.variable.inspect}] ||= 0"
+      line "value -= 1"
+      line "@context.environments.first[#{node.variable.inspect}] = value"
+      echo "value"
+    end
+
+    def compile_echo_literal(node)
+      echo node.inspect
+    end
+
+    def compile_variable(variable)
+      echo make_variable_expr(variable)
+    end
+
+    def compile_assign(node)
+      from_expr = case node.from
+      when Liquid::Variable
+        make_variable_expr(node.from)
+      else
+        raise SuperfluidError, "Unknown assignment `from`: #{node.from.inspect}"
+      end
+
+      line "#{var(node.to)} = #{from_expr}"
+      hoist_var(node.to)
+    end
+
+    def make_variable_expr(variable)
+      case variable
+      when Liquid::Variable
+        base_expression = case variable.name
+        when TrueClass, FalseClass, Numeric, String
+          variable.name.inspect
+        when Liquid::VariableLookup
+          make_variable_lookup_expr(variable.name)
+        when NilClass, Liquid::Expression::MethodLiteral
+          'nil'
+        else
+          raise SuperfluidError, "Invalid variable name: #{variable.name.inspect}"
+          derp "Bad var name", variable.name
+        end
+        variable.filters.inject(base_expression) do |inner, (filter_name, positional_args, keyword_args)|
+          filter_args = positional_args.map(&method(:make_variable_expr))
+
+          if keyword_args
+             filter_args << "{ " + keyword_args
+              .transform_values(&method(:make_variable_expr))
+              .collect { |(key, value)| "#{key.inspect} => #{value}" }
+              .join(", ") + " }"
+          end
+
+          "context.strainer.invoke(#{filter_name.inspect}, #{inner}, *[#{filter_args.join(", ")}])"
+        end
+      when Liquid::VariableLookup
+        make_variable_lookup_expr(variable)
+      when TrueClass, FalseClass, Numeric, String
+        variable.inspect
+      when NilClass
+        'nil'
+      else
+        raise SuperfluidError, "Unknown expression type: #{variable.inspect}"
+      end
+    end
+
+    def make_variable_lookup_expr(variable_lookup)
+      base_expr = var(variable_lookup.name)
+      hoist_var(variable_lookup.name)
+      return base_expr if variable_lookup.lookups.empty?
+      
+      expr = Output.new(output.indent_level)
+      expr.line "(begin"
+      expr.indent do
+        expr.line "inner = #{base_expr}"
+        variable_lookup.lookups.each_with_index do |lookup, i|
+          lookup_expr = lookup.inspect
+          expr.line "inner = if inner.respond_to?(:[]) && ((inner.respond_to?(:key?) && inner.key?(#{lookup_expr})) || (inner.respond_to?(:fetch) && #{lookup_expr}.is_a?(Integer)))"
+          expr.indent do
+            expr.line "inner[#{lookup_expr}].to_liquid"
+          end
+          if variable_lookup.command_flags & (1 << i) != 0
+            expr.line "elsif inner.respond_to?(#{lookup.inspect})"
+            expr.indent do
+              expr.line "inner.#{lookup}.to_liquid"
+            end
+          end
+          expr.line "end"
+        end
+      end
+      expr.line "end)"
+      expr.string.strip
+    end
+
+    private
+
+    def line(string)
+      output.line(string)
+    end
+
+    def echo(string)
+      unless @blank
+        line "liquid_out.write(to_output(#{string}))"
+      end
+    end
+
+    def indent(&block)
+      output.indent(&block)
+    end
+
+    def var(name)
+      name = name
+        .gsub('_', '__')
+        .gsub('-', '_')
+      "__liquid_#{name}"
+    end
+
+    def unvar(name)
+      name
+        .delete_prefix('__liquid_')
+        .gsub(/([^_])_([^_])/) { "#$1-#$2" }
+        .gsub('__', '_')
+    end
+
+    def hoist_var(name)
+      @variables << var(name)
+    end
+
+    attr_reader :output
+  end
+end

lib/liquid/tag.rb

@@ -5,8 +5,8 @@ module Liquid
     include ParserSwitching
 
     class << self
-      def parse(tag_name, markup, tokenizer, parse_context)
-        tag = new(tag_name, markup, parse_context)
+      def parse(tag_name, markup, tokenizer, options)
+        tag = new(tag_name, markup, options)
         tag.parse(tokenizer)
         tag
       end

lib/liquid/tags/assign.rb

@@ -10,10 +10,6 @@ module Liquid
   class Assign < Tag
     Syntax = /(#{VariableSignature}+)\s*=\s*(.*)\s*/om
 
-    def self.syntax_error_translation_key
-      "errors.syntax.assign".freeze
-    end
-
     attr_reader :to, :from
 
     def initialize(tag_name, markup, options)
@@ -22,7 +18,7 @@ module Liquid
         @to = $1
         @from = Variable.new($2, options)
       else
-        raise SyntaxError.new(options[:locale].t(self.class.syntax_error_translation_key))
+        raise SyntaxError.new options[:locale].t("errors.syntax.assign".freeze)
       end
     end
 

lib/liquid/tags/capture.rb

@@ -13,6 +13,8 @@ module Liquid
   class Capture < Block
     Syntax = /(#{VariableSignature}+)/o
 
+    attr_reader :to
+
     def initialize(tag_name, markup, options)
       super
       if markup =~ Syntax
@@ -33,6 +35,7 @@ module Liquid
     def blank?
       true
     end
+
   end
 
   Template.register_tag('capture'.freeze, Capture)

lib/liquid/tags/cycle.rb

@@ -15,7 +15,7 @@ module Liquid
     SimpleSyntax = /\A#{QuotedFragment}+/o
     NamedSyntax  = /\A(#{QuotedFragment})\s*\:\s*(.*)/om
 
-    attr_reader :variables
+    attr_reader :variables, :name
 
     def initialize(tag_name, markup, options)
       super

lib/liquid/tags/decrement.rb

@@ -23,6 +23,8 @@ module Liquid
       @variable = markup.strip
     end
 
+    attr_reader :variable
+
     def render_to_output_buffer(context, output)
       value = context.environments.first[@variable] ||= 0
       value -= 1

lib/liquid/tags/echo.rb

@@ -1,24 +0,0 @@
-module Liquid
-  # Echo outputs an expression
-  #
-  #   {% echo monkey %}
-  #   {% echo user.name %}
-  #
-  # This is identical to variable output syntax, like {{ foo }}, but works
-  # inside {% liquid %} tags. The full syntax is supported, including filters:
-  #
-  #   {% echo user | link %}
-  #
-  class Echo < Tag
-    def initialize(tag_name, markup, parse_context)
-      super
-      @variable = Variable.new(markup, parse_context)
-    end
-
-    def render(context)
-      @variable.render_to_output_buffer(context, '')
-    end
-  end
-
-  Template.register_tag('echo'.freeze, Echo)
-end

lib/liquid/tags/for.rb

@@ -46,7 +46,7 @@ module Liquid
   class For < Block
     Syntax = /\A(#{VariableSegment}+)\s+in\s+(#{QuotedFragment}+)\s*(reversed)?/o
 
-    attr_reader :collection_name, :variable_name, :limit, :from
+    attr_reader :collection_name, :variable_name, :limit, :from, :for_block, :else_block, :name, :reversed
 
     def initialize(tag_name, markup, options)
       super

lib/liquid/tags/include.rb

@@ -46,12 +46,7 @@ module Liquid
       template_name = context.evaluate(@template_name_expr)
       raise ArgumentError.new(options[:locale].t("errors.argument.include")) unless template_name
 
-      partial = PartialCache.load(
-        template_name,
-        context: context,
-        parse_context: parse_context
-      )
-
+      partial = load_cached_partial(template_name, context)
       context_variable_name = template_name.split('/'.freeze).last
 
       variable = if @variable_name_expr
@@ -88,9 +83,35 @@ module Liquid
       output
     end
 
+    private
+
     alias_method :parse_context, :options
     private :parse_context
 
+    def load_cached_partial(template_name, context)
+      cached_partials = context.registers[:cached_partials] || {}
+
+      if cached = cached_partials[template_name]
+        return cached
+      end
+      source = read_template_from_file_system(context)
+      begin
+        parse_context.partial = true
+        partial = Liquid::Template.parse(source, parse_context)
+      ensure
+        parse_context.partial = false
+      end
+      cached_partials[template_name] = partial
+      context.registers[:cached_partials] = cached_partials
+      partial
+    end
+
+    def read_template_from_file_system(context)
+      file_system = context.registers[:file_system] || Liquid::Template.file_system
+
+      file_system.read_template_file(context.evaluate(@template_name_expr))
+    end
+
     class ParseTreeVisitor < Liquid::ParseTreeVisitor
       def children
         [

lib/liquid/tags/increment.rb

@@ -20,10 +20,11 @@ module Liquid
       @variable = markup.strip
     end
 
+    attr_reader :variable
+
     def render_to_output_buffer(context, output)
       value = context.environments.first[@variable] ||= 0
       context.environments.first[@variable] = value + 1
-
       output << value.to_s
       output
     end

lib/liquid/tags/raw.rb

@@ -3,6 +3,8 @@ module Liquid
     Syntax = /\A\s*\z/
     FullTokenPossiblyInvalid = /\A(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om
 
+    attr_reader :body
+
     def initialize(tag_name, markup, parse_context)
       super
 

lib/liquid/tags/render.rb

@@ -1,54 +0,0 @@
-module Liquid
-  class Render < Tag
-    SYNTAX = /(#{QuotedString})#{QuotedFragment}*/o
-
-    attr_reader :template_name_expr, :attributes
-
-    def initialize(tag_name, markup, options)
-      super
-
-      raise SyntaxError.new(options[:locale].t("errors.syntax.render".freeze)) unless markup =~ SYNTAX
-
-      template_name = $1
-
-      @template_name_expr = Expression.parse(template_name)
-
-      @attributes = {}
-      markup.scan(TagAttributes) do |key, value|
-        @attributes[key] = Expression.parse(value)
-      end
-    end
-
-    def render_to_output_buffer(context, output)
-      # Though we evaluate this here we will only ever parse it as a string literal.
-      template_name = context.evaluate(@template_name_expr)
-      raise ArgumentError.new(options[:locale].t("errors.argument.include")) unless template_name
-
-      partial = PartialCache.load(
-        template_name,
-        context: context,
-        parse_context: parse_context
-      )
-
-      inner_context = context.new_isolated_subcontext
-      inner_context.template_name = template_name
-      inner_context.partial = true
-      @attributes.each do |key, value|
-        inner_context[key] = context.evaluate(value)
-      end
-      partial.render_to_output_buffer(inner_context, output)
-
-      output
-    end
-
-    class ParseTreeVisitor < Liquid::ParseTreeVisitor
-      def children
-        [
-          @node.template_name_expr,
-        ] + @node.attributes.values
-      end
-    end
-  end
-
-  Template.register_tag('render'.freeze, Render)
-end

lib/liquid/template.rb

@@ -206,7 +206,7 @@ module Liquid
 
       begin
         # render the nodelist.
-        # for performance reasons we get an array back here. join will make a string out of it.
+
         with_profiling(context) do
           @root.render_to_output_buffer(context, output || '')
         end

lib/liquid/tokenizer.rb

@@ -1,31 +1,25 @@
 module Liquid
   class Tokenizer
-    attr_reader :line_number, :for_liquid_tag
+    attr_reader :line_number
 
-    def initialize(source, line_numbers = false, line_number: nil, for_liquid_tag: false)
+    def initialize(source, line_numbers = false)
       @source = source
-      @line_number = line_number || (line_numbers ? 1 : nil)
-      @for_liquid_tag = for_liquid_tag
+      @line_number = line_numbers ? 1 : nil
       @tokens = tokenize
     end
 
     def shift
-      token = @tokens.shift or return
-
-      if @line_number
-        @line_number += @for_liquid_tag ? 1 : token.count("\n")
-      end
-
+      token = @tokens.shift
+      @line_number += token.count("\n") if @line_number && token
       token
     end
 
     private
 
     def tokenize
+      @source = @source.source if @source.respond_to?(:source)
       return [] if @source.to_s.empty?
 
-      return @source.split("\n") if @for_liquid_tag
-
       tokens = @source.split(TemplateParser)
 
       # removes the rogue empty element at the beginning of the array

lib/liquid/variable_lookup.rb

@@ -3,7 +3,7 @@ module Liquid
     SQUARE_BRACKETED = /\A\[(.*)\]\z/m
     COMMAND_METHODS = ['size'.freeze, 'first'.freeze, 'last'.freeze].freeze
 
-    attr_reader :name, :lookups
+    attr_reader :name, :lookups, :command_flags
 
     def self.parse(markup)
       new(markup)

liquid.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   # s.description = "A secure, non-evaling end user template engine with aesthetic markup."
 
-  s.required_ruby_version     = ">= 2.4.0"
+  s.required_ruby_version     = ">= 2.1.0"
   s.required_rubygems_version = ">= 1.3.7"
 
   s.test_files  = Dir.glob("{test}/**/*")

performance/benchmark.rb

@@ -1,7 +1,16 @@
 require 'benchmark/ips'
 require_relative 'theme_runner'
 
-Liquid::Template.error_mode = ARGV.first.to_sym if ARGV.first
+case ARGV.first.to_sym
+when :lax
+  Liquid::Template.error_mode = ARGV.first.to_sym if ARGV.first
+when :strict
+  Liquid::Template.error_mode = ARGV.first.to_sym if ARGV.first
+when :superfluid
+  require 'liquid/superfluid'
+  Liquid::Template.error_mode = :strict
+end
+
 profiler = ThemeRunner.new
 
 Benchmark.ips do |x|

performance/memory_profile.rb

@@ -1,63 +1,26 @@
 # frozen_string_literal: true
 
-require 'benchmark/ips'
+requirf 'benchmark/ips'
 require 'memory_profiler'
-require 'terminal-table'
 require_relative 'theme_runner'
 
-class Profiler
-  LOG_LABEL   = "Profiling: ".rjust(14).freeze
-  REPORTS_DIR = File.expand_path('.memprof', __dir__).freeze
+def profile(phase, &block)
+  puts
+  puts "#{phase}:"
+  puts
 
-  def self.run
-    puts
-    yield new
-  end
+  report = MemoryProfiler.report(&block)
 
-  def initialize
-    @allocated = []
-    @retained  = []
-    @headings  = []
-  end
-
-  def profile(phase, &block)
-    print LOG_LABEL
-    print "#{phase}.. ".ljust(10)
-    report = MemoryProfiler.report(&block)
-    puts 'Done.'
-    @headings  << phase.capitalize
-    @allocated << "#{report.scale_bytes(report.total_allocated_memsize)} (#{report.total_allocated} objects)"
-    @retained  << "#{report.scale_bytes(report.total_retained_memsize)} (#{report.total_retained} objects)"
-
-    return if ENV['CI']
-
-    require 'fileutils'
-    report_file = File.join(REPORTS_DIR, "#{sanitize(phase)}.txt")
-    FileUtils.mkdir_p(REPORTS_DIR)
-    report.pretty_print(to_file: report_file, scale_bytes: true)
-  end
-
-  def tabulate
-    table = Terminal::Table.new(headings: @headings.unshift('Phase')) do |t|
-      t << @allocated.unshift('Total allocated')
-      t << @retained.unshift('Total retained')
-    end
-
-    puts
-    puts table
-    puts "\nDetailed report(s) saved to #{REPORTS_DIR}/" unless ENV['CI']
-  end
-
-  def sanitize(string)
-    string.downcase.gsub(/[\W]/, '-').squeeze('-')
-  end
+  report.pretty_print(
+    color_output: true,
+    scale_bytes: true,
+    detailed_report: true
+  )
 end
 
 Liquid::Template.error_mode = ARGV.first.to_sym if ARGV.first
 
-runner = ThemeRunner.new
-Profiler.run do |x|
-  x.profile('parse') { runner.compile }
-  x.profile('render') { runner.render }
-  x.tabulate
-end
+profiler = ThemeRunner.new
+
+profile("Parsing") { profiler.compile }
+profile("Rendering") { profiler.render }

test/integration/tags/echo_test.rb

@@ -1,11 +0,0 @@
-require 'test_helper'
-
-class EchoTest < Minitest::Test
-  include Liquid
-
-  def test_echo_outputs_its_input
-    assert_template_result('BAR', <<~LIQUID, { 'variable-name' => 'bar' })
-      {%- echo variable-name | upcase -%}
-    LIQUID
-  end
-end

test/integration/tags/liquid_tag_test.rb

@@ -1,104 +0,0 @@
-require 'test_helper'
-
-class LiquidTagTest < Minitest::Test
-  include Liquid
-
-  def test_liquid_tag
-    assert_template_result('1 2 3', <<~LIQUID, 'array' => [1, 2, 3])
-      {%- liquid
-        echo array | join: " "
-      -%}
-    LIQUID
-
-    assert_template_result('1 2 3', <<~LIQUID, 'array' => [1, 2, 3])
-      {%- liquid
-        for value in array
-          echo value
-          unless forloop.last
-            echo " "
-          endunless
-        endfor
-      -%}
-    LIQUID
-
-    assert_template_result('4 8 12 6', <<~LIQUID, 'array' => [1, 2, 3])
-      {%- liquid
-        for value in array
-          assign double_value = value | times: 2
-          echo double_value | times: 2
-          unless forloop.last
-            echo " "
-          endunless
-        endfor
-
-        echo " "
-        echo double_value
-      -%}
-    LIQUID
-
-    assert_template_result('abc', <<~LIQUID)
-      {%- liquid echo "a" -%}
-      b
-      {%- liquid echo "c" -%}
-    LIQUID
-  end
-
-  def test_liquid_tag_errors
-    assert_match_syntax_error("syntax error (line 1): Unknown tag 'error'", <<~LIQUID)
-      {%- liquid error no such tag -%}
-    LIQUID
-
-    assert_match_syntax_error("syntax error (line 7): Unknown tag 'error'", <<~LIQUID)
-      {{ test }}
-
-      {%-
-      liquid
-        for value in array
-
-          error no such tag
-        endfor
-      -%}
-    LIQUID
-
-    assert_match_syntax_error("syntax error (line 2): Unknown tag '!!! the guards are vigilant'", <<~LIQUID)
-      {%- liquid
-        !!! the guards are vigilant
-      -%}
-    LIQUID
-
-    assert_match_syntax_error("syntax error (line 4): 'for' tag was never closed", <<~LIQUID)
-      {%- liquid
-        for value in array
-          echo 'forgot to close the for tag'
-      -%}
-    LIQUID
-  end
-
-  def test_line_number_is_correct_after_a_blank_token
-    assert_match_syntax_error("syntax error (line 3): Unknown tag 'error'", "{% liquid echo ''\n\n error %}")
-    assert_match_syntax_error("syntax error (line 3): Unknown tag 'error'", "{% liquid echo ''\n  \n error %}")
-  end
-
-  def test_cannot_open_blocks_living_past_a_liquid_tag
-    assert_match_syntax_error("syntax error (line 3): 'if' tag was never closed", <<~LIQUID)
-      {%- liquid
-        if true
-      -%}
-      {%- endif -%}
-    LIQUID
-  end
-
-  def test_quirk_can_close_blocks_created_before_a_liquid_tag
-    assert_template_result("42", <<~LIQUID)
-      {%- if true -%}
-      42
-      {%- liquid endif -%}
-    LIQUID
-  end
-
-  def test_liquid_tag_in_raw
-    assert_template_result("{% liquid echo 'test' %}\n", <<~LIQUID)
-      {% raw %}{% liquid echo 'test' %}{% endraw %}
-    LIQUID
-  end
-end

test/integration/tags/render_tag_test.rb

@@ -1,149 +0,0 @@
-require 'test_helper'
-
-class RenderTagTest < Minitest::Test
-  include Liquid
-
-  def test_render_with_no_arguments
-    Liquid::Template.file_system = StubFileSystem.new('source' => 'rendered content')
-    assert_template_result 'rendered content', '{% render "source" %}'
-  end
-
-  def test_render_tag_looks_for_file_system_in_registers_first
-    file_system = StubFileSystem.new('pick_a_source' => 'from register file system')
-    assert_equal 'from register file system',
-      Template.parse('{% render "pick_a_source" %}').render!({}, registers: { file_system: file_system })
-  end
-
-  def test_render_passes_named_arguments_into_inner_scope
-    Liquid::Template.file_system = StubFileSystem.new('product' => '{{ inner_product.title }}')
-    assert_template_result 'My Product', '{% render "product", inner_product: outer_product %}',
-      'outer_product' => { 'title' => 'My Product' }
-  end
-
-  def test_render_accepts_literals_as_arguments
-    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ price }}')
-    assert_template_result '123', '{% render "snippet", price: 123 %}'
-  end
-
-  def test_render_accepts_multiple_named_arguments
-    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ one }} {{ two }}')
-    assert_template_result '1 2', '{% render "snippet", one: 1, two: 2 %}'
-  end
-
-  def test_render_does_not_inherit_parent_scope_variables
-    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ outer_variable }}')
-    assert_template_result '', '{% assign outer_variable = "should not be visible" %}{% render "snippet" %}'
-  end
-
-  def test_render_does_not_inherit_variable_with_same_name_as_snippet
-    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ snippet }}')
-    assert_template_result '', "{% assign snippet = 'should not be visible' %}{% render 'snippet' %}"
-  end
-
-  def test_render_sets_the_correct_template_name_for_errors
-    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ unsafe }}')
-
-    with_taint_mode :error do
-      template = Liquid::Template.parse('{% render "snippet", unsafe: unsafe %}')
-      context = Context.new('unsafe' => (+'unsafe').tap(&:taint))
-      template.render(context)
-
-      assert_equal [Liquid::TaintedError], template.errors.map(&:class)
-      assert_equal 'snippet', template.errors.first.template_name
-    end
-  end
-
-  def test_render_sets_the_correct_template_name_for_warnings
-    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ unsafe }}')
-
-    with_taint_mode :warn do
-      template = Liquid::Template.parse('{% render "snippet", unsafe: unsafe %}')
-      context = Context.new('unsafe' => (+'unsafe').tap(&:taint))
-      template.render(context)
-
-      assert_equal [Liquid::TaintedError], context.warnings.map(&:class)
-      assert_equal 'snippet', context.warnings.first.template_name
-    end
-  end
-
-  def test_render_does_not_mutate_parent_scope
-    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{% assign inner = 1 %}')
-    assert_template_result '', "{% render 'snippet' %}{{ inner }}"
-  end
-
-  def test_nested_render_tag
-    Liquid::Template.file_system = StubFileSystem.new(
-      'one' => "one {% render 'two' %}",
-      'two' => 'two'
-    )
-    assert_template_result 'one two', "{% render 'one' %}"
-  end
-
-  def test_recursively_rendered_template_does_not_produce_endless_loop
-    Liquid::Template.file_system = StubFileSystem.new('loop' => '{% render "loop" %}')
-
-    assert_raises Liquid::StackLevelError do
-      Template.parse('{% render "loop" %}').render!
-    end
-  end
-
-  def test_includes_and_renders_count_towards_the_same_recursion_limit
-    Liquid::Template.file_system = StubFileSystem.new(
-      'loop_render' => '{% render "loop_include" %}',
-      'loop_include' => '{% include "loop_render" %}'
-    )
-
-    assert_raises Liquid::StackLevelError  do
-      Template.parse('{% render "loop_include" %}').render!
-    end
-  end
-
-  def test_dynamically_choosen_templates_are_not_allowed
-    Liquid::Template.file_system = StubFileSystem.new('snippet' => 'should not be rendered')
-
-    assert_raises Liquid::SyntaxError do
-      Liquid::Template.parse("{% assign name = 'snippet' %}{% render name %}")
-    end
-  end
-
-  def test_include_tag_caches_second_read_of_same_partial
-    file_system = StubFileSystem.new('snippet' => 'echo')
-    assert_equal 'echoecho',
-      Template.parse('{% render "snippet" %}{% render "snippet" %}')
-      .render!({}, registers: { file_system: file_system })
-    assert_equal 1, file_system.file_read_count
-  end
-
-  def test_render_tag_doesnt_cache_partials_across_renders
-    file_system = StubFileSystem.new('snippet' => 'my message')
-
-    assert_equal 'my message',
-      Template.parse('{% include "snippet" %}').render!({}, registers: { file_system: file_system })
-    assert_equal 1, file_system.file_read_count
-
-    assert_equal 'my message',
-      Template.parse('{% include "snippet" %}').render!({}, registers: { file_system: file_system })
-    assert_equal 2, file_system.file_read_count
-  end
-
-  def test_render_tag_within_if_statement
-    Liquid::Template.file_system = StubFileSystem.new('snippet' => 'my message')
-    assert_template_result 'my message', '{% if true %}{% render "snippet" %}{% endif %}'
-  end
-
-  def test_break_through_render
-    Liquid::Template.file_system = StubFileSystem.new('break' => '{% break %}')
-    assert_template_result '1', '{% for i in (1..3) %}{{ i }}{% break %}{{ i }}{% endfor %}'
-    assert_template_result '112233', '{% for i in (1..3) %}{{ i }}{% render "break" %}{{ i }}{% endfor %}'
-  end
-
-  def test_increment_is_isolated_between_renders
-    Liquid::Template.file_system = StubFileSystem.new('incr' => '{% increment %}')
-    assert_template_result '010', '{% increment %}{% increment %}{% render "incr" %}'
-  end
-
-  def test_decrement_is_isolated_between_renders
-    Liquid::Template.file_system = StubFileSystem.new('decr' => '{% decrement %}')
-    assert_template_result '-1-2-1', '{% decrement %}{% decrement %}{% render "decr" %}'
-  end
-end

test/test_helper.rb

@@ -14,11 +14,16 @@ if env_mode = ENV['LIQUID_PARSER_MODE']
 end
 Liquid::Template.error_mode = mode
 
-if ENV['LIQUID_C'] == '1'
+if ENV['LIQUID-C'] == '1'
   puts "-- LIQUID C"
   require 'liquid/c'
 end
 
+if ENV['SUPERFLUID'] == '1'
+  puts "-- SUPERFLUID"
+  require 'liquid/superfluid'
+end
+
 if Minitest.const_defined?('Test')
   # We're on Minitest 5+. Nothing to do here.
 else
@@ -37,18 +42,18 @@ module Minitest
     include Liquid
 
     def assert_template_result(expected, template, assigns = {}, message = nil)
-      assert_equal expected, Template.parse(template, line_numbers: true).render!(assigns), message
+      assert_equal expected, Template.parse(template).render!(assigns), message
     end
 
     def assert_template_result_matches(expected, template, assigns = {}, message = nil)
       return assert_template_result(expected, template, assigns, message) unless expected.is_a? Regexp
 
-      assert_match expected, Template.parse(template, line_numbers: true).render!(assigns), message
+      assert_match expected, Template.parse(template).render!(assigns), message
     end
 
     def assert_match_syntax_error(match, template, assigns = {})
       exception = assert_raises(Liquid::SyntaxError) do
-        Template.parse(template, line_numbers: true).render(assigns)
+        Template.parse(template).render(assigns)
       end
       assert_match match, exception.message
     end
@@ -121,17 +126,3 @@ class ErrorDrop < Liquid::Drop
     raise Exception, 'exception'
   end
 end
-
-class StubFileSystem
-  attr_reader :file_read_count
-
-  def initialize(values)
-    @file_read_count = 0
-    @values = values
-  end
-
-  def read_template_file(template_path)
-    @file_read_count += 1
-    @values.fetch(template_path)
-  end
-end

test/unit/context_unit_test.rb

@@ -468,79 +468,11 @@ class ContextUnitTest < Minitest::Test
     assert_equal 'hi filtered', context.apply_global_filter('hi')
   end
 
-  def test_static_environments_are_read_with_lower_priority_than_environments
-    context = Context.build(
-      static_environments: { 'shadowed' => 'static', 'unshadowed' => 'static' },
-      environments: { 'shadowed' => 'dynamic' }
-    )
-
-    assert_equal 'dynamic', context['shadowed']
-    assert_equal 'static', context['unshadowed']
-  end
-
   def test_apply_global_filter_when_no_global_filter_exist
     context = Context.new
     assert_equal 'hi', context.apply_global_filter('hi')
   end
 
-  def test_new_isolated_subcontext_does_not_inherit_variables
-    super_context = Context.new
-    super_context['my_variable'] = 'some value'
-    subcontext = super_context.new_isolated_subcontext
-
-    assert_nil subcontext['my_variable']
-  end
-
-  def test_new_isolated_subcontext_inherits_static_environment
-    super_context = Context.build(static_environments: { 'my_environment_value' => 'my value' })
-    subcontext = super_context.new_isolated_subcontext
-
-    assert_equal 'my value', subcontext['my_environment_value']
-  end
-
-  def test_new_isolated_subcontext_inherits_resource_limits
-    resource_limits = ResourceLimits.new({})
-    super_context = Context.new({}, {}, {}, false, resource_limits)
-    subcontext = super_context.new_isolated_subcontext
-    assert_equal resource_limits, subcontext.resource_limits
-  end
-
-  def test_new_isolated_subcontext_inherits_exception_renderer
-    super_context = Context.new
-    super_context.exception_renderer = ->(_e) { 'my exception message' }
-    subcontext = super_context.new_isolated_subcontext
-    assert_equal 'my exception message', subcontext.handle_error(Liquid::Error.new)
-  end
-
-  def test_new_isolated_subcontext_does_not_inherit_non_static_registers
-    registers = {
-      my_register: :my_value
-    }
-    super_context = Context.new({}, {}, registers)
-    subcontext = super_context.new_isolated_subcontext
-    assert_nil subcontext.registers[:my_register]
-  end
-
-  def test_new_isolated_subcontext_inherits_static_registers
-    super_context = Context.build(static_registers: { my_register: :my_value })
-    subcontext = super_context.new_isolated_subcontext
-    assert_equal :my_value, subcontext.static_registers[:my_register]
-  end
-
-  def test_new_isolated_subcontext_inherits_filters
-    my_filter = Module.new do
-      def my_filter(*)
-        'my filter result'
-      end
-    end
-
-    super_context = Context.new
-    super_context.add_filters([my_filter])
-    subcontext = super_context.new_isolated_subcontext
-    template = Template.parse('{{ 123 | my_filter }}')
-    assert_equal 'my filter result', template.render(subcontext)
-  end
-
   private
 
   def assert_no_object_allocations

test/unit/partial_cache_unit_test.rb

@@ -1,91 +0,0 @@
-require 'test_helper'
-
-class PartialCacheUnitTest < Minitest::Test
-  def test_uses_the_file_system_register_if_present
-    context = Liquid::Context.build(
-      registers: {
-        file_system: StubFileSystem.new('my_partial' => 'my partial body'),
-      }
-    )
-
-    partial = Liquid::PartialCache.load(
-      'my_partial',
-      context: context,
-      parse_context: Liquid::ParseContext.new
-    )
-
-    assert_equal 'my partial body', partial.render
-  end
-
-  def test_reads_from_the_file_system_only_once_per_file
-    file_system = StubFileSystem.new('my_partial' => 'some partial body')
-    context = Liquid::Context.build(
-      registers: { file_system: file_system }
-    )
-
-    2.times do
-      Liquid::PartialCache.load(
-        'my_partial',
-        context: context,
-        parse_context: Liquid::ParseContext.new
-      )
-    end
-
-    assert_equal 1, file_system.file_read_count
-  end
-
-  def test_cache_state_is_stored_per_context
-    parse_context = Liquid::ParseContext.new
-    shared_file_system = StubFileSystem.new(
-      'my_partial' => 'my shared value'
-    )
-    context_one = Liquid::Context.build(
-      registers: {
-        file_system: shared_file_system,
-      }
-    )
-    context_two = Liquid::Context.build(
-      registers: {
-        file_system: shared_file_system,
-      }
-    )
-
-    2.times do
-      Liquid::PartialCache.load(
-        'my_partial',
-        context: context_one,
-        parse_context: parse_context
-      )
-    end
-
-    Liquid::PartialCache.load(
-      'my_partial',
-      context: context_two,
-      parse_context: parse_context
-    )
-
-    assert_equal 2, shared_file_system.file_read_count
-  end
-
-  def test_cache_is_not_broken_when_a_different_parse_context_is_used
-    file_system = StubFileSystem.new('my_partial' => 'some partial body')
-    context = Liquid::Context.build(
-      registers: { file_system: file_system }
-    )
-
-    Liquid::PartialCache.load(
-      'my_partial',
-      context: context,
-      parse_context: Liquid::ParseContext.new(my_key: 'value one')
-    )
-    Liquid::PartialCache.load(
-      'my_partial',
-      context: context,
-      parse_context: Liquid::ParseContext.new(my_key: 'value two')
-    )
-
-    # Technically what we care about is that the file was parsed twice,
-    # but measuring file reads is an OK proxy for this.
-    assert_equal 1, file_system.file_read_count
-  end
-end