hamli 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8051356e999f363969f3ccd7c937b17e70ea6e58c283e5836e5ccc0f3163e2a
-  data.tar.gz: 6d08f7c25aa75ebd8fc5e64e009533bf02154521329e2de01789eee469462e86
+  metadata.gz: bfe5c703b08f1580b7b3bf603b45984d68c1ccaff5675b0243a838a190597366
+  data.tar.gz: b5af88cc968267fdbc9ae35806a0d6fef3fb749b1939ce42a19d635b00f0c767
 SHA512:
-  metadata.gz: e4c6d223febbf5aec1aaccaa30ef9599aebf32903a8de3afe9fe62ffd8b1b928bfb5eef519551952c6a41d43c0be8b325af4436ad95d69a429949950772cf454
-  data.tar.gz: a78ba804bc6b81fce03df6a85ea885ec809dba8f4c09ea5aed0d80007941149798dda64037ca3f68dbb3ea6d339fe362706ddfb530ada457b53a98a0a14dd6b5
+  metadata.gz: a29fe320a9c23065a6d897eab4acaf1e97b2303c11e0ec28854eb37bd50507a95247edee7a315dfa8b1e91af0be39ec79a1e4ec996220905084e9efa051fc285
+  data.tar.gz: cfcee2c4310365319915007a790d2962a88913180f21baae95857db5493c911fb09da9d152ac0993e01de4f684e141c73646466d1b31181fde85a8dbcde5196e

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## 0.3.0 - 2022-01-26
+
+### Added
+
+- Support output block in tag line.
+- Support HTML comment line.
+- Support HTML conditional comment line.
+- Support Haml comment line.
+- Support output line.
+- Support control line.
+
 ## 0.2.0 - 2022-01-25
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hamli (0.2.0)
+    hamli (0.3.0)
       temple
 
 GEM

data/lib/hamli/parser.rb

@@ -25,6 +25,16 @@ module Hamli
         parse_tag_line
       elsif @scanner.match?(/[#.]/)
         parse_div_line
+      elsif @scanner.match?(%r{/\[})
+        parse_html_conditional_comment_line
+      elsif @scanner.match?(%r{/})
+        parse_html_comment_line
+      elsif @scanner.match?(/-#/)
+        parse_haml_comment_line
+      elsif @scanner.match?(/-/)
+        parse_control_line
+      elsif @scanner.match?(/=/)
+        parse_output_line
       else
         parse_text_line
       end
@@ -110,10 +120,19 @@ module Hamli
         content = [:multi]
         tag << content
         @stacks << content
-      elsif @scanner.scan(/[ \t]*=([<>])*/)
-        # TODO
+      elsif @scanner.scan(/[ \t]*([<>]*)=/)
+        # white_space_marker = @scanner[1]
+        # without_outer_white_space = white_space_marker.include?('>') # TODO
+        # without_inner_white_space = white_space_marker.include?('<') # TODO
+        @scanner.skip(/[ \t]+/)
+        begin_ = @scanner.charpos
+        content = parse_broken_lines
+        end_ = @scanner.charpos
+        block = [:multi]
+        tag << [:hamli, :position, begin_, end_, [:hamli, :output, content, block]]
+        @stacks << block
       elsif @scanner.scan(%r{[ \t]*/[ \t]*})
-        # TODO
+        # Does nothing.
       else
         @scanner.scan(/[ \t]+/)
         tag << [:hamli, :text, parse_text_block]
@@ -295,6 +314,49 @@ module Hamli
       [:hamli, :ruby_attributes, [:hamli, :position, begin_, @scanner.charpos, value]]
     end
 
+    # Parse HTML comment part.
+    #   e.g. /[if IE]
+    #        ^^^^^^^^
+    def parse_html_conditional_comment_line
+      @scanner.pos += 1
+      condition = @scanner.scan(
+        /
+          (?<brackets>
+            \[
+              (?:[^\[\]] | \g<brackets>)*
+            \]
+          )
+        /x
+      )
+      block = [:multi]
+      @stacks.last << [:html, :condcomment, condition, block]
+      @stacks << block
+      parse_line_ending
+    end
+
+    # Parse HTML comment part.
+    #   e.g. / abc
+    #        ^^^^^
+    def parse_html_comment_line
+      @scanner.pos += 1
+      block = [:multi]
+      block << [:static, @scanner.scan(/[^\r\n]*/)]
+      @stacks.last << [:html, :comment, block]
+      @stacks << block
+      parse_line_ending
+    end
+
+    # Parse Haml comment part.
+    #   e.g. -# abc
+    #        ^^^^^^
+    def parse_haml_comment_line
+      @scanner.pos += 2
+      while !@scanner.eos? && (@scanner.match?(/[ \t]*(?=\r|$)/) || peek_indent > @indents.last)
+        @scanner.skip(/[^\r\n]*/)
+        parse_line_ending
+      end
+    end
+
     # Parse text block part.
     #   e.g. %div abc
     #            ^^^^
@@ -334,6 +396,42 @@ module Hamli
       [:hamli, :interpolate, begin_, end_, value]
     end
 
+    # Parse output line part.
+    #   e.g. = abc
+    #        ^^^^^
+    def parse_output_line
+      parse_control_line(name: :output)
+    end
+
+    # Parse control line part.
+    #   e.g. - abc
+    #        ^^^^^
+    def parse_control_line(name: :control)
+      @scanner.pos += 1
+      @scanner.scan(/[ \t]*/)
+      block = [:multi]
+      begin_ = @scanner.charpos
+      content = parse_broken_lines
+      end_ = @scanner.charpos
+      @stacks.last << [:hamli, :position, begin_, end_, [:hamli, name, content, block]]
+      @stacks << block
+    end
+
+    # @note Broken line means line-breaked lines, separated by trailing "," or "|".
+    # @return [String]
+    def parse_broken_lines
+      result = +''
+      result << @scanner.scan(/[^\r\n]*/)
+      while result.end_with?(',') || result.end_with?('|')
+        syntax_error!(Errors::UnexpectedEosError) unless @scanner.scan(/\r?\n/)
+
+        result.delete_suffix('|')
+        result << "\n"
+        result << @scanner.scan(/[^\r\n]*/)
+      end
+      result
+    end
+
     # @param [Class] syntax_error_class A child class of Hamli::Errors::HamlSyntaxError.
     # @raise [Hamli::Errors::HamlSyntaxError]
     def syntax_error!(syntax_error_class)
@@ -364,5 +462,11 @@ module Hamli
     def expecting_indentation?
       @stacks.length > @indents.length
     end
+
+    # @return [Integer] Indent level.
+    def peek_indent
+      @scanner.match?(/[ \t]*/)
+      indent_from_last_match
+    end
   end
 end

data/lib/hamli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hamli
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple