yap-shell-parser 0.2.2 → 0.3.1

data/lib/yap/shell/parser_impl.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
@@ -21,7 +21,7 @@ module Yap
   module Shell
     class ParserImpl < Racc::Parser
 
-module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 101)
+module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 115)
   include Yap::Shell::Parser::Nodes
 
 #=end
@@ -29,6 +29,7 @@ module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 101)
     @yydebug = true
 
     @q = Yap::Shell::Parser::Lexer.new.tokenize(str)
+    pp @q if ENV["DEBUG"]
     # @q.push [false, '$']   # is optional from Racc 1.3.7
 # puts @q.inspect
 # puts "---- parse tree follows ----"
@@ -44,95 +45,122 @@ module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 101)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    18,    19,    28,    22,    20,    34,    18,    19,    28,    16,
-    20,    11,    41,     6,    28,    16,    22,    11,    37,     6,
-    18,    19,    11,    43,    20,    24,    18,    19,    23,    16,
-    20,    11,    22,     6,    42,    16,    21,    11,    30,     6,
-    18,    19,    44,    31,    20,    42,    18,    19,    42,    16,
-    20,    11,    23,     6,    24,    16,    11,    11,   nil,     6,
-    18,    19,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    33 ]
+    21,    22,    25,    25,    23,    28,    14,    52,    33,    19,
+    25,    14,    55,     7,    21,    22,    51,     9,    23,    54,
+    59,    21,    22,    19,    25,    14,    25,     7,    21,    22,
+    38,     9,    23,    35,    57,    52,    60,    19,    36,    14,
+    26,     7,    21,    22,    26,     9,    23,    52,    27,    25,
+    42,    19,    27,    14,    21,    22,    53,    29,    23,     9,
+    29,    33,    25,    19,    33,    14,    24,     7,    21,    22,
+    49,     9,    23,    14,    39,    28,   nil,    19,   nil,    14,
+   nil,     7,    21,    22,   nil,     9,    23,   nil,   nil,   nil,
+   nil,    19,   nil,    14,    21,    22,   nil,   nil,    23,     9,
+   nil,   nil,   nil,    19,   nil,    14,   nil,     7,    21,    22,
+   nil,     9,    23,   nil,   nil,   nil,   nil,    19,   nil,    14,
+   nil,     7,    21,    22,   nil,     9,    23,   nil,   nil,   nil,
+   nil,    19,   nil,    14,   nil,     7,   nil,   nil,    47,     9 ]
 
 racc_action_check = [
-     0,     0,    19,    26,     0,    16,    11,    11,    18,     0,
-    11,     0,    26,     0,    10,    11,    29,    11,    21,    11,
-     6,     6,     5,    29,     6,     4,    24,    24,     3,     6,
-    24,     6,     2,     6,    27,    24,     1,    24,    12,    24,
-    23,    23,    33,    12,    23,    35,    22,    22,    36,    23,
-    22,    23,    38,    23,    39,    22,    40,    22,   nil,    22,
-    15,    15,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    15 ]
+     0,     0,    46,    31,     0,    44,     8,    32,    13,     0,
+    56,     0,    46,     0,    49,    49,    31,     0,    49,    38,
+    56,    18,    18,    49,    48,    49,    58,    49,    47,    47,
+    18,    49,    47,    15,    48,    40,    58,    47,    15,    47,
+     3,    47,    29,    29,    43,    47,    29,    41,     3,    34,
+    24,    29,    43,    29,    28,    28,    34,     5,    28,    29,
+    45,    22,     2,    28,    21,    28,     1,    28,    14,    14,
+    28,    28,    14,    50,    19,     4,   nil,    14,   nil,    14,
+   nil,    14,    26,    26,   nil,    14,    26,   nil,   nil,   nil,
+   nil,    26,   nil,    26,     9,     9,   nil,   nil,     9,    26,
+   nil,   nil,   nil,     9,   nil,     9,   nil,     9,    25,    25,
+   nil,     9,    25,   nil,   nil,   nil,   nil,    25,   nil,    25,
+   nil,    25,    27,    27,   nil,    25,    27,   nil,   nil,   nil,
+   nil,    27,   nil,    27,   nil,    27,   nil,   nil,    27,    27 ]
 
 racc_action_pointer = [
-    -2,    36,    25,    20,    16,     9,    18,   nil,   nil,   nil,
-    10,     4,    33,   nil,   nil,    58,    -7,   nil,     4,    -2,
-   nil,    18,    44,    38,    24,   nil,    -4,    30,   nil,     9,
-   nil,   nil,   nil,    30,   nil,    41,    44,   nil,    44,    45,
-    43,   nil,   nil,   nil,   nil ]
+    -2,    66,    55,    32,    59,    48,   nil,   nil,    -7,    92,
+   nil,   nil,   nil,     4,    66,    28,   nil,   nil,    19,    62,
+   nil,    60,    57,   nil,    50,   106,    80,   120,    52,    40,
+   nil,    -4,     3,   nil,    42,   nil,   nil,   nil,     7,   nil,
+    31,    43,   nil,    36,   -11,    51,    -5,    26,    17,    12,
+    60,   nil,   nil,   nil,   nil,   nil,     3,   nil,    19,   nil,
+   nil ]
 
 racc_action_default = [
-   -33,   -33,    -1,    -3,    -5,    -7,   -33,   -10,   -11,   -12,
-   -14,   -33,   -17,   -19,   -20,   -21,   -33,   -25,   -26,   -28,
-   -32,   -33,   -33,   -33,   -33,    -9,   -33,   -13,   -30,   -33,
-   -16,   -18,   -22,   -33,   -24,   -27,   -29,    45,    -2,    -4,
-    -6,    -8,   -31,   -15,   -23 ]
+   -40,   -40,    -1,    -3,    -4,    -6,    -7,   -12,   -14,   -40,
+   -17,   -18,   -19,   -21,   -40,   -24,   -26,   -27,   -28,   -40,
+   -32,   -33,   -35,   -39,   -40,   -40,   -40,   -40,   -40,   -40,
+   -16,   -40,   -20,   -37,   -40,   -23,   -25,   -29,   -40,   -31,
+   -34,   -36,    61,    -2,   -40,    -5,   -40,   -40,   -40,   -40,
+   -13,   -15,   -38,   -22,   -30,   -10,   -40,    -8,   -40,   -11,
+    -9 ]
 
 racc_goto_table = [
-    25,     2,    27,    40,    39,    38,     1,    26,    32,   nil,
-    35,    36,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     2,    30,    32,    45,    44,    50,    43,     1,    37,    31,
+    40,    41,   nil,   nil,    34,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    46,    48,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    25 ]
+   nil,   nil,   nil,    30,   nil,   nil,   nil,    56,   nil,    58 ]
 
 racc_goto_check = [
-     6,     2,    10,     5,     4,     3,     1,     2,    13,   nil,
-    10,    10,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     2,     8,    12,     5,     4,     7,     3,     1,    15,     2,
+    12,    12,   nil,   nil,     2,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,     2,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,     6 ]
+   nil,   nil,   nil,     8,   nil,   nil,   nil,     2,   nil,     2 ]
 
 racc_goto_pointer = [
-   nil,     6,     1,   -17,   -19,   -21,    -5,   nil,   nil,   nil,
-    -8,   nil,   nil,    -7,   nil,   nil ]
+   nil,     7,     0,   -19,   -21,   -23,   nil,   -24,    -7,   nil,
+   nil,   nil,   -11,   nil,   nil,   -10,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     3,     4,     5,     7,     8,     9,    10,
-   nil,    12,    13,    14,    15,    17 ]
+   nil,   nil,   nil,     3,     4,     5,     6,     8,    10,    11,
+    12,    13,   nil,    15,    16,    17,    18,    20 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 18, :_reduce_none,
-  3, 19, :_reduce_2,
-  1, 19, :_reduce_3,
-  3, 20, :_reduce_4,
-  1, 20, :_reduce_none,
-  3, 21, :_reduce_6,
-  1, 21, :_reduce_none,
-  3, 22, :_reduce_8,
-  2, 22, :_reduce_9,
   1, 22, :_reduce_none,
-  1, 22, :_reduce_none,
-  1, 22, :_reduce_none,
-  2, 23, :_reduce_13,
+  3, 23, :_reduce_2,
+  1, 23, :_reduce_3,
   1, 23, :_reduce_none,
-  3, 26, :_reduce_15,
-  2, 24, :_reduce_16,
+  3, 24, :_reduce_5,
+  1, 24, :_reduce_none,
   1, 24, :_reduce_none,
-  2, 28, :_reduce_18,
+  4, 27, :_reduce_8,
+  5, 27, :_reduce_9,
+  4, 27, :_reduce_10,
+  5, 27, :_reduce_11,
+  1, 25, :_reduce_12,
+  3, 26, :_reduce_13,
+  1, 26, :_reduce_none,
+  3, 28, :_reduce_15,
+  2, 28, :_reduce_16,
   1, 28, :_reduce_none,
   1, 28, :_reduce_none,
   1, 28, :_reduce_none,
-  2, 29, :_reduce_22,
-  3, 31, :_reduce_23,
-  2, 31, :_reduce_24,
+  2, 29, :_reduce_20,
+  1, 29, :_reduce_none,
+  3, 32, :_reduce_22,
+  2, 30, :_reduce_23,
   1, 30, :_reduce_none,
-  1, 32, :_reduce_26,
-  2, 32, :_reduce_27,
-  1, 32, :_reduce_28,
-  2, 32, :_reduce_29,
-  1, 27, :_reduce_30,
-  2, 27, :_reduce_31,
-  1, 25, :_reduce_32 ]
-
-racc_reduce_n = 33
-
-racc_shift_n = 45
+  2, 34, :_reduce_25,
+  1, 34, :_reduce_none,
+  1, 34, :_reduce_none,
+  1, 34, :_reduce_none,
+  2, 35, :_reduce_29,
+  3, 37, :_reduce_30,
+  2, 37, :_reduce_31,
+  1, 36, :_reduce_none,
+  1, 38, :_reduce_33,
+  2, 38, :_reduce_34,
+  1, 38, :_reduce_35,
+  2, 38, :_reduce_36,
+  1, 33, :_reduce_37,
+  2, 33, :_reduce_38,
+  1, 31, :_reduce_39 ]
+
+racc_reduce_n = 40
+
+racc_shift_n = 61
 
 racc_token_table = {
   false => 0,
@@ -150,10 +178,14 @@ racc_token_table = {
   :RValue => 12,
   :BeginCommandSubstitution => 13,
   :EndCommandSubstitution => 14,
-  "(" => 15,
-  ")" => 16 }
+  :Range => 15,
+  :BlockBegin => 16,
+  :BlockEnd => 17,
+  :BlockParams => 18,
+  "(" => 19,
+  ")" => 20 }
 
-racc_nt_base = 17
+racc_nt_base = 21
 
 racc_use_result_var = true
 
@@ -189,13 +221,19 @@ Racc_token_to_s_table = [
   "RValue",
   "BeginCommandSubstitution",
   "EndCommandSubstitution",
+  "Range",
+  "BlockBegin",
+  "BlockEnd",
+  "BlockParams",
   "\"(\"",
   "\")\"",
   "$start",
   "program",
   "stmts",
   "stmt",
+  "range_stmt",
   "pipeline",
+  "block_stmt",
   "stmts2",
   "stmt_w_substitutions",
   "command_w_heredoc",
@@ -230,149 +268,188 @@ module_eval(<<'.,.,', 'grammar.y', 25)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 28)
-  def _reduce_4(val, _values, result)
+# reduce 4 omitted
+
+module_eval(<<'.,.,', 'grammar.y', 29)
+  def _reduce_5(val, _values, result)
      result = ConditionalNode.new(val[1].value, val[0], val[2]) 
     result
   end
 .,.,
 
-# reduce 5 omitted
+# reduce 6 omitted
+
+# reduce 7 omitted
+
+module_eval(<<'.,.,', 'grammar.y', 34)
+  def _reduce_8(val, _values, result)
+     result = val[0].tap { |range_node| range_node.tail = BlockNode.new(nil, val[2]) } 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 36)
+  def _reduce_9(val, _values, result)
+     result = val[0].tap { |range_node| range_node.tail = BlockNode.new(nil, val[3], params: val[2].value) } 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 38)
+  def _reduce_10(val, _values, result)
+     result = BlockNode.new(val[0], val[2]) 
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'grammar.y', 32)
-  def _reduce_6(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 40)
+  def _reduce_11(val, _values, result)
+     result = BlockNode.new(val[0], val[3], params: val[2].value) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 43)
+  def _reduce_12(val, _values, result)
+     result = RangeNode.new(val[0]) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 46)
+  def _reduce_13(val, _values, result)
      result = PipelineNode.new(val[0], val[2]) 
     result
   end
 .,.,
 
-# reduce 7 omitted
+# reduce 14 omitted
 
-module_eval(<<'.,.,', 'grammar.y', 36)
-  def _reduce_8(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 50)
+  def _reduce_15(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 38)
-  def _reduce_9(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 52)
+  def _reduce_16(val, _values, result)
      result = ConcatenationNode.new(val[0], val[1]) 
     result
   end
 .,.,
 
-# reduce 10 omitted
+# reduce 17 omitted
 
-# reduce 11 omitted
+# reduce 18 omitted
 
-# reduce 12 omitted
+# reduce 19 omitted
 
-module_eval(<<'.,.,', 'grammar.y', 44)
-  def _reduce_13(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 58)
+  def _reduce_20(val, _values, result)
      result = val[0] ; val[0].tail = val[1] 
     result
   end
 .,.,
 
-# reduce 14 omitted
+# reduce 21 omitted
 
-module_eval(<<'.,.,', 'grammar.y', 48)
-  def _reduce_15(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 62)
+  def _reduce_22(val, _values, result)
      result = CommandSubstitutionNode.new(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 51)
-  def _reduce_16(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 65)
+  def _reduce_23(val, _values, result)
      val[0].heredoc = val[1] ; result = val[0] 
     result
   end
 .,.,
 
-# reduce 17 omitted
+# reduce 24 omitted
 
-module_eval(<<'.,.,', 'grammar.y', 55)
-  def _reduce_18(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 69)
+  def _reduce_25(val, _values, result)
      val[0].redirects << RedirectionNode.new(val[1].value, val[1].attrs[:target]) ; result = val[0] 
     result
   end
 .,.,
 
-# reduce 19 omitted
+# reduce 26 omitted
 
-# reduce 20 omitted
+# reduce 27 omitted
 
-# reduce 21 omitted
+# reduce 28 omitted
 
-module_eval(<<'.,.,', 'grammar.y', 61)
-  def _reduce_22(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 75)
+  def _reduce_29(val, _values, result)
      result = EnvWrapperNode.new(val[0], val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 64)
-  def _reduce_23(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 78)
+  def _reduce_30(val, _values, result)
      val[0].add_var(val[1].value, val[2].value) ; result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 66)
-  def _reduce_24(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 80)
+  def _reduce_31(val, _values, result)
      result = EnvNode.new(val[0].value, val[1].value) 
     result
   end
 .,.,
 
-# reduce 25 omitted
+# reduce 32 omitted
 
-module_eval(<<'.,.,', 'grammar.y', 71)
-  def _reduce_26(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 85)
+  def _reduce_33(val, _values, result)
      result = CommandNode.new(val[0].value) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 73)
-  def _reduce_27(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 87)
+  def _reduce_34(val, _values, result)
      result = CommandNode.new(val[0].value, val[1].flatten) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 75)
-  def _reduce_28(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 89)
+  def _reduce_35(val, _values, result)
      result = CommandNode.new(val[0].value, literal:true) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 77)
-  def _reduce_29(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 91)
+  def _reduce_36(val, _values, result)
      result = CommandNode.new(val[0].value, val[1].flatten, literal:true) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 80)
-  def _reduce_30(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 94)
+  def _reduce_37(val, _values, result)
      result = [ArgumentNode.new(val[0].value)] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 82)
-  def _reduce_31(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 96)
+  def _reduce_38(val, _values, result)
      result = [val[0], ArgumentNode.new(val[1].value)].flatten 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 85)
-  def _reduce_32(val, _values, result)
+module_eval(<<'.,.,', 'grammar.y', 99)
+  def _reduce_39(val, _values, result)
      result = InternalEvalNode.new(val[0].value) 
     result
   end
@@ -388,6 +465,7 @@ end
 
 
 if $0 == __FILE__
+  require 'pry'
   $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib/"
   require 'yap/shell/parser/lexer'
   require 'yap/shell/parser/nodes'
@@ -396,7 +474,9 @@ if $0 == __FILE__
     # "`git cbranch`",
     # "`git cbranch`.bak",
     # "echo `echo hi`",
-    "echo `echo hi` foo bar baz",
+    # "ls *.rb te* { |f| f }",
+    # "f { |a, b, c| echo foo }"
+    "(0..3) as n : echo hi",
     # "`hi``bye` `what`",
     # "echo && `what` && where is `that`thing | `you know`",
     ].each do |src|

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 
+require 'pry'
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this
@@ -89,3 +91,28 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 =end
 end
+
+
+RSpec::Matchers.define :parse do |expected|
+  match do |parser|
+    begin
+      results = parser.parse(expected)
+      pp results if ENV["DEBUG"]
+    rescue Yap::Shell::Parser::ParseError => ex
+      raise ex
+    end
+    true
+  end
+end
+
+RSpec::Matchers.define :fail_parsing do |expected|
+  match do |parser|
+    begin
+      results = parser.parse(expected)
+      pp results if ENV["DEBUG"]
+    rescue Yap::Shell::Parser::ParseError => ex
+      return true
+    end
+    false
+  end
+end