From 0be441446e8aab385c1c6371f63d8b87751ecde3 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 21 Apr 2018 13:19:54 +0200
Subject: [PATCH] core: drop global_p from variable.

* src/mes (struct scm): Remove field global_p.
 (VARIABLE_GLOBAL_P): Remove.
 (make_variable_): Remove global_p parameter.  Update callers.
* src/lib.c (display_helper): Drop VARIABLE_GLOBAL_P support.
---
 module/mes/display.mes | 2 --
 src/gc.c               | 3 +--
 src/lib.c              | 2 --
 src/mes.c              | 9 +++------
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/module/mes/display.mes b/module/mes/display.mes
index 6be26bfb..65c9b0ec 100644
--- a/module/mes/display.mes
+++ b/module/mes/display.mes
@@ -97,8 +97,6 @@
         (display ">" port))
        ((variable? x)
         (display "#<variable " port)
-        (if (variable-global? x)
-            (display "*global* " port))
         (display (car (core:car x)) port)
         (display ">" port))
        ((number? x)
diff --git a/src/gc.c b/src/gc.c
index dcf9a507..9a78356f 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -116,8 +116,7 @@ gc_loop (SCM scan) ///((internal))
            || NTYPE (scan) == TCONTINUATION
            || NTYPE (scan) == TMACRO
            || NTYPE (scan) == TPAIR
-           || NTYPE (scan) == TVALUES
-           || NTYPE (scan) == TVARIABLE)
+           || NTYPE (scan) == TVALUES)
           && g_news[scan].cdr) // allow for 0 terminated list of symbols
         {
           cdr = gc_copy (g_news[scan].cdr);
diff --git a/src/lib.c b/src/lib.c
index d7f1b641..54cdbc92 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -85,8 +85,6 @@ display_helper (SCM x, int cont, char* sep, int fd, int write_p)
     case TVARIABLE:
       {
         fputs ("#<variable ", fd);
-        if (VARIABLE_GLOBAL_P (x) == cell_t)
-          fputs ("*global* ", fd);
         display_helper (CAR (VARIABLE (x)), cont, "", fd, 0);
         fputs (">", fd);
         break;
diff --git a/src/mes.c b/src/mes.c
index 277b6154..35a0faf5 100644
--- a/src/mes.c
+++ b/src/mes.c
@@ -105,7 +105,6 @@ struct scm {
     SCM cdr;
     SCM closure;
     SCM continuation;
-    SCM global_p;
     SCM macro;
     SCM vector;
     int hits;
@@ -265,7 +264,6 @@ int g_function = 0;
 #define REF(x) g_cells[x].car
 #define STRING(x) g_cells[x].car
 #define VARIABLE(x) g_cells[x].car
-#define VARIABLE_GLOBAL_P(x) g_cells[x].cdr
 
 #define CLOSURE(x) g_cells[x].cdr
 #define CONTINUATION(x) g_cells[x].cdr
@@ -288,7 +286,6 @@ int g_function = 0;
 #define NAME(x) g_cells[x].name
 #define STRING(x) g_cells[x].string
 #define VARIABLE(x) g_cells[x].variable
-#define VARIABLE_GLOBAL_P(x) g_cells[x].cdr
 
 #define CLOSURE(x) g_cells[x].closure
 #define MACRO(x) g_cells[x].macro
@@ -778,9 +775,9 @@ make_closure_ (SCM args, SCM body, SCM a) ///((internal))
 }
 
 SCM
-make_variable_ (SCM var, SCM global_p) ///((internal))
+make_variable_ (SCM var) ///((internal))
 {
-  return make_cell__ (TVARIABLE, var, global_p);
+  return make_cell__ (TVARIABLE, var, 0);
 }
 
 SCM
@@ -907,7 +904,7 @@ expand_variable_ (SCM x, SCM formals, int top_p) ///((internal))
             {
               SCM v = assq (CAR (x), r0);
               if (v != cell_f)
-                CAR (x) = make_variable_ (v, cell_t);
+                CAR (x) = make_variable_ (v);
             }
         }
       x = CDR (x);