minicss 0.1.5 → 0.1.7

data/lib/minicss/css/refinements.rb

@@ -3,76 +3,34 @@
 module MiniCSS
   module CSS
     module StringRefinements
-      refine String do
-        def eof? = false
-        def digit? = between?("0", "9")
-        def hex? = digit? || between?("a", "f") || between?("A", "F")
-        def uppercase? = between?("A", "Z")
-        def lowercase? = between?("a", "z")
-        def letter? = uppercase? || lowercase?
+      refine Integer do
+        # EOF sentinel check
+        def eof? = (self == -1)
+
+        # ASCII digit / hex
+        def digit?     = (0x30..0x39).cover?(self)
+        def hex?       = digit? || (0x61..0x66).cover?(self) || (0x41..0x46).cover?(self)
+        def uppercase? = (0x41..0x5A).cover?(self)
+        def lowercase? = (0x61..0x7A).cover?(self)
+        def letter?    = uppercase? || lowercase?
         def one_of?(*what) = what.include?(self)
 
-        def non_ascii_ident?
-          self == "\u00B7" \
-          || between?("\u00C0", "\u00D6") \
-          || between?("\u00D8", "\u00F6") \
-          || between?("\u00F8", "\u037D") \
-          || between?("\u037F", "\u1FFF") \
-          || self == "\u200C" \
-          || self == "\u200D" \
-          || self == "\u203F" \
-          || self == "\u2040" \
-          || between?("\u2070", "\u218F") \
-          || between?("\u2C00", "\u2FEF") \
-          || between?("\u3001", "\uD7FF") \
-          || between?("\uF900", "\uFDCF") \
-          || between?("\uFDF0", "\uFFFD") \
-          || self >= "\u{10000}"
-        end
-
-        def uni = unpack1("U")
-        def ident_start? = letter? || uni >= 0x80 || self == "_"
-        def ident_point? = ident_start? || digit? || uni == 0x2D
+        # Ident start/point rules
+        def ident_start? = letter? || self >= 0x80 || self == 0x5F
+        def ident_point? = ident_start? || digit? || self == 0x2D
 
+        # Non-printable checks
         def non_printable?
-          between?("\u0000", "\u0008") \
-          || self == "\u000B" \
-          || between?("\u000B", "\u001F") \
-          || self == "\u007F"
+          (0x0000..0x0008).cover?(self) ||
+            self == 0x000B ||
+            (0x000C..0x001F).cover?(self) ||
+            self == 0x007F
         end
 
-        def newline? = (self == "\n")
-        def whitespace? = newline? || self == "\u0009" || self == "\u0020"
+        # Whitespace / newline
+        def newline?    = (self == 0x0A)
+        def whitespace? = newline? || self == 0x09 || self == 0x20
       end
-
-      refine Integer do
-        def surrogate_leading? = between?(0xD800, 0xDBFF)
-        def surrogate_trailing? = between?(0xDC00, 0xDFFF)
-
-        def surrogate? = surrogate_leading? || surrogate_trailing?
-        def overflows_maximum_codepoint? = self > 0x10FFFF
-      end
-    end
-
-    class EOF
-      def self.instance
-        @instance ||= new
-      end
-
-      def eof? = true
-      def digit? = false
-      def hex? = false
-      def uppercase? = false
-      def lowercase? = false
-      def letter? = false
-      def one_of?(*) = false
-      def non_ascii_ident? = false
-      def uni = 0
-      def ident_start? = false
-      def ident_point? = false
-      def non_printable? = false
-      def newline? = false
-      def whitespace? = false
     end
   end
 end

data/lib/minicss/css/token_stream.rb

@@ -1,56 +1,3 @@
 # frozen_string_literal: true
 
-module MiniCSS
-  module CSS
-    class TokenStream
-      using StringRefinements
-
-      def initialize(tokens)
-        @tokens = tokens
-        @idx = 0
-        @marks = []
-      end
-
-      def peek
-        token = @tokens[@idx]
-        return Token::EOF unless token
-
-        token
-      end
-
-      def peek1
-        token = @tokens[@idx + 1]
-        return Token::EOF unless token
-
-        token
-      end
-
-      def empty? = peek.eof?
-
-      def consume
-        peek.tap { @idx += 1 }
-      end
-
-      def discard
-        @idx += 1 unless empty?
-        nil
-      end
-
-      def mark
-        @marks << @idx
-      end
-
-      def restore
-        @idx = pop
-      end
-
-      def pop
-        @marks.pop
-      end
-
-      def discard_whitespace
-        discard while peek.kind == :whitespace
-      end
-    end
-  end
-end
+require_relative "../../minicss_token_stream"