Globs

Author: grncdr

grammar.pegjs

@@ -5,7 +5,11 @@ script "one or more statements separated by control operators"
    spaceNL*
 
 statement
- = statement:(command / conditionalLoop / ifBlock) space* next:chainedStatement?
+ = statement:( command
+             / conditionalLoop
+             / ifBlock
+             )
+   space* next:chainedStatement?
 
 chainedStatement
  = operator:('&&' / '||') spaceNL* statement:statement
@@ -35,18 +39,22 @@ ifBlock
 elifBlock
  = "elif" spaceNL+ test:script "then" spaceNL+ body:script
 
+condition
+ = '[' test:script ']'
+
 variableAssignment
  = writableVariableName '=' argument
 
 commandName "command name"
- = !redirect !keyword name:concatenation
+ = !redirect !keyword name:(concatenation / '[')
 
 argument "command argument"
  = commandName
  / commandSubstitution
 
 concatenation
- = pieces:( bareword
+ = pieces:( glob
+          / bareword
           / environmentVariable
           / variableSubstitution
           / subshell
@@ -63,6 +71,14 @@ barewordChar
 
 barewordMeta = [$"';&<>\n()\[\]*?|` ]
 
+glob = (barewordChar* ('*' / '?' / characterRange / braceExpansion)+ barewordChar*)+
+
+characterRange =
+ $('[' !'-' . '-' !'-' . ']')
+
+braceExpansion =
+ (.? !'$') '{' barewordChar+ '}'
+
 singleQuote = "'" inner:$([^']*) "'"
 
 doubleQuote = '"' contents:(expandsInQuotes / doubleQuoteChar+)* '"'

overrides.js

@@ -108,6 +108,10 @@ rules.elifBlock = function (test, body) {
   }
 }
 
+rules.condition = function (test) {
+  return test
+}
+
 rules.statement = function (statement, next) {
   if (next) {
     statement.control = next[0]
@@ -181,6 +185,13 @@ rules.writableVariableName = function () { return text() }
 
 rules.bareword = function (cs) { return literal(cs) }
 
+rules.glob = function (cs) {
+  return {
+    type: 'glob',
+    pattern: text()
+  }
+}
+
 rules.escapedMetaChar = function (character) { return character }
 
 rules.concatenation = function (pieces) {