mleku/moxa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling of var containing function definitions

Browse Source
This commit is contained in:
Marc Vertes
2018-07-09 13:30:54 +02:00
parent 0a6954caac
commit 515f8d6736
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_test/server3.go
View File

@@ -4,9 +4,9 @@ import (
"net/http"
)
//func myHandler(w http.ResponseWriter, r *http.Request) { w.Write([]byte("hello world")) }
//var myHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("hello world")) })
//var myHandler = func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("hello world")) }
func myHandler(w http.ResponseWriter, r *http.Request) { w.Write([]byte("hello world")) }
var myHandler = func(w http.ResponseWriter, r *http.Request) { w.Write([]byte("hello world")) }
func main() {
http.HandleFunc("/", myHandler)

8
interp/cfg.go
View File

@@ -187,11 +187,17 @@ func (interp *Interpreter) Cfg(root *Node, sdef *NodeMap) []*Node {
if n.kind == Define || n.anc.kind == VarDecl {
// Force definition of assigned ident in current scope
frameIndex.max++
scope.sym[n.child[0].ident] = &Symbol{index: frameIndex.max}
name := n.child[0].ident
scope.sym[name] = &Symbol{index: frameIndex.max}
n.child[0].findex = frameIndex.max
n.child[0].typ = n.child[1].typ
if n.child[0].typ.cat == FuncT {
scope.sym[name].index = -1
scope.sym[name].node = n.child[1]
}
}
n.findex = n.child[0].findex
n.val = n.child[0].val
// Propagate type
// TODO: Check that existing destination type matches source type
n.typ = n.child[0].typ