p_css 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56d14cfeff071d56fbc439f7dc2ad0cd9827bcc21ff1ff26b5d459e832855a91
-  data.tar.gz: 5c576b9cccd85b7be148ed868a90b90072e164a69e317ce56ecdb921e731d3be
+  metadata.gz: 223962d85169a337ff087e759a5bce186ece7182cd15ead418c280228fdde208
+  data.tar.gz: 4ccd0ca9e312dec47fc8f41f4d0b02d6918f86c47279d463f1c6c3e2e75549b8
 SHA512:
-  metadata.gz: badef00c5dc20716c989010581b364ede57d843bf4e31d4263d66e001eb7150f1e7f7f8572a4b53ffa6f49d897f93d93f47bc23ee92d7017b3489fa2475de134
-  data.tar.gz: 98ac482f74beb6fe2726cd8876083402e3995127d7a2205bc5c94063efe5d63bfc0f799d0dee7c5645ad4039af8f567b064e3d71e522e2e7cdb74d9162d39955
+  metadata.gz: 9a4e563505c86e0939c03410c1d75be48b5fc1e9b9ada13dc422ee0b290dba215a94d4cd5dced0c2c4984cd15770bd2797b667436b77709766e7c9d64b750280
+  data.tar.gz: dae2b3b18a78f04eb9dc9babd31e0b1f7e17102740f2fd4cfe34112b24095c8d2c1453e2e67ffb0cd91949d31c35ea4ef42d71c620d8cc0c86cfb67632592f18

data/lib/css/cascade.rb

@@ -18,7 +18,10 @@ module CSS
   # not modeled — `@layer`, `@supports`, `@container`, `@scope`, and
   # `@starting-style` blocks are descended into unconditionally.
   class Cascade
-    Match = Data.define(:declaration, :specificity, :inline, :order)
+    # Allocated once per matching declaration on every resolve; Struct
+    # constructs noticeably faster than Data, and Match never escapes
+    # `resolve`, so it doesn't need Data's immutability guarantees.
+    Match = Struct.new(:declaration, :specificity, :inline, :order)
 
     RuleEntry = Data.define(:selector_pairs, :declarations)
 
@@ -56,14 +59,14 @@ module CSS
 
         entry.declarations.each do |decl|
           order += 1
-          matches << Match.new(declaration: decl, specificity: spec, inline: false, order: order)
+          matches << Match.new(decl, spec, false, order)
         end
       end
 
       if inline_style
         inline_declarations(inline_style).each do |decl|
           order += 1
-          matches << Match.new(declaration: decl, specificity: Selectors::Specificity::ZERO, inline: true, order: order)
+          matches << Match.new(decl, Selectors::Specificity::ZERO, true, order)
         end
       end
 
@@ -216,6 +219,14 @@ module CSS
     end
 
     def best_matching_specificity(element, selector_pairs, cache, state)
+      # The single-selector case is the dominant shape in real stylesheets
+      # (`.foo { ... }`, `div > a { ... }`), so skip the each/block frame
+      # and the running-max compare for it.
+      if selector_pairs.size == 1
+        sel, spec = selector_pairs[0]
+        return Selectors::Matcher.matches?(element, sel, cache: cache, state: state) ? spec : nil
+      end
+
       best = nil
 
       selector_pairs.each do |sel, spec|

data/lib/css/parser.rb

@@ -105,7 +105,7 @@ module CSS
       groups  = []
       current = []
 
-      loop do
+      while true
         case peek.type
         when :eof
           groups << current
@@ -151,7 +151,7 @@ module CSS
     def consume_rule_list(top_level:)
       rules = []
 
-      loop do
+      while true
         t = peek
 
         case t.type
@@ -183,7 +183,7 @@ module CSS
       prelude = []
       block   = nil
 
-      loop do
+      while true
         t = peek
 
         case t.type
@@ -214,7 +214,7 @@ module CSS
     def consume_qualified_rule(nested:)
       prelude = []
 
-      loop do
+      while true
         t = peek
 
         case t.type
@@ -254,7 +254,7 @@ module CSS
     def collect_block_items(stop_at_close_brace:)
       items = []
 
-      loop do
+      while true
         t = peek
 
         case t.type
@@ -306,7 +306,7 @@ module CSS
 
       value = []
 
-      loop do
+      while true
         t = peek
 
         case t.type
@@ -350,7 +350,7 @@ module CSS
       end_type  = BRACKET_CLOSE_TYPE.fetch(open_type)
       values    = []
 
-      loop do
+      while true
         t = peek
 
         case t.type
@@ -371,7 +371,7 @@ module CSS
       name   = consume.value
       values = []
 
-      loop do
+      while true
         t = peek
 
         case t.type

data/lib/css/selectors/matcher.rb

@@ -99,7 +99,17 @@ module CSS
       end
 
       def match_compound(element, compound, cache, state)
-        compound.components.all? { match_simple(element, _1, cache, state) }
+        components = compound.components
+        i          = 0
+        n          = components.size
+
+        while i < n
+          return false unless match_simple(element, components[i], cache, state)
+
+          i += 1
+        end
+
+        true
       end
 
       def match_simple(element, simple, cache, state)
@@ -285,7 +295,12 @@ module CSS
         return nil if p.nil?
 
         siblings = element_children(p)
-        siblings = siblings.select { tag(_1).casecmp?(tag(element)) } if of_type
+
+        if of_type
+          own_tag  = tag(element)
+          siblings = siblings.select { tag(_1) == own_tag }
+        end
+
         siblings = siblings.reverse if from_end
 
         idx = siblings.index { same_node?(_1, element) }

data/lib/css/token.rb

@@ -15,12 +15,12 @@ module CSS
       colon semicolon comma
       lbracket rbracket lparen rparen lbrace rbrace
       eof
-    ].freeze
+    ].to_h { [_1, true] }.freeze
 
     attr_reader :type, :value, :flag, :unit
 
     def initialize(type, value = nil, flag: nil, unit: nil, position: nil)
-      raise ArgumentError, "unknown token type: #{type.inspect}" unless TYPES.include?(type)
+      raise ArgumentError, "unknown token type: #{type.inspect}" unless TYPES[type]
 
       @type     = type
       @value    = value

data/lib/css/tokenizer.rb

@@ -34,7 +34,7 @@ module CSS
     def tokenize
       tokens = []
 
-      loop do
+      while true
         token = next_token
         break if token.type == :eof
 
@@ -45,7 +45,7 @@ module CSS
     end
 
     def next_token
-      consume_comments unless @preserve_comments
+      consume_comments if !@preserve_comments && @chars[@pos] == '/'
 
       return Token.new(:eof) if @pos >= @length
 
@@ -62,7 +62,7 @@ module CSS
 
       c = consume
 
-      return consume_whitespace      if whitespace?(c)
+      return consume_whitespace      if c == ' ' || c == "\n" || c == "\t"
       return consume_string_token(c) if c == '"' || c == "'"
 
       if (c == '+' || c == '-' || c == '.') && number_starts?(c, peek, peek(1))
@@ -252,7 +252,9 @@ module CSS
     end
 
     def consume_whitespace
-      consume while whitespace?(peek)
+      while (c = @chars[@pos]) && (c == ' ' || c == "\n" || c == "\t")
+        @pos += 1
+      end
 
       Token.new(:whitespace)
     end
@@ -261,7 +263,7 @@ module CSS
     def consume_string_token(ending)
       buf = +''
 
-      loop do
+      while true
         c = consume
 
         case c
@@ -306,22 +308,41 @@ module CSS
       end
     end
 
-    # §4.3.11.
+    # §4.3.11. Fast path: walk @chars while the run is pure ident code points,
+    # then slice and return. Escapes (rare in real CSS) switch to a buf-based
+    # slow path that mirrors the spec's append-each-char semantics.
     def consume_ident_sequence
-      buf = +''
+      start = @pos
+      c     = nil
 
-      loop do
-        c = consume
+      while (c = @chars[@pos])
+        o = c.ord
+        break unless o >= 128 || IDENT_CP_TABLE[o]
+
+        @pos += 1
+      end
+
+      return @chars[start, @pos - start].join unless c == '\\' && (n = @chars[@pos + 1]) && n != "\n"
+
+      buf = @chars[start, @pos - start].join.dup
+      @pos += 1
+      buf << consume_escaped_code_point
+
+      while (c = @chars[@pos])
+        o = c.ord
 
-        if ident_code_point?(c)
+        if o >= 128 || IDENT_CP_TABLE[o]
           buf << c
-        elsif valid_escape?(c, peek)
+          @pos += 1
+        elsif c == '\\' && (n = @chars[@pos + 1]) && n != "\n"
+          @pos += 1
           buf << consume_escaped_code_point
         else
-          reconsume unless c.nil?
-          return buf
+          break
         end
       end
+
+      buf
     end
 
     # §4.3.4.
@@ -355,7 +376,7 @@ module CSS
 
       consume while whitespace?(peek)
 
-      loop do
+      while true
         c = consume
 
         case c
@@ -396,7 +417,7 @@ module CSS
 
     # §4.3.14.
     def consume_bad_url_remnants
-      loop do
+      while true
         c = consume
 
         return if c.nil? || c == ')'
@@ -419,17 +440,27 @@ module CSS
       end
     end
 
-    # §4.3.12. Returns [numeric_value, :integer | :number].
+    # §4.3.12. Returns [numeric_value, :integer | :number]. The three digit
+    # runs inline DIGIT_TABLE so the loop bodies stay in the same frame.
     def consume_number
       repr = +''
       flag = :integer
 
       repr << consume if peek == '+' || peek == '-'
-      repr << consume while digit?(peek)
+
+      while (c = @chars[@pos]) && (o = c.ord) < 128 && DIGIT_TABLE[o]
+        repr << c
+        @pos += 1
+      end
 
       if peek == '.' && digit?(peek(1))
         repr << consume
-        repr << consume while digit?(peek)
+
+        while (c = @chars[@pos]) && (o = c.ord) < 128 && DIGIT_TABLE[o]
+          repr << c
+          @pos += 1
+        end
+
         flag = :number
       end
 
@@ -437,7 +468,12 @@ module CSS
           (digit?(peek(1)) || ((peek(1) == '+' || peek(1) == '-') && digit?(peek(2))))
         repr << consume
         repr << consume if peek == '+' || peek == '-'
-        repr << consume while digit?(peek)
+
+        while (c = @chars[@pos]) && (o = c.ord) < 128 && DIGIT_TABLE[o]
+          repr << c
+          @pos += 1
+        end
+
         flag = :number
       end
 

data/lib/css/version.rb

@@ -1,3 +1,3 @@
 module CSS
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p_css
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Keita Urashima