hamlit 2.9.4 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff5c08623e133d33678ed09abfa8aeb752ff6fe48a203d6d22000430335e0ced
-  data.tar.gz: caa9eb9872690fc5ae45432c5c8487be7fafe51f2e65f484e6f9602f5afdf4d2
+  metadata.gz: 315b433bd4a2af17f13b1a8ff54787c65b25beabcbdb1274dd86b29248e75f60
+  data.tar.gz: cd02934b413dd1cf6891f35f5cb1ee8731d68e0f82eb300bf92679b7574ec598
 SHA512:
-  metadata.gz: 0d1241f1a8d1fea6d4528649047d5830197b84e3c2bc01c17f8dd07d59f9cc02023b9c28140817f8aeee92ea26bd67ca3bbf864fa3ffeaff83f271d365b87a23
-  data.tar.gz: 97fcaa8d8b03f6fc84c27927c9a1b73f871211b3d109b32258786a897d54ccb5f3b68c2e42c7e2175dda04073f1dc2aaecb3d3479df34806a5119b035b773968
+  metadata.gz: 128daeb6d3f1d34fd33718b90b20b75117cda4147e8783d039b2daf0e019d836ac580d78fd3e01561f53f4348e442d3a04169761048cc2105ef1e3cae5c5c131
+  data.tar.gz: 0c11bc8dce803aa8d2adfdc78c7b91274678371adb7d30a8a36d997b60ada32320349712cd39c1feec7d965f5e1bbf6b6ab878a3769d4e20ee245afd1772bf79

data/.gitignore

@@ -11,6 +11,7 @@
 .ruby-version
 *.bundle
 *.so
+*.su
 *.o
 *.a
 *.swp

data/.travis.yml

@@ -9,11 +9,13 @@ matrix:
   include:
     - rvm: 2.3.8
       env: TASK=test
-    - rvm: 2.4.5
+    - rvm: 2.4.9
       env: TASK=test
-    - rvm: 2.5.3
+    - rvm: 2.5.7
       env: TASK=test
-    - rvm: 2.6.0
+    - rvm: 2.6.5
+      env: TASK=test
+    - rvm: 2.7.0
       env: TASK=test
     - rvm: ruby-head
       env: TASK=test
@@ -21,19 +23,19 @@ matrix:
       env: TASK=test
     - rvm: truffleruby
       env: TASK=test
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=benchmark/dynamic_attributes/boolean_attribute.haml,benchmark/dynamic_attributes/class_attribute.haml,benchmark/dynamic_attributes/id_attribute.haml,benchmark/dynamic_attributes/data_attribute.haml,benchmark/dynamic_attributes/common_attribute.haml
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench SLIM_BENCH=1
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -4,6 +4,43 @@ All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
 [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [2.11.1](https://github.com/k0kubun/hamlit/compare/v2.11.0...v2.11.1) - 2020-08-25
+
+### Fixed
+
+- Fix a line number on an error after filters like preserve, plain, and ruby.
+  *Thanks to @rgisiger*
+
+## [2.11.0](https://github.com/k0kubun/hamlit/compare/v2.10.1...v2.11.0) - 2019-12-12
+
+### Added
+
+- Support Haml's _revealed_ conditional comment feature on `/![if !IE]` [#153](https://github.com/k0kubun/hamlit/issues/153).
+  *Thanks to @esb*
+
+## [2.10.1](https://github.com/k0kubun/hamlit/compare/v2.10.0...v2.10.1) - 2019-11-28
+
+### Added
+
+- Register `Hamlit::Template` to Tilt as :hamlit as well, in addition to :haml
+
+## [2.10.0](https://github.com/k0kubun/hamlit/compare/v2.9.5...v2.10.0) - 2019-09-15
+
+### Added
+
+- Optimize template rendering by string interpolation [#146](https://github.com/k0kubun/hamlit/issues/146)
+  - Exploiting pre-allocation of string interpolation introduced in Ruby 2.5 [ruby/ruby#1626](https://github.com/ruby/ruby/pull/1626)
+
+### Changed
+
+- Require temple.gem >= 0.8.2
+
+## [2.9.5](https://github.com/k0kubun/hamlit/compare/v2.9.4...v2.9.5) - 2019-09-08
+
+### Added
+
+- Supported `:plain` filter in truffleruby
+
 ## [2.9.4](https://github.com/k0kubun/hamlit/compare/v2.9.3...v2.9.4) - 2019-09-08
 
 ### Added

data/Gemfile

@@ -14,17 +14,15 @@ end
 
 gem 'benchmark-ips', '2.3.0'
 gem 'maxitest'
+gem 'pry'
 
 if /java/ === RUBY_PLATFORM # JRuby
   gem 'pandoc-ruby'
 else
-  gem 'pry-byebug'
   gem 'redcarpet'
 
   if RUBY_PLATFORM !~ /mswin|mingw/ && RUBY_ENGINE != 'truffleruby'
-    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0') # Travis cannot compile ruby.h with C++
-      gem 'faml'
-    end
+    gem 'faml'
     gem 'stackprof'
   end
 end

data/REFERENCE.md

@@ -57,6 +57,7 @@ for full features in original implementation.
   - [x] :plain
   - [x] :preserve
   - [x] :ruby
+     - `haml_io` API is not supported. Use [hamlit-haml\_io.gem](https://github.com/hamlit/hamlit-haml_io) if you need.
   - [x] :sass
   - [x] :scss
   - [ ] :textile
@@ -121,10 +122,10 @@ and merging multiple ids results in concatenation by "\_".
 %div{ id: false }
 
 # Output
-<div id='foo_bar'></span>
-<div id='foo_bar'></span>
-<div id='foo_bar'></span>
-<div id=''></span>
+<div id='foo_bar'></div>
+<div id='foo_bar'></div>
+<div id='foo_bar'></div>
+<div id=''></div>
 ```
 
 ### class attribute
@@ -224,6 +225,14 @@ Hamlit::RailsTemplate.set_options attr_quote: '"'
 set :haml, { attr_quote: '"' }
 ```
 
+## Ruby module
+
+`Hamlit::Template` is a module registered to `Tilt`. You can use it like:
+
+```rb
+Hamlit::Template.new { "%strong Yay for HAML!" }.render
+```
+
 ## Creating a custom filter
 
 Currently it doesn't have filter registering interface compatible with Haml.

data/benchmark/dynamic_merger/benchmark.rb

@@ -0,0 +1,25 @@
+# Original: https://github.com/amatsuda/string_template/blob/master/benchmark.rb
+require 'benchmark_driver'
+
+Benchmark.driver(repeat_count: 8) do |x|
+  x.prelude %{
+    require 'rails'
+    require 'action_view'
+    require 'string_template'
+    StringTemplate::Railtie.run_initializers
+    require 'hamlit'
+    Hamlit::Railtie.run_initializers
+    Hamlit::RailsTemplate.set_options(escape_html: false, generator: Temple::Generators::ArrayBuffer)
+    require 'action_view/base'
+
+    (view = Class.new(ActionView::Base).new(ActionView::LookupContext.new(''))).instance_variable_set(:@world, 'world!')
+
+    # compile template
+    hello = 'benchmark/dynamic_merger/hello'
+    view.render(template: hello, handlers: 'string')
+    view.render(template: hello, handlers: 'haml')
+  }
+  x.report 'string', %{ view.render(template: hello, handlers: 'string') }
+  x.report 'hamlit', %{ view.render(template: hello, handlers: 'haml') }
+  x.loop_count 100_000
+end

data/benchmark/dynamic_merger/hello.haml

@@ -0,0 +1,50 @@
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }

data/benchmark/dynamic_merger/hello.string

@@ -0,0 +1,50 @@
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }

data/bin/bench

@@ -25,7 +25,7 @@ class Bench < Thor
     haml = File.read(file)
 
     Benchmark.ips do |x|
-      x.report("haml v#{Haml::VERSION}") { Haml::Engine.new(haml, escape_html: true, escape_attrs: true, ugly: true).precompiled }
+      x.report("haml v#{Haml::VERSION}") { Haml::Engine.new(haml, escape_html: true, escape_attrs: true).precompiled }
       x.report("faml v#{Faml::VERSION}") { Faml::Engine.new.call(haml) }
       x.report("hamlit v#{Hamlit::VERSION}") { Hamlit::Engine.new.call(haml) }
       x.compare!
@@ -43,7 +43,7 @@ class Bench < Thor
       object.instance_eval(File.read(ruby_file))
     end
 
-    Haml::Engine.new(haml, escape_html: true, escape_attrs: true, ugly: true).def_method(object, :haml)
+    Haml::Engine.new(haml, escape_html: true, escape_attrs: true).def_method(object, :haml)
     object.instance_eval "def faml; #{Faml::Engine.new.call(haml)}; end"
     object.instance_eval "def hamlit; #{Hamlit::Engine.new.call(haml)}; end"
 
@@ -59,7 +59,7 @@ class Bench < Thor
   def code(file)
     haml = File.read(file)
     puts "#{?= * 49}\n Haml Source: #{file}\n#{?= * 49}"
-    puts Haml::Engine.new(haml, escape_html: true, escape_attrs: true, ugly: true).precompiled
+    puts Haml::Engine.new(haml, escape_html: true, escape_attrs: true).precompiled
     puts "\n#{?= * 49}\n Faml Source: #{file}\n#{?= * 49}"
     puts Faml::Engine.new.call(haml)
     puts "\n#{?= * 49}\n Hamlit Source: #{file}\n#{?= * 49}"

data/hamlit.gemspec

@@ -26,10 +26,11 @@ Gem::Specification.new do |spec|
     spec.required_ruby_version = '>= 2.1.0'
   end
 
-  spec.add_dependency 'temple', '>= 0.8.0'
+  spec.add_dependency 'temple', '>= 0.8.2'
   spec.add_dependency 'thor'
   spec.add_dependency 'tilt'
 
+  spec.add_development_dependency 'benchmark_driver'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coffee-script'
   spec.add_development_dependency 'erubi'
@@ -41,5 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'slim'
+  spec.add_development_dependency 'string_template'
   spec.add_development_dependency 'unindent'
 end

data/lib/hamlit/compiler/children_compiler.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'hamlit/temple_line_counter'
+
 module Hamlit
   class Compiler
     class ChildrenCompiler
@@ -14,7 +16,7 @@ module Hamlit
         node.children.each do |n|
           rstrip_whitespace!(temple) if nuke_prev_whitespace?(n)
           insert_newlines!(temple, n)
-          temple << yield(n)
+          temple << moving_lineno(n) { block.call(n) }
           temple << :whitespace if insert_whitespace?(n)
         end
         rstrip_whitespace!(temple) if nuke_inner_whitespace?(node)
@@ -27,19 +29,31 @@ module Hamlit
         (node.line - @lineno).times do
           temple << [:newline]
         end
+
         @lineno = node.line
+      end
 
+      def moving_lineno(node, &block)
+        # before: As they may have children, we need to increment lineno before compilation.
         case node.type
         when :script, :silent_script
           @lineno += 1
-        when :filter
-          @lineno += (node.value[:text] || '').split("\n").size
         when :tag
           node.value[:attributes_hashes].each do |attribute_hash|
             @lineno += attribute_hash.count("\n")
           end
           @lineno += 1 if node.children.empty? && node.value[:parse]
         end
+
+        temple = block.call # compile
+
+        # after: filter may not have children, and for some dynamic filters we can't predict the number of lines.
+        case node.type
+        when :filter
+          @lineno += TempleLineCounter.count_lines(temple)
+        end
+
+        temple
       end
 
       def confirm_whitespace(temple)

data/lib/hamlit/compiler/comment_compiler.rb

@@ -25,11 +25,13 @@ module Hamlit
           condition = $1
         end
 
-        if node.children.empty?
-          [:html, :condcomment, condition, [:static, " #{node.value[:text]} "]]
-        else
-          [:html, :condcomment, condition, yield(node)]
-        end
+        content =
+          if node.children.empty?
+            [:static, " #{node.value[:text]} "]
+          else
+            yield(node)
+          end
+        [:html, :condcomment, condition, content, node.value[:revealed]]
       end
     end
   end

data/lib/hamlit/compiler/tag_compiler.rb

@@ -55,10 +55,6 @@ module Hamlit
 
       # We should handle interpolation here to escape only interpolated values.
       def compile_interpolated_plain(node)
-        unless Ripper.respond_to?(:lex) # No Ripper.lex in truffleruby
-          return [:multi, [:escape, node.value[:escape_interpolation], [:dynamic, "%Q[#{node.value[:value]}]"]], [:newline]]
-        end
-
         temple = [:multi]
         StringSplitter.compile(node.value[:value]).each do |type, value|
           case type

data/lib/hamlit/dynamic_merger.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+module Hamlit
+  # Compile [:multi, [:static, 'foo'], [:dynamic, 'bar']] to [:dynamic, '"foo#{bar}"']
+  class DynamicMerger < Temple::Filter
+    def on_multi(*exps)
+      exps = exps.dup
+      result = [:multi]
+      buffer = []
+
+      until exps.empty?
+        type, arg = exps.first
+        if type == :dynamic && arg.count("\n") == 0
+          buffer << exps.shift
+        elsif type == :static && exps.size > (count = arg.count("\n")) &&
+              exps[1, count].all? { |e| e == [:newline] }
+          (1 + count).times { buffer << exps.shift }
+        elsif type == :newline && exps.size > (count = count_newline(exps)) &&
+              exps[count].first == :static && count == exps[count].last.count("\n")
+          (count + 1).times { buffer << exps.shift }
+        else
+          result.concat(merge_dynamic(buffer))
+          buffer = []
+          result << compile(exps.shift)
+        end
+      end
+      result.concat(merge_dynamic(buffer))
+
+      result.size == 2 ? result[1] : result
+    end
+
+    private
+
+    def merge_dynamic(exps)
+      # Merge exps only when they have both :static and :dynamic
+      unless exps.any? { |type,| type == :static } && exps.any? { |type,| type == :dynamic }
+        return exps
+      end
+
+      strlit_body = String.new
+      exps.each do |type, arg|
+        case type
+        when :static
+          strlit_body << arg.dump.sub!(/\A"/, '').sub!(/"\z/, '').gsub('\n', "\n")
+        when :dynamic
+          strlit_body << "\#{#{arg}}"
+        when :newline
+          # newline is added by `gsub('\n', "\n")`
+        else
+          raise "unexpected type #{type.inspect} is given to #merge_dynamic"
+        end
+      end
+      [[:dynamic, "%Q\0#{strlit_body}\0"]]
+    end
+
+    def count_newline(exps)
+      count = 0
+      exps.each do |exp|
+        if exp == [:newline]
+          count += 1
+        else
+          return count
+        end
+      end
+      return count
+    end
+  end
+end

data/lib/hamlit/engine.rb

@@ -2,10 +2,10 @@
 require 'temple'
 require 'hamlit/parser'
 require 'hamlit/compiler'
+require 'hamlit/html'
 require 'hamlit/escapable'
 require 'hamlit/force_escapable'
-require 'hamlit/html'
-require 'hamlit/string_splitter'
+require 'hamlit/dynamic_merger'
 
 module Hamlit
   class Engine < Temple::Engine
@@ -25,15 +25,14 @@ module Hamlit
     use Parser
     use Compiler
     use HTML
-    if Ripper.respond_to?(:lex) # No Ripper.lex in truffleruby
-      use StringSplitter
-      filter :StaticAnalyzer
-    end
+    filter :StringSplitter
+    filter :StaticAnalyzer
     use Escapable
     use ForceEscapable
     filter :ControlFlow
     filter :MultiFlattener
     filter :StaticMerger
+    use DynamicMerger
     use :Generator, -> { options[:generator] }
   end
 end

data/lib/hamlit/filters/plain.rb

@@ -5,9 +5,6 @@ module Hamlit
   class Filters
     class Plain < Base
       def compile(node)
-        unless Ripper.respond_to?(:lex)
-          raise NotImplementedError.new('This platform does not have Ripper.lex required for :plain filter')
-        end
         text = node.value[:text]
         text = text.rstrip unless ::Hamlit::HamlUtil.contains_interpolation?(text) # for compatibility
         [:multi, *compile_plain(text)]

data/lib/hamlit/html.rb

@@ -10,5 +10,13 @@ module Hamlit
       end
       super(opts)
     end
+
+    # This dispatcher supports Haml's "revealed" conditional comment.
+    def on_html_condcomment(condition, content, revealed = false)
+      on_html_comment [:multi,
+                       [:static, "[#{condition}]>#{'<!-->' if revealed}"],
+                       content,
+                       [:static, "#{'<!--' if revealed}<![endif]"]]
+    end
   end
 end

data/lib/hamlit/string_splitter.rb

@@ -2,87 +2,18 @@ require 'ripper'
 require 'hamlit/ruby_expression'
 
 module Hamlit
-  class StringSplitter < Temple::Filter
-    class << self
-      # `code` param must be valid string literal
-      def compile(code)
-        [].tap do |exps|
-          tokens = Ripper.lex(code.strip)
-          tokens.pop while tokens.last && %i[on_comment on_sp].include?(tokens.last[1])
-
-          if tokens.size < 2
-            raise Hamlit::InternalError.new("Expected token size >= 2 but got: #{tokens.size}")
-          end
-          compile_tokens!(exps, tokens)
-        end
-      end
-
-      private
-
-      def strip_quotes!(tokens)
-        _, type, beg_str = tokens.shift
-        if type != :on_tstring_beg
-          raise Hamlit::InternalError.new("Expected :on_tstring_beg but got: #{type}")
-        end
-
-        _, type, end_str = tokens.pop
-        if type != :on_tstring_end
-          raise Hamlit::InternalError.new("Expected :on_tstring_end but got: #{type}")
-        end
-
-        [beg_str, end_str]
-      end
-
-      def compile_tokens!(exps, tokens)
-        beg_str, end_str = strip_quotes!(tokens)
-
-        until tokens.empty?
-          _, type, str = tokens.shift
-
-          case type
-          when :on_tstring_content
-            exps << [:static, eval("#{beg_str}#{str}#{end_str}")]
-          when :on_embexpr_beg
-            embedded = shift_balanced_embexpr(tokens)
-            exps << [:dynamic, embedded] unless embedded.empty?
-          end
-        end
-      end
-
-      def shift_balanced_embexpr(tokens)
-        String.new.tap do |embedded|
-          embexpr_open = 1
-
-          until tokens.empty?
-            _, type, str = tokens.shift
-            case type
-            when :on_embexpr_beg
-              embexpr_open += 1
-            when :on_embexpr_end
-              embexpr_open -= 1
-              break if embexpr_open == 0
-            end
-
-            embedded << str
-          end
-        end
+  module StringSplitter
+    # `code` param must be valid string literal
+    def self.compile(code)
+      unless Ripper.respond_to?(:lex) # truffleruby doesn't have Ripper.lex
+        return [[:dynamic, code]]
       end
-    end
-
-    def on_dynamic(code)
-      return [:dynamic, code] unless RubyExpression.string_literal?(code)
-      return [:dynamic, code] if code.include?("\n")
 
-      temple = [:multi]
-      StringSplitter.compile(code).each do |type, content|
-        case type
-        when :static
-          temple << [:static, content]
-        when :dynamic
-          temple << on_dynamic(content)
-        end
+      begin
+        Temple::Filters::StringSplitter.compile(code)
+      rescue Temple::FilterError => e
+        raise Hamlit::InternalError.new(e.message)
       end
-      temple
     end
   end
 end

data/lib/hamlit/template.rb

@@ -14,7 +14,7 @@ end
 module Hamlit
   Template = Temple::Templates::Tilt.create(
     Hamlit::Engine,
-    register_as: :haml,
+    register_as: [:haml, :hamlit],
   )
 
   module TemplateExtension

data/lib/hamlit/temple_line_counter.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Hamlit
+  # A module to count lines of expected code. This would be faster than actual code generation
+  # and counting newlines in it.
+  module TempleLineCounter
+    class UnexpectedExpression < StandardError; end
+
+    def self.count_lines(exp)
+      type, *args = exp
+      case type
+      when :multi
+        args.map { |a| count_lines(a) }.reduce(:+) || 0
+      when :dynamic, :code
+        args.first.count("\n")
+      when :static
+        0 # It has not real newline "\n" but escaped "\\n".
+      when :case
+        arg, *cases = args
+        arg.count("\n") + cases.map do |cond, e|
+          (cond == :else ? 0 : cond.count("\n")) + count_lines(e)
+        end.reduce(:+)
+      when :escape
+        count_lines(args[1])
+      when :newline
+        1
+      else
+        raise UnexpectedExpression.new("[HAML BUG] Unexpected Temple expression '#{type}' is given!")
+      end
+    end
+  end
+end

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '2.9.4'
+  VERSION = '2.11.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.11.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark_driver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: string_template
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: unindent
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +275,9 @@ files:
 - benchmark/dynamic_attributes/data_attribute.haml
 - benchmark/dynamic_attributes/id_attribute.haml
 - benchmark/dynamic_boolean_attribute.haml
+- benchmark/dynamic_merger/benchmark.rb
+- benchmark/dynamic_merger/hello.haml
+- benchmark/dynamic_merger/hello.string
 - benchmark/etc/attribute_builder.haml
 - benchmark/etc/real_sample.haml
 - benchmark/etc/real_sample.rb
@@ -290,6 +321,7 @@ files:
 - lib/hamlit/compiler/script_compiler.rb
 - lib/hamlit/compiler/silent_script_compiler.rb
 - lib/hamlit/compiler/tag_compiler.rb
+- lib/hamlit/dynamic_merger.rb
 - lib/hamlit/engine.rb
 - lib/hamlit/error.rb
 - lib/hamlit/escapable.rb
@@ -311,7 +343,6 @@ files:
 - lib/hamlit/filters/text_base.rb
 - lib/hamlit/filters/tilt_base.rb
 - lib/hamlit/force_escapable.rb
-- lib/hamlit/hamlit.su
 - lib/hamlit/helpers.rb
 - lib/hamlit/html.rb
 - lib/hamlit/identity.rb
@@ -333,6 +364,7 @@ files:
 - lib/hamlit/ruby_expression.rb
 - lib/hamlit/string_splitter.rb
 - lib/hamlit/template.rb
+- lib/hamlit/temple_line_counter.rb
 - lib/hamlit/utils.rb
 - lib/hamlit/version.rb
 homepage: https://github.com/k0kubun/hamlit
@@ -354,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: High Performance Haml Implementation