[uim-commit] r495 - trunk/uim
yamaken at freedesktop.org
yamaken at freedesktop.org
Wed Feb 2 16:38:16 PST 2005
Author: yamaken
Date: 2005-02-02 16:38:11 -0800 (Wed, 02 Feb 2005)
New Revision: 495
Modified:
trunk/uim/siod.h
trunk/uim/slib.c
Log:
* This commit moves unexported static declarations of siod.h to slib.c
* uim/siod.h
- (siod_init, siod_quit, set_repl_hooks, get_c_string,
get_c_string_dim, get_c_int, nlength, get_c_pointer,
get_c_func_pointer, cons, car, cdr, setcar, intcons, eql, symcons,
symbol_boundp, symbol_value, symbol_to_string, rintern, closure,
ptrcons, funcptrcons, init_subr, init_subr_0, init_subr_1,
init_subr_2, init_subr_2n, init_subr_3, init_subr_4, init_subr_5,
init_lsubr, init_fsubr, init_msubr, delq, set_eval_hooks, leval,
symbolconc, lprin1f, lread, lreadtk, lreadf, require, strcons,
equal, set_fatal_exit_hook, intern, gc_protect,
siod_gc_protect_stack, siod_gc_unprotect_stack,
siod_repl_c_string_entered, repl_c_string, siod_return_value,
reverse, nreverse, cadr, caar, cdar, cddr, siod_true_value,
siod_false_value, lapply, listn, must_malloc, get_c_file,
last_c_errmsg, llast_c_errmsg, siod_c_provide, funcall1, funcall2,
siod_set_lib_path): Move to slib.c
* uim/slib.c
- (siod_init, siod_quit, set_repl_hooks, get_c_string,
get_c_string_dim, get_c_int, nlength, get_c_pointer,
get_c_func_pointer, cons, car, cdr, setcar, intcons, eql, symcons,
symbol_boundp, symbol_value, symbol_to_string, rintern, closure,
ptrcons, funcptrcons, init_subr, init_subr_0, init_subr_1,
init_subr_2, init_subr_2n, init_subr_3, init_subr_4, init_subr_5,
init_lsubr, init_fsubr, init_msubr, delq, set_eval_hooks, leval,
symbolconc, lprin1f, lread, lreadtk, lreadf, require, strcons,
equal, set_fatal_exit_hook, intern, gc_protect,
siod_gc_protect_stack, siod_gc_unprotect_stack,
siod_repl_c_string_entered, repl_c_string, siod_return_value,
reverse, nreverse, cadr, caar, cdar, cddr, siod_true_value,
siod_false_value, lapply, listn, must_malloc, get_c_file,
last_c_errmsg, llast_c_errmsg, siod_c_provide, funcall1, funcall2,
siod_set_lib_path): Moved from siod.h
Modified: trunk/uim/siod.h
===================================================================
--- trunk/uim/siod.h 2005-02-03 00:21:02 UTC (rev 494)
+++ trunk/uim/siod.h 2005-02-03 00:38:11 UTC (rev 495)
@@ -215,92 +215,4 @@
#define TKBUFFERN 5120
-/*
- These static functions will be moved into slib.c siod.h is only a
- temporary place. -- YamaKen 2005-01-12
-*/
-static void siod_init (int argc, char **argv, int warnflag, FILE *);
-static void siod_quit (void);
-
-static void set_repl_hooks (void (*puts_f) (char *),
- LISP (*read_f) (void),
- LISP (*eval_f) (LISP),
- void (*print_f) (LISP));
-static char *get_c_string (LISP x);
-static char *get_c_string_dim (LISP x, long *);
-static int get_c_int (LISP x);
-static long nlength(LISP x);
-static void *get_c_pointer (LISP x);
-static C_FUNC get_c_func_pointer (LISP x);
-
-static LISP cons (LISP x, LISP y);
-static LISP car (LISP x);
-static LISP cdr (LISP x);
-static LISP setcar (LISP cell, LISP value);
-static LISP intcons (int x);
-static LISP eql (LISP x, LISP y);
-static LISP symcons (char *pname, LISP vcell);
-static LISP symbol_boundp (LISP x, LISP env);
-static LISP symbol_value (LISP x, LISP env);
-static LISP symbol_to_string (LISP x, LISP env);
-static LISP rintern (const char *name);
-static LISP closure (LISP env, LISP code);
-static LISP ptrcons (void *ptr);
-static LISP funcptrcons (C_FUNC ptr);
-
-static void init_subr (char *name, long type, SUBR_FUNC fcn);
-static void init_subr_0 (char *name, LISP (*fcn) (void));
-static void init_subr_1 (char *name, LISP (*fcn) (LISP));
-static void init_subr_2 (char *name, LISP (*fcn) (LISP, LISP));
-static void init_subr_2n (char *name, LISP (*fcn) (LISP, LISP));
-static void init_subr_3 (char *name, LISP (*fcn) (LISP, LISP, LISP));
-static void init_subr_4 (char *name, LISP (*fcn) (LISP, LISP, LISP, LISP));
-static void init_subr_5 (char *name, LISP (*fcn) (LISP, LISP, LISP, LISP, LISP));
-static void init_lsubr (char *name, LISP (*fcn) (LISP));
-static void init_fsubr (char *name, LISP (*fcn) (LISP, LISP));
-static void init_msubr (char *name, LISP (*fcn) (LISP *, LISP *));
-
-static LISP delq (LISP elem, LISP l);
-static void set_eval_hooks (long type, LISP (*fcn) (LISP, LISP *, LISP *));
-static LISP leval (LISP x, LISP env);
-static LISP symbolconc (LISP args);
-static LISP lprin1f (LISP exp, FILE * f);
-static LISP lread (LISP);
-static LISP lreadtk (char *, long j);
-static LISP lreadf (FILE * f);
-static LISP require (LISP fname);
-static LISP strcons (long length, const char *data);
-static LISP equal (LISP, LISP);
-static void set_fatal_exit_hook (void (*fcn) (void));
-static LISP intern (LISP x);
-static void gc_protect (LISP * location);
-#if (NESTED_REPL_C_STRING)
-static void siod_gc_protect_stack(LISP *stack_start);
-static void siod_gc_unprotect_stack(LISP *stack_start);
-#else
-static int siod_repl_c_string_entered (void);
-#endif
-static long repl_c_string (const char *, long want_init, long want_print);
-static LISP siod_return_value (void);
-static LISP reverse (LISP);
-static LISP nreverse (LISP);
-static LISP cadr (LISP);
-static LISP caar (LISP);
-static LISP cdar (LISP);
-static LISP cddr (LISP);
-static LISP siod_true_value (void);
-static LISP siod_false_value (void);
-static LISP lapply (LISP fcn, LISP args);
-static LISP listn (long n,...);
-static char *must_malloc (unsigned long size);
-static FILE *get_c_file (LISP p, FILE * deflt);
-static char *last_c_errmsg (int);
-static LISP llast_c_errmsg (int);
-static void siod_c_provide(const char *);
-
-static LISP funcall1 (LISP, LISP);
-static LISP funcall2 (LISP, LISP, LISP);
-
-static void siod_set_lib_path(const char *);
-
#endif /* __SIOD_H__ */
Modified: trunk/uim/slib.c
===================================================================
--- trunk/uim/slib.c 2005-02-03 00:21:02 UTC (rev 494)
+++ trunk/uim/slib.c 2005-02-03 00:38:11 UTC (rev 495)
@@ -152,6 +152,91 @@
/* forward declaration of static functions */
static void gc_for_newcell (void);
+/* forward declaration of static functions previously declared in siod.h */
+static void siod_init (int argc, char **argv, int warnflag, FILE *);
+static void siod_quit (void);
+
+static void set_repl_hooks (void (*puts_f) (char *),
+ LISP (*read_f) (void),
+ LISP (*eval_f) (LISP),
+ void (*print_f) (LISP));
+static char *get_c_string (LISP x);
+static char *get_c_string_dim (LISP x, long *);
+static int get_c_int (LISP x);
+static long nlength(LISP x);
+static void *get_c_pointer (LISP x);
+static C_FUNC get_c_func_pointer (LISP x);
+
+static LISP cons (LISP x, LISP y);
+static LISP car (LISP x);
+static LISP cdr (LISP x);
+static LISP setcar (LISP cell, LISP value);
+static LISP intcons (int x);
+static LISP eql (LISP x, LISP y);
+static LISP symcons (char *pname, LISP vcell);
+static LISP symbol_boundp (LISP x, LISP env);
+static LISP symbol_value (LISP x, LISP env);
+static LISP symbol_to_string (LISP x, LISP env);
+static LISP rintern (const char *name);
+static LISP closure (LISP env, LISP code);
+static LISP ptrcons (void *ptr);
+static LISP funcptrcons (C_FUNC ptr);
+
+static void init_subr (char *name, long type, SUBR_FUNC fcn);
+static void init_subr_0 (char *name, LISP (*fcn) (void));
+static void init_subr_1 (char *name, LISP (*fcn) (LISP));
+static void init_subr_2 (char *name, LISP (*fcn) (LISP, LISP));
+static void init_subr_2n (char *name, LISP (*fcn) (LISP, LISP));
+static void init_subr_3 (char *name, LISP (*fcn) (LISP, LISP, LISP));
+static void init_subr_4 (char *name, LISP (*fcn) (LISP, LISP, LISP, LISP));
+static void init_subr_5 (char *name, LISP (*fcn) (LISP, LISP, LISP, LISP, LISP));
+static void init_lsubr (char *name, LISP (*fcn) (LISP));
+static void init_fsubr (char *name, LISP (*fcn) (LISP, LISP));
+static void init_msubr (char *name, LISP (*fcn) (LISP *, LISP *));
+
+static LISP delq (LISP elem, LISP l);
+static void set_eval_hooks (long type, LISP (*fcn) (LISP, LISP *, LISP *));
+static LISP leval (LISP x, LISP env);
+static LISP symbolconc (LISP args);
+static LISP lprin1f (LISP exp, FILE * f);
+static LISP lread (LISP);
+static LISP lreadtk (char *, long j);
+static LISP lreadf (FILE * f);
+static LISP require (LISP fname);
+static LISP strcons (long length, const char *data);
+static LISP equal (LISP, LISP);
+static void set_fatal_exit_hook (void (*fcn) (void));
+static LISP intern (LISP x);
+static void gc_protect (LISP * location);
+#if (NESTED_REPL_C_STRING)
+static void siod_gc_protect_stack(LISP *stack_start);
+static void siod_gc_unprotect_stack(LISP *stack_start);
+#else
+static int siod_repl_c_string_entered (void);
+#endif
+static long repl_c_string (const char *, long want_init, long want_print);
+static LISP siod_return_value (void);
+static LISP reverse (LISP);
+static LISP nreverse (LISP);
+static LISP cadr (LISP);
+static LISP caar (LISP);
+static LISP cdar (LISP);
+static LISP cddr (LISP);
+static LISP siod_true_value (void);
+static LISP siod_false_value (void);
+static LISP lapply (LISP fcn, LISP args);
+static LISP listn (long n,...);
+static char *must_malloc (unsigned long size);
+static FILE *get_c_file (LISP p, FILE * deflt);
+static char *last_c_errmsg (int);
+static LISP llast_c_errmsg (int);
+static void siod_c_provide(const char *);
+
+static LISP funcall1 (LISP, LISP);
+static LISP funcall2 (LISP, LISP, LISP);
+
+static void siod_set_lib_path(const char *);
+
/* macros */
#define INTERRUPT_CHECK()
More information about the Uim-commit
mailing list