shunting_yard 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75535fce560ff196525060c8cc74fa8b15fb085f5042b442bc766399f9075072
-  data.tar.gz: 2a6f28b8f4a10bfd25e5f93cd32ee3d8bca1f2a65a604f8e1cb16a55c3786de9
+  metadata.gz: 0d0b8a2d962c3ee8b9b416d729dd4d72c57ef4c4f53ae1962215afd08d79b67e
+  data.tar.gz: 174cb0e75d168499608eff7be798249fbdaa89682612b0cdd24ef396474e89ab
 SHA512:
-  metadata.gz: 6974a00a4694382d711e18358c76ebbe225f768155eaf3d30feed68fd8047845e1e0d7aacbff116f3da3f6ea823b697c98225a661b62de05740b7d70e957d106
-  data.tar.gz: 6c51c7ad5d8ec75a17f7825099fe1894e198048006d44deca00a20d2603fccc79f2aa4d83ecd60c3cbefbdc7080fabc81c98f189d140ef6c2b715fd36c807fea
+  metadata.gz: 38f3557a80197e08b0b301b1c28e512ac55f6808e5f7c025f4e17bfc0e9b5c76e2cc1b6b29a608ff47fbb7735e2a2962020e91d634a62ef43636c9a9c59f7abf
+  data.tar.gz: '018c673de3b9cc1e3b719a3538fdcdef7eea35f1febb34666a80bcd3777e2c3e2122e1bcb07bfdbf8c5de18f0acebb3e44b254dad432d08aad7d6bb14e4d57ce'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shunting_yard (0.1.2)
+    shunting_yard (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -32,7 +32,7 @@ parser.evaluate(input) #=> 24
 `ShuntingYard::Lexer` is responsible for splitting source string into tokens.
 To recognize each possible token it needs to know corresponding patterns represented as regular expressions.
 
-If substring is matched to multiple patterns, **the longest match** wil be used.
+If substring is matched to multiple patterns, **the first match** will be used.
 
 After matching a token, its lexeme is evaluated with provided function. If function is not provided - it returns the lexeme itself.
 

data/lib/shunting_yard/lexer.rb

@@ -21,29 +21,24 @@ module ShuntingYard
       matches = []
 
       until sc.eos?
-        match = nil
         last_match = nil
-        longest_match_size = 0
 
         @patterns.each do |name, regex, evaluator|
           match = sc.check(regex)
           next if match.nil?
 
-          longest_match_size = [longest_match_size, match.bytesize].max
-
           value = evaluator.(match)
-          next if value.nil?
-
-          last_match = [name, match, value] if last_match.nil? || last_match[1].size < match.size
+          last_match = [name, match, value]
+          break
         end
 
-        if longest_match_size == 0
+        if last_match.nil?
           unknown_token = sc.check_until(separator_pattern).sub(separator_pattern, "")
           raise UnknownTokenError.new(unknown_token, sc.pos + 1)
         end
 
-        sc.pos += longest_match_size
-        matches << build_token(last_match) unless last_match.nil?
+        sc.pos += last_match[1].bytesize
+        matches << build_token(last_match) unless last_match[2].nil?
       end
 
       matches

data/lib/shunting_yard/version.rb

@@ -1,3 +1,3 @@
 module ShuntingYard
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shunting_yard
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Artem Rashev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase