nocturn9x
/
peon
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Initial work on fixing calling functions assigned to variables

This commit is contained in:
Mattia Giambirtone 2022-10-25 11:17:38 +02:00
parent dc626a90d9
commit b903005504
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/frontend/compiler.nim
View File

@ -825,7 +825,11 @@ proc infer(self: Compiler, node: Expression): Type =
of identExpr:
let resolved = self.resolve(IdentExpr(node.callee))
if not resolved.isNil():
result = resolved.valueType.returnType
case resolved.valueType.kind:
of Function:
result = resolved.valueType.returnType
else:
result = resolved.valueType
else:
result = nil
of lambdaExpr:
@ -1704,8 +1708,23 @@ proc generateCall(self: Compiler, fn: Name, args: seq[Expression], line: int) =
if fn.valueType.isBuiltinFunction:
self.handleBuiltinFunction(fn.valueType, args, line)
return
self.emitByte(LoadUInt64, line)
self.emitBytes(self.chunk.writeConstant(fn.codePos.toLong()), line)
case fn.kind:
of NameKind.Var:
# We're trying to call a function assigned to a variable,
# so we resolve it if it's an identifier (lambdas coming soon!)
case VarDecl(fn.node).value.kind:
of identExpr:
let fn = self.matchImpl(IdentExpr(VarDecl(fn.node).value).token.lexeme, fn.valueType)
self.identifier(IdentExpr(VarDecl(fn.node).value))
else:
discard # TODO
of NameKind.Function:
# Just a regular function declaration: we can load its address
# normally
self.emitByte(LoadUInt64, line)
self.emitBytes(self.chunk.writeConstant(fn.codePos.toLong()), line)
else:
discard
self.emitByte(LoadUInt64, line)
self.emitBytes(self.chunk.writeConstant(0.toLong()), line)
let pos = self.chunk.consts.len() - 8

6
tests/closures.pn
View File

@ -1,6 +1,4 @@
# Tests closures
fn makeClosure(n: int): fn: int {
fn inner: int {
return n;
@ -9,5 +7,5 @@ fn makeClosure(n: int): fn: int {
}
var c = makeClosure(38);
c();
var closure = makeClosure(38);
closure();