[word_eval] Fix the ${!prefix@} failure for the second time (#657)

osh/word_eval.py

@@ -914,6 +914,7 @@ def _EvalBracedVarSub(self, part, part_vals, quoted):
           e_die("Array %r can't be referred to as a scalar (without @ or *)",
                 var_name, part=part)
 
+    suffix_processed = False
     if part.prefix_op:
       val = self._EmptyStrOrError(val)  # maybe error
 
@@ -928,7 +929,7 @@ def _EvalBracedVarSub(self, part, part_vals, quoted):
         # "${!prefix@}" is the only one that doesn't decay
         maybe_decay_array = not (quoted and suffix_op.op_id == Id.VOp3_At)
 
-        part.suffix_op = None  # don't process it later
+        suffix_processed = True
       else:
         # could be
         # - ${!ref-default}
@@ -939,7 +940,7 @@ def _EvalBracedVarSub(self, part, part_vals, quoted):
         # NOTE: The length operator followed by a suffix operator is a SYNTAX
         # error.
 
-    if part.suffix_op:
+    if part.suffix_op and not suffix_processed:
       op = part.suffix_op
       UP_op = op
       with tagswitch(op) as case:

spec/var-op-bash.test.sh

@@ -62,10 +62,21 @@ argv.py ${!Z*}
 argv.py ${!Z@}
 argv.py "${!Z*}"
 argv.py "${!Z@}"
+for i in 1 2; do argv.py ${!Z*}  ; done
+for i in 1 2; do argv.py ${!Z@}  ; done
+for i in 1 2; do argv.py "${!Z*}"; done
+for i in 1 2; do argv.py "${!Z@}"; done
 ## STDOUT:
 ['Z', 'ZIP', 'ZOO', 'ZOOM']
 ['Z', 'ZIP', 'ZOO', 'ZOOM']
 ['Z ZIP ZOO ZOOM']
 ['Z', 'ZIP', 'ZOO', 'ZOOM']
+['Z', 'ZIP', 'ZOO', 'ZOOM']
+['Z', 'ZIP', 'ZOO', 'ZOOM']
+['Z', 'ZIP', 'ZOO', 'ZOOM']
+['Z', 'ZIP', 'ZOO', 'ZOOM']
+['Z ZIP ZOO ZOOM']
+['Z ZIP ZOO ZOOM']
+['Z', 'ZIP', 'ZOO', 'ZOOM']
+['Z', 'ZIP', 'ZOO', 'ZOOM']
 ## END
-