Cleaninup grammar, add for loops, add some bash builtins

Author: grncdr

grammar.pegjs

@@ -1,40 +1,39 @@
 script
- = sections:(spaceNL* statementList spaceNL*)+
+ = spaceNL* statements:statementList?
 
-statementList "a list of statements"
- = first:statement
-   rest:(space* controlOperator spaceNL* statement)*
-   last:(space* controlOperator)?
+statementList
+ = head:statement
+   tail:(controlOperator spaceNL* statement)*
+   space* last:controlOperator? spaceNL*
 
 statement
  = statement:( subshell
+             / bashExtensions
              / command
              / variableAssignment
-             / conditionalLoop
              / ifBlock
+             / conditionalLoop
+             / forLoop
              )
    next:(space* chainedStatement)?
 
 chainedStatement
  = operator:('&&' / '||') spaceNL* statement:statement
 
-controlOperator
- = op:('&' / ';' / '\n')
+subshell "a subshell"
+ = "(" space* statements:statementList  space* ")"
 
 command "a single command"
  = pre:((variableAssignment / redirect) space+)*
    name:(commandName / builtinCommandName)
    post:(space+ (redirect / argument))*
    pipe:(space* pipe)?
 
-conditionalLoop
- = kind:("while" / "until") spaceNL+ test:condition spaceNL*
-   "do" spaceNL
-   body:script
-   "done"
+condition
+ = test:script
 
-ifBlock
- = "if" spaceNL+ test:script
+ifBlock "an if/elif/else statement"
+ = "if" spaceNL+ test:condition
    "then" spaceNL+ body:script
    elifBlocks:elifBlock*
    elseBody:("else" script)?
@@ -43,13 +42,29 @@ ifBlock
 elifBlock
  = "elif" spaceNL+ test:condition "then" spaceNL+ body:script
 
-condition
- = test:script
+conditionalLoop "a while/until loop"
+ = kind:("while" / "until") spaceNL+ test:condition
+   "do" spaceNL+ body:script
+   "done"
 
-subshell "a subshell"
- = "(" space* statements:statementList  space* ")"
+forLoop "a for loop"
+ = "for" space+ loopVar:writableVariableName spaceNL+
+   subjects:("in" (space+ argument)*)?
+   space* (";" / "\n") spaceNL*
+   "do" spaceNL+
+   body:statementList spaceNL*
+   "done"
+
+bashExtensions
+ = time / declare
 
-variableAssignment
+time "time builtin"
+ = "time" space+ flags:("-" [a-z]+ space+)* statements:statementList
+
+declare "declare builtin"
+ = ("declare" / "typeset") command:[^\n]+ (";" / "\n")
+
+variableAssignment "a variable assignment"
  = name:writableVariableName '=' value:argument?
 
 commandName "command name"
@@ -59,8 +74,7 @@ commandName "command name"
    name:(concatenation / builtinCommandName)
 
 builtinCommandName
- = '['
- / '[['
+ = '[[' / '['
 
 argument "command argument"
  = commandName
@@ -155,15 +169,19 @@ redirectionOperator
 fd
  = digits:[0-9]+ { return parseInt(join(digits), 10) }
 
+controlOperator
+ = space* op:('&' / ';' / '\n')
+
 pipe =
  "|" spaceNL* command:command
 
-space
+space "whitespace"
  = " " / "\t"
 
 spaceNL = space / "\n" / comment
 
-comment = '#' [^\n]* ("\n" / EOF)
+comment "a comment"
+  = '#' [^\n]* ("\n" / EOF)
 
 keyword
  = ( "while"

overrides.js

@@ -70,21 +70,23 @@ exports.initializer = [
   }
 ].join('\n')
 
-rules.script = function (sections) {
-  var statements = []
-  map(sections, function (section) {
-    statements = statements.concat(section[1])
-  })
-  return statements
+rules.script = function (statements) {
+  return statements || []
 }
 
-rules.statementList = function (first, rest, last) {
-  var statements = [first]
-  var prev = first
-  map(rest, function (spaceOpSpaceCmd, i, cmds) {
-    setOperator(spaceOpSpaceCmd[1], prev)
-    statements.push(prev = spaceOpSpaceCmd[3])
+rules.statementList = function (first, tail, last) {
+  var statements = [head]
+  var prev = head
+  map(tail, function (spaceOpSpaceCmd, i, cmds) {
+    setOperator(spaceOpSpaceCmd[0], prev)
+    statements.push(prev = spaceOpSpaceCmd[2])
   })
+
+  if (last) {
+    if (!prev) { debugger }
+    setOperator(last, prev)
+  }
+
   return statements
 
   function setOperator(operator, command) {
@@ -96,7 +98,6 @@ rules.statementList = function (first, rest, last) {
 }
 
 rules.subshell = function (statements) {
-  debugger
   return {
     type: 'subshell',
     statements: statements,
@@ -105,12 +106,21 @@ rules.subshell = function (statements) {
 
 rules.conditionalLoop = function (kind, test, body) {
   return {
-    type: kind + '-loop',
+    type: kind + 'Loop',
     test: test,
     body: body
   }
 }
 
+rules.forLoop = function (loopVar, subjects, body) {
+  return {
+    type: 'forLoop',
+    loopVariable: loopVar,
+    subjects: subjects[1].map(second),
+    body: body
+  }
+}
+
 rules.ifBlock = function (test, body, elifBlocks, elseBody) {
   return {
     type: 'ifElse',
@@ -129,6 +139,14 @@ rules.elifBlock = function (test, body) {
   }
 }
 
+rules.time = function (flags, statements) {
+  return {
+    type: 'time',
+    flags: flags,
+    command: statements
+  }
+}
+
 rules.condition = function bare (test) {
   return test
 }
@@ -201,15 +219,6 @@ rules.environmentVariable  = function () {
   return {type: 'variable', name: name}
 }
 
-rules.variableAssignment = function () {
-  name, val
-  return {
-    type: 'assignment',
-    name: name,
-    value: val
-  }
-}
-
 rules.variableSubstitution = function () {
   return {
     type:        'variableSubstitution',