From 1878f60ebdacdd52fb05a171eb07b4bc91e9704c Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 3 Aug 2015 09:59:49 -0700 Subject: Switching some globals to lexical and changing some names. * arith.c (arith-init): Changing *flo-...* from special to lexical, and adding un-earmuffed variants. The earmuffed versions are obsolescent. Adding %pi% and %e% global lexicals. Earmuffed versions are also made global lexical, and obsolescent. * eval.c (lookup_global_var, lookup_global_var_l): New functions. (lookup_var): Uses lookup_global_var. (reg_varl): New function. (reg_var): Uses reg_var. (eval_init): Register global lexicals user-package, system-package and keyword-package. Old symbols with earmuffs are obsoleted, and also turned into global lexicals. (top-vb, top-fb): Changed to lexical. * eval.h (lookup_global_var, lookup_global_var_l, reg_varl): Declared. * genvim.txr: Scan ver.tl so that the lib-version variable is included. Extract reg_varl calls. * glob.c (glob_init): glob-err and other variables made lexical. * lib.c (get_user_package, get_system_package, get_keyword_package): Use lookup_global_var_l to avoid searching dynamic scope for lexicals which cannot be dynamically rebound. * share/txr/stdlib/ver.tl (lib-version): New global lexical variable. (*lib-version*): Turned lexical. Obsolescent. * signal.c (sig-init): sig-* variables turned lexical. * sysif.c (sysif-init): s-*, poll-* and w-* variables turned lexical. * syslog.c (syslog-init): log-* variables turned lexical. * txr.c (sysroot-init): stdlib and *txr-version* variables turned lexical. txr-version variable added, and *txr-version* is obsolescent. (txr-main): self-path variable added. *self-path* turns lexical and is obsolescent. * txr.1: Documentation updated. Lexical variables not referred to as special. Special variables referred to as special. --- syslog.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'syslog.c') diff --git a/syslog.c b/syslog.c index 2f329fba..0cb1d80e 100644 --- a/syslog.c +++ b/syslog.c @@ -55,28 +55,28 @@ static struct strm_ops syslog_strm_ops; void syslog_init(void) { - reg_var(intern(lit("log-pid"), user_package), num_fast(LOG_PID)); - reg_var(intern(lit("log-cons"), user_package), num_fast(LOG_CONS)); - reg_var(intern(lit("log-ndelay"), user_package), num_fast(LOG_NDELAY)); - reg_var(intern(lit("log-odelay"), user_package), num_fast(LOG_ODELAY)); - reg_var(intern(lit("log-nowait"), user_package), num_fast(LOG_NOWAIT)); + reg_varl(intern(lit("log-pid"), user_package), num_fast(LOG_PID)); + reg_varl(intern(lit("log-cons"), user_package), num_fast(LOG_CONS)); + reg_varl(intern(lit("log-ndelay"), user_package), num_fast(LOG_NDELAY)); + reg_varl(intern(lit("log-odelay"), user_package), num_fast(LOG_ODELAY)); + reg_varl(intern(lit("log-nowait"), user_package), num_fast(LOG_NOWAIT)); #ifdef LOG_PERROR - reg_var(intern(lit("log-perror"), user_package), num_fast(LOG_PERROR)); + reg_varl(intern(lit("log-perror"), user_package), num_fast(LOG_PERROR)); #endif - reg_var(intern(lit("log-user"), user_package), num_fast(LOG_USER)); - reg_var(intern(lit("log-daemon"), user_package), num_fast(LOG_DAEMON)); - reg_var(intern(lit("log-auth"), user_package), num_fast(LOG_AUTH)); + reg_varl(intern(lit("log-user"), user_package), num_fast(LOG_USER)); + reg_varl(intern(lit("log-daemon"), user_package), num_fast(LOG_DAEMON)); + reg_varl(intern(lit("log-auth"), user_package), num_fast(LOG_AUTH)); #ifdef LOG_AUTHPRIV - reg_var(intern(lit("log-authpriv"), user_package), num_fast(LOG_AUTHPRIV)); + reg_varl(intern(lit("log-authpriv"), user_package), num_fast(LOG_AUTHPRIV)); #endif - reg_var(intern(lit("log-emerg"), user_package), num_fast(LOG_EMERG)); - reg_var(intern(lit("log-alert"), user_package), num_fast(LOG_ALERT)); - reg_var(intern(lit("log-crit"), user_package), num_fast(LOG_CRIT)); - reg_var(intern(lit("log-err"), user_package), num_fast(LOG_ERR)); - reg_var(intern(lit("log-warning"), user_package), num_fast(LOG_WARNING)); - reg_var(intern(lit("log-notice"), user_package), num_fast(LOG_NOTICE)); - reg_var(intern(lit("log-info"), user_package), num_fast(LOG_INFO)); - reg_var(intern(lit("log-debug"), user_package), num_fast(LOG_DEBUG)); + reg_varl(intern(lit("log-emerg"), user_package), num_fast(LOG_EMERG)); + reg_varl(intern(lit("log-alert"), user_package), num_fast(LOG_ALERT)); + reg_varl(intern(lit("log-crit"), user_package), num_fast(LOG_CRIT)); + reg_varl(intern(lit("log-err"), user_package), num_fast(LOG_ERR)); + reg_varl(intern(lit("log-warning"), user_package), num_fast(LOG_WARNING)); + reg_varl(intern(lit("log-notice"), user_package), num_fast(LOG_NOTICE)); + reg_varl(intern(lit("log-info"), user_package), num_fast(LOG_INFO)); + reg_varl(intern(lit("log-debug"), user_package), num_fast(LOG_DEBUG)); reg_fun(intern(lit("openlog"), user_package), func_n3o(openlog_wrap, 1)); reg_fun(intern(lit("closelog"), user_package), func_n0(closelog_wrap)); reg_fun(intern(lit("setlogmask"), user_package), func_n1(setlogmask_wrap)); -- cgit v1.2.3