[Python-checkins] r43110 - in python/branches/p3yk: Doc/lib/libdis.tex Include/opcode.h Lib/compiler/pycodegen.py Lib/opcode.py Python/compile.c

[neal.norwitz]

Author: neal.norwitz
Date: Fri Mar 17 09:59:09 2006
New Revision: 43110

Modified:
   python/branches/p3yk/Doc/lib/libdis.tex
   python/branches/p3yk/Include/opcode.h
   python/branches/p3yk/Lib/compiler/pycodegen.py
   python/branches/p3yk/Lib/opcode.py
   python/branches/p3yk/Python/compile.c
Log:
INPLACE_DIVIDE is no longer necessary (INPLACE_TRUE_DIVIDE is used).

Modified: python/branches/p3yk/Doc/lib/libdis.tex
==============================================================================
--- python/branches/p3yk/Doc/lib/libdis.tex	(original)
+++ python/branches/p3yk/Doc/lib/libdis.tex	Fri Mar 17 09:59:09 2006
@@ -247,11 +247,6 @@
 Implements in-place \code{TOS = TOS1 * TOS}.
 \end{opcodedesc}
 
-\begin{opcodedesc}{INPLACE_DIVIDE}{}
-Implements in-place \code{TOS = TOS1 / TOS} when
-\code{from __future__ import division} is not in effect.
-\end{opcodedesc}
-
 \begin{opcodedesc}{INPLACE_FLOOR_DIVIDE}{}
 Implements in-place \code{TOS = TOS1 // TOS}.
 \end{opcodedesc}

Modified: python/branches/p3yk/Include/opcode.h
==============================================================================
--- python/branches/p3yk/Include/opcode.h	(original)
+++ python/branches/p3yk/Include/opcode.h	Fri Mar 17 09:59:09 2006
@@ -48,7 +48,7 @@
 #define INPLACE_ADD	55
 #define INPLACE_SUBTRACT	56
 #define INPLACE_MULTIPLY	57
-#define INPLACE_DIVIDE	58
+
 #define INPLACE_MODULO	59
 #define STORE_SUBSCR	60
 #define DELETE_SUBSCR	61

Modified: python/branches/p3yk/Lib/compiler/pycodegen.py
==============================================================================
--- python/branches/p3yk/Lib/compiler/pycodegen.py	(original)
+++ python/branches/p3yk/Lib/compiler/pycodegen.py	Fri Mar 17 09:59:09 2006
@@ -999,7 +999,7 @@
         '+=' : 'INPLACE_ADD',
         '-=' : 'INPLACE_SUBTRACT',
         '*=' : 'INPLACE_MULTIPLY',
-        '/=' : 'INPLACE_DIVIDE',
+        '/=' : 'INPLACE_TRUE_DIVIDE',
         '//=': 'INPLACE_FLOOR_DIVIDE',
         '%=' : 'INPLACE_MODULO',
         '**=': 'INPLACE_POWER',

Modified: python/branches/p3yk/Lib/opcode.py
==============================================================================
--- python/branches/p3yk/Lib/opcode.py	(original)
+++ python/branches/p3yk/Lib/opcode.py	Fri Mar 17 09:59:09 2006
@@ -88,7 +88,7 @@
 def_op('INPLACE_ADD', 55)
 def_op('INPLACE_SUBTRACT', 56)
 def_op('INPLACE_MULTIPLY', 57)
-def_op('INPLACE_DIVIDE', 58)
+
 def_op('INPLACE_MODULO', 59)
 def_op('STORE_SUBSCR', 60)
 def_op('DELETE_SUBSCR', 61)

Modified: python/branches/p3yk/Python/compile.c
==============================================================================
--- python/branches/p3yk/Python/compile.c	(original)
+++ python/branches/p3yk/Python/compile.c	Fri Mar 17 09:59:09 2006
@@ -1338,7 +1338,6 @@
 		case INPLACE_ADD:
 		case INPLACE_SUBTRACT:
 		case INPLACE_MULTIPLY:
-		case INPLACE_DIVIDE:
 		case INPLACE_MODULO:
 			return -1;
 		case STORE_SUBSCR: