yap-shell-parser 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22f0856a5b1b260c5d9ade076db5d0ec84ed0d3
-  data.tar.gz: d7281d94d9473c1eee9c98de6e309395cfa21352
+  metadata.gz: f1721a734dd55506e55a1d3c5c6749a7d4177b0a
+  data.tar.gz: 2211073698e05b3cd2d8cb994a396d431dba1880
 SHA512:
-  metadata.gz: 99bd043d5beb4791c874c695cd73f2178826e3b976729412e8658116d3b45554f6dfea34230ac45c027f08d396320c78f808f57c51ae05de47242354ed71f37a
-  data.tar.gz: 277240948738b082d8da1bc74253be78c4a6128f4f894024e3cc03be538600fef50f9baa4887fddd6ecbb8e40970b7e99da221fa9f19ffa5139f3c8f671620d1
+  metadata.gz: 5ab7eee677398b1f24a546f1512aad1fd9b0f4e10d6dfffbca5471b8e477d5bbd33372365f51a74652251dfec6707ea526b388715de0ea10a40b171183b73259
+  data.tar.gz: a5ed3d26e255794023a8265e807360469b75cb245fac33ac953f72babda1681a87756c353849b31b9a2b171b9d68bdc144d6cc887d8cd26c27c15999e019a004

data/bin/compile_debug_parser

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-racc -t lib/yap/shell/parser/grammar.y -o lib/yap/shell/parser.rb
+racc -t lib/yap/shell/parser/grammar.y -o lib/yap/shell/parser_impl.rb

data/bin/compile_parser

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-racc lib/yap/shell/parser/grammar.y -o lib/yap/shell/parser.rb
+racc lib/yap/shell/parser/grammar.y -o lib/yap/shell/parser_impl.rb

data/lib/yap/shell/parser/grammar.y

@@ -2,7 +2,7 @@
 #
 # convert Array-like string into Ruby's Array.
 
-class Yap::Shell::Parser
+class Yap::Shell::ParserImpl
   token Command LiteralCommand Argument Heredoc InternalEval Separator Conditional Pipe Redirection LValue RValue
   #
   # prechigh
@@ -77,12 +77,8 @@ internal_eval : InternalEval
 
 
 ---- inner
-  $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../"
-  require 'yap/shell/parser/lexer'
-  require 'yap/shell/parser/nodes'
-
   include Yap::Shell::Parser::Nodes
-
+#=end
   def parse(str)
     # @yydebug = true
 
@@ -101,7 +97,7 @@ internal_eval : InternalEval
 ---- footer
 
 if $0 == __FILE__
-  $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../"
+  $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib/"
   require 'yap/shell/parser/lexer'
   require 'yap/shell/parser/nodes'
     [

data/lib/yap/shell/parser/lexer.rb

@@ -33,11 +33,11 @@ module Yap::Shell
       end
     end
 
-    ARG                    = /[^\s;\|\(\)\{\}\[\]\&\!\\\<][^\s;\|\(\)\{\}\[\]\&\!\>\<]*/
+    COMMAND_SUBSTITUTION   = /\A(`|\$\()/
+    ARG                    = /[^\s;\|\(\)\{\}\[\]\&\!\\\<`][^\s;\|\(\)\{\}\[\]\&\!\>\<`]*/
     COMMAND                = /\A(#{ARG})/
     LITERAL_COMMAND        = /\A\\(#{ARG})/
     WHITESPACE             = /\A[^\n\S]+/
-    ARGUMENT               = /\A(#{ARG}+)/
     LH_ASSIGNMENT          = /\A(([A-z_][\w]*)=)/
     RH_VALUE               = /\A(\S+)/
     STATEMENT_TERMINATOR   = /\A(;)/
@@ -61,7 +61,9 @@ module Yap::Shell
       process_next_chunk = -> { @chunk = str.slice(@current_position..-1) ; @chunk != "" }
 
       while process_next_chunk.call
-        result = subgroup_token ||
+        result =
+          command_substitution_token ||
+          subgroup_token ||
           assignment_token ||
           literal_command_token ||
           command_token ||
@@ -161,7 +163,7 @@ module Yap::Shell
     end
 
     def argument_token
-      if @looking_for_args && md=@chunk.match(ARGUMENT)
+      if @looking_for_args
         str = ''
         i = 0
         loop do
@@ -170,8 +172,7 @@ module Yap::Shell
             result = process_string @chunk[i..-1], ch
             str << result.str
             i += result.consumed_length
-
-          elsif ch !~ ARGUMENT
+          elsif ch =~ /[\s\|;&]/
             break
           else
             str << ch
@@ -230,6 +231,18 @@ module Yap::Shell
       end
     end
 
+    def command_substitution_token
+      if md=@chunk.match(COMMAND_SUBSTITUTION)
+        delimiter = md[1] == "$(" ? ")" : md[1]
+        result = process_string @chunk[md[0].length-1..-1], delimiter
+        token :BeginSubcommand, md[1]
+        @tokens.push *self.class.new.tokenize(result.str)
+        token :EndSubcommand, delimiter
+
+        result.consumed_length + (md[0].length - 1)
+      end
+    end
+
     def process_internal_eval(input_str, consumed:0)
       scope = []
       words = []

data/lib/yap/shell/parser/version.rb

@@ -1,5 +1,9 @@
 require 'yap/shell/parser'
 
-class Yap::Shell::Parser
-  VERSION = "0.0.1"
+module Yap
+  module Shell
+    module Parser
+      VERSION = "0.0.3"
+    end
+  end
 end

data/lib/yap/shell/parser.rb

@@ -1,381 +1,14 @@
-#
-# DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
-# from Racc grammer file "".
-#
-
-require 'racc/parser.rb'
 module Yap
   module Shell
-    class Parser < Racc::Parser
-
-module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 80)
-  $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../"
-  require 'yap/shell/parser/lexer'
-  require 'yap/shell/parser/nodes'
-
-  include Yap::Shell::Parser::Nodes
-
-  def parse(str)
-    # @yydebug = true
-
-    @q = Yap::Shell::Parser::Lexer.new.tokenize(str)
-    # @q.push [false, '$']   # is optional from Racc 1.3.7
-# puts @q.inspect
-# puts "---- parse tree follows ----"
-    __send__(Racc_Main_Parsing_Routine, _racc_setup(), false)
-    #do_parse
-  end
-
-  def next_token
-    @q.shift
-  end
-
-...end grammar.y/module_eval...
-##### State transition tables begin ###
-
-racc_action_table = [
-    15,    16,    29,    23,    17,    29,    15,    16,    24,    13,
-    17,     6,    15,    16,    27,    13,    17,     6,    15,    16,
-    31,    13,    17,     6,    15,    16,    21,    13,    17,     6,
-    15,    16,    20,    13,    19,     6,    19,    18,    36,    26,
-    37,    35,    37,    20,    21 ]
-
-racc_action_check = [
-     0,     0,    16,     9,     0,    15,     6,     6,     9,     0,
-     6,     0,    21,    21,    13,     6,    21,     6,    20,    20,
-    18,    21,    20,    21,    19,    19,     4,    20,    19,    20,
-    12,    12,     3,    19,    22,    19,     2,     1,    26,    12,
-    28,    22,    30,    32,    33 ]
-
-racc_action_pointer = [
-    -2,    37,    29,    24,    17,   nil,     4,   nil,   nil,    -2,
-   nil,   nil,    28,     2,   nil,     1,    -2,   nil,    20,    22,
-    16,    10,    27,   nil,   nil,   nil,    26,   nil,    36,   nil,
-    38,   nil,    35,    35,   nil,   nil,   nil,   nil ]
-
-racc_action_default = [
-   -28,   -28,    -1,    -3,    -5,    -7,   -28,    -9,   -10,   -12,
-   -14,   -15,   -16,   -28,   -20,   -21,   -23,   -27,   -28,   -28,
-   -28,   -28,   -28,   -11,   -13,   -17,   -28,   -19,   -22,   -25,
-   -24,    38,    -2,    -4,    -6,    -8,   -18,   -26 ]
-
-racc_goto_table = [
-     2,    28,    30,    33,    32,    34,    22,    25,     1 ]
-
-racc_goto_check = [
-     2,    13,    13,     4,     3,     5,     2,    10,     1 ]
-
-racc_goto_pointer = [
-   nil,     8,     0,   -15,   -17,   -16,   nil,   nil,   nil,   nil,
-    -5,   nil,   nil,   -14 ]
-
-racc_goto_default = [
-   nil,   nil,   nil,     3,     4,     5,     7,     8,     9,    10,
-    11,    12,    14,   nil ]
-
-racc_reduce_table = [
-  0, 0, :racc_error,
-  1, 16, :_reduce_none,
-  3, 17, :_reduce_2,
-  1, 17, :_reduce_3,
-  3, 18, :_reduce_4,
-  1, 18, :_reduce_none,
-  3, 19, :_reduce_6,
-  1, 19, :_reduce_none,
-  3, 20, :_reduce_8,
-  1, 20, :_reduce_none,
-  1, 20, :_reduce_none,
-  2, 21, :_reduce_11,
-  1, 21, :_reduce_none,
-  2, 23, :_reduce_13,
-  1, 23, :_reduce_none,
-  1, 23, :_reduce_none,
-  1, 23, :_reduce_none,
-  2, 24, :_reduce_17,
-  3, 26, :_reduce_18,
-  2, 26, :_reduce_19,
-  1, 25, :_reduce_none,
-  1, 27, :_reduce_21,
-  2, 27, :_reduce_22,
-  1, 27, :_reduce_23,
-  2, 27, :_reduce_24,
-  1, 28, :_reduce_25,
-  2, 28, :_reduce_26,
-  1, 22, :_reduce_27 ]
-
-racc_reduce_n = 28
-
-racc_shift_n = 38
-
-racc_token_table = {
-  false => 0,
-  :error => 1,
-  :Command => 2,
-  :LiteralCommand => 3,
-  :Argument => 4,
-  :Heredoc => 5,
-  :InternalEval => 6,
-  :Separator => 7,
-  :Conditional => 8,
-  :Pipe => 9,
-  :Redirection => 10,
-  :LValue => 11,
-  :RValue => 12,
-  "(" => 13,
-  ")" => 14 }
-
-racc_nt_base = 15
-
-racc_use_result_var = true
-
-Racc_arg = [
-  racc_action_table,
-  racc_action_check,
-  racc_action_default,
-  racc_action_pointer,
-  racc_goto_table,
-  racc_goto_check,
-  racc_goto_default,
-  racc_goto_pointer,
-  racc_nt_base,
-  racc_reduce_table,
-  racc_token_table,
-  racc_shift_n,
-  racc_reduce_n,
-  racc_use_result_var ]
-
-Racc_token_to_s_table = [
-  "$end",
-  "error",
-  "Command",
-  "LiteralCommand",
-  "Argument",
-  "Heredoc",
-  "InternalEval",
-  "Separator",
-  "Conditional",
-  "Pipe",
-  "Redirection",
-  "LValue",
-  "RValue",
-  "\"(\"",
-  "\")\"",
-  "$start",
-  "program",
-  "stmts",
-  "stmt",
-  "pipeline",
-  "stmts2",
-  "command_w_heredoc",
-  "internal_eval",
-  "command_w_redirects",
-  "command_w_vars",
-  "command",
-  "vars",
-  "command2",
-  "args" ]
-
-Racc_debug_parser = false
-
-##### State transition tables end #####
-
-# reduce 0 omitted
-
-# reduce 1 omitted
-
-module_eval(<<'.,.,', 'grammar.y', 23)
-  def _reduce_2(val, _values, result)
-     result = StatementsNode.new(val[0], val[2]) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 25)
-  def _reduce_3(val, _values, result)
-     result = StatementsNode.new(val[0]) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 28)
-  def _reduce_4(val, _values, result)
-     result = ConditionalNode.new(val[1].value, val[0], val[2]) 
-    result
-  end
-.,.,
-
-# reduce 5 omitted
-
-module_eval(<<'.,.,', 'grammar.y', 32)
-  def _reduce_6(val, _values, result)
-     result = PipelineNode.new(val[0], val[2]) 
-    result
-  end
-.,.,
-
-# reduce 7 omitted
-
-module_eval(<<'.,.,', 'grammar.y', 36)
-  def _reduce_8(val, _values, result)
-     result = val[1] 
-    result
-  end
-.,.,
-
-# reduce 9 omitted
-
-# reduce 10 omitted
-
-module_eval(<<'.,.,', 'grammar.y', 41)
-  def _reduce_11(val, _values, result)
-     val[0].heredoc = val[1] ; result = val[0] 
-    result
-  end
-.,.,
-
-# reduce 12 omitted
-
-module_eval(<<'.,.,', 'grammar.y', 45)
-  def _reduce_13(val, _values, result)
-     val[0].redirects << RedirectionNode.new(val[1].value, val[1].attrs[:target]) ; result = val[0] 
-    result
-  end
-.,.,
-
-# reduce 14 omitted
-
-# reduce 15 omitted
-
-# reduce 16 omitted
-
-module_eval(<<'.,.,', 'grammar.y', 51)
-  def _reduce_17(val, _values, result)
-     result = EnvWrapperNode.new(val[0], val[1]) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 54)
-  def _reduce_18(val, _values, result)
-     val[0].add_var(val[1].value, val[2].value) ; result = val[0] 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 56)
-  def _reduce_19(val, _values, result)
-     result = EnvNode.new(val[0].value, val[1].value) 
-    result
-  end
-.,.,
-
-# reduce 20 omitted
-
-module_eval(<<'.,.,', 'grammar.y', 61)
-  def _reduce_21(val, _values, result)
-     result = CommandNode.new(val[0].value) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 63)
-  def _reduce_22(val, _values, result)
-     result = CommandNode.new(val[0].value, val[1].flatten) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 65)
-  def _reduce_23(val, _values, result)
-     result = CommandNode.new(val[0].value, literal:true) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 67)
-  def _reduce_24(val, _values, result)
-     result = CommandNode.new(val[0].value, val[1].flatten, literal:true) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 70)
-  def _reduce_25(val, _values, result)
-     result = [val[0].value] 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 72)
-  def _reduce_26(val, _values, result)
-     result = [val[0], val[1].value] 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 75)
-  def _reduce_27(val, _values, result)
-     result = InternalEvalNode.new(val[0].value) 
-    result
+    module Parser
+      def self.new
+        Yap::Shell::ParserImpl.new
+      end
+    end
   end
-.,.,
-
-def _reduce_none(val, _values, result)
-  val[0]
 end
 
-    end   # class Parser
-    end   # module Shell
-  end   # module Yap
-
-
-if $0 == __FILE__
-  $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../"
-  require 'yap/shell/parser/lexer'
-  require 'yap/shell/parser/nodes'
-    [
-    # "echo foo",
-    # "echo foo ; echo bar baz yep",
-    # "echo foo && echo bar baz yep",
-    # "echo foo && echo bar && ls foo && ls bar",
-    # "echo foo ; echo bar baz yep ; ls foo",
-    # "echo foo && echo bar ; ls baz",
-    # "echo foo && echo bar ; ls baz ; echo zach || echo gretchen",
-    # "echo foo | bar",
-    # "echo foo | bar && foo | bar",
-    # "foo && bar ; word || baz ; yep | grep -v foo",
-    # "( foo )",
-    # "( foo a b && bar c d )",
-    # "( foo a b && (bar c d | baz e f))",
-    # "((((foo))))",
-    # "foo -b -c ; (this ;that ;the; other  ;thing) && yep",
-    # "foo -b -c ; (this ;that && other  ;thing) && yep",
-    # "4 + 5",
-    # "!'hello' ; 4 - 4 && 10 + 3",
-    # "\\foo <<-EOT\nbar\nEOT",
-    # "ls | grep md | grep WISH",
-    # "(!upcase)",
-    # "echo foo > bar.txt",
-    # "ls -l > a.txt ; echo f 2> b.txt ; cat b &> c.txt ; du -sh 1>&2 1>hey.txt",
-    # "!Dir.chdir('..')",
-    # "FOO=123",
-    # "FOO=123 BAR=345",
-    # "FOO=abc bar=2314 car=14ab ls -l",
-    "FOO=abc BAR='hello world' ls -l ; CAR=f echo foo && say hi"
-    ].each do |src|
-      puts 'parsing:'
-      print src
-      puts
-      puts 'result:'
-      require 'pp'
-      ast = Yap::Shell::Parser.new.parse(src)
-      pp ast
-    end
-
-
-  # puts "---- Evaluating"
-  #   require 'pry'
-  # binding.pry
-  # Evaluator.new.evaltree(ast)
-end
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../"
+require 'yap/shell/parser/lexer'
+require 'yap/shell/parser/nodes'
+require 'yap/shell/parser_impl'

data/lib/yap/shell/parser_impl.rb

@@ -0,0 +1,377 @@
+#
+# DO NOT MODIFY!!!!
+# This file is automatically generated by Racc 1.4.9
+# from Racc grammer file "".
+#
+
+require 'racc/parser.rb'
+module Yap
+  module Shell
+    class ParserImpl < Racc::Parser
+
+module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 80)
+  include Yap::Shell::Parser::Nodes
+#=end
+  def parse(str)
+    # @yydebug = true
+
+    @q = Yap::Shell::Parser::Lexer.new.tokenize(str)
+    # @q.push [false, '$']   # is optional from Racc 1.3.7
+# puts @q.inspect
+# puts "---- parse tree follows ----"
+    __send__(Racc_Main_Parsing_Routine, _racc_setup(), false)
+    #do_parse
+  end
+
+  def next_token
+    @q.shift
+  end
+
+...end grammar.y/module_eval...
+##### State transition tables begin ###
+
+racc_action_table = [
+    15,    16,    29,    23,    17,    29,    15,    16,    24,    13,
+    17,     6,    15,    16,    27,    13,    17,     6,    15,    16,
+    31,    13,    17,     6,    15,    16,    21,    13,    17,     6,
+    15,    16,    20,    13,    19,     6,    19,    18,    36,    26,
+    37,    35,    37,    20,    21 ]
+
+racc_action_check = [
+     0,     0,    16,     9,     0,    15,     6,     6,     9,     0,
+     6,     0,    21,    21,    13,     6,    21,     6,    20,    20,
+    18,    21,    20,    21,    19,    19,     4,    20,    19,    20,
+    12,    12,     3,    19,    22,    19,     2,     1,    26,    12,
+    28,    22,    30,    32,    33 ]
+
+racc_action_pointer = [
+    -2,    37,    29,    24,    17,   nil,     4,   nil,   nil,    -2,
+   nil,   nil,    28,     2,   nil,     1,    -2,   nil,    20,    22,
+    16,    10,    27,   nil,   nil,   nil,    26,   nil,    36,   nil,
+    38,   nil,    35,    35,   nil,   nil,   nil,   nil ]
+
+racc_action_default = [
+   -28,   -28,    -1,    -3,    -5,    -7,   -28,    -9,   -10,   -12,
+   -14,   -15,   -16,   -28,   -20,   -21,   -23,   -27,   -28,   -28,
+   -28,   -28,   -28,   -11,   -13,   -17,   -28,   -19,   -22,   -25,
+   -24,    38,    -2,    -4,    -6,    -8,   -18,   -26 ]
+
+racc_goto_table = [
+     2,    28,    30,    33,    32,    34,    22,    25,     1 ]
+
+racc_goto_check = [
+     2,    13,    13,     4,     3,     5,     2,    10,     1 ]
+
+racc_goto_pointer = [
+   nil,     8,     0,   -15,   -17,   -16,   nil,   nil,   nil,   nil,
+    -5,   nil,   nil,   -14 ]
+
+racc_goto_default = [
+   nil,   nil,   nil,     3,     4,     5,     7,     8,     9,    10,
+    11,    12,    14,   nil ]
+
+racc_reduce_table = [
+  0, 0, :racc_error,
+  1, 16, :_reduce_none,
+  3, 17, :_reduce_2,
+  1, 17, :_reduce_3,
+  3, 18, :_reduce_4,
+  1, 18, :_reduce_none,
+  3, 19, :_reduce_6,
+  1, 19, :_reduce_none,
+  3, 20, :_reduce_8,
+  1, 20, :_reduce_none,
+  1, 20, :_reduce_none,
+  2, 21, :_reduce_11,
+  1, 21, :_reduce_none,
+  2, 23, :_reduce_13,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  2, 24, :_reduce_17,
+  3, 26, :_reduce_18,
+  2, 26, :_reduce_19,
+  1, 25, :_reduce_none,
+  1, 27, :_reduce_21,
+  2, 27, :_reduce_22,
+  1, 27, :_reduce_23,
+  2, 27, :_reduce_24,
+  1, 28, :_reduce_25,
+  2, 28, :_reduce_26,
+  1, 22, :_reduce_27 ]
+
+racc_reduce_n = 28
+
+racc_shift_n = 38
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :Command => 2,
+  :LiteralCommand => 3,
+  :Argument => 4,
+  :Heredoc => 5,
+  :InternalEval => 6,
+  :Separator => 7,
+  :Conditional => 8,
+  :Pipe => 9,
+  :Redirection => 10,
+  :LValue => 11,
+  :RValue => 12,
+  "(" => 13,
+  ")" => 14 }
+
+racc_nt_base = 15
+
+racc_use_result_var = true
+
+Racc_arg = [
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
+
+Racc_token_to_s_table = [
+  "$end",
+  "error",
+  "Command",
+  "LiteralCommand",
+  "Argument",
+  "Heredoc",
+  "InternalEval",
+  "Separator",
+  "Conditional",
+  "Pipe",
+  "Redirection",
+  "LValue",
+  "RValue",
+  "\"(\"",
+  "\")\"",
+  "$start",
+  "program",
+  "stmts",
+  "stmt",
+  "pipeline",
+  "stmts2",
+  "command_w_heredoc",
+  "internal_eval",
+  "command_w_redirects",
+  "command_w_vars",
+  "command",
+  "vars",
+  "command2",
+  "args" ]
+
+Racc_debug_parser = false
+
+##### State transition tables end #####
+
+# reduce 0 omitted
+
+# reduce 1 omitted
+
+module_eval(<<'.,.,', 'grammar.y', 23)
+  def _reduce_2(val, _values, result)
+     result = StatementsNode.new(val[0], val[2]) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 25)
+  def _reduce_3(val, _values, result)
+     result = StatementsNode.new(val[0]) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 28)
+  def _reduce_4(val, _values, result)
+     result = ConditionalNode.new(val[1].value, val[0], val[2]) 
+    result
+  end
+.,.,
+
+# reduce 5 omitted
+
+module_eval(<<'.,.,', 'grammar.y', 32)
+  def _reduce_6(val, _values, result)
+     result = PipelineNode.new(val[0], val[2]) 
+    result
+  end
+.,.,
+
+# reduce 7 omitted
+
+module_eval(<<'.,.,', 'grammar.y', 36)
+  def _reduce_8(val, _values, result)
+     result = val[1] 
+    result
+  end
+.,.,
+
+# reduce 9 omitted
+
+# reduce 10 omitted
+
+module_eval(<<'.,.,', 'grammar.y', 41)
+  def _reduce_11(val, _values, result)
+     val[0].heredoc = val[1] ; result = val[0] 
+    result
+  end
+.,.,
+
+# reduce 12 omitted
+
+module_eval(<<'.,.,', 'grammar.y', 45)
+  def _reduce_13(val, _values, result)
+     val[0].redirects << RedirectionNode.new(val[1].value, val[1].attrs[:target]) ; result = val[0] 
+    result
+  end
+.,.,
+
+# reduce 14 omitted
+
+# reduce 15 omitted
+
+# reduce 16 omitted
+
+module_eval(<<'.,.,', 'grammar.y', 51)
+  def _reduce_17(val, _values, result)
+     result = EnvWrapperNode.new(val[0], val[1]) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 54)
+  def _reduce_18(val, _values, result)
+     val[0].add_var(val[1].value, val[2].value) ; result = val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 56)
+  def _reduce_19(val, _values, result)
+     result = EnvNode.new(val[0].value, val[1].value) 
+    result
+  end
+.,.,
+
+# reduce 20 omitted
+
+module_eval(<<'.,.,', 'grammar.y', 61)
+  def _reduce_21(val, _values, result)
+     result = CommandNode.new(val[0].value) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 63)
+  def _reduce_22(val, _values, result)
+     result = CommandNode.new(val[0].value, val[1].flatten) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 65)
+  def _reduce_23(val, _values, result)
+     result = CommandNode.new(val[0].value, literal:true) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 67)
+  def _reduce_24(val, _values, result)
+     result = CommandNode.new(val[0].value, val[1].flatten, literal:true) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 70)
+  def _reduce_25(val, _values, result)
+     result = [val[0].value] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 72)
+  def _reduce_26(val, _values, result)
+     result = [val[0], val[1].value] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 75)
+  def _reduce_27(val, _values, result)
+     result = InternalEvalNode.new(val[0].value) 
+    result
+  end
+.,.,
+
+def _reduce_none(val, _values, result)
+  val[0]
+end
+
+    end   # class ParserImpl
+    end   # module Shell
+  end   # module Yap
+
+
+if $0 == __FILE__
+  $LOAD_PATH.unshift File.dirname(__FILE__) + "/lib/"
+  require 'yap/shell/parser/lexer'
+  require 'yap/shell/parser/nodes'
+    [
+    # "echo foo",
+    # "echo foo ; echo bar baz yep",
+    # "echo foo && echo bar baz yep",
+    # "echo foo && echo bar && ls foo && ls bar",
+    # "echo foo ; echo bar baz yep ; ls foo",
+    # "echo foo && echo bar ; ls baz",
+    # "echo foo && echo bar ; ls baz ; echo zach || echo gretchen",
+    # "echo foo | bar",
+    # "echo foo | bar && foo | bar",
+    # "foo && bar ; word || baz ; yep | grep -v foo",
+    # "( foo )",
+    # "( foo a b && bar c d )",
+    # "( foo a b && (bar c d | baz e f))",
+    # "((((foo))))",
+    # "foo -b -c ; (this ;that ;the; other  ;thing) && yep",
+    # "foo -b -c ; (this ;that && other  ;thing) && yep",
+    # "4 + 5",
+    # "!'hello' ; 4 - 4 && 10 + 3",
+    # "\\foo <<-EOT\nbar\nEOT",
+    # "ls | grep md | grep WISH",
+    # "(!upcase)",
+    # "echo foo > bar.txt",
+    # "ls -l > a.txt ; echo f 2> b.txt ; cat b &> c.txt ; du -sh 1>&2 1>hey.txt",
+    # "!Dir.chdir('..')",
+    # "FOO=123",
+    # "FOO=123 BAR=345",
+    # "FOO=abc bar=2314 car=14ab ls -l",
+    "FOO=abc BAR='hello world' ls -l ; CAR=f echo foo && say hi"
+    ].each do |src|
+      puts 'parsing:'
+      print src
+      puts
+      puts 'result:'
+      require 'pp'
+      ast = Yap::Shell::Parser.new.parse(src)
+      pp ast
+    end
+
+
+  # puts "---- Evaluating"
+  #   require 'pry'
+  # binding.pry
+  # Evaluator.new.evaltree(ast)
+end

data/spec/yap/shell/lexer_spec.rb

@@ -689,8 +689,114 @@ describe Yap::Shell::Parser::Lexer do
         t(:Argument, "-l", lineno: 0)
       ]}
     end
+  end
+
+  describe "command substitution" do
+    describe "backticks can wrap simple commands: `pwd`" do
+      let(:str){ "`pwd`" }
+      it { should eq [
+        t(:BeginSubcommand, "`", lineno: 0),
+        t(:Command, "pwd", lineno: 0),
+        t(:EndSubcommand, "`", lineno: 0)
+      ]}
+    end
+
+    describe "backticks can wrap complex statements: `ls -al && foo bar || baz`" do
+      let(:str){ "`ls -al && foo bar || baz`" }
+      it { should eq [
+        t(:BeginSubcommand, "`", lineno: 0),
+        t(:Command,'ls', lineno: 0),
+        t(:Argument, '-al', lineno: 0),
+        t(:Conditional, '&&', lineno: 0),
+        t(:Command, 'foo', lineno: 0),
+        t(:Argument, 'bar', lineno: 0),
+        t(:Conditional, '||', lineno: 0),
+        t(:Command, 'baz', lineno: 0),
+        t(:EndSubcommand, "`", lineno: 0)
+      ]}
+    end
+
+    describe "backticks can appear as an argument: echo `pwd`" do
+      let(:str){ "echo `pwd`" }
+      it { should eq [
+        t(:Command,'echo', lineno: 0),
+        t(:BeginSubcommand, "`", lineno: 0),
+        t(:Command,'pwd', lineno: 0),
+        t(:EndSubcommand, "`", lineno: 0)
+      ]}
+    end
 
+    describe "backticks can appear as a complex argument: echo `pwd && foo bar || baz ; yep` ; hello" do
+      let(:str){ "echo `pwd && foo bar || baz ; yep` ; hello" }
+      it { should eq [
+        t(:Command,'echo', lineno: 0),
+        t(:BeginSubcommand, "`", lineno: 0),
+        t(:Command,'pwd', lineno: 0),
+        t(:Conditional, '&&', lineno: 0),
+        t(:Command, 'foo', lineno: 0),
+        t(:Argument, 'bar', lineno: 0),
+        t(:Conditional, '||', lineno: 0),
+        t(:Command, 'baz', lineno: 0),
+        t(:Separator, ";", lineno: 0),
+        t(:Command, 'yep', lineno: 0),
+        t(:EndSubcommand, "`", lineno: 0),
+        t(:Separator, ";", lineno: 0),
+        t(:Command, "hello", lineno: 0)
+      ]}
+    end
 
+    describe "dollar-sign paren can wrap simple commands: $(pwd)" do
+      let(:str){ "$(pwd)" }
+      it { should eq [
+        t(:BeginSubcommand, "$(", lineno: 0),
+        t(:Command, "pwd", lineno: 0),
+        t(:EndSubcommand, ")", lineno: 0)
+      ]}
+    end
+
+    describe "dollar-sign paren can wrap complex statements: $(ls -al && foo bar || baz)" do
+      let(:str){ "`ls -al && foo bar || baz`" }
+      it { should eq [
+        t(:BeginSubcommand, "`", lineno: 0),
+        t(:Command,'ls', lineno: 0),
+        t(:Argument, '-al', lineno: 0),
+        t(:Conditional, '&&', lineno: 0),
+        t(:Command, 'foo', lineno: 0),
+        t(:Argument, 'bar', lineno: 0),
+        t(:Conditional, '||', lineno: 0),
+        t(:Command, 'baz', lineno: 0),
+        t(:EndSubcommand, "`", lineno: 0)
+      ]}
+    end
+
+    describe "dollar-sign paren can appear as an argument: echo $(pwd)" do
+      let(:str){ "echo $(pwd)" }
+      it { should eq [
+        t(:Command,'echo', lineno: 0),
+        t(:BeginSubcommand, "$(", lineno: 0),
+        t(:Command,'pwd', lineno: 0),
+        t(:EndSubcommand, ")", lineno: 0)
+      ]}
+    end
+
+    describe "dollar-sign paren can appear as a complex argument: echo $(pwd && foo bar || baz ; yep) ; hello" do
+      let(:str){ "echo $(pwd && foo bar || baz ; yep) ; hello" }
+      it { should eq [
+        t(:Command,'echo', lineno: 0),
+        t(:BeginSubcommand, "$(", lineno: 0),
+        t(:Command,'pwd', lineno: 0),
+        t(:Conditional, '&&', lineno: 0),
+        t(:Command, 'foo', lineno: 0),
+        t(:Argument, 'bar', lineno: 0),
+        t(:Conditional, '||', lineno: 0),
+        t(:Command, 'baz', lineno: 0),
+        t(:Separator, ";", lineno: 0),
+        t(:Command, 'yep', lineno: 0),
+        t(:EndSubcommand, ")", lineno: 0),
+        t(:Separator, ";", lineno: 0),
+        t(:Command, "hello", lineno: 0)
+      ]}
+    end
 
   end
 

data/yap-shell-parser.gemspec

@@ -9,13 +9,13 @@ Gem::Specification.new do |spec|
   spec.version       = Yap::Shell::Parser::VERSION
   spec.authors       = ["Zach Dennis"]
   spec.email         = ["zach.dennis@gmail.com"]
-  spec.summary       = %q{The parser for the yap shell.}
-  spec.description   = %q{The parser for the yap shell.}
-  spec.homepage      = ""
+  spec.summary       = %q{The parser for the yap shell}
+  spec.description   = %q{The parser for the yap shell}
+  spec.homepage      = "https://github.com/zdennis/yap-shell-parser"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  # spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,12 +52,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-description: The parser for the yap shell.
+description: The parser for the yap shell
 email:
 - zach.dennis@gmail.com
-executables:
-- compile_debug_parser
-- compile_parser
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -71,16 +69,16 @@ files:
 - bin/compile_debug_parser
 - bin/compile_parser
 - lib/tasks/gem.rake
-- lib/yap/shell.rb
 - lib/yap/shell/parser.rb
 - lib/yap/shell/parser/grammar.y
 - lib/yap/shell/parser/lexer.rb
 - lib/yap/shell/parser/nodes.rb
 - lib/yap/shell/parser/version.rb
+- lib/yap/shell/parser_impl.rb
 - spec/spec_helper.rb
 - spec/yap/shell/lexer_spec.rb
 - yap-shell-parser.gemspec
-homepage: ''
+homepage: https://github.com/zdennis/yap-shell-parser
 licenses:
 - MIT
 metadata: {}
@@ -103,7 +101,7 @@ rubyforge_project:
 rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: The parser for the yap shell.
+summary: The parser for the yap shell
 test_files:
 - spec/spec_helper.rb
 - spec/yap/shell/lexer_spec.rb

data/lib/yap/shell.rb

@@ -1,2 +0,0 @@
-module Yap::Shell
-end