* ports.c (scm_char_ready_p): bug fix: in SCM_PROC char-ready's

[bpt/guile.git] / libguile / variable.c

diff --git a/libguile/variable.c b/libguile/variable.c
index 93d800b..f87887f 100644 (file)
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -42,6 +42,7 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "eq.h"
 #include "genio.h"
 #include "smob.h"
 
@@ -97,11 +98,21 @@ scm_markvar (ptr)
   return SCM_CDR (ptr);
 }
 
+static SCM var_equal SCM_P ((SCM var1, SCM var2));
+
+static SCM
+var_equal (var1, var2)
+     SCM var1;
+     SCM var2;
+{
+  return scm_equal_p (SCM_CDR (var1), SCM_CDR (var2));
+}
+
 int scm_tc16_variable;
-static scm_smobfuns variable_smob = {scm_markvar, free_var, prin_var, 0};
+static scm_smobfuns variable_smob = {scm_markvar, free_var, prin_var, var_equal};
 \f
 
-static SCM variable_sym;
+static SCM anonymous_variable_sym;
 
 
 static SCM make_vcell_variable SCM_P ((SCM vcell));
@@ -113,13 +124,13 @@ make_vcell_variable (vcell)
   SCM answer;
   SCM_NEWCELL(answer);
   SCM_REDEFER_INTS;
-  SCM_CAR(answer) = scm_tc16_variable;
-  SCM_CDR(answer) = vcell;
+  SCM_SETCAR (answer, scm_tc16_variable);
+  SCM_SETCDR (answer, vcell);
   SCM_REALLOW_INTS;
   return answer;
 }
 
-SCM_PROC(s_make_variable, "make-variable", 2, 0, 0, scm_make_variable);
+SCM_PROC(s_make_variable, "make-variable", 1, 1, 0, scm_make_variable);
 
 SCM
 scm_make_variable (init, name_hint)
@@ -127,10 +138,14 @@ scm_make_variable (init, name_hint)
      SCM name_hint;
 {
   SCM val_cell;
+  
+  if (name_hint == SCM_UNDEFINED)
+    name_hint = anonymous_variable_sym;
+
   SCM_NEWCELL(val_cell);
   SCM_DEFER_INTS;
-  SCM_CAR(val_cell) = name_hint;
-  SCM_CDR(val_cell) = init;
+  SCM_SETCAR (val_cell, name_hint);
+  SCM_SETCDR (val_cell, init);
   SCM_ALLOW_INTS;
   return make_vcell_variable (val_cell);
 }
@@ -145,12 +160,12 @@ scm_make_undefined_variable (name_hint)
   SCM vcell;
 
   if (name_hint == SCM_UNDEFINED)
-    name_hint = variable_sym;
+    name_hint = anonymous_variable_sym;
 
   SCM_NEWCELL (vcell);
   SCM_DEFER_INTS;
-  SCM_CAR (vcell) = name_hint;
-  SCM_CDR (vcell) = SCM_UNDEFINED;
+  SCM_SETCAR (vcell, name_hint);
+  SCM_SETCDR (vcell, SCM_UNDEFINED);
   SCM_ALLOW_INTS;
   return make_vcell_variable (vcell);
 }
@@ -188,7 +203,7 @@ scm_variable_set_x (var, val)
      SCM val;
 {
   SCM_ASSERT (SCM_NIMP(var) && SCM_VARIABLEP (var), var, SCM_ARG1, s_variable_set_x);
-  SCM_CDR (SCM_CDR (var)) = val;
+  SCM_SETCDR (SCM_CDR (var), val);
   return SCM_UNSPECIFIED;
 }
 
@@ -213,7 +228,7 @@ scm_builtin_variable (name)
   SCM_DEFER_INTS;
   if (   SCM_IMP (SCM_CDR (var_slot))
       || (SCM_VARVCELL (var_slot) != vcell))
-    SCM_CDR (var_slot) = make_vcell_variable (vcell);
+    SCM_SETCDR (var_slot, make_vcell_variable (vcell));
   SCM_ALLOW_INTS;
 
   return SCM_CDR (var_slot);
@@ -239,7 +254,7 @@ void
 scm_init_variable ()
 {
   scm_tc16_variable = scm_newsmob (&variable_smob);
-  variable_sym = SCM_CAR (scm_sysintern ("anonymous-variable", SCM_UNDEFINED));
+  anonymous_variable_sym = SCM_CAR (scm_sysintern ("anonymous-variable", SCM_UNDEFINED));
 #include "variable.x"
 }