[Jython-checkins] SF.net SVN: jython:[5989] branches/pbcvm/src/org/python/core/PyBytecode. java

[<zy...@us...>]

Revision: 5989
          http://jython.svn.sourceforge.net/jython/?rev=5989&view=rev
Author:   zyasoft
Date:     2009-01-27 02:26:20 +0000 (Tue, 27 Jan 2009)

Log Message:
-----------
Fixed RAISE_VARARGS opcode to raise exceptions properly.

Modified Paths:
--------------
    branches/pbcvm/src/org/python/core/PyBytecode.java

Modified: branches/pbcvm/src/org/python/core/PyBytecode.java
===================================================================
--- branches/pbcvm/src/org/python/core/PyBytecode.java	2009-01-27 02:16:49 UTC (rev 5988)
+++ branches/pbcvm/src/org/python/core/PyBytecode.java	2009-01-27 02:26:20 UTC (rev 5989)
@@ -625,27 +625,22 @@
                                 PyTraceback tb = (PyTraceback) (stack.pop());
                                 PyObject value = stack.pop();
                                 PyObject type = stack.pop();
-                                PyException.doRaise(type, value, tb);
-                                break;
+                                throw PyException.doRaise(type, value, tb);
                             }
                             case 2: {
                                 PyObject value = stack.pop();
                                 PyObject type = stack.pop();
-                                PyException.doRaise(type, value, null);
-                                break;
+                                throw PyException.doRaise(type, value, null);
                             }
                             case 1: {
                                 PyObject type = stack.pop();
-                                PyException.doRaise(type, null, null);
-                                break;
+                                throw PyException.doRaise(type, null, null);
                             }
                             case 0:
-                                PyException.doRaise(null, null, null);
-                                break;
+                                throw PyException.doRaise(null, null, null);
                             default:
                                 throw Py.SystemError("bad RAISE_VARARGS oparg");
                         }
-                        break;
 
                     case Opcode.LOAD_LOCALS:
                         stack.push(f.f_locals);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.