fix: calling function throws exception

silverhairs · Aug 29, 2023 · 688dea6 · 688dea6
1 parent ccd19de
commit 688dea6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/glox/interpreter/callable.go b/glox/interpreter/callable.go
@@ -0,0 +1,7 @@
+package interpreter
+
+type Callable interface {
+ Call(i *Interpreter, arguments []any) any
+ Arity() int
+ String() string
+}
diff --git a/glox/interpreter/function.go b/glox/interpreter/function.go
@@ -4,20 +4,17 @@ import (
  "fmt"
  "glox/ast"
  "glox/env"
- "glox/object"
- "glox/token"
 )
 
 type LoxFunction struct {
- object.Callable[*Interpreter]
  declaration *ast.Function
 }
 
 func NewFunction(declaration *ast.Function) *LoxFunction {
  return &LoxFunction{declaration: declaration}
 }
 
-func (fn *LoxFunction) Call(i *Interpreter, args []token.Token) any {
+func (fn *LoxFunction) Call(i *Interpreter, args []any) any {
  env := env.New(i.Env)
  for i, param := range fn.declaration.Params {
  arg := args[i]

diff --git a/glox/interpreter/interpreter.go b/glox/interpreter/interpreter.go
@@ -6,7 +6,6 @@ import (
  "glox/env"
  "glox/exception"
  "glox/native"
- "glox/object"
  "glox/token"
  "io"
  "math"
@@ -338,7 +337,7 @@ func (i *Interpreter) VisitCall(expr *ast.Call) any {
  if err != nil {
  return err
  }
- function, isOk := calle.(object.Callable[*Interpreter])
+ function, isOk := calle.(Callable)
  if !isOk {
  return exception.Runtime(expr.Paren, fmt.Sprintf("'%v' cannot be called.", expr.Callee.String()))
  } else if function.Arity() != len(args) {

diff --git a/glox/object/object.go b/glox/object/object.go