yoga 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac664b4901d0613248ba9cb7169931dfb135480
-  data.tar.gz: 61185a381b8363cea814da9df4aa948464157523
+  metadata.gz: c9d32e62917dfcbbdd0993469ee617970ab77073
+  data.tar.gz: 5646e21cfdd27da322f1fad4de9af2e71a9474c9
 SHA512:
-  metadata.gz: b7d22c7ba8033a31f4192486775bacbbde86471daca4d4e1ccec55a1b00505c91ed7b3f4f0bc6b02b5d7d7d0692dd2bc437e2a2d9fff8f6e5e65ffdc30a79079
-  data.tar.gz: 6ee507d8d3e3f989ca55c81211b93c143e8f1a2233280200d6f4db231d2ddccdec97f9b1a3127145ab35b8c3a65904a0f001c8fd76dc56dc8a39cbbe576617a0
+  metadata.gz: 9577807b96c3475d6c7848db1e91bd3946d2216f3a9f2d525f5f95e47a6e97fefc7ab0db501feb5c47f68c056d2841b3bc006fdf5f2edc18e9040011f12f31c6
+  data.tar.gz: fb11c522ff6206c6ff75f9c03f301b76f30aab93e19bb891b87cda1ebb89757b0d12e20247237ef4372560717715f5ed20e5ee9ed9ec723aa1bffae1bf4d068b

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 2.4.0
   - 2.2.2
-  - 2.1.0
 before_install: gem install bundler
 install: bundle install
 script:

data/lib/yoga/scanner.rb

@@ -91,6 +91,11 @@ module Yoga
       Token.new(kind.freeze, source.freeze, location(source.length))
     end
 
+    # A regular expression to match all kinds of lines.  All of them.
+    #
+    # @return [::Regexp]
+    LINE_MATCHER = /\r\n|\n\r|\n|\r/
+
     # Attempts to match the given token.  The first argument can be a string,
     # a symbol, or a regular expression.  If the matcher is a symbol, it's
     # coerced into a regular expression, with a forward negative assertion for
@@ -98,7 +103,9 @@ module Yoga
     # {#symbol_negative_assertion}).  If the matcher is a regular expression,
     # it is left alone.  Otherwise, `#to_s` is called and passed to
     # `Regexp.escape`.  If the text is matched at the current position, a token
-    # is returned; otherwise, nil is returned.
+    # is returned; otherwise, nil is returned.  If a newline is matched within
+    # a match, the scanner automatically updates the line and column
+    # information.
     #
     # @param matcher [::Symbol, ::Regexp, #to_s]
     # @param kind [::Symbol] The kind of token to emit.  This defaults to a
@@ -111,25 +118,18 @@ module Yoga
                 else /#{::Regexp.escape(matcher.to_s)}/
                 end
 
-      ((kind && emit(kind)) || true) if @scanner.scan(matcher)
-    end
+      return unless @scanner.scan(matcher)
 
-    # A regular expression to match all kinds of lines.  All of them.
-    #
-    # @return [::Regexp]
-    LINE_MATCHER = /\r\n|\n\r|\n|\r/
+      update_line_information
+      ((kind && emit(kind)) || true)
+    end
 
     # Matches a line.  This is separate in order to allow internal logic,
     # such as line counting and caching, to be performed.
     #
     # @return [Boolean] If the line was matched.
-    def match_line(kind: false, required: false)
-      result = @scanner.scan(LINE_MATCHER)
-      (required ? (fail UnexpectedCharacterError, location: location) : return) \
-        unless result
-      @line += 1
-      @last_line_at = @scanner.charpos
-      (kind && emit(kind)) || true
+    def match_line(kind = false)
+      match(LINE_MATCHER, kind)
     end
 
     # Returns the number of lines that have been covered so far in the scanner.
@@ -160,5 +160,17 @@ module Yoga
     def eof_token
       emit(:EOF, "")
     end
+
+    # Updates the line information for the scanner.  This is called for any
+    # successful matches.
+    #
+    # @api private
+    # @return [void]
+    def update_line_information
+      return unless (lines = @scanner[0].scan(LINE_MATCHER)).any?
+      @line += lines.size
+      @last_line_at =
+        @scanner.string.rindex(LINE_MATCHER, @scanner.charpos) + 1
+    end
   end
 end

data/lib/yoga/version.rb

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

metadata

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