correct names of certain rules/nodes (refer #1)

Author: grncdr

grammar.pegjs

@@ -47,23 +47,24 @@ variableAssignment
  = writableVariableName '=' argument
 
 commandName "command name"
- = !redirect !keyword name:(concatenation / '[')
+ = !redirect
+   !keyword
+   name:(concatenation / builtinCommandName)
 
 builtinCommandName
  = '['
  / '[['
 
 argument "command argument"
  = commandName
- / commandSubstitution
+ / processSubstitution
 
 concatenation
  = pieces:( glob
           / bareword
           / environmentVariable
           / variableSubstitution
-          / subshell
-          / backticks
+          / commandSubstitution
           / singleQuote
           / doubleQuote
           )+
@@ -101,10 +102,9 @@ doubleQuoteMeta
  = '"' / '$' / '`'
 
 expandsInQuotes
- = backticks
+ = commandSubstitution
  / environmentVariable
  / variableSubstitution
- / subshell
 
 environmentVariable = '$' name:readableVariableName
 
@@ -113,13 +113,11 @@ readableVariableName = writableVariableName / '?'  /* todo, other special vars *
 
 variableSubstitution = '${' expr:[^}]* '}'
 
-backticks
- = '`' commands:(!backticks command)+ '`'
-
-subshell
- = '$(' commands:statementList ')'
-
 commandSubstitution
+ = '`' commands:statementList '`'
+ / '$(' commands:statementList ')'
+
+processSubstitution
  = rw:[<>] '(' commands:statementList ')'
 
 redirect

overrides.js

@@ -176,9 +176,9 @@ rules.controlOperator = function (op) {
   return op == '\n' ? ';' : op
 }
 
-rules.commandSubstitution = function (rw)  {
+rules.processSubstitution = function (rw)  {
   return {
-    type: 'command-substitution',
+    type: 'process-substitution',
     readWrite: rw,
     commands: commands,
   }
@@ -224,12 +224,17 @@ rules.doubleQuote = function (contents) {
 rules.escapedQuote = function (character) {
   return character
 }
-rules.backticks = function (commands) {
-  return {type: 'backticks', commands: commands.map(second)}
-}
 
-rules.subshell = function (commands) {
-  return {type: 'subshell', commands: commands}
+rules.commandSubstitution = [
+  commandSubstitution,
+  commandSubstitution,
+]
+
+function commandSubstitution (commands) {
+  return {
+    type: 'command-substitution',
+    commands: commands
+  }
 }
 
 /** stdio redirection */