yoga 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03845e88ffb4574489a6881d994554233bffe779
-  data.tar.gz: 1217f182ff6402b7df6f5997f7f24dca773e39d2
+  metadata.gz: d47b133334a8a84e8376462babbbe7ead6a966bd
+  data.tar.gz: d2b5d18e263caf245c93677658dadb1c5c66f36b
 SHA512:
-  metadata.gz: 14e9209587fc857be6637316ae9e3cdfe08022b61d5326987b2d7f7a3e2ba18b2c20e2bc8277097f7f35dfa38742813378b2acb02114c7afb9780afdea4e3343
-  data.tar.gz: 84892e0eca95a1d0b56f64ccab0bb1b6c532f3775185e31b89b54f21386c0803873e872361abf66d6d425c8383d6423eacfa4790618b4e576e71859c2c1f5643
+  metadata.gz: fd9eb5267207071585e630dcf03186a0e7f8ac748b578fc207330a2560544f649573d7ebe299fe4820ec53a473e01fc2980048b9484979fb9cb5781b2576fb32
+  data.tar.gz: 14c809c089f72ddfd86d64dad0d4834d6d7faabfe0386efcc487550c0c4615cb81ee5c6cd1bced90b92bf462a6182a040737d81567079b64d602116ffb91d57b

data/.rubocop.yml

@@ -37,4 +37,6 @@ Style/IndentArray:
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 Style/ParallelAssignment:
-  Enabled: false
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false

data/lib/yoga/parser/helpers.rb

@@ -173,8 +173,8 @@ module Yoga
       # @return [::Array] The collected nodes from the yielding process.
       def collect(ending, join = nil)
         children = []
-        join = Utils.flatten_into_set([join]) if join
-        ending = Utils.flatten_into_set([ending]) if ending
+        join = Utils.flatten_into_set(join) if join
+        ending = Utils.flatten_into_set(ending) if ending
 
         return [] if (ending && peek?(ending)) || (!ending && !join)
 
@@ -196,9 +196,8 @@ module Yoga
       #
       # @param tokens [<::Symbol>] The possible kinds.
       # @return [::Boolean]
-      def peek?(*tokens)
-        tokens = Utils.flatten_into_set(tokens)
-        tokens.include?(peek.kind)
+      def peek?(tokens)
+        Utils.flatten_into_set(tokens).include?(peek.kind)
       end
 
       # Peeks out to a specific point in the future to match.  This is an
@@ -210,8 +209,7 @@ module Yoga
       # @param tokens [<::Symbol>] The kinds of tokens to check for.
       # @return [::Boolean]
       def peek_out?(to, tokens)
-        tokens = Utils.flatten_into_set([tokens])
-        tokens.include?(peek_out(to).kind)
+        Utils.flatten_into_set(tokens).include?(peek_out(to).kind)
       end
 
       # Shifts to the next token, and returns the old token.
@@ -229,10 +227,10 @@ module Yoga
       #
       # @param tokens [<::Symbol>] The expected tokens.
       # @return [Yoga::Token]
-      def expect(*tokens)
+      def expect(tokens)
         tokens = Utils.flatten_into_set(tokens)
-        return shift if peek?(*tokens)
-        error(tokens.flatten)
+        return shift if peek?(tokens)
+        error(tokens)
       end
 
       # Retrieves the first set for the given node name.

data/lib/yoga/scanner.rb

@@ -171,8 +171,8 @@ module Yoga
     def update_line_information
       return unless (lines = @scanner[0].scan(LINE)).any?
       @line += lines.size
-      @last_line_at =
-        @scanner.string.rindex(LINE, @scanner.charpos) + 1
+      line_index = @scanner.string.rindex(LINE, @scanner.charpos)
+      @last_line_at = line_index < 0 ? 0 : line_index + 1
     end
   end
 end

data/lib/yoga/utils.rb

@@ -15,22 +15,11 @@ module Yoga
     #   The array to flatten into a set.
     # @return [::Set<Yoga::Token>]
     def flatten_into_set(tokens)
-      flatten_into_array(tokens).to_set
-    end
-
-    # Takes an array of tokens or a set/array of tokens and turns it into a
-    # single array.
-    #
-    # @param tokens [<Yoga::Token>, ::Set<Yoga::Token>, ::Enumerable]
-    #   The array to flatten into a set.
-    # @return [<Yoga::Token>]
-    def flatten_into_array(tokens)
-      tokens.flat_map do |part|
-        if part.is_a?(::Enumerable)
-          flatten_into_array(part)
-        else
-          part
-        end
+      case tokens
+      when ::Set then tokens
+      when ::Array then ::Set.new(tokens)
+      else
+        ::Set.new(tokens.to_a)
       end
     end
   end

data/lib/yoga/version.rb

@@ -5,5 +5,5 @@ module Yoga
   # The version of the module.
   #
   # @return [::String]
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yoga
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jeremy Rodi