moar changes

Author: grncdr

grammar.pegjs

@@ -1,15 +1,17 @@
-script "one or more statements separated by control operators"
+script
+ = sections:(spaceNL* statementList spaceNL*)+
+
+statementList "a list of statements"
  = first:statement
-   rest:(controlOperator statement)*
-   last:controlOperator?
-   spaceNL*
+   rest:(space* controlOperator spaceNL* statement)*
+   last:(space* controlOperator)?
 
 statement
  = statement:( command
              / conditionalLoop
              / ifBlock
              )
-   space* next:chainedStatement?
+   next:(space* chainedStatement)?
 
 chainedStatement
  = operator:('&&' / '||') spaceNL* statement:statement
@@ -18,36 +20,39 @@ controlOperator
  = op:('&' / ';' / '\n')
 
 command "a single command"
- = spaceNL*
-   pre:((variableAssignment / redirect) space+)*
-   name:commandName
+ = pre:((variableAssignment / redirect) space+)*
+   name:(commandName / builtinCommandName)
    post:(space+ (redirect / argument))*
 
 conditionalLoop
- = kind:("while" / "until") spaceNL+ test:script spaceNL*
-   "do" spaceNL*
-   body:script spaceNL*
-   "done" spaceNL*
+ = kind:("while" / "until") spaceNL+ test:condition spaceNL*
+   "do" spaceNL
+   body:script
+   "done"
 
 ifBlock
- = "if" spaceNL+ test:script spaceNL*
-   "then" spaceNL* body:script spaceNL*
+ = "if" spaceNL+ test:script
+   "then" spaceNL+ body:script
    elifBlocks:elifBlock*
    elseBody:("else" script)?
-   "fi" spaceNL*
+   "fi"
 
 elifBlock
- = "elif" spaceNL+ test:script "then" spaceNL+ body:script
+ = "elif" spaceNL+ test:condition "then" spaceNL+ body:script
 
 condition
- = '[' test:script ']'
+ = test:script
 
 variableAssignment
  = writableVariableName '=' argument
 
 commandName "command name"
  = !redirect !keyword name:(concatenation / '[')
 
+builtinCommandName
+ = '['
+ / '[['
+
 argument "command argument"
  = commandName
  / commandSubstitution
@@ -63,32 +68,37 @@ concatenation
           / doubleQuote
           )+
 
-bareword = cs:barewordChar+
+bareword
+ = cs:barewordChar+
 
 barewordChar
  = '\\' chr:barewordMeta { return chr }
  / !barewordMeta chr:.   { return chr }
 
-barewordMeta = [$"';&<>\n()\[\]*?|` ]
+barewordMeta = [$"';&<>\n()\[*?|` ]
 
-glob = (barewordChar* ('*' / '?' / characterRange / braceExpansion)+ barewordChar*)+
+glob
+ = barewordChar* ('*' / '?' / characterRange / braceExpansion)+ barewordChar*
 
-characterRange =
- $('[' !'-' . '-' !'-' . ']')
+characterRange
+ = $('[' !'-' . '-' !'-' . ']')
 
-braceExpansion =
- (.? !'$') '{' barewordChar+ '}'
+braceExpansion
+ = (.? !'$') '{' barewordChar+ '}'
 
-singleQuote = "'" inner:$([^']*) "'"
+singleQuote
+ = "'" inner:$([^']*) "'"
 
-doubleQuote = '"' contents:(expandsInQuotes / doubleQuoteChar+)* '"'
+doubleQuote
+ = '"' contents:(expandsInQuotes / doubleQuoteChar+)* '"'
 
 doubleQuoteChar
  = '\\' chr:doubleQuoteMeta { return chr }
  / '\\\\'                   { return '\\' }
  / !doubleQuoteMeta chr:.   { return chr }
 
-doubleQuoteMeta = '"' / '$' / '`'
+doubleQuoteMeta
+ = '"' / '$' / '`'
 
 expandsInQuotes
  = backticks
@@ -107,10 +117,10 @@ backticks
  = '`' commands:(!backticks command)+ '`'
 
 subshell
- = '$(' commands:script ')'
+ = '$(' commands:statementList ')'
 
 commandSubstitution
- = rw:[<>] '(' commands:script ')'
+ = rw:[<>] '(' commands:statementList ')'
 
 redirect
  = moveFd / duplicateFd / redirectFd / pipe
@@ -151,7 +161,9 @@ keyword
    / "then"
    / "else"
    / "elif"
-   / "fi" )
+   / "fi"
+   / "[["
+   )
    ( spaceNL+ / EOF )
 
 continuationStart

overrides.js

@@ -49,9 +49,14 @@ exports.initializer = [
         // it's still a concatenation, append it's pieces to ours
         result = result.concat(current.pieces)
       }
-      else if (current.type == 'literal' && prev.type == 'literal') {
-        // merge two literals
+      else if ((current.type == 'literal' || current.type == 'glob')
+               && (prev.type == 'literal' || prev.type == 'glob')) {
+        // globs & literals can be merged
         prev.value += current.value
+        if (prev.type != 'glob' && current.type == 'glob') {
+          // globs are infectious
+          prev.type = 'glob'
+        }
       }
       else {
         result.push(current)
@@ -65,12 +70,20 @@ exports.initializer = [
   }
 ].join('\n')
 
-rules.script = function (first, rest, last) {
+rules.script = function (sections) {
+  var statements = []
+  map(sections, function (section) {
+    statements = statements.concat(section[1])
+  })
+  return statements
+}
+
+rules.statementList = function (first, rest, last) {
   var statements = [first]
   var prev = first
-  map(rest, function (oc, i, cmds) {
-    setOperator(oc[0], prev)
-    statements.push(prev = oc[1])
+  map(rest, function (spaceOpSpaceCmd, i, cmds) {
+    setOperator(spaceOpSpaceCmd[1], prev)
+    statements.push(prev = spaceOpSpaceCmd[3])
   })
   return statements
 
@@ -108,12 +121,13 @@ rules.elifBlock = function (test, body) {
   }
 }
 
-rules.condition = function (test) {
+rules.condition = function bare (test) {
   return test
 }
 
 rules.statement = function (statement, next) {
-  if (next) {
+  if (typeof next !== 'undefined' && next) {
+    next = next[1]
     statement.control = next[0]
     statement.next = next[1]
   } else {
@@ -188,7 +202,7 @@ rules.bareword = function (cs) { return literal(cs) }
 rules.glob = function (cs) {
   return {
     type: 'glob',
-    pattern: text()
+    value: text()
   }
 }