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. --- sysif.c | 68 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'sysif.c') diff --git a/sysif.c b/sysif.c index 6761b912..36013656 100644 --- a/sysif.c +++ b/sysif.c @@ -826,48 +826,48 @@ void sysif_init(void) #define S_IXOTH 0 #endif - reg_var(intern(lit("s-ifmt"), user_package), num_fast(S_IFMT)); - reg_var(intern(lit("s-ifsock"), user_package), num_fast(S_IFSOCK)); - reg_var(intern(lit("s-iflnk"), user_package), num_fast(S_IFLNK)); - reg_var(intern(lit("s-ifreg"), user_package), num_fast(S_IFREG)); - reg_var(intern(lit("s-ifblk"), user_package), num_fast(S_IFBLK)); - reg_var(intern(lit("s-ifdir"), user_package), num_fast(S_IFDIR)); - reg_var(intern(lit("s-ifchr"), user_package), num_fast(S_IFCHR)); - reg_var(intern(lit("s-ififo"), user_package), num_fast(S_IFIFO)); - reg_var(intern(lit("s-isuid"), user_package), num_fast(S_ISUID)); - reg_var(intern(lit("s-isgid"), user_package), num_fast(S_ISGID)); - reg_var(intern(lit("s-isvtx"), user_package), num_fast(S_ISVTX)); - reg_var(intern(lit("s-irwxu"), user_package), num_fast(S_IRWXU)); - reg_var(intern(lit("s-irusr"), user_package), num_fast(S_IRUSR)); - reg_var(intern(lit("s-iwusr"), user_package), num_fast(S_IWUSR)); - reg_var(intern(lit("s-ixusr"), user_package), num_fast(S_IXUSR)); - reg_var(intern(lit("s-irwxg"), user_package), num_fast(S_IRWXG)); - reg_var(intern(lit("s-irgrp"), user_package), num_fast(S_IRGRP)); - reg_var(intern(lit("s-iwgrp"), user_package), num_fast(S_IWGRP)); - reg_var(intern(lit("s-ixgrp"), user_package), num_fast(S_IXGRP)); - reg_var(intern(lit("s-irwxo"), user_package), num_fast(S_IRWXO)); - reg_var(intern(lit("s-iroth"), user_package), num_fast(S_IROTH)); - reg_var(intern(lit("s-iwoth"), user_package), num_fast(S_IWOTH)); - reg_var(intern(lit("s-ixoth"), user_package), num_fast(S_IXOTH)); + reg_varl(intern(lit("s-ifmt"), user_package), num_fast(S_IFMT)); + reg_varl(intern(lit("s-ifsock"), user_package), num_fast(S_IFSOCK)); + reg_varl(intern(lit("s-iflnk"), user_package), num_fast(S_IFLNK)); + reg_varl(intern(lit("s-ifreg"), user_package), num_fast(S_IFREG)); + reg_varl(intern(lit("s-ifblk"), user_package), num_fast(S_IFBLK)); + reg_varl(intern(lit("s-ifdir"), user_package), num_fast(S_IFDIR)); + reg_varl(intern(lit("s-ifchr"), user_package), num_fast(S_IFCHR)); + reg_varl(intern(lit("s-ififo"), user_package), num_fast(S_IFIFO)); + reg_varl(intern(lit("s-isuid"), user_package), num_fast(S_ISUID)); + reg_varl(intern(lit("s-isgid"), user_package), num_fast(S_ISGID)); + reg_varl(intern(lit("s-isvtx"), user_package), num_fast(S_ISVTX)); + reg_varl(intern(lit("s-irwxu"), user_package), num_fast(S_IRWXU)); + reg_varl(intern(lit("s-irusr"), user_package), num_fast(S_IRUSR)); + reg_varl(intern(lit("s-iwusr"), user_package), num_fast(S_IWUSR)); + reg_varl(intern(lit("s-ixusr"), user_package), num_fast(S_IXUSR)); + reg_varl(intern(lit("s-irwxg"), user_package), num_fast(S_IRWXG)); + reg_varl(intern(lit("s-irgrp"), user_package), num_fast(S_IRGRP)); + reg_varl(intern(lit("s-iwgrp"), user_package), num_fast(S_IWGRP)); + reg_varl(intern(lit("s-ixgrp"), user_package), num_fast(S_IXGRP)); + reg_varl(intern(lit("s-irwxo"), user_package), num_fast(S_IRWXO)); + reg_varl(intern(lit("s-iroth"), user_package), num_fast(S_IROTH)); + reg_varl(intern(lit("s-iwoth"), user_package), num_fast(S_IWOTH)); + reg_varl(intern(lit("s-ixoth"), user_package), num_fast(S_IXOTH)); #endif #if HAVE_POLL - reg_var(intern(lit("poll-in"), user_package), num_fast(POLLIN)); - reg_var(intern(lit("poll-out"), user_package), num_fast(POLLOUT)); - reg_var(intern(lit("poll-err"), user_package), num_fast(POLLERR)); + reg_varl(intern(lit("poll-in"), user_package), num_fast(POLLIN)); + reg_varl(intern(lit("poll-out"), user_package), num_fast(POLLOUT)); + reg_varl(intern(lit("poll-err"), user_package), num_fast(POLLERR)); #ifdef POLLPRI - reg_var(intern(lit("poll-pri"), user_package), num_fast(POLLPRI)); + reg_varl(intern(lit("poll-pri"), user_package), num_fast(POLLPRI)); #endif #ifdef POLLRDHUP - reg_var(intern(lit("poll-rdhup"), user_package), num_fast(POLLRDHUP)); + reg_varl(intern(lit("poll-rdhup"), user_package), num_fast(POLLRDHUP)); #endif #ifdef POLLNVAL - reg_var(intern(lit("poll-nval"), user_package), num_fast(POLLNVAL)); + reg_varl(intern(lit("poll-nval"), user_package), num_fast(POLLNVAL)); #endif #ifdef POLLRDBAND - reg_var(intern(lit("poll-rdband"), user_package), num_fast(POLLRDBAND)); + reg_varl(intern(lit("poll-rdband"), user_package), num_fast(POLLRDBAND)); #endif #ifdef POLLWRBAND - reg_var(intern(lit("poll-wrband"), user_package), num_fast(POLLWRBAND)); + reg_varl(intern(lit("poll-wrband"), user_package), num_fast(POLLWRBAND)); #endif #endif @@ -889,13 +889,13 @@ void sysif_init(void) reg_fun(intern(lit("w-ifcontinued"), user_package), func_n1(wifcontinued)); #endif #ifdef WNOHANG - reg_var(intern(lit("w-nohang"), user_package), num_fast(WNOHANG)); + reg_varl(intern(lit("w-nohang"), user_package), num_fast(WNOHANG)); #endif #ifdef WUNTRACED - reg_var(intern(lit("w-untraced"), user_package), num_fast(WUNTRACED)); + reg_varl(intern(lit("w-untraced"), user_package), num_fast(WUNTRACED)); #endif #ifdef WCONTINUED - reg_var(intern(lit("w-continued"), user_package), num_fast(WCONTINUED)); + reg_varl(intern(lit("w-continued"), user_package), num_fast(WCONTINUED)); #endif reg_fun(intern(lit("dupfd"), user_package), func_n2o(dup_wrap, 1)); #endif -- cgit v1.2.3