cql_ruby 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2d4b179a2563722c3dc2ef101ec10f817b1f79b3ce7d81a9ca6550fd088f39d
-  data.tar.gz: 3cace84921a72b38150aa52d60d1a48a48775b20234a3f4094e58939cf1c6058
+  metadata.gz: 26a9b9341ee0071484f34f631a1255a4c7444cbbacd29d56e687188522bd77d8
+  data.tar.gz: d6268072bae25c64caa1ef72126f2f44d38242b6904f0262781cddfc839532b0
 SHA512:
-  metadata.gz: e4c5f5f1e37f8520a7e366d6dc1bb07792ba8062230cd41a068cb846516e76497639131d0f93a0b60c360586bc886743d0a02aac4d3c3660281e1c8a18021f26
-  data.tar.gz: 65b4991554e454c0ca76f1077ae19665b3b4b27fc48243d301fb873e36af0da6652dcb6d741a249f529f72263866c4a5d2104b9fd5c958c0ed6c307218f829eb
+  metadata.gz: 809c7b9b5f5c7ed652f4f2f55bb3861d85ab8d9faf99400f7bd662694e1085c2b4640410def457a7d1d3404b8cf92dacc944d32fe90f7e90755fe80963a88ef0
+  data.tar.gz: be9575913b3360926360e2fc7653488a445ea3e9cc9e84f7bcd34fc094f116f807968b4daf82f42eff245318149f898e49f63a7b41cb13828c63668471a94835

data/bin/cql_ruby

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'parser'
 require 'cql_ruby'
+require 'pry-byebug'
 
 def show_help
   puts <<~HELP
@@ -18,6 +18,7 @@ def show_help
     \t\tNesting under: nest:T(=NAME) Example: nest:def=save_user nest:class=UserManager
     \t\tHas child: has:T(=NAME) Example: has:const has:def=valid?
     \t\tPattern: pattern:(T-)*X(-T)* Example: pattern:class-def-X-block
+    \t\tAssignment left side: assigned Example: assigned
 
     \tOPTIONS
     \t\t--include=PATTERN Parses only files whose name matches the pattern.

data/lib/cql_ruby/console_printer.rb

@@ -78,7 +78,11 @@ module CqlRuby
       from = crumb.line_col_no
       to = from + crumb.expression_size
 
-      prefix = source[0..from - 1] || ''
+      prefix = if from > 0
+        source[0..from - 1] || ''
+      else
+        ''
+      end
       subject = source[from..to - 1] || ''
       suffix = source[to..] || ''
 

data/lib/cql_ruby/filter_evaluator.rb

@@ -9,6 +9,7 @@ module CqlRuby
           pass_nesting?(filter_reader, ancestors),
           pass_has?(filter_reader, ancestors, node),
           pass_pattern?(filter_reader, ancestors, node),
+          pass_assignment?(filter_reader, ancestors, node),
         ].all?
       end
 
@@ -56,6 +57,8 @@ module CqlRuby
       # @param [Array<Parser::AST::Node>] ancestors
       # @param [Any<Parser::AST::Node, Symbol>] node
       #
+      # @return [Boolean]
+      #
       def pass_has?(filter_reader, ancestors, node)
         return true unless filter_reader.restrict_children?
 
@@ -76,6 +79,8 @@ module CqlRuby
       # @param [Array<Parser::AST::Node>] ancestors
       # @param [Any<Parser::AST::Node, Symbol>] node
       #
+      # @return [Boolean]
+      #
       def pass_pattern?(filter_reader, ancestors, node)
         return true unless filter_reader.restrict_pattern?
 
@@ -97,10 +102,23 @@ module CqlRuby
         end
       end
 
+      #
+      # @param [CqlRuby::FilterReader] filter_reader
+      # @param [Array<Parser::AST::Node>] ancestors
+      # @param [Parser::AST::Node] node
+      #
+      # @return [Boolean]
+      #
+      def pass_assignment?(filter_reader, ancestors, node)
+        CqlRuby::Filters::Assignments.pass?(filter_reader, ancestors, node)
+      end
+
       #
       # @param [Array<String>] pattern_descendants
       # @param [Parser::AST::Node] node
       #
+      # @return [Boolean]
+      #
       def match_descendant_pattern?(pattern_descendants, node)
         return true if pattern_descendants.empty?
         # If we're at the end and we're still expecting a type - no match.

data/lib/cql_ruby/filter_reader.rb

@@ -67,6 +67,8 @@ module CqlRuby
     attr_reader :has_leaves
     # @attribute [Array<CqlRuby::FilterReader::HierarchyPattern>] patterns
     attr_reader :patterns
+    # @attribute [Boolean] is_assigned
+    attr_reader :is_assigned
 
     def initialize(raw_filters = [])
       super()
@@ -75,6 +77,7 @@ module CqlRuby
       @nest_under = []
       @has_leaves = []
       @patterns = []
+      @is_assigned = false
 
       parse_raw_filters(raw_filters)
     end
@@ -95,13 +98,17 @@ module CqlRuby
       !@patterns.empty?
     end
 
+    def restrict_assignment?
+      @is_assigned
+    end
+
     private
 
     # @param [Array<String>] raw_filters
     def parse_raw_filters(raw_filters)
       raw_filters.each do |raw_filter|
         name, value = raw_filter.split(':')
-        raise "Unrecognized filter: #{raw_filter}" if name.nil? || value.nil?
+        raise "Unrecognized filter: #{raw_filter}" if name.nil?
 
         if %w[type t].include?(name)
           @allowed_types += value.split(',').map(&:to_sym)
@@ -115,6 +122,8 @@ module CqlRuby
           @has_leaves << NodeSpec.from(value)
         elsif %w[pattern p].include?(name)
           @patterns << HierarchyPattern.from(value)
+        elsif name == 'assigned'
+          @is_assigned = true
         end
       end
 

data/lib/cql_ruby/filters/assignments.rb

@@ -0,0 +1,151 @@
+module CqlRuby
+  module Filters
+    class Assignments
+      class << self
+        #
+        # @param [CqlRuby::FilterReader] filter_reader
+        # @param [Array<Parser::AST::Node>] ancestors
+        # @param [Parser::AST::Node] node
+        #
+        # @return [Boolean]
+        #
+        def pass?(filter_reader, ancestors, node)
+          return true unless filter_reader.restrict_assignment?
+          return true if lvar_assign?(ancestors, node)
+          return true if instance_attr_assign?(ancestors, node)
+          return true if array_sym_key_assign?(ancestors, node)
+          return true if array_string_key_assign?(ancestors, node)
+          return true if hash_sym_key_assign?(ancestors, node)
+          return true if hash_string_key_assign?(ancestors, node)
+          false
+        end
+
+        private
+
+        #
+        # @param [Array<Parser::AST::Node>] ancestors
+        # @param [Parser::AST::Node] node
+        #
+        # @return [Boolean]
+        #
+        def lvar_assign?(ancestors, node)
+          pattern_pass?({
+            nth_child: 0,
+            parent: {
+              type: :lvasgn
+            }
+          }, ancestors, node)
+        end
+
+        # TODO This does not work as symbol token is suffixed with =, eg foo= for bar.foo = x.
+        # Workaround for now is to use a =-alloed pattern, such as 'r/^token(|=)$/'
+        def instance_attr_assign?(ancestors, node)
+          pattern_pass?({
+            nth_child: 1,
+            parent: {
+              type: :send
+            }
+          }, ancestors, node)
+        end
+
+        def array_sym_key_assign?(ancestors, node)
+          pattern_pass?({
+            nth_child: 0,
+            parent: {
+              type: :sym,
+              nth_child: 2,
+              parent: {
+                type: :send,
+                child: {
+                  nth: 1,
+                  token: :[]=
+                }
+              }
+            }
+          }, ancestors, node)
+        end
+
+        def array_string_key_assign?(ancestors, node)
+          pattern_pass?({
+            nth_child: 0,
+            parent: {
+              type: :str,
+              nth_child: 2,
+              parent: {
+                type: :send,
+                child: {
+                  nth: 1,
+                  token: :[]=
+                }
+              }
+            }
+          }, ancestors, node)
+        end
+
+        def hash_sym_key_assign?(ancestors, node)
+          pattern_pass?({
+            nth_child: 0,
+            parent: {
+              type: :sym,
+              nth_child: 0,
+              parent: {
+                type: :pair,
+                parent: {
+                  type: :hash
+                }
+              }
+            }
+          }, ancestors, node)
+        end
+
+        def hash_string_key_assign?(ancestors, node)
+          pattern_pass?({
+            nth_child: 0,
+            parent: {
+              type: :str,
+              nth_child: 0,
+              parent: {
+                type: :pair,
+                parent: {
+                  type: :hash
+                }
+              }
+            }
+          }, ancestors, node)
+        end
+
+        def pattern_pass?(pattern, ancestors, node)
+          ancestor_idx = ancestors.size
+          current_node = node
+          current_pattern = pattern
+
+          loop do
+            if current_pattern.key?(:nth_child)
+              return false unless ancestor_idx - 1 >= 0
+              return false unless ancestors[ancestor_idx - 1].is_a?(Parser::AST::Node)
+              return false unless ancestors[ancestor_idx - 1].children[current_pattern[:nth_child]] == current_node
+            end
+
+            if current_pattern.key?(:type)
+              return false unless current_node.type == current_pattern[:type]
+            end
+
+            if current_pattern.key?(:child)
+              return false if current_node.children.size <= current_pattern[:child][:nth]
+              return false unless current_node.children[current_pattern[:child][:nth]] == current_pattern[:child][:token]
+            end
+
+            break unless current_pattern.key?(:parent)
+
+            ancestor_idx -= 1
+            return false unless ancestor_idx >= 0
+            current_node = ancestors[ancestor_idx]
+            current_pattern = current_pattern[:parent]
+          end
+
+          true
+        end
+      end
+    end
+  end
+end

data/lib/cql_ruby.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module CqlRuby;
+module CqlRuby
   def self.log(txt)
     p txt
   end
@@ -12,5 +12,6 @@ require 'cql_ruby/crumb_collector'
 require 'cql_ruby/abstract_printer'
 require 'cql_ruby/console_printer'
 require 'cql_ruby/filter_reader'
+require 'cql_ruby/filters/assignments'
 require 'cql_ruby/filter_evaluator'
 require 'cql_ruby/pattern_matcher'

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: cql_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - itarato
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-07-05 00:00:00.000000000 Z
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 3.2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 3.2.2.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +44,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email: it.arato@gmail.com
 executables:
 - cql_ruby
@@ -60,12 +74,13 @@ files:
 - lib/cql_ruby/executor.rb
 - lib/cql_ruby/filter_evaluator.rb
 - lib/cql_ruby/filter_reader.rb
+- lib/cql_ruby/filters/assignments.rb
 - lib/cql_ruby/pattern_matcher.rb
 homepage: https://github.com/itarato/cql
 licenses:
 - GPL-3.0-or-later
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.4.13
+signing_key:
 specification_version: 4
 summary: Code Query Language for Ruby
 test_files: []