-/* Copyright (C) 1995,1996 Mikael Djurfeldt
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
* If you do not wish that, delete this exception notice.
*
* The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
+
\f
#include <stdio.h>
#include "_scm.h"
+#include "smob.h"
+#include "alist.h"
+#include "debug.h"
+#include "hashtab.h"
+#include "hash.h"
+#include "ports.h"
+#include "weaks.h"
+#include "validate.h"
+#include "srcprop.h"
\f
/* {Source Properties}
*
*
*/
-SCM scm_i_copy;
-static SCM scm_i_breakpoint, scm_i_line, scm_i_column;
-static SCM scm_i_filename;
+SCM scm_sym_filename;
+SCM scm_sym_copy;
+SCM scm_sym_line;
+SCM scm_sym_column;
+SCM scm_sym_breakpoint;
-long tc16_srcprops;
+long scm_tc16_srcprops;
static scm_srcprops_chunk *srcprops_chunklist = 0;
static scm_srcprops *srcprops_freelist = 0;
-#ifdef __STDC__
+
static SCM
marksrcprops (SCM obj)
-#else
-static SCM
-marksrcprops (obj)
- SCM obj;
-#endif
{
- SCM_SETGC8MARK (obj);
scm_gc_mark (SRCPROPFNAME (obj));
scm_gc_mark (SRCPROPCOPY (obj));
return SRCPROPPLIST (obj);
}
-#ifdef __STDC__
+
static scm_sizet
freesrcprops (SCM obj)
-#else
-static scm_sizet
-freesrcprops (obj)
- SCM obj;
-#endif
{
*((scm_srcprops **) SCM_CDR (obj)) = srcprops_freelist;
srcprops_freelist = (scm_srcprops *) SCM_CDR (obj);
return 0; /* srcprops_chunks are not freed until leaving guile */
}
-#ifdef __STDC__
-static int
-prinsrcprops (SCM obj, SCM port, int writing)
-#else
+
static int
-prinsrcprops (obj, port, writing)
- SCM obj;
- SCM port;
- int writing;
-#endif
+prinsrcprops (SCM obj,SCM port,scm_print_state *pstate)
{
- scm_gen_puts (scm_regular_string, "#<srcprops ", port);
- scm_iprin1 (scm_srcprops_to_plist (obj), port, 1);
- scm_gen_putc ('>', port);
+ int writingp = SCM_WRITINGP (pstate);
+ scm_puts ("#<srcprops ", port);
+ SCM_SET_WRITINGP (pstate, 1);
+ scm_iprin1 (scm_srcprops_to_plist (obj), port, pstate);
+ SCM_SET_WRITINGP (pstate, writingp);
+ scm_putc ('>', port);
return 1;
}
-static scm_smobfuns srcpropssmob =
-{marksrcprops, freesrcprops, prinsrcprops, 0};
-#ifdef __STDC__
-SCM
-_scm_make_srcprops (int line, int col, SCM filename, SCM copy, SCM plist)
-#else
SCM
-_scm_make_srcprops (line, col, filename, copy, plist)
- int line;
- int col;
- SCM filename;
- SCM copy;
- SCM plist;
-#endif
+scm_make_srcprops (int line, int col, SCM filename, SCM copy, SCM plist)
{
- register SCM ans;
register scm_srcprops *ptr;
SCM_DEFER_INTS;
if ((ptr = srcprops_freelist) != NULL)
*(scm_srcprops **)&ptr[SRCPROPS_CHUNKSIZE - 1] = 0;
srcprops_freelist = (scm_srcprops *) &ptr[1];
}
- SCM_NEWCELL (ans);
- SCM_CAR (ans) = tc16_srcprops;
ptr->pos = SRCPROPMAKPOS (line, col);
ptr->fname = filename;
ptr->copy = copy;
ptr->plist = plist;
- SCM_CDR (ans) = (SCM) ptr;
- SCM_ALLOW_INTS;
- return ans;
+ SCM_RETURN_NEWSMOB (scm_tc16_srcprops, ptr);
}
-#ifdef __STDC__
+
SCM
scm_srcprops_to_plist (SCM obj)
-#else
-SCM
-scm_srcprops_to_plist (obj)
- SCM obj;
-#endif
{
SCM plist = SRCPROPPLIST (obj);
if (!SCM_UNBNDP (SRCPROPCOPY (obj)))
- plist = scm_acons (scm_i_copy, SRCPROPCOPY (obj), plist);
+ plist = scm_acons (scm_sym_copy, SRCPROPCOPY (obj), plist);
if (!SCM_UNBNDP (SRCPROPFNAME (obj)))
- plist = scm_acons (scm_i_filename, SRCPROPFNAME (obj), plist);
- plist = scm_acons (scm_i_column, SCM_MAKINUM (SRCPROPCOL (obj)), plist);
- plist = scm_acons (scm_i_line, SCM_MAKINUM (SRCPROPLINE (obj)), plist);
- plist = scm_acons (scm_i_breakpoint, SRCPROPBRK (obj), plist);
+ plist = scm_acons (scm_sym_filename, SRCPROPFNAME (obj), plist);
+ plist = scm_acons (scm_sym_column, SCM_MAKINUM (SRCPROPCOL (obj)), plist);
+ plist = scm_acons (scm_sym_line, SCM_MAKINUM (SRCPROPLINE (obj)), plist);
+ plist = scm_acons (scm_sym_breakpoint, SRCPROPBRK (obj), plist);
return plist;
}
-SCM_PROC (s_source_properties, "source-properties", 1, 0, 0, scm_source_properties);
-#ifdef __STDC__
-SCM
-scm_source_properties (SCM obj)
-#else
-SCM
-scm_source_properties (obj)
- SCM obj;
-#endif
+SCM_DEFINE (scm_source_properties, "source-properties", 1, 0, 0,
+ (SCM obj),
+"")
+#define FUNC_NAME s_scm_source_properties
{
SCM p;
+ SCM_VALIDATE_NIM (1,obj);
if (SCM_MEMOIZEDP (obj))
- obj = SCM_MEMOEXP (obj);
+ obj = SCM_MEMOIZED_EXP (obj);
+#ifndef SCM_RECKLESS
+ else if (SCM_NCONSP (obj))
+ SCM_WRONG_TYPE_ARG (1, obj);
+#endif
p = scm_hashq_ref (scm_source_whash, obj, (SCM) NULL);
if (p != (SCM) NULL && SRCPROPSP (p))
return scm_srcprops_to_plist (p);
return SCM_EOL;
}
+#undef FUNC_NAME
/* Perhaps this procedure should look through an alist
and try to make a srcprops-object...? */
-SCM_PROC (s_set_source_properties_x, "set-source-properties!", 2, 0, 0, scm_set_source_properties_x);
-#ifdef __STDC__
-SCM
-scm_set_source_properties_x (SCM obj, SCM plist)
-#else
-SCM
-scm_set_source_properties_x (obj, plist)
- SCM obj;
- SCM plist;
-#endif
+SCM_DEFINE (scm_set_source_properties_x, "set-source-properties!", 2, 0, 0,
+ (SCM obj, SCM plist),
+"")
+#define FUNC_NAME s_scm_set_source_properties_x
{
SCM handle;
+ SCM_VALIDATE_NIM (1,obj);
if (SCM_MEMOIZEDP (obj))
- obj = SCM_MEMOEXP (obj);
+ obj = SCM_MEMOIZED_EXP (obj);
+#ifndef SCM_RECKLESS
+ else if (SCM_NCONSP (obj))
+ SCM_WRONG_TYPE_ARG(1, obj);
+#endif
handle = scm_hashq_create_handle_x (scm_source_whash, obj, plist);
SCM_SETCDR (handle, plist);
return plist;
}
+#undef FUNC_NAME
-SCM_PROC (s_source_property, "source-property", 2, 0, 0, scm_source_property);
-#ifdef __STDC__
-SCM
-scm_source_property (SCM obj, SCM key)
-#else
-SCM
-scm_source_property (obj, key)
- SCM obj;
- SCM key;
-#endif
+SCM_DEFINE (scm_source_property, "source-property", 2, 0, 0,
+ (SCM obj, SCM key),
+"")
+#define FUNC_NAME s_scm_source_property
{
SCM p;
+ SCM_VALIDATE_NIM (1,obj);
if (SCM_MEMOIZEDP (obj))
- obj = SCM_MEMOEXP (obj);
+ obj = SCM_MEMOIZED_EXP (obj);
+#ifndef SCM_RECKLESS
+ else if (SCM_NECONSP (obj))
+ SCM_WRONG_TYPE_ARG (1, obj);
+#endif
p = scm_hashq_ref (scm_source_whash, obj, SCM_EOL);
if (SCM_IMP (p) || !SRCPROPSP (p))
goto plist;
- if (scm_i_breakpoint == key) p = SRCPROPBRK (p);
- else if (scm_i_line == key) p = SCM_MAKINUM (SRCPROPLINE (p));
- else if (scm_i_column == key) p = SCM_MAKINUM (SRCPROPCOL (p));
- else if (scm_i_filename == key) p = SRCPROPFNAME (p);
- else if (scm_i_copy == key) p = SRCPROPCOPY (p);
+ if (scm_sym_breakpoint == key) p = SRCPROPBRK (p);
+ else if (scm_sym_line == key) p = SCM_MAKINUM (SRCPROPLINE (p));
+ else if (scm_sym_column == key) p = SCM_MAKINUM (SRCPROPCOL (p));
+ else if (scm_sym_filename == key) p = SRCPROPFNAME (p);
+ else if (scm_sym_copy == key) p = SRCPROPCOPY (p);
else
{
p = SRCPROPPLIST (p);
}
return SCM_UNBNDP (p) ? SCM_BOOL_F : p;
}
+#undef FUNC_NAME
-SCM_PROC (s_set_source_property_x, "set-source-property!", 3, 0, 0, scm_set_source_property_x);
-#ifdef __STDC__
-SCM
-scm_set_source_property_x (SCM obj, SCM key, SCM datum)
-#else
-SCM
-scm_set_source_property_x (obj, key, datum)
- SCM obj;
- SCM key;
- SCM datum;
-#endif
+SCM_DEFINE (scm_set_source_property_x, "set-source-property!", 3, 0, 0,
+ (SCM obj, SCM key, SCM datum),
+"")
+#define FUNC_NAME s_scm_set_source_property_x
{
scm_whash_handle h;
SCM p;
+ SCM_VALIDATE_NIM (1,obj);
if (SCM_MEMOIZEDP (obj))
- obj = SCM_MEMOEXP (obj);
+ obj = SCM_MEMOIZED_EXP (obj);
+#ifndef SCM_RECKLESS
+ else if (SCM_NCONSP (obj))
+ SCM_WRONG_TYPE_ARG (1, obj);
+#endif
h = scm_whash_get_handle (scm_source_whash, obj);
if (SCM_WHASHFOUNDP (h))
p = SCM_WHASHREF (scm_source_whash, h);
h = scm_whash_create_handle (scm_source_whash, obj);
p = SCM_EOL;
}
- if (scm_i_breakpoint == key)
- if (SCM_FALSEP (datum))
- CLEARSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p)
+ if (scm_sym_breakpoint == key)
+ {
+ if (SCM_FALSEP (datum))
+ CLEARSRCPROPBRK (SRCPROPSP (p)
+ ? p
+ : SCM_WHASHSET (scm_source_whash, h,
+ scm_make_srcprops (0,
+ 0,
+ SCM_UNDEFINED,
+ SCM_UNDEFINED,
+ p)));
+ else
+ SETSRCPROPBRK (SRCPROPSP (p)
? p
: SCM_WHASHSET (scm_source_whash, h,
- _scm_make_srcprops (0, 0, SCM_UNDEFINED,
- SCM_UNDEFINED, p)));
- else
- SETSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p)
- ? p
- : SCM_WHASHSET (scm_source_whash, h,
- _scm_make_srcprops (0, 0, SCM_UNDEFINED,
- SCM_UNDEFINED, p)));
- else if (scm_i_line == key)
+ scm_make_srcprops (0,
+ 0,
+ SCM_UNDEFINED,
+ SCM_UNDEFINED,
+ p)));
+ }
+ else if (scm_sym_line == key)
{
- if (SCM_NIMP (p) && SRCPROPSP (p))
- SETSRCPROPLINE (p, datum);
+ SCM_VALIDATE_INUM (3,datum);
+ if (SRCPROPSP (p))
+ SETSRCPROPLINE (p, SCM_INUM (datum));
else
SCM_WHASHSET (scm_source_whash, h,
- _scm_make_srcprops (datum, 0, SCM_UNDEFINED, SCM_UNDEFINED, p));
+ scm_make_srcprops (SCM_INUM (datum), 0,
+ SCM_UNDEFINED, SCM_UNDEFINED, p));
}
- else if (scm_i_column == key)
+ else if (scm_sym_column == key)
{
- if (SCM_NIMP (p) && SRCPROPSP (p))
- SETSRCPROPCOL (p, datum);
+ SCM_VALIDATE_INUM (3,datum);
+ if (SRCPROPSP (p))
+ SETSRCPROPCOL (p, SCM_INUM (datum));
else
SCM_WHASHSET (scm_source_whash, h,
- _scm_make_srcprops (0, datum, SCM_UNDEFINED, SCM_UNDEFINED, p));
+ scm_make_srcprops (0, SCM_INUM (datum),
+ SCM_UNDEFINED, SCM_UNDEFINED, p));
}
- else if (scm_i_filename == key)
+ else if (scm_sym_filename == key)
{
- if (SCM_NIMP (p) && SRCPROPSP (p))
+ if (SRCPROPSP (p))
SRCPROPFNAME (p) = datum;
else
- SCM_WHASHSET (scm_source_whash, h, _scm_make_srcprops (0, 0, datum, SCM_UNDEFINED, p));
+ SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, datum, SCM_UNDEFINED, p));
}
- else if (scm_i_filename == key)
+ else if (scm_sym_filename == key)
{
- if (SCM_NIMP (p) && SRCPROPSP (p))
+ if (SRCPROPSP (p))
SRCPROPCOPY (p) = datum;
else
- SCM_WHASHSET (scm_source_whash, h, _scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p));
+ SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p));
}
else
SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p));
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
+
-#ifdef __STDC__
-void
-scm_init_srcprop (void)
-#else
void
scm_init_srcprop ()
-#endif
{
- tc16_srcprops = scm_newsmob (&srcpropssmob);
- scm_source_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (255));
+ scm_tc16_srcprops = scm_make_smob_type_mfpe ("srcprops", 0,
+ marksrcprops, freesrcprops, prinsrcprops, NULL);
+ scm_source_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (2047));
- scm_i_filename = SCM_CAR (scm_sysintern ("filename", SCM_UNDEFINED));
- scm_i_copy = SCM_CAR (scm_sysintern ("copy", SCM_UNDEFINED));
- scm_i_line = SCM_CAR (scm_sysintern ("line", SCM_UNDEFINED));
- scm_i_column = SCM_CAR (scm_sysintern ("column", SCM_UNDEFINED));
- scm_i_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED));
+ scm_sym_filename = SCM_CAR (scm_sysintern ("filename", SCM_UNDEFINED));
+ scm_sym_copy = SCM_CAR (scm_sysintern ("copy", SCM_UNDEFINED));
+ scm_sym_line = SCM_CAR (scm_sysintern ("line", SCM_UNDEFINED));
+ scm_sym_column = SCM_CAR (scm_sysintern ("column", SCM_UNDEFINED));
+ scm_sym_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED));
scm_sysintern ("source-whash", scm_source_whash);
#include "srcprop.x"
free ((char *) ptr);
scm_mallocated -= sizeof (scm_srcprops_chunk)
+ sizeof (scm_srcprops) * (SRCPROPS_CHUNKSIZE - 1);
+ ptr = next;
}
}
HCoop / bpt / guile.git / blobdiff