[osh] Introduce word_.PieceOperator()

Also change from PieceOperator -> PieceQuoted for brace digit expansion

The usage

    Piece('3', quoted=False, do_split=False)

is the same as

    Piece('3', quoted=True, do_split=False)

That's because '3' isn't a metacharacter, so it won't be glob-escaped.

[soil] Ignore IOError that happens because of race condition

Author: Andy C

osh/word_.py

@@ -36,9 +36,22 @@ def PieceQuoted(s):
     For 'hi' "$x" 
     and $[myexpr] in YSH
     """
+    # quoted=True, do_split=False
     return Piece(s, True, False)
 
 
+def PieceOperator(s):
+    # type: (str) -> Piece
+    """
+    For Extended glob  @(--verbose|help)
+    And BashRegexGroup [[ foo =~ x(a b)y ]
+
+    We don't want ( to become \(, so quoted=False
+    """
+    # quoted=False, do_split=False
+    return Piece(s, False, False)
+
+
 def LiteralId(part):
     # type: (word_part_t) -> Id_t
     """If the WordPart consists of a single literal token, return its Id.

osh/word_eval.py

@@ -1781,16 +1781,14 @@ def _EvalExtGlob(self, part, part_vals):
             op_str = '@('
         else:
             op_str = lexer.LazyStr(op)
-        # Do NOT split these.
-        # TODO: should be PieceQuoted
-        part_vals.append(Piece(op_str, False, False))
+        part_vals.append(word_.PieceOperator(op_str))
 
         for i, w in enumerate(part.arms):
             if i != 0:
-                part_vals.append(Piece('|', False, False))  # separator
+                part_vals.append(word_.PieceOperator('|'))  # separator
             # FLATTEN the tree of extglob "arms".
             self._EvalWordToParts(w, part_vals, EXTGLOB_NESTED)
-        part_vals.append(Piece(')', False, False))  # closing )
+        part_vals.append(word_.PieceOperator(')'))  # closing )
 
     def _TranslateExtGlob(self, part_vals, w, glob_parts, fnmatch_parts):
         # type: (List[part_value_t], CompoundWord, List[str], List[str]) -> None
@@ -1857,9 +1855,8 @@ def _EvalWordPart(self, part, part_vals, flags):
 
             elif case(word_part_e.BracedRangeDigit):
                 part = cast(word_part.BracedRangeDigit, UP_part)
-                # This is the '5' in {1..10} - whether it's quoted should not
-                # matter - it doesn't look like a glob
-                v = Piece(part.s, False, False)
+                # This is the '5' in {1..10}
+                v = word_.PieceQuoted(part.s)
                 part_vals.append(v)
 
             elif case(word_part_e.EscapedLiteral):
@@ -1928,10 +1925,10 @@ def _EvalWordPart(self, part, part_vals, flags):
             elif case(word_part_e.BashRegexGroup):
                 part = cast(word_part.BashRegexGroup, UP_part)
 
-                part_vals.append(Piece('(', False, False))  # not quoted
+                part_vals.append(word_.PieceOperator('('))
                 if part.child:
                     self._EvalWordToParts(part.child, part_vals, 0)
-                part_vals.append(Piece(')', False, False))
+                part_vals.append(word_.PieceOperator(')'))
 
             elif case(word_part_e.Splice):
                 part = cast(word_part.Splice, UP_part)

osh/word_parse.py

@@ -1016,7 +1016,7 @@ def _ReadBashRegexGroup(self):
         # type: () -> word_part.BashRegexGroup
         """
         Grammar:
-        BashRegexGroup = '(' WORD? ')
+          BashRegexGroup = '(' WORD? ')
         """
         left_token = self.cur_token
         assert left_token.id == Id.BashRegex_LParen, left_token

soil/web.py

@@ -211,8 +211,13 @@ def ParseJobs(stdin):
     #if i % 20 == 0:
     #  log('job %d = %s', i, json_path)
 
-    with open(json_path) as f:
-      meta = json.load(f)
+    try:
+      with open(json_path) as f:
+        meta = json.load(f)
+    except IOError as e:
+      # We do concurrent deletions, and we can't rely on sorting beforehand
+      log('Ignoring file that was probably deleted %s: %s', json_path, e)
+      continue
     #print(meta)
 
     tsv_path = json_path[:-5] + '.tsv'