Allow whitespaces before PrimaryExpressions.

Fix a pathological case where the elements of a PrimaryExpression
are separated by whitespaces. For instance, having a newline
after the dot of InvocationExpression is valid.

Author: Claudiu Popa

TODO

@@ -1,11 +1,6 @@
 * The Command grammar can't parse the string "New-Object 'int[,]' 3,2"
 * Pathological case for Command grammar for the string "New-Object -ArgumentList 3,2 -TypeName 'int[,]'"
 
-* Pathological case for SwitchCondition
-
-($PSBoundParameters.GetEnumerator().
- Where({$_.Value -eq $true}).Key)
-
 * Pathological case for the following:
 
 for ($i = 1; $i -le 10; ++$i) { "$i $($i*$i)" }

tests/test_grammar.py

@@ -1571,9 +1571,8 @@ def test_switch_condition(self):
             '-file C:\\obito',
             '-file $ps1',
 
-            # TODO: other pathological case
-            # '($PSBoundParameters.GetEnumerator().\n'
-            # 'Where({$_.Value -eq $true}).Key)',
+            '($PSBoundParameters.GetEnumerator().\n'
+            'Where({$_.Value -eq $true}).Key)',
         ]
         self._test_expected(SwitchCondition, parts)
 

wispy/grammar.py

@@ -699,7 +699,7 @@ class ArgumentList(Grammar):
 
 
 class InvocationExpressionPrime(Grammar):
-    grammar = (OR(".", "::"), MemberName,
+    grammar = (OR(".", "::"), OPTIONAL(WHITESPACE), MemberName,
                ArgumentList, OPTIONAL(REF("InvocationExpressionPrime")))
 
 
@@ -793,18 +793,18 @@ class Value(Grammar):
 
 
 class PrimaryExpressionPrime(Grammar):
-    grammar = OR(MemberAccessPrime,
+    grammar = OR(InvocationExpressionPrime,
+                 MemberAccessPrime,
                  ElementAccessPrime,
-                 InvocationExpressionPrime,
                  PostIncrementExpressionPrime,
                  PostDecrementExpressionPrime)
 
 
 class PrimaryExpression(Grammar):
+    pe = (OPTIONAL(WHITESPACE), REPEAT(PrimaryExpressionPrime))
     grammar = (
         Value,
-        OPTIONAL(OR(REPEAT(PrimaryExpressionPrime),
-                    REF('PrimaryExpression'))),
+        OPTIONAL(OR(REPEAT(pe), REF('PrimaryExpression')))
     )