From eb7be4c854261924bb4cdb9f300e865802f9e4d9 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Sat, 2 Mar 2019 10:16:31 -0800
Subject: ffi, eval: move struct_s.

* eval.c (struct_s): Now defined here.
(eval_init): struct now interned here.

* eval.h (struct_s): Declared.

* ffi.c (struct_s): Definition removed.
(ffi_init) struct no longer interned here.
---
 eval.c | 3 ++-
 eval.h | 2 +-
 ffi.c  | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eval.c b/eval.c
index cd99424e..db883365 100644
--- a/eval.c
+++ b/eval.c
@@ -97,7 +97,7 @@ val op_s, identity_s;
 val hash_lit_s, hash_construct_s, struct_lit_s, qref_s, uref_s;
 val vector_lit_s, vec_list_s;
 val macro_time_s, macrolet_s;
-val defsymacro_s, symacrolet_s, prof_s, switch_s;
+val defsymacro_s, symacrolet_s, prof_s, switch_s, struct_s;
 val fbind_s, lbind_s, flet_s, labels_s;
 val load_path_s, load_recursive_s;
 val load_time_s, load_time_lit_s;
@@ -6142,6 +6142,7 @@ void eval_init(void)
   symacro_k = intern(lit("symacro"), keyword_package);
   prof_s = intern(lit("prof"), user_package);
   switch_s = intern(lit("switch"), system_package);
+  struct_s = intern(lit("struct"), user_package);
   load_path_s = intern(lit("*load-path*"), user_package);
   load_recursive_s = intern(lit("*load-recursive*"), system_package);
   load_time_s = intern(lit("load-time"), user_package);
diff --git a/eval.h b/eval.h
index 3b422d1e..c538941e 100644
--- a/eval.h
+++ b/eval.h
@@ -32,7 +32,7 @@ extern val eq_s, eql_s, equal_s;
 extern val car_s, cdr_s;
 extern val last_form_evaled, last_form_expanded;
 extern val load_path_s, load_recursive_s;
-extern val special_s;
+extern val special_s, struct_s;
 
 #define load_path (deref(lookup_var_l(nil, load_path_s)))
 
diff --git a/ffi.c b/ffi.c
index b047d859..f54ecddd 100644
--- a/ffi.c
+++ b/ffi.c
@@ -111,7 +111,7 @@ val le_float_s, le_double_s;
 
 val array_s, zarray_s, carray_s;
 
-val struct_s, union_s;
+val union_s;
 
 val str_d_s, wstr_s, wstr_d_s, bstr_s, bstr_d_s;
 
@@ -5501,7 +5501,6 @@ void ffi_init(void)
   array_s = intern(lit("array"), user_package);
   zarray_s = intern(lit("zarray"), user_package);
   carray_s = intern(lit("carray"), user_package);
-  struct_s = intern(lit("struct"), user_package);
   union_s = intern(lit("union"), user_package);
   str_d_s = intern(lit("str-d"), user_package);
   wstr_s = intern(lit("wstr"), user_package);
-- 
cgit v1.2.3