[Python-3000-checkins] r58987 - in python/branches/py3k: Lib/test/test_parser.py Modules/parsermodule.c

[Guido van Rossum]

Sorry. There's one real change:

-                       validate_testlist(CHILD(tree, 3)) &&
+                       validate_arglist(CHILD(tree, 3)) &&

On Nov 15, 2007 11:31 AM, Brett Cannon <brett at python.org> wrote:
> Am I going blind, or is there only whitespace changes to
> parsermodule.c?  If so, is there supposed to be a change there?  Or is
> the test the big deal?
>
> -Brett
>
> On Nov 15, 2007 11:17 AM, guido.van.rossum
>
> <python-3000-checkins at python.org> wrote:
> > Author: guido.van.rossum
> > Date: Thu Nov 15 20:17:28 2007
> > New Revision: 58987
> >
> > Modified:
> >    python/branches/py3k/Lib/test/test_parser.py
> >    python/branches/py3k/Modules/parsermodule.c
> > Log:
> > Patch 1144 by David Binger, fix for parser module. With unittest.
> > (I also cleared out all trailing whitespace in the C file.)
> >
> >
> > Modified: python/branches/py3k/Lib/test/test_parser.py
> > ==============================================================================
> > --- python/branches/py3k/Lib/test/test_parser.py        (original)
> > +++ python/branches/py3k/Lib/test/test_parser.py        Thu Nov 15 20:17:28 2007
> > @@ -136,6 +136,7 @@
> >
> >      def test_class_defs(self):
> >          self.check_suite("class foo():pass")
> > +        self.check_suite("class foo(object):pass")
> >
> >      def test_import_from_statement(self):
> >          self.check_suite("from sys.path import *")
> >
> > Modified: python/branches/py3k/Modules/parsermodule.c
> > ==============================================================================
> > --- python/branches/py3k/Modules/parsermodule.c (original)
> > +++ python/branches/py3k/Modules/parsermodule.c Thu Nov 15 20:17:28 2007
> > @@ -861,7 +861,7 @@
> >  VALIDATER(class);               VALIDATER(node);
> >  VALIDATER(parameters);          VALIDATER(suite);
> >  VALIDATER(testlist);            VALIDATER(varargslist);
> > -VALIDATER(vfpdef);
> > +VALIDATER(vfpdef);
> >  VALIDATER(stmt);                VALIDATER(simple_stmt);
> >  VALIDATER(expr_stmt);           VALIDATER(power);
> >  VALIDATER(del_stmt);
> > @@ -874,7 +874,7 @@
> >  VALIDATER(try);                 VALIDATER(except_clause);
> >  VALIDATER(test);                VALIDATER(and_test);
> >  VALIDATER(not_test);            VALIDATER(comparison);
> > -VALIDATER(comp_op);
> > +VALIDATER(comp_op);
> >  VALIDATER(star_expr);           VALIDATER(expr);
> >  VALIDATER(xor_expr);            VALIDATER(and_expr);
> >  VALIDATER(shift_expr);          VALIDATER(arith_expr);
> > @@ -988,11 +988,11 @@
> >      else {
> >          (void) validate_numnodes(tree, 4, "class");
> >      }
> > -
> > +
> >      if (res) {
> >         if (nch == 7) {
> >                 res = ((validate_lparen(CHILD(tree, 2)) &&
> > -                       validate_testlist(CHILD(tree, 3)) &&
> > +                       validate_arglist(CHILD(tree, 3)) &&
> >                         validate_rparen(CHILD(tree, 4))));
> >         }
> >         else if (nch == 6) {
> > @@ -1177,11 +1177,11 @@
> >             }
> >              while (res && i+1 < nch) { /* validate  (',' vfpdef ['=' test])* */
> >                  res = validate_comma(CHILD(tree, i));
> > -                if (TYPE(CHILD(tree, i+1)) == DOUBLESTAR)
> > +                if (TYPE(CHILD(tree, i+1)) == DOUBLESTAR)
> >                      break;
> >                  res = res && validate_vfpdef(CHILD(tree, i+1));
> >                  if (res && i+2 < nch && TYPE(CHILD(tree, i+2)) == EQUAL) {
> > -                    res = res && (i+3 < nch)
> > +                    res = res && (i+3 < nch)
> >                            && validate_test(CHILD(tree, i+3));
> >                      i += 4;
> >                  }
> > @@ -1234,7 +1234,7 @@
> >      int sym;
> >      node *ch;
> >      int i = 0;
> > -
> > +
> >      if (!res)
> >          return 0;
> >      if (nch < 1) {
> > @@ -1242,7 +1242,7 @@
> >          return 0;
> >      }
> >      while (i < nch) {
> > -        ch = CHILD(tree, i);
> > +        ch = CHILD(tree, i);
> >          sym = TYPE(ch);
> >          if (sym == vfpdef || sym == tfpdef) {
> >              /* validate (vfpdef ['=' test] ',')+ */
> > @@ -1443,7 +1443,7 @@
> >  static int
> >  validate_yield_or_testlist(node *tree)
> >  {
> > -       if (TYPE(tree) == yield_expr)
> > +       if (TYPE(tree) == yield_expr)
> >                 return validate_yield_expr(tree);
> >         else
> >                 return validate_testlist(tree);
> > @@ -1675,7 +1675,7 @@
> >                 && validate_dotted_as_names(CHILD(tree, 1)));
> >  }
> >
> > -/* Helper function to count the number of leading dots in
> > +/* Helper function to count the number of leading dots in
> >   * 'from ...module import name'
> >   */
> >  static int
> > @@ -2361,7 +2361,7 @@
> >  static int
> >  validate_decorators(node *tree)
> >  {
> > -    int i, nch, ok;
> > +    int i, nch, ok;
> >      nch = NCH(tree);
> >      ok = validate_ntype(tree, decorators) && nch >= 1;
> >
> > @@ -2372,7 +2372,7 @@
> >  }
> >
> >  /*  funcdef:
> > - *
> > + *
> >   *     -5   -4         -3  -2    -1
> >   *  'def' NAME parameters ':' suite
> >   */
> > _______________________________________________
> > Python-3000-checkins mailing list
> > Python-3000-checkins at python.org
> > http://mail.python.org/mailman/listinfo/python-3000-checkins
> >
> _______________________________________________
> Python-3000-checkins mailing list
> Python-3000-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-3000-checkins
>



-- 
--Guido van Rossum (home page: http://www.python.org/~guido/)