mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix bug 56185.

This commit is contained in:
nboyd%atg.com 2000-10-12 16:10:55 +00:00
Родитель dbbc5437de
Коммит 024a61b8eb
2 изменённых файлов: 20 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
js/rhino/org/mozilla/javascript/Interpreter.java
Просмотреть файл

@ -493,8 +493,7 @@ public class Interpreter extends LabelTable {
*/
Node target = (Node)(node.getProp(Node.TARGET_PROP));
target.putProp(Node.FINALLY_PROP, node);
iCodeTop = addGoto(node, TokenStream.GOSUB,
iCodeTop);
iCodeTop = addGoto(node, TokenStream.GOSUB, iCodeTop);
}
break;
@ -848,20 +847,25 @@ public class Interpreter extends LabelTable {
exception object.
*/
while (child != null) {
if (lastChild == catchTarget) {
if (catchTarget != null && lastChild == catchTarget) {
itsStackDepth = 1;
if (itsStackDepth > itsData.itsMaxStack)
itsData.itsMaxStack = itsStackDepth;
}
/*
When the following child is the catchTarget,
When the following child is the catchTarget
(or the finallyTarget if there are no catches),
the current child is the goto at the end of
the try statemets, we need to emit the endtry
before that goto.
*/
if (child.getNextSibling() == catchTarget)
Node nextSibling = child.getNextSibling();
if (nextSibling == catchTarget ||
nextSibling == finallyTarget)
{
iCodeTop = addByte((byte) TokenStream.ENDTRY,
iCodeTop);
iCodeTop);
}
iCodeTop = generateICode(child, iCodeTop);
lastChild = child;
child = child.getNextSibling();

16
js/rhino/src/org/mozilla/javascript/Interpreter.java
Просмотреть файл

@ -493,8 +493,7 @@ public class Interpreter extends LabelTable {
*/
Node target = (Node)(node.getProp(Node.TARGET_PROP));
target.putProp(Node.FINALLY_PROP, node);
iCodeTop = addGoto(node, TokenStream.GOSUB,
iCodeTop);
iCodeTop = addGoto(node, TokenStream.GOSUB, iCodeTop);
}
break;
@ -848,20 +847,25 @@ public class Interpreter extends LabelTable {
exception object.
*/
while (child != null) {
if (lastChild == catchTarget) {
if (catchTarget != null && lastChild == catchTarget) {
itsStackDepth = 1;
if (itsStackDepth > itsData.itsMaxStack)
itsData.itsMaxStack = itsStackDepth;
}
/*
When the following child is the catchTarget,
When the following child is the catchTarget
(or the finallyTarget if there are no catches),
the current child is the goto at the end of
the try statemets, we need to emit the endtry
before that goto.
*/
if (child.getNextSibling() == catchTarget)
Node nextSibling = child.getNextSibling();
if (nextSibling == catchTarget ||
nextSibling == finallyTarget)
{
iCodeTop = addByte((byte) TokenStream.ENDTRY,
iCodeTop);
iCodeTop);
}
iCodeTop = generateICode(child, iCodeTop);
lastChild = child;
child = child.getNextSibling();