querly 0.2.1 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd9629e495b71aa9395ad56acba1b0a90438f8a
-  data.tar.gz: 988988c9c767178f711ea944a1955807675ad08a
+  metadata.gz: 278d6249e0070a8df23463f5a87e192723582d9b
+  data.tar.gz: 7f25f0bec22cc8fa8dc715aaa1c151f917ddbe1a
 SHA512:
-  metadata.gz: 14691228c8cc50ce2219558080b9ff0d814f1e2c98421c9d4967c1aeaf54a00261f8e883da6c00095545a4d92173fa4136004ed8768ca2e95ba7174bbdcc9dcc
-  data.tar.gz: 4cda473f15bc4fb71ea036b6914b6222766a3b6c088bd5c31ffb111aeaa6f5e57a75e30cfb8f640d917dc9f9313a7b77d5410cf8c991f3e68ad00deb8dd6001f
+  metadata.gz: 3fce9e93f1b3656ab76379d105eb5812694ebd21d812d3db673bc7d62c8ca8b1ddb57adc4500cf111c9c9bd29aafd37d7cb48b827806fb4cb130bd0ca8470893
+  data.tar.gz: 406d47ca60ac29da0d1adae7c239e327fa71640bc713fc4cbc2fd2ef1488ba6a0154cc3619ab7c45ac1aa2b67cc75cc786efdfcd38cb056c999e73f3f44c3e2d

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## master
 
+## 0.3.0
+
+* Add `version` command
+* Fix *with block* and *without block* pattern parsing
+* Prettier backtrace printing
+* Prettier pattern syntax error message
+
 ## 0.2.1 (2016-11-24)
 
 * Fix `self` pattern matching
@@ -12,7 +19,7 @@
 * Add `check` section to select rules to check
 * Add `import` section to load rules from other file
 * Add `querly rules` sub command to print loaded rules
-* Add *with block* and *without block* pattern (`foo {}` / `foo !{}`)
+* Add *with block* and *without block* pattern (`foo() {}` / `foo() !{}`)
 * Add *some of receiver chain* pattern (`...`)
 * Fix keyword args pattern matching bug
 

data/lib/querly/cli/console.rb

@@ -3,6 +3,8 @@ require 'readline'
 module Querly
   class CLI
     class Console
+      include Concerns::BacktraceFormatter
+
       attr_reader :paths
 
       def initialize(paths:)
@@ -87,8 +89,9 @@ Querly #{VERSION}, interactive console
 
               puts "#{count} results"
             rescue => exn
-              STDOUT.puts exn.inspect
-              STDOUT.puts exn.backtrace
+              STDOUT.puts Rainbow("Error: #{exn}").red
+              STDOUT.puts "Backtrace:"
+              STDOUT.puts format_backtrace(exn.backtrace)
             end
           else
             puts_commands

data/lib/querly/cli/formatter.rb

@@ -2,6 +2,8 @@ module Querly
   class CLI
     module Formatter
       class Base
+        include Concerns::BacktraceFormatter
+
         # Called when analyzer started
         def start; end
 
@@ -26,7 +28,8 @@ module Querly
         # Abort(status != 0) after the call
         def fatal_error(error)
           STDERR.puts Rainbow("Fatal error: #{error}").red
-          STDERR.puts error.backtrace.inspect
+          STDERR.puts "Backtrace:"
+          STDERR.puts format_backtrace(error.backtrace)
         end
 
         # Called on exit/abort
@@ -37,7 +40,8 @@ module Querly
         def config_error(path, error)
           STDERR.puts Rainbow("Failed to load configuration: #{path}").red
           STDERR.puts error
-          STDERR.puts error.backtrace.inspect
+          STDERR.puts "Backtrace:"
+          STDERR.puts format_backtrace(error.backtrace)
         end
 
         def script_error(path, error)

data/lib/querly/cli.rb

@@ -81,6 +81,11 @@ Specify configuration file by --config option.
       Rules.new(config_path: config_path, ids: ids).run
     end
 
+    desc "version", "Print version"
+    def version
+      puts "Querly #{VERSION}"
+    end
+
     private
 
     def config_path

data/lib/querly/concerns/backtrace_formatter.rb

@@ -0,0 +1,7 @@
+module Concerns
+  module BacktraceFormatter
+    def format_backtrace(backtrace, indent: 2)
+      backtrace.map {|x| " "*indent + x }.join("\n")
+    end
+  end
+end

data/lib/querly/pattern/parser.rb

@@ -9,7 +9,7 @@ module Querly
   module Pattern
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 101)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 102)
 
 require "strscan"
 
@@ -113,116 +113,120 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    55,   -38,    29,    62,    71,    72,    73,    56,    57,    26,
-    71,   -39,    56,    57,   -37,   -38,    41,    34,    40,    30,
-    30,   -40,    42,    69,    70,    56,    57,    72,    73,    69,
-    70,     7,    18,    72,    73,    33,     6,     8,     9,    10,
-    11,    12,    13,    14,    15,    16,    17,    33,    19,    29,
-    61,    44,    18,    20,    22,    23,     6,     8,     9,    10,
-    11,    12,    13,    14,    15,    16,    17,    30,    19,    63,
-    46,    48,    64,    20,    51,    52,     7,    18,    66,    77,
-   nil,     6,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,   nil,    19,    29,   nil,     7,    18,    20,    22,
+   -39,    29,   -38,    29,    64,   -39,    26,    59,   -37,   -38,
+    34,    35,    34,    35,    74,    75,    39,    61,    38,    30,
+   -41,    30,   -40,    44,    36,    34,    35,    34,    35,    36,
+    34,    35,    34,    35,    34,    35,     7,    18,    20,    41,
+    42,     6,     8,     9,    10,    11,    12,    13,    14,    15,
+    16,    17,    30,    19,    46,    36,    48,    18,    20,    22,
     23,     6,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    30,    19,    29,   nil,    44,    18,    20,    22,
-    23,     6,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    30,    19,   nil,    46,    48,   nil,    20,    51,
-    52,     7,    18,   nil,    29,   nil,     6,     8,     9,    10,
-    11,    12,    13,    14,    15,    16,    17,   nil,    19,   nil,
-    59,     7,    30,    20,    22,    23,     6,     8,     9,    10,
-    11,    12,    13,    14,    15,    16,    17,    35,    19,    29,
-   nil,     7,    18,    20,    51,    52,     6,     8,     9,    10,
-    11,    12,    13,    14,    15,    16,    17,    30,    19,    20,
-    37,    38,   -39,    20,    22,    23,     7,    18,   nil,   nil,
-   nil,     6,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,   -41,    19,   nil,   nil,    33,     7,    20,    22,
-    23,   nil,     6,     8,     9,    10,    11,    12,    13,    14,
-    15,    16,    17,   nil,    19,   nil,   nil,    44,    18,    20,
-    22,    23,     6,     8,     9,    10,    11,    12,    13,    14,
-    15,    16,    17,   nil,    19,   nil,    46,    48,   nil,    20,
-    51,    52,    29,    27,    28,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    30 ]
+    16,    17,    73,    19,    73,    50,    52,    63,    20,    55,
+    56,    65,    66,    29,    29,    29,    68,    79,   nil,   nil,
+   nil,    71,    72,    71,    72,    74,    75,    74,    75,     7,
+    18,    30,    30,    30,     6,     8,     9,    10,    11,    12,
+    13,    14,    15,    16,    17,   nil,    19,   nil,   nil,     7,
+    18,    20,    22,    23,     6,     8,     9,    10,    11,    12,
+    13,    14,    15,    16,    17,   nil,    19,   nil,   nil,    48,
+    18,    20,    22,    23,     6,     8,     9,    10,    11,    12,
+    13,    14,    15,    16,    17,   nil,    19,   nil,    50,    52,
+     7,    20,    55,    56,   nil,     6,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,   nil,    19,   nil,   nil,
+     7,    18,    20,    55,    56,     6,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,   nil,    19,   nil,   nil,
+     7,   nil,    20,    22,    23,     6,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,   nil,    19,   nil,   nil,
+     7,    18,    20,    22,    23,     6,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,   nil,    19,   nil,   nil,
+     7,    18,    20,    22,    23,     6,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,   nil,    19,   nil,   nil,
+    48,    18,    20,    22,    23,     6,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,    29,    19,   nil,    50,
+    52,   nil,    20,    55,    56,    29,    27,    28,   nil,   nil,
+    45,   nil,   nil,   nil,    30,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    30 ]
 
 racc_action_check = [
-    39,    51,    32,    49,    61,    71,    71,    64,    64,     1,
-    62,    23,    77,    77,    21,    22,    32,    24,    26,    31,
-    32,    51,    33,    61,    61,    39,    39,    61,    61,    62,
-    62,    63,    63,    62,    62,    23,    63,    63,    63,    63,
-    63,    63,    63,    63,    63,    63,    63,    42,    63,    60,
-    48,    59,    59,    63,    63,    63,    59,    59,    59,    59,
-    59,    59,    59,    59,    59,    59,    59,    60,    59,    50,
-    59,    59,    53,    59,    59,    59,    66,    66,    58,    65,
-   nil,    66,    66,    66,    66,    66,    66,    66,    66,    66,
-    66,    66,   nil,    66,    78,   nil,    69,    69,    66,    66,
-    66,    69,    69,    69,    69,    69,    69,    69,    69,    69,
-    69,    69,    78,    69,    79,   nil,    34,    34,    69,    69,
-    69,    34,    34,    34,    34,    34,    34,    34,    34,    34,
-    34,    34,    79,    34,   nil,    34,    34,   nil,    34,    34,
-    34,    18,    18,   nil,    45,   nil,    18,    18,    18,    18,
-    18,    18,    18,    18,    18,    18,    18,   nil,    18,   nil,
-    45,    44,    45,    18,    18,    18,    44,    44,    44,    44,
-    44,    44,    44,    44,    44,    44,    44,    25,    44,    75,
-   nil,    46,    46,    44,    44,    44,    46,    46,    46,    46,
-    46,    46,    46,    46,    46,    46,    46,    75,    46,    25,
-    25,    25,    52,    46,    46,    46,     0,     0,   nil,   nil,
-   nil,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    52,     0,   nil,   nil,    52,     7,     0,     0,
-     0,   nil,     7,     7,     7,     7,     7,     7,     7,     7,
-     7,     7,     7,   nil,     7,   nil,   nil,    55,    55,     7,
-     7,     7,    55,    55,    55,    55,    55,    55,    55,    55,
-    55,    55,    55,   nil,    55,   nil,    55,    55,   nil,    55,
-    55,    55,     3,     3,     3,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     3 ]
+    56,    49,    55,    77,    53,    23,     1,    43,    21,    22,
+    66,    66,    79,    79,    73,    73,    25,    49,    24,    49,
+    56,    77,    55,    26,    56,    56,    56,    55,    55,    23,
+    23,    23,    43,    43,    22,    22,    71,    71,    25,    25,
+    25,    71,    71,    71,    71,    71,    71,    71,    71,    71,
+    71,    71,    31,    71,    36,    46,    61,    61,    71,    71,
+    71,    61,    61,    61,    61,    61,    61,    61,    61,    61,
+    61,    61,    63,    61,    64,    61,    61,    52,    61,    61,
+    61,    54,    57,    62,    80,    81,    60,    67,   nil,   nil,
+   nil,    63,    63,    64,    64,    63,    63,    64,    64,    65,
+    65,    62,    80,    81,    65,    65,    65,    65,    65,    65,
+    65,    65,    65,    65,    65,   nil,    65,   nil,   nil,    68,
+    68,    65,    65,    65,    68,    68,    68,    68,    68,    68,
+    68,    68,    68,    68,    68,   nil,    68,   nil,   nil,    38,
+    38,    68,    68,    68,    38,    38,    38,    38,    38,    38,
+    38,    38,    38,    38,    38,   nil,    38,   nil,    38,    38,
+    48,    38,    38,    38,   nil,    48,    48,    48,    48,    48,
+    48,    48,    48,    48,    48,    48,   nil,    48,   nil,   nil,
+    50,    50,    48,    48,    48,    50,    50,    50,    50,    50,
+    50,    50,    50,    50,    50,    50,   nil,    50,   nil,   nil,
+     7,   nil,    50,    50,    50,     7,     7,     7,     7,     7,
+     7,     7,     7,     7,     7,     7,   nil,     7,   nil,   nil,
+     0,     0,     7,     7,     7,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   nil,     0,   nil,   nil,
+    18,    18,     0,     0,     0,    18,    18,    18,    18,    18,
+    18,    18,    18,    18,    18,    18,   nil,    18,   nil,   nil,
+    59,    59,    18,    18,    18,    59,    59,    59,    59,    59,
+    59,    59,    59,    59,    59,    59,    32,    59,   nil,    59,
+    59,   nil,    59,    59,    59,     3,     3,     3,   nil,   nil,
+    32,   nil,   nil,   nil,    32,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,     3 ]
 
 racc_action_pointer = [
-   204,     9,   nil,   268,   nil,   nil,   nil,   225,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   139,   nil,
-   nil,    11,    12,     8,    14,   175,    18,   nil,   nil,   nil,
-   nil,    -3,    -2,    -4,   114,   nil,   nil,   nil,   nil,    -3,
-   nil,   nil,    20,   nil,   159,   140,   179,   nil,    30,   -17,
-    46,    -2,   199,    54,   nil,   245,   nil,   nil,    55,    49,
-    45,     2,     8,    29,   -21,    61,    74,   nil,   nil,    94,
-   nil,   -20,   nil,   nil,   nil,   175,   nil,   -16,    90,   110,
-   nil ]
+   218,     6,   nil,   281,   nil,   nil,   nil,   198,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   238,   nil,
+   nil,     5,     6,     2,    15,    14,    23,   nil,   nil,   nil,
+   nil,    30,   272,   nil,   nil,   nil,    28,   nil,   137,   nil,
+   nil,   nil,   nil,     4,   nil,   nil,    28,   nil,   158,    -3,
+   178,   nil,    57,   -16,    58,    -1,    -3,    64,   nil,   258,
+    63,    54,    79,    70,    72,    97,   -18,    69,   117,   nil,
+   nil,    34,   nil,   -11,   nil,   nil,   nil,    -1,   nil,   -16,
+    80,    81,   nil ]
 
 racc_action_default = [
-   -56,   -56,    -1,    -2,    -5,    -6,    -7,   -36,    -9,   -10,
-   -11,   -12,   -13,   -14,   -15,   -16,   -17,   -18,   -56,   -20,
-   -35,   -45,   -44,   -42,   -56,   -56,   -56,    -3,    -4,   -51,
-   -52,    -8,   -56,   -56,   -21,   -36,   -37,   -38,   -39,   -53,
-    81,   -19,   -42,   -43,   -36,   -22,   -56,   -25,   -26,   -31,
-   -56,   -44,   -42,   -56,   -47,   -21,   -54,   -55,   -56,   -21,
-   -24,   -28,   -28,   -56,   -53,   -56,   -56,   -23,   -27,   -56,
-   -30,   -56,   -40,   -41,   -32,   -33,   -46,   -53,   -34,   -29,
-   -49 ]
+   -57,   -57,    -1,    -2,    -5,    -6,    -7,   -36,    -9,   -10,
+   -11,   -12,   -13,   -14,   -15,   -16,   -17,   -18,   -57,   -20,
+   -35,   -46,   -54,   -42,   -57,   -57,   -57,    -3,    -4,   -52,
+   -53,    -8,   -57,   -44,   -55,   -56,   -57,   -45,   -21,   -36,
+   -37,   -38,   -39,   -54,    83,   -19,   -42,   -43,   -36,   -22,
+   -57,   -25,   -26,   -31,   -57,   -54,   -42,   -57,   -48,   -21,
+   -57,   -21,   -24,   -28,   -28,   -57,   -54,   -57,   -57,   -23,
+   -27,   -57,   -30,   -57,   -40,   -41,   -32,   -33,   -47,   -54,
+   -34,   -29,   -50 ]
 
 racc_goto_table = [
-     3,    54,    58,    53,    68,    74,     1,    31,    43,    36,
-    39,     2,   nil,   nil,   nil,   nil,   nil,   nil,    32,   nil,
-   nil,   nil,   nil,   nil,    65,   nil,    76,   nil,    67,    58,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    80,
-   nil,   nil,   nil,   nil,    31,   nil,    60,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    75,   nil,   nil,    78,   nil,   nil,    79 ]
+     3,    37,    60,    57,    70,    76,     1,    31,    47,    40,
+    43,     2,   nil,   nil,   nil,   nil,   nil,   nil,    32,   nil,
+   nil,    58,   nil,   nil,    67,   nil,    69,    60,   nil,   nil,
+   nil,   nil,   nil,   nil,    37,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    78,   nil,   nil,   nil,    31,   nil,
+    62,   nil,   nil,   nil,   nil,   nil,   nil,    82,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    77,   nil,   nil,    80,   nil,
+   nil,    81 ]
 
 racc_goto_check = [
      3,    12,     9,     6,     7,     7,     1,     3,     4,    10,
     11,     2,   nil,   nil,   nil,   nil,   nil,   nil,     3,   nil,
-   nil,   nil,   nil,   nil,     6,   nil,    12,   nil,     6,     9,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,
-   nil,   nil,   nil,   nil,     3,   nil,     3,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     3,   nil,   nil,     3,   nil,   nil,     3 ]
+   nil,    12,   nil,   nil,     6,   nil,     6,     9,   nil,   nil,
+   nil,   nil,   nil,   nil,    12,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    12,   nil,   nil,   nil,     3,   nil,
+     3,   nil,   nil,   nil,   nil,   nil,   nil,    12,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     3,   nil,   nil,     3,   nil,
+   nil,     3 ]
 
 racc_goto_pointer = [
-   nil,     6,    11,     0,   -25,   nil,   -31,   -57,   nil,   -42,
-   -16,   -15,   -38,   nil ]
+   nil,     6,    11,     0,   -28,   nil,   -35,   -59,   nil,   -46,
+   -16,   -15,   -22,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    45,     4,     5,   nil,    47,    49,    50,
-    21,    24,   nil,    25 ]
+   nil,   nil,   nil,    49,     4,     5,   nil,    51,    53,    54,
+    21,    24,    33,    25 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -269,22 +273,23 @@ racc_reduce_table = [
   1, 39, :_reduce_none,
   1, 34, :_reduce_42,
   3, 34, :_reduce_43,
-  1, 35, :_reduce_44,
-  1, 35, :_reduce_45,
-  5, 35, :_reduce_46,
-  3, 35, :_reduce_47,
+  2, 35, :_reduce_44,
+  2, 35, :_reduce_45,
+  1, 35, :_reduce_46,
+  5, 35, :_reduce_47,
   3, 35, :_reduce_48,
-  6, 35, :_reduce_49,
+  3, 35, :_reduce_49,
   6, 35, :_reduce_50,
-  2, 43, :_reduce_51,
+  6, 35, :_reduce_51,
   2, 43, :_reduce_52,
-  0, 42, :_reduce_53,
-  1, 42, :_reduce_54,
-  1, 42, :_reduce_55 ]
+  2, 43, :_reduce_53,
+  0, 42, :_reduce_54,
+  1, 42, :_reduce_55,
+  1, 42, :_reduce_56 ]
 
-racc_reduce_n = 56
+racc_reduce_n = 57
 
-racc_shift_n = 81
+racc_shift_n = 83
 
 racc_token_table = {
   false => 0,
@@ -649,20 +654,27 @@ module_eval(<<'.,.,', 'parser.y', 65)
 
 module_eval(<<'.,.,', 'parser.y', 67)
   def _reduce_44(val, _values, result)
-     result = Expr::Vcall.new(name: val[0]) 
+     result = val[1] != nil ? Expr::Send.new(receiver: Expr::Any.new, name: val[0], args: Argument::AnySeq.new, block: val[1]) : Expr::Vcall.new(name: val[0]) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 68)
   def _reduce_45(val, _values, result)
-     result = Expr::Send.new(receiver: Expr::Any.new, name: val[0], block: nil) 
+     result = Expr::Send.new(receiver: Expr::Any.new, name: val[0], block: val[1]) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 69)
   def _reduce_46(val, _values, result)
+     result = Expr::Send.new(receiver: Expr::Any.new, name: val[0], block: nil) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 70)
+  def _reduce_47(val, _values, result)
      result = Expr::Send.new(receiver: Expr::Any.new,
                                                                             name: val[0],
                                                                             args: val[2],
@@ -671,8 +683,8 @@ module_eval(<<'.,.,', 'parser.y', 69)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 73)
-  def _reduce_47(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 74)
+  def _reduce_48(val, _values, result)
      result = Expr::Send.new(receiver: val[0],
                                                                   name: val[1],
                                                                   args: Argument::AnySeq.new,
@@ -681,8 +693,8 @@ module_eval(<<'.,.,', 'parser.y', 73)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 77)
-  def _reduce_48(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 78)
+  def _reduce_49(val, _values, result)
      result = Expr::Send.new(receiver: val[0],
                                                                   name: val[1],
                                                                   args: Argument::AnySeq.new,
@@ -691,8 +703,8 @@ module_eval(<<'.,.,', 'parser.y', 77)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 81)
-  def _reduce_49(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 82)
+  def _reduce_50(val, _values, result)
      result = Expr::Send.new(receiver: val[0],
                                                                                      name: val[1],
                                                                                      args: val[3],
@@ -701,8 +713,8 @@ module_eval(<<'.,.,', 'parser.y', 81)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 85)
-  def _reduce_50(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 86)
+  def _reduce_51(val, _values, result)
      result = Expr::Send.new(receiver: val[0],
                                                                                      name: val[1],
                                                                                      args: val[3],
@@ -711,36 +723,36 @@ module_eval(<<'.,.,', 'parser.y', 85)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 90)
-  def _reduce_51(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 91)
+  def _reduce_52(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 91)
-  def _reduce_52(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 92)
+  def _reduce_53(val, _values, result)
      result = Expr::ReceiverContext.new(receiver: val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 93)
-  def _reduce_53(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 94)
+  def _reduce_54(val, _values, result)
      result = nil 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 94)
-  def _reduce_54(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 95)
+  def _reduce_55(val, _values, result)
      result = true 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 95)
-  def _reduce_55(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 96)
+  def _reduce_56(val, _values, result)
      result = false 
     result
   end

data/lib/querly/pattern/parser.y

@@ -65,7 +65,8 @@ keyword: LIDENT | UIDENT
 constant: UIDENT { result = [val[0]] }
   | UIDENT COLONCOLON constant { result = [val[0]] + val[2] }
 
-send: LIDENT { result = Expr::Vcall.new(name: val[0]) }
+send: LIDENT block { result = val[1] != nil ? Expr::Send.new(receiver: Expr::Any.new, name: val[0], args: Argument::AnySeq.new, block: val[1]) : Expr::Vcall.new(name: val[0]) }
+  | UIDENT block { result = Expr::Send.new(receiver: Expr::Any.new, name: val[0], block: val[1]) }
   | method_name { result = Expr::Send.new(receiver: Expr::Any.new, name: val[0], block: nil) }
   | method_name_or_ident LPAREN args RPAREN block { result = Expr::Send.new(receiver: Expr::Any.new,
                                                                             name: val[0],

data/lib/querly/rule.rb

@@ -38,6 +38,7 @@ module Querly
     end
 
     class InvalidRuleHashError < StandardError; end
+    class PatternSyntaxError < StandardError; end
 
     def self.load(hash)
       id = hash["id"]
@@ -45,7 +46,13 @@ module Querly
 
       srcs = Array(hash["pattern"])
       raise InvalidRuleHashError, "pattern is missing" if srcs.empty?
-      patterns = srcs.map {|src| Pattern::Parser.parse(src) }
+      patterns = srcs.map.with_index do |src, index|
+        begin
+          Pattern::Parser.parse(src)
+        rescue Racc::ParseError => exn
+          raise PatternSyntaxError, "Pattern syntax error: rule=#{hash["id"]}, index=#{index}, pattern=#{Rainbow(src.split("\n").first).blue}: #{exn}"
+        end
+      end
 
       messages = Array(hash["message"])
       raise InvalidRuleHashError, "message is missing" if messages.empty?

data/lib/querly/version.rb

@@ -1,3 +1,3 @@
 module Querly
-  VERSION = "0.2.1"
+  VERSION = "0.3.0.beta.1"
 end

data/lib/querly.rb

@@ -20,6 +20,7 @@ require 'querly/pattern/kind'
 require "querly/config"
 require "querly/preprocessor"
 require "querly/check"
+require "querly/concerns/backtrace_formatter"
 
 module Querly
   # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querly
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0.beta.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,6 +151,7 @@ files:
 - lib/querly/cli/formatter.rb
 - lib/querly/cli/rules.rb
 - lib/querly/cli/test.rb
+- lib/querly/concerns/backtrace_formatter.rb
 - lib/querly/config.rb
 - lib/querly/node_pair.rb
 - lib/querly/pattern/argument.rb
@@ -180,12 +181,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Pattern Based Checking Tool for Ruby