term.c: add term_fprint function

Add term_fprint function as a replacement, that doesn't
require a Context, for term_display.
term_display is reimplemented on top of it.

Signed-off-by: Davide Bettio <[email protected]>

Author: bettio

src/libAtomVM/globalcontext.h

@@ -58,7 +58,7 @@ typedef struct Module Module;
 
 struct Module;
 
-typedef struct
+struct GlobalContext
 {
     struct ListHead ready_processes;
     struct ListHead waiting_processes;
@@ -83,7 +83,7 @@ typedef struct
     uint64_t ref_ticks;
 
     void *platform_data;
-} GlobalContext;
+};
 
 /**
  * @brief Creates a new GlobalContext

src/libAtomVM/term.c

@@ -33,10 +33,16 @@
 const term empty_tuple = 0;
 
 void term_display(FILE *fd, term t, const Context *ctx)
+{
+    term_fprint(fd, t, ctx->global);
+}
+
+void term_fprint(FILE *fd, term t, const GlobalContext *global)
 {
     if (term_is_atom(t)) {
         int atom_index = term_to_atom_index(t);
-        AtomString atom_string = (AtomString) valueshashtable_get_value(ctx->global->atoms_ids_table, atom_index, (unsigned long) NULL);
+        AtomString atom_string = (AtomString) valueshashtable_get_value(
+            global->atoms_ids_table, atom_index, (unsigned long) NULL);
         fprintf(fd, "%.*s", (int) atom_string_len(atom_string), (char *) atom_string_data(atom_string));
 
     } else if (term_is_integer(t)) {
@@ -79,12 +85,12 @@ void term_display(FILE *fd, term t, const Context *ctx)
                     display_separator = 1;
                 }
 
-                term_display(fd, term_get_list_head(t), ctx);
+                term_fprint(fd, term_get_list_head(t), global);
                 t = term_get_list_tail(t);
             }
             if (!term_is_nil(t)) {
                 fputc('|', fd);
-                term_display(fd, t, ctx);
+                term_fprint(fd, t, global);
             }
             fputc(']', fd);
         }
@@ -111,7 +117,7 @@ void term_display(FILE *fd, term t, const Context *ctx)
             if (i != 0) {
                 fputc(',', fd);
             }
-            term_display(fd, term_get_tuple_element(t, i), ctx);
+            term_fprint(fd, term_get_tuple_element(t, i), global);
         }
 
         fputc('}', fd);
@@ -124,9 +130,9 @@ void term_display(FILE *fd, term t, const Context *ctx)
             if (i != 0) {
                 fputc(',', fd);
             }
-            term_display(fd, term_get_map_key(t, i), ctx);
+            term_fprint(fd, term_get_map_key(t, i), global);
             fprintf(fd, "=>");
-            term_display(fd, term_get_map_value(t, i), ctx);
+            term_fprint(fd, term_get_map_value(t, i), global);
         }
 
         fputc('}', fd);

src/libAtomVM/term.h

@@ -86,6 +86,11 @@ extern "C" {
 
 #define TERM_FROM_ATOM_INDEX(atom_index) ((atom_index << 6) | 0xB)
 
+#ifndef TYPEDEF_GLOBALCONTEXT
+#define TYPEDEF_GLOBALCONTEXT
+typedef struct GlobalContext GlobalContext;
+#endif
+
 enum RefcBinaryFlags
 {
     RefcNoFlags = 0,
@@ -1392,12 +1397,23 @@ static inline int term_is_number(term t)
 /**
  * @brief Prints a term to stdout
  *
- * @details Print any given term to the standard output.
+ * @details Print any term to the given file.
+ * @param fd the file where the term will be printed.
  * @param t the term that will be printed.
  * @param ctx the context.
  */
 void term_display(FILE *fd, term t, const Context *ctx);
 
+/**
+ * @brief Prints a term to the given file
+ *
+ * @details Print any given term to the given file.
+ * @param fd the file where the term will be printed.
+ * @param t the term that will be printed.
+ * @param global the \c GlobalContext.
+ */
+void term_fprint(FILE *fd, term t, const GlobalContext *global);
+
 /**
  * @brief Checks if a term is a string (i.e., a list of characters)
  *