eval: record correct source contexts in call stack

Also handle calls to C functions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

4 files changed, 9 insertions, 9 deletions

diff --git a/lib/fs.c b/lib/fs.c
index 9e15111..f8888c5 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -726,10 +726,10 @@ void ut_module_init(const struct ut_ops *ut, struct ut_state *s, struct json_obj
 	file_proto = ops->new_object(NULL);
 	dir_proto = ops->new_object(NULL);
 
-	register_functions(ops, global_fns, scope);
-	register_functions(ops, proc_fns, proc_proto);
-	register_functions(ops, file_fns, file_proto);
-	register_functions(ops, dir_fns, dir_proto);
+	register_functions(s, ops, global_fns, scope);
+	register_functions(s, ops, proc_fns, proc_proto);
+	register_functions(s, ops, file_fns, file_proto);
+	register_functions(s, ops, dir_fns, dir_proto);
 
 	ops->register_type("fs.proc", proc_proto, close_proc);
 	ops->register_type("fs.file", file_proto, close_file);
diff --git a/lib/math.c b/lib/math.c
index 37bd33f..efbc21c 100644
--- a/lib/math.c
+++ b/lib/math.c
@@ -181,5 +181,5 @@ void ut_module_init(const struct ut_ops *ut, struct ut_state *s, struct json_obj
 {
 	ops = ut;
 
-	register_functions(ops, global_fns, scope);
+	register_functions(s, ops, global_fns, scope);
 }
diff --git a/lib/ubus.c b/lib/ubus.c
index 21f7a7b..b707e51 100644
--- a/lib/ubus.c
+++ b/lib/ubus.c
@@ -320,8 +320,8 @@ void ut_module_init(const struct ut_ops *ut, struct ut_state *s, struct json_obj
 	ops = ut;
 	conn_proto = ops->new_object(NULL);
 
-	register_functions(ops, global_fns, scope);
-	register_functions(ops, conn_fns, conn_proto);
+	register_functions(s, ops, global_fns, scope);
+	register_functions(s, ops, conn_fns, conn_proto);
 
 	ops->register_type("ubus.connection", conn_proto, close_connection);
 }
diff --git a/lib/uci.c b/lib/uci.c
index 6a40df5..a56531a 100644
--- a/lib/uci.c
+++ b/lib/uci.c
@@ -1023,8 +1023,8 @@ void ut_module_init(const struct ut_ops *ut, struct ut_state *s, struct json_obj
 	ops = ut;
 	uci_proto = ops->new_object(NULL);
 
-	register_functions(ops, global_fns, scope);
-	register_functions(ops, cursor_fns, uci_proto);
+	register_functions(s, ops, global_fns, scope);
+	register_functions(s, ops, cursor_fns, uci_proto);
 
 	ops->register_type("uci.cursor", uci_proto, close_uci);
 }