Respond to review feedback

Author: ddfisher

ast27/Python/ast.c

@@ -765,6 +765,12 @@ ast_for_arguments(struct compiling *c, const node *n)
     defaults = (n_defaults ? asdl_seq_new(n_defaults, c->c_arena) : NULL);
     if (!defaults && n_defaults)
         return NULL;
+    /* type_comments will be lazily initialized if needed.  If there are no
+       per-argument type comments, it will remain NULL.  Otherwise, it will be
+       an asdl_seq with length equal to the number of args (including varargs
+       and kwargs, if present) and with members set to the string of each arg's
+       type comment, if present, or NULL otherwise.
+     */
 
     /* fpdef: NAME | '(' fplist ')'
        fplist: fpdef (',' fpdef)* [',']
@@ -839,7 +845,9 @@ ast_for_arguments(struct compiling *c, const node *n)
                     asdl_seq_SET(args, k++, name);
 
                 }
-                i += 1 + (TYPE(CHILD(n, i + 1)) == COMMA); /* the name and the comma, if present */
+                i += 1; /* the name */
+                if (TYPE(CHILD(n, i + 1)) == COMMA)
+                    i += 1; /* the comma, if present */
                 if (parenthesized && Py_Py3kWarningFlag &&
                     !ast_warn(c, ch, "parenthesized argument names "
                               "are invalid in 3.x"))
@@ -853,15 +861,19 @@ ast_for_arguments(struct compiling *c, const node *n)
                 vararg = NEW_IDENTIFIER(CHILD(n, i+1));
                 if (!vararg)
                     return NULL;
-                i += 2 + (TYPE(CHILD(n, i + 2)) == COMMA);
+                i += 2; /* the star and the name */
+                if (TYPE(CHILD(n, i + 2)) == COMMA)
+                    i += 1; /* the comma, if present */
                 break;
             case DOUBLESTAR:
                 if (!forbidden_check(c, CHILD(n, i+1), STR(CHILD(n, i+1))))
                     return NULL;
                 kwarg = NEW_IDENTIFIER(CHILD(n, i+1));
                 if (!kwarg)
                     return NULL;
-                i += 2 + (TYPE(CHILD(n, i + 2)) == COMMA);
+                i += 2; /* the double star and the name */
+                if (TYPE(CHILD(n, i + 2)) == COMMA)
+                    i += 1; /* the comma, if present */
                 break;
             case TYPE_COMMENT:
                 assert(l < k + !!vararg + !!kwarg);

ast35/Python/ast.c

@@ -1320,16 +1320,18 @@ handle_keywordonly_args(struct compiling *c, const node *n, int start,
                 if (!arg)
                     goto error;
                 asdl_seq_SET(kwonlyargs, j++, arg);
-                i += 1 + (TYPE(CHILD(n, i + 1)) == COMMA); /* the name and the comma, if present */
+                i += 1; /* the name */
+                if (TYPE(CHILD(n, i + 1)) == COMMA)
+                    i += 1; /* the comma, if present */
                 break;
-            case DOUBLESTAR:
-                return i;
             case TYPE_COMMENT:
                 /* arg will be equal to the last argument processed */
                 if (!set_arg_comment_annotation(c, arg, ch))
                     return -1;
                 i += 1;
                 break;
+            case DOUBLESTAR:
+                return i;
             default:
                 ast_error(c, ch, "unexpected node");
                 goto error;
@@ -1457,10 +1459,12 @@ ast_for_arguments(struct compiling *c, const node *n)
                 if (!arg)
                     return NULL;
                 asdl_seq_SET(posargs, k++, arg);
-                i += 1 + (TYPE(CHILD(n, i + 1)) == COMMA); /* the name and the comma, if present */
+                i += 1; /* the name */
+                if (TYPE(CHILD(n, i + 1)) == COMMA)
+                    i += 1; /* the comma, if present */
                 break;
             case STAR:
-                if (i+1 >= NCH(n)) {
+                if (i+1 >= NCH(n) || TYPE(CHILD(n, i+1)) == TYPE_COMMENT) {
                     ast_error(c, CHILD(n, i),
                         "named arguments must follow bare *");
                     return NULL;
@@ -1486,7 +1490,9 @@ ast_for_arguments(struct compiling *c, const node *n)
                     if (!vararg)
                         return NULL;
 
-                    i += 2 + (TYPE(CHILD(n, i + 2)) == COMMA);
+                i += 2; /* the star and the name */
+                if (TYPE(CHILD(n, i + 2)) == COMMA)
+                    i += 1; /* the comma, if present */
 
                     if (TYPE(CHILD(n, i)) == TYPE_COMMENT) {
                         if (!set_arg_comment_annotation(c, vararg, CHILD(n, i)))
@@ -1511,7 +1517,9 @@ ast_for_arguments(struct compiling *c, const node *n)
                 kwarg = ast_for_arg(c, ch);
                 if (!kwarg)
                     return NULL;
-                i += 2 + (TYPE(CHILD(n, i + 2)) == COMMA);
+                i += 2; /* the double star and the name */
+                if (TYPE(CHILD(n, i + 2)) == COMMA)
+                    i += 1; /* the comma, if present */
                 break;
             case TYPE_COMMENT:
                 assert(i);

typed_ast/ast35.py

@@ -10,13 +10,16 @@
     that `ast35` provides PEP 484 type comment information as part of the
     AST.
 
-    In particular, the `FunctionDef`, `Assign`, `For`, and `With` classes all
-    have a `type_comment` field which contains a `str` with the text of the
-    type comment.  Per-argument function comments are put into the annotation
-    field of each argument.  `parse` has been augmented so it can parse
-    function signature types when called with `mode=func_type`.  Finally,
-    `Module` has a `type_ignores` field which contains a list of lines which
-    have been `# type: ignored`.
+    In particular:
+    - The `FunctionDef`, `Assign`, `For`, and `With` classes all have a
+      `type_comment` field which contains a `str` with the text of the type
+      comment.
+    - Per-argument function comments are put into the annotation field of each
+      argument.
+    - `parse` has been augmented so it can parse function signature types when
+      called with `mode=func_type`.
+    - `Module` has a `type_ignores` field which contains a list of
+      lines which have been `# type: ignored`.
 
     An abstract syntax tree can be generated by using the `parse()`
     function from this module.  The result will be a tree of objects whose

typed_ast/conversions.py

@@ -196,7 +196,7 @@ def get_type_comment(i):
         kwarg = None
         if n.kwarg is not None:
             kwarg = ast35.arg(n.kwarg,
-                              get_type_comment(len(args) + 1 + (1 if n.vararg is not None else 0)),
+                              get_type_comment(len(args) + 1 + (0 if n.vararg is None else 1)),
                               lineno=-1, col_offset=-1)
 
         defaults = self.visit(n.defaults)