Issue #13629: Renumber the tokens in token.h to match the _PyParser_TokenNames indexes.

diff --cc Misc/NEWS
index 1afe584bd996a285f28fd30626e257410f8f3a06,c061809ea04a706c2e9a1e86c41626d908df47ee..eb54b87718ea8521cf224c1e776149db592d8fa4
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,37 -10,9 +10,40 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #13629: Renumber the tokens in token.h so that they match the indexes
+   into _PyParser_TokenNames.
+ 
 +- Issue #13752: Add a casefold() method to str.
 +
 +- Issue #13761: Add a "flush" keyword argument to the print() function,
 +  used to ensure flushing the output stream.
 +
 +- Issue #13645: pyc files now contain the size of the corresponding source
 +  code, to avoid timestamp collisions (especially on filesystems with a low
 +  timestamp resolution) when checking for freshness of the bytecode.
 +
 +- PEP 380, Issue #11682: Add "yield from <x>" to support easy delegation to
 +  subgenerators (initial patch by Greg Ewing, integration into 3.3 by
 +  Renaud Blanch, Ryan Kelly, Zbigniew Jędrzejewski-Szmek and Nick Coghlan)
 +
 +- Issue #13748: Raw bytes literals can now be written with the ``rb`` prefix
 +  as well as ``br``.
 +
 +- Issue #12736: Use full unicode case mappings for upper, lower, and title case.
 +
 +- Issue #12760: Add a create mode to open(). Patch by David Townshend.
 +
 +- Issue #13738: Simplify implementation of bytes.lower() and bytes.upper().
 +
 +- Issue #13577: Built-in methods and functions now have a __qualname__.
 +  Patch by sbt.
 +
 +- Issue #6695: Full garbage collection runs now clear the freelist of set
 +  objects.  Initial patch by Matthias Troffaes.
 +
 +- Fix OSError.__init__ and OSError.__new__ so that each of them can be
 +  overriden and take additional arguments (followup to issue #12555).
 +
  - Fix the fix for issue #12149: it was incorrect, although it had the side
    effect of appearing to resolve the issue.  Thanks to Mark Shannon for
    noticing.

diff --cc Python/graminit.c
Simple merge