querly 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d5bf2430a932df4208453cc4847d06915a5140
-  data.tar.gz: 6be0f56ed32a3bded3ef3b9241633faedfc83c3a
+  metadata.gz: 0bd9629e495b71aa9395ad56acba1b0a90438f8a
+  data.tar.gz: 988988c9c767178f711ea944a1955807675ad08a
 SHA512:
-  metadata.gz: 68bfb69f1c7628a24f2738bf5be828ce7b31d181a82f550ad1ed54b451d7612fa2ff7f4e6a6b6bf229dbfe147c13ff2a0656436c6b2680cfc800bd70106a34c3
-  data.tar.gz: 9794d372352bd5cff6704b93604ea6b94942a6e4eaf882602788b0660c579e80bfae6369843b5eb75cb55ae3d97848123e52517b4acbb825d1f961e731acacc0
+  metadata.gz: 14691228c8cc50ce2219558080b9ff0d814f1e2c98421c9d4967c1aeaf54a00261f8e883da6c00095545a4d92173fa4136004ed8768ca2e95ba7174bbdcc9dcc
+  data.tar.gz: 4cda473f15bc4fb71ea036b6914b6222766a3b6c088bd5c31ffb111aeaa6f5e57a75e30cfb8f640d917dc9f9313a7b77d5410cf8c991f3e68ad00deb8dd6001f

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## master
+
+## 0.2.1 (2016-11-24)
+
+* Fix `self` pattern matching
+
 ## 0.2.0 (2016-11-24)
 
 * Remove `tagging` section from config

data/lib/querly/pattern/expr.rb

@@ -170,12 +170,23 @@ module Querly
           case node&.type
           when :send
             return false unless name == node.children[1]
-            return false unless receiver.test_node(node.children[0])
+            return false unless test_receiver(node.children[0])
             return false unless test_args(node.children.drop(2), args)
             true
           end
         end
 
+        def test_receiver(node)
+          case receiver
+          when Self
+            !node || receiver.test_node(node)
+          when nil
+            true
+          else
+            receiver.test_node(node)
+          end
+        end
+
         def test_args(nodes, args)
           first_node = nodes.first
 
@@ -271,6 +282,12 @@ module Querly
         end
       end
 
+      class Self < Base
+        def test_node(node)
+          node&.type == :self
+        end
+      end
+
       class Vcall < Base
         attr_reader :name
 
@@ -299,8 +316,6 @@ module Querly
             node.children[1] == name
           when :lvar
             node.children.first == name
-          when :self
-            name == :self
           end
         end
       end

data/lib/querly/pattern/parser.y

@@ -15,6 +15,7 @@ kinded_expr: expr { result = Kind::Any.new(expr: val[0]) }
 
 expr: constant { result = Expr::Constant.new(path: val[0]) }
   | send
+  | SELF { result = Expr::Self.new }
   | EXCLAMATION expr { result = Expr::Not.new(pattern: val[1]) }
   | BOOL { result = Expr::Literal.new(type: :bool, value: val[0]) }
   | STRING { result = Expr::Literal.new(type: :string, value: val[0]) }
@@ -154,6 +155,8 @@ def next_token
     [:UNDERBAR, input.matched]
   when input.scan(/[A-Z]\w*/)
     [:UIDENT, input.matched.to_sym]
+  when input.scan(/self/)
+    [:SELF, nil]
   when input.scan(/[a-z_](\w)*(\?|\!|=)?/)
     [:LIDENT, input.matched.to_sym]
   when input.scan(/\(/)

data/lib/querly/version.rb

@@ -1,3 +1,3 @@
 module Querly
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: querly
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Soutaro Matsumoto