< prev index next >
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java
Print this page
*** 33,64 ****
* The scope is also responsible for handling the var arg 'arguments' object,
* though most of the access is via generated code.
*
* The constructor of this class is responsible for any function prologue
* involving the scope.
- *
- * TODO see NASHORN-715.
*/
! public class FunctionScope extends ScriptObject implements Scope {
/** Area to store scope arguments. (public for access from scripts.) */
public final ScriptObject arguments;
- /** Flag to indicate that a split method issued a return statement */
- private int splitState = -1;
-
/**
* Constructor
*
* @param map property map
* @param callerScope caller scope
* @param arguments arguments
*/
public FunctionScope(final PropertyMap map, final ScriptObject callerScope, final ScriptObject arguments) {
super(callerScope, map);
this.arguments = arguments;
- setIsScope();
}
/**
* Constructor
*
--- 33,58 ----
* The scope is also responsible for handling the var arg 'arguments' object,
* though most of the access is via generated code.
*
* The constructor of this class is responsible for any function prologue
* involving the scope.
*/
! public class FunctionScope extends Scope {
/** Area to store scope arguments. (public for access from scripts.) */
public final ScriptObject arguments;
/**
* Constructor
*
* @param map property map
* @param callerScope caller scope
* @param arguments arguments
*/
public FunctionScope(final PropertyMap map, final ScriptObject callerScope, final ScriptObject arguments) {
super(callerScope, map);
this.arguments = arguments;
}
/**
* Constructor
*
*** 66,76 ****
* @param callerScope caller scope
*/
public FunctionScope(final PropertyMap map, final ScriptObject callerScope) {
super(callerScope, map);
this.arguments = null;
- setIsScope();
}
/**
* Constructor
*
--- 60,69 ----
*** 80,104 ****
*/
public FunctionScope(final PropertyMap map, final long[] primitiveSpill, final Object[] objectSpill) {
super(map, primitiveSpill, objectSpill);
this.arguments = null;
}
-
-
- /**
- * Get the current split state.
- * @return current split state
- */
- @Override
- public int getSplitState() {
- return splitState;
- }
-
- /**
- * Set the current split state.
- * @param state current split state
- */
- @Override
- public void setSplitState(final int state) {
- splitState = state;
- }
}
--- 73,78 ----
< prev index next >