commit 876b2f286b9af1a69846c84d1229014b2a885c97
author Benjamin Peterson <benjamin@python.org> Sun Jun 28 03:18:59 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Sun Jun 28 03:18:59 2009 +0000
tree 1934d1ce119603a4ae7a0a37c01957a3ca2d17a2
parent d2397753ee3d20579aa60b5e1c037e9e20db7ccb

Merged revisions 72912,72920,72940 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72912 | benjamin.peterson | 2009-05-25 08:13:44 -0500 (Mon, 25 May 2009) | 5 lines

  add a SETUP_WITH opcode

  It speeds up the with statement and correctly looks up the special
  methods involved.
........
  r72920 | benjamin.peterson | 2009-05-25 15:12:57 -0500 (Mon, 25 May 2009) | 1 line

  take into account the fact that SETUP_WITH pushes a finally block
........
  r72940 | benjamin.peterson | 2009-05-26 07:49:59 -0500 (Tue, 26 May 2009) | 1 line

  teach the peepholer about SETUP_WITH
........

Lib/opcode.py

diff --git a/Lib/opcode.py b/Lib/opcode.py
index 86ebc5c5..e8cccc3 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -166,12 +166,14 @@
 def_op('CALL_FUNCTION_VAR', 140)     # #args + (#kwargs << 8)
 def_op('CALL_FUNCTION_KW', 141)      # #args + (#kwargs << 8)
 def_op('CALL_FUNCTION_VAR_KW', 142)  # #args + (#kwargs << 8)
-def_op('EXTENDED_ARG', 143)
-EXTENDED_ARG = 143
+
+jrel_op('SETUP_WITH', 143)
 
 def_op('LIST_APPEND', 145)
 def_op('SET_ADD', 146)
 def_op('MAP_ADD', 147)
 
+def_op('EXTENDED_ARG', 144)
+EXTENDED_ARG = 144
 
 del def_op, name_op, jrel_op, jabs_op