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

fix: re-apply GTA until all global types/constants are defined

Browse Source
This commit is contained in:
Marc Vertes
2020-02-20 12:44:04 +01:00
committed by GitHub
parent 7037424edf
commit 27520f6dae
13 changed files with 130 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
interp/interp.go
View File

@@ -294,7 +294,7 @@ func (interp *Interpreter) main() *node {
func (interp *Interpreter) Eval(src string) (reflect.Value, error) {
var res reflect.Value
// Parse source to AST
// Parse source to AST.
pkgName, root, err := interp.ast(src, interp.Name)
if err != nil || root == nil {
return res, err
@@ -307,16 +307,10 @@ func (interp *Interpreter) Eval(src string) (reflect.Value, error) {
}
}
// Global type analysis
revisit, err := interp.gta(root, pkgName, interp.Name)
if err != nil {
// Perform global types analysis.
if err = interp.gtaRetry([]*node{root}, pkgName, interp.Name); err != nil {
return res, err
}
for _, n := range revisit {
if _, err = interp.gta(n, pkgName, interp.Name); err != nil {
return res, err
}
}
// Annotate AST with CFG infos
initNodes, err := interp.cfg(root, interp.Name)