Renames

Author: vladbelousoff

include/tea_scope.h

@@ -4,9 +4,9 @@
 #include "tea_value.h"
 
 typedef struct {
-  const char *fname;
-  tea_list_entry_t fns;
-  tea_list_entry_t nfns;
+  const char *file_name;
+  tea_list_entry_t funcs;
+  tea_list_entry_t native_funcs;
   tea_list_entry_t structs;
   tea_list_entry_t vars;
 } tea_ctx_t;

src/tea_fn.c

@@ -121,7 +121,7 @@ bool tea_decl_fn(const tea_node_t *node, tea_list_entry_t *functions)
 
 bool tea_interp_fn_decl(tea_ctx_t *ctx, const tea_node_t *node)
 {
-  return tea_decl_fn(node, &ctx->fns);
+  return tea_decl_fn(node, &ctx->funcs);
 }
 
 tea_val_t tea_eval_native_fn_call(tea_ctx_t *ctx, tea_scope_t *scp,
@@ -269,21 +269,20 @@ tea_val_t tea_eval_fn_call(tea_ctx_t *ctx, tea_scope_t *scp,
 
     if (function) {
       // declare 'self' for the scope
-      tea_decl_var(ctx, &inner_scope, "self",
-        function->mut ? TEA_VAR_MUT : 0,
-        NULL, object_node);
+      tea_decl_var(ctx, &inner_scope, "self", function->mut ? TEA_VAR_MUT : 0,
+                   NULL, object_node);
     }
   } else {
     const tea_tok_t *token = node->tok;
     if (token) {
       const tea_native_fn_t *nat_fn =
-        tea_ctx_find_native_fn(&ctx->nfns, token->buf);
+        tea_ctx_find_native_fn(&ctx->native_funcs, token->buf);
       if (nat_fn) {
         return tea_eval_native_fn_call(ctx, scp, nat_fn, args);
       }
 
       function_name = token->buf;
-      function = tea_ctx_find_fn(&ctx->fns, token->buf);
+      function = tea_ctx_find_fn(&ctx->funcs, token->buf);
     }
   }
 
@@ -394,6 +393,6 @@ void tea_bind_native_fn(tea_ctx_t *ctx, const char *name,
   if (function) {
     function->name = name;
     function->cb = cb;
-    tea_list_add_tail(&ctx->nfns, &function->link);
+    tea_list_add_tail(&ctx->native_funcs, &function->link);
   }
 }

src/tea_interp.c

@@ -8,9 +8,9 @@
 
 void tea_interp_init(tea_ctx_t *ctx, const char *fname)
 {
-  ctx->fname = fname;
-  tea_list_init(&ctx->fns);
-  tea_list_init(&ctx->nfns);
+  ctx->file_name = fname;
+  tea_list_init(&ctx->funcs);
+  tea_list_init(&ctx->native_funcs);
   tea_list_init(&ctx->structs);
 
   tea_list_init(&ctx->vars);
@@ -21,14 +21,14 @@ void tea_interp_cleanup(const tea_ctx_t *ctx)
   tea_list_entry_t *entry;
   tea_list_entry_t *safe;
 
-  tea_list_for_each_safe(entry, safe, &ctx->fns)
+  tea_list_for_each_safe(entry, safe, &ctx->funcs)
   {
     tea_fn_t *function = tea_list_record(entry, tea_fn_t, link);
     tea_list_remove(entry);
     tea_free(function);
   }
 
-  tea_list_for_each_safe(entry, safe, &ctx->nfns)
+  tea_list_for_each_safe(entry, safe, &ctx->native_funcs)
   {
     tea_native_fn_t *function = tea_list_record(entry, tea_native_fn_t, link);
     tea_list_remove(entry);

src/tea_stmt.c

@@ -416,12 +416,13 @@ bool tea_exec(tea_ctx_t *ctx, tea_scope_t *scp, const tea_node_t *node,
       tea_log_err(
         "Interpreter error: Unimplemented statement type <%s> in file %s, token: <%s> '%.*s' "
         "(line %d, col %d)",
-        tea_node_type_name(node->type), ctx->fname, tea_tok_name(token->type),
-        token->size, token->buf, token->line, token->col);
+        tea_node_type_name(node->type), ctx->file_name,
+        tea_tok_name(token->type), token->size, token->buf, token->line,
+        token->col);
     } else {
       tea_log_err(
         "Interpreter error: Unimplemented statement type <%s> in file %s",
-        tea_node_type_name(node->type), ctx->fname);
+        tea_node_type_name(node->type), ctx->file_name);
     }
   } break;
   }