3.4-3.5 MAKE_CLOSURE with annotate

Docs lie about annnotation args. Slight adjustment here.
More is probably needed.

Author: rocky

uncompyle6/parser.py

@@ -199,7 +199,7 @@ def error(self, instructions, index):
             if instructions[finish].linestart:
                 break
             pass
-        if start > 0:
+        if start >= 0:
             err_token = instructions[index]
             print("Instruction context:")
             for i in range(start, finish):

uncompyle6/scanners/scanner3.py

@@ -626,10 +626,19 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None
                     pos_args, name_pair_args, annotate_args = parse_fn_counts(
                         inst.argval
                     )
+
+                    correct_annotate_args = annotate_args
+                    if opname == "MAKE_CLOSURE" and ((3, 4) <= self.version < (3, 6)) and annotate_args > 0:
+                        # For some reason that I don't understand annotate_args is off by one
+                        # here from what is documented in
+                        # https://docs.python.org/3.4/library/dis.html#opcode-MAKE_CLOSURE
+                        # However in parsing rule, we have already adjusted for the one-fewer annotate arg
+                        correct_annotate_args -= 1
+
                     pattr = "%d positional, %d keyword only, %d annotated" % (
                         pos_args,
                         name_pair_args,
-                        annotate_args,
+                        correct_annotate_args,
                     )
                     if name_pair_args > 0:
                         # FIXME: this should probably be K_