diff options
Diffstat (limited to 'src/com/craftinginterpreters/lox/LoxFunction.java')
-rw-r--r-- | src/com/craftinginterpreters/lox/LoxFunction.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/craftinginterpreters/lox/LoxFunction.java b/src/com/craftinginterpreters/lox/LoxFunction.java index 371b822..07dd727 100644 --- a/src/com/craftinginterpreters/lox/LoxFunction.java +++ b/src/com/craftinginterpreters/lox/LoxFunction.java @@ -5,8 +5,10 @@ import java.util.List; class LoxFunction implements LoxCallable { private final Stmt.Function declaration; private final Environment closure; + private final boolean isInitializer; - LoxFunction(Stmt.Function declaration, Environment closure) { + LoxFunction(Stmt.Function declaration, Environment closure, boolean isInitializer) { + this.isInitializer = isInitializer; this.closure = closure; this.declaration = declaration; } @@ -14,7 +16,7 @@ class LoxFunction implements LoxCallable { LoxFunction bind(LoxInstance instance) { Environment environment = new Environment(closure); environment.define("this", instance); - return new LoxFunction(declaration, environment); + return new LoxFunction(declaration, environment, isInitializer); } @Override @@ -33,8 +35,13 @@ class LoxFunction implements LoxCallable { try { interpreter.executeBlock(declaration.body, environment); } catch (Return returnValue) { + if (isInitializer) + return closure.getAt(0, "this"); return returnValue.value; } + + if (isInitializer) + return closure.getAt(0, "this"); return null; } |