Add parse error for [[ -f < ]].

Unrelated:

- Remove unnecessary code in osh2oil.
- Minor cleanups of imports

bin/oil.py

@@ -381,10 +381,7 @@ def OshCommandMain(argv):
   # stderr: show how we're following imports?
 
   if action == 'translate':
-    # TODO: FIx this invocation up.
-    #debug_spans = opt.debug_spans
-    debug_spans = False
-    osh2oil.PrintAsOil(arena, node, debug_spans)
+    osh2oil.PrintAsOil(arena, node)
 
   elif action == 'arena':  # for debugging
     osh2oil.PrintArena(arena)

core/args.py

@@ -51,7 +51,6 @@
 
 - NOTE: GNU getopt has fuzzy matching for long flags.  I think we should rely
   on good completion instead.
-
 """
 
 from core import util

core/builtin.py

@@ -27,6 +27,7 @@
 """
 
 import os
+import signal
 import sys
 
 from core import args
@@ -1034,9 +1035,6 @@ def UnAlias(argv, aliases):
   return status
 
 
-import signal
-
-
 def _SigIntHandler(unused, unused_frame):
   """
   Either this handler is installed, or the user's handler is installed.

core/glob_.py

@@ -260,8 +260,6 @@ def GlobToERE(pat):
     return None, warnings
 
   if 0:
-    #import sys
-    #from asdl import format as fmt
     print('---')
     for p in parts:
       print(p)

osh/bool_parse.py

@@ -39,6 +39,7 @@
 except ImportError:
   from benchmarks import fake_libc as libc
 
+word_e = ast.word_e
 lex_mode_e = types.lex_mode_e
 log = util.log
 p_die = util.p_die
@@ -184,6 +185,9 @@ def ParseFactor(self):
       op = self.op_id
       self._Next()
       w = self.cur_word
+      # e.g. [[ -f < ]].  But [[ -f '<' ]] is OK
+      if w.tag not in (word_e.CompoundWord, word_e.StringWord):
+        p_die('Invalid argument to unary operator', word=w)
       self._Next()
       node = ast.BoolUnary(op, w)
       return node

osh/lex.py

@@ -100,11 +100,9 @@
   Op_LBracket Op_RBracketEqual
 """
 
-from osh.meta import Id, Kind, ID_SPEC
+from osh.meta import types, Id, Kind, ID_SPEC
 from core.lexer import C, R
 
-from osh.meta import types
-
 lex_mode_e = types.lex_mode_e
 
 

scripts/count.sh

@@ -194,6 +194,10 @@ imports() {
   oil-osh-files | xargs grep --no-filename -w import | hist
 }
 
+imports-not-at-top() {
+  oil-osh-files | xargs grep -n -w import | awk -F : ' $2 > 100'
+}
+
 # For the compiler, see what's at the top level.
 top-level() {
   grep '^[a-zA-Z]' {core,osh}/*.py \
@@ -245,4 +249,9 @@ pickle-bytecodes() {
   #show-pickle _devbuild/*_asdl.pickle 
 }
 
+# Some of these are "abstract classes" like ChildStateChange
+NotImplementedError() {
+  grep NotImplementedError */*.py
+}
+
 "$@"

spec/dbracket.test.sh

@@ -168,7 +168,7 @@ FOO=bar [[ foo == foo ]]
 ## stdout-json: "false\nfalse\n"
 
 #### Argument that looks like a real operator
-[[ -f < ]]
+[[ -f < ]] && echo 'should be parse error'
 ## status: 2
 ## OK mksh status: 1
 
@@ -205,7 +205,10 @@ false
 [[ 1+2 -eq 3 ]] && echo true
 expr='1+2'
 [[ $expr -eq 3 ]] && echo true  # must be dynamically parsed
-## stdout-json: "true\ntrue\n"
+## STDOUT:
+true
+true
+## END
 
 #### -eq coercion produces weird results
 [[ '' -eq 0 ]] && echo true

test/spec.sh

@@ -528,7 +528,7 @@ assoc-zsh() {
 # NOTE: zsh passes about half and fails about half.  It supports a subset of [[
 # I guess.
 dbracket() {
-  sh-spec spec/dbracket.test.sh --osh-failures-allowed 2 \
+  sh-spec spec/dbracket.test.sh --osh-failures-allowed 1 \
     $BASH $MKSH $OSH_LIST "$@"
   #sh-spec spec/dbracket.test.sh $BASH $MKSH $OSH_LIST $ZSH "$@"
 }

tools/osh2oil.py

@@ -82,20 +82,7 @@ def PrintSpans(arena):
   print('(%d spans)' % len(arena.spans), file=sys.stderr)
 
 
-def PrintAsOil(arena, node, debug_spans):
-  if len(arena.spans) == 1:  # Special case for line_id == -1
-    # Nothing to print; would crash otherwise.
-    return
-
-  #print node
-  #print(spans)
-  if debug_spans:
-    for i, span in enumerate(arena.spans):
-      line = arena.GetLine(span.line_id)
-      piece = line[span.col : span.col + span.length]
-      print('%5d %r' % (i, piece), file=sys.stderr)
-    print('(%d spans)' % len(arena.spans), file=sys.stderr)
-
+def PrintAsOil(arena, node):
   cursor = Cursor(arena, sys.stdout)
   fixer = OilPrinter(cursor, arena, sys.stdout)
   fixer.DoCommand(node, None, at_top_level=True)  # no local symbols yet