grammaphone 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e243f173f31ceddb840bd5e1c166f2f5aae6574e79f44bcc8edab86f397e6b6e
-  data.tar.gz: 2c3a92d6ecfcccf67b8f3330bceae184df8a64dc4b1a0f3765085f69d57abf51
+  metadata.gz: d20b285443cbec1d2e058d0cefb9abf7fe5c2505393622dcab78af9d8a9ee6c3
+  data.tar.gz: b3bb5615dbb530129c88a2e7d6dd105329889a216673cb9811135cb1f9fef46a
 SHA512:
-  metadata.gz: 867e6191b314ea4a1c1bda97c053fc910ddb44fcea1d8dc24248307676277298066d40390741a48f8337a457283cf84baf92d4a67e03c30e5d90cb7fdbb964e2
-  data.tar.gz: 5fac8bfa0ec133c8fdc1e94cb9d673dd11a902487de46bb941262e33bdc6cd4475e15f4fa03947bf3a2a039eed01cef5c832f29131652a7af022ec7c12fd87d0
+  metadata.gz: 32b1def2c467a1e65cffaa804f9a44c4b25a6c68b6ab351759e8a83ae5bb2553e99a989183a07ded0e309c863954ecf838a054abcecd5b96a95911328829f946
+  data.tar.gz: bf8c0745fa89f141347c9ac2d6c97af66b9797df01f533a520ae528daccb90b18a1faf9270f6c1c95006d917d9a163ede24dc6d30816a25064c21ebb913a31be

data/lib/grammaphone.rb

@@ -184,7 +184,7 @@ class Grammaphone
           matches << token
           result << token
           tokens.next # might as well be tokens.skip
-        elsif Token.pattern?(element)
+        elsif Token.pattern?(element) # only matches empty tokens at the end
           unless Token.matches_pattern?(element, token)
             matches = nil
             matched = false
@@ -192,10 +192,19 @@ class Grammaphone
           end
 
           matches ||= []
-          unless token.nil?
-            matches << token
-            result << token
+          matches << token
+          result << token unless token.nil? 
+          tokens.next
+        elsif Token.backref?(element) # exists but buggy as hell
+          unless Token.matches_backref?(element, token, matches)
+            matches = nil
+            matched = false
+            break
           end
+
+          matches ||= []
+          matches << token
+          result << token unless token.nil?
           tokens.next
         else
           raise TokenError.new("Can't have empty patterns") if element.empty?
@@ -214,6 +223,7 @@ class Grammaphone
         end
       end
 
+      matches&.keep_if {|m| !m.nil?}
       if matched
         result = r.trigger(result)
         break

data/lib/grammaphone/tokens.rb

@@ -170,5 +170,29 @@ class Grammaphone
       pattern?(element) && (token =~ clean_pattern(element)) ||
         token.nil? && "" =~ clean_pattern(element)
     end
+
+    # Checks if an element expects a backreference. A backreference is prefixed 
+    # by an equals sign ("=")
+    def self.backref?(element)
+      element[0] == "=" 
+    end
+
+    # Removes the denotative marks of a backreference, and returns a literal 
+    # token that references a previous element referenced. The token is the 
+    # exact token matched, regardless of if the original element was a literal 
+    # or pattern.
+    def self.clean_backref(element, matches)
+      matches[element[1..].to_i - 1]
+    end
+
+    # Returns whether the token is described by the element and that the 
+    # element is a backreference. A token is described by a backreference if 
+    # it matches the element at the 1-indexed position exactly.
+    #
+    # A backreference cannot describe a rule, even if that rule describes 1 or 
+    # fewer tokens.
+    def self.matches_backref?(element, token, matches)
+      !token.nil? && backref?(element) && token == clean_backref(element, matches) 
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grammaphone
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kellen Watt