From 40a8c6fc74e670863ed8b5e923451b9b9c28ef8c Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 4 Nov 2014 16:29:08 -0800 Subject: [PATCH 01/14] Various cleanups and renamings, part 1. --- Makefile | 2 +- g/a.c | 3 +- g/e.c | 10 +- g/m.c | 4 +- g/t.c | 12 +- include/all.h | 55 ++- include/c/portable.h | 54 +-- include/c/tune.h | 24 - include/f/bail.h | 488 -------------------- include/f/benx.h | 192 -------- include/f/cash.h | 271 ----------- include/f/chad.h | 107 ----- include/f/coal.h | 1032 ------------------------------------------ include/f/dash.h | 73 --- include/f/funj.h | 430 ------------------ include/f/hevn.h | 44 -- include/f/host.h | 333 -------------- include/f/loom.h | 970 --------------------------------------- include/f/nock.h | 49 -- include/f/rail.h | 673 --------------------------- include/f/shed.h | 93 ---- include/f/trac.h | 273 ----------- include/f/unix.h | 78 ---- include/f/wire.h | 108 ----- include/g/a.h | 390 ++++++++++++++++ include/g/e.h | 55 +++ include/g/h.h | 72 +++ include/g/j.h | 103 ++++- include/g/v.h | 58 ++- include/n/arvo.h | 40 -- include/n/glob.h | 54 --- include/n/hash.h | 73 --- include/n/jets.h | 95 ---- include/n/meze.h | 83 ---- include/n/noun.h | 89 ---- include/n/road.h | 238 ---------- include/n/save.h | 49 -- include/n/tune.h | 17 - include/v/vere.h | 2 +- j/5/aesc.c | 10 +- j/5/shax.c | 6 +- v/cttp.c | 2 +- v/main.c | 4 +- v/sist.c | 12 +- v/time.c | 4 +- v/unix.c | 6 +- w/test.c | 2 +- 47 files changed, 783 insertions(+), 6059 deletions(-) delete mode 100644 include/f/bail.h delete mode 100644 include/f/benx.h delete mode 100644 include/f/cash.h delete mode 100644 include/f/chad.h delete mode 100644 include/f/coal.h delete mode 100644 include/f/dash.h delete mode 100644 include/f/funj.h delete mode 100644 include/f/hevn.h delete mode 100644 include/f/host.h delete mode 100644 include/f/loom.h delete mode 100644 include/f/nock.h delete mode 100644 include/f/rail.h delete mode 100644 include/f/shed.h delete mode 100644 include/f/trac.h delete mode 100644 include/f/unix.h delete mode 100644 include/f/wire.h delete mode 100644 include/n/arvo.h delete mode 100644 include/n/glob.h delete mode 100644 include/n/hash.h delete mode 100644 include/n/jets.h delete mode 100644 include/n/meze.h delete mode 100644 include/n/noun.h delete mode 100644 include/n/road.h delete mode 100644 include/n/save.h delete mode 100644 include/n/tune.h diff --git a/Makefile b/Makefile index 8cea47a8f9..7a52d5c082 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ LIBS=-lssl -lcrypto -lgmp -lncurses -lsigsegv $(OSLIBS) endif INCLUDE=include -MDEFINES=-DU2_OS_$(OS) -DU2_OS_ENDIAN_$(ENDIAN) -D U2_LIB=\"$(LIB)\" +MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\" # NOTFORCHECKIN - restore -O3 CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \ diff --git a/g/a.c b/g/a.c index 6b4910bf76..798c15dfe1 100644 --- a/g/a.c +++ b/g/a.c @@ -4,6 +4,7 @@ */ #include "all.h" + /* _box_slot(): select the right free list to search for a block. */ c3_w @@ -266,7 +267,7 @@ _ca_walloc(c3_w len_w) c3_assert(0 == box_u->use_w); box_u->use_w = 1; -#ifdef U2_MEMORY_DEBUG +#ifdef U3_MEMORY_DEBUG box_u->cod_w = u3_Code; #endif return u3_co_boxto(box_u); diff --git a/g/e.c b/g/e.c index 147b4dd6b7..300d231f23 100644 --- a/g/e.c +++ b/g/e.c @@ -539,11 +539,11 @@ _ce_patch_compose(void) static void _ce_sync(c3_i fid_i) { -#if defined(U2_OS_linux) +#if defined(U3_OS_linux) fdatasync(fid_i); -#elif defined(U2_OS_osx) +#elif defined(U3_OS_osx) fcntl(fid_i, F_FULLFSYNC); -#elif defined(U2_OS_bsd) +#elif defined(U3_OS_bsd) fsync(fid_i); #else # error "port: datasync" @@ -851,7 +851,7 @@ u3_ce_init(c3_o chk_o) if ( -1 == (c3_ps)map_v ) { fprintf(stderr, "boot: map failed twice\r\n"); } else { - fprintf(stderr, "boot: map failed - try U2_OS_LoomBase %p\r\n", map_v); + fprintf(stderr, "boot: map failed - try U3_OS_LoomBase %p\r\n", map_v); } exit(1); } @@ -980,7 +980,7 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) snprintf(pas_c, 2048, "%s/.urb/urbit.pill", cpu_c); if ( -1 == stat(pas_c, &buf_u) ) { - snprintf(pas_c, 2048, "%s/urbit.pill", U2_LIB); + snprintf(pas_c, 2048, "%s/urbit.pill", U3_LIB); } printf("boot: loading %s\r\n", pas_c); u3_cv_make(pas_c); diff --git a/g/m.c b/g/m.c index efaa09bd81..4579531c0f 100644 --- a/g/m.c +++ b/g/m.c @@ -486,12 +486,12 @@ u3_cm_bail(u3_noun how) str_c[2] = ((how >> 16) & 0xff); str_c[3] = ((how >> 24) & 0xff); str_c[4] = 0; - fprintf(stderr, "bail: %s (at %llu)\r\n", str_c, u3N); + fprintf(stderr, "bail: %s\r\n", str_c); } else { c3_assert(u3_so(u3ud(u3h(how)))); - fprintf(stderr, "bail: %d (at %llu)\r\n", u3h(how), u3N); + fprintf(stderr, "bail: %d\r\n", u3h(how)); u3_cm_p("bail", u3t(how)); } } diff --git a/g/t.c b/g/t.c index d7ef46d2cb..de3dcc7daf 100644 --- a/g/t.c +++ b/g/t.c @@ -133,7 +133,7 @@ u3_ct_boot(void) printf("knox: %llu\r\n", (u3R->pro.nox_d / 1000ULL)); u3R->pro.nox_d = 0; -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) #if 0 { struct itimerval itm_v; @@ -151,9 +151,9 @@ u3_ct_boot(void) setitimer(ITIMER_PROF, &itm_v, 0); } #endif -#elif defined(U2_OS_linux) +#elif defined(U3_OS_linux) // TODO: support profiling on linux -#elif defined(U2_OS_bsd) +#elif defined(U3_OS_bsd) // TODO: support profiling on bsd #else #error "port: profiling" @@ -165,7 +165,7 @@ u3_ct_boot(void) void u3_ct_boff(void) { -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) struct sigaction sig_s; struct itimerval itm_v; @@ -179,9 +179,9 @@ u3_ct_boff(void) sigaction(SIGPROF, &sig_s, 0); u3_ct_damp(); -#elif defined(U2_OS_linux) +#elif defined(U3_OS_linux) // TODO: support profiling on linux -#elif defined(U2_OS_bsd) +#elif defined(U3_OS_bsd) // TODO: support profiling on bsd #else #error "port: profiling" diff --git a/include/all.h b/include/all.h index f5f055d7d2..c52db8a14a 100644 --- a/include/all.h +++ b/include/all.h @@ -44,17 +44,52 @@ # include "c/motes.h" # include "c/comd.h" - /** n: the u3 layer, definitions and data structures. + /** miscellaneous definitions and data structures. **/ -# include "n/tune.h" -# include "n/noun.h" -# include "n/save.h" -# include "n/hash.h" -# include "n/road.h" -# include "n/jets.h" -# include "n/meze.h" -# include "n/arvo.h" -# include "n/glob.h" + /* u3_yes, u3_no, u3_nul; + ** + ** Our Martian booleans and list terminator; empty string; not a noun. + */ +# define u3_yes 0 +# define u3_no 1 +# define u3_nul 0 +# define u3_blip 0 + + /* Tools for Martian booleans. + */ +# define u3_so(x) (u3_yes == (x)) +# define u3_ne(x) (u3_no == (x)) +# define u3_say(x) ( (x) ? u3_yes : u3_no ) +# define u3_not(x) ( (x == u3_yes) ? u3_no : u3_yes ) +# define u3_and(x, y) ( (u3_so(x) && u3_so(y)) ? u3_yes : u3_no ) +# define u3_or(x, y) ( (u3_so(x) || u3_so(y)) ? u3_yes : u3_no ) + +# define u3_assure(x) if ( u3_ne(x) ) { u3_cm_bail(c3__fail); } +# define u3_assent(x) if ( u3_ne(x) ) { u3_cm_bail(c3__exit); } + + + /** Aliases - selective and syntactically unique. + **/ +# define u3h(som) u3_cx_h(som) +# define u3t(som) u3_cx_t(som) +# define u3at(axe, som) u3_cx_at(axe, som) + +# define u3nc(a, b) u3_ci_cell(a, b) +# define u3nt(a, b, c) u3_ci_trel(a, b, c) +# define u3nq(a, b, c, d) u3_ci_qual(a, b, c, d) + +# define u3du(som) (u3_cr_du(som)) +# define u3ud(som) (u3_cr_ud(som)) + +# define u3k(som) u3_ca_gain(som) +# define u3z(som) u3_ca_lose(som) + + /** Arvo macros. + **/ +# define u3_do(txt_c, arg) u3_cv_do(txt_c, arg) +# define u3_dc(txt_c, a, b) u3_cv_do(txt_c, u3nc(a, b)) +# define u3_dt(txt_c, a, b, c) u3_cv_do(txt_c, u3nt(a, b, c)) +# define u3_dq(txt_c, a, b, c, d) u3_cv_do(txt_c, u3nt(a, b, c, d)) /** g: the u3 layer, functions. **/ diff --git a/include/c/portable.h b/include/c/portable.h index 4c93259d4e..193970df2a 100644 --- a/include/c/portable.h +++ b/include/c/portable.h @@ -16,7 +16,7 @@ *** porting layer here. Include them directly in the *** C file. **/ -# if defined(U2_OS_linux) +# if defined(U3_OS_linux) # include # include # include @@ -31,7 +31,7 @@ # include # include -# elif defined(U2_OS_osx) +# elif defined(U3_OS_osx) # include # include # include @@ -47,7 +47,7 @@ # include # include -# elif defined(U2_OS_bsd) +# elif defined(U3_OS_bsd) # include # include # include @@ -69,23 +69,23 @@ /** Address space layout. **/ -# if defined(U2_OS_linux) -# define U2_OS_LoomBase 0x404db000 -# define U2_OS_LoomBits 29 // ie, 2^29 words == 2GB -# elif defined(U2_OS_osx) +# if defined(U3_OS_linux) +# define U3_OS_LoomBase 0x404db000 +# define U3_OS_LoomBits 29 // ie, 2^29 words == 2GB +# elif defined(U3_OS_osx) # ifdef __LP64__ -# define U2_OS_LoomBase 0x200000000 +# define U3_OS_LoomBase 0x200000000 # else -# define U2_OS_LoomBase 0x4000000 +# define U3_OS_LoomBase 0x4000000 # endif -# define U2_OS_LoomBits 29 // ie, 2^29 words == 2GB -# elif defined(U2_OS_bsd) +# define U3_OS_LoomBits 29 // ie, 2^29 words == 2GB +# elif defined(U3_OS_bsd) # ifdef __LP64__ -# define U2_OS_LoomBase 0x200000000 +# define U3_OS_LoomBase 0x200000000 # else -# define U2_OS_LoomBase 0x4000000 +# define U3_OS_LoomBase 0x4000000 # endif -# define U2_OS_LoomBits 29 // ie, 2^29 words == 2GB +# define U3_OS_LoomBits 29 // ie, 2^29 words == 2GB # else # error "port: LoomBase" # endif @@ -110,7 +110,7 @@ /** Private C "extensions." *** *** Except for these and main(), any function, macro, or structure - *** names must be prefixed either by u3_/U2_ (for public names), + *** names must be prefixed either by u3_/U3_ (for public names), *** or _ (for static and other file-local names). **/ /* Endianness. @@ -118,22 +118,22 @@ # define c3_endian_little 0 # define c3_endian_big 1 -# ifdef U2_OS_ENDIAN_little +# ifdef U3_OS_ENDIAN_little # define c3_endian c3_endian_little -# elif defined(U2_OS_ENDIAN_big) +# elif defined(U3_OS_ENDIAN_big) # define c3_endian c3_endian_big # else -# error "port: U2_OS_ENDIAN" +# error "port: U3_OS_ENDIAN" # endif /* Byte swapping. */ -# if defined(U2_OS_linux) || defined(U2_OS_bsd) +# if defined(U3_OS_linux) || defined(U3_OS_bsd) # define c3_bswap_16(x) bswap_16(x) # define c3_bswap_32(x) bswap_32(x) # define c3_bswap_64(x) bswap_64(x) -# elif defined(U2_OS_osx) +# elif defined(U3_OS_osx) # define c3_bswap_16(x) NXSwapShort(x) # define c3_bswap_32(x) NXSwapInt(x) # define c3_bswap_64(x) NXSwapLongLong(x) @@ -143,9 +143,9 @@ /* Sync */ -# if defined(U2_OS_linux) || defined(U2_OS_bsd) +# if defined(U3_OS_linux) || defined(U3_OS_bsd) # define c3_sync(fd) (fdatasync(fd)) -# elif defined(U2_OS_osx) +# elif defined(U3_OS_osx) # define c3_sync(fd) (fcntl(fd, F_FULLFSYNC, 0)) # else # error "port: sync" @@ -153,10 +153,10 @@ /* Purge */ -# if defined(U2_OS_linux) +# if defined(U3_OS_linux) # include # define c3_fpurge __fpurge -# elif defined(U2_OS_bsd) || defined(U2_OS_osx) +# elif defined(U3_OS_bsd) || defined(U3_OS_osx) # define c3_fpurge fpurge # else # error "port: fpurge" @@ -164,12 +164,12 @@ /* Stat struct */ -# if defined(U2_OS_linux) +# if defined(U3_OS_linux) # define c3_stat_mtime(dp) (u3_time_t_in_ts((dp)->st_mtime)) -# elif defined(U2_OS_osx) +# elif defined(U3_OS_osx) # define c3_stat_mtime(dp) (u3_time_in_ts(&((dp)->st_mtimespec))) # define lseek64 lseek -# elif defined(U2_OS_bsd) +# elif defined(U3_OS_bsd) # define c3_stat_mtime(dp) (u3_time_in_ts(&((dp)->st_mtim))) # define lseek64 lseek # else diff --git a/include/c/tune.h b/include/c/tune.h index c7a4ec72ea..e69de29bb2 100644 --- a/include/c/tune.h +++ b/include/c/tune.h @@ -1,24 +0,0 @@ -/* include/c/tune.h -** -** This file is in the public domain. -*/ - /** Tuning ifdefs. Comment out to disable. - **/ - /** Profiling. - **/ - /* Profile at all. - */ -# define U2_PROFILE - - /* Measure memory usage. - */ -# define U2_PROFILE_MEMORY - - /* Measure execution time. - */ -# define U2_PROFILE_SPEED - - /* Describe execution patterns. - */ -# define U2_PROFILE_SHAPE - diff --git a/include/f/bail.h b/include/f/bail.h deleted file mode 100644 index dc0b4999a2..0000000000 --- a/include/f/bail.h +++ /dev/null @@ -1,488 +0,0 @@ -/* include/bail.h -** -** This file is in the public domain. -*/ - /** Data types. - **/ - /** Structures - in loom space. - **/ - /* u2_loom_kite: jump buffer. - */ - typedef struct _u2_loom_kite { - /* Parent kite. - */ - u2_ray par_r; - - /* Interpreter trace at call point. - */ - u2_noun tax; - - /* Profiling action stack. - */ - u2_noun don; - - /* C escape buffer. - */ - jmp_buf buf_f; - } u2_loom_kite; - -# define u2_kite_tax(kit_r) *u2_at(kit_r, u2_loom_kite, tax) -# define u2_kite_don(kit_r) *u2_at(kit_r, u2_loom_kite, don) -# define u2_kite_par_r(kit_r) *u2_at(kit_r, u2_loom_kite, par_r) -# define u2_kite_buf_r(kit_r) u2_aftr(kit_r, u2_loom_kite, buf_f) - - - /** Functions. - **/ - /** Fail-specific. - **/ - /* u2_bl_bail(): bail out. - ** - ** Bail codes: - ** - ** c3__exit for normal exit with correct trace - ** c3__fail for abnormal failure without assumptions - ** - ** When in doubt, fail. - ** - ** In both cases, a mark-and-sweep is necessary (and - ** not currently performed) to clean up leaks. - */ - u2_noun // blocked - u2_bl_bail(u2_wire wir_r, - c3_l how_l); - - /* u2_bl_yes(): assure yes. - */ -# define u2_bl_yes(wir_r, feg) \ - ( (u2_yes == (feg)) ? 0 : u2_bl_bail(wir_r, c3__fail) ) - - /* u2_bl_good(): test for u2_none. - */ - u2_noun - u2_bl_good(u2_wire wir_r, u2_weak som); - - /* u2_bl_some(): test for zero ray. - */ - u2_ray - u2_bl_some(u2_wire wir_r, u2_ray ray_r); - - /* u2_bl_flat(): force to atom. - */ - u2_atom - u2_bl_flat(u2_wire wir_r, u2_noun som); - - - /** General. All functions bail out on error. - **/ - /** Cell access. - **/ - /* u2_bi_h(): - ** - ** Return the head of (a). - */ - u2_noun - u2_bi_h(u2_wire wir_r, - u2_noun a); - -# define u2_xh(wir_r, a) u2_bi_h(wir_r, a) -# define u2_xt(wir_r, a) u2_bi_t(wir_r, a) - - /* u2_bi_t(): - ** - ** Return the tail of (a). - */ - u2_noun - u2_bi_t(u2_wire wir_r, - u2_noun a); - - - /* u2_bi_frag(): - ** - ** Return fragment (a) of (b). - */ - u2_noun - u2_bi_frag(u2_wire wir_r, - u2_atom a, - u2_noun b); - - /* u2_bi_cell(): - ** - ** Factor `a` as a cell `[b c]`. - */ - void - u2_bi_cell(u2_wire wir_r, - u2_noun a, - u2_noun* b, - u2_noun* c); - - /* u2_bi_qual(): - ** - ** Factor `a` as a quadruple `[b c d e]`. - */ - void - u2_bi_qual(u2_wire wir_r, - u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d, - u2_noun* e); - - /* u2_bi_quil(): - ** - ** Factor `a` as a quintuple `[b c d e f]`, or bail. - */ - void - u2_bi_quil(u2_wire wir_r, - u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d, - u2_noun* e, - u2_noun* f); - - /* u2_bi_trel(): - ** - ** Factor `a` as a trel `[b c d]`, or bail. - */ - void - u2_bi_trel(u2_wire wir_r, - u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d); - - /** Tracing. - **/ - /* u2_bl_push(): push on trace stack. - */ - void - u2_bl_push(u2_wire wir_r, - u2_noun mon); // transfer - - /* u2_bl_mean(): push `[%mean roc]` on trace stack. - */ - void - u2_bl_mean(u2_wire wir_r, - u2_noun roc); // transfer - - /* u2_bl_error(): simple string error. - */ - u2_noun // blocked - u2_bl_error(u2_wire wir_r, - const c3_c* err_c); // retain - - /* u2_bl_drop(): drop from meaning stack. - */ - void - u2_bl_drop(u2_wire wir_r); - - /** Atom access. - **/ - /* u2_bi_met(): - ** - ** Return the size of (b) in bits, rounded up to - ** (1 << a_y). - ** - ** For example, (a_y == 3) returns the size in bytes. - */ - c3_w - u2_bi_met(u2_wire wir_r, - c3_y a_y, - u2_noun b); - - /* u2_bi_bit(): - ** - ** Return bit (a_w) of (b). - */ - c3_b - u2_bi_bit(u2_wire wir_r, - c3_w a_w, - u2_noun b); - - /* u2_bi_byte(): - ** - ** Return byte (a_w) of (b). - */ - c3_y - u2_bi_byte(u2_wire wir_r, - c3_w a_w, - u2_noun b); - - /* u2_bi_bytes(): - ** - ** Copy bytes (a_w) through (a_w + b_w - 1) from (d) to (c). - */ - void - u2_bi_bytes(u2_wire wir_r, - c3_w a_w, - c3_w b_w, - c3_y* c_y, - u2_noun d); - - /* u2_bi_mp(): - ** - ** Copy (b) into (a_mp). - */ - void - u2_bi_mp(u2_wire wir_r, - mpz_t a_mp, - u2_noun b); - - /* u2_bi_word(): - ** - ** Return word (a_w) of (b). - */ - c3_w - u2_bi_word(u2_wire wir_r, - c3_w a_w, - u2_noun b); - - /* u2_bi_words(): - ** - ** Copy words (a_w) through (a_w + b_w - 1) from (d) to (c). - */ - void - u2_bi_words(u2_wire wir_r, - c3_w a_w, - c3_w b_w, - c3_w* c_w, - u2_noun d); - - /** Allocation. - **/ - /* u2_bn_slab(): - ** - ** Create an atomic slab of `len` words. - */ - u2_ray - u2_bn_slab(u2_wire wir_r, - c3_w len_w); - - /* u2_bn_slaq(): - ** - ** Create an atomic slab of `len` bloqs of size `met`. - */ - u2_ray - u2_bn_slaq(u2_wire wir_r, - c3_g met_g, - c3_w len_w); - - /** Noun construction. - **/ - /* u2_bn_bytes(): - ** - ** Copy [a] bytes from [b]. - */ - u2_noun - u2_bn_bytes(u2_wire wir_r, - c3_w a_w, - const c3_y* b_y); - - /* u2_bn_string(): - ** - ** u2_bn_bytes(wir_r, strlen(a_c), (c3_y *)a_c); - */ - u2_noun - u2_bn_string(u2_wire wir_r, - const c3_c* a_c); - - /* u2_bn_tape(): - ** - ** Create an atomic string from a list of bytes. - */ - u2_noun - u2_bn_tape(u2_wire wir_r, - u2_list lit); - - /* u2_bn_cell(): - ** - ** Produce the cell [a b]. - */ - u2_noun - u2_bn_cell(u2_wire wir_r, - u2_noun a, - u2_noun b); -# define u2_bc(wir_r, a, b) u2_bn_cell(wir_r, a, b) -# define u2_bo(wir_r, a) u2_bn_cell(wir_r, a, _0) - - /* u2_bn_decimal(): - ** - ** On (wir_r), write (list), a list of digits, as a decimal. - */ - u2_noun - u2_bn_decimal(u2_wire wir_r, - u2_list lit); - - /* u2_bn_heximal(): - ** - ** On (wir_r), write (lit), a list of digits, as a hexadecimal. - */ - u2_noun - u2_bn_heximal(u2_wire wir_r, - u2_list lit); - - /* u2_bn_ice(): - ** - ** Produce `a`, not referencing the can. Copy or gain reference. - */ - u2_noun - u2_bn_ice(u2_wire wir_r, - u2_weak a); -# define u2_bx(wir_r, a) u2_bn_ice(wir_r, a) - - /* u2_bn_list(): - ** - ** Generate a null-terminated list, with u2_none as terminator. - */ - u2_noun - u2_bn_list(u2_wire wir_r, ...); - - /* u2_bn_nock(): - ** - ** Nock or bail. - */ - u2_noun // transfer - u2_bn_nock(u2_wire wir_r, - u2_noun bus, // retain - u2_noun fol); // retain - - /* u2_bn_mp(): - ** - ** Copy the GMP integer [a] into an atom. Free it. - */ - u2_noun - u2_bn_mp(u2_wire wir_r, - mpz_t a_mp); - - /* u2_bn_qual(): - ** - ** Produce the quadruple [a b c d]. - */ - u2_noun - u2_bn_qual(u2_wire wir_r, - u2_noun a, - u2_noun b, - u2_noun c, - u2_noun d); -# define u2_bq(wir_r, a, b, c, d) u2_bn_qual(wir_r, a, b, c, d) - - /* u2_bn_quil(): - ** - ** Produce the quintuple [a b c d]. - */ - u2_noun - u2_bn_quil(u2_wire wir_r, - u2_noun a, - u2_noun b, - u2_noun c, - u2_noun d, - u2_noun e); -# define u2_bu(wir_r, a, b, c, d, e) u2_bn_quil(wir_r, a, b, c, d, e) - - /* u2_bn_trel(): - ** - ** Produce the triple [a b c]. - */ - u2_noun - u2_bn_trel(u2_wire wir_r, - u2_noun a, - u2_noun b, - u2_noun c); -# define u2_bt(wir_r, a, b, c) u2_bn_trel(wir_r, a, b, c) - - /* u2_bn_words(): - ** - ** Copy [a] words from [b] into an atom. - */ - u2_noun - u2_bn_words(u2_wire wir_r, - c3_w a_w, - const c3_w* b_w); - - /* u2_bn_molt(): - ** - ** Mutate `som` with a 0-terminated list of axis, noun pairs. - ** Axes must be cats (31 bit). - */ - u2_noun // transfer - u2_bn_molt(u2_wire wir_r, - u2_noun som, // retain - ...); // retain - - /* u2_bn_molf(): - ** - ** As u2_bn_molt(), with argument pointer. - */ - u2_noun - u2_bn_molf(u2_wire wir_r, - u2_noun som, - va_list vap); - - /* u2_bn_mang(): - ** - ** Kick a core, substituting axes with nouns. - */ - u2_noun - u2_bn_mang(u2_wire wir_r, - u2_noun cor, - ...); // nouns - - /* u2_bn_mong(): - ** - ** Call by gate and sample (new convention). - ** Caller retains `gat`, transfers `sam`. - */ - u2_noun // produce - u2_bn_mong(u2_wire wir_r, - u2_noun gat, // retain - u2_noun sam); // submit - - /* u2_bn_hook(): - ** - ** Execute hook from core. - */ - u2_noun // transfer - u2_bn_hook(u2_wire wir_r, - u2_noun cor, // retain - const c3_c* tam_c); - - /* u2_bn_cook(): - ** - ** Reverse hook as molt. - */ - u2_noun // transfer - u2_bn_cook(u2_wire wir_r, - u2_noun cor, // retain - const c3_c* tam_c, - u2_noun som); // transfer - - /* u2_bn_gart(): - ** - ** Call by core, hook, sample. - */ - u2_noun - u2_bn_gart(u2_wire wir_r, - u2_noun cor, - const c3_c* tam_c, - u2_noun sam); - - /* u2_bn_gort(): - ** - ** Call by core, depth, hook, molt list. - */ - u2_noun - u2_bn_gort(u2_wire wir_r, - u2_noun cor, - const c3_c* tam_c, - ...); - - /* u2_bn_wait(): - ** - ** Produce the functional equivalent of `|.(~(tam cor sam))`. - */ - u2_noun // produce - u2_bn_wait(u2_wire wir_r, - u2_noun cor, // retain - u2_noun sam, // retain - const c3_c* tam_c); // retain diff --git a/include/f/benx.h b/include/f/benx.h deleted file mode 100644 index 64d51b7816..0000000000 --- a/include/f/benx.h +++ /dev/null @@ -1,192 +0,0 @@ -/* include/benx.h -** -** This file is in the public domain. -*/ - /** Data structures. - **/ - /* u2_loom_benx: tracing, profiling, debugging - */ - typedef struct _u2_loom_benx { - /* Source position debug stack: - ** - ** *(list ~[* [@ @] [@ @]]) - */ - u2_weak zat; // on shed - - /* Manual context debug stack: - ** - ** *(list %{nap}) - */ - u2_weak zof; // on shed - - /* Interpreter steps. - */ - c3_d sap_d; - - /* Words copied. - */ - c3_d cop_d; - - /* Matching comparisons. - */ - c3_d det_d; - - /* Jet activations. - */ - c3_d jax_d; - - /* User-defined activations. - */ - c3_d use_d; - - /* Current depth of C stack. - */ - c3_w wac_w; - - /* Maximum depth of C stack. - */ - c3_w wax_w; - - /* Original words in wire. - */ - c3_w lif_w; - - /* Original words in basket. - */ - c3_w bos_w; - - /* Unix time in seconds. - */ - c3_w sec_w; - - /* Unix time in microseconds. - */ - c3_w usc_w; - } u2_loom_benx; - -#define u2_benx_at(bex_r, wof) *u2_at(bex_r, u2_loom_benx, wof) -#define u2_benx_be(bex_r, ite, wof) *u2_be(bex_r, u2_loom_benx, ite, wof) - - - /** Functions. - **/ - /* u2_bx_boot(): reset the performance log. - */ - void - u2_bx_boot(u2_ray wir_r); - - /* u2_bx_post(): export and reset the performance log. - ** - ** zat: source position stack (on shed) - ** zof: programer action stack (on shed) - ** sap: number of steps - ** cop: number of words copied - ** det: number of identical nouns compared - ** jax: number of jet activations - ** use: number of user counts - ** wax: maximum depth of C stack - ** viq: words in wire allocated - ** zor: words in basket allocated - ** ums: number of milliseconds consumed - */ - u2_bean - u2_bx_post(u2_ray wir_r, - u2_noun* zat, - u2_noun* zof, - c3_d* sap_d, - c3_d* cop_d, - c3_d* det_d, - c3_d* jax_d, - c3_d* use_d, - c3_w* wax_w, - c3_ws* viq_ws, - c3_ws* zor_ws, - c3_w* ums_w); - - /* u2_bx_spot(): declare source position. - */ - void - u2_bx_spot(u2_ray wir_r, - u2_noun hod); // transfer - - /* u2_bx_loaf(): print debug wall. - */ - void - u2_bx_loaf(u2_ray wir_r, - u2_noun wal); // retain - - /* u2_bx_bean_ent(), u2_bx_bean_out(): enter and exit execution state. - */ - void - u2_bx_bean_ent(u2_ray wir_r, - u2_noun hod); // transfer - void - u2_bx_bean_out(u2_ray wir_r); - - /* u2_bx_step(): note interpreter step. - */ - void - u2_bx_step(u2_ray wir_r); - - /* u2_bx_copy(): note `cop` copied words. - */ - void - u2_bx_copy(u2_ray wir_r, - c3_w cop_w); - - /* u2_bx_dent(): note 'det' identicals. - */ - void - u2_bx_dent(u2_ray wir_r, - c3_w det_w); - - /* u2_bx_shed(): note `wad` allocated/freed words in hangar. - */ - void - u2_bx_shed(u2_ray wir_r, - c3_ws wad_ws); - - /* u2_bx_bask(): note `wad` allocated/freed words in basket. - */ - void - u2_bx_bask(u2_ray wir_r, - c3_ws wad_ws); - - /* u2_bx_sink(): go deeper (call) in the C stack. - */ - void - u2_bx_sink(u2_ray wir_r); - - /* u2_bx_rise(): go shallower (return) in the C stack. - */ - void - u2_bx_rise(u2_ray wir_r); - - /* u2_bx_used(): report a user count. - */ - void - u2_bx_used(u2_ray wir_r); - - /* u2_bx_flew(): report a jet activation. - */ - void - u2_bx_flew(u2_ray wir_r); - - /* u2_bx_mark(): update memory watermarks. - */ - void - u2_bx_mark(u2_ray wir_r); - - /* u2_bx_show(): print benchmark report and clear structure. - */ - void - u2_bx_show(u2_ray wir_r); - - /* u2_bx_warn(): report a warning at file and line. - */ - void - u2_bx_warn(u2_ray wir_r, - const c3_c* fil_c, - c3_w lyn_w); -# define u2_bx_warn_here(wir_r) u2_bx_warn(wir_r, __FILE__, __LINE__) - diff --git a/include/f/cash.h b/include/f/cash.h deleted file mode 100644 index aa5bb41679..0000000000 --- a/include/f/cash.h +++ /dev/null @@ -1,271 +0,0 @@ -/* include/cash.h -** -** This file is in the public domain. -*/ - /** Hash-table design: - *** - *** The cash system is a 16-way hash tree designed to - *** scale smoothly, remaining small for small usage - *** and fast for big usage. It is also salted for use - *** of multiple associations in the same table. - *** - *** A logical key is the combination of an opaque - *** function salt, any number < (1 << 31), and a - *** sample list. Matches are in every case within - *** the salt. - *** - *** All the nouns in the sample list are equal, but - *** duplicate. Comparing duplicates is expensive, so - *** the hash-table stores every duplicate it finds. - *** - *** The search key is the mug of the salt, XORed - *** with the mug of the sample. [XX - This sacrifices - *** efficiency to internal convenience and should - *** be replaced with direct salt.] - *** - *** A single slot stores a single entry. If a new entry - *** is added, the slot expands to a 16-way table. If the - *** table is lightly filled, slots are collision-mapped. - *** If it is heavily filled, slots are radix-mapped. - *** - *** Full key collisions, which are inevitable and not at - *** all improbable, revert to linear search. 16 collisions - *** on the same 31-bit key will produce storage failure. - *** - *** Future revisions should add a reclamation mode based on - *** the "clock algorithm" (a variant on LRU). The clock - *** rotates around search-key space. Entries are reclaimed - *** if they are clocked out and either key or value has a - *** reference count of 1. - **/ - - /** Tunable constants. - **/ - /* A 16-way subtable with remaining keyspace switches up to laminar - ** mode when it exceeds `cash_hi` recursively counted entries, and - ** reverts to collision mode when it falls back below `cash_lo`. - */ -# define u2_tune_cash_lo 6 -# define u2_tune_cash_hi 10 - - /** Data types. - **/ - /* Slot: a discriminated union. - */ -# define u2_slot_is_a(lot_r) (0 == (*u2_at_ray(lot_r) >> 31)) -# define u2_slot_is_b(lot_r) (3 == (*u2_at_ray(lot_r) >> 30)) -# define u2_slot_is_c(lot_r) (2 == (*u2_at_ray(lot_r) >> 30)) - - /* u2_cash_slot_a: cache slot, containing exactly one entry. - */ - typedef struct { - /* sel_m: opaque, unique function identity (0 for nock) - ** sap: sample list - ** pro: product - */ - c3_m sel_m; - u2_noun sap; - u2_noun pro; - } u2_cash_slot_a; - - typedef u2_cash_slot_a u2_cash_slot; - -# define u2_slot_a_sel(lot_r) *u2_at(lot_r, u2_cash_slot_a, sel_m) -# define u2_slot_a_sap(lot_r) *u2_at(lot_r, u2_cash_slot_a, sap) -# define u2_slot_a_pro(lot_r) *u2_at(lot_r, u2_cash_slot_a, pro) - -# define u2_slot_gunk_coll (7 << 29) -# define u2_slot_gunk_radx (6 << 29) - -# define u2_slot_gunk_is_coll(gun_w) (!!((gun_w) & (1 << 29))) -# define u2_slot_gunk_is_radx(gun_w) (!((gun_w) & (1 << 29))) - - /* u2_cash_slot_b: cache slot, with 16-way table - if not empty. - */ - typedef struct { - /* gun_w: gunk word - (1 << 31) at present - ** rag_w: recursive entry count - ** sid_r: ray to 16-way slot array, or 0 if rag_w is 0 - */ - c3_w gun_w; - c3_w rag_w; - u2_ray sid_r; - } u2_cash_slot_b; - -# define u2_slot_b_gun(lot_r) *u2_at(lot_r, u2_cash_slot_b, gun_w) -# define u2_slot_b_rag(lot_r) *u2_at(lot_r, u2_cash_slot_b, rag_w) -# define u2_slot_b_sid(lot_r) *u2_at(lot_r, u2_cash_slot_b, sid_r) -# define u2_slot_b_sid_i(lot_r, i_w) \ - (u2_slot_b_sid(lot_r) + ((i_w) * c3_wiseof(u2_cash_slot_a))) - - /* u2_cash_slot_c: cache slot, empty - */ - typedef struct { - /* emt_w: (1 << 31) - */ - c3_w emt_w; - c3_w xxx_w; // unused - c3_w xxy_w; // unused - } u2_cash_slot_c; - -# define u2_slot_emty (1 << 31) -# define u2_slot_c_emt(lot_r) *u2_at(lot_r, u2_cash_slot_c, emt_w) - - /** Functions. - **/ - /* u2_cs_free(): - ** - ** Release an old hashtable. - */ - void - u2_cs_free(u2_ray ral_r, - u2_ray lot_r); // submit - - /* u2_cs_mark(): - ** - ** Mark traverse of slot. Return allocated words. - */ - c3_w - u2_cs_mark(u2_ray ral_r, - u2_ray lot_r); - - /* u2_cs_init(): - ** - ** Initialize slot to empty. - */ - void - u2_cs_init(u2_ray lot_r); - - /* u2_cs_lose(): - ** - ** Release all resources in and under slot (but not slot itself). - */ - void - u2_cs_lose(u2_ray ral_r, - u2_ray lot_r); // submit - - /* u2_cs_make(): - ** - ** Create a new hashtable. - */ - u2_ray // produce - u2_cs_make(u2_ray ral_r); - - /* u2_cs_find(): - ** - ** Find `sam` for `sel`, or return `u2_none`. - */ - u2_weak // discover - u2_cs_find(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - u2_noun sam); // retain - - /* u2_cs_find_cell(): - ** - ** Find `[a b]` for `sel`, or return `u2_none`. - */ - u2_weak // retain - u2_cs_find_cell(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - u2_noun a, // retain - u2_noun b); // retain - - /* u2_cs_find_mixt(): - ** - ** Find `[a b]` for `sel`, or return `u2_none`. - */ - u2_weak // retain - u2_cs_find_mixt(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - const c3_c* a_c, // retain - u2_noun b); // retain - - /* u2_cs_find_trel(): - ** - ** Find `[a b c]` for `sel`, or return `u2_none`. - */ - u2_weak // retain - u2_cs_find_trel(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - u2_noun a, // retain - u2_noun b, // retain - u2_noun c); // retain - - /* u2_cs_find_qual(): - ** - ** Find `[a b c d]` for `sel`, or return `u2_none`. - */ - u2_weak // retain - u2_cs_find_qual(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - u2_noun a, // retain - u2_noun b, // retain - u2_noun c, // retain - u2_noun d); // retain - - /* u2_cs_save(): - ** - ** Save `sam` as `pro` for `sel`. Replace existing `pro`, if any. - */ - u2_noun // produce - u2_cs_save(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - u2_noun sam, // retain - u2_noun pro); // submit - - /* u2_cs_save_cell(): - ** - ** Save `[a b]` as `pro` for `sel`. - */ - u2_noun // transfer - u2_cs_save_cell(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - u2_noun a, // retain - u2_noun b, // retain - u2_noun pro); // transfer - - /* u2_cs_save_mixt(): - ** - ** Save `[a b]` as `pro` for `sel`. - */ - u2_noun // transfer - u2_cs_save_mixt(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - const c3_c* a_c, // retain - u2_noun b, // retain - u2_noun pro); // transfer - - /* u2_cs_save_trel(): - ** - ** Save `[a b c]` as `pro` for `sel`. - */ - u2_noun // transfer - u2_cs_save_trel(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - u2_noun a, // retain - u2_noun b, // retain - u2_noun c, // retain - u2_noun pro); // transfer - - /* u2_cs_save_qual(): - ** - ** Save `[a b c d]` as `pro` for `sel`. - */ - u2_noun // transfer - u2_cs_save_qual(u2_ray ral_r, - u2_ray lot_r, - c3_m sel_m, - u2_noun a, // retain - u2_noun b, // retain - u2_noun c, // retain - u2_noun d, // retain - u2_noun pro); // transfer diff --git a/include/f/chad.h b/include/f/chad.h deleted file mode 100644 index 9a19783b5e..0000000000 --- a/include/f/chad.h +++ /dev/null @@ -1,107 +0,0 @@ -/* include/chad.h -** -** This file is in the public domain. -*/ - /** Data types. - **/ - /* u2_loom_pear: overloaded name-value pair. - */ - typedef struct { - /* [nam val]: name-value pair - ** [u2_none ray]: subtable - ** [u2_none 0]: empty - */ - u2_weak nam; - u2_weak val; - } u2_loom_pear; - -#define u2_pear_nam(per_r) *u2_at(per_r, u2_loom_pear, nam) -#define u2_pear_val(per_r) *u2_at(per_r, u2_loom_pear, nam) - - /* u2_loom_chad: - ** - ** 16-way mug-powered hashtable. If wun != u2_none, - ** table is not allocated. - */ - typedef struct { - u2_loom_pear dol_p[16]; - } u2_loom_chad; - -#define u2_chad_dol(cad_r, i_w) \ - ( (cad_r) + ((i_w) * c3_wiseof(u2_loom_pear)) ) - -#define u2_chad_dol_nam(cad_r, i_w) u2_pear_nam(u2_chad_dol(cad_r, i_w)) -#define u2_chad_dol_val(cad_r, i_w) u2_pear_val(u2_chad_dol(cad_r, i_w)) - - - /** Functions. - **/ - /* u2_ch_init(): - ** - ** Initialize empty chad. - */ - void - u2_ch_init(u2_ray cad_r); - - /* u2_ch_find(): - ** - ** Find value for `nam` in `cad`, or return `u2_none`. - */ - u2_weak - u2_ch_find(u2_ray cad_r, - u2_noun nam); - - /* u2_ch_find_cell(): - ** - ** Find value for `[hed tal]` in `cad`, or return `u2_none`. - */ - u2_weak - u2_ch_find_cell(u2_ray cad_r, - u2_noun hed, - u2_noun tal); - - /* u2_ch_find_mixt(): - ** - ** Find value for `[hed tal]` in `cad`, or return `u2_none`. - */ - u2_weak - u2_ch_find_mixt(u2_ray cad_r, - const c3_c* hed_c, - u2_noun tal); - - /* u2_ch_save(): - ** - ** Save `val` under `nam` in `cad`, allocating in `ral`. - ** Return `u2_none` iff allocation fails. Asserts on duplicate. - */ - u2_weak // retain - u2_ch_save(u2_ray ral_r, - u2_ray cad_r, - u2_noun nam, // retain - u2_noun val); // retain - - /* u2_ch_save_cell(): - ** - ** Save `val` under `[hed tal]` in `cad`, allocating in `ral`. - ** Return `u2_none` iff allocation fails. Asserts on duplicate. - */ - u2_weak // retain - u2_ch_save_cell(u2_ray ral_r, - u2_ray cad_r, - u2_noun hed, // retain - u2_noun tal, // retain - u2_noun val); // retain - - /* u2_ch_save_mixt(): - ** - ** Save `val` under `[hed tal]` in `cad`, allocating in `ral`. - ** Return `u2_none` iff allocation fails. Asserts on duplicate. - ** - ** Caller retains ownership of arguments; callee retains result. - */ - u2_weak // retain - u2_ch_save_mixt(u2_ray ral_r, - u2_ray cad_r, - const c3_c* hed_c, - u2_noun tal, // retain - u2_noun val); // retain diff --git a/include/f/coal.h b/include/f/coal.h deleted file mode 100644 index aecab58c0a..0000000000 --- a/include/f/coal.h +++ /dev/null @@ -1,1032 +0,0 @@ -/* include/coal.h -** -** This file is in the public domain. -*/ - /** coal.h: common noun substrate. - *** - *** Generally modeled on stage 223, but ideally isolated from it. - *** Currently depends for implementation on direct-linked jets. - *** - *** Functions of the same name and tier may vary subtly from - *** kernel semantics. Be wary and read the header comment. - *** - *** Most coal functions depend on u2_Wire, a thread-local global, - *** which addresses all memory and other thread state. This in - *** turn depends on u2_System. - **/ - - /** Globals. - **/ - c3_global u2_ray u2_Wire; // __thread or equivalent - - - /** Aliases - selective and syntactically unique. - **/ -# define u2h(som) u2_cx_h(som) -# define u2t(som) u2_cx_t(som) -# define u2at(axe, som) u2_cx_at(axe, som) - -# define u2nc(a, b) u2_cn_cell(a, b) -# define u2nt(a, b, c) u2_cn_trel(a, b, c) -# define u2nq(a, b, c, d) u2_cn_qual(a, b, c, d) - -# define u2fh(som) (*u2_at_pom_hed(som)) // no validity check -# define u2ft(som) (*u2_at_pom_tel(som)) // no validity check - -# define u2du(som) (u2_cr_du(som)) -# define u2ud(som) (u2_cr_ud(som)) - -# define u2k(som) u2_ct(som) -# define u2z(som) u2_cz(som) - - - /** u2_cx*: crash-only core traversal. - *** - *** unless otherwise noted, u2_cx callers *retain* ownership of - *** all argument nouns and pointers, and *preserve* ownership of - *** all results. - *** - *** u2_cx functions always bail with c3__exit. - **/ -#if 1 -# define u2_cx_h(som) u2_bi_h(u2_Wire, som) -# define u2_cx_t(som) u2_bi_t(u2_Wire, som) -# define u2_cx_at(axe, som) u2_bi_frag(u2_Wire, axe, som) -# define u2_cx_cell(a, b, c) u2_bi_cell(u2_Wire, a, b, c) -# define u2_cx_trel(a, b, c, d) u2_bi_trel(u2_Wire, a, b, c, d) -# define u2_cx_qual(a, b, c, d, e) u2_bi_qual(u2_Wire, a, b, c, d, e) -#else - /* u2_cx_h (u2h): head. - */ - u2_noun - u2_cx_h(u2_noun som); - - /* u2_cx_t (u2t): tail. - */ - u2_noun - u2_cx_t(u2_noun som); - - /* u2_cx_at (u2at): fragment. - */ - u2_noun - u2_cx_at(u2_noun axe, u2_noun som); - - /* u2_cx_cell(): - ** - ** Divide `a` as a cell `[b c]`. - */ - void - u2_cx_cell(u2_noun a, - u2_noun* b, - u2_noun* c); - - /* u2_cx_trel(): - ** - ** Divide `a` as a trel `[b c d]`, or bail. - */ - void - u2_cx_trel(u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d); - - /* u2_cx_qual(): - ** - ** Divide `a` as a quadruple `[b c d e]`. - */ - void - u2_cx_qual(u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d, - u2_noun* e); - -#endif - - /** u2_cr*: crash-free core traversal. - *** - *** unless otherwise noted, u2_cr callers *retain* ownership of - *** all argument nouns and pointers, and *preserve* ownership of - *** all results. - **/ - // XX: bound by cpp to the older, underlying loom layer. - // -#if 1 -# define u2_cr_du(a) u2_dust(a) -# define u2_cr_ud(a) u2_stud(a) -# define u2_cr_at(a, b) u2_frag(a, b) -# define u2_cr_mean u2_mean -# define u2_cr_mug(a) u2_mug(a) -# define u2_cr_mug_string(a) u2_mug_string(a) -# define u2_cr_mug_words(a, b) u2_mug_words(a, b) -# define u2_cr_mug_cell(a, b) u2_mug_cell(a, b) -# define u2_cr_mug_trel(a, b, c) u2_mug_cell(a, b, c) -# define u2_cr_mug_qual(a, b, c, d) u2_mug_qual(a, b, c, d) -# define u2_cr_mug_both(a, b) u2_mug_both(a, b) -# define u2_cr_fing(a, b) u2_fing(a, b) -# define u2_cr_fing_c(a_c, b) u2_fing_c(a_c, b) -# define u2_cr_fing_cell(p, q, b) u2_fing_cell(p, q, b) -# define u2_cr_fing_mixt(p_c, q, b) u2_fing_mixt(p_c, q, b) -# define u2_cr_fing_trel(p, q, r, b) u2_fing_trel(p, q, r, b) -# define u2_cr_fing_qual(p, q, r, s, b) u2_fing_qual(p, q, r, s, b) -# define u2_cr_sing(a, b) u2_sing(a, b) -# define u2_cr_sing_c(a_c, b) u2_sing_c(a_c, b) -# define u2_cr_sing_cell(p, q, b) u2_sing_cell(p, q, b) -# define u2_cr_sing_mixt(p_c, q, b) u2_sing_mixt(p_c, q, b) -# define u2_cr_sing_trel(p, q, r, b) u2_sing_trel(p, q, r, b) -# define u2_cr_sing_qual(p, q, r, s, b) u2_sing_qual(p, q, r, s, b) -# define u2_cr_nord(a, b) u2_as_nord(a, b) -# define u2_cr_bush(a, b, c) u2_as_bush(a, b, c) -# define u2_cr_cell(a, b, c) u2_as_cell(a, b, c) -# define u2_cr_trel(a, b, c, d) u2_as_trel(a, b, c, d) -# define u2_cr_qual(a, b, c, d, e) u2_as_qual(a, b, c, d, e) -# define u2_cr_p(a, b, c) u2_as_p(a, b, c) -# define u2_cr_pq(a, b, c, d) u2_as_pq(a, b, c, d) -# define u2_cr_pqr(a, b, c, d, e) u2_as_pqr(a, b, c, d, e) -# define u2_cr_pqrs(a, b, c, d, e, f) u2_as_pqrs(a, b, c, d, e, f) -# define u2_cr_pqrs(a, b, c, d, e, f) u2_as_pqrs(a, b, c, d, e, f) -# define u2_cr_met(a_y, b) u2_met(a_y, b) -# define u2_cr_bit(a_w, b) u2_bit(a_w, b) -# define u2_cr_byte(a_w, b) u2_byte(a_w, b) -# define u2_cr_bytes(a_w, b_w, c_y, d) u2_bytes(a_w, b_w, c_y, d) -# define u2_cr_chop(m, f, w, t, d, s) u2_chop(m, f, w, t, d, s) -# define u2_cr_mp(a_mp, b) u2_mp(a_mp, b) -# define u2_cr_word(a_w, b) u2_word(a_w, b) -# define u2_cr_chub(a_w, b) u2_chub(a_w, b) -# define u2_cr_words(a_w, b_w, c_w, d) u2_words(a_w, b_w, c_w, d) -#else - - /* u2_cr_du(): u2_yes iff `a` is cell. - */ - u2_bean - u2_cr_du(u2_noun a); - - /* u2_cr_ud(): u2_no iff `a` is cell. - */ - u2_bean - u2_cr_ud(u2_noun a); - - /* u2_cr_at(): fragment `a` of `b`, or none. - */ - u2_weak - u2_cr_at(u2_atom a, - u2_weak b); - - /* u2_cr_mean(): - ** - ** Attempt to deconstruct `a` by axis, noun pairs; 0 terminates. - ** Axes must be sorted in tree order. - */ - u2_bean - u2_cr_mean(u2_noun a, - ...); - - /* u2_cr_mug(): - ** - ** Compute and/or recall the mug (31-bit hash) of (a). - */ - c3_w - u2_cr_mug(u2_noun a); - - /* u2_cr_mug_string(): - ** - ** Compute the mug of `a`, LSB first. - */ - c3_w - u2_cr_mug_string(const c3_c *a_c); - - /* u2_cr_mug_words(): - ** - ** Compute the mug of `buf`, `len`, LSW first. - */ - c3_w - u2_cr_mug_words(const c3_w *buf_w, - c3_w len_w); - - /* u2_cr_mug_cell(): - ** - ** Compute the mug of `[a b]`. - */ - c3_w - u2_cr_mug_cell(u2_noun a, - u2_noun b); - - /* u2_cr_mug_trel(): - ** - ** Compute the mug of `[a b c]`. - */ - c3_w - u2_cr_mug_trel(u2_noun a, - u2_noun b, - u2_noun c); - - /* u2_cr_mug_qual(): - ** - ** Compute the mug of `[a b c d]`. - */ - c3_w - u2_cr_mug_qual(u2_noun a, - u2_noun b, - u2_noun c, - u2_noun d); - - /* u2_cr_mug_both(): - ** - ** Join two mugs. - */ - c3_w - u2_cr_mug_both(c3_w a_w, - c3_w b_w); - - - /* u2_cr_fing(): - ** - ** Yes iff (a) and (b) are the same copy of the same noun. - ** (Ie, by pointer equality - u2_cr_sing with false negatives.) - */ - u2_bean - u2_cr_fing(u2_noun a, - u2_noun b); - - /* u2_cr_fing_c(): - ** - ** Yes iff (b) is the same copy of the same noun as the C string [a]. - */ - u2_bean - u2_cr_fing_c(const c3_c* a_c, - u2_noun b); - - /* u2_cr_fing_cell(): - ** - ** Yes iff `[p q]` and `b` are the same copy of the same noun. - */ - u2_bean - u2_cr_fing_cell(u2_noun p, - u2_noun q, - u2_noun b); - - /* u2_cr_fing_mixt(): - ** - ** Yes iff `[p q]` and `b` are the same copy of the same noun. - */ - u2_bean - u2_cr_fing_mixt(const c3_c* p_c, - u2_noun q, - u2_noun b); - - /* u2_cr_fing_trel(): - ** - ** Yes iff `[p q r]` and `b` are the same copy of the same noun. - */ - u2_bean - u2_cr_fing_trel(u2_noun p, - u2_noun q, - u2_noun r, - u2_noun b); - - /* u2_cr_fing_qual(): - ** - ** Yes iff `[p q r s]` and `b` are the same copy of the same noun. - */ - u2_bean - u2_cr_fing_qual(u2_noun p, - u2_noun q, - u2_noun r, - u2_noun s, - u2_noun b); - - /* u2_cr_sing(): - ** - ** Yes iff (a) and (b) are the same noun. - */ - u2_bean - u2_cr_sing(u2_noun a, - u2_noun b); - - /* u2_cr_sing_c(): - ** - ** Yes iff (b) is the same noun as the C string [a]. - */ - u2_bean - u2_cr_sing_c(const c3_c* a_c, - u2_noun b); - - /* u2_cr_sing_cell(): - ** - ** Yes iff `[p q]` and `b` are the same noun. - */ - u2_bean - u2_cr_sing_cell(u2_noun p, - u2_noun q, - u2_noun b); - - /* u2_cr_sing_mixt(): - ** - ** Yes iff `[p q]` and `b` are the same noun. - */ - u2_bean - u2_cr_sing_mixt(const c3_c* p_c, - u2_noun q, - u2_noun b); - - /* u2_cr_sing_trel(): - ** - ** Yes iff `[p q r]` and `b` are the same noun. - */ - u2_bean - u2_cr_sing_trel(u2_noun p, - u2_noun q, - u2_noun r, - u2_noun b); - - /* u2_cr_sing_qual(): - ** - ** Yes iff `[p q r s]` and `b` are the same noun. - */ - u2_bean - u2_cr_sing_qual(u2_noun p, - u2_noun q, - u2_noun r, - u2_noun s, - u2_noun b); - - /* u2_cr_nord(): - ** - ** Return 0, 1 or 2 if `a` is below, equal to, or above `b`. - */ - u2_atom - u2_cr_nord(u2_noun a, - u2_noun b); - - /* u2_cr_mold(): - ** - ** Divide `a` as a mold `[b.[p q] c]`. - */ - u2_bean - u2_cr_mold(u2_noun a, - u2_noun* b, - u2_noun* c); - - /* u2_cr_cell(): - ** - ** Divide `a` as a cell `[b c]`. - */ - u2_bean - u2_cr_cell(u2_noun a, - u2_noun* b, - u2_noun* c); - - /* u2_cr_trel(): - ** - ** Divide `a` as a trel `[b c]`. - */ - u2_bean - u2_cr_trel(u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d); - - /* u2_cr_qual(): - ** - ** Divide (a) as a qual (b c d e). - */ - u2_bean - u2_cr_qual(u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d, - u2_noun* e); - - /* u2_cr_p(): - ** - ** & [0] if [a] is of the form [b *c]. - */ - u2_bean - u2_cr_p(u2_noun a, - u2_noun b, - u2_noun* c); - - /* u2_cr_pq(): - ** - ** & [0] if [a] is of the form [b *c d]. - */ - u2_bean - u2_cr_pq(u2_noun a, - u2_noun b, - u2_noun* c, - u2_noun* d); - - /* u2_cr_pqr(): - ** - ** & [0] if [a] is of the form [b *c *d *e]. - */ - u2_bean - u2_cr_pqr(u2_noun a, - u2_noun b, - u2_noun* c, - u2_noun* d, - u2_noun* e); - - /* u2_cr_pqrs(): - ** - ** & [0] if [a] is of the form [b *c *d *e *f]. - */ - u2_bean - u2_cr_pqrs(u2_noun a, - u2_noun b, - u2_noun* c, - u2_noun* d, - u2_noun* e, - u2_noun* f); - - /* u2_cr_met(): - ** - ** Return the size of (b) in bits, rounded up to - ** (1 << a_y). - ** - ** For example, (a_y == 3) returns the size in bytes. - */ - c3_w - u2_cr_met(c3_y a_y, - u2_atom b); - - /* u2_cr_bit(): - ** - ** Return bit (a_w) of (b). - */ - c3_b - u2_cr_bit(c3_w a_w, - u2_atom b); - - /* u2_cr_byte(): - ** - ** Return byte (a_w) of (b). - */ - c3_y - u2_cr_byte(c3_w a_w, - u2_atom b); - - /* u2_cr_bytes(): - ** - ** Copy bytes (a_w) through (a_w + b_w - 1) from (d) to (c). - */ - void - u2_cr_bytes(c3_w a_w, - c3_w b_w, - c3_y* c_y, - u2_atom d); - - /* u2_cr_chop(): - ** - ** Into the bloq space of `met`, from position `fum` for a - ** span of `wid`, to position `tou`, XOR from atom `src` - ** into ray `dst`. - */ - void - u2_cr_chop(c3_g met_g, - c3_w fum_w, - c3_w wid_w, - c3_w tou_w, - u2_ray dst_r, - u2_atom src); - - /* u2_cr_mp(): - ** - ** Copy (b) into (a_mp). - */ - void - u2_cr_mp(mpz_t a_mp, - u2_atom b); - - /* u2_cr_word(): - ** - ** Return word (a_w) of (b). - */ - c3_w - u2_cr_word(c3_w a_w, - u2_atom b); - - /* u2_cr_words(): - ** - ** Copy words (a_w) through (a_w + b_w - 1) from (d) to (c). - */ - void - u2_cr_words(c3_w a_w, - c3_w b_w, - c3_w* c_w, - u2_atom d); -#endif - - /* u2_cr_string(): `a`, a text atom, as malloced C string. - */ - c3_c* - u2_cr_string(u2_atom a); - - /* u2_cr_tape(): `a`, a list of bytes, as malloced C string. - */ - c3_y* - u2_cr_tape(u2_noun a); - - - /** u2_c?: managing noun reference counts. - **/ -#if 1 -# define u2_ct(som) u2_rx(u2_Wire, som) -# define u2_cz(som) u2_rz(u2_Wire, som) -# define u2_co(som) u2_rl_senior(u2_Wire) -# define u2_cy(som) u2_rl_junior(u2_Wire) -#else - /* u2_cz(): release noun. Return `som` for convenience. - */ - u2_noun - u2_cz(u2_noun som); - - /* u2_ct(): acquire noun. Return `som` for convenience. - */ - u2_noun - u2_ct(u2_noun som); - -#endif - /* u2_cu(): yes iff `som` is mutable where transferred (refcount 1). - */ - u2_bean - u2_cu(u2_noun som); - - - /** u2_ci*, u2_cf*: importing and constructing nouns. - *** - *** Unless otherwise noted, u2_ci/f callers *transfer* ownership of - *** all argument nouns, and *retain* ownership of argument pointers. - *** Callers *produce* a new result which the caller must release. - **/ - /* u2_ci_mp(): construct atom from GMP. Caller transfers a_mp. - */ - u2_atom - u2_ci_mp(mpz_t a_mp); - - /* u2_ci_bytes(): - ** - ** Construct `a` bytes from `b`, LSB first, as an atom. - */ - u2_atom - u2_ci_bytes(c3_w a_w, - const c3_y* b_y); - - /* u2_ci_words(): - ** - ** Construct `a` words from `b`, LSW first, as an atom. - */ - u2_atom - u2_ci_words(c3_w a_w, - const c3_w* b_w); - - /* u2_ci_chubs(): - ** - ** Construct `a` double-words from `b`, LSD first, as an atom. - */ - u2_atom - u2_ci_chubs(c3_w a_w, - const c3_d* b_d); - - /* u2_ci_string(): - ** - ** u2_ci_bytes(strlen(a_c), (c3_y *)a_c); - */ - u2_atom - u2_ci_string(const c3_c* a_c); - - /* u2_ci_tape(): from a C string, to a list of bytes. - */ - u2_atom - u2_ci_tape(const c3_c* txt_c); - - /* u2_ci_duck(): - ** - ** Create an atomic string from a list of bytes. - */ - u2_noun - u2_ci_duck(u2_noun a); - - /* u2_ci_decimal(): - ** - ** Parse `a` as a list of decimal digits. - */ - u2_atom - u2_ci_decimal(u2_noun a); - - /* u2_ci_heximal(): - ** - ** Parse `a` as a list of hex digits. - */ - u2_noun - u2_ci_heximal(u2_noun a); - - /* u2_ci_list(): - ** - ** Generate a null-terminated list, with `u2_none` as terminator. - */ - u2_noun - u2_ci_list(u2_weak one, ...); - - - /** u2_cn_*: natural constructors. - *** - *** All argument nouns are transferred. - **/ - /* u2_cn_inc(): increment an atom. - */ - u2_atom - u2_cn_inc(u2_atom a); - - /* u2_cn_dec(): decrement an atom. - */ - u2_atom - u2_cn_dec(u2_atom a); - - /* u2_cn_cell(): produce the cell `[a b]`. - */ - u2_noun - u2_cn_cell(u2_noun a, - u2_noun b); - - /* u2_cn_trel(): - */ - u2_noun - u2_cn_trel(u2_noun a, - u2_noun b, - u2_noun c); - - /* u2_cn_qual(): - */ - u2_noun - u2_cn_qual(u2_noun a, - u2_noun b, - u2_noun c, - u2_noun d); - - /* u2_cn_nock(): - ** - ** Nock or bail. - */ - u2_noun - u2_cn_nock(u2_noun bus, - u2_noun fol); - - /* u2_cn_mung(): - ** - ** Call `(function sample)`. - */ - u2_noun - u2_cn_mung(u2_noun fun, - u2_noun sam); - - /* u2_cn_mink(): logical virtual nock. - */ - u2_noun - u2_cn_mink(u2_noun bus, - u2_noun fol, - u2_noun fly); - - /* u2_cn_moch(): blind mink with empty fly. - */ - u2_noun - u2_cn_moch(u2_noun bus, - u2_noun fol); - - - /** u2_cm: meta, miscellaneous, management and magic. - **/ - /* u2_cm_boot(): try to boot the system and set one wire (single thread). - ** - ** Return u2_no on failure. - */ - u2_bean - u2_cm_boot(void); - - /* u2_cm_rind(): open and produce a new jump buffer. - */ - void* - u2_cm_rind(); - - /* u2_cm_trap(): trap for exceptions. - */ -# if 0 - u2_noun - u2_cm_trap(); -# else - // XX breaks for 64-bit nouns - use a tmp var - // -# define u2_cm_trap() (u2_noun)(setjmp(u2_cm_rind())) -# endif - - /* u2_cm_done(): terminate trap. - */ - void - u2_cm_done(); - - /* u2_cm_wail(): retrieve and reset local trace. - */ - u2_noun - u2_cm_wail(); - - /* u2_cm_poll(): poll for interrupts, etc. - */ - void - u2_cm_poll(); - - /* u2_cm_trip(): descend into a memory region. - ** - ** Memory allocated in the heap above is senior & frozen. - */ - void - u2_cm_trip(); - - /* u2_cm_chin(): ascend out of a memory region. - ** - ** Memory allocated in the heap below is junior & volatile. - */ - void - u2_cm_chin(); - - /* u2_cm_keep(): copy volatile noun `som` to fresh heap. - */ - u2_noun - u2_cm_keep(u2_noun som); - - /* u2_cm_bury(): store fresh or volatile noun `som` to freezer. - */ - u2_noun - u2_cm_bury(u2_noun som); - - /* u2_cm_ruby(): store fresh or volatile noun `som` to freezer - debug. - */ - u2_noun - u2_cm_ruby(u2_noun som); - - /* u2_cm_bail(): bail out to the local trap. Does not return. - ** - ** Bail structure: - ** - ** %exit - ** %intr - ** %fail - ** [%fail p=*term] - ** [%need p=*(list path)] - ** - ** c3__exit for normal exit - ** c3__fail for abnormal failure - ** - ** When in doubt, fail. - */ - u2_noun - u2_cm_bail(c3_m how_m); - - /* u2_cm_bowl(): bail out with preset report. - */ - u2_noun - u2_cm_bowl(u2_noun how); // transfer - - /* u2_cm_pack(): elide all volatile memory. - */ - void - u2_cm_pack(); - - /* u2_cm_prof(): begin profiling. - */ - void - u2_cm_prof(); - - /* u2_cm_push(): push `mon` on trace stack. - */ - void - u2_cm_push(u2_noun mon); - - /* u2_cm_bean(): push `[%bean roc]` on trace stack. - */ - void - u2_cm_bean(u2_noun roc); - - /* u2_cm_foul(): - */ - u2_noun - u2_cm_foul(const c3_c* err_c); - - /* u2_cm_sweep(): return bytes leaked; match bytes saved. - */ - c3_w - u2_cm_sweep(c3_w sav_w); - - /* u2_cm_purge(): purge memo cache. - */ - void - u2_cm_purge(); - - /* u2_cm_mark_noun(): mark individual noun. - */ - c3_w - u2_cm_mark_noun(u2_noun som); - - /* u2_cm_mark_ptr(): mark a root for gc (do not use again before gc) - */ - c3_w - u2_cm_mark_ptr(void *ptr); - - /* u2_cm_mark_internal(): mark all coal internals - */ - c3_w - u2_cm_mark_internal(); - - /* u2_cm_drop(): drop from meaning stack. - */ - void - u2_cm_drop(); - - /* u2_cm_frop(): extract, clear and disable profiler. - */ - u2_noun - u2_cm_frop(); - - /* u2_cm_slab(): - ** - ** Create a blank atomic slab of `len` words. - */ - u2_ray - u2_cm_slab(c3_w len_w); - - /* u2_cm_slaq(): - ** - ** Create a blank atomic slab of `len` bloqs of size `met`. - */ - u2_ray - u2_cm_slaq(c3_g met_g, - c3_w len_w); - - /* u2_cm_malt(): - ** - ** Initialize slab `sal` as an atom, self-measured. - */ - u2_atom - u2_cm_malt(u2_ray sal_r); - - /* u2_cm_mint(): - ** - ** Initialize slab `sal` as an atom, auto-measured. - */ - u2_atom - u2_cm_mint(u2_ray sal_r, - c3_w len_w); - - /* u2_cm_moot(): - ** - ** Initialize slab `sal` as an atom, originally measured. - */ - u2_atom - u2_cm_moot(u2_ray sal_r); - - /* u2_cm_open(): - ** - ** Yes iff [a] more words remain in the pad. - */ - u2_bean - u2_cm_open(c3_w a_w); - - /* u2_cm_malloc(): - ** - ** Allocate `sib_w` *bytes* of raw C storage. - */ - void* - u2_cm_malloc(c3_w sib_w); - - /* u2_cm_ralloc(): - ** - ** Allocate `siz_w` words of raw ray storage. - */ - u2_ray - u2_cm_ralloc(c3_w siz_w); - - /* u2_cm_rfree(): - ** - ** Free raw ray storage allocated by `u2_cm_ralloc()`. - */ - void - u2_cm_rfree(u2_ray nov_r); - - /* u2_cp: profiling and debugging. - ** - ** Profiling information is automatically cleared on each - */ - /* u2_cm_slab(): produce profiling record. - */ - u2_noun - u2_cm_slab(); - - /* u2_ck: kernel and related functions - ** - ** All nouns transferred unless otherwise stated. - */ - /* u2_cka: tier 1 functions - */ - u2_noun - u2_cka_add(u2_noun a, u2_noun b); - - u2_noun - u2_cka_sub(u2_noun a, u2_noun b); - - u2_noun - u2_cka_mul(u2_noun a, u2_noun b); - - u2_noun - u2_cka_gth(u2_noun a, u2_noun b); - - u2_bean - u2_cka_lte(u2_noun a, u2_noun b); - - /* u2_ckb: tier 2 functions - */ - /* u2_ckb_lent(): length of a list. - */ - u2_noun - u2_ckb_lent(u2_noun a); - - /* u2_ckb_weld(): concatenate list `a` before `b`. - */ - u2_noun - u2_ckb_weld(u2_noun a, u2_noun b); - - /* u2_ckb_flop(): reverse list `a`. - */ - u2_noun - u2_ckb_flop(u2_noun a); - - /* u2_ckc: tier 3 functions - */ - /* u2_ckc_lsh(): left shift. - */ - u2_noun - u2_ckc_lsh(u2_noun a, u2_noun b, u2_noun c); - - /* u2_ckc_rsh(): right shift. - */ - u2_noun - u2_ckc_rsh(u2_noun a, u2_noun b, u2_noun c); - - /* u2_ckd: tier 4 functions - */ - /* u2_ckd_by_get(): map get for key `b` in map `a` with u2_none. - */ - u2_weak - u2_ckd_by_get(u2_noun a, u2_noun b); - - /* u2_ckd_by_got(): map get for key `b` in map `a` with fail. - */ - u2_noun - u2_ckd_by_got(u2_noun a, u2_noun b); - - /* u2_ckd_by_put(): map put for key `b`, value `c` in map `a`. - */ - u2_weak - u2_ckd_by_put(u2_noun a, u2_noun b, u2_noun c); - - /* u2_ckd_by_has(): test for get. - */ - u2_bean - u2_ckd_by_has(u2_noun a, u2_noun b); - - /* u2_ckd_by_gas(): list to map. - */ - u2_noun - u2_ckd_by_gas(u2_noun a, u2_noun b); - - /* u2_ckd_in_gas(): list to map. - */ - u2_noun - u2_ckd_in_gas(u2_noun a, u2_noun b); - - /* u2_ckd_in_has(): test for presence. - */ - u2_bean - u2_ckd_in_has(u2_noun a, u2_noun b); - - /* u2_ckd_in_tap(): map/set convert to list. (solves by_tap also.) - */ - u2_noun - u2_ckd_in_tap(u2_noun a, u2_noun b); - -#define u2_ckd_by_tap(a, b) u2_ckd_in_tap(a, b) - - /* u2_cke: tier 5 functions - */ - /* u2_cke_cue(): expand saved pill. - */ - u2_noun - u2_cke_cue(u2_atom a); - - /* u2_cke_jam(): pack noun as atom. - */ - u2_atom - u2_cke_jam(u2_noun a); - - /* u2_cke_trip: atom to tape. - */ - u2_noun - u2_cke_trip(u2_noun a); diff --git a/include/f/dash.h b/include/f/dash.h deleted file mode 100644 index 57dce8c468..0000000000 --- a/include/f/dash.h +++ /dev/null @@ -1,73 +0,0 @@ -/* include/dash.h -** -** This file is in the public domain. -*/ - /** Data types. - **/ - /* u2_chop: identification in objective battery declaration. - ** - ** |? - ** lef=*term - ** [std=*term kel=@] - ** [ven=*term pro=*term kel=@] - ** [ven=*term pro=*term ver=@ kel=@] - ** == - */ - // typedef u2_noun u2_chop; - - /* u2_clue: programmer's declaration hint - ** - ** [bud=*tool cop=*chop pic=*(list &[p=*term q=*tool])] - */ - // typedef u2_noun u2_clue; - - /* u2_chip: complete battery record (XX: list should be map) - ** - ** :* dac=[cop=*chop pic=*(list <[p=*term q=*tool]>)] - ** bat=* - ** pet=<~ [axe=*axis led=*chip]> - ** -- - */ - // typedef u2_noun u2_chip; - - /** Functions. - **/ - /* u2_ds_find(): find chip by core, or none. - */ - u2_weak // senior - u2_ds_find(u2_wire wir_r, - u2_noun cor); // retain - - /* u2_ds_mine(): - ** - ** Register and/or replace core. - */ - u2_noun // produce - u2_ds_mine(u2_wire wir_r, - u2_noun clu, // retain - u2_noun cor); // submit - - /* u2_ds_look(): - ** - ** Produce hook formula from core, or u2_none. - */ - u2_weak // produce - u2_ds_look(u2_wire wir_r, - u2_noun cor, // retain - const c3_c* tam_c); // retain - - /* u2_ds_wipe(): - ** - ** Clear dashboard. - */ - void - u2_ds_wipe(u2_wire wir_r); - - /* u2_ds_fire(): - ** - ** Fire formula from core. - */ - u2_weak // produce - u2_ds_fire(u2_wire wir_r, - u2_noun cor, // retain - const c3_c* tam_c); // retain diff --git a/include/f/funj.h b/include/f/funj.h deleted file mode 100644 index 9ab30ad743..0000000000 --- a/include/f/funj.h +++ /dev/null @@ -1,430 +0,0 @@ -/* include/funj.h -** -** This file is in the public domain. -*/ - /** Data structures. - **/ - /** Various nouns. - **/ - typedef u2_noun u2_bank; - typedef u2_noun u2_cord; - typedef u2_noun u2_door; - typedef u2_noun u2_gene; - typedef u2_noun u2_home; - typedef u2_noun u2_init; - typedef u2_noun u2_menu; - typedef u2_noun u2_plan; - typedef u2_noun u2_plot; - typedef u2_noun u2_prop; - typedef u2_noun u2_rack; - typedef u2_noun u2_rung; - typedef u2_noun u2_rope; - typedef u2_noun u2_spec; - typedef u2_noun u2_tack; - typedef u2_noun u2_type; - typedef u2_noun u2_prep; - typedef u2_noun u2_dump; - - /** Functions. - **/ - /** Miscellaneous operators - all old. - **/ - /* u2_fj_op_add(): - ** - ** Produce the sum of (a) and (b). - */ - u2_atom - u2_fj_op_add(u2_wire wir_r, - u2_atom a, - u2_atom b); - - /* u2_fj_op_con(): - ** - ** Produce (a | b). - */ - u2_atom - u2_fj_op_con(u2_wire wir_r, - u2_atom a, - u2_atom b); - - /* u2_fj_op_dec(): - ** - ** Produce (atom - 1), or bull if (atom) is 0. - */ - u2_weak - u2_fj_op_dec(u2_wire wir_r, - u2_atom atom); - - /* u2_fj_op_div(): - ** - ** Produce (b / a), or bull if (a) is 0. - */ - u2_weak - u2_fj_op_div(u2_wire wir_r, - u2_atom a, - u2_atom b); - - /* u2_fj_op_glu(): - ** - ** Concatenate atomic strings `a` and `b`. - */ - u2_atom - u2_fj_op_glu(u2_wire wir_r, - u2_atom a, - u2_atom b); - - /* u2_fj_op_inc(): - ** - ** Produce (atom + 1). - */ - u2_atom - u2_fj_op_inc(u2_wire wir_r, - u2_atom atom); - - /* u2_fj_op_log(): - ** - ** Produce the lowest m_log such that (1 << m_log) > m. - */ - u2_atom - u2_fj_op_log(u2_wire wir_r, - u2_atom atom); - - /* u2_fj_op_lsh(): - ** - ** Produce (b << a). - */ - u2_atom - u2_fj_op_lsh(u2_wire wir_r, - u2_atom a, - u2_atom b); - - /* u2_fj_op_peg(): - ** - ** Concatenate (twig_a) above (twig_b). - */ - u2_atom - u2_fj_op_peg(u2_wire wir_r, - u2_atom twig_a, - u2_atom twig_b); - - /* u2_fj_op_rsh(): - ** - ** Produce (b >> a). - */ - u2_atom - u2_fj_op_rsh(u2_wire wir_r, - u2_atom a, - u2_atom b); - - /* u2_fj_op_sub(): - ** - ** Produce (b - a), or bull if (a > b). - */ - u2_weak - u2_fj_op_sub(u2_wire wir_r, - u2_atom a, - u2_atom b); - - /* u2_fj_op_tip(): - ** - ** Produce the root of (twig) - 2 or 3; o4 bull if (twig) is 1. - */ - u2_weak - u2_fj_op_tip(u2_atom twig); - - /* u2_fj_op_tap(): - ** - ** Produce (twig) with the root bit removed, or bull if (twig) is 1. - */ - u2_weak - u2_fj_op_tap(u2_wire wir_r, - u2_atom twig); - - /** Lists. - **/ - /* u2_fj_list_cat(): concatenate list. - */ - u2_list - u2_fj_list_cat(u2_wire wir_r, - u2_list lit, - u2_list lus); - - /* u2_fj_list_flip(): invert list. - */ - u2_list - u2_fj_list_flip(u2_wire wir_r, - u2_list lit); - - /* u2_fj_list_len(): length of list. - */ - c3_w - u2_fj_list_len(u2_wire wir_r, - u2_list lit); - - /** Pools (sets). - **/ - /* u2_fj_pool_ok(): sanity test for pool. - */ - c3_t - u2_fj_pool_ok(u2_pool pool); - - /* u2_fj_pool_in(): - ** - ** Return 1 iff (pig) is in (pool). - */ - c3_t - u2_fj_pool_in(u2_noun pig, - u2_pool pool); - - /* u2_fj_pool_add(): - ** - ** Produce a version of (pool_sub) which includes (pig). - */ - u2_noun - u2_fj_pool_add(u2_wire wir_r, - u2_noun pig, - u2_pool pool_sub); - - /* u2_fj_pool_list(): - ** - ** Convert (pool) to a pseudo-randomly sorted list, - ** prepending to (list). - */ - u2_list - u2_fj_pool_list(u2_wire wir_r, - u2_list list, - u2_pool pool); - - /* u2_fj_pool_cat(): - ** - ** Produce a version of (pool_b) which includes all entries - ** in (pool_a). - */ - u2_noun - u2_fj_pool_cat(u2_wire wir_r, - u2_pool pool_a, - u2_pool pool_b); - - /* u2_fj_pool_at(): - ** - ** Return path to node of (pig) in (pool), under (axe); or 0. - */ - u2_atom - u2_fj_pool_at(u2_wire wir_r, - u2_noun pig_in, - u2_atom axe, - u2_pool pool); - - /** Books (associative arrays). - **/ - /* u2_fj_book_is(): - ** - ** Return 1 iff (noun) is a book. - */ - c3_t - u2_fj_book_is(u2_noun book); - - /* u2_fj_book_in(): - ** - ** Return 1 iff (tag_in) is in (book). - */ - c3_t - u2_fj_book_in(u2_noun tag_in, - u2_book book); - - /* u2_fj_book_get(): - ** - ** Produce the dog in (book) matching (tag_get), or u2_none. - */ - u2_weak - u2_fj_book_get(u2_noun tag_get, - u2_book book); - - /* u2_fj_book_add(): - ** - ** Produce a new book which adds (tag_add dog_add) to (book). - ** Replace old dog, if any. - */ - u2_book - u2_fj_book_add(u2_wire wir_r, - u2_noun tag_add, - u2_noun dog_add, - u2_book book); - - /* u2_fj_book_add_list(): - ** - ** Produce a new book which adds all (tag dog) cells in - ** (list) to (book). Replace old dog, if any. - */ - u2_book - u2_fj_book_add_list(u2_wire wir_r, - u2_list list, - u2_book book); - - /* u2_fj_book_list(): - ** - ** Convert (book) to a pseudo-randomly sorted list of (tag dog) - ** cells, prepending to (list). - */ - u2_list - u2_fj_book_list(u2_wire wir_r, - u2_list list, - u2_book book); - - /** Parsing. - **/ - /* u2_fj_watt(): - ** - ** Convert `zar`, a text atom, to a gene. - */ - u2_gene - u2_fj_watt(u2_wire wir_r, - u2_noun zar); - - /** Plow (Watt compilation). - **/ - /* u2_fj_plow_make(): - ** - ** Not verifying type correctness, compile to formula. - */ - u2_noun - u2_fj_plow_make(u2_wire wir_r, - u2_type sut, - u2_gene gen); - - /* u2_fj_plow_play(): - ** - ** Not verifying type correctness, infer product type. - */ - u2_noun - u2_fj_plow_play(u2_wire wir_r, - u2_type sut, - u2_gene gen); - - /* u2_fj_plow_show(): - ** - ** Verify type correctness. - */ - u2_noun - u2_fj_plow_show(u2_wire wir_r, - u2_type sut, - u2_gene gen); - - /* u2_fj_plow_pass(): - ** - ** Verifying type correctness, compile to formula. - */ - u2_noun - u2_fj_plow_pass(u2_wire wir_r, - u2_type sut, - u2_gene gen); - - /* u2_fj_plow_shop(): - ** - ** Verifying type correctness, infer product type. - */ - u2_noun - u2_fj_plow_shop(u2_wire wir_r, - u2_type sut, - u2_gene gen); - - /* u2_fj_plow_wish(): - ** - ** Not verifying type correctness, compile and infer. - */ - u2_noun - u2_fj_plow_wish(u2_wire wir_r, - u2_type sut, - u2_gene gen); - - /* u2_fj_plow_mill(): - ** - ** Verifying type correctness, compile and infer. - */ - u2_noun - u2_fj_plow_mill(u2_wire wir_r, - u2_type sut, - u2_gene gen); - - /** Prep and pump (prettyprinting). - **/ - /* u2_fj_prep_textual(): - ** - ** Prep with a text bias; fall back to decimal. - */ - u2_prep - u2_fj_prep_textual(u2_wire wir_r, - u2_atom atom); - - /* u2_fj_prep_decimal(): - ** - ** Prep a decimal value. - */ - u2_prep - u2_fj_prep_decimal(u2_wire wir_r, - u2_atom atom); - - /* u2_fj_prep_heximal(): - ** - ** Prep a hexadecimal value, with 0x. - */ - u2_prep - u2_fj_prep_heximal(u2_wire wir_r, - u2_atom atom); - - /* u2_fj_prep_hexinal(): - ** - ** Prep a heximal value, without 0x. - */ - u2_prep - u2_fj_prep_hexinal(u2_wire wir_r, - u2_atom atom); - - /* u2_fj_prep_noun(): - ** - ** Convert (noun) to a prep, which is - ** - ** (text) - ** | (.glue *prep) - ** | (.nail *prep) - */ - u2_prep - u2_fj_prep_noun(u2_wire wir_r, - u2_noun noun); - - /* u2_fj_prep_close(): - ** - ** Prep a list of preps, in (xb_a, xb_b). - */ - u2_prep - u2_fj_prep_close(u2_wire wir_r, - c3_y xb_a, - c3_y xb_b, - u2_list gah); - - /* u2_fj_pump_dump(): - ** - ** Convert (prep) to a dump, printing (cols) wide. - */ - u2_dump - u2_fj_pump_dump(u2_wire wir_r, - c3_w xw_cols, - u2_prep prep); - - /* u2_err(): - ** - ** Print (nopt) with (caption), using (wir). - */ - void - u2_err(u2_wire wir_r, - const c3_c* cl_caption, - u2_weak noun); - - /* u2_burp(): - ** - ** Print (prep) with (caption), using (wir). - */ - void - u2_burp(u2_wire wir_r, - const c3_c* cl_caption, - u2_prep prep); diff --git a/include/f/hevn.h b/include/f/hevn.h deleted file mode 100644 index 00d49d8dce..0000000000 --- a/include/f/hevn.h +++ /dev/null @@ -1,44 +0,0 @@ -/* include/hevn.h -** -** This file is in the public domain. -*/ - /** Data structures. - **/ - /* u2_pryr: takes a path and produces a unit. - */ - typedef u2_noun (*u2_pryr)(u2_noun); - - /* u2_loom_hevn: global namespace control structure. - */ - typedef struct _u2_loom_hevn { - /* Don't set this unless you know what you're doing. - */ - u2_pryr god; - - /* Mock gate stack. Pop the stack when executing. - ** - ** Each entry in this list is a crash-only gate. If the - ** list is empty, we are in kernel mode & god is active. - */ - u2_noun lad; - } u2_loom_hevn; - -#define u2_hevx_at(hev_r, wof) (*u2_at(hev_r, u2_loom_hevn, wof)) -#define u2_hevx_be(hev_r, ite, wof) (*u2_be(hev_r, u2_loom_hevn, ite, wof)) - -#define u2_hevn_at(wof) u2_hevx_at(u2_wire_hev_r(u2_Wire), wof) -#define u2_hevn_be(ite, wof) u2_hevx_be(u2_wire_hev_r(u2_Wire), ite, wof) - - /** Functions. - **/ - /** Lifecycle. - **/ - /* u2_hv_init(): initialize state. - */ - u2_ray - u2_hv_init(u2_ray wir_r); - - /* u2_hv_mark(): mark heaven. - */ - c3_w - u2_hv_mark(); diff --git a/include/f/host.h b/include/f/host.h deleted file mode 100644 index 0cb9aaffe8..0000000000 --- a/include/f/host.h +++ /dev/null @@ -1,333 +0,0 @@ -/* include/host.h -** -** This file is in the public domain. -*/ - /** Macros. - **/ - /* Symbol composition. Horrid. - */ -# define _j2_xd(x) j2_##x##_d -# define _j2_xm(x) j2_##x##_m -# define _j2_xmc(x) j2_##x##_mc -# define _j2_xmy(x) j2_##x##_my -# define _j2_xmx(x) j2_##x##_mx -# define _j2_xmk(x) j2_##x##_mk -# define _j2_xmi(x) j2_##x##_mi -# define _j2_xmj(x) j2_##x##_jets -# define _j2_xmd(x) j2_##x##_drivers -# define _j2_xp(p, x) j2_##x##_p_##p -# define _j2_xpc(p, x) j2_##x##_pc_##p -# define _j2_xss(x) #x -# define _j2_xs(x) _j2_xss(x) - -# define _j2_qd(x) _j2_xd(x) -# define _j2_qm(x) _j2_xm(x) -# define _j2_qmc(x) _j2_xmc(x) -# define _j2_qmy(x) _j2_xmy(x) -# define _j2_qmx(x) _j2_xmx(x) -# define _j2_qmi(x) _j2_xmi(x) -# define _j2_qmk(x) _j2_xmk(x) -# define _j2_qmd(x) _j2_xmd(x) -# define _j2_qmj(x) _j2_xmj(x) -# define _j2_qp(p, x) _j2_xp(p, x) -# define _j2_qpc(p, x) _j2_xpc(p, x) - -# define _j2_a(a) a -# define _j2_ab(a, b) a##__##b -# define _j2_abc(a, b, c) a##__##b##__##c -# define _j2_abcd(a, b, c, d) a##__##b##__##c##__##d -# define _j2_abcde(a, b, c, d, e) a##__##b##__##c##__##d##__##e - -# define j2_sa(a) _j2_xs(_j2_a(a)) -# define j2_sb(a, b) _j2_xs(_j2_ab(a, b)) -# define j2_sc(a, b, c) _j2_xs(_j2_abc(a, b, c)) -# define j2_sd(a, b, c, d) _j2_xs(_j2_abcd(a, b, c, d)) -# define j2_se(a, b, c, d, e) _j2_xs(_j2_abcde(a, b, c, d, e)) - -# define j2_da(a) _j2_qd(_j2_a(a)) -# define j2_db(a, b) _j2_qd(_j2_ab(a, b)) -# define j2_dc(a, b, c) _j2_qd(_j2_abc(a, b, c)) -# define j2_dd(a, b, c, d) _j2_qd(_j2_abcd(a, b, c, d)) -# define j2_de(a, b, c, d, e) _j2_qd(_j2_abcde(a, b, c, d, e)) - -# define j2_ma(a) _j2_qm(_j2_a(a)) -# define j2_mb(a, b) _j2_qm(_j2_ab(a, b)) -# define j2_mc(a, b, c) _j2_qm(_j2_abc(a, b, c)) -# define j2_md(a, b, c, d) _j2_qm(_j2_abcd(a, b, c, d)) -# define j2_me(a, b, c, d, e) _j2_qm(_j2_abcde(a, b, c, d, e)) - -# define j2_mac(a) _j2_qmc(_j2_a(a)) -# define j2_mbc(a, b) _j2_qmc(_j2_ab(a, b)) -# define j2_mcc(a, b, c) _j2_qmc(_j2_abc(a, b, c)) -# define j2_mdc(a, b, c, d) _j2_qmc(_j2_abcd(a, b, c, d)) -# define j2_mec(a, b, c, d, e) _j2_qmc(_j2_abcde(a, b, c, d, e)) - -# define j2_may(a) _j2_qmy(_j2_a(a)) -# define j2_mby(a, b) _j2_qmy(_j2_ab(a, b)) -# define j2_mcy(a, b, c) _j2_qmy(_j2_abc(a, b, c)) -# define j2_mdy(a, b, c, d) _j2_qmy(_j2_abcd(a, b, c, d)) -# define j2_mey(a, b, c, d, e) _j2_qmy(_j2_abcde(a, b, c, d, e)) - -# define j2_max(a) _j2_qmx(_j2_a(a)) -# define j2_mbx(a, b) _j2_qmx(_j2_ab(a, b)) -# define j2_mcx(a, b, c) _j2_qmx(_j2_abc(a, b, c)) -# define j2_mdx(a, b, c, d) _j2_qmx(_j2_abcd(a, b, c, d)) -# define j2_mex(a, b, c, d, e) _j2_qmx(_j2_abcde(a, b, c, d, e)) - -# define j2_mai(a) _j2_qmi(_j2_a(a)) -# define j2_mbi(a, b) _j2_qmi(_j2_ab(a, b)) -# define j2_mci(a, b, c) _j2_qmi(_j2_abc(a, b, c)) -# define j2_mdi(a, b, c, d) _j2_qmi(_j2_abcd(a, b, c, d)) -# define j2_mei(a, b, c, d, e) _j2_qmi(_j2_abcde(a, b, c, d, e)) - -# define j2_mak(a) _j2_qmk(_j2_a(a)) -# define j2_mbk(a, b) _j2_qmk(_j2_ab(a, b)) -# define j2_mck(a, b, c) _j2_qmk(_j2_abc(a, b, c)) -# define j2_mdk(a, b, c, d) _j2_qmk(_j2_abcd(a, b, c, d)) -# define j2_mek(a, b, c, d, e) _j2_qmk(_j2_abcde(a, b, c, d, e)) - -# define j2_maj(a) _j2_qmj(_j2_a(a)) -# define j2_mbj(a, b) _j2_qmj(_j2_ab(a, b)) -# define j2_mcj(a, b, c) _j2_qmj(_j2_abc(a, b, c)) -# define j2_mdj(a, b, c, d) _j2_qmj(_j2_abcd(a, b, c, d)) -# define j2_mej(a, b, c, d, e) _j2_qmj(_j2_abcde(a, b, c, d, e)) - -# define j2_mad(a) _j2_qmd(_j2_a(a)) -# define j2_mbd(a, b) _j2_qmd(_j2_ab(a, b)) -# define j2_mcd(a, b, c) _j2_qmd(_j2_abc(a, b, c)) -# define j2_mdd(a, b, c, d) _j2_qmd(_j2_abcd(a, b, c, d)) -# define j2_med(a, b, c, d, e) _j2_qmd(_j2_abcde(a, b, c, d, e)) - -# define j2_pa(a, p) _j2_qp(p, _j2_a(a)) -# define j2_pb(a, b, p) _j2_qp(p, _j2_ab(a, b)) -# define j2_pc(a, b, c, p) _j2_qp(p, _j2_abc(a, b, c)) -# define j2_pd(a, b, c, d, p) _j2_qp(p, _j2_abcd(a, b, c, d)) -# define j2_pe(a, b, c, d, e, p) _j2_qp(p, _j2_abcde(a, b, c, d, e)) - -# define j2_pac(a, p) _j2_qpc(p, _j2_a(a)) -# define j2_pbc(a, b, p) _j2_qpc(p, _j2_ab(a, b)) -# define j2_pcc(a, b, c, p) _j2_qpc(p, _j2_abc(a, b, c)) -# define j2_pdc(a, b, c, d, p) _j2_qpc(p, _j2_abcd(a, b, c, d)) -# define j2_pec(a, b, c, d, e, p) _j2_qpc(p, _j2_abcde(a, b, c, d, e)) - - /** Types. - **/ - /* u2_nash: cash-hash. - */ - struct u2_nash; - /* u2_ho_fun: actual function. - */ - typedef u2_noun (*u2_ho_fun)(u2_noun cor); - - /* Jet to hash selector. - */ -# define u2_jet_fun_m(jet_j) (0x7fffffff & (c3_w)(c3_p)(jet_j)) - - /* u2_ho_state: jet state beans - */ - typedef c3_w u2_ho_state; - -# define u2_jet_live 0x1 // live: C jet active -# define u2_jet_test 0x2 // test: C jet must be tested -# define u2_jet_memo 0x4 // memo: memoize, even if jet is dead -# define u2_jet_leak 0x8 // leak: check for memory leaks -# define u2_jet_dead 0 - - /* u2_ho_jet: a C function, per formula. - */ - typedef struct { - /* Function control string - finds formula in core. Declared. - ** - ** ".@" | "hook" - */ - const c3_c* fcs_c; - - /* Invocation model. Declared: - ** - ** c3__lite // does not bail - ** c3__hevy // may bail - */ - c3_m vok_m; - - /* C function, on core. Declared. - */ - u2_noun (*fun_f)(u2_noun cor); - - /* State - see above. Declared, but may change dynamically. - */ - u2_ho_state sat_s; - - /* chip: battery identifier. Computed (declare u2_none). - */ - u2_noun xip; - - /* Tool: Nock formula. Computed (declare u2_none). - */ - u2_noun fol; - - /* Custom memoization key from core. Declared - should reorder. - */ - u2_noun (*key_f)(u2_noun cor); - - /* Memo selector. Declared, with key function. - */ - c3_m fun_m; - - /* Axis in battery. Computed (declare 0). - */ - c3_l axe_l; - } u2_ho_jet; - - /* u2_ho_driver: battery driver. - */ - typedef struct _u2_ho_driver { - /* Control string - computed from seals. - */ - const c3_c* cos_c; - - /* Function/formula jet array. Null `fcs` terminates. - */ - u2_ho_jet *fan_j; - - /* Subdriver array, if any. - */ - struct _u2_ho_driver* sub_d; - - /* Mug: short hash of chip, or 0. Must match if set. - */ - c3_w mug_w; - - /* chip: battery identifier, from shed. - */ - u2_noun xip; - - /* Cache from axe to jet. - */ - struct u2_nash* jax_s; - } u2_ho_driver; - - /* u2_ho_hangar: driver system. - */ - typedef struct _u2_ho_hangar { - /* Cache from chip to driver. - */ - struct u2_nash* bad_s; - - /* Next hangar in stack. - */ - struct _u2_ho_hangar *nex_h; - } u2_ho_hangar; - - /** Globals. - **/ - extern u2_ho_driver *HostDriverBase[]; - - /** Functions. - **/ - /* u2_ho_push(): - ** - ** Push a driver hangar (corresponding to a jet shed). - */ - void - u2_ho_push(void); - - /* u2_ho_popp(): - ** - ** Pop a driver hangar. - */ - void - u2_ho_popp(void); - - /* u2_ho_klar(): - ** - ** Clear and release all hangars. - */ - void - u2_ho_klar(void); - - /* u2_ho_cstring(): return malloced control string for `xip`. - */ - c3_c* // transfer - u2_ho_cstring(u2_noun xip); // retain - - /* u2_ho_warn(): - ** - ** Report a warning at file and line. This is assumed - ** to have no semantic effect and negligible cost. - */ - void - u2_ho_warn(const c3_c* fil_c, - c3_w lyn_w); - -# define u2_ho_warn_here() u2_ho_warn(__FILE__, __LINE__) - - /* u2_ho_test(): - ** - ** Report result of jet test on `cor`. `pro` is fast; `vet` is slow. - */ - void - u2_ho_test(u2_ho_jet* jet_j, - u2_weak cor, // retain - u2_weak sof, // retain - u2_weak had); // retain - - /* u2_ho_dive(): - ** - ** Report compatibility failure in `xip`, with subject `bus`. - */ - void - u2_ho_dive(u2_noun xip, // retain - u2_noun bus); // retain - - /* u2_ho_fine(): - ** - ** Report test execution in `xip`, with subject `bus`. - */ - void - u2_ho_fine(u2_noun xip, // retain - u2_noun bus); // retain - - /* u2_ho_use(): - ** - ** Run a jet. Must be previously verified with u2_ho_nice(). - */ - u2_weak // transfer - u2_ho_use(u2_ho_jet* jet_j, // retain - u2_noun cor, // retain - u2_noun fol); // retain - - /* u2_ho_nice(): - ** - ** Verify quickly that a chip's jet supports this core. - ** - ** Only the outer battery is assumed to match. - */ - u2_bean - u2_ho_nice(u2_ho_jet* jet_j, - u2_noun cor); - - /* u2_ho_punt(): - ** - ** Apply host nock driver on `xip`, `cor`, `fol`. - */ - u2_weak - u2_ho_punt(u2_noun xip, // retain - u2_noun cor, // retain - u2_noun fol); // retain - - /* u2_ho_kick(): - ** - ** Apply host nock driver on `xip`, `cor`, `fol`. - */ - u2_weak // produce - u2_ho_kick(u2_noun xip, // retain - u2_noun cor, // retain - u2_atom axe); // retain - - /* u2_ho_kicq(): as u2_ho_kick(), but mocky. - */ - u2_noun // produce - u2_ho_kicq(u2_noun xip, // retain - u2_noun cor, // retain - u2_atom axe, // retain - u2_bean *pon); // retain diff --git a/include/f/loom.h b/include/f/loom.h deleted file mode 100644 index 22b82f1767..0000000000 --- a/include/f/loom.h +++ /dev/null @@ -1,970 +0,0 @@ -/* include/loom.h -** -** This file is in the public domain. -*/ - /** Global variables and definitions. - **/ -# define Loom ((c3_w *)U2_OS_LoomBase) -# define LoomBits U2_OS_LoomBits -# define LoomSize (1 << LoomBits) -# define HalfBits (U2_OS_LoomBits - 1) -# define HalfSize (1 << HalfBits) -# define HalfEnd (HalfSize - 1) -# define LoomPageWords 12 // 16K pages -# define LoomAllPages (1 << 16) // 65536 pages -# define LoomHalfPages (1 << 15) // 32768 pages -# define LoomVersion 0xdeafbee - - /** Data structures. - **/ - /* u2_life: page state. - */ - typedef enum { - u2_page_none = 0, // page is not mapped - u2_page_slow = 1, // page not yet loaded (not used) - u2_page_neat = 2, // page is unmodified - u2_page_tref = 3 // page is dirty - } u2_page_life; - - typedef struct { - u2_page_life lif_e: 2; // page state - c3_w mug_e: 30; // 30-bit mug - } u2_chit; - - /* u2_chef: memory control, per whole, on disk. - */ - typedef struct _u2_chef { // control image - c3_d ent_d; // event number - c3_w ven_w; // version - c3_w bot_w; // offset in loom - c3_w pgs_w; // pages saved - } u2_chef; - - /* u2_cheg: mapped segment. always grows upward for now. - */ - typedef struct _u2_cheg { - c3_c* nam_c; // name as a file - struct _u2_cheg* nex_u; // linked in list - c3_w bot_w; // beginning page - c3_w len_w; // length in pages - c3_w pgs_w; // pages in used prefix - c3_i ctl_i; // control file - c3_i dat_i; // data file - } u2_cheg; - -# ifdef U2_GLOBAL - /* Memory control structures. - */ - volatile u2_chit LoomChem[LoomAllPages]; // memory - - /* Direct segment pointers. - */ - u2_cheg LoomSegmentD = { "d" }; - u2_cheg LoomSegmentC = { "c", &LoomSegmentD }; - u2_cheg LoomSegmentB = { "b", &LoomSegmentC }; - u2_cheg LoomSegmentA = { "a", &LoomSegmentB }; - - /* Critical-section bit, for signal handlers. - */ - volatile uint32_t u2_Critical; - -# else - extern uint32_t LoomFrame; - extern volatile sig_atomic_t LoomStop; - extern volatile sig_atomic_t LoomIntr; - extern volatile uint32_t u2_Critical; - - extern volatile u2_chit LoomChem[LoomAllPages]; - extern u2_cheg LoomSegmentA, LoomSegmentB, LoomSegmentC, LoomSegmentD; -# endif - -# define LoomFrameMax 8192 -# define LoomSink \ - (LoomFrame == LoomFrameMax ? (LoomStop = 1) : LoomFrame++) -# define LoomRise \ - (LoomFrame--) - -// # define LoomFold - - /** Data types. - **/ - /** Bitfields. Assumes HalfBits == 28 (the maximum). - *** - *** u2_nit - word offset in loom - *** &&&&:28a - *** a: offset from loom - *** - *** u2_ray - word offset on beam - *** &&&:1a:28b - *** a: beam (& = low = west, | = high = east) - *** b: offset on beam - *** - *** u2_noun - noun - *** ?(u2_cat, u2_dog) - *** 1a:31b - *** a: cat if 0, dog if 1 - *** - *** u2_weak - noun - *** ?(noun, u2_none) - *** - *** u2_dog - indirect atom or cell - *** ?(u2_pom, u2_pug) - *** |:29a:1b:1c - *** a: ray to data - *** b: boxed bit - *** - *** u2_cat - direct atom - *** &:31a - *** a: unsigned integer - *** - *** u2_pom - indirect cell - *** |:29a:1b:& - *** a: ray to struct u2_cell - *** b: allocated bit (0 == fixed, 1 == allocated) - *** - *** u2_pug - indirect atom - *** |:29a:1b:| - *** a: ray to struct u2_atom - *** b: allocated bit (0 == fixed, 1 == allocated) - **/ - typedef c3_w u2_nit; - typedef c3_w u2_ray; - typedef c3_w u2_fly; - typedef c3_w u2_dog; - typedef c3_w u2_cat; - typedef c3_w u2_pug; - - /** Structures. - *** - **/ - /* u2_atom, u2_cell: logical atom and cell structures. - ** - ** Not referenced as such, since in ray space. - */ - typedef struct _u2_loom_atom { - c3_w mug_w; - c3_w len_w; - c3_w buf_w[0]; - } u2_loom_atom; - - typedef struct _u2_loom_cell { - c3_w mug_w; - u2_ray hed_r; - u2_ray tel_r; - } u2_loom_cell; - - /** Basic macros. - **/ - /** Bitfield unpacking. See above. - **/ -# define u2_ray_a(ray) ( (ray) >> HalfBits ) -# define u2_ray_b(ray) ( (ray) & ((1 << HalfBits) - 1) ) - -# define u2_fly_a(fly) ( (fly) >> 31 ) - -# define u2_dog_a(dog) ( ((dog) &~ (1 << 31)) >> 2 ) -# define u2_dog_b(dog) ( 1 & ((dog) >> 1) ) -# define u2_dog_c(dog) ( 1 & (dog) ) - -# define u2_pom_a(pom) u2_dog_a(pom) -# define u2_pom_b(pom) u2_dog_b(pom) -# define u2_pug_a(pug) u2_dog_a(pug) -# define u2_pug_b(pug) u2_dog_b(pug) - -# define u2_fly_is_cat(fly) ( !u2_fly_a(fly) ) -# define u2_fly_is_dog(fly) ( u2_fly_a(fly) ) - -# define u2_dog_is_pom(dog) ( !u2_dog_c(dog) ) -# define u2_dog_is_pug(dog) ( u2_dog_c(dog) ) - -# define u2_dog_is_all(dog) ( u2_dog_b(dog) ) - -# define u2_fly_is_atom(a) \ - (u2_fly_is_cat(a) || u2_dog_is_pug(a)) - - - /** Bitfield packing. See above. - **/ -# define u2_ray_of(a, b) ( ((a) << HalfBits) | (b) ) - -# define u2_dog_of(a, b, c) \ - ( (1 << 31) | ((a) << 2) | ((b) << 1) | (c) ) - -# define u2_pom_of(a, b) u2_dog_of(a, b, 0) -# define u2_pug_of(a, b) u2_dog_of(a, b, 1) - - - /** Cage reference and geometry. - *** - *** Formally, we are always folded. - **/ -# define u2_ray_fnit(ray) \ - ( u2_ray_a(ray) ? (HalfEnd - u2_ray_b(ray)) : (ray) ) -# ifdef LoomFold -# define u2_ray_nit(ray) u2_ray_fnit(ray) -# else -# define u2_ray_nit(ray) (ray) -# endif - -# define u2_ray_open(tid, tat, das) \ - ( (0 == u2_ray_a(tid)) \ - ? ( (u2_ray_fnit(tid) + (das)) < u2_ray_fnit(tat) ) \ - : ( (u2_ray_fnit(tat) + (das)) < u2_ray_fnit(tid) ) ) - -# define u2_ray_gap(tid, tat) \ - ( (HalfSize - (u2_ray_b(tid) + u2_ray_b(tat))) ) - - /* last word of opposite is first word of other. so, in a 4-word loom: - ** - ** 0 1 2 3 - ** | | | | - ** ## ## ## ## - ** | | | | - ** 3 2 1 0 - */ - -# define u2_ray_over(ray, siz_w) \ - u2_ray_of(!u2_ray_a(ray), (HalfSize - (u2_ray_b(ray) + (siz_w)))) - -# define u2_at_nit(nit) (Loom + nit) -# define u2_at_ray(ray) u2_at_nit(u2_ray_nit(ray)) -# define u2_nit_at(ptr_v) (((c3_w *)(ptr_v)) - Loom) - -# ifdef LoomFold -# define u2_at_cord(ray, siz) \ - (u2_ray_a(ray) ? (u2_at_ray(ray) - ((siz) - 1)) : u2_at_ray(ray)) -# else -# define u2_at_cord(ray, siz) u2_at_ray(ray) -# endif - -# define u2_aftr(ray, type, field) \ - ((ray) + \ - ( ((c3_w *)&((type *)0)->field) - \ - ((c3_w *)0) ) \ - ) -# define u2_fore(ray, type, field) \ - ((ray - 1) - \ - ( ((c3_w *)&((type *)0)->field) - \ - ((c3_w *)0) ) \ - ) - -# define u2_at(ray, type, field) \ - u2_at_ray(u2_aftr(ray, type, field)) -# define u2_by(ray, type, field) \ - u2_at_ray(u2_fore(ray, type, field)) - -# define u2_be(ray, type, item, field) \ - ( (item *)(void *)u2_at_ray(u2_aftr(ray, type, field)) ) - -# define u2_ray_beam(ray) u2_ray_a(ray) -# define u2_ray_point(ray) u2_ray_b(ray) - -# define u2_dog_ray(dog) u2_dog_a(dog) - -# define u2_dog_beam(dog) u2_ray_beam(u2_dog_ray(dog)) - - - /*** Noun structure access. - ***/ -# define u2_at_dog_mug(a) u2_at_ray(u2_dog_a(a)) - -# define u2_at_pom_hed(a) u2_at_ray((1 + u2_pom_a(a))) -# define u2_at_pom_tel(a) u2_at_ray((2 + u2_pom_a(a))) - -# define u2_at_pug_len(a) u2_at_ray((1 + u2_pug_a(a))) -# define u2_at_pug_buf(a, b) \ - u2_at_ray((2 + (b) + u2_pug_a(a))) - -# define u2_atom_word(a, b) \ - ( u2_fly_is_cat(a) ? (b ? 0 : (a)) : *u2_at_pug_buf(a, b) ) - - /*** Word axis macros. - **** - **** Use these on axes known to be in 31-bit range. - ***/ - /* u2_ax_dep(): number of axis bits. - */ -# define u2_ax_dep(a_w) (c3_bits_word(a_w) - 1) - - /* u2_ax_cap(): root axis, 2 or 3. - */ -# define u2_ax_cap(a_w) (0x2 | (a_w >> (u2_ax_dep(a_w) - 1))) - - /* u2_ax_mas(): remainder after cap. - */ -# define u2_ax_mas(a_w) \ - ( (a_w & ~(1 << u2_ax_dep(a_w))) | (1 << (u2_ax_dep(a_w) - 1)) ) - - /* u2_ax_peg(): connect two axes. - */ -# define u2_ax_peg(a_w, b_w) \ - ( (a_w << u2_ax_dep(b_w)) | (b_w &~ (1 << u2_ax_dep(b_w))) ) - - /** Constants and macros. - **/ - /* u2_none: - ** - ** An exceptional value, comparable to NaN for floats. - */ -# define u2_none u2_dog_of(u2_ray_of(0, 0), 0, 0) - - /* Small atoms. - */ -# define _0 0 -# define _1 1 -# define _2 2 -# define _3 3 -# define _4 4 -# define _5 5 -# define _6 6 -# define _7 7 -# define _8 8 -# define _9 9 -# define _10 10 -# define _11 11 -# define _12 12 -# define _13 13 -# define _14 14 -# define _15 15 - - /* Nock operators. - */ -# define u2_nock_frag 0 -# define u2_nock_bone 1 -# define u2_nock_sail 2 -# define u2_nock_dust 3 -# define u2_nock_vint 4 -# define u2_nock_sing 5 -# define u2_nock_trol 6 -# define u2_nock_flac 7 -# define u2_nock_gant 8 -# define u2_nock_kick 9 -# define u2_nock_hint 10 - -# define u2_nock_0 0 -# define u2_nock_1 1 -# define u2_nock_2 2 -# define u2_nock_3 3 -# define u2_nock_4 4 -# define u2_nock_5 5 -# define u2_nock_6 6 -# define u2_nock_7 7 -# define u2_nock_8 8 -# define u2_nock_9 9 -# define u2_nock_10 10 - - - /* New (Nock 5) conventional axes for gate call. - */ -#if 1 -# define u2_cv_pay 3 // payload -# define u2_cv_sam 6 // sample -# define u2_cv_sam_1 6 -# define u2_cv_sam_2 12 -# define u2_cv_sam_3 13 -# define u2_cv_sam_4 24 -# define u2_cv_sam_5 25 -# define u2_cv_sam_6 26 -# define u2_cv_sam_12 52 -# define u2_cv_sam_13 53 -# define u2_cv_sam_7 27 -# define u2_cv_con 7 // context -# define u2_cv_con_2 14 // context -# define u2_cv_con_3 15 // context -# define u2_cv_con_sam 30 // sample in gate context -# define u2_cv_noc 2 // deprecated -# define u2_cv_bat 2 // battery -#endif - - /* u2_yes, u2_no, u2_nul; - ** - ** Our Martian booleans and list terminator; empty string. - */ -# define u2_yes 0 -# define u2_no 1 -# define u2_nul 0 -# define u2_blip 0 - - /* Tools for Martian booleans. - */ -# define u2_na(x) (u2_no == (x)) -# define u2_so(x) (u2_yes == (x)) -# define u2_say(x) ( (x) ? u2_yes : u2_no ) -# define u2_not(x) ( (x == u2_yes) ? u2_no : u2_yes ) -# define u2_and(x, y) ( (u2_so(x) && u2_so(y)) ? u2_yes : u2_no ) -# define u2_or(x, y) ( (u2_so(x) || u2_so(y)) ? u2_yes : u2_no ) - - /** Typedefs. - *** - *** Noun typedefs may reflect usage, structure, or both. Any noun - *** typedef is a noun - that is, it may not be (u2_none). - **/ - /* u2_noun: - ** - ** A fly which is not u2_none. - */ - typedef u2_fly u2_noun; - - /* u2_weak: - ** - ** A fly which may be (and must be tested for) u2_none. - */ - typedef u2_fly u2_weak; - - /* u2_atom: - ** - ** A noun which is an atom. - */ - typedef u2_noun u2_atom; - - /* u2_cell: - ** - ** A noun which is a cell. - */ - typedef u2_noun u2_cell; - - /* u2_bean: - ** - ** A Martian boolean (0 = yes, 1 = no). - */ - typedef u2_noun u2_bean; - - /* u2_axis: - ** - ** An atomic tree address. - */ - typedef u2_noun u2_axis; - - /* u2_mote: - ** - ** An atom < (1 << 31). - */ - typedef u2_atom u2_mote; - - /* u2_term: - ** - ** A Watt symbol. - */ - typedef u2_noun u2_term; - - /* u2_list: - ** - ** A zero-terminated, tailward list. - */ - typedef u2_noun u2_list; - - /* u2_tool: - ** - ** A valid or presumptive Nock formula. - */ - typedef u2_noun u2_tool; - - /* u2_pool: - ** - ** A set, stored as binary treap by mug. - */ - typedef u2_noun u2_pool; - - /* u2_book: - ** - ** An associative array, stored as binary treap by mug. - */ - typedef u2_noun u2_book; - - /* u2_unit: - ** - ** A conditional (maybe), `[0 n]` or `0`. - */ - typedef u2_noun u2_unit; - - /** Functions. - **/ - /** Lifecycle. - **/ - /* u2_loom_boot(): - ** - ** Instantiate the loom as a new image. - */ - void - u2_loom_boot(void); - - /* u2_loom_clip(): - ** - ** Clip top and bottom. - */ - void - u2_loom_clip(c3_w bot_w, c3_w top_w); - - /* u2_loom_load(): - ** - ** Load the loom from a file. - */ - u2_bean - u2_loom_load(void); - - /* u2_loom_exit(): - ** - ** Quit out of the loom. - */ - void - u2_loom_exit(void); - - /* u2_loom_save(): - ** - ** Save the current loom at the current event number. - */ - u2_bean - u2_loom_save(c3_d ent_d); - - /** General. - **/ - - /* u2_dust(): - ** - ** Yes iff (a) is a cell. - */ -#if 0 - u2_bean - u2_dust(u2_noun a) -#else -# define u2_dust(a) \ - (u2_fly_is_atom(a) ? u2_no : u2_yes) -#endif - - /* u2_frag(): - ** - ** Return fragment (a) of (b), or u2_none if not applicable. - */ - u2_weak - u2_frag(u2_atom a, - u2_noun b); - - /* u2_mean(): - ** - ** Attempt to deconstruct `a` by axis, noun pairs; 0 terminates. - ** Axes must be sorted in tree order. - */ - u2_bean - u2_mean(u2_noun a, - ...); - - /* u2_mug(): - ** - ** Compute and/or recall the mug (31-bit hash) of (a). - */ - c3_w - u2_mug(u2_noun a); - - /* u2_mug(): - ** - ** Compute and/or recall the mug (31-bit hash) of (a). - */ - c3_w - u2_mum(u2_noun a); - - /* u2_mur_words(): MurmurHash3 on raw words. - */ - c3_w - u2_mur_words(c3_w syd_w, c3_w len_w, c3_w* key_w); - - /* u2_mug_string(): - ** - ** Compute the mug of `a`, LSB first. - */ - c3_w - u2_mug_string(const c3_c *a_c); - - /* u2_mug_words(): - ** - ** Compute the mug of `buf`, `len`, LSW first. - */ - c3_w - u2_mug_words(const c3_w *buf_w, - c3_w len_w); - - /* u2_mug_cell(): - ** - ** Compute the mug of `[a b]`. - */ - c3_w - u2_mug_cell(u2_noun a, - u2_noun b); - - /* u2_mug_trel(): - ** - ** Compute the mug of `[a b c]`. - */ - c3_w - u2_mug_trel(u2_noun a, - u2_noun b, - u2_noun c); - - /* u2_mug_qual(): - ** - ** Compute the mug of `[a b c d]`. - */ - c3_w - u2_mug_qual(u2_noun a, - u2_noun b, - u2_noun c, - u2_noun d); - - /* u2_mug_both(): - ** - ** Join two mugs. - */ - c3_w - u2_mug_both(c3_w a_w, - c3_w b_w); - - /* u2_fing(): - ** - ** Yes iff (a) and (b) are the same copy of the same noun. - ** (Ie, by pointer equality - u2_sing with false negatives.) - */ - u2_bean - u2_fing(u2_noun a, - u2_noun b); - - /* u2_fing_c(): - ** - ** Yes iff (b) is the same copy of the same noun as the C string [a]. - */ - u2_bean - u2_fing_c(const c3_c* a_c, - u2_noun b); - - /* u2_fing_cell(): - ** - ** Yes iff `[p q]` and `b` are the same copy of the same noun. - */ - u2_bean - u2_fing_cell(u2_noun p, - u2_noun q, - u2_noun b); - - /* u2_fing_mixt(): - ** - ** Yes iff `[p q]` and `b` are the same copy of the same noun. - */ - u2_bean - u2_fing_mixt(const c3_c* p_c, - u2_noun q, - u2_noun b); - - /* u2_fing_trel(): - ** - ** Yes iff `[p q r]` and `b` are the same copy of the same noun. - */ - u2_bean - u2_fing_trel(u2_noun p, - u2_noun q, - u2_noun r, - u2_noun b); - - /* u2_fing_qual(): - ** - ** Yes iff `[p q r s]` and `b` are the same copy of the same noun. - */ - u2_bean - u2_fing_qual(u2_noun p, - u2_noun q, - u2_noun r, - u2_noun s, - u2_noun b); - - /* u2_sing(): - ** - ** Yes iff (a) and (b) are the same noun. - */ - u2_bean - u2_sing(u2_noun a, - u2_noun b); - - /* u2_sing_c(): - ** - ** Yes iff (b) is the same noun as the C string [a]. - */ - u2_bean - u2_sing_c(const c3_c* a_c, - u2_noun b); - - /* u2_sing_cell(): - ** - ** Yes iff `[p q]` and `b` are the same noun. - */ - u2_bean - u2_sing_cell(u2_noun p, - u2_noun q, - u2_noun b); - - /* u2_sing_mixt(): - ** - ** Yes iff `[p q]` and `b` are the same noun. - */ - u2_bean - u2_sing_mixt(const c3_c* p_c, - u2_noun q, - u2_noun b); - - /* u2_sing_trel(): - ** - ** Yes iff `[p q r]` and `b` are the same noun. - */ - u2_bean - u2_sing_trel(u2_noun p, - u2_noun q, - u2_noun r, - u2_noun b); - - /* u2_sing_qual(): - ** - ** Yes iff `[p q r s]` and `b` are the same noun. - */ - u2_bean - u2_sing_qual(u2_noun p, - u2_noun q, - u2_noun r, - u2_noun s, - u2_noun b); - - /* u2_nord(): - ** - ** Return 0, 1 or 2 if `a` is below, equal to, or above `b`. - */ - u2_atom - u2_nord(u2_noun a, - u2_noun b); - - /* u2_stud(): - ** - ** Yes iff (a) is an atom. - */ -#if 0 - u2_bean - u2_stud(u2_noun a) -#else -# define u2_stud(a) \ - (u2_fly_is_atom(a) ? u2_yes : u2_no) -#endif - - /** Cell access. - **/ - /* u2_as_bush(): - ** - ** Factor [a] as a bush [b.[p q] c]. - */ - u2_bean - u2_as_bush(u2_noun a, - u2_noun* b, - u2_noun* c); - - /* u2_as_cell(): - ** - ** Factor (a) as a cell (b c). - */ - u2_bean - u2_as_cell(u2_noun a, - u2_noun* b, - u2_noun* c); - - /* u2_as_hext(): - ** - ** Factor (a) as a hext (b c d e f g) - */ - u2_bean - u2_as_hext(u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d, - u2_noun* e, - u2_noun* f, - u2_noun* g); - - /* u2_as_p(): - ** - ** & [0] if [a] is of the form [b *c]. - */ - u2_bean - u2_as_p(u2_noun a, - u2_noun b, - u2_noun* c); - - /* u2_as_pq(): - ** - ** & [0] if [a] is of the form [b *c d]. - */ - u2_bean - u2_as_pq(u2_noun a, - u2_noun b, - u2_noun* c, - u2_noun* d); - - /* u2_as_pqr(): - ** - ** & [0] if [a] is of the form [b *c *d *e]. - */ - u2_bean - u2_as_pqr(u2_noun a, - u2_noun b, - u2_noun* c, - u2_noun* d, - u2_noun* e); - - /* u2_as_pqrs(): - ** - ** & [0] if [a] is of the form [b *c *d *e *f]. - */ - u2_bean - u2_as_pqrs(u2_noun a, - u2_noun b, - u2_noun* c, - u2_noun* d, - u2_noun* e, - u2_noun* f); - - /* u2_as_qual(): - ** - ** Factor (a) as a qual (b c d e). - */ - u2_bean - u2_as_qual(u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d, - u2_noun* e); - - /* u2_as_quil(): - ** - ** Factor (a) as a quil (b c d e f). - */ - u2_bean - u2_as_quil(u2_noun a, - u2_noun* b, - u2_noun* c, - u2_noun* d, - u2_noun* e, - u2_noun* f); - - /* u2_as_trel(): - ** - ** Factor (a) as a trel (b c d). - */ - u2_bean - u2_as_trel(u2_noun a, - u2_noun *b, - u2_noun *c, - u2_noun *d); - - /* u2_h(), u2_sh(): - ** - ** Return the head of `a`, unsafely or safely. - */ -#if 0 - u2_noun - u2_h(u2_noun a); -#else -# define u2_h(a) (*u2_at_pom_hed(a)) -#endif - u2_noun - u2_sh(u2_noun a); - - /* u2_t(), u2_st(): - ** - ** Return the tail of `a`, unsafely or safely. - */ -#if 0 - u2_noun - u2_t(u2_noun a); -#else -# define u2_t(a) (*u2_at_pom_tel(a)) -#endif - u2_noun - u2_st(u2_noun a); - - /** Atom access. - **/ - /* u2_met(): - ** - ** Return the size of (b) in bits, rounded up to - ** (1 << a_y). - ** - ** For example, (a_y == 3) returns the size in bytes. - */ - c3_w - u2_met(c3_y a_y, - u2_atom b); - - /* u2_bit(): - ** - ** Return bit (a_w) of (b). - */ - c3_b - u2_bit(c3_w a_w, - u2_atom b); - - /* u2_byte(): - ** - ** Return byte (a_w) of (b). - */ - c3_y - u2_byte(c3_w a_w, - u2_atom b); - - /* u2_bytes(): - ** - ** Copy bytes (a_w) through (a_w + b_w - 1) from (d) to (c). - */ - void - u2_bytes(c3_w a_w, - c3_w b_w, - c3_y* c_y, - u2_atom d); - - /* u2_chop(): - ** - ** Into the bloq space of `met`, from position `fum` for a - ** span of `wid`, to position `tou`, XOR from atom `src` - ** into ray `dst`. - */ - void - u2_chop(c3_g met_g, - c3_w fum_w, - c3_w wid_w, - c3_w tou_w, - u2_ray dst_r, - u2_atom src); - - /* u2_mp(): - ** - ** Copy (b) into (a_mp). - */ - void - u2_mp(mpz_t a_mp, - u2_atom b); - - /* u2_word(): - ** - ** Return word (a_w) of (b). - */ - c3_w - u2_word(c3_w a_w, - u2_atom b); - - /* u2_chub(): - ** - ** Return double-word (a_w) of (b). - */ - c3_d - u2_chub(c3_w a_w, - u2_atom b); - - /* u2_words(): - ** - ** Copy words (a_w) through (a_w + b_w - 1) from (d) to (c). - */ - void - u2_words(c3_w a_w, - c3_w b_w, - c3_w* c_w, - u2_atom d); diff --git a/include/f/nock.h b/include/f/nock.h deleted file mode 100644 index 56eb7e16a5..0000000000 --- a/include/f/nock.h +++ /dev/null @@ -1,49 +0,0 @@ -/* include/nock.h -** -** This file is in the public domain. -*/ - /** Functions. - **/ - /* u2_nk_nock(): - ** - ** Compute `(nock bus fol)`. - */ - u2_weak // transfer - u2_nk_nock(u2_wire wir_r, - u2_weak bus, // transfer - u2_weak fol); // retain - - /* u2_nk_soft(): - ** - ** Compute `(nock bus fol)`, interpreter first. - */ - u2_weak // transfer - u2_nk_soft(u2_wire wir_r, - u2_weak bus, // transfer - u2_weak fol); // retain - - /* u2_nk_nold(): - ** - ** Really compute `(nock bus fol)`, interpreter first. - */ - u2_weak // transfer - u2_nk_nold(u2_wire wir_r, - u2_weak bus, // transfer - u2_weak fol); // retain - - /* u2_nk_mong(): - ** - ** Compute `(nock gat(-> sam) +.gat)` - new calling convention. - */ - u2_weak // transfer - u2_nk_mong(u2_wire wir_r, - u2_weak gat, // retain - u2_weak sam); // transfer - - /* u2_nk_kick(): - ** - ** Fire `gat` without changing the sample. - */ - u2_weak // transfer - u2_nk_kick(u2_wire wir_r, - u2_weak gat); // retain diff --git a/include/f/rail.h b/include/f/rail.h deleted file mode 100644 index a25ba98f58..0000000000 --- a/include/f/rail.h +++ /dev/null @@ -1,673 +0,0 @@ -/* include/rail.h -** -** This file is in the public domain. -*/ - /** Configurations. - **/ -# undef U2_LEAK_DEBUG - -# ifdef U2_LEAK_DEBUG -# define u2_leak_on(x) (COD_w = x) - extern c3_w COD_w; -# define u2_leak_off (COD_w = 0) -# endif - - /** Data types. - **/ - /** Ray types. - **/ - /* u2_rail: an allocation control frame. - */ - typedef u2_ray u2_rail; - - /* u2_wire: an execution context, inheriting rail - */ - typedef u2_ray u2_wire; - - /** Structures - in loom space. - **/ - /* Base rail. - */ - typedef struct _u2_loom_rail { - u2_ray cap_r; // top of transient region - u2_ray hat_r; // top of new durable region - u2_ray mat_r; // bottom of transient region - u2_ray rut_r; // bottom of new durable region - c3_m hip_m; // memory model in durable; c3__rock, c3__sand - } u2_loom_rail; - -# define u2_rail_cap_r(ral_r) *u2_at(ral_r, u2_loom_rail, cap_r) -# define u2_rail_hat_r(ral_r) *u2_at(ral_r, u2_loom_rail, hat_r) -# define u2_rail_mat_r(ral_r) *u2_at(ral_r, u2_loom_rail, mat_r) -# define u2_rail_rut_r(ral_r) *u2_at(ral_r, u2_loom_rail, rut_r) -# define u2_rail_hip_m(ral_r) *u2_at(ral_r, u2_loom_rail, hip_m) - - /* Pork - base of frame. - */ - typedef struct { - u2_ray mut_r; // parent mat - u2_ray rit_r; // parent rut - c3_m hap_m; // parent hip - } u2_loom_pork; -# define u2_pork_mut_r(pik_r) *u2_at(pik_r, u2_loom_pork, mut_r) -# define u2_pork_rit_r(pik_r) *u2_at(pik_r, u2_loom_pork, rit_r) -# define u2_pork_hap_m(pik_r) *u2_at(pik_r, u2_loom_pork, hap_m) - - /* Floe - a solid rail allocator. Implied by `hip_m == c3__sand`. - */ - typedef struct { - } u2_loom_floe; - - /* Soup - a liquid rail allocator. - */ -# define u2_soup_free_no 28 - - typedef struct { - u2_ray fre_r[u2_soup_free_no]; // doubly-linked free lists - u2_cash_slot lot_s; // modern memo cache -#ifdef U2_PROFILE_MEMORY - c3_w liv_w; // number of words live -#endif - } u2_loom_soup; -# define u2_soup_fre_r(sop_r, x) *u2_at(sop_r, u2_loom_soup, fre_r[x]) -# define u2_soup_lot_r(sop_r) u2_aftr(sop_r, u2_loom_soup, lot_s) -# define u2_soup_liv_w(sop_r) *u2_at(sop_r, u2_loom_soup, liv_w) - - /* A noun box, for liquid hats. Behind pointer, addressed fwd. - ** - ** The box size is also stored at the end of the box in classic - ** bad ass malloc style. Hence a box is: - ** - ** --- - ** siz_w - ** use_w - ** user data - ** siz_w - ** --- - ** - ** Do not attempt to adjust this structure! - */ - typedef struct _u2_loom_rail_box { - c3_w siz_w; // size of this box - c3_w use_w; // reference count; free if 0 -#ifdef U2_LEAK_DEBUG - c3_w cod_w; // allocation code -#endif - } u2_loom_rail_box; - -# define u2_rail_box_siz(box) *u2_at(box, u2_loom_rail_box, siz_w) -# define u2_rail_box_use(box) *u2_at(box, u2_loom_rail_box, use_w) -# define u2_rail_box_cod(box) *u2_at(box, u2_loom_rail_box, cod_w) - - /* A free node. Addressed from the box. - */ - typedef struct _u2_loom_rail_hut { - u2_loom_rail_box b; - u2_ray pre_r; // next on free list - u2_ray nex_r; // next on free list - } u2_loom_rail_hut; - -# define u2_rail_hut_siz(hut) *u2_at(hut, u2_loom_rail_hut, b.siz_w) -# define u2_rail_hut_use(hut) *u2_at(hut, u2_loom_rail_hut, b.use_w) -# define u2_rail_hut_pre(hut) *u2_at(hut, u2_loom_rail_hut, pre_r) -# define u2_rail_hut_nex(hut) *u2_at(hut, u2_loom_rail_hut, nex_r) - -# define u2_rail_box(som) \ - ( u2_fly_is_cat(som) \ - ? 0 \ - : (u2_dog_a(som) - c3_wiseof(u2_loom_rail_box)) ) - - /** Abbreviations. - **/ -# define u2_rc(ral_r, a, b) u2_rl_cell(ral_r, a, b) -# define u2_rt(ral_r, a, b, c) u2_rl_trel(ral_r, a, b, c) -# define u2_rq(ral_r, a, b, c, d) u2_rl_qual(ral_r, a, b, c, d) -# define u2_ri(ral_r, a, b, c, d, e) u2_rl_quil(ral_r, a, b, c, d, e) -# define u2_ro(ral_r, a) u2_rl_lone(ral_r, a) -# define u2_ru(ral_r, a) u2_rl_unit(ral_r, a) -# define u2_rx(ral_r, a) u2_rl_take(ral_r, a) -# define u2_rz(ral_r, a) u2_rl_lose(ral_r, a) -# define u2_rl u2_rl_list -# define u2_rk u2_rl_rack - - - /** Functions. - **/ - /** Miscellaneous and interesting. - **/ - /* u2_rl_boot(): - ** - ** Create an empty rail in an empty loom, with memory model `hip`. - ** See u2_rl_leap() for storage policies. - */ - u2_ray - u2_rl_boot(c3_m hip_m); - - /* u2_rl_clear(): - ** - ** Yes iff [lef] does not point to any word >= [net] - ** and < [bat]. - */ - u2_bean - u2_rl_clear(u2_noun lef, - u2_ray net_r, - u2_ray bat_r); - - /* u2_rl_init(): - ** - ** Install an empty rail within `hat_r` and `mat_r` in the loom, - ** with memory model `hip`. - ** - ** Returns ray to rail, which always equalls the passed `mat_r`. - */ - u2_ray - u2_rl_init(c3_m hip_m, - u2_ray hat_r, - u2_ray mat_r); - - /* u2_rl_dump(): - ** - ** Print memory structure for benefit of archeologists. - */ - void - u2_rl_dump(u2_ray ral_r); - - /* u2_rl_drain(): - ** - ** Clear the memo cache (soup). - */ - void - u2_rl_drain(u2_ray ral_r); - - /* u2_rl_fall(): - ** - ** Reverse the beams backward, restoring the old frame. - */ - void - u2_rl_fall(u2_ray ral_r); - - /* u2_rl_fall_part(): - ** - ** Fall on `ral`, also releasing the partition `aux`. - */ - void - u2_rl_fall_part(u2_ray ral_r, - u2_ray aux_r); - - /* u2_rl_flog(): - ** - ** Release the can, setting cap to mat. - */ - void - u2_rl_flog(u2_ray ral_r); - - /* u2_rl_gain(): - ** - ** Gain a reference to `som`, returning it. - */ - u2_weak // transfer - u2_rl_gain(u2_ray ral_r, - u2_weak som); // retain - - /* u2_rl_free(): - ** - ** Free storage allocated by u2_rl_malloc(). - */ - void - u2_rl_free(u2_ray ral_r, - void* lag_v); - - /* u2_rl_ok(): - ** - ** Ensure that all reference counts are valid in `som`. - */ - void - u2_rl_ok(u2_ray ral_r, - u2_noun som); // retain - - /* u2_rl_junior(): - ** - ** Yes iff `dus` is junior in `ral` - ie, must be copied - ** to be referenced on the hat. - */ - u2_bean - u2_rl_junior(u2_ray ral_r, - u2_noun dus); // retain - - /* u2_rl_leap(): - ** - ** Reverse the beams forward, with memory model `hip`. - ** Memory models at present: - ** - ** c3__sand solid, no boxes or reference counts - ** c3__rock liquid, boxes, reference-counted heap - ** - ** Returns u2_yes on success. - */ - u2_bean - u2_rl_leap(u2_ray ral_r, - c3_m hip_m); - - /* u2_rl_leap_part(): - ** - ** Reverse and split rail, inserting partition of size `num/dem` - ** plus `tip`. - ** - ** Returns partition rail, `aux_r`. - */ - u2_ray - u2_rl_leap_part(u2_ray ral_r, - c3_m hop_m, - c3_w num_w, - c3_w dem_w, - c3_w tip_w); - - /* u2_rl_lose(): - ** - ** Lose a reference to `som`. Free it if refcount == 0. - */ - void - u2_rl_lose(u2_ray ral_r, - u2_weak som); // transfer - - /* u2_rl_gc_mark_noun(): - ** - ** Mark a noun for gc. Return allocated words. - */ - c3_w - u2_rl_gc_mark_noun(u2_ray ral_r, - u2_noun som); - - /* u2_rl_gc_mark_ptr(): - ** - ** Mark a pointer allocated with ralloc. Return allocated words. - */ - c3_w - u2_rl_gc_mark_ptr(u2_ray ral_r, - u2_ray ptr_r); - - /* u2_rl_gc_mark(): - ** - ** Mark a rail (mainly memo cache). Return allocated words. - */ - c3_w - u2_rl_gc_mark(u2_ray ral_r); - - /* u2_rl_gc_sweep(): - ** - ** Sweep memory, freeing unused blocks. Match live, save leaked. - */ - c3_w - u2_rl_gc_sweep(u2_ray ral_r, c3_w sav_w); - - /* u2_rl_malloc(): - ** - ** Allocate `sib_w` *bytes* of raw C storage. - */ - void* - u2_rl_malloc(u2_ray ral_r, - c3_w sib_w); - - /* u2_rl_malt(): - ** - ** Initialize slab `sal` as an atom, internally measured. - */ - u2_atom // transfer - u2_rl_malt(u2_rail ral_r, - u2_ray sal_r); - - /* u2_rl_mint(): - ** - ** Initialize slab `sal` as an atom, externally measured. - */ - u2_atom // transfer - u2_rl_mint(u2_rail ral_r, - u2_ray sal_r, - c3_w len_w); - - /* u2_rl_moot(): - ** - ** Initialize slab `sal` as an atom, originally measured. - */ - u2_atom // transfer - u2_rl_moot(u2_rail ral_r, - u2_ray sal_r); - - /* u2_rl_open(): - ** - ** Yes iff [a] more words remain in the pad. - */ - u2_bean - u2_rl_open(u2_ray ral_r, - c3_w a_w); - - /* u2_rl_ralloc(): - ** - ** Allocate `siz_w` words of raw ray storage. - */ - u2_ray - u2_rl_ralloc(u2_ray ral_r, - c3_w siz_w); - - /* u2_rl_rfree(): - ** - ** Free raw ray storage allocated by `u2_rl_ralloc()`. - */ - void - u2_rl_rfree(u2_ray ral_r, - u2_ray nov_r); - - /* u2_rl_senior(): - ** - ** Yes iff `dus` is senior in `ral` - ie, does not - ** require reference counting. - */ - u2_bean - u2_rl_senior(u2_ray ral_r, - u2_noun dus); // retain - - /* u2_rl_slab(): - ** - ** Create a blank atomic slab of `len` words. - */ - u2_ray - u2_rl_slab(u2_rail ral_r, - c3_w len_w); - - /* u2_rl_slaq(): - ** - ** Create a blank atomic slab of `len` bloqs of size `met`. - */ - u2_ray - u2_rl_slaq(u2_wire wir_r, - c3_g met_g, - c3_w len_w); - - /* u2_rl_refs(): - ** - ** Return the reference count of (som). For debugging, etc. - */ - c3_w - u2_rl_refs(u2_ray ral_r, - u2_noun som); - - /* u2_rl_copy(): - ** - ** Copy indirect noun `fiz` into main storage, preserving dags. - ** Must be followed by `rl_wash(fiz)` if `fiz` is to be preserved. - */ - u2_weak // transfer - u2_rl_copy(u2_ray ral_r, - u2_dog fiz); // retain - - /* u2_rl_take(): - ** - ** Produce `a`, as eligible result. Copy juniors; reference peers. - */ - u2_weak // transfer - u2_rl_take(u2_ray ral_r, - u2_weak a); // retain -# define u2_rl_ice(ral_r, a) \ - u2_rl_take(ral_r, a) - - /* u2_rl_tamp(): - ** - ** Tamp, eliding the segment from `net` up to `bat`, - ** preserving the root `lef`. - ** - ** Assumes u2_rl_clear() with the same arguments. - */ - u2_noun - u2_rl_tamp(u2_ray ral_r, - u2_noun lef, - u2_ray net_r, - u2_ray bat_r); - - /* u2_rl_valid(): - ** - ** Validate rail for memory bugs. - */ - void - u2_rl_valid(u2_ray ral_r); - - /* u2_rl_water(): - ** - ** Return east and west watermarks, respectively. - */ - void - u2_rl_water(u2_ray ral_r, - c3_w* maz_w, - c3_w* buc_w); - - /** Basic noun fabrication. - **/ - /* u2_rl_bytes(): - ** - ** Copy `a` bytes from `b` to an LSB first atom. - */ - u2_weak // transfer - u2_rl_bytes(u2_ray ral_r, - c3_w a_w, - const c3_y* b_y); - - /* u2_rl_cell(): - ** - ** Produce the cell `[a b]`. - */ - u2_weak // transfer - u2_rl_cell(u2_ray ral_r, - u2_weak a, // transfer - u2_weak b); // transfer - - /* u2_rl_list(): - ** - ** Produce a null-terminated list, terminating `...` with `u2_none`. - */ - u2_weak // transfer - u2_rl_list(u2_rail ral_r, - ...); // transfer - - /* u2_rl_lone(): - ** - ** Create the unit `[0 a]`. - */ -#if 0 - u2_weak // transfer - u2_rl_lone(u2_rail ral_r, - u2_weak a); // transfer -#else -# define u2_rl_lone(ral_r, a) \ - u2_rc(ral_r, a, u2_nul) -#endif - - /* u2_rl_molt(): - ** - ** Mutate `som` with a 0-terminated list of axis, noun pairs. - ** Axes must be cats (31 bit). - */ - u2_weak // transfer - u2_rl_molt(u2_rail ral_r, - u2_weak som, // retain - ...); // transfer - - /* u2_rl_molv(): - ** - ** As u2_rl_molt(), by argument pointer. - */ - u2_weak // transfer - u2_rl_molv(u2_rail ral_r, - u2_weak som, // retain - va_list vap); // transfer - - /* u2_rl_mp(): - ** - ** Copy the GMP integer [a] into an atom. - */ - u2_weak // transfer - u2_rl_mp(u2_ray ral_r, - mpz_t a_mp); // transfer - - /* u2_rl_qual(): - ** - ** Produce the triple `[a b c d]`. - */ -#if 0 - u2_weak // transfer - u2_rl_qual(u2_rail ral_r, - u2_weak a, // transfer - u2_weak b, // transfer - u2_weak c, // transfer - u2_weak d); // transfer -#else -# define u2_rl_qual(ral_r, a, b, c, d) \ - u2_rc(ral_r, a, u2_rt(ral_r, b, c, d)) -#endif - - /* u2_rl_rack(): - ** - ** Produce an n-tuple, terminating `...` with `u2_none`. - */ - u2_weak // transfer - u2_rl_rack(u2_rail ral_r, - ...); // transfer - - /* u2_rl_string(): - ** - ** Produce an LSB-first atom from the C string `a`. - */ - u2_weak // transfer - u2_rl_string(u2_ray ral_r, - const c3_c* a_c); - - /* u2_rl_trel(): - ** - ** Create the triple `[a b c]`. - */ -#if 0 - u2_weak // transfer - u2_rl_trel(u2_rail ral_r, - u2_weak a, // transfer - u2_weak b, // transfer - u2_weak c); // transfer -#else -# define u2_rl_trel(ral_r, a, b, c) \ - u2_rc(ral_r, a, u2_rc(ral_r, b, c)) -#endif - - /* u2_rl_unit(): - ** - ** Create the unit `[0 a]`. - */ -#if 0 - u2_weak // transfer - u2_rl_unit(u2_rail ral_r, - u2_weak a); // transfer -#else -# define u2_rl_unit(ral_r, a) \ - u2_rc(ral_r, u2_nul, a) -#endif - - /* u2_rl_vint(): - ** - ** Create `a + 1`. - */ - u2_weak // transfer - u2_rl_vint(u2_rail ral_r, - u2_weak a); // transfer - - /* u2_rl_words(): - ** - ** Copy [a] words from [b] into an atom. - */ - u2_weak // transfer - u2_rl_words(u2_ray ral_r, - c3_w a_w, - const c3_w* b_w); - - /** Caching. - **/ - /* u2_rl_find(): - ** - ** Cache search for function (0 means nock) and sample. - */ - u2_weak // transfer - u2_rl_find(u2_ray ral_r, - u2_mote fun_m, - u2_noun sam); // retain - - /* u2_rl_save(): - ** - ** Cache store for function (0 means nock), sample and product. - */ - u2_weak // transfer - u2_rl_save(u2_ray ral_r, - u2_mote fun_m, // retain - u2_noun sam, // retain - u2_noun pro); // transfer - - /* u2_rl_uniq(): - ** - ** Use cache to render object unique. - */ - u2_noun // produce - u2_rl_uniq(u2_ray ral_r, - u2_noun som); // submit - - /* u2_rl_find_cell(): as u2_rl_find(), for `sam=[a b]`. - ** u2_rl_find_trel(): as u2_rl_find(), for `sam=[a b c]`. - ** u2_rl_find_qual(): as u2_rl_find(), for `sam=[a b d]`. - ** u2_rl_find_quil(): as u2_rl_find(), for `sam=[a b c d e]`. - ** - ** Extend as needed... - */ - u2_weak // transfer - u2_rl_find_cell(u2_ray, u2_mote, u2_noun, // retain - u2_noun); // retain - u2_weak // transfer - u2_rl_find_trel(u2_ray, u2_mote, u2_noun, // retain - u2_noun, // retain - u2_noun); // retain - u2_weak // transfer - u2_rl_find_qual(u2_ray, u2_mote, u2_noun, // retain - u2_noun, // retain - u2_noun, // retain - u2_noun); // retain - u2_weak // transfer - u2_rl_find_quil(u2_ray, u2_mote, u2_noun, // retain - u2_noun, // retain - u2_noun, // retain - u2_noun, // retain - u2_noun); // retain - - /* u2_rl_save_cell(): as u2_rl_save(), for `sam=[a b]`. - ** u2_rl_save_trel(): as u2_rl_save(), for `sam=[a b c]`. - ** u2_rl_save_qual(): as u2_rl_save(), for `sam=[a b c d]`. - ** u2_rl_save_quil(): as u2_rl_save(), for `sam=[a b c d e]`. - ** - ** Extended - */ - u2_weak // transfer - u2_rl_save_cell(u2_ray, u2_mote, u2_noun, // retain - u2_noun, // retain - u2_noun); // transfer - - u2_weak // transfer - u2_rl_save_trel(u2_ray, u2_mote, u2_noun, // retain - u2_noun, // retain - u2_noun, // retain - u2_noun); // transfer - - u2_weak // transfer - u2_rl_save_qual(u2_ray, u2_mote, u2_noun, // retain - u2_noun, // retain - u2_noun, // retain - u2_noun, // retain - u2_noun); // transfer - - u2_weak // transfer - u2_rl_save_quil(u2_ray, u2_mote, u2_noun, // retain - u2_noun, // retain - u2_noun, // retain - u2_noun, // retain - u2_noun, // retain - u2_noun); // transfer diff --git a/include/f/shed.h b/include/f/shed.h deleted file mode 100644 index cbc31cd06d..0000000000 --- a/include/f/shed.h +++ /dev/null @@ -1,93 +0,0 @@ -/* include/shed.h -** -** This file is in the public domain. -*/ - /** Data types. - **/ - /* u2_seal: identification in objective battery declaration. - ** - ** |? - ** lef=*term - ** [std=*term kel=@] - ** [ven=*term pro=*term kel=@] - ** [ven=*term pro=*term ver=@ kel=@] - ** == - */ - typedef u2_noun u2_seal; - - /* u2_clue: programmer's declaration hint - ** - ** [bud=*tool sil=*seal nut=*(list &[p=*term q=*tool])] - */ - typedef u2_noun u2_clue; - - /* u2_disc: declaration layer (list should be map) - ** - ** [sil=*seal nut=*(list &[p=*term q=*tool])] - */ - typedef u2_noun u2_disc; - - /* u2_chip: complete battery record - ** - ** [dac=*disc bat=* pet=<~ [axe=*axis led=*chip]>] - */ - typedef u2_noun u2_chip; - - /* u2_loom_shed: jet registration hangar. - */ - typedef struct { - u2_loom_rail o; - - /* cad_c: hash from battery to chip. - */ - u2_loom_chad cad_c; - - /* dip_c: hash from battery, term to formula. - */ - u2_loom_chad dip_c; - } u2_loom_shed; - -# define u2_shed_cad_r(sad_r) u2_aftr(sad_r, u2_loom_shed, cad_c) -# define u2_shed_dip_r(sad_r) u2_aftr(sad_r, u2_loom_shed, dip_c) - - /** Functions. - **/ - /* u2_sh_init(): - ** - ** Initialize shed, with parent if any. - */ - void - u2_sh_init(u2_wire wir_r); - - /* u2_sh_find(): find chip by core, or none. Includes validate. - */ - u2_weak // senior - u2_sh_find(u2_wire wir_r, - u2_noun cor); // retain - - /* u2_sh_mine(): - ** - ** Register and/or replace core. - */ - u2_noun // transfer - u2_sh_mine(u2_wire wir_r, - u2_noun hod, // retain - u2_noun cor); // transfer - - /* u2_sh_cook(): - ** - ** Produce hook formula from chip, or u2_none. - */ - u2_weak // senior - u2_sh_cook(u2_wire wir_r, - u2_noun xip, // retain - const c3_c* tam_c); - - /* u2_sh_look(): - ** - ** Produce hook formula from core, or u2_none. - */ - u2_weak // senior - u2_sh_look(u2_wire wir_r, - u2_noun cor, // retain - const c3_c* tam_c); diff --git a/include/f/trac.h b/include/f/trac.h deleted file mode 100644 index a4d60d8ecc..0000000000 --- a/include/f/trac.h +++ /dev/null @@ -1,273 +0,0 @@ -/* include/trac.h -** -** This file is in the public domain. -*/ - /** Data structures. - **/ - /* u2_loom_marx: profile watermark. - */ - struct u2_loom_marx { - /* Measure. - */ - c3_w med_w; - - /* Maximum. - */ - c3_w max_w; - }; - - /* u2_loom_knot: profile node. - */ - typedef struct _u2_loom_knot { - /* Task name - 31-byte prefix. - */ - c3_c lic_c[32]; - - /* Number of hits in this task. - */ - c3_w fin_w; - - /* Subtask list, if any. - */ - struct _u2_loom_knot *fam_k; - struct _u2_loom_knot *nex_k; - } u2_loom_knot; - - /* u2_loom_trac: tracing/profiling control structure. - */ - typedef struct _u2_loom_trac { - /* Control. - */ - struct { - /* u2_yes iff debugging is on. - */ - u2_bean deb; - - /* u2_yes iff profiling is on. - */ - u2_bean pro; - } cor; - - /* Tracing. - */ - struct { - /* Position stack: *(list shoe) [XX not used, still wire->tax] - */ - u2_noun ryp; - - /* Mode bit - u2_yes == C/system, u2_no == interpreted - */ - u2_bean sys; - - /* Function bit for sys - u2_yes == overhead, u2_no == function - */ - u2_bean glu; - - /* Number of samples in random C code. - */ - c3_d com_d; - - /* Number of samples in jet code. - */ - c3_d jet_d; - - /* Number of samples in interpreted code. - */ - c3_d erp_d; - } wer; - - /* Profiling. - */ - struct { - /* Task stack: *(list term) - */ - u2_noun don; - - /* Act count: *(map term num) - */ - u2_noun cot; - } duz; - - /* Built-in system acts and counters. - */ - struct { - /* Nock reductions. - */ - c3_d hop_d; - - /* Jet activations. - */ - c3_d jet_d; - - /* Jet tests. - */ - c3_d tes_d; - - /* Matching comparisons. - */ - c3_d nod_d; - - /* Memoization searches. - */ - c3_d fin_d; - - /* Memoization productions. - */ - c3_d pod_d; - - /* C stack record. - */ - struct u2_loom_marx cas_x; - - /* Main memory usage record. - */ - struct u2_loom_marx men_x; - - /* Basket memory usage record. - */ - struct u2_loom_marx bek_x; - - /* Unix time in seconds at analysis instantiation. - */ - c3_w sec_w; - - /* Unix time in microseconds at analysis instantiation. - */ - c3_w usc_w; - - /* Original words in wire. - */ - c3_w lif_w; - - /* Original words in basket. - */ - c3_w bos_w; - } sys; - } u2_loom_trac; - -#define u2_trac_at(rac_r, wof) (*u2_at(rac_r, u2_loom_trac, wof)) -#define u2_trac_be(rac_r, ite, wof) (*u2_be(rac_r, u2_loom_trac, ite, wof)) - -#define u2_wrac_at(wir_r, wof) u2_trac_at(u2_wire_rac_r(wir_r), wof) -#define u2_wrac_be(wir_r, ite, wof) u2_trac_be(u2_wire_rac_r(wir_r), ite, wof) - - /** Functions. - **/ - /** Lifecycle. - **/ - /* u2_tx_init(): initialize state. - */ - u2_ray - u2_tx_init(u2_ray wir_r); - - /* u2_tx_done(): produce a profile slab to render. Close tracing. - ** - ** type: - */ - u2_noun // produce - u2_tx_done(u2_ray wir_r); - - /* u2_tx_open(): open tracing. - */ - void - u2_tx_open(u2_ray wir_r); - - /* u2_tx_do_*(): set debug/profile bean. Return old value. - */ - u2_bean u2_tx_do_debug(u2_ray wir_r, u2_bean lag); - u2_bean u2_tx_do_profile(u2_ray wir_r, u2_bean lag); - - /* u2_tx_in_*(): get debug/profile bean. - */ - u2_bean u2_tx_in_debug(u2_ray wir_r); - u2_bean u2_tx_in_profile(u2_ray wir_r); - - /** Actions. - **/ - /* u2_tx_did_*(): record system actions. - */ -#if 0 -# define u2_tx_did(wir_r, wof, det_ws) \ - ( u2_wrac_be(wir_r, c3_d, wof) += det_ws ) -#else -# define u2_tx_did(wir_r, wof, det_ws) -#endif - -# define u2_tx_did_hop(wir_r, det_ws) u2_tx_did(wir_r, sys.hop_d, det_ws) -# define u2_tx_did_jet(wir_r, det_ws) u2_tx_did(wir_r, sys.jet_d, det_ws) -# define u2_tx_did_tes(wir_r, det_ws) u2_tx_did(wir_r, sys.tes_d, det_ws) -# define u2_tx_did_nod(wir_r, det_ws) u2_tx_did(wir_r, sys.nod_d, det_ws) -# define u2_tx_did_fin(wir_r, det_ws) u2_tx_did(wir_r, sys.fin_d, det_ws) -# define u2_tx_did_pod(wir_r, det_ws) u2_tx_did(wir_r, sys.pod_d, det_ws) - - /* u2_tx_mex*(): record signed change in watermarks. - */ -# define u2_tx_mex(wir_r, wof, det_ws) \ - ( ( u2_wrac_at(wir_r, wof.med_w) += det_ws), \ - ( u2_wrac_at(wir_r, wof.max_w) = \ - ( u2_wrac_at(wir_r, wof.med_w) > \ - u2_wrac_at(wir_r, wof.max_w) ) \ - ? u2_wrac_at(wir_r, wof.med_w) \ - : u2_wrac_at(wir_r, wof.max_w) ) ) - -# define u2_tx_add_cas(wir_r, det_ws) u2_tx_mex(wir_r, sys.cas_x, det_ws) -# define u2_tx_add_men(wir_r, det_ws) u2_tx_mex(wir_r, sys.men_x, det_ws) -# define u2_tx_add_bek(wir_r, det_ws) u2_tx_mex(wir_r, sys.bek_x, det_ws) - -# define u2_tx_sink_cas(wir_r) u2_tx_add_cas(wir_r, 1) -# define u2_tx_rise_cas(wir_r) u2_tx_add_cas(wir_r, -1) - - /* u2_tx_add_mem(): add memory to rail. A hack. Not used. - */ -# define u2_tx_add_mem(ral_r, det_ws) \ - ( (0 == ral_r) ? u2_tx_add_men(ral_r, det_ws) \ - : u2_tx_add_bek(0, det_ws) - - /* u2_tx_did_act(): record user actions. - */ - void - u2_tx_did_act(u2_ray wir_r, - u2_noun did); // retain - - /* u2_tx_sys_bit(): set system bit, returning old value. - */ - u2_bean - u2_tx_sys_bit(u2_ray wir_r, - u2_bean val); - - /* u2_tx_glu_bit(): set glue bit within system bit. - */ - u2_bean - u2_tx_glu_bit(u2_ray wir_r, - u2_bean val); - /** Tasks. - **/ - /* u2_tx_task_in(): enter a task for profiling purposes. - ** - ** u2_yes iff the task is not already in the stack. - */ - u2_bean - u2_tx_task_in(u2_ray wir_r, - u2_noun tak); // retain - - /* u2_tx_task_out(): leave a task for profiling purposes. - */ - void - u2_tx_task_out(u2_ray wir_r); - - /** Direct logging. - **/ - /* u2_tx_slog(): print debug syslog [0-3 tank] 0=debug 3=alarm - */ - void - u2_tx_slog(u2_ray wir_r, - u2_noun luf); // retain - - /* u2_tx_warn(): report a warning by internal file and line. - */ - void - u2_tx_warn(u2_ray wir_r, - const c3_c* fil_c, - c3_w lyn_w); -# define u2_tx_warn_here(wir_r) u2_bx_warn(wir_r, __FILE__, __LINE__) - diff --git a/include/f/unix.h b/include/f/unix.h deleted file mode 100644 index c1cc20a7a2..0000000000 --- a/include/f/unix.h +++ /dev/null @@ -1,78 +0,0 @@ -/* include/unix.h -** -** This file is in the public domain. -*/ - /** Structures. - **/ - /* u2_life: a monitored file. - */ - typedef struct _u2_life { - const c3_c* src_c; // source path - const c3_c* dat_c; // data path - c3_d act_d; // tick updated at - struct timespec tim_p; // date of source at update - u2_weak src; // source noun - u2_weak dat; // data noun - void* han_v; // dlopen handle - struct _u2_life* nex_l; - } *u2_life; - - /** Functions. - **/ - /* u2_ux_life(): create a monitored file, not loading. - */ - u2_life - u2_ux_life(u2_wire wir_r, - const c3_c* src_c, - const c3_c* dat_c, - const c3_c* oxt_c, - u2_life nex_l); - - /* u2_ux_live(): load/reload a monitored source; u2_yes for change. - */ - u2_bean - u2_ux_live(u2_wire wir_r, - u2_life lif_l); - - /* u2_ux_lose(): forget a monitored file. - */ - void - u2_ux_lose(u2_wire wir_r, - u2_life lif_l); - - /* u2_ux_read(): read a path/extension into an atom. - */ - u2_weak - u2_ux_read(u2_wire wir_r, - const c3_c* paf_c, - const c3_c* ext_c); - - /* u2_ux_read_deep(): read a filesystem path as a generic noun. - */ - u2_weak - u2_ux_read_deep(u2_wire wir_r, - const c3_c* paf_c, - const c3_c* ext_c); - - /* u2_ux_write(): write a path/extension as an atom. - */ - u2_bean - u2_ux_write(u2_wire wir_r, - u2_atom som, - const c3_c* paf_c, - const c3_c* ext_c); - - /* u2_ux_write_deep(): write a path/extension as a generic noun. - */ - u2_bean - u2_ux_write_deep(u2_wire wir_r, - u2_noun som, - const c3_c* paf_c, - const c3_c* ext_c); - - /* u2_ux_fresh(): true iff `oxt` is as fresh as `ext`. - */ - u2_bean - u2_ux_fresh(const c3_c* paf_c, - const c3_c* ext_c, - const c3_c* oxt_c); diff --git a/include/f/wire.h b/include/f/wire.h deleted file mode 100644 index 9b4f290e3e..0000000000 --- a/include/f/wire.h +++ /dev/null @@ -1,108 +0,0 @@ -/* include/wire.h -** -** This file is in the public domain. -*/ - /** Data types. - **/ - /** Structures - in loom space. - **/ - /* u2_loom_wire: one per thread. - */ - typedef struct _u2_loom_wire { - u2_loom_rail o; - - /* Clean bean. u2_no when there may be garbage. - */ - u2_noun lan; - - /* Basket; u2_loom_bask; senior storage (for dashboard). - */ - u2_ray bas_r; - - /* Dashboard; u2_loom_dash; map battery to chip list. - */ - u2_cash_slot des_s; - - /* Ray to jet exception buffer, or 0. - */ - u2_ray kit_r; - - /* Ray to OS state. - */ - u2_ray arv_r; - - /* Ray to performance log. - */ - u2_ray bex_r; - - /* Interpreter trace. - */ - u2_noun tax; - - /* Ray to new tracer. - */ - u2_ray rac_r; - - /* Heaven. - */ - u2_ray hev_r; - } u2_loom_wire; - -# define u2_wire_bas_r(wir_r) *u2_at(wir_r, u2_loom_wire, bas_r) -# define u2_wire_des_r(wir_r) u2_aftr(wir_r, u2_loom_wire, des_s) -# define u2_wire_kit_r(wir_r) *u2_at(wir_r, u2_loom_wire, kit_r) -# define u2_wire_bex_r(wir_r) *u2_at(wir_r, u2_loom_wire, bex_r) -# define u2_wire_rac_r(wir_r) *u2_at(wir_r, u2_loom_wire, rac_r) -# define u2_wire_hev_r(wir_r) *u2_at(wir_r, u2_loom_wire, hev_r) -# define u2_wire_arv_r(wir_r) *u2_at(wir_r, u2_loom_wire, arv_r) - -# define u2_wire_tax(wir_r) *u2_at(wir_r, u2_loom_wire, tax) -# define u2_wire_lan(wir_r) *u2_at(wir_r, u2_loom_wire, lan) - - - /** Functions. - **/ - /** Administration. - **/ - /* u2_wr_init(): - ** - ** Install an empty wire within `hat_r` and `mat_r` in the loom, - ** with memory model `hip`. - ** - ** Returns ray to wire, which always equalls the passed `mat_r`. - */ - u2_ray - u2_wr_init(c3_m hip_m, - u2_ray hat_r, - u2_ray mat_r); - - /* u2_wr_check_init(): initialize checkpoint segments and/or files. - */ - void - u2_wr_check_init(c3_c* cpu_c); - - /* u2_wr_check_save(): checkpoint wire in global structure. - */ - void - u2_wr_check_save(); - - /* u2_wr_ice(): u2_rl_ice(), with u2_bx_copy(). - */ - u2_weak - u2_wr_ice(u2_ray wir_r, - u2_noun fiz); - - /* u2_wr_gc(): - ** - ** Garbage-collect all current storage in a wire, given - ** a 0-terminated list of external roots. - */ - void - u2_wr_gc(u2_ray wir_r, ...); - - /* u2_wr_mark(): - ** - ** Mark all roots in a wire and return their allocation size. - */ - c3_w - u2_wr_mark(u2_ray wir_r); diff --git a/include/g/a.h b/include/g/a.h index a7e0beb4a5..29047287d0 100644 --- a/include/g/a.h +++ b/include/g/a.h @@ -2,7 +2,397 @@ ** ** This file is in the public domain. */ + /** Tunables. + **/ +# undef U3_MEMORY_DEBUG +# ifdef U3_MEMORY_DEBUG +# define u3_leak_on(x) (u3_Code = x) +# define u3_leak_off (u3_Code = 0) +# endif +# define u3_cc_bits U3_OS_LoomBits // 28, max 29 +# define u3_cc_page 12 // 16Kbyte pages +# define u3_cc_pages (1 << (u3_cc_bits - u3_cc_page)) // 2^16 pages +# define u3_cc_words (1 << u3_cc_bits) +# define u3_cc_bytes (c3_w)((1 << (2 + u3_cc_bits))) +# define u3_Loom ((c3_w *)(void *)U3_OS_LoomBase) + + + /** Data structures. + **/ + /* u3_post: pointer offset into u3_Loom; _p suffix; declare as u3p(). + */ + typedef c3_w u3_post; +# define u3p(type) u3_post + + /* u3_noun: tagged pointer. + ** + ** If bit 31 is 0, a u3_noun is a direct 31-bit atom ("cat"). + ** If bit 31 is 1 and bit 30 0, an indirect atom ("pug"). + ** If bit 31 is 1 and bit 30 1, an indirect cell ("pom"). + ** + ** Bits 0-29 are a word offset against u3_Loom (u3_post). + */ + typedef c3_w u3_noun; + + /* u3_none - out-of-band noun. + */ +# define u3_none (u3_noun)0xffffffff + + /* Informative typedefs. Use if you like. + */ + typedef u3_noun u3_atom; // must be atom + typedef u3_noun u3_term; // @tas + typedef u3_noun u3_mote; // @tas + typedef u3_noun u3_cell; // must be cell + typedef u3_noun u3_trel; // must be triple + typedef u3_noun u3_qual; // must be quadruple + typedef u3_noun u3_quin; // must be quintuple + typedef u3_noun u3_bean; // loobean: 0 == u3_yes, 1 == u3_no + typedef u3_noun u3_weak; // may be u3_none + typedef u3_noun (*u3_funk)(u3_noun); + typedef u3_noun (*u3_funq)(u3_noun, u3_noun); + + /** Typedefs. + **/ + /* u3_atom, u3_cell: logical atom and cell structures. + */ + typedef struct { + c3_w mug_w; + } u3_cs_noun; + + typedef struct { + c3_w mug_w; + c3_w len_w; + c3_w buf_w[0]; + } u3_cs_atom; + + typedef struct { + c3_w mug_w; + u3_noun hed; + u3_noun tel; + } u3_cs_cell; + + /* Inside a noun. + */ +# define u3_co_is_cat(som) (((som) >> 31) ? u3_no : u3_yes) +# define u3_co_is_dog(som) (((som) >> 31) ? u3_yes : u3_no) + +# define u3_co_is_pug(som) ((2 == ((som) >> 30)) ? u3_yes : u3_no) +# define u3_co_is_pom(som) ((3 == ((som) >> 30)) ? u3_yes : u3_no) +# define u3_co_to_off(som) ((som) & 0x3fffffff) +# define u3_co_to_ptr(som) (u3_co_into(u3_co_to_off(som))) +# define u3_co_to_wtr(som) ((c3_w *)u3_co_to_ptr(som)) +# define u3_co_to_pug(off) (off | 0x80000000) +# define u3_co_to_pom(off) (off | 0xc0000000) + +# define u3_co_is_atom(som) u3_or(u3_co_is_cat(som), \ + u3_co_is_pug(som)) +# define u3_co_is_cell(som) u3_co_is_pom(som) +# define u3_co_de_twin(dog, dog_w) ((dog & 0xc0000000) | u3_co_outa(dog_w)) + +# define u3_co_h(som) \ + ( u3_so(u3_co_is_cell(som)) \ + ? ( ((u3_cs_cell *)u3_co_to_ptr(som))->hed )\ + : u3_cm_bail(c3__exit) ) + +# define u3_co_t(som) \ + ( u3_so(u3_co_is_cell(som)) \ + ? ( ((u3_cs_cell *)u3_co_to_ptr(som))->tel )\ + : u3_cm_bail(c3__exit) ) + + /* u3_cs_box: classic allocation box. + ** + ** The box size is also stored at the end of the box in classic + ** bad ass malloc style. Hence a box is: + ** + ** --- + ** siz_w + ** use_w + ** if(debug) cod_w + ** user data + ** siz_w + ** --- + ** + ** Do not attempt to adjust this structure! + */ + typedef struct _u3_cs_box { + c3_w siz_w; // size of this box + c3_w use_w; // reference count; free if 0 +# ifdef U3_MEMORY_DEBUG + c3_w eus_w; // recomputed refcount + c3_w cod_w; // tracing code +# endif + } u3_cs_box; + +# define u3_co_boxed(len_w) (len_w + c3_wiseof(u3_cs_box) + 1) +# define u3_co_boxto(box_v) ( (void *) \ + ( ((c3_w *)(void*)(box_v)) + \ + c3_wiseof(u3_cs_box) ) ) +# define u3_co_botox(tox_v) ( (struct _u3_cs_box *) \ + (void *) \ + ( ((c3_w *)(void*)(tox_v)) - \ + c3_wiseof(u3_cs_box) ) ) + + /* u3_cs_fbox: free node in heap. Sets minimum node size. + ** + */ + typedef struct _u3_cs_fbox { + u3_cs_box box_u; + u3p(struct _u3_cs_fbox) pre_p; + u3p(struct _u3_cs_fbox) nex_p; + } u3_cs_fbox; + +# define u3_cc_minimum 6 +# define u3_cc_fbox_no 28 + + + /* u3_cs_road: contiguous allocation and execution context. + ** + ** A road is a normal heap-stack system, except that the heap + ** and stack can point in either direction. Therefore, inside + ** a road, we can nest another road in the opposite direction. + ** + ** When the opposite road completes, its heap is left on top of + ** the opposite heap's stack. It's no more than the normal + ** behavior of a stack machine for all subcomputations to push + ** their results, internally durable, on the stack. + ** + ** The performance tradeoff of "leaping" - reversing directions + ** in the road - is that if the outer computation wants to + ** preserve the results of the inner one, not just use them for + ** temporary purposes, it has to copy them. + ** + ** This is a trivial cost in some cases, a prohibitive cost in + ** others. The upside, of course, is that all garbage accrued + ** in the inner computation is discarded at zero cost. + ** + ** The goal of the road system is the ability to *layer* memory + ** models. If you are allocating on a road, you have no idea + ** how deep within a nested road system you are - in other words, + ** you have no idea exactly how durable your result may be. + ** But free space is never fragmented within a road. + ** + ** Roads do not reduce the generality or performance of a memory + ** system, since even the most complex GC system can be nested + ** within a road at no particular loss of performance - a road + ** is just a block of memory. The cost of road allocation is, + ** at least in theory, the branch prediction hits when we try to + ** decide which side of the road we're allocating on. The road + ** system imposes no pointer read or write barriers, of course. + ** + ** The road can point in either direction. If cap > hat, it + ** looks like this ("north"): + ** + ** 0 rut hat ffff + ** | | | | + ** |~~~~~~~~~~~~-------##########################+++++++$~~~~~| + ** | | | | + ** 0 cap mat ffff + ** + ** Otherwise, it looks like this ("south"): + ** + ** 0 mat cap ffff + ** | | | | + ** |~~~~~~~~~~~~$++++++##########################--------~~~~~| + ** | | | | + ** 0 hat rut ffff + ** + ** Legend: - is durable storage (heap); + is temporary storage + ** (stack); ~ is deep storage (immutable); $ is the allocation block; + ** # is free memory. + ** + ** Pointer restrictions: pointers stored in + can point anywhere, + ** except to more central pointers in +. (Ie, all pointers from + ** stack to stack must point downward on the stack.) Pointers in + ** - can only point to - or ~; pointers in ~ only point to ~. + ** + ** To "leap" is to create a new inner road in the ### free space. + ** but in the reverse direction, so that when the inner road + ** "falls" (terminates), its durable storage is left on the + ** temporary storage of the outer road. + ** + ** In all cases, the pointer in a u3_noun is a word offset into + ** u3H, the top-level road. + */ + typedef struct _u3_cs_road { + struct _u3_cs_road* par_u; // parent road + + struct _u3_cs_road* kid_u; // child road list + struct _u3_cs_road* nex_u; // sibling road + struct _u3_cs_road* now_u; // current road pointer + + u3p(c3_w) cap_p; // top of transient region + u3p(c3_w) hat_p; // top of durable region + u3p(c3_w) mat_p; // bottom of transient region + u3p(c3_w) rut_p; // bottom of durable region + u3p(c3_w) ear_p; // original cap if kid is live + + c3_w fut_w[32]; // futureproof buffer + + struct { // escape buffer + union { + jmp_buf buf; + c3_w buf_w[256]; // futureproofing + }; + } esc; + + struct { // miscellaneous config + c3_w fag_w; // flag bits + } how; // + + struct { // allocation pools + u3p(u3_cs_fbox) fre_p[u3_cc_fbox_no]; // heap by node size log + c3_w fre_w; // number of free words + } all; + + struct { // jet dashboard + u3p(u3_ch_root) har_p; // jet index (old style) + u3_noun das; // dashboard (new style) + } jed; + + struct { // namespace + u3_noun flu; // (list $+(* (unit))), inward + } ski; + + struct { // trace stack + u3_noun tax; // (list ,*) + u3_noun mer; // emergency buffer to release + } bug; + + struct { // profile stack + c3_d nox_d; // nock steps + u3_noun don; // ++path + u3_noun day; // profile data, ++doss + } pro; + + struct { // memoization + u3p(u3_ch_root) har_p; // (map (pair term noun) noun) + } cax; + } u3_cs_road; + typedef u3_cs_road u3_road; + + + /** Flags. + **/ + enum u3_cs_flag { + u3_cs_flag_debug = 0x1, // debug memory + u3_cs_flag_gc = 0x2, // garbage collect once + u3_cs_flag_sand = 0x4, // sand mode, bump allocation + u3_cs_flag_die = 0x8 // process was asked to exit + }; + + + /** Macros. + **/ +# define u3_co_into(x) ((void *)(u3_Loom + (x))) +# define u3_co_outa(p) (((c3_w*)(void*)(p)) - u3_Loom) + +# define u3to(type, x) ((type *) u3_co_into(x)) +# define u3of(type, x) (u3_co_outa((type *)x)) + +# define u3_co_is_north(r) ((r->cap_p > r->hat_p) ? u3_yes : u3_no) +# define u3_co_is_south(r) ((u3_so(u3_co_is_north(r))) ? u3_no : u3_yes) + +# define u3_co_open(r) ( (u3_yes == u3_co_is_north(r)) \ + ? (c3_w)(r->cap_p - r->hat_p) \ + : (c3_w)(r->hat_p - r->cap_p) ) + +# define u3_co_north_is_senior(r, dog) \ + u3_say((u3_co_to_off(dog) < r->rut_p) || \ + (u3_co_to_off(dog) >= r->mat_p)) + +# define u3_co_north_is_junior(r, dog) \ + u3_say((u3_co_to_off(dog) >= r->cap_p) && \ + (u3_co_to_off(dog) < r->mat_p)) + +# define u3_co_north_is_normal(r, dog) \ + u3_and(u3_not(u3_co_north_is_senior(r, dog)), \ + u3_not(u3_co_north_is_junior(r, dog))) + +# define u3_co_south_is_senior(r, dog) \ + u3_say((u3_co_to_off(dog) < r->mat_p) || \ + (u3_co_to_off(dog) >= r->rut_p)) + +# define u3_co_south_is_junior(r, dog) \ + u3_say((u3_co_to_off(dog) < r->cap_p) && \ + (u3_co_to_off(dog) >= r->mat_p)) + +# define u3_co_south_is_normal(r, dog) \ + u3_and(u3_not(u3_co_south_is_senior(r, dog)), \ + u3_not(u3_co_south_is_junior(r, dog))) + +# define u3_co_is_junior(r, som) \ + ( u3_so(u3_co_is_cat(som)) \ + ? u3_no \ + : u3_so(u3_co_is_north(r)) \ + ? u3_co_north_is_junior(r, som) \ + : u3_co_south_is_junior(r, som) ) + +# define u3_co_is_senior(r, som) \ + ( u3_so(u3_co_is_cat(som)) \ + ? u3_yes \ + : u3_so(u3_co_is_north(r)) \ + ? u3_co_north_is_senior(r, som) \ + : u3_co_south_is_senior(r, som) ) + + /* Word axis macros. For 31-bit axes only. + */ + /* u3_ax_dep(): number of axis bits. + */ +# define u3_ax_dep(a_w) (c3_bits_word(a_w) - 1) + + /* u3_ax_cap(): root axis, 2 or 3. + */ +# define u3_ax_cap(a_w) (0x2 | (a_w >> (u3_ax_dep(a_w) - 1))) + + /* u3_ax_mas(): remainder after cap. + */ +# define u3_ax_mas(a_w) \ + ( (a_w & ~(1 << u3_ax_dep(a_w))) | (1 << (u3_ax_dep(a_w) - 1)) ) + + /* u3_ax_peg(): connect two axes. + */ +# define u3_ax_peg(a_w, b_w) \ + ( (a_w << u3_ax_dep(b_w)) | (b_w &~ (1 << u3_ax_dep(b_w))) ) + + /* Conventional axes for gate call. + */ +# define u3_cv_pay 3 // payload +# define u3_cv_sam 6 // sample +# define u3_cv_sam_1 6 +# define u3_cv_sam_2 12 +# define u3_cv_sam_3 13 +# define u3_cv_sam_4 24 +# define u3_cv_sam_5 25 +# define u3_cv_sam_6 26 +# define u3_cv_sam_12 52 +# define u3_cv_sam_13 53 +# define u3_cv_sam_7 27 +# define u3_cv_con 7 // context +# define u3_cv_con_2 14 // context +# define u3_cv_con_3 15 // context +# define u3_cv_con_sam 30 // sample in gate context +# define u3_cv_noc 2 // deprecated +# define u3_cv_bat 2 // battery + + + /** Globals. + **/ + /* u3_Road / u3R: current road (thread-local). + */ + c3_global u3_road* u3_Road; +# define u3R u3_Road + + /* u3_Code: memory code. + */ +#ifdef U3_MEMORY_DEBUG + c3_global c3_w u3_Code; +#endif + + + /** Functions. + **/ /** Allocation. **/ /* Basic allocation. diff --git a/include/g/e.h b/include/g/e.h index 5c3dd451b8..59bf16929e 100644 --- a/include/g/e.h +++ b/include/g/e.h @@ -2,6 +2,60 @@ ** ** This file is in the public domain. */ + /** Data structures. + **/ + /* u3_cs_line: control line. + */ + typedef struct _u3_cs_line { + c3_w pag_w; + c3_w mug_w; + } u3_cs_line; + + /* u3_cs_control: memory change, control file. + */ + typedef struct _u3_cs_control { + c3_d evt_d; // event number + c3_w nor_w; // new page count north + c3_w sou_w; // new page count south + c3_w pgs_w; // number of changed pages + u3_cs_line mem_u[0]; // per page + } u3_cs_control; + + /* u3_cs_patch: memory change, top level. + */ + typedef struct _u3_cs_patch { + c3_i ctl_i; + c3_i mem_i; + u3_cs_control* con_u; + } u3_cs_patch; + + /* u3_cs_image: memory segment, open file. + */ + typedef struct _u3_cs_image { + c3_c* nam_c; // segment name + c3_i fid_i; // open file, or 0 + c3_w pgs_w; // length in pages + } u3_cs_image; + + /* u3_cs_pool: entire memory system. + */ + typedef struct _u3_cs_pool { + c3_c* cpu_c; // path to + c3_d evt_d; // last patch written at event + c3_w dit_w[u3_cc_pages >> 5]; // touched since last save + u3_cs_image nor_u; // north segment + u3_cs_image sou_u; // south segment + } u3_cs_pool; + + + /** Globals. + **/ + /* u3_Pool / u3P: global memory control. + */ + c3_global u3_cs_pool u3_Pool; +# define u3P u3_Pool + + /** Functions. **/ /* u3_ce_fault(): handle a memory event with libsigsegv protocol. @@ -33,3 +87,4 @@ */ c3_w u3_ce_dirty(void); + diff --git a/include/g/h.h b/include/g/h.h index cd50701511..2038cb25ac 100644 --- a/include/g/h.h +++ b/include/g/h.h @@ -2,6 +2,78 @@ ** ** This file is in the public domain. */ + /** Data structures. + **/ + /** Straightforward implementation of the classic Bagwell + *** HAMT (hash array mapped trie), using a mug hash. + *** + *** Because a mug is 31 bits, the root table is 64 wide. + *** Thereupon 5 bits each are warm for each layer. The + *** final leaf is simply a linear search. + *** + *** We store an extra "freshly warm" bit for a simple + *** clock-algorithm reclamation policy, not yet implemented. + *** Search "clock algorithm" to figure it out. + **/ + /* u3_ch_slot: map slot. + ** + ** Either a key-value cell or a loom offset, decoded as a pointer + ** to a u3_ch_node. Matches the u3_noun format - coordinate with + ** meme.h. The top two bits are: + ** + ** 00 - empty (in the root table only) + ** 01 - table + ** 02 - entry, stale + ** 03 - entry, fresh + */ + typedef c3_w u3_ch_slot; + + /* u3_ch_node: map node. + */ + typedef struct { + c3_w map_w; + u3_ch_slot sot_w[0]; + } u3_ch_node; + + /* u3_ch_root: hash root table, with future-proof clock. + */ + typedef struct { + c3_w clk_w; + u3_ch_slot sot_w[64]; + } u3_ch_root; + + /* u3_ch_buck: bottom bucket. + */ + typedef struct { + c3_w len_w; + u3_noun kev[0]; + } u3_ch_buck; + + /** HAMT macros. + *** + *** Coordinate with u3_noun definition! + **/ + /* u3_ch_slot_is_null(): yes iff slot is empty + ** u3_ch_slot_is_noun(): yes iff slot contains a key/value cell + ** u3_ch_slot_is_node(): yes iff slot contains a subtable/bucket + ** u3_ch_slot_is_warm(): yes iff fresh bit is set + ** u3_ch_slot_to_node(): slot to node pointer + ** u3_ch_node_to_slot(): node pointer to slot + ** u3_ch_slot_to_noun(): slot to cell + ** u3_ch_noun_to_slot(): cell to slot + */ +# define u3_ch_slot_is_null(sot) ((0 == ((sot) >> 30)) ? u3_yes : u3_no) +# define u3_ch_slot_is_node(sot) ((1 == ((sot) >> 30)) ? u3_yes : u3_no) +# define u3_ch_slot_is_noun(sot) ((1 == ((sot) >> 31)) ? u3_yes : u3_no) +# define u3_ch_slot_is_warm(sot) (((sot) & 0x40000000) ? u3_yes : u3_no) +# define u3_ch_slot_to_node(sot) (u3_co_into((sot) & 0x3fffffff)) +# define u3_ch_node_to_slot(ptr) (u3_co_outa(ptr) | 0x40000000) +# define u3_ch_slot_to_noun(sot) (0x40000000 | (sot)) +# define u3_ch_noun_to_slot(som) (som) +# define u3_ch_noun_be_warm(sot) ((sot) | 0x40000000) +# define u3_ch_noun_be_cold(sot) ((sot) & ~0x40000000) + + /** Functions. *** *** Needs: delete and merge functions; clock reclamation function. diff --git a/include/g/j.h b/include/g/j.h index 12d861fe69..fc88627f78 100644 --- a/include/g/j.h +++ b/include/g/j.h @@ -2,7 +2,108 @@ ** ** This file is in the public domain. */ - /** Jets. + /** Noun semantics. + **/ +#if 0 + ++ bane ,@tas :: battery name + ++ bash ,@uvH :: ctx identity hash + ++ bosh ,@uvH :: local battery hash + ++ batt ,* :: battery + ++ calx :: cached by battery + $: jax=,@ud :: jet index + pax=,@ud :: parent axis or 0 + hap=(map ,@ud ,@ud) :: axis/jet + huc=(map term nock) :: name/tool + == :: + ++ clog (pair cope (map batt (map term nock))) :: identity record + ++ cope (trel bane axis (each bash noun)) :: core pattern + ++ dash :: jet system + $: sys=(map batt bash) :: battery/identity + haw=(map bash clog) :: identity/core + == :: + ++ je !: :: dashboard door + |_ dash + ++ fsck :: parse classic clue + |= clu=clue + ^- [p=term q=axis r=(map term nock)] + :+ ?@ p.clu `@tas`p.clu + ?> ?=([@ @] p.clu) + (cat 3 -.p.clu (scot %ud +.p.clu)) + |- ^- axis + ?: ?=([10 *] q.clu) $(q.clu +>.q.clu) + ?: ?=([1 0] q.clu) 0 + ?> ?=([0 @] q.clu) +.q.clu + (~(gas by *(map term nock)) r.jlu) + :: + ++ fund :: register battery + |= [clu=clue cor=*] :: + ^+ +> + ?. =(~ (find cor)) +>.$ + =+ cey=(fsck clu) + =+ ^= mop ^- (trel bane axis (each bash ,*)) + :- p.cey + ?: =(0 q.cey) + [3 %| -.cor] + [q.cey %& (~(got by sys) -:.*([0 q.cey] cor))] + =+ soh=(sham mop) + =+ cag=(~(get by haw) soh) + %= +>.$ + sys (~(put by sys) -.cor [soh r.cey]) + haw %+ ~(put by haw) soh + :- mop + ?~ cag + [[-.cor r.cey] ~ ~] + (~(put by q.u.cag) -.cor r.cey) + == + -- +#endif + + /** Data structures. + *** + *** All of these are transient structures allocated with malloc. + **/ + /* u3_cs_harm: jet arm. + */ + typedef struct _u3_cs_harm { + c3_c* fcs_c; // `.axe` or name + u3_noun (*fun_f)(u3_noun); // compute or 0 / semitransfer + // u3_bean (*val_f)(u3_noun); // validate or 0 / retain + c3_o ice; // perfect (don't test) + c3_o tot; // total (never punts) + c3_o liv; // live (enabled) + c3_l axe_l; // computed/discovered axis + struct _u3_cs_core* cop_u; // containing core + } u3_cs_harm; + + /* u3_cs_core: driver definition. + */ + typedef struct _u3_cs_core { + c3_c* cos_c; // control string + struct _u3_cs_harm* arm_u; // blank-terminated static list + struct _u3_cs_core* dev_u; // blank-terminated static list + struct _u3_cs_core* par_u; // dynamic parent pointer + c3_l axe_l; // axis to parent + c3_l jax_l; // index in global dashboard + } u3_cs_core; + + /* u3_cs_dash, u3_Dash, u3D: jet dashboard singleton + */ + typedef struct _u3_cs_dash { + u3_cs_core* dev_u; // null-terminated static list + c3_l len_l; // dynamic array length + c3_l all_l; // allocated length + u3_cs_core* ray_u; // dynamic array by axis + } u3_cs_dash; + + /** Globals. + **/ + /* u3_Dash: jet dashboard. + */ + extern u3_cs_dash u3_Dash; +# define u3D u3_Dash + + + /** Functions. **/ /* u3_cj_boot(): initialize jet system. */ diff --git a/include/g/v.h b/include/g/v.h index 4c29b36011..cb9b6f24dc 100644 --- a/include/g/v.h +++ b/include/g/v.h @@ -2,14 +2,60 @@ ** ** This file is in the public domain. */ - /** Arvo macros. + /** Data structures. **/ -# define u3_do(txt_c, arg) u3_cv_do(txt_c, arg) -# define u3_dc(txt_c, a, b) u3_cv_do(txt_c, u3nc(a, b)) -# define u3_dt(txt_c, a, b, c) u3_cv_do(txt_c, u3nt(a, b, c)) -# define u3_dq(txt_c, a, b, c, d) u3_cv_do(txt_c, u3nt(a, b, c, d)) + /* u3_cart: ovum carton. + */ + struct _u3_cs_arvo; - /** Arvo functions. Rather unstructured. + typedef struct _u3_cs_cart { + u3_noun vir; // effects of ovum + u3_bean did; // cart considered for commit? + u3_bean cit; // cart committed? + c3_d ent_d; // entry in raft queue? + u3p(struct _u3_cs_cart) nex_p; + } u3_cs_cart; + + /* u3_cs_arvo: modern arvo structure. + */ + typedef struct _u3_cs_arvo { + c3_d ent_d; // event number + u3_noun yot; // cached gates + u3_noun now; // current time, as noun + u3_noun wen; // current time, as text + u3_noun sev_l; // instance number + u3_noun sen; // instance string + u3_noun own; // owner list + + u3_noun roe; // temporary unsaved events + u3_noun key; // log key, or 0 + + u3_noun ken; // kernel formula + u3_noun roc; // kernel core + + struct { // ova waiting to process + u3p(u3_cs_cart) egg_p; // exit of ovum queue + u3p(u3_cs_cart) geg_p; // entry of ovum queue + } ova; + } u3_cs_arvo; + + /* u3_cs_home: all internal (within image) state. + */ + typedef struct _u3_cs_home { + u3_cs_road rod_u; // storage state + u3_cs_arvo arv_u; // arvo state + } u3_cs_home; + + + /** Globals. + **/ + /* u3_Home / u3H: root of thread. + */ + c3_global u3_cs_home* u3_Home; +# define u3H u3_Home +# define u3A (&(u3_Home->arv_u)) + + /** Functions. **/ /* u3_cv_do(): use a kernel function. */ diff --git a/include/n/arvo.h b/include/n/arvo.h deleted file mode 100644 index 47795d9689..0000000000 --- a/include/n/arvo.h +++ /dev/null @@ -1,40 +0,0 @@ -/* include/f/arvo.h -** -** This file is in the public domain. -*/ - /** Data structures. - **/ - /* u3_cart: ovum carton. - */ - struct _u3_cs_arvo; - - typedef struct _u3_cs_cart { - u3_noun vir; // effects of ovum - u3_bean did; // cart considered for commit? - u3_bean cit; // cart committed? - c3_d ent_d; // entry in raft queue? - u3p(struct _u3_cs_cart) nex_p; - } u3_cs_cart; - - /* u3_cs_arvo: modern arvo structure. - */ - typedef struct _u3_cs_arvo { - c3_d ent_d; // event number - u3_noun yot; // cached gates - u3_noun now; // current time, as noun - u3_noun wen; // current time, as text - u3_noun sev_l; // instance number - u3_noun sen; // instance string - u3_noun own; // owner list - - u3_noun roe; // temporary unsaved events - u3_noun key; // log key, or 0 - - u3_noun ken; // kernel formula - u3_noun roc; // kernel core - - struct { // ova waiting to process - u3p(u3_cs_cart) egg_p; // exit of ovum queue - u3p(u3_cs_cart) geg_p; // entry of ovum queue - } ova; - } u3_cs_arvo; diff --git a/include/n/glob.h b/include/n/glob.h deleted file mode 100644 index 61bbd6c1ea..0000000000 --- a/include/n/glob.h +++ /dev/null @@ -1,54 +0,0 @@ -/* include/n/glob.h -** -** This file is in the public domain. -*/ - /** Data structures. - **/ - /* u3_cs_home: all internal (within image) state. - */ - typedef struct _u3_cs_home { - u3_cs_road rod_u; // storage state - u3_cs_arvo arv_u; // arvo state - } u3_cs_home; - - - /** Globals. - **/ - /* u3_Loom: base of loom, as a word pointer. - */ -#if 0 - c3_global c3_w* u3_Loom; -#else -# define u3_Loom ((c3_w *)(void *)0x200000000) -#endif - /* u3_Home / u3H: root of thread. Always north. - */ - c3_global u3_cs_home* u3_Home; -# define u3H u3_Home -# define u3A (&(u3_Home->arv_u)) - - /* u3_Road / u3R: current road (thread-local). - */ - c3_global u3_road* u3_Road; -# define u3R u3_Road - - /* u3_Dash: jet dashboard. - */ - extern u3_cs_dash u3_Dash; -# define u3D u3_Dash - - /* u3_Pool / u3P: global memory control. - */ - c3_global u3_cs_pool u3_Pool; -# define u3P u3_Pool - - /* u3_Code: memory code. - */ -#ifdef U3_MEMORY_DEBUG - c3_global c3_w u3_Code; -#endif - - /* u3_Nock: nock instruction counter. - */ - c3_global c3_d u3_Nock; -# define u3N u3_Nock diff --git a/include/n/hash.h b/include/n/hash.h deleted file mode 100644 index e1e850abed..0000000000 --- a/include/n/hash.h +++ /dev/null @@ -1,73 +0,0 @@ -/* include/n/hash.h -** -** This file is in the public domain. -*/ - /** Straightforward implementation of the classic Bagwell - *** HAMT (hash array mapped trie), using a mug hash. - *** - *** Because a mug is 31 bits, the root table is 64 wide. - *** Thereupon 5 bits each are warm for each layer. The - *** final leaf is simply a linear search. - *** - *** We store an extra "freshly warm" bit for a simple - *** clock-algorithm reclamation policy, not yet implemented. - *** Search "clock algorithm" to figure it out. - **/ - /* u3_ch_slot: map slot. - ** - ** Either a key-value cell or a loom offset, decoded as a pointer - ** to a u3_ch_node. Matches the u3_noun format - coordinate with - ** meme.h. The top two bits are: - ** - ** 00 - empty (in the root table only) - ** 01 - table - ** 02 - entry, stale - ** 03 - entry, fresh - */ - typedef c3_w u3_ch_slot; - - /* u3_ch_node: map node. - */ - typedef struct { - c3_w map_w; - u3_ch_slot sot_w[0]; - } u3_ch_node; - - /* u3_ch_root: hash root table, with future-proof clock. - */ - typedef struct { - c3_w clk_w; - u3_ch_slot sot_w[64]; - } u3_ch_root; - - /* u3_ch_buck: bottom bucket. - */ - typedef struct { - c3_w len_w; - u3_noun kev[0]; - } u3_ch_buck; - - /** HAMT macros. - *** - *** Coordinate with u3_noun definition! - **/ - /* u3_ch_slot_is_null(): yes iff slot is empty - ** u3_ch_slot_is_noun(): yes iff slot contains a key/value cell - ** u3_ch_slot_is_node(): yes iff slot contains a subtable/bucket - ** u3_ch_slot_is_warm(): yes iff fresh bit is set - ** u3_ch_slot_to_node(): slot to node pointer - ** u3_ch_node_to_slot(): node pointer to slot - ** u3_ch_slot_to_noun(): slot to cell - ** u3_ch_noun_to_slot(): cell to slot - */ -# define u3_ch_slot_is_null(sot) ((0 == ((sot) >> 30)) ? u3_yes : u3_no) -# define u3_ch_slot_is_node(sot) ((1 == ((sot) >> 30)) ? u3_yes : u3_no) -# define u3_ch_slot_is_noun(sot) ((1 == ((sot) >> 31)) ? u3_yes : u3_no) -# define u3_ch_slot_is_warm(sot) (((sot) & 0x40000000) ? u3_yes : u3_no) -# define u3_ch_slot_to_node(sot) (u3_co_into((sot) & 0x3fffffff)) -# define u3_ch_node_to_slot(ptr) (u3_co_outa(ptr) | 0x40000000) -# define u3_ch_slot_to_noun(sot) (0x40000000 | (sot)) -# define u3_ch_noun_to_slot(som) (som) -# define u3_ch_noun_be_warm(sot) ((sot) | 0x40000000) -# define u3_ch_noun_be_cold(sot) ((sot) & ~0x40000000) - diff --git a/include/n/jets.h b/include/n/jets.h deleted file mode 100644 index 950330baa7..0000000000 --- a/include/n/jets.h +++ /dev/null @@ -1,95 +0,0 @@ -/* include/f/jets.h -** -** This file is in the public domain. -*/ - /** Noun structures. - **/ -#if 0 - ++ bane ,@tas :: battery name - ++ bash ,@uvH :: ctx identity hash - ++ bosh ,@uvH :: local battery hash - ++ batt ,* :: battery - ++ calx :: cached by battery - $: jax=,@ud :: jet index - pax=,@ud :: parent axis or 0 - hap=(map ,@ud ,@ud) :: axis/jet - huc=(map term nock) :: name/tool - == :: - ++ clog (pair cope (map batt (map term nock))) :: identity record - ++ cope (trel bane axis (each bash noun)) :: core pattern - ++ dash :: jet system - $: sys=(map batt bash) :: battery/identity - haw=(map bash clog) :: identity/core - == :: - ++ je !: :: dashboard door - |_ dash - ++ fsck :: parse classic clue - |= clu=clue - ^- [p=term q=axis r=(map term nock)] - :+ ?@ p.clu `@tas`p.clu - ?> ?=([@ @] p.clu) - (cat 3 -.p.clu (scot %ud +.p.clu)) - |- ^- axis - ?: ?=([10 *] q.clu) $(q.clu +>.q.clu) - ?: ?=([1 0] q.clu) 0 - ?> ?=([0 @] q.clu) +.q.clu - (~(gas by *(map term nock)) r.jlu) - :: - ++ fund :: register battery - |= [clu=clue cor=*] :: - ^+ +> - ?. =(~ (find cor)) +>.$ - =+ cey=(fsck clu) - =+ ^= mop ^- (trel bane axis (each bash ,*)) - :- p.cey - ?: =(0 q.cey) - [3 %| -.cor] - [q.cey %& (~(got by sys) -:.*([0 q.cey] cor))] - =+ soh=(sham mop) - =+ cag=(~(get by haw) soh) - %= +>.$ - sys (~(put by sys) -.cor [soh r.cey]) - haw %+ ~(put by haw) soh - :- mop - ?~ cag - [[-.cor r.cey] ~ ~] - (~(put by q.u.cag) -.cor r.cey) - == - -- -#endif - /** Data structures. - *** - *** All of these are transient structures allocated with malloc. - **/ - /* u3_cs_harm: jet arm. - */ - typedef struct _u3_cs_harm { - c3_c* fcs_c; // `.axe` or name - u3_noun (*fun_f)(u3_noun); // compute or 0 / semitransfer - // u3_bean (*val_f)(u3_noun); // validate or 0 / retain - c3_o ice; // perfect (don't test) - c3_o tot; // total (never punts) - c3_o liv; // live (enabled) - c3_l axe_l; // computed/discovered axis - struct _u3_cs_core* cop_u; // containing core - } u3_cs_harm; - - /* u3_cs_core: driver definition. - */ - typedef struct _u3_cs_core { - c3_c* cos_c; // control string - struct _u3_cs_harm* arm_u; // blank-terminated static list - struct _u3_cs_core* dev_u; // blank-terminated static list - struct _u3_cs_core* par_u; // dynamic parent pointer - c3_l axe_l; // axis to parent - c3_l jax_l; // index in global dashboard - } u3_cs_core; - - /* u3_cs_dash, u3_Dash, u3D: jet dashboard singleton - */ - typedef struct _u3_cs_dash { - u3_cs_core* dev_u; // null-terminated static list - c3_l len_l; // dynamic array length - c3_l all_l; // allocated length - u3_cs_core* ray_u; // dynamic array by axis - } u3_cs_dash; diff --git a/include/n/meze.h b/include/n/meze.h deleted file mode 100644 index 532479f751..0000000000 --- a/include/n/meze.h +++ /dev/null @@ -1,83 +0,0 @@ -/* include/f/meze.h -** -** This file is in the public domain. -*/ - /** Nock-specific typedefs. - **/ - /* u3_yes, u3_no, u3_nul; - ** - ** Our Martian booleans and list terminator; empty string; not a noun. - */ -# define u3_yes 0 -# define u3_no 1 -# define u3_nul 0 -# define u3_blip 0 - - /* Tools for Martian booleans. - */ -# define u3_so(x) (u3_yes == (x)) -# define u3_ne(x) (u3_no == (x)) -# define u3_say(x) ( (x) ? u3_yes : u3_no ) -# define u3_not(x) ( (x == u3_yes) ? u3_no : u3_yes ) -# define u3_and(x, y) ( (u3_so(x) && u3_so(y)) ? u3_yes : u3_no ) -# define u3_or(x, y) ( (u3_so(x) || u3_so(y)) ? u3_yes : u3_no ) - -# define u3_assure(x) if ( u3_ne(x) ) { u3_cm_bail(c3__fail); } -# define u3_assent(x) if ( u3_ne(x) ) { u3_cm_bail(c3__exit); } - - /* Word axis macros. For 31-bit axes only. - */ - /* u3_ax_dep(): number of axis bits. - */ -# define u3_ax_dep(a_w) (c3_bits_word(a_w) - 1) - - /* u3_ax_cap(): root axis, 2 or 3. - */ -# define u3_ax_cap(a_w) (0x2 | (a_w >> (u3_ax_dep(a_w) - 1))) - - /* u3_ax_mas(): remainder after cap. - */ -# define u3_ax_mas(a_w) \ - ( (a_w & ~(1 << u3_ax_dep(a_w))) | (1 << (u3_ax_dep(a_w) - 1)) ) - - /* u3_ax_peg(): connect two axes. - */ -# define u3_ax_peg(a_w, b_w) \ - ( (a_w << u3_ax_dep(b_w)) | (b_w &~ (1 << u3_ax_dep(b_w))) ) - - /* Conventional axes for gate call. - */ -# define u3_cv_pay 3 // payload -# define u3_cv_sam 6 // sample -# define u3_cv_sam_1 6 -# define u3_cv_sam_2 12 -# define u3_cv_sam_3 13 -# define u3_cv_sam_4 24 -# define u3_cv_sam_5 25 -# define u3_cv_sam_6 26 -# define u3_cv_sam_12 52 -# define u3_cv_sam_13 53 -# define u3_cv_sam_7 27 -# define u3_cv_con 7 // context -# define u3_cv_con_2 14 // context -# define u3_cv_con_3 15 // context -# define u3_cv_con_sam 30 // sample in gate context -# define u3_cv_noc 2 // deprecated -# define u3_cv_bat 2 // battery - - /** Aliases - selective and syntactically unique. - **/ -# define u3h(som) u3_cx_h(som) -# define u3t(som) u3_cx_t(som) -# define u3at(axe, som) u3_cx_at(axe, som) - -# define u3nc(a, b) u3_ci_cell(a, b) -# define u3nt(a, b, c) u3_ci_trel(a, b, c) -# define u3nq(a, b, c, d) u3_ci_qual(a, b, c, d) - -# define u3du(som) (u3_cr_du(som)) -# define u3ud(som) (u3_cr_ud(som)) - -# define u3k(som) u3_ca_gain(som) -# define u3z(som) u3_ca_lose(som) - diff --git a/include/n/noun.h b/include/n/noun.h deleted file mode 100644 index e89bedef84..0000000000 --- a/include/n/noun.h +++ /dev/null @@ -1,89 +0,0 @@ -/* include/f/noun.h -** -** This file is in the public domain. -*/ - /** Data structures. - **/ - /* u3_post: pointer offset into u3_Loom; _p suffix; declare as u3p(). - */ - typedef c3_w u3_post; -# define u3p(type) u3_post - - /* u3_noun: tagged pointer. - ** - ** If bit 31 is 0, a u3_noun is a direct 31-bit atom ("cat"). - ** If bit 31 is 1 and bit 30 0, an indirect atom ("pug"). - ** If bit 31 is 1 and bit 30 1, an indirect cell ("pom"). - ** - ** Bits 0-29 are a word offset against u3_Loom (u3_post). - */ - typedef c3_w u3_noun; - - /* u3_none - out-of-band noun. - */ -# define u3_none (u3_noun)0xffffffff - - /* Informative typedefs. Use if you like. - */ - typedef u3_noun u3_atom; // must be atom - typedef u3_noun u3_term; // @tas - typedef u3_noun u3_mote; // @tas - typedef u3_noun u3_cell; // must be cell - typedef u3_noun u3_trel; // must be triple - typedef u3_noun u3_qual; // must be quadruple - typedef u3_noun u3_quin; // must be quintuple - typedef u3_noun u3_bean; // loobean: 0 == u3_yes, 1 == u3_no - typedef u3_noun u3_weak; // may be u3_none - typedef u3_noun (*u3_funk)(u3_noun); - typedef u3_noun (*u3_funq)(u3_noun, u3_noun); - - /** Typedefs. - **/ - /* u3_atom, u3_cell: logical atom and cell structures. - */ - typedef struct { - c3_w mug_w; - } u3_cs_noun; - - typedef struct { - c3_w mug_w; - c3_w len_w; - c3_w buf_w[0]; - } u3_cs_atom; - - typedef struct { - c3_w mug_w; - u3_noun hed; - u3_noun tel; - } u3_cs_cell; - - /* Inside a noun. - */ -# define u3_co_is_cat(som) (((som) >> 31) ? u3_no : u3_yes) -# define u3_co_is_dog(som) (((som) >> 31) ? u3_yes : u3_no) - -# define u3_co_is_pug(som) ((2 == ((som) >> 30)) ? u3_yes : u3_no) -# define u3_co_is_pom(som) ((3 == ((som) >> 30)) ? u3_yes : u3_no) -# define u3_co_to_off(som) ((som) & 0x3fffffff) -# define u3_co_to_ptr(som) (u3_co_into(u3_co_to_off(som))) -# define u3_co_to_wtr(som) ((c3_w *)u3_co_to_ptr(som)) -# define u3_co_to_pug(off) (off | 0x80000000) -# define u3_co_to_pom(off) (off | 0xc0000000) - -# define u3_co_is_atom(som) u3_or(u3_co_is_cat(som), \ - u3_co_is_pug(som)) -# define u3_co_is_cell(som) u3_co_is_pom(som) -# define u3_co_de_twin(dog, dog_w) ((dog & 0xc0000000) | u3_co_outa(dog_w)) - -# define u3_co_h(som) \ - ( u3_so(u3_co_is_cell(som)) \ - ? ( ((u3_cs_cell *)u3_co_to_ptr(som))->hed )\ - : u3_cm_bail(c3__exit) ) - -# define u3_co_t(som) \ - ( u3_so(u3_co_is_cell(som)) \ - ? ( ((u3_cs_cell *)u3_co_to_ptr(som))->tel )\ - : u3_cm_bail(c3__exit) ) - - /* u3_cs_hold, u3_cs_move: iterators for memory control. - */ diff --git a/include/n/road.h b/include/n/road.h deleted file mode 100644 index 8ed5dceae2..0000000000 --- a/include/n/road.h +++ /dev/null @@ -1,238 +0,0 @@ -/* include/n/road.h -** -** This file is in the public domain. -*/ - /** Data structures. - **/ - /* u3_cs_box: classic allocation box. - ** - ** The box size is also stored at the end of the box in classic - ** bad ass malloc style. Hence a box is: - ** - ** --- - ** siz_w - ** use_w - ** if(debug) cod_w - ** user data - ** siz_w - ** --- - ** - ** Do not attempt to adjust this structure! - */ - typedef struct _u3_cs_box { - c3_w siz_w; // size of this box - c3_w use_w; // reference count; free if 0 -# ifdef U3_MEMORY_DEBUG - c3_w eus_w; // recomputed refcount - c3_w cod_w; // tracing code -# endif - } u3_cs_box; - -# define u3_co_boxed(len_w) (len_w + c3_wiseof(u3_cs_box) + 1) -# define u3_co_boxto(box_v) ( (void *) \ - ( ((c3_w *)(void*)(box_v)) + \ - c3_wiseof(u3_cs_box) ) ) -# define u3_co_botox(tox_v) ( (struct _u3_cs_box *) \ - (void *) \ - ( ((c3_w *)(void*)(tox_v)) - \ - c3_wiseof(u3_cs_box) ) ) - - /* u3_cs_fbox: free node in heap. Sets minimum node size. - ** - */ - typedef struct _u3_cs_fbox { - u3_cs_box box_u; - u3p(struct _u3_cs_fbox) pre_p; - u3p(struct _u3_cs_fbox) nex_p; - } u3_cs_fbox; - -# define u3_cc_minimum 6 -# define u3_cc_fbox_no 28 - - - /* u3_cs_road: contiguous allocation and execution context. - ** - ** A road is a normal heap-stack system, except that the heap - ** and stack can point in either direction. Therefore, inside - ** a road, we can nest another road in the opposite direction. - ** - ** When the opposite road completes, its heap is left on top of - ** the opposite heap's stack. It's no more than the normal - ** behavior of a stack machine for all subcomputations to push - ** their results, internally durable, on the stack. - ** - ** The performance tradeoff of "leaping" - reversing directions - ** in the road - is that if the outer computation wants to - ** preserve the results of the inner one, not just use them for - ** temporary purposes, it has to copy them. - ** - ** This is a trivial cost in some cases, a prohibitive cost in - ** others. The upside, of course, is that all garbage accrued - ** in the inner computation is discarded at zero cost. - ** - ** The goal of the road system is the ability to *layer* memory - ** models. If you are allocating on a road, you have no idea - ** how deep within a nested road system you are - in other words, - ** you have no idea exactly how durable your result may be. - ** But free space is never fragmented within a road. - ** - ** Roads do not reduce the generality or performance of a memory - ** system, since even the most complex GC system can be nested - ** within a road at no particular loss of performance - a road - ** is just a block of memory. The cost of road allocation is, - ** at least in theory, the branch prediction hits when we try to - ** decide which side of the road we're allocating on. The road - ** system imposes no pointer read or write barriers, of course. - ** - ** The road can point in either direction. If cap > hat, it - ** looks like this ("north"): - ** - ** 0 rut hat ffff - ** | | | | - ** |~~~~~~~~~~~~-------##########################+++++++$~~~~~| - ** | | | | - ** 0 cap mat ffff - ** - ** Otherwise, it looks like this ("south"): - ** - ** 0 mat cap ffff - ** | | | | - ** |~~~~~~~~~~~~$++++++##########################--------~~~~~| - ** | | | | - ** 0 hat rut ffff - ** - ** Legend: - is durable storage (heap); + is temporary storage - ** (stack); ~ is deep storage (immutable); $ is the allocation block; - ** # is free memory. - ** - ** Pointer restrictions: pointers stored in + can point anywhere, - ** except to more central pointers in +. (Ie, all pointers from - ** stack to stack must point downward on the stack.) Pointers in - ** - can only point to - or ~; pointers in ~ only point to ~. - ** - ** To "leap" is to create a new inner road in the ### free space. - ** but in the reverse direction, so that when the inner road - ** "falls" (terminates), its durable storage is left on the - ** temporary storage of the outer road. - ** - ** In all cases, the pointer in a u3_noun is a word offset into - ** u3H, the top-level road. - */ - typedef struct _u3_cs_road { - struct _u3_cs_road* par_u; // parent road - - struct _u3_cs_road* kid_u; // child road list - struct _u3_cs_road* nex_u; // sibling road - struct _u3_cs_road* now_u; // current road pointer - - u3p(c3_w) cap_p; // top of transient region - u3p(c3_w) hat_p; // top of durable region - u3p(c3_w) mat_p; // bottom of transient region - u3p(c3_w) rut_p; // bottom of durable region - u3p(c3_w) ear_p; // original cap if kid is live - - c3_w fut_w[32]; // futureproof buffer - - struct { // escape buffer - union { - jmp_buf buf; - c3_w buf_w[256]; // futureproofing - }; - } esc; - - struct { // miscellaneous config - c3_w fag_w; // flag bits - } how; // - - struct { // allocation pools - u3p(u3_cs_fbox) fre_p[u3_cc_fbox_no]; // heap by node size log - c3_w fre_w; // number of free words - } all; - - struct { // jet dashboard - u3p(u3_ch_root) har_p; // jet index (old style) - u3_noun das; // dashboard (new style) - } jed; - - struct { // namespace - u3_noun flu; // (list $+(* (unit))), inward - } ski; - - struct { // trace stack - u3_noun tax; // (list ,*) - u3_noun mer; // emergency buffer to release - } bug; - - struct { // profile stack - c3_d nox_d; // nock steps - u3_noun don; // ++path - u3_noun day; // profile data, ++doss - } pro; - - struct { // memoization - u3p(u3_ch_root) har_p; // (map (pair term noun) noun) - } cax; - } u3_cs_road; - typedef u3_cs_road u3_road; - - /** Flags. - **/ - enum u3_cs_flag { - u3_cs_flag_debug = 0x1, // debug memory - u3_cs_flag_gc = 0x2, // garbage collect once - u3_cs_flag_sand = 0x4, // sand mode, bump allocation - u3_cs_flag_die = 0x8 // process was asked to exit - }; - - /** Macros. - **/ -# define u3_co_into(x) ((void *)(u3_Loom + (x))) -# define u3_co_outa(p) (((c3_w*)(void*)(p)) - u3_Loom) - -# define u3to(type, x) ((type *) u3_co_into(x)) -# define u3of(type, x) (u3_co_outa((type *)x)) - -# define u3_co_is_north(r) ((r->cap_p > r->hat_p) ? u3_yes : u3_no) -# define u3_co_is_south(r) ((u3_so(u3_co_is_north(r))) ? u3_no : u3_yes) - -# define u3_co_open(r) ( (u3_yes == u3_co_is_north(r)) \ - ? (c3_w)(r->cap_p - r->hat_p) \ - : (c3_w)(r->hat_p - r->cap_p) ) - -# define u3_co_north_is_senior(r, dog) \ - u3_say((u3_co_to_off(dog) < r->rut_p) || \ - (u3_co_to_off(dog) >= r->mat_p)) - -# define u3_co_north_is_junior(r, dog) \ - u3_say((u3_co_to_off(dog) >= r->cap_p) && \ - (u3_co_to_off(dog) < r->mat_p)) - -# define u3_co_north_is_normal(r, dog) \ - u3_and(u3_not(u3_co_north_is_senior(r, dog)), \ - u3_not(u3_co_north_is_junior(r, dog))) - -# define u3_co_south_is_senior(r, dog) \ - u3_say((u3_co_to_off(dog) < r->mat_p) || \ - (u3_co_to_off(dog) >= r->rut_p)) - -# define u3_co_south_is_junior(r, dog) \ - u3_say((u3_co_to_off(dog) < r->cap_p) && \ - (u3_co_to_off(dog) >= r->mat_p)) - -# define u3_co_south_is_normal(r, dog) \ - u3_and(u3_not(u3_co_south_is_senior(r, dog)), \ - u3_not(u3_co_south_is_junior(r, dog))) - -# define u3_co_is_junior(r, som) \ - ( u3_so(u3_co_is_cat(som)) \ - ? u3_no \ - : u3_so(u3_co_is_north(r)) \ - ? u3_co_north_is_junior(r, som) \ - : u3_co_south_is_junior(r, som) ) - -# define u3_co_is_senior(r, som) \ - ( u3_so(u3_co_is_cat(som)) \ - ? u3_yes \ - : u3_so(u3_co_is_north(r)) \ - ? u3_co_north_is_senior(r, som) \ - : u3_co_south_is_senior(r, som) ) diff --git a/include/n/save.h b/include/n/save.h deleted file mode 100644 index 63e0e71248..0000000000 --- a/include/n/save.h +++ /dev/null @@ -1,49 +0,0 @@ -/* include/n/save.h -** -** This file is in the public domain. -*/ - /** Data structures. - **/ - /* u3_cs_line: control line. - */ - typedef struct _u3_cs_line { - c3_w pag_w; - c3_w mug_w; - } u3_cs_line; - - /* u3_cs_control: memory change, control file. - */ - typedef struct _u3_cs_control { - c3_d evt_d; // event number - c3_w nor_w; // new page count north - c3_w sou_w; // new page count south - c3_w pgs_w; // number of changed pages - u3_cs_line mem_u[0]; // per page - } u3_cs_control; - - /* u3_cs_patch: memory change, top level. - */ - typedef struct _u3_cs_patch { - c3_i ctl_i; - c3_i mem_i; - u3_cs_control* con_u; - } u3_cs_patch; - - /* u3_cs_image: memory segment, open file. - */ - typedef struct _u3_cs_image { - c3_c* nam_c; // segment name - c3_i fid_i; // open file, or 0 - c3_w pgs_w; // length in pages - } u3_cs_image; - - /* u3_cs_pool: entire memory system. - */ - typedef struct _u3_cs_pool { - c3_c* cpu_c; // path to - c3_d evt_d; // last patch written at event - c3_w dit_w[u3_cc_pages >> 5]; // touched since last save - u3_cs_image nor_u; // north segment - u3_cs_image sou_u; // south segment - } u3_cs_pool; - diff --git a/include/n/tune.h b/include/n/tune.h deleted file mode 100644 index c108107b42..0000000000 --- a/include/n/tune.h +++ /dev/null @@ -1,17 +0,0 @@ -/* include/n/tune.h -** -** This file is in the public domain. -*/ - /** Tuning and configuration. - **/ -# undef U3_MEMORY_DEBUG -# ifdef U3_MEMORY_DEBUG -# define u3_leak_on(x) (u3_Code = x) -# define u3_leak_off (u3_Code = 0) -# endif - -# define u3_cc_bits U2_OS_LoomBits // 28, max 29 -# define u3_cc_page 12 // 16Kbyte pages -# define u3_cc_pages (1 << (u3_cc_bits - u3_cc_page)) // 2^16 pages -# define u3_cc_words (1 << u3_cc_bits) -# define u3_cc_bytes (c3_w)((1 << (2 + u3_cc_bits))) diff --git a/include/v/vere.h b/include/v/vere.h index c6d8d150d1..267b222b37 100644 --- a/include/v/vere.h +++ b/include/v/vere.h @@ -630,7 +630,7 @@ */ u3_atom u3_time_in_ts(struct timespec* tim_ts); -#if defined(U2_OS_linux) +#if defined(U3_OS_linux) /* u3_time_t_in_ts(): urbit time from time_t. */ u3_atom diff --git a/j/5/aesc.c b/j/5/aesc.c index 343fed3481..3dbb1a60d4 100644 --- a/j/5/aesc.c +++ b/j/5/aesc.c @@ -5,7 +5,7 @@ #include "all.h" -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) #include #else #include @@ -18,7 +18,7 @@ { c3_y a_y[32]; c3_y b_y[16]; -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) size_t siz_i = 0; #else AES_KEY key_u; @@ -30,7 +30,7 @@ u3_cr_bytes(0, 32, a_y, a); u3_cr_bytes(0, 16, b_y, b); -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) if ( kCCSuccess != CCCrypt(kCCEncrypt, kCCAlgorithmAES128, kCCOptionECBMode, a_y, kCCKeySizeAES256, 0, b_y, 16, b_y, 16, &siz_i) ) @@ -71,7 +71,7 @@ { c3_y a_y[32]; c3_y b_y[16]; -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) size_t siz_i = 0; #else AES_KEY key_u; @@ -83,7 +83,7 @@ u3_cr_bytes(0, 32, a_y, a); u3_cr_bytes(0, 16, b_y, b); -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) if ( kCCSuccess != CCCrypt(kCCDecrypt, kCCAlgorithmAES128, kCCOptionECBMode, a_y, kCCKeySizeAES256, 0, b_y, 16, b_y, 16, &siz_i) ) diff --git a/j/5/shax.c b/j/5/shax.c index 30d965e295..56dc21978a 100644 --- a/j/5/shax.c +++ b/j/5/shax.c @@ -5,7 +5,7 @@ #include "all.h" -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) #include #else #include @@ -23,7 +23,7 @@ u3_cr_bytes(0, met_w, fat_y, a); { c3_y dig_y[32]; -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) CC_SHA256_CTX ctx_h; CC_SHA256_Init(&ctx_h); @@ -51,7 +51,7 @@ u3_cr_bytes(0, a, fat_y, b); { c3_y dig_y[64]; -#if defined(U2_OS_osx) +#if defined(U3_OS_osx) CC_SHA512_CTX ctx_h; CC_SHA512_Init(&ctx_h); diff --git a/v/cttp.c b/v/cttp.c index edb0c93748..3ad24e231d 100644 --- a/v/cttp.c +++ b/v/cttp.c @@ -27,7 +27,7 @@ #include "all.h" #include "v/vere.h" -#ifdef U2_OS_osx +#ifdef U3_OS_osx # pragma GCC diagnostic ignored "-Wdeprecated-declarations" # pragma clang diagnostic ignored "-Wdeprecated-declarations" #endif diff --git a/v/main.c b/v/main.c index b81513b299..c791d30103 100644 --- a/v/main.c +++ b/v/main.c @@ -19,7 +19,7 @@ #include #include -#define U2_GLOBAL +#define U3_GLOBAL #define C3_GLOBAL #include "all.h" #include "v/vere.h" @@ -194,7 +194,7 @@ static void u3_ve_sysopt() { u3_Local = strdup(u3_Host.cpu_c); - u3_System = U2_LIB; + u3_System = U3_LIB; u3_Flag_Abort = u3_Host.ops_u.abo; u3_Flag_Garbage = u3_Host.ops_u.gab; u3_Flag_Profile = u3_Host.ops_u.pro; diff --git a/v/sist.c b/v/sist.c index 01b3a44e25..78b7caca3d 100644 --- a/v/sist.c +++ b/v/sist.c @@ -13,7 +13,7 @@ #include "all.h" #include "v/vere.h" -#if defined(U2_OS_linux) +#if defined(U3_OS_linux) #include #define fpurge(fd) __fpurge(fd) #define DEVRANDOM "/dev/urandom" @@ -77,11 +77,11 @@ u3_sist_pack(c3_w tem_w, c3_w typ_w, c3_w* bob_w, c3_w len_w) // Sync. Or, what goes by sync. { fsync(lug_u->fid_i); // fsync is almost useless, F_FULLFSYNC too slow -#if defined(U2_OS_linux) +#if defined(U3_OS_linux) fdatasync(lug_u->fid_i); -#elif defined(U2_OS_osx) +#elif defined(U3_OS_osx) fcntl(lug_u->fid_i, F_FULLFSYNC); -#elif defined(U2_OS_bsd) +#elif defined(U3_OS_bsd) fsync(lug_u->fid_i); #else # error "port: datasync" @@ -309,7 +309,7 @@ _sist_home() // { snprintf(ful_c, 2048, "cp %s/urbit.pill %s/.urb", - U2_LIB, u3_Host.cpu_c); + U3_LIB, u3_Host.cpu_c); printf("%s\r\n", ful_c); if ( 0 != system(ful_c) ) { uL(fprintf(uH, "could not %s\n", ful_c)); @@ -322,7 +322,7 @@ _sist_home() // if ( u3_Host.ops_u.imp_c ) { snprintf(ful_c, 2048, "cp -r %s/zod %s/%s", - U2_LIB, u3_Host.cpu_c, u3_Host.ops_u.imp_c+1); + U3_LIB, u3_Host.cpu_c, u3_Host.ops_u.imp_c+1); printf("%s\r\n", ful_c); if ( 0 != system(ful_c) ) { uL(fprintf(uH, "could not %s\n", ful_c)); diff --git a/v/time.c b/v/time.c index c00badabbf..1bed2d45c1 100644 --- a/v/time.c +++ b/v/time.c @@ -114,7 +114,7 @@ u3_time_in_ts(struct timespec* tim_ts) return u3_time_in_tv(&tim_tv); } -#if defined(U2_OS_linux) +#if defined(U3_OS_linux) /* u3_time_t_in_ts(): urbit time from time_t. */ u3_atom @@ -127,7 +127,7 @@ u3_time_t_in_ts(time_t tim) return u3_time_in_tv(&tim_tv); } -#endif // defined(U2_OS_linux) +#endif // defined(U3_OS_linux) /* u3_time_out_ts(): struct timespec from urbit time. */ diff --git a/v/unix.c b/v/unix.c index af1eb4cda6..857add6c8e 100644 --- a/v/unix.c +++ b/v/unix.c @@ -130,11 +130,11 @@ u3_unix_acquire(c3_c* pax_c) { c3_i fid_i = fileno(loq_u); -#if defined(U2_OS_linux) +#if defined(U3_OS_linux) fdatasync(fid_i); -#elif defined(U2_OS_osx) +#elif defined(U3_OS_osx) fcntl(fid_i, F_FULLFSYNC); -#elif defined(U2_OS_bsd) +#elif defined(U3_OS_bsd) fsync(fid_i); #else # error "port: datasync" diff --git a/w/test.c b/w/test.c index 2c130431a4..7f8414d2fe 100644 --- a/w/test.c +++ b/w/test.c @@ -252,7 +252,7 @@ int FOO; int main(int argc, char *argv[]) { - printf("hello, world: len %dMB\n", (1 << U2_OS_LoomBits) >> 18); + printf("hello, world: len %dMB\n", (1 << U3_OS_LoomBits) >> 18); // _test_words(); u3_ce_init(u3_no); From 2ca5ae560d9855052abd797bdddedeb7d77bacbf Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 4 Nov 2014 16:53:07 -0800 Subject: [PATCH 02/14] Another experimental renaming. --- g/a.c | 260 +++++++++++++++++++++++++------------------------- g/i.c | 28 +++--- g/j.c | 12 +-- g/m.c | 28 +++--- g/r.c | 204 +++++++++++++++++++-------------------- g/v.c | 2 +- include/g/a.h | 116 +++++++++++----------- include/g/h.h | 4 +- include/g/r.h | 4 +- include/g/x.h | 4 +- j/1/add.c | 2 +- j/1/dec.c | 2 +- j/1/div.c | 2 +- j/1/gte.c | 2 +- j/1/gth.c | 2 +- j/1/lte.c | 2 +- j/1/lth.c | 2 +- j/1/mul.c | 2 +- j/1/sub.c | 2 +- j/2/scag.c | 2 +- j/2/slag.c | 2 +- j/2/snag.c | 2 +- j/3/bex.c | 2 +- j/3/can.c | 4 +- j/3/cat.c | 2 +- j/3/cut.c | 6 +- j/3/end.c | 4 +- j/3/lsh.c | 4 +- j/3/met.c | 4 +- j/3/po.c | 2 +- j/3/rap.c | 2 +- j/3/rip.c | 2 +- j/3/rsh.c | 4 +- j/5/parse.c | 22 ++--- j/5/shax.c | 6 +- v/cttp.c | 2 +- v/http.c | 2 +- 37 files changed, 375 insertions(+), 379 deletions(-) diff --git a/g/a.c b/g/a.c index 798c15dfe1..c11160c722 100644 --- a/g/a.c +++ b/g/a.c @@ -120,21 +120,21 @@ _box_detach(u3_cs_box* box_u) static c3_w* _me_road_all_hat(c3_w len_w) { - if ( len_w > u3_co_open(u3R) ) { + if ( len_w > u3_ca_open(u3R) ) { u3_cm_bail(c3__meme); return 0; } - if ( u3_yes == u3_co_is_north(u3R) ) { + if ( u3_yes == u3_ca_is_north(u3R) ) { u3_post all_p; all_p = u3R->hat_p; u3R->hat_p += len_w; - return u3_co_into(all_p); + return u3_ca_into(all_p); } else { u3R->hat_p -= len_w; - return u3_co_into(u3R->hat_p); + return u3_ca_into(u3R->hat_p); } } @@ -144,20 +144,20 @@ _me_road_all_hat(c3_w len_w) static c3_w* _me_road_all_cap(c3_w len_w) { - if ( len_w > u3_co_open(u3R) ) { + if ( len_w > u3_ca_open(u3R) ) { u3_cm_bail(c3__meme); return 0; } - if ( u3_yes == u3_co_is_north(u3R) ) { + if ( u3_yes == u3_ca_is_north(u3R) ) { u3R->cap_p -= len_w; - return u3_co_into(u3R->cap_p); + return u3_ca_into(u3R->cap_p); } else { u3_post all_p; all_p = u3R->cap_p; u3R->cap_p += len_w; - return u3_co_into(all_p); + return u3_ca_into(all_p); } } #endif @@ -195,7 +195,7 @@ u3_ca_sane(void) static void* _ca_walloc(c3_w len_w) { - c3_w siz_w = c3_max(u3_cc_minimum, u3_co_boxed(len_w)); + c3_w siz_w = c3_max(u3_cc_minimum, u3_ca_boxed(len_w)); c3_w sel_w = _box_slot(siz_w); // XX: this logic is totally bizarre, but preserve it. @@ -217,7 +217,7 @@ _ca_walloc(c3_w len_w) else { /* Nothing in top free list. Chip away at the hat. */ - return u3_co_boxto(_box_make(_me_road_all_hat(siz_w), siz_w, 1)); + return u3_ca_boxto(_box_make(_me_road_all_hat(siz_w), siz_w, 1)); } } else { @@ -261,7 +261,7 @@ _ca_walloc(c3_w len_w) c3_w lef_w = (box_u->siz_w - siz_w); _box_attach(_box_make(end_w, lef_w, 0)); - return u3_co_boxto(_box_make(box_w, siz_w, 1)); + return u3_ca_boxto(_box_make(box_w, siz_w, 1)); } else { c3_assert(0 == box_u->use_w); @@ -270,7 +270,7 @@ _ca_walloc(c3_w len_w) #ifdef U3_MEMORY_DEBUG box_u->cod_w = u3_Code; #endif - return u3_co_boxto(box_u); + return u3_ca_boxto(box_u); } } } @@ -289,12 +289,12 @@ u3_ca_walloc(c3_w len_w) #if 0 if ( (703 == u3_Code) && - u3_co_botox(ptr_v) == (u3_cs_box*)(void *)0x200dfe3e4 ) { + u3_ca_botox(ptr_v) == (u3_cs_box*)(void *)0x200dfe3e4 ) { static int xuc_i; printf("xuc_i %d\r\n", xuc_i); if ( 1 == xuc_i ) { - u3_cs_box* box_u = u3_co_botox(ptr_v); + u3_cs_box* box_u = u3_ca_botox(ptr_v); box_u->cod_w = 999; FOO = 1; @@ -323,7 +323,7 @@ u3_ca_wealloc(void* lag_v, c3_w len_w) return u3_ca_malloc(len_w); } else { - u3_cs_box* box_u = u3_co_botox(lag_v); + u3_cs_box* box_u = u3_ca_botox(lag_v); c3_w* old_w = lag_v; c3_w tiz_w = c3_min(box_u->siz_w, len_w); { @@ -352,7 +352,7 @@ u3_ca_realloc(void* lag_v, c3_w len_w) void u3_ca_free(void* tox_v) { - u3_cs_box* box_u = u3_co_botox(tox_v); + u3_cs_box* box_u = u3_ca_botox(tox_v); c3_w* box_w = (c3_w *)(void *)box_u; c3_assert(box_u->use_w != 0); @@ -371,10 +371,10 @@ u3_ca_free(void* tox_v) } #endif - if ( u3_yes == u3_co_is_north(u3R) ) { + if ( u3_yes == u3_ca_is_north(u3R) ) { /* Try to coalesce with the block below. */ - if ( box_w != u3_co_into(u3R->rut_p) ) { + if ( box_w != u3_ca_into(u3R->rut_p) ) { c3_w laz_w = *(box_w - 1); u3_cs_box* pox_u = (u3_cs_box*)(void *)(box_w - laz_w); @@ -389,8 +389,8 @@ u3_ca_free(void* tox_v) /* Try to coalesce with the block above, or the wilderness. */ - if ( (box_w + box_u->siz_w) == u3_co_into(u3R->hat_p) ) { - u3R->hat_p = u3_co_outa(box_w); + if ( (box_w + box_u->siz_w) == u3_ca_into(u3R->hat_p) ) { + u3R->hat_p = u3_ca_outa(box_w); } else { u3_cs_box* nox_u = (u3_cs_box*)(void *)(box_w + box_u->siz_w); @@ -405,7 +405,7 @@ u3_ca_free(void* tox_v) else { /* Try to coalesce with the block above. */ - if ( (box_w + box_u->siz_w) != u3_co_into(u3R->rut_p) ) { + if ( (box_w + box_u->siz_w) != u3_ca_into(u3R->rut_p) ) { u3_cs_box* nox_u = (u3_cs_box*)(void *)(box_w + box_u->siz_w); if ( 0 == nox_u->use_w ) { @@ -416,8 +416,8 @@ u3_ca_free(void* tox_v) /* Try to coalesce with the block below, or with the wilderness. */ - if ( box_w == u3_co_into(u3R->hat_p) ) { - u3R->hat_p = u3_co_outa(box_w + box_u->siz_w); + if ( box_w == u3_ca_into(u3R->hat_p) ) { + u3R->hat_p = u3_ca_outa(box_w + box_u->siz_w); } else { c3_w laz_w = *(box_w - 1); @@ -440,23 +440,23 @@ static void _me_wash_north(u3_noun dog); static void _me_wash_north_in(u3_noun som) { - if ( u3_so(u3_co_is_cat(som)) ) return; - if ( u3_ne(u3_co_north_is_junior(u3R, som)) ) return; + if ( u3_so(u3_ca_is_cat(som)) ) return; + if ( u3_ne(u3_ca_north_is_junior(u3R, som)) ) return; _me_wash_north(som); } static void _me_wash_north(u3_noun dog) { - c3_assert(u3_yes == u3_co_is_dog(dog)); - // c3_assert(u3_yes == u3_co_north_is_junior(u3R, dog)); + c3_assert(u3_yes == u3_ca_is_dog(dog)); + // c3_assert(u3_yes == u3_ca_north_is_junior(u3R, dog)); { - u3_cs_noun* dog_u = u3_co_to_ptr(dog); + u3_cs_noun* dog_u = u3_ca_to_ptr(dog); if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } - if ( u3_so(u3_co_is_pom(dog)) ) { + if ( u3_so(u3_ca_is_pom(dog)) ) { u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u; _me_wash_north_in(god_u->hed); @@ -471,23 +471,23 @@ static void _me_wash_south(u3_noun dog); static void _me_wash_south_in(u3_noun som) { - if ( u3_so(u3_co_is_cat(som)) ) return; - if ( u3_ne(u3_co_south_is_junior(u3R, som)) ) return; + if ( u3_so(u3_ca_is_cat(som)) ) return; + if ( u3_ne(u3_ca_south_is_junior(u3R, som)) ) return; _me_wash_south(som); } static void _me_wash_south(u3_noun dog) { - c3_assert(u3_yes == u3_co_is_dog(dog)); - // c3_assert(u3_yes == u3_co_south_is_junior(u3R, dog)); + c3_assert(u3_yes == u3_ca_is_dog(dog)); + // c3_assert(u3_yes == u3_ca_south_is_junior(u3R, dog)); { - u3_cs_noun* dog_u = u3_co_to_ptr(dog); + u3_cs_noun* dog_u = u3_ca_to_ptr(dog); if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } - if ( u3_so(u3_co_is_pom(dog)) ) { + if ( u3_so(u3_ca_is_pom(dog)) ) { u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u; _me_wash_south_in(god_u->hed); @@ -501,16 +501,16 @@ _me_wash_south(u3_noun dog) void u3_ca_wash(u3_noun som) { - if ( u3_so(u3_co_is_cat(som)) ) { + if ( u3_so(u3_ca_is_cat(som)) ) { return; } - if ( u3_so(u3_co_is_north(u3R)) ) { - if ( u3_so(u3_co_north_is_junior(u3R, som)) ) { + if ( u3_so(u3_ca_is_north(u3R)) ) { + if ( u3_so(u3_ca_north_is_junior(u3R, som)) ) { _me_wash_north(som); } } else { - if ( u3_so(u3_co_south_is_junior(u3R, som)) ) { + if ( u3_so(u3_ca_south_is_junior(u3R, som)) ) { _me_wash_south(som); } } @@ -524,8 +524,8 @@ extern u3_noun BDA, BDB; static void _me_gain_use(u3_noun dog) { - c3_w* dog_w = u3_co_to_ptr(dog); - u3_cs_box* box_u = u3_co_botox(dog_w); + c3_w* dog_w = u3_ca_to_ptr(dog); + u3_cs_box* box_u = u3_ca_botox(dog_w); if ( 0x7fffffff == box_u->use_w ) { u3_cm_bail(c3__fail); @@ -564,8 +564,8 @@ _me_gain_use(u3_noun dog) { static c3_w bug_w = 0; - if ( FOO && u3_co_botox(u3_co_to_ptr(dog)) == (void *)0x200dfe3e4 ) { - u3_cs_box* box_u = u3_co_botox(u3_co_to_ptr(dog)); + if ( FOO && u3_ca_botox(u3_ca_to_ptr(dog)) == (void *)0x200dfe3e4 ) { + u3_cs_box* box_u = u3_ca_botox(u3_ca_to_ptr(dog)); printf("GAIN %d %d\r\n", bug_w, box_u->use_w); if ( bug_w == 8 ) { abort(); } @@ -585,16 +585,16 @@ static u3_noun _me_copy_north_in(u3_noun som) { c3_assert(u3_none != som); - if ( u3_so(u3_co_is_cat(som)) ) { + if ( u3_so(u3_ca_is_cat(som)) ) { return som; } else { u3_noun dog = som; - if ( u3_so(u3_co_north_is_senior(u3R, dog)) ) { + if ( u3_so(u3_ca_north_is_senior(u3R, dog)) ) { return dog; } - else if ( u3_so(u3_co_north_is_junior(u3R, dog)) ) { + else if ( u3_so(u3_ca_north_is_junior(u3R, dog)) ) { return _me_copy_north(dog); } else { @@ -608,32 +608,32 @@ _me_copy_north_in(u3_noun som) static u3_noun _me_copy_north(u3_noun dog) { - c3_assert(u3_yes == u3_co_north_is_junior(u3R, dog)); + c3_assert(u3_yes == u3_ca_north_is_junior(u3R, dog)); - if ( u3_ne(u3_co_north_is_junior(u3R, dog)) ) { - if ( u3_ne(u3_co_north_is_senior(u3R, dog)) ) { + if ( u3_ne(u3_ca_north_is_junior(u3R, dog)) ) { + if ( u3_ne(u3_ca_north_is_senior(u3R, dog)) ) { _me_gain_use(dog); } return dog; } else { - u3_cs_noun* dog_u = u3_co_to_ptr(dog); + u3_cs_noun* dog_u = u3_ca_to_ptr(dog); /* Borrow mug slot to record new destination. */ if ( dog_u->mug_w >> 31 ) { u3_noun nov = (u3_noun) dog_u->mug_w; - c3_assert(u3_so(u3_co_north_is_normal(u3R, nov))); + c3_assert(u3_so(u3_ca_north_is_normal(u3R, nov))); _me_gain_use(nov); return nov; } else { - if ( u3_yes == u3_co_is_pom(dog) ) { - u3_cs_cell* old_u = u3_co_to_ptr(dog); + if ( u3_yes == u3_ca_is_pom(dog) ) { + u3_cs_cell* old_u = u3_ca_to_ptr(dog); c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); - u3_noun new = u3_co_de_twin(dog, new_w); + u3_noun new = u3_ca_de_twin(dog, new_w); u3_cs_cell* new_u = (u3_cs_cell*)(void *)new_w; new_u->mug_w = old_u->mug_w; @@ -646,9 +646,9 @@ _me_copy_north(u3_noun dog) return new; } else { - u3_cs_atom* old_u = u3_co_to_ptr(dog); + u3_cs_atom* old_u = u3_ca_to_ptr(dog); c3_w* new_w = u3_ca_walloc(old_u->len_w + c3_wiseof(u3_cs_atom)); - u3_noun new = u3_co_de_twin(dog, new_w); + u3_noun new = u3_ca_de_twin(dog, new_w); u3_cs_atom* new_u = (u3_cs_atom*)(void *)new_w; new_u->mug_w = old_u->mug_w; @@ -677,16 +677,16 @@ static u3_noun _me_copy_south_in(u3_noun som) { c3_assert(u3_none != som); - if ( u3_so(u3_co_is_cat(som)) ) { + if ( u3_so(u3_ca_is_cat(som)) ) { return som; } else { u3_noun dog = som; - if ( u3_so(u3_co_south_is_senior(u3R, dog)) ) { + if ( u3_so(u3_ca_south_is_senior(u3R, dog)) ) { return dog; } - else if ( u3_so(u3_co_south_is_junior(u3R, dog)) ) { + else if ( u3_so(u3_ca_south_is_junior(u3R, dog)) ) { return _me_copy_south(dog); } else { @@ -700,34 +700,34 @@ _me_copy_south_in(u3_noun som) static u3_noun _me_copy_south(u3_noun dog) { - c3_assert(u3_yes == u3_co_south_is_junior(u3R, dog)); + c3_assert(u3_yes == u3_ca_south_is_junior(u3R, dog)); - if ( u3_ne(u3_co_south_is_junior(u3R, dog)) ) { - if ( u3_ne(u3_co_south_is_senior(u3R, dog)) ) { + if ( u3_ne(u3_ca_south_is_junior(u3R, dog)) ) { + if ( u3_ne(u3_ca_south_is_senior(u3R, dog)) ) { _me_gain_use(dog); } return dog; } else { - u3_cs_noun* dog_u = u3_co_to_ptr(dog); + u3_cs_noun* dog_u = u3_ca_to_ptr(dog); /* Borrow mug slot to record new destination. */ if ( dog_u->mug_w >> 31 ) { u3_noun nov = (u3_noun) dog_u->mug_w; - // printf("south: %p is already %p\r\n", dog_u, u3_co_to_ptr(nov)); + // printf("south: %p is already %p\r\n", dog_u, u3_ca_to_ptr(nov)); - c3_assert(u3_so(u3_co_south_is_normal(u3R, nov))); + c3_assert(u3_so(u3_ca_south_is_normal(u3R, nov))); _me_gain_use(nov); return nov; } else { - if ( u3_yes == u3_co_is_pom(dog) ) { - u3_cs_cell* old_u = u3_co_to_ptr(dog); + if ( u3_yes == u3_ca_is_pom(dog) ) { + u3_cs_cell* old_u = u3_ca_to_ptr(dog); c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); - u3_noun new = u3_co_de_twin(dog, new_w); + u3_noun new = u3_ca_de_twin(dog, new_w); u3_cs_cell* new_u = (u3_cs_cell*)(void *)new_w; // printf("south: cell %p to %p\r\n", old_u, new_u); @@ -743,9 +743,9 @@ _me_copy_south(u3_noun dog) return new; } else { - u3_cs_atom* old_u = u3_co_to_ptr(dog); + u3_cs_atom* old_u = u3_ca_to_ptr(dog); c3_w* new_w = u3_ca_walloc(old_u->len_w + c3_wiseof(u3_cs_atom)); - u3_noun new = u3_co_de_twin(dog, new_w); + u3_noun new = u3_ca_de_twin(dog, new_w); u3_cs_atom* new_u = (u3_cs_atom*)(void *)new_w; // printf("south: atom %p to %p\r\n", old_u, new_u); @@ -775,17 +775,17 @@ _me_copy_south(u3_noun dog) static u3_noun _me_take_north(u3_noun dog) { - if ( u3_yes == u3_co_north_is_senior(u3R, dog) ) { + if ( u3_yes == u3_ca_north_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; } - else if ( u3_yes == u3_co_north_is_junior(u3R, dog) ) { + else if ( u3_yes == u3_ca_north_is_junior(u3R, dog) ) { /* junior pointers are copied */ u3_noun mos = _me_copy_north(dog); - // printf("north: %p to %p\r\n", u3_co_to_ptr(dog), u3_co_to_ptr(mos)); + // printf("north: %p to %p\r\n", u3_ca_to_ptr(dog), u3_ca_to_ptr(mos)); return mos; } else { @@ -801,17 +801,17 @@ _me_take_north(u3_noun dog) static u3_noun _me_take_south(u3_noun dog) { - if ( u3_yes == u3_co_south_is_senior(u3R, dog) ) { + if ( u3_yes == u3_ca_south_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; } - else if ( u3_yes == u3_co_south_is_junior(u3R, dog) ) { + else if ( u3_yes == u3_ca_south_is_junior(u3R, dog) ) { /* junior pointers are copied */ u3_noun mos = _me_copy_south(dog); - // printf("south: %p to %p\r\n", u3_co_to_ptr(dog), u3_co_to_ptr(mos)); + // printf("south: %p to %p\r\n", u3_ca_to_ptr(dog), u3_ca_to_ptr(mos)); return mos; } else { @@ -829,11 +829,11 @@ u3_ca_take(u3_noun som) { c3_assert(u3_none != som); - if ( u3_so(u3_co_is_cat(som)) ) { + if ( u3_so(u3_ca_is_cat(som)) ) { return som; } else { - return u3_so(u3_co_is_north(u3R)) + return u3_so(u3_ca_is_north(u3R)) ? _me_take_north(som) : _me_take_south(som); } @@ -844,13 +844,13 @@ u3_ca_take(u3_noun som) c3_o u3_ca_left(u3_noun som) { - if ( u3_so(u3_co_is_cat(som)) || - u3_ne(u3_co_is_junior(u3R, som)) ) + if ( u3_so(u3_ca_is_cat(som)) || + u3_ne(u3_ca_is_junior(u3R, som)) ) { return u3_yes; } else { - u3_cs_noun* dog_u = u3_co_to_ptr(som); + u3_cs_noun* dog_u = u3_ca_to_ptr(som); return u3_say(0 != (dog_u->mug_w >> 31)); } @@ -861,7 +861,7 @@ u3_ca_left(u3_noun som) static u3_noun _me_gain_north(u3_noun dog) { - if ( u3_yes == u3_co_north_is_senior(u3R, dog) ) { + if ( u3_yes == u3_ca_north_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; @@ -869,7 +869,7 @@ _me_gain_north(u3_noun dog) else { /* junior nouns are disallowed */ - c3_assert(u3_ne(u3_co_north_is_junior(u3R, dog))); + c3_assert(u3_ne(u3_ca_north_is_junior(u3R, dog))); /* normal pointers are refcounted */ @@ -883,7 +883,7 @@ _me_gain_north(u3_noun dog) static u3_noun _me_gain_south(u3_noun dog) { - if ( u3_yes == u3_co_south_is_senior(u3R, dog) ) { + if ( u3_yes == u3_ca_south_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; @@ -891,7 +891,7 @@ _me_gain_south(u3_noun dog) else { /* junior nouns are disallowed */ - c3_assert(u3_ne(u3_co_south_is_junior(u3R, dog))); + c3_assert(u3_ne(u3_ca_south_is_junior(u3R, dog))); /* normal nouns are refcounted */ @@ -906,9 +906,9 @@ static void _me_lose_north(u3_noun dog) { top: - if ( u3_yes == u3_co_north_is_normal(u3R, dog) ) { - c3_w* dog_w = u3_co_to_ptr(dog); - u3_cs_box* box_u = u3_co_botox(dog_w); + if ( u3_yes == u3_ca_north_is_normal(u3R, dog) ) { + c3_w* dog_w = u3_ca_to_ptr(dog); + u3_cs_box* box_u = u3_ca_botox(dog_w); if ( box_u->use_w > 1 ) { box_u->use_w -= 1; @@ -918,16 +918,16 @@ top: u3_cm_bail(c3__foul); } else { - if ( u3_so(u3_co_is_pom(dog)) ) { + if ( u3_so(u3_ca_is_pom(dog)) ) { u3_cs_cell* dog_u = (void *)dog_w; u3_noun h_dog = dog_u->hed; u3_noun t_dog = dog_u->tel; - if ( u3_ne(u3_co_is_cat(h_dog)) ) { + if ( u3_ne(u3_ca_is_cat(h_dog)) ) { _me_lose_north(h_dog); } u3_ca_free(dog_w); - if ( u3_ne(u3_co_is_cat(t_dog)) ) { + if ( u3_ne(u3_ca_is_cat(t_dog)) ) { dog = t_dog; goto top; } @@ -946,9 +946,9 @@ static void _me_lose_south(u3_noun dog) { top: - if ( u3_yes == u3_co_south_is_normal(u3R, dog) ) { - c3_w* dog_w = u3_co_to_ptr(dog); - u3_cs_box* box_u = u3_co_botox(dog_w); + if ( u3_yes == u3_ca_south_is_normal(u3R, dog) ) { + c3_w* dog_w = u3_ca_to_ptr(dog); + u3_cs_box* box_u = u3_ca_botox(dog_w); if ( box_u->use_w > 1 ) { box_u->use_w -= 1; @@ -958,16 +958,16 @@ top: u3_cm_bail(c3__foul); } else { - if ( u3_so(u3_co_is_pom(dog)) ) { + if ( u3_so(u3_ca_is_pom(dog)) ) { u3_cs_cell* dog_u = (void *)dog_w; u3_noun h_dog = dog_u->hed; u3_noun t_dog = dog_u->tel; - if ( u3_ne(u3_co_is_cat(h_dog)) ) { + if ( u3_ne(u3_ca_is_cat(h_dog)) ) { _me_lose_south(h_dog); } u3_ca_free(dog_w); - if ( u3_ne(u3_co_is_cat(t_dog)) ) { + if ( u3_ne(u3_ca_is_cat(t_dog)) ) { dog = t_dog; goto top; } @@ -987,11 +987,11 @@ u3_ca_gain(u3_noun som) { c3_assert(u3_none != som); - if ( u3_so(u3_co_is_cat(som)) ) { + if ( u3_so(u3_ca_is_cat(som)) ) { return som; } else { - return u3_so(u3_co_is_north(u3R)) + return u3_so(u3_ca_is_north(u3R)) ? _me_gain_north(som) : _me_gain_south(som); } @@ -1002,8 +1002,8 @@ u3_ca_gain(u3_noun som) void u3_ca_lose(u3_noun som) { - if ( u3_ne(u3_co_is_cat(som)) ) { - if ( u3_so(u3_co_is_north(u3R)) ) { + if ( u3_ne(u3_ca_is_cat(som)) ) { + if ( u3_so(u3_ca_is_north(u3R)) ) { _me_lose_north(som); } else { _me_lose_south(som); @@ -1016,12 +1016,12 @@ u3_ca_lose(u3_noun som) c3_w u3_ca_use(u3_noun som) { - if ( u3_so(u3_co_is_cat(som)) ) { + if ( u3_so(u3_ca_is_cat(som)) ) { return 1; } else { - c3_w* dog_w = u3_co_to_ptr(som); - u3_cs_box* box_u = u3_co_botox(dog_w); + c3_w* dog_w = u3_ca_to_ptr(som); + u3_cs_box* box_u = u3_ca_botox(dog_w); return box_u->use_w; } @@ -1032,22 +1032,22 @@ u3_ca_use(u3_noun som) c3_w u3_ca_mark_ptr(void* ptr_v) { - if ( u3_so(u3_co_is_north(u3R)) ) { - if ( !((ptr_v >= u3_co_into(u3R->rut_p)) && - (ptr_v < u3_co_into(u3R->hat_p))) ) + if ( u3_so(u3_ca_is_north(u3R)) ) { + if ( !((ptr_v >= u3_ca_into(u3R->rut_p)) && + (ptr_v < u3_ca_into(u3R->hat_p))) ) { return 0; } } else { - if ( !((ptr_v >= u3_co_into(u3R->hat_p)) && - (ptr_v < u3_co_into(u3R->rut_p))) ) + if ( !((ptr_v >= u3_ca_into(u3R->hat_p)) && + (ptr_v < u3_ca_into(u3R->rut_p))) ) { return 0; } } { - u3_cs_box* box_u = u3_co_botox(ptr_v); + u3_cs_box* box_u = u3_ca_botox(ptr_v); c3_w siz_w; #ifdef U3_MEMORY_DEBUG @@ -1091,11 +1091,11 @@ u3_ca_mark_noun(u3_noun som) c3_w siz_w = 0; while ( 1 ) { - if ( u3_so(u3_co_is_senior(u3R, som)) ) { + if ( u3_so(u3_ca_is_senior(u3R, som)) ) { return siz_w; } else { - c3_w* dog_w = u3_co_to_ptr(som); + c3_w* dog_w = u3_ca_to_ptr(som); c3_w new_w = u3_ca_mark_ptr(dog_w); if ( 0 == new_w ) { @@ -1155,7 +1155,7 @@ u3_ca_sweep(c3_c* cap_c) c3_w fre_w = 0; c3_w i_w; - end_w = u3_so(u3_co_is_north(u3R)) + end_w = u3_so(u3_ca_is_north(u3R)) ? (u3R->hat_p - u3R->rut_p) : (u3R->rut_p - u3R->hat_p); @@ -1176,10 +1176,10 @@ u3_ca_sweep(c3_c* cap_c) */ pos_w = leq_w = weq_w = 0; { - u3_post box_p = u3_so(u3_co_is_north(u3R)) ? u3R->rut_p : u3R->hat_p; - u3_post end_p = u3_so(u3_co_is_north(u3R)) ? u3R->hat_p : u3R->rut_p; - c3_w* box_w = u3_co_into(box_p); - c3_w* end_w = u3_co_into(end_p); + u3_post box_p = u3_so(u3_ca_is_north(u3R)) ? u3R->rut_p : u3R->hat_p; + u3_post end_p = u3_so(u3_ca_is_north(u3R)) ? u3R->hat_p : u3R->rut_p; + c3_w* box_w = u3_ca_into(box_p); + c3_w* end_w = u3_ca_into(end_p); while ( box_w < end_w ) { u3_cs_box* box_u = (void *)box_w; @@ -1193,20 +1193,20 @@ u3_ca_sweep(c3_c* cap_c) else { printf("weak %p %x (%d, %d)\r\n", box_u, - ((u3_cs_noun *)(u3_co_boxto(box_w)))->mug_w, + ((u3_cs_noun *)(u3_ca_boxto(box_w)))->mug_w, box_u->use_w, box_u->eus_w); - // u3_cm_p("weak", u3_co_to_pom(u3_co_outa(u3_co_boxto(box_w)))); + // u3_cm_p("weak", u3_ca_to_pom(u3_ca_outa(u3_ca_boxto(box_w)))); } weq_w += box_u->siz_w; } else { printf("leak %p %x (%d)\r\n", box_u, - ((u3_cs_noun *)(u3_co_boxto(box_w)))->mug_w - ? ((u3_cs_noun *)(u3_co_boxto(box_w)))->mug_w - : u3_cr_mug(u3_co_to_pom(u3_co_outa(u3_co_boxto(box_w)))), + ((u3_cs_noun *)(u3_ca_boxto(box_w)))->mug_w + ? ((u3_cs_noun *)(u3_ca_boxto(box_w)))->mug_w + : u3_cr_mug(u3_ca_to_pom(u3_ca_outa(u3_ca_boxto(box_w)))), box_u->use_w); - // u3_cm_p("leak", u3_co_to_pom(u3_co_outa(u3_co_boxto(box_w)))); + // u3_cm_p("leak", u3_ca_to_pom(u3_ca_outa(u3_ca_boxto(box_w)))); leq_w += box_u->siz_w; } if ( box_u->cod_w ) { @@ -1239,10 +1239,10 @@ u3_ca_sweep(c3_c* cap_c) } } - tot_w = u3_so(u3_co_is_north(u3R)) + tot_w = u3_so(u3_ca_is_north(u3R)) ? u3R->mat_p - u3R->rut_p : u3R->rut_p - u3R->mat_p; - caf_w = u3_so(u3_co_is_north(u3R)) + caf_w = u3_so(u3_ca_is_north(u3R)) ? u3R->mat_p - u3R->cap_p : u3R->cap_p - u3R->mat_p; @@ -1319,13 +1319,13 @@ u3_ca_moot(c3_w* sal_w) c3_assert(0 != las_w); if ( 1 == len_w ) { - if ( u3_so(u3_co_is_cat(las_w)) ) { + if ( u3_so(u3_ca_is_cat(las_w)) ) { u3_ca_free(nov_w); return las_w; } } - return u3_co_to_pug(u3_co_outa(nov_w)); + return u3_ca_to_pug(u3_ca_outa(nov_w)); } #if 0 @@ -1392,7 +1392,7 @@ u3_ca_mint(c3_w* sal_w, c3_w len_w) else if ( len_w == 1 ) { c3_w low_w = nov_u->buf_w[0]; - if ( u3_so(u3_co_is_cat(low_w)) ) { + if ( u3_so(u3_ca_is_cat(low_w)) ) { u3_ca_free(nov_w); return low_w; @@ -1406,7 +1406,7 @@ u3_ca_mint(c3_w* sal_w, c3_w len_w) c3_w dif_w = (old_w - len_w); if ( dif_w >= u3_cc_minimum ) { - c3_w* box_w = (void *)u3_co_botox(nov_w); + c3_w* box_w = (void *)u3_ca_botox(nov_w); c3_w* end_w = (nov_w + c3_wiseof(u3_cs_atom) + len_w + 1); c3_w asz_w = (end_w - box_w); c3_w bsz_w = box_w[0] - asz_w; @@ -1418,7 +1418,7 @@ u3_ca_mint(c3_w* sal_w, c3_w len_w) } nov_u->len_w = len_w; } - return u3_co_to_pug(u3_co_outa(nov_w)); + return u3_ca_to_pug(u3_ca_outa(nov_w)); } #ifdef U3_MEMORY_DEBUG diff --git a/g/i.c b/g/i.c index 8f173c3588..26a11e8544 100644 --- a/g/i.c +++ b/g/i.c @@ -45,7 +45,7 @@ u3_ci_words(c3_w a_w, nov_u->buf_w[i_w] = b_w[i_w]; } } - return u3_co_to_pug(u3_co_outa(nov_w)); + return u3_ca_to_pug(u3_ca_outa(nov_w)); } } @@ -133,7 +133,7 @@ u3_ci_bytes(c3_w a_w, nov_u->buf_w[i_w >> 2] |= (b_y[i_w] << ((i_w & 3) * 8)); } } - return u3_co_to_pug(u3_co_outa(nov_w)); + return u3_ca_to_pug(u3_ca_outa(nov_w)); } } @@ -170,7 +170,7 @@ u3_ci_vint(u3_noun a) { c3_assert(u3_none != a); - if ( u3_so(u3_co_is_cat(a)) ) { + if ( u3_so(u3_ca_is_cat(a)) ) { c3_w vin_w = (a + 1); if ( a == 0x7fffffff ) { @@ -178,7 +178,7 @@ u3_ci_vint(u3_noun a) } else return vin_w; } - else if ( u3_so(u3_co_is_cell(a)) ) { + else if ( u3_so(u3_ca_is_cell(a)) ) { return u3_cm_bail(c3__exit); } else { @@ -192,10 +192,6 @@ u3_ci_vint(u3_noun a) } } -extern int FOO; - -u3_noun BAD; - /* u3_ci_cell(): ** ** Produce the cell `[a b]`. @@ -206,8 +202,8 @@ u3_ci_cell(u3_noun a, u3_noun b) c3_assert(u3_none != a); c3_assert(u3_none != b); - c3_assert(u3_ne(u3_co_is_junior(u3R, a))); - c3_assert(u3_ne(u3_co_is_junior(u3R, b))); + c3_assert(u3_ne(u3_ca_is_junior(u3R, a))); + c3_assert(u3_ne(u3_ca_is_junior(u3R, b))); { c3_w* nov_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); @@ -218,7 +214,7 @@ u3_ci_cell(u3_noun a, u3_noun b) nov_u->hed = a; nov_u->tel = b; - pro = u3_co_to_pom(u3_co_outa(nov_w)); + pro = u3_ca_to_pom(u3_ca_outa(nov_w)); #if 0 if ( 0x15d47649 == u3_cr_mug(pro) ) { fprintf(stderr, "BAD %x\r\n", pro); @@ -228,9 +224,9 @@ u3_ci_cell(u3_noun a, u3_noun b) #if 1 return pro; #else - if ( !FOO ) return u3_co_to_pom(u3_co_outa(nov_w)); + if ( !FOO ) return u3_ca_to_pom(u3_ca_outa(nov_w)); else { - u3_noun pro = u3_co_to_pom(u3_co_outa(nov_w)); + u3_noun pro = u3_ca_to_pom(u3_ca_outa(nov_w)); u3_cm_p("leaked", pro); printf("pro %u, %x\r\n", pro, u3_cr_mug(pro)); @@ -346,13 +342,13 @@ u3_ci_list(u3_weak one, ...); else { c3_w cut_w = _molt_cut(len_w, pms_m); - if ( u3_no == u3_co_is_cell(som) ) { + if ( u3_no == u3_ca_is_cell(som) ) { return u3_cm_bail(c3__exit); } else { return u3_ci_cell - (_molt_apply(u3_co_h(som), cut_w, pms_m), - _molt_apply(u3_co_t(som), (len_w - cut_w), (pms_m + cut_w))); + (_molt_apply(u3_ca_h(som), cut_w, pms_m), + _molt_apply(u3_ca_t(som), (len_w - cut_w), (pms_m + cut_w))); } } } diff --git a/g/j.c b/g/j.c index 3682e341f6..07bfbfd65e 100644 --- a/g/j.c +++ b/g/j.c @@ -55,7 +55,7 @@ _cj_axis(u3_noun fol) if ( u3_ne(u3_cr_trel(fol, &p_fol, &q_fol, &r_fol)) ) { if ( u3_ne(u3_cr_cell(fol, &p_fol, &q_fol)) || (0 != p_fol) || - (u3_ne(u3_co_is_cat(q_fol))) ) + (u3_ne(u3_ca_is_cat(q_fol))) ) { fprintf(stderr, "axis: bad a\r\n"); return 0; @@ -65,7 +65,7 @@ _cj_axis(u3_noun fol) else { if ( 9 != p_fol ) { fprintf(stderr, "axis: bad b\r\n"); return 0; } - if ( u3_ne(u3_co_is_cat(q_fol)) ) + if ( u3_ne(u3_ca_is_cat(q_fol)) ) { fprintf(stderr, "axis: bad c\r\n"); return 0; } if ( u3_ne(u3du(r_fol)) || (0 != u3h(r_fol)) || (1 != u3t(r_fol)) ) { fprintf(stderr, "axis: bad d\r\n"); return 0; } @@ -114,7 +114,7 @@ _cj_chum(u3_noun chu) u3_noun h_chu = u3h(chu); u3_noun t_chu = u3t(chu); - if ( u3_ne(u3_co_is_cat(t_chu)) ) { + if ( u3_ne(u3_ca_is_cat(t_chu)) ) { return 0; } else { c3_c* h_chu_c = u3_cr_string(h_chu); @@ -156,7 +156,7 @@ _cj_je_fsck(u3_noun clu) axe_l = 0; } else { - if ( (0 != u3h(q_clu)) || u3_ne(u3_co_is_cat(axe_l = u3t(q_clu))) ) { + if ( (0 != u3h(q_clu)) || u3_ne(u3_ca_is_cat(axe_l = u3t(q_clu))) ) { u3z(clu); free(nam_c); return u3_none; } } @@ -614,7 +614,7 @@ _cj_find(u3_noun bat) u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat); if ( u3_none != jaw ) { - u3_assure(u3_co_is_cat(u3h(jaw))); + u3_assure(u3_ca_is_cat(u3h(jaw))); #if 0 if ( rod_u != u3R ) { @@ -971,7 +971,7 @@ _cj_warm_reap(u3_noun kev) #if 0 fprintf(stderr, "reap: bat %x (%d, %d), cax %x\r\n", u3_cr_mug(tab), - u3_co_is_junior(u3R, bat), + u3_ca_is_junior(u3R, bat), u3_ca_use(tab), u3_cr_mug(xac)); #endif diff --git a/g/m.c b/g/m.c index 4579531c0f..b21074acca 100644 --- a/g/m.c +++ b/g/m.c @@ -144,7 +144,7 @@ _cm_signal_recover(c3_l sig_l, u3_noun arg) // _cm_signal_reset(); - if ( (c3__meme == sig_l) && (u3_co_open(u3R) <= 256) ) { + if ( (c3__meme == sig_l) && (u3_ca_open(u3R) <= 256) ) { // Out of memory at the top level. Error becomes c3__full, // and we release the emergency buffer. To continue work, // we need to readjust the image, eg, migrate to 64 bit. @@ -405,7 +405,7 @@ u3_cm_dump(void) c3_w fre_w = 0; c3_w i_w; - hat_w = u3_so(u3_co_is_north(u3R)) ? u3R->hat_w - u3R->rut_w + hat_w = u3_so(u3_ca_is_north(u3R)) ? u3R->hat_w - u3R->rut_w : u3R->rut_w - u3R->hat_w; for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) { @@ -420,10 +420,10 @@ u3_cm_dump(void) hat_w, fre_w, (hat_w - fre_w)); if ( 0 != (hat_w - fre_w) ) { - c3_w* box_w = u3_so(u3_co_is_north(u3R)) ? u3R->rut_w : u3R->hat_w; + c3_w* box_w = u3_so(u3_ca_is_north(u3R)) ? u3R->rut_w : u3R->hat_w; c3_w mem_w = 0; - while ( box_w < (u3_so(u3_co_is_north(u3R)) ? u3R->hat_w : u3R->rut_w) ) { + while ( box_w < (u3_so(u3_ca_is_north(u3R)) ? u3R->hat_w : u3R->rut_w) ) { u3_cs_box* box_u = (void *)box_w; if ( 0 != box_u->use_w ) { @@ -505,7 +505,7 @@ u3_cm_bail(u3_noun how) // choice but to use the signal process; and we require the flat // form of how. // - c3_assert(u3_so(u3_co_is_cat(how))); + c3_assert(u3_so(u3_ca_is_cat(how))); u3_cm_signal(how); } @@ -563,10 +563,10 @@ u3_cm_leap(c3_w pad_w) else { pad_w -= u3R->all.fre_w; } - if ( (pad_w + c3_wiseof(u3_cs_road)) >= u3_co_open(u3R) ) { + if ( (pad_w + c3_wiseof(u3_cs_road)) >= u3_ca_open(u3R) ) { u3_cm_bail(c3__meme); } - len_w = u3_co_open(u3R) - (pad_w + c3_wiseof(u3_cs_road)); + len_w = u3_ca_open(u3R) - (pad_w + c3_wiseof(u3_cs_road)); } /* Allocate a region on the cap. @@ -574,11 +574,11 @@ u3_cm_leap(c3_w pad_w) { u3p(c3_w) bot_p; - if ( u3_yes == u3_co_is_north(u3R) ) { + if ( u3_yes == u3_ca_is_north(u3R) ) { bot_p = (u3R->cap_p - len_w); u3R->cap_p -= len_w; - rod_u = _boot_south(u3_co_into(bot_p), c3_wiseof(u3_cs_road), len_w); + rod_u = _boot_south(u3_ca_into(bot_p), c3_wiseof(u3_cs_road), len_w); #if 0 fprintf(stderr, "leap: from north %p (cap %x), to south %p\r\n", u3R, @@ -590,7 +590,7 @@ u3_cm_leap(c3_w pad_w) bot_p = u3R->cap_p; u3R->cap_p += len_w; - rod_u = _boot_north(u3_co_into(bot_p), c3_wiseof(u3_cs_road), len_w); + rod_u = _boot_north(u3_ca_into(bot_p), c3_wiseof(u3_cs_road), len_w); #if 0 fprintf(stderr, "leap: from north %p (cap %p), to south %p\r\n", u3R, @@ -628,9 +628,9 @@ u3_cm_fall() #if 0 fprintf(stderr, "fall: from %s %p, to %s %p (cap %p, was %p)\r\n", - u3_so(u3_co_is_north(u3R)) ? "north" : "south", + u3_so(u3_ca_is_north(u3R)) ? "north" : "south", u3R, - u3_so(u3_co_is_north(u3R)) ? "north" : "south", + u3_so(u3_ca_is_north(u3R)) ? "north" : "south", u3R->par_u, u3R->hat_w, u3R->rut_w); @@ -682,7 +682,7 @@ u3_cm_love(u3_noun pro) c3_w u3_cm_golf(void) { - if ( u3_yes == u3_co_is_north(u3R) ) { + if ( u3_yes == u3_ca_is_north(u3R) ) { return u3R->mat_p - u3R->cap_p; } else { @@ -697,7 +697,7 @@ u3_cm_flog(c3_w gof_w) { // Enable memsets in case of memory corruption. // - if ( u3_yes == u3_co_is_north(u3R) ) { + if ( u3_yes == u3_ca_is_north(u3R) ) { u3_post bot_p = (u3R->mat_p - gof_w); // c3_w len_w = (bot_w - u3R->cap_w); diff --git a/g/r.c b/g/r.c index 225770b860..a3251da815 100644 --- a/g/r.c +++ b/g/r.c @@ -15,11 +15,11 @@ _frag_word(c3_w a_w, u3_noun b) c3_w dep_w = u3_ax_dep(a_w); while ( dep_w ) { - if ( u3_no == u3_co_is_cell(b) ) { + if ( u3_no == u3_ca_is_cell(b) ) { return u3_none; } else { - u3_cs_cell* b_u = u3_co_to_ptr(b); + u3_cs_cell* b_u = u3_ca_to_ptr(b); b = *(((u3_noun*)&(b_u->hed)) + (1 & (a_w >> (dep_w - 1)))); dep_w--; @@ -37,11 +37,11 @@ _frag_deep(c3_w a_w, u3_noun b) c3_w dep_w = 32; while ( dep_w ) { - if ( u3_no == u3_co_is_cell(b) ) { + if ( u3_no == u3_ca_is_cell(b) ) { return u3_none; } else { - u3_cs_cell* b_u = u3_co_to_ptr(b); + u3_cs_cell* b_u = u3_ca_to_ptr(b); b = *(((u3_noun*)&(b_u->hed)) + (1 & (a_w >> (dep_w - 1)))); dep_w--; @@ -65,15 +65,15 @@ u3_cr_at(u3_atom a, return u3_none; } - if ( u3_so(u3_co_is_cat(a)) ) { + if ( u3_so(u3_ca_is_cat(a)) ) { return _frag_word(a, b); } else { - if ( u3_ne(u3_co_is_pug(a)) ) { + if ( u3_ne(u3_ca_is_pug(a)) ) { return u3_none; } else { - u3_cs_atom* a_u = u3_co_to_ptr(a); + u3_cs_atom* a_u = u3_ca_to_ptr(a); c3_w len_w = a_u->len_w; b = _frag_word(a_u->buf_w[len_w - 1], b); @@ -136,14 +136,14 @@ u3_cr_at(u3_atom a, return u3_yes; } else { - if ( u3_no == u3_co_is_cell(som) ) { + if ( u3_no == u3_ca_is_cell(som) ) { return u3_no; } else { c3_w cut_w = _mean_cut(len_w, prs_m); return u3_and - (_mean_extract(u3_co_h(som), cut_w, prs_m), - _mean_extract(u3_co_t(som), (len_w - cut_w), (prs_m + cut_w))); + (_mean_extract(u3_ca_h(som), cut_w, prs_m), + _mean_extract(u3_ca_t(som), (len_w - cut_w), (prs_m + cut_w))); } } } @@ -256,7 +256,7 @@ _mug_bytes(c3_w off_w, c3_w nby_w, c3_y* byt_y) static __inline__ c3_w _mug_words_in_buf(c3_w off_w, c3_w nwd_w, u3_noun veb) { - u3_cs_atom* veb_u = u3_co_to_ptr(veb); + u3_cs_atom* veb_u = u3_ca_to_ptr(veb); if ( 0 == nwd_w ) { return off_w; @@ -384,19 +384,19 @@ u3_cr_mug(u3_noun veb) { c3_assert(u3_none != veb); - if ( u3_so(u3_co_is_cat(veb)) ) { + if ( u3_so(u3_ca_is_cat(veb)) ) { c3_w x_w = veb; return _mug_words(2166136261, (veb ? 1 : 0), &x_w); } else { - u3_cs_noun* veb_u = u3_co_to_ptr(veb); + u3_cs_noun* veb_u = u3_ca_to_ptr(veb); if ( veb_u->mug_w ) { return veb_u->mug_w; } else { - if ( u3_so(u3_co_is_cell(veb)) ) { - u3_cs_cell* veb_u = u3_co_to_ptr(veb); + if ( u3_so(u3_ca_is_cell(veb)) ) { + u3_cs_cell* veb_u = u3_ca_to_ptr(veb); u3_noun hed = veb_u->hed; u3_noun tel = veb_u->tel; @@ -404,7 +404,7 @@ u3_cr_mug(u3_noun veb) return veb_u->mug_w; } else { - u3_cs_atom* veb_u = u3_co_to_ptr(veb); + u3_cs_atom* veb_u = u3_ca_to_ptr(veb); c3_w len_w = veb_u->len_w; veb_u->mug_w = _mug_words_buf(2166136261, len_w, veb); @@ -487,8 +487,8 @@ _sung_one(u3_noun* a, u3_noun* b) return; } else { - c3_o asr_o = u3_co_is_senior(u3R, *a); - c3_o bsr_o = u3_co_is_senior(u3R, *b); + c3_o asr_o = u3_ca_is_senior(u3R, *a); + c3_o bsr_o = u3_ca_is_senior(u3R, *b); if ( u3_so(asr_o) && u3_so(bsr_o) ) { // You shouldn't have let this happen. We don't want to @@ -506,7 +506,7 @@ _sung_one(u3_noun* a, u3_noun* b) u3z(*a); *a = *b; } - if ( u3_co_is_north(u3R) ) { + if ( u3_ca_is_north(u3R) ) { if ( *a <= *b ) { u3k(*a); u3z(*b); @@ -540,17 +540,17 @@ _sung_x(u3_noun a, u3_noun b) return u3_yes; } else { - if ( u3_so(u3_co_is_atom(a)) ) { - u3_cs_atom* a_u = u3_co_to_ptr(a); + if ( u3_so(u3_ca_is_atom(a)) ) { + u3_cs_atom* a_u = u3_ca_to_ptr(a); - if ( !u3_so(u3_co_is_atom(b)) || - u3_so(u3_co_is_cat(a)) || - u3_so(u3_co_is_cat(b)) ) + if ( !u3_so(u3_ca_is_atom(b)) || + u3_so(u3_ca_is_cat(a)) || + u3_so(u3_ca_is_cat(b)) ) { return u3_no; } else { - u3_cs_atom* b_u = u3_co_to_ptr(b); + u3_cs_atom* b_u = u3_ca_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -579,12 +579,12 @@ _sung_x(u3_noun a, u3_noun b) } } else { - if ( u3_so(u3_co_is_atom(b)) ) { + if ( u3_so(u3_ca_is_atom(b)) ) { return u3_no; } else { - u3_cs_cell* a_u = u3_co_to_ptr(a); - u3_cs_cell* b_u = u3_co_to_ptr(b); + u3_cs_cell* a_u = u3_ca_to_ptr(a); + u3_cs_cell* b_u = u3_ca_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -629,17 +629,17 @@ _sing_x(u3_noun a, return u3_yes; } else { - if ( u3_so(u3_co_is_atom(a)) ) { - u3_cs_atom* a_u = u3_co_to_ptr(a); + if ( u3_so(u3_ca_is_atom(a)) ) { + u3_cs_atom* a_u = u3_ca_to_ptr(a); - if ( !u3_so(u3_co_is_atom(b)) || - u3_so(u3_co_is_cat(a)) || - u3_so(u3_co_is_cat(b)) ) + if ( !u3_so(u3_ca_is_atom(b)) || + u3_so(u3_ca_is_cat(a)) || + u3_so(u3_ca_is_cat(b)) ) { return u3_no; } else { - u3_cs_atom* b_u = u3_co_to_ptr(b); + u3_cs_atom* b_u = u3_ca_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -668,12 +668,12 @@ _sing_x(u3_noun a, } } else { - if ( u3_so(u3_co_is_atom(b)) ) { + if ( u3_so(u3_ca_is_atom(b)) ) { return u3_no; } else { - u3_cs_cell* a_u = u3_co_to_ptr(a); - u3_cs_cell* b_u = u3_co_to_ptr(b); + u3_cs_cell* a_u = u3_ca_to_ptr(a); + u3_cs_cell* b_u = u3_ca_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -682,10 +682,10 @@ _sing_x(u3_noun a, return u3_no; } else { - if ( u3_no == _sing_x(u3_co_h(a), u3_co_h(b)) ) { + if ( u3_no == _sing_x(u3_ca_h(a), u3_ca_h(b)) ) { return u3_no; } - else if ( u3_no == _sing_x(u3_co_t(a), u3_co_t(b)) ) { + else if ( u3_no == _sing_x(u3_ca_t(a), u3_ca_t(b)) ) { return u3_no; } return u3_yes; @@ -731,18 +731,18 @@ u3_cr_sing_cell(u3_noun p, u3_noun q, u3_noun b) { - return u3_and(u3_so(u3_co_is_cell(b)), - u3_and(u3_cr_sing(p, u3_co_h(b)), - u3_cr_sing(q, u3_co_t(b)))); + return u3_and(u3_so(u3_ca_is_cell(b)), + u3_and(u3_cr_sing(p, u3_ca_h(b)), + u3_cr_sing(q, u3_ca_t(b)))); } u3_bean u3_cr_fing_cell(u3_noun p, u3_noun q, u3_noun b) { - return u3_and(u3_so(u3_co_is_cell(b)), - u3_and(u3_cr_fing(p, u3_co_h(b)), - u3_cr_fing(q, u3_co_t(b)))); + return u3_and(u3_so(u3_ca_is_cell(b)), + u3_and(u3_cr_fing(p, u3_ca_h(b)), + u3_cr_fing(q, u3_ca_t(b)))); } /* u3_cr_sing_mixt(): @@ -754,18 +754,18 @@ u3_cr_sing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) { - return u3_and(u3_so(u3_co_is_cell(b)), - u3_and(u3_cr_sing_c(p_c, u3_co_h(b)), - u3_cr_sing(q, u3_co_t(b)))); + return u3_and(u3_so(u3_ca_is_cell(b)), + u3_and(u3_cr_sing_c(p_c, u3_ca_h(b)), + u3_cr_sing(q, u3_ca_t(b)))); } u3_bean u3_cr_fing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) { - return u3_and(u3_so(u3_co_is_cell(b)), - u3_and(u3_cr_sing_c(p_c, u3_co_h(b)), - u3_cr_fing(q, u3_co_t(b)))); + return u3_and(u3_so(u3_ca_is_cell(b)), + u3_and(u3_cr_sing_c(p_c, u3_ca_h(b)), + u3_cr_fing(q, u3_ca_t(b)))); } /* u3_cr_sing_trel(): @@ -778,9 +778,9 @@ u3_cr_sing_trel(u3_noun p, u3_noun r, u3_noun b) { - return u3_and(u3_so(u3_co_is_cell(b)), - u3_and(u3_cr_sing(p, u3_co_h(b)), - u3_cr_sing_cell(q, r, u3_co_t(b)))); + return u3_and(u3_so(u3_ca_is_cell(b)), + u3_and(u3_cr_sing(p, u3_ca_h(b)), + u3_cr_sing_cell(q, r, u3_ca_t(b)))); } u3_bean u3_cr_fing_trel(u3_noun p, @@ -788,9 +788,9 @@ u3_cr_fing_trel(u3_noun p, u3_noun r, u3_noun b) { - return u3_and(u3_so(u3_co_is_cell(b)), - u3_and(u3_cr_fing(p, u3_co_h(b)), - u3_cr_fing_cell(q, r, u3_co_t(b)))); + return u3_and(u3_so(u3_ca_is_cell(b)), + u3_and(u3_cr_fing(p, u3_ca_h(b)), + u3_cr_fing_cell(q, r, u3_ca_t(b)))); } /* u3_cr_sing_qual(): @@ -804,9 +804,9 @@ u3_cr_sing_qual(u3_noun p, u3_noun s, u3_noun b) { - return u3_and(u3_so(u3_co_is_cell(b)), - u3_and(u3_cr_sing(p, u3_co_h(b)), - u3_cr_sing_trel(q, r, s, u3_co_t(b)))); + return u3_and(u3_so(u3_ca_is_cell(b)), + u3_and(u3_cr_sing(p, u3_ca_h(b)), + u3_cr_sing_trel(q, r, s, u3_ca_t(b)))); } u3_bean u3_cr_fing_qual(u3_noun p, @@ -815,9 +815,9 @@ u3_cr_fing_qual(u3_noun p, u3_noun s, u3_noun b) { - return u3_and(u3_so(u3_co_is_cell(b)), - u3_and(u3_cr_fing(p, u3_co_h(b)), - u3_cr_fing_trel(q, r, s, u3_co_t(b)))); + return u3_and(u3_so(u3_ca_is_cell(b)), + u3_and(u3_cr_fing(p, u3_ca_h(b)), + u3_cr_fing_trel(q, r, s, u3_ca_t(b)))); } /* u3_cr_nord(): @@ -835,22 +835,22 @@ u3_cr_nord(u3_noun a, return 1; } else { - if ( u3_so(u3_co_is_atom(a)) ) { - if ( !u3_so(u3_co_is_atom(b)) ) { + if ( u3_so(u3_ca_is_atom(a)) ) { + if ( !u3_so(u3_ca_is_atom(b)) ) { return 0; } else { - if ( u3_so(u3_co_is_cat(a)) ) { - if ( u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(a)) ) { + if ( u3_so(u3_ca_is_cat(b)) ) { return (a < b) ? 0 : 2; } else return 0; } - else if ( u3_so(u3_co_is_cat(b)) ) { + else if ( u3_so(u3_ca_is_cat(b)) ) { return 2; } else { - u3_cs_atom* a_u = u3_co_to_ptr(a); - u3_cs_atom* b_u = u3_co_to_ptr(b); + u3_cs_atom* a_u = u3_ca_to_ptr(a); + u3_cs_atom* b_u = u3_ca_to_ptr(b); c3_w w_rez = a_u->len_w; c3_w w_mox = b_u->len_w; @@ -874,13 +874,13 @@ u3_cr_nord(u3_noun a, } } } else { - if ( u3_so(u3_co_is_atom(b)) ) { + if ( u3_so(u3_ca_is_atom(b)) ) { return 2; } else { - u3_atom c = u3_cr_nord(u3_co_h(a), u3_co_h(b)); + u3_atom c = u3_cr_nord(u3_ca_h(a), u3_ca_h(b)); if ( 1 == c ) { - return u3_cr_nord(u3_co_t(a), u3_co_t(b)); + return u3_cr_nord(u3_ca_t(a), u3_ca_t(b)); } else { return c; } @@ -899,7 +899,7 @@ u3_cr_sing_c(const c3_c* a_c, { c3_assert(u3_none != b); - if ( !u3_so(u3_co_is_atom(b)) ) { + if ( !u3_so(u3_ca_is_atom(b)) ) { return u3_no; } else { @@ -929,16 +929,16 @@ u3_cr_bush(u3_noun a, { c3_assert(u3_none != a); - if ( u3_so(u3_co_is_atom(a)) ) { + if ( u3_so(u3_ca_is_atom(a)) ) { return u3_no; } else { - *b = u3_co_h(a); + *b = u3_ca_h(a); - if ( u3_so(u3_co_is_atom(*b)) ) { + if ( u3_so(u3_ca_is_atom(*b)) ) { return u3_no; } else { - *c = u3_co_t(a); + *c = u3_ca_t(a); return u3_yes; } } @@ -955,12 +955,12 @@ u3_cr_cell(u3_noun a, { c3_assert(u3_none != a); - if ( u3_so(u3_co_is_atom(a)) ) { + if ( u3_so(u3_ca_is_atom(a)) ) { return u3_no; } else { - if ( b ) *b = u3_co_h(a); - if ( c ) *c = u3_co_t(a); + if ( b ) *b = u3_ca_h(a); + if ( c ) *c = u3_ca_t(a); return u3_yes; } } @@ -1144,7 +1144,7 @@ u3_cr_met(c3_y a_y, u3_atom b) { c3_assert(u3_none != b); - c3_assert(u3_so(u3_co_is_atom(b))); + c3_assert(u3_so(u3_ca_is_atom(b))); if ( b == 0 ) { return 0; @@ -1156,12 +1156,12 @@ u3_cr_met(c3_y a_y, c3_w gal_w; c3_w daz_w; - if ( u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(b)) ) { gal_w = 0; daz_w = b; } else { - u3_cs_atom* b_u = u3_co_to_ptr(b); + u3_cs_atom* b_u = u3_ca_to_ptr(b); gal_w = (b_u->len_w) - 1; daz_w = b_u->buf_w[gal_w]; @@ -1207,16 +1207,16 @@ u3_cr_bit(c3_w a_w, u3_atom b) { c3_assert(u3_none != b); - c3_assert(u3_so(u3_co_is_atom(b))); + c3_assert(u3_so(u3_ca_is_atom(b))); - if ( u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(b)) ) { if ( a_w >= 31 ) { return 0; } else return (1 & (b >> a_w)); } else { - u3_cs_atom* b_u = u3_co_to_ptr(b); + u3_cs_atom* b_u = u3_ca_to_ptr(b); c3_y vut_y = (a_w & 31); c3_w pix_w = (a_w >> 5); @@ -1240,16 +1240,16 @@ u3_cr_byte(c3_w a_w, u3_atom b) { c3_assert(u3_none != b); - c3_assert(u3_so(u3_co_is_atom(b))); + c3_assert(u3_so(u3_ca_is_atom(b))); - if ( u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(b)) ) { if ( a_w > 3 ) { return 0; } else return (255 & (b >> (a_w << 3))); } else { - u3_cs_atom* b_u = u3_co_to_ptr(b); + u3_cs_atom* b_u = u3_ca_to_ptr(b); c3_y vut_y = (a_w & 3); c3_w pix_w = (a_w >> 2); @@ -1294,13 +1294,13 @@ u3_cr_mp(mpz_t a_mp, u3_atom b) { c3_assert(u3_none != b); - c3_assert(u3_so(u3_co_is_atom(b))); + c3_assert(u3_so(u3_ca_is_atom(b))); - if ( u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(b)) ) { mpz_init_set_ui(a_mp, b); } else { - u3_cs_atom* b_u = u3_co_to_ptr(b); + u3_cs_atom* b_u = u3_ca_to_ptr(b); c3_w len_w = b_u->len_w; /* Slight deficiency in the GMP API. @@ -1331,16 +1331,16 @@ u3_cr_word(c3_w a_w, u3_atom b) { c3_assert(u3_none != b); - c3_assert(u3_so(u3_co_is_atom(b))); + c3_assert(u3_so(u3_ca_is_atom(b))); - if ( u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(b)) ) { if ( a_w > 0 ) { return 0; } else return b; } else { - u3_cs_atom* b_u = u3_co_to_ptr(b); + u3_cs_atom* b_u = u3_ca_to_ptr(b); if ( a_w >= b_u->len_w ) { return 0; @@ -1403,14 +1403,14 @@ u3_cr_chop(c3_g met_g, c3_w* buf_w; c3_assert(u3_none != src); - c3_assert(u3_so(u3_co_is_atom(src))); + c3_assert(u3_so(u3_ca_is_atom(src))); - if ( u3_so(u3_co_is_cat(src)) ) { + if ( u3_so(u3_ca_is_cat(src)) ) { len_w = src ? 1 : 0; buf_w = &src; } else { - u3_cs_atom* src_u = u3_co_to_ptr(src); + u3_cs_atom* src_u = u3_ca_to_ptr(src); len_w = src_u->len_w; buf_w = src_u->buf_w; @@ -1481,12 +1481,12 @@ u3_cr_tape(u3_noun a) c3_w i_w; c3_y *a_y; - for ( i_w = 0, b=a; u3_yes == u3_co_is_cell(b); i_w++, b=u3_co_t(b) ) + for ( i_w = 0, b=a; u3_yes == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) ; a_y = c3_malloc(i_w + 1); - for ( i_w = 0, b=a; u3_yes == u3_co_is_cell(b); i_w++, b=u3_co_t(b) ) { - a_y[i_w] = u3_co_h(b); + for ( i_w = 0, b=a; u3_yes == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) { + a_y[i_w] = u3_ca_h(b); } a_y[i_w] = 0; diff --git a/g/v.c b/g/v.c index 29749d325c..0011037170 100644 --- a/g/v.c +++ b/g/v.c @@ -485,7 +485,7 @@ u3_cv_louse(c3_m how_m) #if 0 if ( c3__exit == how_m ) { printf("louse: nocks: %d\n", NOX); - printf("louse: washing kernel %x %d\n", u3A->ken, u3_co_is_dog(u3A->ken)); + printf("louse: washing kernel %x %d\n", u3A->ken, u3_ca_is_dog(u3A->ken)); u3_cm_wash(u3A->ken); printf("kernel %x; washed mug %x\n", u3A->ken, u3_cr_mug(u3A->ken)); diff --git a/include/g/a.h b/include/g/a.h index 29047287d0..2b766af71d 100644 --- a/include/g/a.h +++ b/include/g/a.h @@ -15,7 +15,6 @@ # define u3_cc_pages (1 << (u3_cc_bits - u3_cc_page)) // 2^16 pages # define u3_cc_words (1 << u3_cc_bits) # define u3_cc_bytes (c3_w)((1 << (2 + u3_cc_bits))) -# define u3_Loom ((c3_w *)(void *)U3_OS_LoomBase) /** Data structures. @@ -75,30 +74,30 @@ /* Inside a noun. */ -# define u3_co_is_cat(som) (((som) >> 31) ? u3_no : u3_yes) -# define u3_co_is_dog(som) (((som) >> 31) ? u3_yes : u3_no) +# define u3_ca_is_cat(som) (((som) >> 31) ? u3_no : u3_yes) +# define u3_ca_is_dog(som) (((som) >> 31) ? u3_yes : u3_no) -# define u3_co_is_pug(som) ((2 == ((som) >> 30)) ? u3_yes : u3_no) -# define u3_co_is_pom(som) ((3 == ((som) >> 30)) ? u3_yes : u3_no) -# define u3_co_to_off(som) ((som) & 0x3fffffff) -# define u3_co_to_ptr(som) (u3_co_into(u3_co_to_off(som))) -# define u3_co_to_wtr(som) ((c3_w *)u3_co_to_ptr(som)) -# define u3_co_to_pug(off) (off | 0x80000000) -# define u3_co_to_pom(off) (off | 0xc0000000) +# define u3_ca_is_pug(som) ((2 == ((som) >> 30)) ? u3_yes : u3_no) +# define u3_ca_is_pom(som) ((3 == ((som) >> 30)) ? u3_yes : u3_no) +# define u3_ca_to_off(som) ((som) & 0x3fffffff) +# define u3_ca_to_ptr(som) (u3_ca_into(u3_ca_to_off(som))) +# define u3_ca_to_wtr(som) ((c3_w *)u3_ca_to_ptr(som)) +# define u3_ca_to_pug(off) (off | 0x80000000) +# define u3_ca_to_pom(off) (off | 0xc0000000) -# define u3_co_is_atom(som) u3_or(u3_co_is_cat(som), \ - u3_co_is_pug(som)) -# define u3_co_is_cell(som) u3_co_is_pom(som) -# define u3_co_de_twin(dog, dog_w) ((dog & 0xc0000000) | u3_co_outa(dog_w)) +# define u3_ca_is_atom(som) u3_or(u3_ca_is_cat(som), \ + u3_ca_is_pug(som)) +# define u3_ca_is_cell(som) u3_ca_is_pom(som) +# define u3_ca_de_twin(dog, dog_w) ((dog & 0xc0000000) | u3_ca_outa(dog_w)) -# define u3_co_h(som) \ - ( u3_so(u3_co_is_cell(som)) \ - ? ( ((u3_cs_cell *)u3_co_to_ptr(som))->hed )\ +# define u3_ca_h(som) \ + ( u3_so(u3_ca_is_cell(som)) \ + ? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->hed )\ : u3_cm_bail(c3__exit) ) -# define u3_co_t(som) \ - ( u3_so(u3_co_is_cell(som)) \ - ? ( ((u3_cs_cell *)u3_co_to_ptr(som))->tel )\ +# define u3_ca_t(som) \ + ( u3_so(u3_ca_is_cell(som)) \ + ? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->tel )\ : u3_cm_bail(c3__exit) ) /* u3_cs_box: classic allocation box. @@ -125,11 +124,11 @@ # endif } u3_cs_box; -# define u3_co_boxed(len_w) (len_w + c3_wiseof(u3_cs_box) + 1) -# define u3_co_boxto(box_v) ( (void *) \ +# define u3_ca_boxed(len_w) (len_w + c3_wiseof(u3_cs_box) + 1) +# define u3_ca_boxto(box_v) ( (void *) \ ( ((c3_w *)(void*)(box_v)) + \ c3_wiseof(u3_cs_box) ) ) -# define u3_co_botox(tox_v) ( (struct _u3_cs_box *) \ +# define u3_ca_botox(tox_v) ( (struct _u3_cs_box *) \ (void *) \ ( ((c3_w *)(void*)(tox_v)) - \ c3_wiseof(u3_cs_box) ) ) @@ -285,56 +284,56 @@ /** Macros. **/ -# define u3_co_into(x) ((void *)(u3_Loom + (x))) -# define u3_co_outa(p) (((c3_w*)(void*)(p)) - u3_Loom) +# define u3_ca_into(x) ((void *)(u3_Loom + (x))) +# define u3_ca_outa(p) (((c3_w*)(void*)(p)) - u3_Loom) -# define u3to(type, x) ((type *) u3_co_into(x)) -# define u3of(type, x) (u3_co_outa((type *)x)) +# define u3to(type, x) ((type *) u3_ca_into(x)) +# define u3of(type, x) (u3_ca_outa((type *)x)) -# define u3_co_is_north(r) ((r->cap_p > r->hat_p) ? u3_yes : u3_no) -# define u3_co_is_south(r) ((u3_so(u3_co_is_north(r))) ? u3_no : u3_yes) +# define u3_ca_is_north(r) ((r->cap_p > r->hat_p) ? u3_yes : u3_no) +# define u3_ca_is_south(r) ((u3_so(u3_ca_is_north(r))) ? u3_no : u3_yes) -# define u3_co_open(r) ( (u3_yes == u3_co_is_north(r)) \ +# define u3_ca_open(r) ( (u3_yes == u3_ca_is_north(r)) \ ? (c3_w)(r->cap_p - r->hat_p) \ : (c3_w)(r->hat_p - r->cap_p) ) -# define u3_co_north_is_senior(r, dog) \ - u3_say((u3_co_to_off(dog) < r->rut_p) || \ - (u3_co_to_off(dog) >= r->mat_p)) +# define u3_ca_north_is_senior(r, dog) \ + u3_say((u3_ca_to_off(dog) < r->rut_p) || \ + (u3_ca_to_off(dog) >= r->mat_p)) -# define u3_co_north_is_junior(r, dog) \ - u3_say((u3_co_to_off(dog) >= r->cap_p) && \ - (u3_co_to_off(dog) < r->mat_p)) +# define u3_ca_north_is_junior(r, dog) \ + u3_say((u3_ca_to_off(dog) >= r->cap_p) && \ + (u3_ca_to_off(dog) < r->mat_p)) -# define u3_co_north_is_normal(r, dog) \ - u3_and(u3_not(u3_co_north_is_senior(r, dog)), \ - u3_not(u3_co_north_is_junior(r, dog))) +# define u3_ca_north_is_normal(r, dog) \ + u3_and(u3_not(u3_ca_north_is_senior(r, dog)), \ + u3_not(u3_ca_north_is_junior(r, dog))) -# define u3_co_south_is_senior(r, dog) \ - u3_say((u3_co_to_off(dog) < r->mat_p) || \ - (u3_co_to_off(dog) >= r->rut_p)) +# define u3_ca_south_is_senior(r, dog) \ + u3_say((u3_ca_to_off(dog) < r->mat_p) || \ + (u3_ca_to_off(dog) >= r->rut_p)) -# define u3_co_south_is_junior(r, dog) \ - u3_say((u3_co_to_off(dog) < r->cap_p) && \ - (u3_co_to_off(dog) >= r->mat_p)) +# define u3_ca_south_is_junior(r, dog) \ + u3_say((u3_ca_to_off(dog) < r->cap_p) && \ + (u3_ca_to_off(dog) >= r->mat_p)) -# define u3_co_south_is_normal(r, dog) \ - u3_and(u3_not(u3_co_south_is_senior(r, dog)), \ - u3_not(u3_co_south_is_junior(r, dog))) +# define u3_ca_south_is_normal(r, dog) \ + u3_and(u3_not(u3_ca_south_is_senior(r, dog)), \ + u3_not(u3_ca_south_is_junior(r, dog))) -# define u3_co_is_junior(r, som) \ - ( u3_so(u3_co_is_cat(som)) \ +# define u3_ca_is_junior(r, som) \ + ( u3_so(u3_ca_is_cat(som)) \ ? u3_no \ - : u3_so(u3_co_is_north(r)) \ - ? u3_co_north_is_junior(r, som) \ - : u3_co_south_is_junior(r, som) ) + : u3_so(u3_ca_is_north(r)) \ + ? u3_ca_north_is_junior(r, som) \ + : u3_ca_south_is_junior(r, som) ) -# define u3_co_is_senior(r, som) \ - ( u3_so(u3_co_is_cat(som)) \ +# define u3_ca_is_senior(r, som) \ + ( u3_so(u3_ca_is_cat(som)) \ ? u3_yes \ - : u3_so(u3_co_is_north(r)) \ - ? u3_co_north_is_senior(r, som) \ - : u3_co_south_is_senior(r, som) ) + : u3_so(u3_ca_is_north(r)) \ + ? u3_ca_north_is_senior(r, som) \ + : u3_ca_south_is_senior(r, som) ) /* Word axis macros. For 31-bit axes only. */ @@ -390,6 +389,7 @@ c3_global c3_w u3_Code; #endif +# define u3_Loom ((c3_w *)(void *)U3_OS_LoomBase) /** Functions. **/ diff --git a/include/g/h.h b/include/g/h.h index 2038cb25ac..8aaf239321 100644 --- a/include/g/h.h +++ b/include/g/h.h @@ -66,8 +66,8 @@ # define u3_ch_slot_is_node(sot) ((1 == ((sot) >> 30)) ? u3_yes : u3_no) # define u3_ch_slot_is_noun(sot) ((1 == ((sot) >> 31)) ? u3_yes : u3_no) # define u3_ch_slot_is_warm(sot) (((sot) & 0x40000000) ? u3_yes : u3_no) -# define u3_ch_slot_to_node(sot) (u3_co_into((sot) & 0x3fffffff)) -# define u3_ch_node_to_slot(ptr) (u3_co_outa(ptr) | 0x40000000) +# define u3_ch_slot_to_node(sot) (u3_ca_into((sot) & 0x3fffffff)) +# define u3_ch_node_to_slot(ptr) (u3_ca_outa(ptr) | 0x40000000) # define u3_ch_slot_to_noun(sot) (0x40000000 | (sot)) # define u3_ch_noun_to_slot(som) (som) # define u3_ch_noun_be_warm(sot) ((sot) | 0x40000000) diff --git a/include/g/r.h b/include/g/r.h index 84ee2d10e4..d027476e46 100644 --- a/include/g/r.h +++ b/include/g/r.h @@ -5,8 +5,8 @@ /** u3_cr_*: read without ever crashing. **/ #if 1 -# define u3_cr_du(a) u3_co_is_cell(a) -# define u3_cr_ud(a) u3_co_is_atom(a) +# define u3_cr_du(a) u3_ca_is_cell(a) +# define u3_cr_ud(a) u3_ca_is_atom(a) #else /* u3_cr_du(): u3_yes iff `a` is cell. */ diff --git a/include/g/x.h b/include/g/x.h index 6e22da6e0d..edd77d2021 100644 --- a/include/g/x.h +++ b/include/g/x.h @@ -5,8 +5,8 @@ /** u3_cx_*: read, but bail with c3__exit on a crash. **/ #if 1 -# define u3_cx_h(som) u3_co_h(som) -# define u3_cx_t(som) u3_co_t(som) +# define u3_cx_h(som) u3_ca_h(som) +# define u3_cx_t(som) u3_ca_t(som) #else /* u3_cx_h (u3h): head. */ diff --git a/j/1/add.c b/j/1/add.c index 35b5a4f524..ec59306da5 100644 --- a/j/1/add.c +++ b/j/1/add.c @@ -11,7 +11,7 @@ u3_cqa_add(u3_atom a, u3_atom b) { - if ( u3_so(u3_co_is_cat(a)) && u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { c3_w c = a + b; return u3_ci_words(1, &c); diff --git a/j/1/dec.c b/j/1/dec.c index 6205e9ad5f..5c45adabe3 100644 --- a/j/1/dec.c +++ b/j/1/dec.c @@ -20,7 +20,7 @@ return u3_cm_error("decrement-underflow"); } else { - if ( u3_so(u3_co_is_cat(a)) ) { + if ( u3_so(u3_ca_is_cat(a)) ) { return a - 1; } else { diff --git a/j/1/div.c b/j/1/div.c index 07b50aa2f1..ccfcd48881 100644 --- a/j/1/div.c +++ b/j/1/div.c @@ -15,7 +15,7 @@ return u3_cm_bail(c3__exit); } else { - if ( u3_so(u3_co_is_cat(a)) && u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { return a / b; } else { diff --git a/j/1/gte.c b/j/1/gte.c index 6f10ef690c..741f92774b 100644 --- a/j/1/gte.c +++ b/j/1/gte.c @@ -10,7 +10,7 @@ u3_noun u3_cqa_gte(u3_atom a, u3_atom b) { - if ( u3_so(u3_co_is_cat(a)) && u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { return u3_say(a >= b); } else { diff --git a/j/1/gth.c b/j/1/gth.c index 2068fdc859..801812d071 100644 --- a/j/1/gth.c +++ b/j/1/gth.c @@ -11,7 +11,7 @@ u3_cqa_gth(u3_atom a, u3_atom b) { - if ( u3_so(u3_co_is_cat(a)) && u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { return u3_say(a > b); } else { diff --git a/j/1/lte.c b/j/1/lte.c index cfa7f7bb67..08781eb12f 100644 --- a/j/1/lte.c +++ b/j/1/lte.c @@ -10,7 +10,7 @@ u3_noun u3_cqa_lte(u3_atom a, u3_atom b) { - if ( u3_so(u3_co_is_cat(a)) && u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { return u3_say(a <= b); } else { diff --git a/j/1/lth.c b/j/1/lth.c index c06d939ace..5e9fffe3bb 100644 --- a/j/1/lth.c +++ b/j/1/lth.c @@ -11,7 +11,7 @@ u3_cqa_lth(u3_atom a, u3_atom b) { - if ( u3_so(u3_co_is_cat(a)) && u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { return u3_say(a < b); } else { diff --git a/j/1/mul.c b/j/1/mul.c index efb8891476..a24146c935 100644 --- a/j/1/mul.c +++ b/j/1/mul.c @@ -11,7 +11,7 @@ u3_cqa_mul(u3_atom a, u3_atom b) { - if ( u3_so(u3_co_is_cat(a)) && u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { c3_d c = ((c3_d) a) * ((c3_d) b); return u3_ci_chubs(1, &c); diff --git a/j/1/sub.c b/j/1/sub.c index 71021597d1..5ebb7eda65 100644 --- a/j/1/sub.c +++ b/j/1/sub.c @@ -10,7 +10,7 @@ u3_noun u3_cqa_sub(u3_atom a, u3_atom b) { - if ( u3_so(u3_co_is_cat(a)) && u3_so(u3_co_is_cat(b)) ) { + if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { if ( a < b ) { return u3_cm_error("subtract-underflow"); } diff --git a/j/2/scag.c b/j/2/scag.c index 7acfe877d0..8cb68cc98d 100644 --- a/j/2/scag.c +++ b/j/2/scag.c @@ -12,7 +12,7 @@ u3_atom a, u3_noun b) { - if ( u3_ne(u3_co_is_cat(a)) ) { + if ( u3_ne(u3_ca_is_cat(a)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/2/slag.c b/j/2/slag.c index 2479a2e04d..c0668f2d51 100644 --- a/j/2/slag.c +++ b/j/2/slag.c @@ -10,7 +10,7 @@ u3_noun u3_cqb_slag(u3_atom a, u3_noun b) { - if ( u3_ne(u3_co_is_cat(a)) ) { + if ( u3_ne(u3_ca_is_cat(a)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/2/snag.c b/j/2/snag.c index 33274dc18e..074a372c84 100644 --- a/j/2/snag.c +++ b/j/2/snag.c @@ -11,7 +11,7 @@ u3_cqb_snag(u3_atom a, u3_noun b) { - if ( u3_ne(u3_co_is_cat(a)) ) { + if ( u3_ne(u3_ca_is_cat(a)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/3/bex.c b/j/3/bex.c index 4284cba040..b525f5c438 100644 --- a/j/3/bex.c +++ b/j/3/bex.c @@ -12,7 +12,7 @@ { mpz_t a_mp; - if ( u3_ne(u3_co_is_cat(a)) ) { + if ( u3_ne(u3_ca_is_cat(a)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/3/can.c b/j/3/can.c index bda77c37f4..3980458f35 100644 --- a/j/3/can.c +++ b/j/3/can.c @@ -11,7 +11,7 @@ u3_cqc_can(u3_atom a, u3_noun b) { - if ( u3_ne(u3_co_is_cat(a)) || (a >= 32) ) { + if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } else { @@ -35,7 +35,7 @@ if ( u3_no == u3du(i_cab) ) return u3_cm_bail(c3__fail); pi_cab = u3h(i_cab); qi_cab = u3t(i_cab); - if ( u3_no == u3_co_is_cat(pi_cab) ) return u3_cm_bail(c3__fail); + if ( u3_no == u3_ca_is_cat(pi_cab) ) return u3_cm_bail(c3__fail); if ( u3_no == u3ud(qi_cab) ) return u3_cm_bail(c3__fail); if ( (tot_w + pi_cab) < tot_w ) return u3_cm_bail(c3__fail); diff --git a/j/3/cat.c b/j/3/cat.c index 1e62f23909..daa369b7c7 100644 --- a/j/3/cat.c +++ b/j/3/cat.c @@ -12,7 +12,7 @@ u3_atom b, u3_atom c) { - if ( u3_ne(u3_co_is_cat(a)) || (a >= 32) ) { + if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/3/cut.c b/j/3/cut.c index d62eec6f08..3aa6ecbef9 100644 --- a/j/3/cut.c +++ b/j/3/cut.c @@ -14,13 +14,13 @@ u3_atom c, u3_atom d) { - if ( u3_ne(u3_co_is_cat(a)) || (a >= 32) ) { + if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } - if ( u3_ne(u3_co_is_cat(b)) ) { + if ( u3_ne(u3_ca_is_cat(b)) ) { return 0; } - if ( u3_ne(u3_co_is_cat(c)) ) { + if ( u3_ne(u3_ca_is_cat(c)) ) { c = 0x7fffffff; } diff --git a/j/3/end.c b/j/3/end.c index bfcadba51d..ba523db4fd 100644 --- a/j/3/end.c +++ b/j/3/end.c @@ -13,10 +13,10 @@ u3_atom b, u3_atom c) { - if ( u3_ne(u3_co_is_cat(a)) || (a >= 32) ) { + if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } - else if ( u3_ne(u3_co_is_cat(b)) ) { + else if ( u3_ne(u3_ca_is_cat(b)) ) { return u3k(c); } else { diff --git a/j/3/lsh.c b/j/3/lsh.c index 9b234dc968..da48101b2c 100644 --- a/j/3/lsh.c +++ b/j/3/lsh.c @@ -10,10 +10,10 @@ u3_noun u3_cqc_lsh(u3_atom a, u3_atom b, u3_atom c) { - if ( u3_ne(u3_co_is_cat(a)) || (a >= 32) ) { + if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } - else if ( u3_ne(u3_co_is_cat(b)) ) { + else if ( u3_ne(u3_ca_is_cat(b)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/3/met.c b/j/3/met.c index 80f68bd28b..bc84189270 100644 --- a/j/3/met.c +++ b/j/3/met.c @@ -12,7 +12,7 @@ u3_atom a, u3_atom b) { - if ( u3_ne(u3_co_is_cat(a)) || (a >= 32) ) { + if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( 0 == b ) { return 0; } else return 1; @@ -20,7 +20,7 @@ else { c3_w met_w = u3_cr_met(a, b); - if ( u3_ne(u3_co_is_cat(met_w)) ) { + if ( u3_ne(u3_ca_is_cat(met_w)) ) { return u3_ci_words(1, &met_w); } else return u3_cr_met(a, b); diff --git a/j/3/po.c b/j/3/po.c index 0477961cc9..c6b3484d21 100644 --- a/j/3/po.c +++ b/j/3/po.c @@ -10,7 +10,7 @@ static u3_noun _po_find(u3_noun buf, u3_noun a) { - if ( u3_ne(u3_co_is_cat(a)) ) { + if ( u3_ne(u3_ca_is_cat(a)) ) { return u3_nul; } else { diff --git a/j/3/rap.c b/j/3/rap.c index e6dd7a727c..7e4f2a67a4 100644 --- a/j/3/rap.c +++ b/j/3/rap.c @@ -11,7 +11,7 @@ u3_cqc_rap(u3_atom a, u3_noun b) { - if ( u3_ne(u3_co_is_cat(a)) || (a >= 32) ) { + if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/rip.c b/j/3/rip.c index a577657200..aa7951fa59 100644 --- a/j/3/rip.c +++ b/j/3/rip.c @@ -11,7 +11,7 @@ u3_cqc_rip(u3_atom a, u3_atom b) { - if ( u3_ne(u3_co_is_cat(a)) || (a >= 32) ) { + if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/3/rsh.c b/j/3/rsh.c index 27bb7f2519..f27c2b649d 100644 --- a/j/3/rsh.c +++ b/j/3/rsh.c @@ -13,10 +13,10 @@ u3_atom b, u3_atom c) { - if ( u3_ne(u3_co_is_cat(a)) || (a >= 32) ) { + if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } - else if ( u3_ne(u3_co_is_cat(b)) ) { + else if ( u3_ne(u3_ca_is_cat(b)) ) { return 0; } else { diff --git a/j/5/parse.c b/j/5/parse.c index 56aaa3ebd0..40fdad7d60 100644 --- a/j/5/parse.c +++ b/j/5/parse.c @@ -44,8 +44,8 @@ u3_cx_cell(zyc, &p_zyc, &q_zyc); u3_cx_cell(naz, &p_naz, &q_naz); - if ( u3_ne(u3_co_is_cat(p_zyc)) || u3_ne(u3_co_is_cat(q_zyc)) || - u3_ne(u3_co_is_cat(p_naz)) || u3_ne(u3_co_is_cat(q_naz)) ) + if ( u3_ne(u3_ca_is_cat(p_zyc)) || u3_ne(u3_ca_is_cat(q_zyc)) || + u3_ne(u3_ca_is_cat(p_naz)) || u3_ne(u3_ca_is_cat(q_naz)) ) { return u3_cm_bail(c3__fail); } else { @@ -775,9 +775,9 @@ u3_noun iq_tub = u3h(q_tub); u3_cx_cell(zep, &p_zep, &q_zep); - if ( u3_so(u3_co_is_cat(p_zep)) && - u3_so(u3_co_is_cat(q_zep)) && - u3_so(u3_co_is_cat(iq_tub)) ) + if ( u3_so(u3_ca_is_cat(p_zep)) && + u3_so(u3_ca_is_cat(q_zep)) && + u3_so(u3_ca_is_cat(iq_tub)) ) { if ( (iq_tub >= p_zep) && (iq_tub <= q_zep) ) { return _next(tub); @@ -860,12 +860,12 @@ u3_noun ort, u3_noun wan) { - if ( u3_ne(u3_co_is_cat(ort)) ) { + if ( u3_ne(u3_ca_is_cat(ort)) ) { return u3_cm_bail(c3__fail); } else { if ( u3_no == u3du(wan) ) { - if ( u3_ne(u3_co_is_cat(wan)) ) { + if ( u3_ne(u3_ca_is_cat(wan)) ) { return u3_cm_bail(c3__fail); } else return (ort < wan) ? u3_yes : u3_no; @@ -873,7 +873,7 @@ else { u3_noun h_wan = u3h(wan); - if ( u3_ne(u3_co_is_cat(h_wan)) ) { + if ( u3_ne(u3_ca_is_cat(h_wan)) ) { return u3_cm_bail(c3__fail); } else return (ort < h_wan) ? u3_yes : u3_no; @@ -895,7 +895,7 @@ else { u3_noun iq_tub = u3h(q_tub); - if ( u3_ne(u3_co_is_cat(iq_tub)) ) { + if ( u3_ne(u3_ca_is_cat(iq_tub)) ) { return u3_cm_bail(c3__fail); } else while ( 1 ) { @@ -917,8 +917,8 @@ u3_noun hpn_hel = u3h(pn_hel); u3_noun tpn_hel = u3t(pn_hel); - if ( u3_ne(u3_co_is_cat(hpn_hel)) || - u3_ne(u3_co_is_cat(tpn_hel)) ) { + if ( u3_ne(u3_ca_is_cat(hpn_hel)) || + u3_ne(u3_ca_is_cat(tpn_hel)) ) { return _fail(tub); } else bit_o = u3_say((iq_tub >= hpn_hel) && (iq_tub <= tpn_hel)); diff --git a/j/5/shax.c b/j/5/shax.c index 56dc21978a..d13c1a57c6 100644 --- a/j/5/shax.c +++ b/j/5/shax.c @@ -45,7 +45,7 @@ u3_cqe_shal(u3_atom a, u3_atom b) { - c3_assert(u3_so(u3_co_is_cat(a))); + c3_assert(u3_so(u3_ca_is_cat(a))); c3_y* fat_y = c3_malloc(a + 1); u3_cr_bytes(0, a, fat_y, b); @@ -104,7 +104,7 @@ if ( (u3_none == (a = u3_cr_at(u3_cv_sam_2, cor))) || (u3_none == (b = u3_cr_at(u3_cv_sam_3, cor))) || (u3_no == u3ud(a)) || - (u3_no == u3_co_is_cat(a)) || + (u3_no == u3_ca_is_cat(a)) || (u3_no == u3ud(b)) ) { return u3_cm_bail(c3__exit); @@ -137,7 +137,7 @@ { u3_noun l = u3_nul; - if ( u3_ne(u3_co_is_cat(b)) ) { + if ( u3_ne(u3_ca_is_cat(b)) ) { return u3_cm_bail(c3__fail); } while ( 0 != b ) { diff --git a/v/cttp.c b/v/cttp.c index 3ad24e231d..cf719c66f7 100644 --- a/v/cttp.c +++ b/v/cttp.c @@ -220,7 +220,7 @@ _cttp_octs_to_bod(u3_noun oct) { c3_w len_w; - if ( u3_ne(u3_co_is_cat(u3h(oct))) ) { // 2GB max + if ( u3_ne(u3_ca_is_cat(u3h(oct))) ) { // 2GB max u3_cm_bail(c3__fail); return 0; } len_w = u3h(oct); diff --git a/v/http.c b/v/http.c index d3ad44aef0..298e309026 100644 --- a/v/http.c +++ b/v/http.c @@ -787,7 +787,7 @@ _http_octs_to_bod(u3_noun oct) { c3_w len_w; - if ( u3_ne(u3_co_is_cat(u3h(oct))) ) { + if ( u3_ne(u3_ca_is_cat(u3h(oct))) ) { // 2GB max u3_cm_bail(c3__fail); return 0; } From ceb35b892cdb79aeafe4123cb4fac99b5e42b63e Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 4 Nov 2014 17:09:17 -0800 Subject: [PATCH 03/14] About to rename loobeans. --- g/i.c | 6 +++--- g/r.c | 6 +++--- include/c/defs.h | 48 +++++++++++++---------------------------------- include/c/types.h | 7 ------- 4 files changed, 19 insertions(+), 48 deletions(-) diff --git a/g/i.c b/g/i.c index 26a11e8544..d3e2cfaf20 100644 --- a/g/i.c +++ b/g/i.c @@ -314,13 +314,13 @@ u3_ci_list(u3_weak one, ...); { c3_w i_w, cut_t, cut_w; - cut_t = c3_false; + cut_t = 0; cut_w = 0; for ( i_w = 0; i_w < len_w; i_w++ ) { c3_w axe_w = pms_m[i_w].axe_w; - if ( (cut_t == c3_false) && (3 == u3_ax_cap(axe_w)) ) { - cut_t = c3_true; + if ( (cut_t == 0) && (3 == u3_ax_cap(axe_w)) ) { + cut_t = 1; cut_w = i_w; } pms_m[i_w].axe_w = u3_ax_mas(axe_w); diff --git a/g/r.c b/g/r.c index a3251da815..300dc45782 100644 --- a/g/r.c +++ b/g/r.c @@ -109,13 +109,13 @@ u3_cr_at(u3_atom a, { c3_w i_w, cut_t, cut_w; - cut_t = c3_false; + cut_t = 0; cut_w = 0; for ( i_w = 0; i_w < len_w; i_w++ ) { c3_w axe_w = prs_m[i_w].axe_w; - if ( (cut_t == c3_false) && (3 == u3_ax_cap(axe_w)) ) { - cut_t = c3_true; + if ( (cut_t == 0) && (3 == u3_ax_cap(axe_w)) ) { + cut_t = 1; cut_w = i_w; } prs_m[i_w].axe_w = u3_ax_mas(axe_w); diff --git a/include/c/defs.h b/include/c/defs.h index 6c43239eb7..b323d8a7f3 100644 --- a/include/c/defs.h +++ b/include/c/defs.h @@ -2,6 +2,17 @@ ** ** This file is in the public domain. */ + /** Loobeans - inverse booleans to match nock. + **/ +# define c3y 0 +# define c3n 1 + +# define _(x) (c3y == (x)) +# define __(x) ((x) ? c3y : c3n) +# define c3a(x) __(_(x) && _(y)) +# define c3o(x)( __(_(x) || _(y)) + + /** Random useful C macros. **/ /* Assert. Good to capture. @@ -19,41 +30,7 @@ /* Bit counting. */ -#if 1 -# define c3_bits_word(w) ((w) ? (32 - __builtin_clz(w)) : 0) -#else -#ifdef C3_GLOBAL - c3_y Bts_y[] = { - 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 - }; -#else - extern c3_y Bts_y[]; -#endif -# define c3_bits_byte(y) Bts_y[y] -# define c3_bits_word(w) \ - ( ((w) >> 24) \ - ? (24 + Bts_y[(w) >> 24]) \ - : ((w) >> 16) \ - ? (16 + Bts_y[(w) >> 16]) \ - : ((w) >> 8) \ - ? (8 + Bts_y[(w) >> 8]) \ - : Bts_y[(w)] ) -#endif +# define c3_bits_word(w) ((w) ? (32 - __builtin_clz(w)) : 0) /* Min and max. */ @@ -104,6 +81,7 @@ } \ cnt_w = (cnt_w + 1) % (n); \ } while (0) + /* c3_malloc(): asserting malloc */ #define c3_malloc(s) ({ \ diff --git a/include/c/types.h b/include/c/types.h index b42ee631ea..a7d74901cd 100644 --- a/include/c/types.h +++ b/include/c/types.h @@ -22,13 +22,6 @@ typedef uint32_t c3_l; // little; 31-bit unsigned integer typedef uint32_t c3_m; // mote; also c3_l; LSB first a-z 4-char string. - /* C true and false; boolean logic - */ -# define c3_true 1 -# define c3_false 0 -# define c3_and(x, y) ((x) && (y)) -# define c3_or(x, y) ((x) || (y)) - /* Deprecated integers. */ typedef char c3_c; // does not match int8_t or uint8_t From dbe046620a6e2176a713c105dd5af6cadb94ea35 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 4 Nov 2014 17:18:47 -0800 Subject: [PATCH 04/14] Move loobeans from u3 to c3. --- g/a.c | 152 +++++++++++------------ g/e.c | 56 ++++----- g/h.c | 94 +++++++------- g/i.c | 18 +-- g/j.c | 148 +++++++++++----------- g/m.c | 62 +++++----- g/n.c | 16 +-- g/r.c | 314 +++++++++++++++++++++++------------------------ g/t.c | 6 +- g/v.c | 24 ++-- g/x.c | 14 +-- g/z.c | 2 +- include/c/defs.h | 8 +- include/g/a.h | 56 ++++----- include/g/e.h | 2 +- include/g/h.h | 8 +- include/g/j.h | 2 +- include/g/r.h | 6 +- include/g/x.h | 2 +- j/1/add.c | 8 +- j/1/dec.c | 6 +- j/1/div.c | 8 +- j/1/gte.c | 12 +- j/1/gth.c | 12 +- j/1/lte.c | 12 +- j/1/lth.c | 12 +- j/1/mod.c | 6 +- j/1/mul.c | 8 +- j/1/sub.c | 8 +- j/2/bind.c | 2 +- j/2/clap.c | 2 +- j/2/drop.c | 4 +- j/2/flop.c | 4 +- j/2/lent.c | 4 +- j/2/levy.c | 10 +- j/2/lien.c | 10 +- j/2/need.c | 2 +- j/2/reel.c | 4 +- j/2/roll.c | 6 +- j/2/scag.c | 8 +- j/2/skim.c | 8 +- j/2/skip.c | 14 +-- j/2/slag.c | 8 +- j/2/snag.c | 10 +- j/2/sort.c | 2 +- j/2/turn.c | 4 +- j/2/weld.c | 4 +- j/3/bex.c | 6 +- j/3/can.c | 14 +-- j/3/cap.c | 4 +- j/3/cat.c | 10 +- j/3/con.c | 6 +- j/3/cut.c | 16 +-- j/3/dis.c | 6 +- j/3/dor.c | 18 +-- j/3/end.c | 12 +- j/3/gor.c | 4 +- j/3/hor.c | 14 +-- j/3/lsh.c | 12 +- j/3/mas.c | 4 +- j/3/met.c | 10 +- j/3/mix.c | 6 +- j/3/mug.c | 2 +- j/3/peg.c | 6 +- j/3/po.c | 34 ++--- j/3/rap.c | 10 +- j/3/rip.c | 8 +- j/3/rsh.c | 12 +- j/3/vor.c | 4 +- j/4/by_gas.c | 10 +- j/4/by_get.c | 16 +-- j/4/by_has.c | 16 +-- j/4/by_int.c | 24 ++-- j/4/by_put.c | 16 +-- j/4/by_uni.c | 24 ++-- j/4/in_gas.c | 8 +- j/4/in_has.c | 14 +-- j/4/in_int.c | 16 +-- j/4/in_mer.c | 16 +-- j/4/in_put.c | 14 +-- j/4/in_tap.c | 6 +- j/4/in_uni.c | 24 ++-- j/5/aesc.c | 12 +- j/5/cue.c | 4 +- j/5/ed_puck.c | 2 +- j/5/ed_sign.c | 2 +- j/5/ed_veri.c | 4 +- j/5/jam.c | 8 +- j/5/lore.c | 4 +- j/5/loss.c | 46 +++---- j/5/mat.c | 2 +- j/5/mink.c | 2 +- j/5/mule.c | 2 +- j/5/parse.c | 154 +++++++++++------------ j/5/rd.c | 60 ++++----- j/5/repg.c | 6 +- j/5/rexp.c | 4 +- j/5/rub.c | 10 +- j/5/shax.c | 28 ++--- j/5/tape.c | 14 +-- j/5/trip.c | 4 +- j/6/ap.c | 72 +++++------ j/6/bull.c | 2 +- j/6/cell.c | 2 +- j/6/comb.c | 28 ++--- j/6/cons.c | 16 +-- j/6/core.c | 2 +- j/6/cube.c | 2 +- j/6/face.c | 2 +- j/6/fine.c | 2 +- j/6/fitz.c | 18 +-- j/6/flan.c | 8 +- j/6/flay.c | 10 +- j/6/flip.c | 16 +-- j/6/flor.c | 8 +- j/6/fork.c | 4 +- j/6/hike.c | 10 +- j/6/look.c | 26 ++-- j/6/slot.c | 16 +-- j/6/type.c | 2 +- j/6/ut_burn.c | 8 +- j/6/ut_busk.c | 6 +- j/6/ut_bust.c | 8 +- j/6/ut_conk.c | 10 +- j/6/ut_crop.c | 24 ++-- j/6/ut_cull.c | 22 ++-- j/6/ut_find.c | 110 ++++++++--------- j/6/ut_fink.c | 4 +- j/6/ut_fire.c | 34 ++--- j/6/ut_firm.c | 26 ++-- j/6/ut_fish.c | 20 +-- j/6/ut_fuse.c | 22 ++-- j/6/ut_heal.c | 16 +-- j/6/ut_mint.c | 52 ++++---- j/6/ut_mull.c | 40 +++--- j/6/ut_nest.c | 122 +++++++++--------- j/6/ut_park.c | 36 +++--- j/6/ut_peek.c | 30 ++--- j/6/ut_play.c | 18 +-- j/6/ut_repo.c | 12 +- j/6/ut_rest.c | 14 +-- j/6/ut_seek.c | 36 +++--- j/6/ut_sift.c | 4 +- j/6/ut_swab.c | 6 +- j/6/ut_tock.c | 8 +- j/6/ut_wrap.c | 8 +- j/dash.c | 112 ++++++++--------- v/ames.c | 30 ++--- v/batz.c | 16 +-- v/cttp.c | 58 ++++----- v/http.c | 30 ++--- v/loop.c | 46 +++---- v/main.c | 90 +++++++------- v/raft.c | 62 +++++----- v/reck.c | 112 ++++++++--------- v/save.c | 2 +- v/sist.c | 38 +++--- v/temp.c | 16 +-- v/term.c | 52 ++++---- v/time.c | 2 +- v/unix.c | 120 +++++++++--------- v/walk.c | 14 +-- 162 files changed, 1860 insertions(+), 1860 deletions(-) diff --git a/g/a.c b/g/a.c index c11160c722..0203db89ce 100644 --- a/g/a.c +++ b/g/a.c @@ -124,7 +124,7 @@ _me_road_all_hat(c3_w len_w) u3_cm_bail(c3__meme); return 0; } - if ( u3_yes == u3_ca_is_north(u3R) ) { + if ( c3y == u3_ca_is_north(u3R) ) { u3_post all_p; all_p = u3R->hat_p; @@ -148,7 +148,7 @@ _me_road_all_cap(c3_w len_w) u3_cm_bail(c3__meme); return 0; } - if ( u3_yes == u3_ca_is_north(u3R) ) { + if ( c3y == u3_ca_is_north(u3R) ) { u3R->cap_p -= len_w; return u3_ca_into(u3R->cap_p); } @@ -371,7 +371,7 @@ u3_ca_free(void* tox_v) } #endif - if ( u3_yes == u3_ca_is_north(u3R) ) { + if ( c3y == u3_ca_is_north(u3R) ) { /* Try to coalesce with the block below. */ if ( box_w != u3_ca_into(u3R->rut_p) ) { @@ -440,23 +440,23 @@ static void _me_wash_north(u3_noun dog); static void _me_wash_north_in(u3_noun som) { - if ( u3_so(u3_ca_is_cat(som)) ) return; - if ( u3_ne(u3_ca_north_is_junior(u3R, som)) ) return; + if ( _(u3_ca_is_cat(som)) ) return; + if ( !_(u3_ca_north_is_junior(u3R, som)) ) return; _me_wash_north(som); } static void _me_wash_north(u3_noun dog) { - c3_assert(u3_yes == u3_ca_is_dog(dog)); - // c3_assert(u3_yes == u3_ca_north_is_junior(u3R, dog)); + c3_assert(c3y == u3_ca_is_dog(dog)); + // c3_assert(c3y == u3_ca_north_is_junior(u3R, dog)); { u3_cs_noun* dog_u = u3_ca_to_ptr(dog); if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } - if ( u3_so(u3_ca_is_pom(dog)) ) { + if ( _(u3_ca_is_pom(dog)) ) { u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u; _me_wash_north_in(god_u->hed); @@ -471,23 +471,23 @@ static void _me_wash_south(u3_noun dog); static void _me_wash_south_in(u3_noun som) { - if ( u3_so(u3_ca_is_cat(som)) ) return; - if ( u3_ne(u3_ca_south_is_junior(u3R, som)) ) return; + if ( _(u3_ca_is_cat(som)) ) return; + if ( !_(u3_ca_south_is_junior(u3R, som)) ) return; _me_wash_south(som); } static void _me_wash_south(u3_noun dog) { - c3_assert(u3_yes == u3_ca_is_dog(dog)); - // c3_assert(u3_yes == u3_ca_south_is_junior(u3R, dog)); + c3_assert(c3y == u3_ca_is_dog(dog)); + // c3_assert(c3y == u3_ca_south_is_junior(u3R, dog)); { u3_cs_noun* dog_u = u3_ca_to_ptr(dog); if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } - if ( u3_so(u3_ca_is_pom(dog)) ) { + if ( _(u3_ca_is_pom(dog)) ) { u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u; _me_wash_south_in(god_u->hed); @@ -501,16 +501,16 @@ _me_wash_south(u3_noun dog) void u3_ca_wash(u3_noun som) { - if ( u3_so(u3_ca_is_cat(som)) ) { + if ( _(u3_ca_is_cat(som)) ) { return; } - if ( u3_so(u3_ca_is_north(u3R)) ) { - if ( u3_so(u3_ca_north_is_junior(u3R, som)) ) { + if ( _(u3_ca_is_north(u3R)) ) { + if ( _(u3_ca_north_is_junior(u3R, som)) ) { _me_wash_north(som); } } else { - if ( u3_so(u3_ca_south_is_junior(u3R, som)) ) { + if ( _(u3_ca_south_is_junior(u3R, som)) ) { _me_wash_south(som); } } @@ -584,17 +584,17 @@ static u3_noun _me_copy_north(u3_noun); static u3_noun _me_copy_north_in(u3_noun som) { - c3_assert(u3_none != som); - if ( u3_so(u3_ca_is_cat(som)) ) { + c3_assert(c3nne != som); + if ( _(u3_ca_is_cat(som)) ) { return som; } else { u3_noun dog = som; - if ( u3_so(u3_ca_north_is_senior(u3R, dog)) ) { + if ( _(u3_ca_north_is_senior(u3R, dog)) ) { return dog; } - else if ( u3_so(u3_ca_north_is_junior(u3R, dog)) ) { + else if ( _(u3_ca_north_is_junior(u3R, dog)) ) { return _me_copy_north(dog); } else { @@ -608,10 +608,10 @@ _me_copy_north_in(u3_noun som) static u3_noun _me_copy_north(u3_noun dog) { - c3_assert(u3_yes == u3_ca_north_is_junior(u3R, dog)); + c3_assert(c3y == u3_ca_north_is_junior(u3R, dog)); - if ( u3_ne(u3_ca_north_is_junior(u3R, dog)) ) { - if ( u3_ne(u3_ca_north_is_senior(u3R, dog)) ) { + if ( !_(u3_ca_north_is_junior(u3R, dog)) ) { + if ( !_(u3_ca_north_is_senior(u3R, dog)) ) { _me_gain_use(dog); } return dog; @@ -624,13 +624,13 @@ _me_copy_north(u3_noun dog) if ( dog_u->mug_w >> 31 ) { u3_noun nov = (u3_noun) dog_u->mug_w; - c3_assert(u3_so(u3_ca_north_is_normal(u3R, nov))); + c3_assert(_(u3_ca_north_is_normal(u3R, nov))); _me_gain_use(nov); return nov; } else { - if ( u3_yes == u3_ca_is_pom(dog) ) { + if ( c3y == u3_ca_is_pom(dog) ) { u3_cs_cell* old_u = u3_ca_to_ptr(dog); c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); u3_noun new = u3_ca_de_twin(dog, new_w); @@ -676,17 +676,17 @@ static u3_noun _me_copy_south(u3_noun); static u3_noun _me_copy_south_in(u3_noun som) { - c3_assert(u3_none != som); - if ( u3_so(u3_ca_is_cat(som)) ) { + c3_assert(c3nne != som); + if ( _(u3_ca_is_cat(som)) ) { return som; } else { u3_noun dog = som; - if ( u3_so(u3_ca_south_is_senior(u3R, dog)) ) { + if ( _(u3_ca_south_is_senior(u3R, dog)) ) { return dog; } - else if ( u3_so(u3_ca_south_is_junior(u3R, dog)) ) { + else if ( _(u3_ca_south_is_junior(u3R, dog)) ) { return _me_copy_south(dog); } else { @@ -700,10 +700,10 @@ _me_copy_south_in(u3_noun som) static u3_noun _me_copy_south(u3_noun dog) { - c3_assert(u3_yes == u3_ca_south_is_junior(u3R, dog)); + c3_assert(c3y == u3_ca_south_is_junior(u3R, dog)); - if ( u3_ne(u3_ca_south_is_junior(u3R, dog)) ) { - if ( u3_ne(u3_ca_south_is_senior(u3R, dog)) ) { + if ( !_(u3_ca_south_is_junior(u3R, dog)) ) { + if ( !_(u3_ca_south_is_senior(u3R, dog)) ) { _me_gain_use(dog); } return dog; @@ -718,13 +718,13 @@ _me_copy_south(u3_noun dog) // printf("south: %p is already %p\r\n", dog_u, u3_ca_to_ptr(nov)); - c3_assert(u3_so(u3_ca_south_is_normal(u3R, nov))); + c3_assert(_(u3_ca_south_is_normal(u3R, nov))); _me_gain_use(nov); return nov; } else { - if ( u3_yes == u3_ca_is_pom(dog) ) { + if ( c3y == u3_ca_is_pom(dog) ) { u3_cs_cell* old_u = u3_ca_to_ptr(dog); c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); u3_noun new = u3_ca_de_twin(dog, new_w); @@ -775,12 +775,12 @@ _me_copy_south(u3_noun dog) static u3_noun _me_take_north(u3_noun dog) { - if ( u3_yes == u3_ca_north_is_senior(u3R, dog) ) { + if ( c3y == u3_ca_north_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; } - else if ( u3_yes == u3_ca_north_is_junior(u3R, dog) ) { + else if ( c3y == u3_ca_north_is_junior(u3R, dog) ) { /* junior pointers are copied */ u3_noun mos = _me_copy_north(dog); @@ -801,12 +801,12 @@ _me_take_north(u3_noun dog) static u3_noun _me_take_south(u3_noun dog) { - if ( u3_yes == u3_ca_south_is_senior(u3R, dog) ) { + if ( c3y == u3_ca_south_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; } - else if ( u3_yes == u3_ca_south_is_junior(u3R, dog) ) { + else if ( c3y == u3_ca_south_is_junior(u3R, dog) ) { /* junior pointers are copied */ u3_noun mos = _me_copy_south(dog); @@ -827,13 +827,13 @@ _me_take_south(u3_noun dog) u3_noun u3_ca_take(u3_noun som) { - c3_assert(u3_none != som); + c3_assert(c3nne != som); - if ( u3_so(u3_ca_is_cat(som)) ) { + if ( _(u3_ca_is_cat(som)) ) { return som; } else { - return u3_so(u3_ca_is_north(u3R)) + return _(u3_ca_is_north(u3R)) ? _me_take_north(som) : _me_take_south(som); } @@ -844,15 +844,15 @@ u3_ca_take(u3_noun som) c3_o u3_ca_left(u3_noun som) { - if ( u3_so(u3_ca_is_cat(som)) || - u3_ne(u3_ca_is_junior(u3R, som)) ) + if ( _(u3_ca_is_cat(som)) || + !_(u3_ca_is_junior(u3R, som)) ) { - return u3_yes; + return c3y; } else { u3_cs_noun* dog_u = u3_ca_to_ptr(som); - return u3_say(0 != (dog_u->mug_w >> 31)); + return __(0 != (dog_u->mug_w >> 31)); } } @@ -861,7 +861,7 @@ u3_ca_left(u3_noun som) static u3_noun _me_gain_north(u3_noun dog) { - if ( u3_yes == u3_ca_north_is_senior(u3R, dog) ) { + if ( c3y == u3_ca_north_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; @@ -869,7 +869,7 @@ _me_gain_north(u3_noun dog) else { /* junior nouns are disallowed */ - c3_assert(u3_ne(u3_ca_north_is_junior(u3R, dog))); + c3_assert(!_(u3_ca_north_is_junior(u3R, dog))); /* normal pointers are refcounted */ @@ -883,7 +883,7 @@ _me_gain_north(u3_noun dog) static u3_noun _me_gain_south(u3_noun dog) { - if ( u3_yes == u3_ca_south_is_senior(u3R, dog) ) { + if ( c3y == u3_ca_south_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; @@ -891,7 +891,7 @@ _me_gain_south(u3_noun dog) else { /* junior nouns are disallowed */ - c3_assert(u3_ne(u3_ca_south_is_junior(u3R, dog))); + c3_assert(!_(u3_ca_south_is_junior(u3R, dog))); /* normal nouns are refcounted */ @@ -906,7 +906,7 @@ static void _me_lose_north(u3_noun dog) { top: - if ( u3_yes == u3_ca_north_is_normal(u3R, dog) ) { + if ( c3y == u3_ca_north_is_normal(u3R, dog) ) { c3_w* dog_w = u3_ca_to_ptr(dog); u3_cs_box* box_u = u3_ca_botox(dog_w); @@ -918,16 +918,16 @@ top: u3_cm_bail(c3__foul); } else { - if ( u3_so(u3_ca_is_pom(dog)) ) { + if ( _(u3_ca_is_pom(dog)) ) { u3_cs_cell* dog_u = (void *)dog_w; u3_noun h_dog = dog_u->hed; u3_noun t_dog = dog_u->tel; - if ( u3_ne(u3_ca_is_cat(h_dog)) ) { + if ( !_(u3_ca_is_cat(h_dog)) ) { _me_lose_north(h_dog); } u3_ca_free(dog_w); - if ( u3_ne(u3_ca_is_cat(t_dog)) ) { + if ( !_(u3_ca_is_cat(t_dog)) ) { dog = t_dog; goto top; } @@ -946,7 +946,7 @@ static void _me_lose_south(u3_noun dog) { top: - if ( u3_yes == u3_ca_south_is_normal(u3R, dog) ) { + if ( c3y == u3_ca_south_is_normal(u3R, dog) ) { c3_w* dog_w = u3_ca_to_ptr(dog); u3_cs_box* box_u = u3_ca_botox(dog_w); @@ -958,16 +958,16 @@ top: u3_cm_bail(c3__foul); } else { - if ( u3_so(u3_ca_is_pom(dog)) ) { + if ( _(u3_ca_is_pom(dog)) ) { u3_cs_cell* dog_u = (void *)dog_w; u3_noun h_dog = dog_u->hed; u3_noun t_dog = dog_u->tel; - if ( u3_ne(u3_ca_is_cat(h_dog)) ) { + if ( !_(u3_ca_is_cat(h_dog)) ) { _me_lose_south(h_dog); } u3_ca_free(dog_w); - if ( u3_ne(u3_ca_is_cat(t_dog)) ) { + if ( !_(u3_ca_is_cat(t_dog)) ) { dog = t_dog; goto top; } @@ -985,13 +985,13 @@ top: u3_noun u3_ca_gain(u3_noun som) { - c3_assert(u3_none != som); + c3_assert(c3nne != som); - if ( u3_so(u3_ca_is_cat(som)) ) { + if ( _(u3_ca_is_cat(som)) ) { return som; } else { - return u3_so(u3_ca_is_north(u3R)) + return _(u3_ca_is_north(u3R)) ? _me_gain_north(som) : _me_gain_south(som); } @@ -1002,8 +1002,8 @@ u3_ca_gain(u3_noun som) void u3_ca_lose(u3_noun som) { - if ( u3_ne(u3_ca_is_cat(som)) ) { - if ( u3_so(u3_ca_is_north(u3R)) ) { + if ( !_(u3_ca_is_cat(som)) ) { + if ( _(u3_ca_is_north(u3R)) ) { _me_lose_north(som); } else { _me_lose_south(som); @@ -1016,7 +1016,7 @@ u3_ca_lose(u3_noun som) c3_w u3_ca_use(u3_noun som) { - if ( u3_so(u3_ca_is_cat(som)) ) { + if ( _(u3_ca_is_cat(som)) ) { return 1; } else { @@ -1032,7 +1032,7 @@ u3_ca_use(u3_noun som) c3_w u3_ca_mark_ptr(void* ptr_v) { - if ( u3_so(u3_ca_is_north(u3R)) ) { + if ( _(u3_ca_is_north(u3R)) ) { if ( !((ptr_v >= u3_ca_into(u3R->rut_p)) && (ptr_v < u3_ca_into(u3R->hat_p))) ) { @@ -1091,7 +1091,7 @@ u3_ca_mark_noun(u3_noun som) c3_w siz_w = 0; while ( 1 ) { - if ( u3_so(u3_ca_is_senior(u3R, som)) ) { + if ( _(u3_ca_is_senior(u3R, som)) ) { return siz_w; } else { @@ -1103,7 +1103,7 @@ u3_ca_mark_noun(u3_noun som) } else { siz_w += new_w; - if ( u3_so(u3du(som)) ) { + if ( _(u3du(som)) ) { siz_w += u3_ca_mark_noun(u3h(som)); som = u3t(som); } @@ -1155,7 +1155,7 @@ u3_ca_sweep(c3_c* cap_c) c3_w fre_w = 0; c3_w i_w; - end_w = u3_so(u3_ca_is_north(u3R)) + end_w = _(u3_ca_is_north(u3R)) ? (u3R->hat_p - u3R->rut_p) : (u3R->rut_p - u3R->hat_p); @@ -1176,8 +1176,8 @@ u3_ca_sweep(c3_c* cap_c) */ pos_w = leq_w = weq_w = 0; { - u3_post box_p = u3_so(u3_ca_is_north(u3R)) ? u3R->rut_p : u3R->hat_p; - u3_post end_p = u3_so(u3_ca_is_north(u3R)) ? u3R->hat_p : u3R->rut_p; + u3_post box_p = _(u3_ca_is_north(u3R)) ? u3R->rut_p : u3R->hat_p; + u3_post end_p = _(u3_ca_is_north(u3R)) ? u3R->hat_p : u3R->rut_p; c3_w* box_w = u3_ca_into(box_p); c3_w* end_w = u3_ca_into(end_p); @@ -1239,10 +1239,10 @@ u3_ca_sweep(c3_c* cap_c) } } - tot_w = u3_so(u3_ca_is_north(u3R)) + tot_w = _(u3_ca_is_north(u3R)) ? u3R->mat_p - u3R->rut_p : u3R->rut_p - u3R->mat_p; - caf_w = u3_so(u3_ca_is_north(u3R)) + caf_w = _(u3_ca_is_north(u3R)) ? u3R->mat_p - u3R->cap_p : u3R->cap_p - u3R->mat_p; @@ -1319,7 +1319,7 @@ u3_ca_moot(c3_w* sal_w) c3_assert(0 != las_w); if ( 1 == len_w ) { - if ( u3_so(u3_ca_is_cat(las_w)) ) { + if ( _(u3_ca_is_cat(las_w)) ) { u3_ca_free(nov_w); return las_w; @@ -1338,7 +1338,7 @@ _ca_detect(u3p(u3_ch_root) har_p, u3_noun fum, u3_noun som, c3_d axe_d) if ( som == fum ) { return axe_d; } - else if ( u3_ne(u3du(fum)) || (u3_none != u3_ch_get(har_p, fum)) ) { + else if ( !_(u3du(fum)) || (c3nne != u3_ch_get(har_p, fum)) ) { return 0; } else { @@ -1347,7 +1347,7 @@ _ca_detect(u3p(u3_ch_root) har_p, u3_noun fum, u3_noun som, c3_d axe_d) u3_ch_put(har_p, fum, 0); if ( 0 != (eax_d = _ca_detect(har_p, u3h(fum), som, 2ULL * axe_d)) ) { - return u3_yes; + return c3y; } else { fum = u3t(fum); @@ -1392,7 +1392,7 @@ u3_ca_mint(c3_w* sal_w, c3_w len_w) else if ( len_w == 1 ) { c3_w low_w = nov_u->buf_w[0]; - if ( u3_so(u3_ca_is_cat(low_w)) ) { + if ( _(u3_ca_is_cat(low_w)) ) { u3_ca_free(nov_w); return low_w; diff --git a/g/e.c b/g/e.c index 300d231f23..82632ca782 100644 --- a/g/e.c +++ b/g/e.c @@ -112,7 +112,7 @@ u3_ce_fault(void* adr_v, c3_i ser_i) static c3_o _ce_image_open(u3_cs_image* img_u, c3_o nuu_o) { - c3_i mod_i = u3_so(nuu_o) ? (O_RDWR | O_CREAT) : O_RDWR; + c3_i mod_i = _(nuu_o) ? (O_RDWR | O_CREAT) : O_RDWR; c3_c ful_c[8193]; snprintf(ful_c, 8192, "%s", u3P.cpu_c); @@ -127,7 +127,7 @@ _ce_image_open(u3_cs_image* img_u, c3_o nuu_o) snprintf(ful_c, 8192, "%s/.urb/chk/%s.bin", u3P.cpu_c, img_u->nam_c); if ( -1 == (img_u->fid_i = open(ful_c, mod_i, 0666)) ) { perror(ful_c); - return u3_no; + return c3n; } else { struct stat buf_u; @@ -135,29 +135,29 @@ _ce_image_open(u3_cs_image* img_u, c3_o nuu_o) if ( -1 == fstat(img_u->fid_i, &buf_u) ) { perror(ful_c); c3_assert(0); - return u3_no; + return c3n; } else { c3_d siz_d = buf_u.st_size; c3_d pgs_d = (siz_d + (c3_d)((1 << (u3_cc_page + 2)) - 1)) >> (c3_d)(u3_cc_page + 2); - if ( u3_yes == nuu_o ) { + if ( c3y == nuu_o ) { if ( siz_d ) { c3_assert(0); - return u3_no; + return c3n; } - return u3_yes; + return c3y; } else { if ( siz_d != (pgs_d << (c3_d)(u3_cc_page + 2)) ) { fprintf(stderr, "%s: corrupt size %llx\r\n", ful_c, siz_d); - return u3_no; + return c3n; } img_u->pgs_w = (c3_w) pgs_d; c3_assert(pgs_d == (c3_d)img_u->pgs_w); - return u3_yes; + return c3y; } } } @@ -189,7 +189,7 @@ _ce_patch_read_control(u3_cs_patch* pat_u) if ( -1 == fstat(pat_u->ctl_i, &buf_u) ) { c3_assert(0); - return u3_no; + return c3n; } len_w = (c3_w) buf_u.st_size; } @@ -201,9 +201,9 @@ _ce_patch_read_control(u3_cs_patch* pat_u) { free(pat_u->con_u); pat_u->con_u = 0; - return u3_no; + return c3n; } - return u3_yes; + return c3y; } /* _ce_patch_create(): create patch files. @@ -259,12 +259,12 @@ _ce_patch_verify(u3_cs_patch* pat_u) if ( -1 == lseek(pat_u->mem_i, (i_w << (u3_cc_page + 2)), SEEK_SET) ) { perror("seek"); c3_assert(0); - return u3_no; + return c3n; } if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3_cc_page + 2))) ) { perror("read"); c3_assert(0); - return u3_no; + return c3n; } { c3_w nug_w = u3_cr_mug_words(mem_w, (1 << u3_cc_page)); @@ -273,7 +273,7 @@ _ce_patch_verify(u3_cs_patch* pat_u) printf("_ce_patch_verify: mug mismatch %d/%d; (%x, %x)\r\n", pag_w, i_w, mug_w, nug_w); c3_assert(0); - return u3_no; + return c3n; } #if 0 else { @@ -282,7 +282,7 @@ _ce_patch_verify(u3_cs_patch* pat_u) #endif } } - return u3_yes; + return c3y; } /* _ce_patch_free(): free a patch. @@ -328,7 +328,7 @@ _ce_patch_open(void) pat_u->mem_i = mem_i; pat_u->con_u = 0; - if ( u3_no == _ce_patch_read_control(pat_u) ) { + if ( c3n == _ce_patch_read_control(pat_u) ) { close(pat_u->ctl_i); close(pat_u->mem_i); free(pat_u); @@ -336,7 +336,7 @@ _ce_patch_open(void) _ce_patch_delete(); return 0; } - if ( u3_no == _ce_patch_verify(pat_u) ) { + if ( c3n == _ce_patch_verify(pat_u) ) { _ce_patch_free(pat_u); _ce_patch_delete(); return 0; @@ -837,7 +837,7 @@ u3_ce_init(c3_o chk_o) map_v = mmap((void *)u3_Loom, len_w, - u3_so(chk_o) ? PROT_READ : (PROT_READ | PROT_WRITE), + _(chk_o) ? PROT_READ : (PROT_READ | PROT_WRITE), (MAP_ANON | MAP_FIXED | MAP_PRIVATE), -1, 0); @@ -862,7 +862,7 @@ u3_ce_init(c3_o chk_o) /* u3_ce_grab(): garbage-collect the world, plus extra roots, then */ void -u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with u3_none +u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with c3nne { // u3_ch_free(u3R->cax.har_p); // u3R->cax.har_p = u3_ch_new(); @@ -875,10 +875,10 @@ u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with u3_none va_start(vap, som); - if ( som != u3_none ) { + if ( som != c3nne ) { u3_ca_mark_noun(som); - while ( u3_none != (tur = va_arg(vap, u3_noun)) ) { + while ( c3nne != (tur = va_arg(vap, u3_noun)) ) { u3_ca_mark_noun(tur); } } @@ -900,9 +900,9 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) /* Open and apply any patches. */ - if ( u3_so(nuu_o) ) { - if ( (u3_no == _ce_image_open(&u3P.nor_u, u3_yes)) || - (u3_no == _ce_image_open(&u3P.sou_u, u3_yes)) ) + if ( _(nuu_o) ) { + if ( (c3n == _ce_image_open(&u3P.nor_u, c3y)) || + (c3n == _ce_image_open(&u3P.sou_u, c3y)) ) { printf("boot: image failed\r\n"); exit(1); @@ -914,8 +914,8 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) /* Open image files. */ { - if ( (u3_no == _ce_image_open(&u3P.nor_u, u3_no)) || - (u3_no == _ce_image_open(&u3P.sou_u, u3_no)) ) + if ( (c3n == _ce_image_open(&u3P.nor_u, c3n)) || + (c3n == _ce_image_open(&u3P.sou_u, c3n)) ) { fprintf(stderr, "boot: no image\r\n"); exit(1); @@ -960,7 +960,7 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) */ if ( (0 == u3P.nor_u.pgs_w) && (0 == u3P.sou_u.pgs_w) ) { printf("logical boot\r\n"); - nuu_o = u3_yes; + nuu_o = c3y; } } @@ -974,7 +974,7 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) /* Install the kernel. */ - if ( u3_so(nuu_o) ) { + if ( _(nuu_o) ) { c3_c pas_c[2049]; struct stat buf_u; diff --git a/g/h.c b/g/h.c index 426816cfbe..f094d11601 100644 --- a/g/h.c +++ b/g/h.c @@ -50,7 +50,7 @@ _ch_buck_add(u3_ch_buck* hab_u, u3_noun kev) c3_w i_w; for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { - if ( u3_yes == u3_cr_sing(u3h(kev), u3h(hab_u->kev[i_w])) ) { + if ( c3y == u3_cr_sing(u3h(kev), u3h(hab_u->kev[i_w])) ) { u3_ca_lose(hab_u->kev[i_w]); hab_u->kev[i_w] = kev; @@ -104,7 +104,7 @@ _ch_node_add(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun kev) if ( map_w & (1 << bit_w) ) { c3_w sot_w = han_u->sot_w[inx_w]; - if ( u3_so(u3_ch_slot_is_node(sot_w)) ) { + if ( _(u3_ch_slot_is_node(sot_w)) ) { void* hav_v = u3_ch_slot_to_node(sot_w); hav_v = _ch_some_add(hav_v, lef_w, rem_w, kev); @@ -115,7 +115,7 @@ _ch_node_add(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun kev) else { u3_noun kov = u3_ch_slot_to_noun(sot_w); - if ( u3_yes == u3_cr_sing(u3h(kev), u3h(kov)) ) { + if ( c3y == u3_cr_sing(u3h(kev), u3h(kov)) ) { u3_ca_lose(kov); han_u->sot_w[inx_w] = u3_ch_noun_to_slot(kev); return han_u; @@ -193,13 +193,13 @@ u3_ch_put(u3p(u3_ch_root) har_p, u3_noun key, u3_noun val) c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w sot_w = har_u->sot_w[inx_w]; - if ( u3_so(u3_ch_slot_is_null(sot_w)) ) { + if ( _(u3_ch_slot_is_null(sot_w)) ) { har_u->sot_w[inx_w] = u3_ch_noun_to_slot(kev); } else { u3_ch_node* han_u; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kov = u3_ch_slot_to_noun(sot_w); c3_w rom_w = u3_cr_mug(u3h(kov)) & ((1 << 25) - 1); @@ -223,10 +223,10 @@ _ch_buck_hum(u3_ch_buck* hab_u, c3_w mug_w) for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { if ( mug_w == u3_cr_mug(u3h(hab_u->kev[i_w])) ) { - return u3_yes; + return c3y; } } - return u3_no; + return c3n; } /* _ch_node_hum(): read in node. @@ -242,20 +242,20 @@ _ch_node_hum(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, c3_w mug_w) map_w = han_u->map_w; if ( !(map_w & (1 << bit_w)) ) { - return u3_no; + return c3n; } else { c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); c3_w sot_w = han_u->sot_w[inx_w]; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); if ( mug_w == u3_cr_mug(u3h(kev)) ) { - return u3_yes; + return c3y; } else { - return u3_no; + return c3n; } } else { @@ -281,17 +281,17 @@ u3_ch_hum(u3p(u3_ch_root) har_p, c3_w mug_w) c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w sot_w = har_u->sot_w[inx_w]; - if ( u3_so(u3_ch_slot_is_null(sot_w)) ) { - return u3_no; + if ( _(u3_ch_slot_is_null(sot_w)) ) { + return c3n; } - else if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + else if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); if ( mug_w == u3_cr_mug(u3h(kev)) ) { - return u3_yes; + return c3y; } else { - return u3_no; + return c3n; } } else { @@ -309,11 +309,11 @@ _ch_buck_get(u3_ch_buck* hab_u, u3_noun key) c3_w i_w; for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { - if ( u3_so(u3_cr_sing(key, u3h(hab_u->kev[i_w]))) ) { + if ( _(u3_cr_sing(key, u3h(hab_u->kev[i_w]))) ) { return u3_ca_gain(u3t(hab_u->kev[i_w])); } } - return u3_none; + return c3nne; } /* _ch_node_get(): read in node. @@ -329,20 +329,20 @@ _ch_node_get(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) map_w = han_u->map_w; if ( !(map_w & (1 << bit_w)) ) { - return u3_none; + return c3nne; } else { c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); c3_w sot_w = han_u->sot_w[inx_w]; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); - if ( u3_so(u3_cr_sing(key, u3h(kev))) ) { + if ( _(u3_cr_sing(key, u3h(kev))) ) { return u3_ca_gain(u3t(kev)); } else { - return u3_none; + return c3nne; } } else { @@ -369,18 +369,18 @@ u3_ch_get(u3p(u3_ch_root) har_p, u3_noun key) c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w sot_w = har_u->sot_w[inx_w]; - if ( u3_so(u3_ch_slot_is_null(sot_w)) ) { - return u3_none; + if ( _(u3_ch_slot_is_null(sot_w)) ) { + return c3nne; } - else if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + else if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); - if ( u3_so(u3_cr_sing(key, u3h(kev))) ) { + if ( _(u3_cr_sing(key, u3h(kev))) ) { har_u->sot_w[inx_w] = u3_ch_noun_be_warm(sot_w); return u3_ca_gain(u3t(kev)); } else { - return u3_none; + return c3nne; } } else { @@ -398,11 +398,11 @@ _ch_buck_gut(u3_ch_buck* hab_u, u3_noun key) c3_w i_w; for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { - if ( u3_so(u3_cr_sung(key, u3h(hab_u->kev[i_w]))) ) { + if ( _(u3_cr_sung(key, u3h(hab_u->kev[i_w]))) ) { return u3_ca_gain(u3t(hab_u->kev[i_w])); } } - return u3_none; + return c3nne; } /* _ch_node_gut(): read in node, unifying key nouns. @@ -418,20 +418,20 @@ _ch_node_gut(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) map_w = han_u->map_w; if ( !(map_w & (1 << bit_w)) ) { - return u3_none; + return c3nne; } else { c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); c3_w sot_w = han_u->sot_w[inx_w]; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); - if ( u3_so(u3_cr_sung(key, u3h(kev))) ) { + if ( _(u3_cr_sung(key, u3h(kev))) ) { return u3_ca_gain(u3t(kev)); } else { - return u3_none; + return c3nne; } } else { @@ -458,18 +458,18 @@ u3_ch_gut(u3p(u3_ch_root) har_p, u3_noun key) c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w sot_w = har_u->sot_w[inx_w]; - if ( u3_so(u3_ch_slot_is_null(sot_w)) ) { - return u3_none; + if ( _(u3_ch_slot_is_null(sot_w)) ) { + return c3nne; } - else if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + else if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); - if ( u3_so(u3_cr_sung(key, u3h(kev))) ) { + if ( _(u3_cr_sung(key, u3h(kev))) ) { har_u->sot_w[inx_w] = u3_ch_noun_be_warm(sot_w); return u3_ca_gain(u3t(kev)); } else { - return u3_none; + return c3nne; } } else { @@ -505,7 +505,7 @@ _ch_free_node(u3_ch_node* han_u, c3_w lef_w) for ( i_w = 0; i_w < len_w; i_w++ ) { c3_w sot_w = han_u->sot_w[i_w]; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_ca_lose(kev); @@ -534,12 +534,12 @@ u3_ch_free(u3p(u3_ch_root) har_p) for ( i_w = 0; i_w < 64; i_w++ ) { c3_w sot_w = har_u->sot_w[i_w]; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_ca_lose(kev); } - else if ( u3_so(u3_ch_slot_is_node(sot_w)) ) { + else if ( _(u3_ch_slot_is_node(sot_w)) ) { u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); _ch_free_node(han_u, 25); @@ -573,7 +573,7 @@ _ch_walk_node(u3_ch_node* han_u, c3_w lef_w, void (*fun_f)(u3_noun)) for ( i_w = 0; i_w < len_w; i_w++ ) { c3_w sot_w = han_u->sot_w[i_w]; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); fun_f(kev); @@ -601,12 +601,12 @@ u3_ch_walk(u3p(u3_ch_root) har_p, void (*fun_f)(u3_noun)) for ( i_w = 0; i_w < 64; i_w++ ) { c3_w sot_w = har_u->sot_w[i_w]; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); fun_f(kev); } - else if ( u3_so(u3_ch_slot_is_node(sot_w)) ) { + else if ( _(u3_ch_slot_is_node(sot_w)) ) { u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); _ch_walk_node(han_u, 25, fun_f); @@ -641,7 +641,7 @@ _ch_mark_node(u3_ch_node* han_u, c3_w lef_w) for ( i_w = 0; i_w < len_w; i_w++ ) { c3_w sot_w = han_u->sot_w[i_w]; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_ca_mark_noun(kev); @@ -670,12 +670,12 @@ u3_ch_mark(u3p(u3_ch_root) har_p) for ( i_w = 0; i_w < 64; i_w++ ) { c3_w sot_w = har_u->sot_w[i_w]; - if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { + if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_ca_mark_noun(kev); } - else if ( u3_so(u3_ch_slot_is_node(sot_w)) ) { + else if ( _(u3_ch_slot_is_node(sot_w)) ) { u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); _ch_mark_node(han_u, 25); diff --git a/g/i.c b/g/i.c index d3e2cfaf20..8473723d20 100644 --- a/g/i.c +++ b/g/i.c @@ -168,9 +168,9 @@ u3_ci_mp(mpz_t a_mp) u3_noun u3_ci_vint(u3_noun a) { - c3_assert(u3_none != a); + c3_assert(c3nne != a); - if ( u3_so(u3_ca_is_cat(a)) ) { + if ( _(u3_ca_is_cat(a)) ) { c3_w vin_w = (a + 1); if ( a == 0x7fffffff ) { @@ -178,7 +178,7 @@ u3_ci_vint(u3_noun a) } else return vin_w; } - else if ( u3_so(u3_ca_is_cell(a)) ) { + else if ( _(u3_ca_is_cell(a)) ) { return u3_cm_bail(c3__exit); } else { @@ -199,11 +199,11 @@ u3_ci_vint(u3_noun a) u3_noun u3_ci_cell(u3_noun a, u3_noun b) { - c3_assert(u3_none != a); - c3_assert(u3_none != b); + c3_assert(c3nne != a); + c3_assert(c3nne != b); - c3_assert(u3_ne(u3_ca_is_junior(u3R, a))); - c3_assert(u3_ne(u3_ca_is_junior(u3R, b))); + c3_assert(!_(u3_ca_is_junior(u3R, a))); + c3_assert(!_(u3_ca_is_junior(u3R, b))); { c3_w* nov_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); @@ -292,7 +292,7 @@ u3_ci_heximal(u3_noun a); /* u3_ci_list(): ** -** Generate a null-terminated list, with `u3_none` as terminator. +** Generate a null-terminated list, with `c3nne` as terminator. */ u3_noun u3_ci_list(u3_weak one, ...); @@ -342,7 +342,7 @@ u3_ci_list(u3_weak one, ...); else { c3_w cut_w = _molt_cut(len_w, pms_m); - if ( u3_no == u3_ca_is_cell(som) ) { + if ( c3n == u3_ca_is_cell(som) ) { return u3_cm_bail(c3__exit); } else { diff --git a/g/j.c b/g/j.c index 07bfbfd65e..01815dd192 100644 --- a/g/j.c +++ b/g/j.c @@ -49,13 +49,13 @@ _cj_axis(u3_noun fol) { u3_noun p_fol, q_fol, r_fol; - while ( u3_so(u3du(fol)) && (10 == u3h(fol)) ) + while ( _(u3du(fol)) && (10 == u3h(fol)) ) { fol = u3t(u3t(fol)); } - if ( u3_ne(u3_cr_trel(fol, &p_fol, &q_fol, &r_fol)) ) { - if ( u3_ne(u3_cr_cell(fol, &p_fol, &q_fol)) || + if ( !_(u3_cr_trel(fol, &p_fol, &q_fol, &r_fol)) ) { + if ( !_(u3_cr_cell(fol, &p_fol, &q_fol)) || (0 != p_fol) || - (u3_ne(u3_ca_is_cat(q_fol))) ) + (!_(u3_ca_is_cat(q_fol))) ) { fprintf(stderr, "axis: bad a\r\n"); return 0; @@ -65,9 +65,9 @@ _cj_axis(u3_noun fol) else { if ( 9 != p_fol ) { fprintf(stderr, "axis: bad b\r\n"); return 0; } - if ( u3_ne(u3_ca_is_cat(q_fol)) ) + if ( !_(u3_ca_is_cat(q_fol)) ) { fprintf(stderr, "axis: bad c\r\n"); return 0; } - if ( u3_ne(u3du(r_fol)) || (0 != u3h(r_fol)) || (1 != u3t(r_fol)) ) + if ( !_(u3du(r_fol)) || (0 != u3h(r_fol)) || (1 != u3t(r_fol)) ) { fprintf(stderr, "axis: bad d\r\n"); return 0; } return q_fol; @@ -80,7 +80,7 @@ static u3_weak _cj_by_gut(u3_noun a, u3_noun b) { if ( u3_nul == a ) { - return u3_none; + return c3nne; } else { u3_noun l_a, n_a, r_a; @@ -89,11 +89,11 @@ _cj_by_gut(u3_noun a, u3_noun b) u3_cx_trel(a, &n_a, &l_a, &r_a); u3_cx_cell(n_a, &pn_a, &qn_a); { - if ( (u3_yes == u3_cr_sing(b, pn_a)) ) { + if ( (c3y == u3_cr_sing(b, pn_a)) ) { return qn_a; } else { - if ( u3_yes == u3_cqc_gor(b, pn_a) ) { + if ( c3y == u3_cqc_gor(b, pn_a) ) { return _cj_by_gut(l_a, b); } else return _cj_by_gut(r_a, b); @@ -107,14 +107,14 @@ _cj_by_gut(u3_noun a, u3_noun b) static c3_c* _cj_chum(u3_noun chu) { - if ( u3_so(u3ud(chu)) ) { + if ( _(u3ud(chu)) ) { return u3_cr_string(chu); } else { u3_noun h_chu = u3h(chu); u3_noun t_chu = u3t(chu); - if ( u3_ne(u3_ca_is_cat(t_chu)) ) { + if ( !_(u3_ca_is_cat(t_chu)) ) { return 0; } else { c3_c* h_chu_c = u3_cr_string(h_chu); @@ -139,39 +139,39 @@ _cj_je_fsck(u3_noun clu) c3_c* nam_c; c3_l axe_l; - if ( u3_no == u3_cr_trel(clu, &p_clu, &q_clu, &r_clu) ) { - u3z(clu); return u3_none; + if ( c3n == u3_cr_trel(clu, &p_clu, &q_clu, &r_clu) ) { + u3z(clu); return c3nne; } if ( 0 == (nam_c = _cj_chum(p_clu)) ) { - u3z(clu); return u3_none; + u3z(clu); return c3nne; } - while ( u3_so(u3du(q_clu)) && (10 == u3h(q_clu)) ) { + while ( _(u3du(q_clu)) && (10 == u3h(q_clu)) ) { q_clu = u3t(u3t(q_clu)); } - if ( u3_ne(u3du(q_clu)) ) { - u3z(clu); free(nam_c); return u3_none; + if ( !_(u3du(q_clu)) ) { + u3z(clu); free(nam_c); return c3nne; } if ( (1 == u3h(q_clu)) && (0 == u3t(q_clu)) ) { axe_l = 0; } else { - if ( (0 != u3h(q_clu)) || u3_ne(u3_ca_is_cat(axe_l = u3t(q_clu))) ) { - u3z(clu); free(nam_c); return u3_none; + if ( (0 != u3h(q_clu)) || !_(u3_ca_is_cat(axe_l = u3t(q_clu))) ) { + u3z(clu); free(nam_c); return c3nne; } } { huk = 0; - while ( u3_so(u3du(r_clu)) ) { + while ( _(u3du(r_clu)) ) { u3_noun ir_clu, tr_clu, pir_clu, qir_clu; - if ( (u3_no == u3_cr_cell(r_clu, &ir_clu, &tr_clu)) || - (u3_no == u3_cr_cell(ir_clu, &pir_clu, &qir_clu)) || - (u3_no == u3ud(pir_clu)) ) + if ( (c3n == u3_cr_cell(r_clu, &ir_clu, &tr_clu)) || + (c3n == u3_cr_cell(ir_clu, &pir_clu, &qir_clu)) || + (c3n == u3ud(pir_clu)) ) { - u3z(huk); u3z(clu); free(nam_c); return u3_none; + u3z(huk); u3z(clu); free(nam_c); return c3nne; } huk = u3_ckdb_put(huk, u3k(pir_clu), u3k(qir_clu)); r_clu = tr_clu; @@ -204,14 +204,14 @@ _cj_cold_find_sys(u3_noun bat) while ( 1 ) { u3_noun pro = _cj_by_gut(u3h(rod_u->jed.das), bat); - if ( pro != u3_none ) { + if ( pro != c3nne ) { return pro; } if ( !rod_u->par_u ) break; rod_u = rod_u->par_u; } - return u3_none; + return c3nne; } /* _cj_cold_mine(): in cold mode, declare a core. RETAINS. @@ -229,27 +229,27 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) u3_noun mop; if ( 0 == q_cey ) { - mop = u3nq(u3k(p_cey), 3, u3_no, u3k(bat)); + mop = u3nq(u3k(p_cey), 3, c3n, u3k(bat)); } else { u3_weak rah = u3_cr_at(q_cey, cor); - if ( (u3_none == rah) || u3_ne(u3du(rah)) ) { + if ( (c3nne == rah) || !_(u3du(rah)) ) { fprintf(stderr, "fund: %s is bogus\r\n", u3_cr_string(p_cey)); - return u3_none; + return c3nne; } else { u3_noun soh = _cj_cold_find_sys(u3h(rah)); - if ( u3_none == soh ) { + if ( c3nne == soh ) { fprintf(stderr, "fund: in %s, parent %x not found at %d\r\n", u3_cr_string(p_cey), u3_cr_mug(u3h(rah)), q_cey); - return u3_none; + return c3nne; } else { - mop = u3nq(u3k(p_cey), u3k(q_cey), u3_yes, u3k(soh)); + mop = u3nq(u3k(p_cey), u3k(q_cey), c3y, u3k(soh)); } } } @@ -261,7 +261,7 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) u3_noun hoe = u3_ckdb_get(u3k(u3t(u3R->jed.das)), u3k(soh)); u3_noun sab; - if ( u3_none == hoe ) { + if ( c3nne == hoe ) { sab = u3nt(u3nc(u3k(bat), u3k(r_cey)), u3_nul, u3_nul); } else { @@ -286,7 +286,7 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) } } -/* _cj_warm_fend(): in warm state, return u3_none or calx. RETAINS. +/* _cj_warm_fend(): in warm state, return c3nne or calx. RETAINS. */ u3_weak _cj_warm_fend(u3_noun bat) @@ -296,14 +296,14 @@ _cj_warm_fend(u3_noun bat) while ( 1 ) { u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat); - if ( u3_none != jaw ) { + if ( c3nne != jaw ) { return jaw; } if ( rod_u->par_u ) { rod_u = rod_u->par_u; } - else return u3_none; + else return c3nne; } } @@ -339,7 +339,7 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc) u3_noun nam = u3_ci_string(jet_u->fcs_c); u3_noun fol = u3_ckdb_get(u3k(huc), nam); - if ( u3_none == fol ) { + if ( c3nne == fol ) { fprintf(stderr, "jets: activate: bad fcs %s\r\n", jet_u->fcs_c); } else { @@ -379,7 +379,7 @@ _cj_boil_mean(c3_l par_l, u3_noun mop, u3_noun bat) u3_cs_core* cop_u; while ( (cop_u = &dev_u[i_l])->cos_c ) { - if ( u3_so(u3_cr_sing_c(cop_u->cos_c, u3h(mop))) ) { + if ( _(u3_cr_sing_c(cop_u->cos_c, u3h(mop))) ) { #if 0 fprintf(stderr, "boil: bound jet %d/%s/%s/%x\r\n", cop_u->jax_l, @@ -409,7 +409,7 @@ _cj_boil_mine(u3_noun mop, u3_noun cor) // Calculate parent axis. // - if ( u3_yes == hr_mop ) { + if ( c3y == hr_mop ) { u3_noun cax = _cj_warm_fend(u3h(u3_cr_at(q_mop, cor))); par_l = u3h(cax); @@ -468,7 +468,7 @@ _cj_warm_ream_un(u3_noun soh) u3_noun cax; c3_l jax_l; - if ( u3_none != (cax = u3_ch_get(u3R->jed.har_p, u3h(u3h(sab)))) ) { + if ( c3nne != (cax = u3_ch_get(u3R->jed.har_p, u3h(u3h(sab)))) ) { jax_l = u3h(cax); u3z(cax); } @@ -493,7 +493,7 @@ _cj_warm_ream_at(u3_noun soh, u3_noun cag) { c3_l par_l, jax_l; - if ( u3_yes == hr_mop ) { + if ( c3y == hr_mop ) { par_l = _cj_warm_ream_un(tr_mop); } else par_l = 0; @@ -552,10 +552,10 @@ _cj_warm_mine(u3_noun clu, u3_noun cor) u3_noun bat = u3h(cor); u3_noun cax; - if ( u3_ne(u3du(cor)) ) { + if ( !_(u3du(cor)) ) { u3z(clu); } - else if ( u3_none != (cax = _cj_warm_fend(bat)) ) { + else if ( c3nne != (cax = _cj_warm_fend(bat)) ) { u3z(cax); u3z(clu); } else { @@ -563,12 +563,12 @@ _cj_warm_mine(u3_noun clu, u3_noun cor) // fprintf(stderr, "warm_mine %s\r\n", u3_cr_string(u3h(cey))); - if ( u3_none != cey ) { + if ( c3nne != cey ) { u3_noun huc = u3t(u3t(cey)); u3_noun pax = u3h(u3t(cey)); u3_noun mop; - if ( u3_none != (mop = _cj_cold_mine(cey, cor)) ) { + if ( c3nne != (mop = _cj_cold_mine(cey, cor)) ) { c3_l jax_l = _cj_boil_mine(mop, cor); // fprintf(stderr, "warm: bat %x\r\n", u3_cr_mug(bat)); @@ -613,7 +613,7 @@ _cj_find(u3_noun bat) while ( 1 ) { u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat); - if ( u3_none != jaw ) { + if ( c3nne != jaw ) { u3_assure(u3_ca_is_cat(u3h(jaw))); #if 0 @@ -651,7 +651,7 @@ _cj_soft(u3_noun cor, u3_noun axe) extern int SLAY; -/* _cj_kick_z(): try to kick by jet. If no kick, produce u3_none. +/* _cj_kick_z(): try to kick by jet. If no kick, produce c3nne. ** ** `cor` is RETAINED iff there is no kick, TRANSFERRED if one. ** `axe` is RETAINED. @@ -660,17 +660,17 @@ static u3_weak _cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe) { if ( 0 == ham_u->fun_f ) { - return u3_none; + return c3nne; } - if ( u3_ne(ham_u->liv) ) { - return u3_none; + if ( !_(ham_u->liv) ) { + return c3nne; } else { - if ( u3_so(ham_u->ice) ) { + if ( _(ham_u->ice) ) { u3_weak pro = ham_u->fun_f(cor); - if ( u3_none != pro ) { + if ( c3nne != pro ) { u3z(cor); return pro; } @@ -678,19 +678,19 @@ _cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe) else { u3_weak pro, ame; - ham_u->ice = u3_yes; + ham_u->ice = c3y; pro = ham_u->fun_f(u3k(cor)); - ham_u->ice = u3_no; + ham_u->ice = c3n; - if ( u3_none == pro ) { + if ( c3nne == pro ) { u3z(cor); return pro; } - ham_u->liv = u3_no; + ham_u->liv = c3n; ame = _cj_soft(cor, axe); - ham_u->liv = u3_yes; + ham_u->liv = c3y; - if ( u3_no == u3_cr_sing(ame, pro) ) { + if ( c3n == u3_cr_sing(ame, pro) ) { fprintf(stderr, "test: %s %s: mismatch: good %x, bad %x\r\n", cop_u->cos_c, (!strcmp(".2", ham_u->fcs_c)) ? "$" : ham_u->fcs_c, @@ -708,7 +708,7 @@ _cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe) #endif } } - return u3_none; + return c3nne; } } @@ -721,11 +721,11 @@ _cj_hook_in(u3_noun cor, { u3_noun bat = u3h(cor); - if ( u3_ne(u3du(cor)) ) { return u3_cm_bail(c3__fail); } + if ( !_(u3du(cor)) ) { return u3_cm_bail(c3__fail); } { u3_weak cax = _cj_warm_fend(bat); - if ( u3_none == cax ) { return u3_cm_bail(c3__fail); } + if ( c3nne == cax ) { return u3_cm_bail(c3__fail); } { u3_noun jax, pax, huc, hap; @@ -735,7 +735,7 @@ _cj_hook_in(u3_noun cor, u3_cs_core* cop_u = &u3D.ray_u[jax_l]; u3_noun fol = u3_ckdb_get(u3k(huc), u3_ci_string(tam_c)); - if ( u3_none == fol ) { + if ( c3nne == fol ) { // The caller wants a deeper core. // if ( 0 == pax ) { return u3_cm_bail(c3__fail); } @@ -752,9 +752,9 @@ _cj_hook_in(u3_noun cor, c3_l inx_l; if ( (0 == axe_l) || - (u3_no == jet_o) || - (u3_none == (inx_l = u3_ckdb_get(u3k(hap), axe_l))) || - (u3_none == (pro = _cj_kick_z(cor, + (c3n == jet_o) || + (c3nne == (inx_l = u3_ckdb_get(u3k(hap), axe_l))) || + (c3nne == (pro = _cj_kick_z(cor, cop_u, &cop_u->arm_u[inx_l], axe_l))) ) @@ -788,7 +788,7 @@ u3_cj_soft(u3_noun cor, { u3_noun pro; - pro = _cj_hook_in(cor, tam_c, u3_no); + pro = _cj_hook_in(cor, tam_c, c3n); return pro; } @@ -800,7 +800,7 @@ u3_cj_hook(u3_noun cor, { u3_noun pro; - pro = _cj_hook_in(cor, tam_c, u3_yes); + pro = _cj_hook_in(cor, tam_c, c3y); return pro; } @@ -812,18 +812,18 @@ u3_cj_hook(u3_noun cor, u3_weak u3_cj_kick(u3_noun cor, u3_noun axe) { - if ( u3_ne(u3du(cor)) ) { return u3_none; } + if ( !_(u3du(cor)) ) { return c3nne; } { u3_noun bat = u3h(cor); u3_weak cax = _cj_warm_fend(bat); - if ( u3_none == cax ) { return u3_none; } + if ( c3nne == cax ) { return c3nne; } { u3_noun hap = u3h(u3t(u3t(cax))); u3_noun inx = u3_ckdb_get(u3k(hap), u3k(axe)); - if ( u3_none == inx ) { - u3z(cax); return u3_none; + if ( c3nne == inx ) { + u3z(cax); return c3nne; } else { c3_l jax_l = u3h(cax); @@ -849,7 +849,7 @@ u3_cj_kink(u3_noun cor, { u3_weak pro = u3_cj_kick(cor, axe); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { return u3_cn_nock_on(cor, u3nq(9, axe, 0, 1)); @@ -907,7 +907,7 @@ _cj_cold_reap_to(u3_noun sab, u3_noun bas) // If the battery is not junior, or if it has been // already collected for the product, promote it. // - if ( u3_so(u3_ca_left(pn_sab)) ) { + if ( _(u3_ca_left(pn_sab)) ) { u3_noun bat = u3_ca_take(pn_sab); bas = u3_ckdb_put(bas, bat, u3_ca_take(qn_sab)); @@ -965,7 +965,7 @@ _cj_warm_reap(u3_noun kev) u3_noun bat = u3h(kev); u3_noun cax = u3t(kev); - if ( u3_so(u3_ca_left(bat)) ) { + if ( _(u3_ca_left(bat)) ) { u3_noun tab = u3_ca_take(bat); u3_noun xac = u3_ca_take(cax); #if 0 diff --git a/g/m.c b/g/m.c index b21074acca..a500e4366b 100644 --- a/g/m.c +++ b/g/m.c @@ -367,7 +367,7 @@ u3_cm_mark(void) void u3_cm_boot(c3_o nuu_o, c3_o bug_o) { - if ( u3_yes == nuu_o ) { + if ( c3y == nuu_o ) { u3H = (void *)_boot_north(u3_Loom + 1, c3_wiseof(u3_cs_home), u3_cc_words - 1); @@ -382,7 +382,7 @@ u3_cm_boot(c3_o nuu_o, c3_o bug_o) u3R = &u3H->rod_u; } - if ( u3_so(bug_o) ) { + if ( _(bug_o) ) { u3R->how.fag_w |= u3_cs_flag_debug; } } @@ -405,7 +405,7 @@ u3_cm_dump(void) c3_w fre_w = 0; c3_w i_w; - hat_w = u3_so(u3_ca_is_north(u3R)) ? u3R->hat_w - u3R->rut_w + hat_w = _(u3_ca_is_north(u3R)) ? u3R->hat_w - u3R->rut_w : u3R->rut_w - u3R->hat_w; for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) { @@ -420,10 +420,10 @@ u3_cm_dump(void) hat_w, fre_w, (hat_w - fre_w)); if ( 0 != (hat_w - fre_w) ) { - c3_w* box_w = u3_so(u3_ca_is_north(u3R)) ? u3R->rut_w : u3R->hat_w; + c3_w* box_w = _(u3_ca_is_north(u3R)) ? u3R->rut_w : u3R->hat_w; c3_w mem_w = 0; - while ( box_w < (u3_so(u3_ca_is_north(u3R)) ? u3R->hat_w : u3R->rut_w) ) { + while ( box_w < (_(u3_ca_is_north(u3R)) ? u3R->hat_w : u3R->rut_w) ) { u3_cs_box* box_u = (void *)box_w; if ( 0 != box_u->use_w ) { @@ -478,7 +478,7 @@ u3_cm_bail(u3_noun how) /* Printf some metadata. */ if ( c3__exit != how ) { - if ( u3_so(u3ud(how)) ) { + if ( _(u3ud(how)) ) { c3_c str_c[5]; str_c[0] = ((how >> 0) & 0xff); @@ -489,7 +489,7 @@ u3_cm_bail(u3_noun how) fprintf(stderr, "bail: %s\r\n", str_c); } else { - c3_assert(u3_so(u3ud(u3h(how)))); + c3_assert(_(u3ud(u3h(how)))); fprintf(stderr, "bail: %d\r\n", u3h(how)); u3_cm_p("bail", u3t(how)); @@ -505,14 +505,14 @@ u3_cm_bail(u3_noun how) // choice but to use the signal process; and we require the flat // form of how. // - c3_assert(u3_so(u3_ca_is_cat(how))); + c3_assert(_(u3_ca_is_cat(how))); u3_cm_signal(how); } /* Reconstruct a correct error ball. */ { - if ( u3_so(u3ud(how)) ) { + if ( _(u3ud(how)) ) { switch ( how ) { case c3__exit: { how = u3nc(2, u3R->bug.tax); @@ -574,7 +574,7 @@ u3_cm_leap(c3_w pad_w) { u3p(c3_w) bot_p; - if ( u3_yes == u3_ca_is_north(u3R) ) { + if ( c3y == u3_ca_is_north(u3R) ) { bot_p = (u3R->cap_p - len_w); u3R->cap_p -= len_w; @@ -628,9 +628,9 @@ u3_cm_fall() #if 0 fprintf(stderr, "fall: from %s %p, to %s %p (cap %p, was %p)\r\n", - u3_so(u3_ca_is_north(u3R)) ? "north" : "south", + _(u3_ca_is_north(u3R)) ? "north" : "south", u3R, - u3_so(u3_ca_is_north(u3R)) ? "north" : "south", + _(u3_ca_is_north(u3R)) ? "north" : "south", u3R->par_u, u3R->hat_w, u3R->rut_w); @@ -682,7 +682,7 @@ u3_cm_love(u3_noun pro) c3_w u3_cm_golf(void) { - if ( u3_yes == u3_ca_is_north(u3R) ) { + if ( c3y == u3_ca_is_north(u3R) ) { return u3R->mat_p - u3R->cap_p; } else { @@ -697,7 +697,7 @@ u3_cm_flog(c3_w gof_w) { // Enable memsets in case of memory corruption. // - if ( u3_yes == u3_ca_is_north(u3R) ) { + if ( c3y == u3_ca_is_north(u3R) ) { u3_post bot_p = (u3R->mat_p - gof_w); // c3_w len_w = (bot_w - u3R->cap_w); @@ -761,7 +761,7 @@ u3_cm_soft_top(c3_w sec_w, // timer seconds /* Make sure the inner routine did not create garbage. */ if ( u3R->how.fag_w & u3_cs_flag_debug ) { - u3_ce_grab("top", pro, u3_none); + u3_ce_grab("top", pro, c3nne); } /* Revert to external signal regime. @@ -798,7 +798,7 @@ u3_cm_soft_sure(u3_funk fun_f, u3_noun arg) { u3_noun pro, pru = u3_cm_soft_top(0, 32768, fun_f, arg); - c3_assert(u3_so(u3du(pru))); + c3_assert(_(u3du(pru))); pro = u3k(u3t(pru)); u3z(pru); @@ -842,7 +842,7 @@ u3_cm_soft_run(u3_noun fly, pro = fun_f(aga, agb); if ( u3R->how.fag_w & u3_cs_flag_debug ) { - u3_ce_grab("top", pro, u3_none); + u3_ce_grab("top", pro, c3nne); } /* Produce success, on the old road. @@ -853,7 +853,7 @@ u3_cm_soft_run(u3_noun fly, /* Produce - or fall again. */ { - c3_assert(u3_so(u3du(why))); + c3_assert(_(u3du(why))); switch ( u3h(why) ) { default: c3_assert(0); return 0; @@ -1005,9 +1005,9 @@ _cm_is_tas(u3_atom som, c3_w len_w) { continue; } - return u3_no; + return c3n; } - return u3_yes; + return c3y; } /* _cm_is_ta(): yes iff som (RETAIN) is @ta. @@ -1021,10 +1021,10 @@ _cm_is_ta(u3_noun som, c3_w len_w) c3_c c_c = u3_cr_byte(i_w, som); if ( (c_c < 32) || (c_c > 127) ) { - return u3_no; + return c3n; } } - return u3_yes; + return c3y; } /* _cm_hex(): hex byte. @@ -1041,24 +1041,24 @@ c3_y _cm_hex(c3_y c_y) static c3_w _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c) { - if ( u3_so(u3du(som)) ) { + if ( _(u3du(som)) ) { c3_w sel_w, one_w, two_w; sel_w = 0; - if ( u3_so(sel_o) ) { + if ( _(sel_o) ) { if ( str_c ) { *(str_c++) = '['; } sel_w += 1; } - one_w = _cm_in_pretty(u3h(som), u3_yes, str_c); + one_w = _cm_in_pretty(u3h(som), c3y, str_c); if ( str_c ) { str_c += one_w; *(str_c++) = ' '; } - two_w = _cm_in_pretty(u3t(som), u3_no, str_c); + two_w = _cm_in_pretty(u3t(som), c3n, str_c); if ( str_c ) { str_c += two_w; } - if ( u3_so(sel_o) ) { + if ( _(sel_o) ) { if ( str_c ) { *(str_c++) = ']'; } sel_w += 1; } @@ -1078,7 +1078,7 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c) else { c3_w len_w = u3_cr_met(3, som); - if ( u3_so(_cm_is_tas(som, len_w)) ) { + if ( _(_cm_is_tas(som, len_w)) ) { c3_w len_w = u3_cr_met(3, som); if ( str_c ) { @@ -1088,7 +1088,7 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c) } return len_w + 1; } - else if ( u3_so(_cm_is_ta(som, len_w)) ) { + else if ( _(_cm_is_ta(som, len_w)) ) { if ( str_c ) { *(str_c++) = '\''; u3_cr_bytes(0, len_w, (c3_y *)str_c, som); @@ -1133,10 +1133,10 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c) c3_c* u3_cm_pretty(u3_noun som) { - c3_w len_w = _cm_in_pretty(som, u3_yes, 0); + c3_w len_w = _cm_in_pretty(som, c3y, 0); c3_c* pre_c = malloc(len_w + 1); - _cm_in_pretty(som, u3_yes, pre_c); + _cm_in_pretty(som, c3y, pre_c); pre_c[len_w] = 0; return pre_c; } diff --git a/g/n.c b/g/n.c index bee6829a69..b58d14a54d 100644 --- a/g/n.c +++ b/g/n.c @@ -54,7 +54,7 @@ _cn_hint(u3_noun zep, case c3__germ: { u3_noun pro = u3_cn_nock_on(bus, nex); - if ( u3_yes == u3_cr_sing(pro, hod) ) { + if ( c3y == u3_cr_sing(pro, hod) ) { u3z(pro); return hod; } else { u3z(hod); return pro; @@ -76,7 +76,7 @@ _cn_hint(u3_noun zep, { u3_noun pro = u3_cz_find_2(c3__nock, bus, nex); - if ( pro != u3_none ) { + if ( pro != c3nne ) { u3z(bus); u3z(nex); return pro; } @@ -117,7 +117,7 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) u3R->pro.nox_d += 1; - if ( u3_yes == u3_cr_du(hib) ) { + if ( c3y == u3_cr_du(hib) ) { u3_noun poz, riv; poz = u3_cn_nock_on(u3k(bus), u3k(hib)); @@ -130,7 +130,7 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) default: return u3_cm_bail(c3__exit); case 0: { - if ( u3_no == u3_cr_ud(gal) ) { + if ( c3n == u3_cr_ud(gal) ) { return u3_cm_bail(c3__exit); } else { @@ -254,12 +254,12 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) u3_noun seb = u3_cn_nock_on(bus, u3k(c_gal)); u3_noun pro = u3_cj_kick(seb, b_gal); - if ( u3_none != pro ) { + if ( c3nne != pro ) { u3_ca_lose(fol); return pro; } else { - if ( u3_no == u3_cr_ud(b_gal) ) { + if ( c3n == u3_cr_ud(b_gal) ) { return u3_cm_bail(c3__exit); } else { @@ -282,7 +282,7 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) { u3_noun zep, hod, nex; - if ( u3_yes == u3_cr_du(p_gal) ) { + if ( c3y == u3_cr_du(p_gal) ) { u3_noun b_gal = u3h(p_gal); u3_noun c_gal = u3t(p_gal); u3_noun d_gal = q_gal; @@ -309,7 +309,7 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) u3_noun gof = u3_cn_nock_on(bus, u3k(gal)); u3_noun val = u3_cm_soft_esc(gof); - if ( u3_ne(u3du(val)) ) { + if ( !_(u3du(val)) ) { u3_cm_bail(u3nt(1, gof, 0)); } else { diff --git a/g/r.c b/g/r.c index 300dc45782..14b78db110 100644 --- a/g/r.c +++ b/g/r.c @@ -15,8 +15,8 @@ _frag_word(c3_w a_w, u3_noun b) c3_w dep_w = u3_ax_dep(a_w); while ( dep_w ) { - if ( u3_no == u3_ca_is_cell(b) ) { - return u3_none; + if ( c3n == u3_ca_is_cell(b) ) { + return c3nne; } else { u3_cs_cell* b_u = u3_ca_to_ptr(b); @@ -37,8 +37,8 @@ _frag_deep(c3_w a_w, u3_noun b) c3_w dep_w = 32; while ( dep_w ) { - if ( u3_no == u3_ca_is_cell(b) ) { - return u3_none; + if ( c3n == u3_ca_is_cell(b) ) { + return c3nne; } else { u3_cs_cell* b_u = u3_ca_to_ptr(b); @@ -52,25 +52,25 @@ _frag_deep(c3_w a_w, u3_noun b) /* u3_cr_at(): ** -** Return fragment (a) of (b), or u3_none if not applicable. +** Return fragment (a) of (b), or c3nne if not applicable. */ u3_weak u3_cr_at(u3_atom a, u3_noun b) { - c3_assert(u3_none != a); - c3_assert(u3_none != b); + c3_assert(c3nne != a); + c3_assert(c3nne != b); if ( 0 == a ) { - return u3_none; + return c3nne; } - if ( u3_so(u3_ca_is_cat(a)) ) { + if ( _(u3_ca_is_cat(a)) ) { return _frag_word(a, b); } else { - if ( u3_ne(u3_ca_is_pug(a)) ) { - return u3_none; + if ( !_(u3_ca_is_pug(a)) ) { + return c3nne; } else { u3_cs_atom* a_u = u3_ca_to_ptr(a); @@ -82,7 +82,7 @@ u3_cr_at(u3_atom a, while ( len_w ) { b = _frag_deep(a_u->buf_w[len_w - 1], b); - if ( u3_none == b ) { + if ( c3nne == b ) { return b; } else { len_w--; @@ -129,19 +129,19 @@ u3_cr_at(u3_atom a, struct _mean_pair* prs_m) { if ( len_w == 0 ) { - return u3_yes; + return c3y; } else if ( (len_w == 1) && (1 == prs_m[0].axe_w) ) { *prs_m->som = som; - return u3_yes; + return c3y; } else { - if ( u3_no == u3_ca_is_cell(som) ) { - return u3_no; + if ( c3n == u3_ca_is_cell(som) ) { + return c3n; } else { c3_w cut_w = _mean_cut(len_w, prs_m); - return u3_and + return c3a (_mean_extract(u3_ca_h(som), cut_w, prs_m), _mean_extract(u3_ca_t(som), (len_w - cut_w), (prs_m + cut_w))); } @@ -156,7 +156,7 @@ u3_cr_mean(u3_noun som, c3_w len_w; struct _mean_pair* prs_m; - c3_assert(u3_none != som); + c3_assert(c3nne != som); /* Count. */ @@ -382,9 +382,9 @@ _mug_words_buf(c3_w off_w, c3_w nwd_w, u3_noun veb) c3_w u3_cr_mug(u3_noun veb) { - c3_assert(u3_none != veb); + c3_assert(c3nne != veb); - if ( u3_so(u3_ca_is_cat(veb)) ) { + if ( _(u3_ca_is_cat(veb)) ) { c3_w x_w = veb; return _mug_words(2166136261, (veb ? 1 : 0), &x_w); @@ -395,7 +395,7 @@ u3_cr_mug(u3_noun veb) return veb_u->mug_w; } else { - if ( u3_so(u3_ca_is_cell(veb)) ) { + if ( _(u3_ca_is_cell(veb)) ) { u3_cs_cell* veb_u = u3_ca_to_ptr(veb); u3_noun hed = veb_u->hed; u3_noun tel = veb_u->tel; @@ -490,7 +490,7 @@ _sung_one(u3_noun* a, u3_noun* b) c3_o asr_o = u3_ca_is_senior(u3R, *a); c3_o bsr_o = u3_ca_is_senior(u3R, *b); - if ( u3_so(asr_o) && u3_so(bsr_o) ) { + if ( _(asr_o) && _(bsr_o) ) { // You shouldn't have let this happen. We don't want to // descend down to a lower road and free there, because // synchronization - though this could be revisited under @@ -498,11 +498,11 @@ _sung_one(u3_noun* a, u3_noun* b) // return; } - if ( u3_so(asr_o) && !u3_so(bsr_o) ){ + if ( _(asr_o) && !_(bsr_o) ){ u3z(*b); *b = *a; } - if ( u3_so(bsr_o) && !u3_so(asr_o) ) { + if ( _(bsr_o) && !_(asr_o) ) { u3z(*a); *a = *b; } @@ -537,17 +537,17 @@ static u3_bean _sung_x(u3_noun a, u3_noun b) { if ( a == b ) { - return u3_yes; + return c3y; } else { - if ( u3_so(u3_ca_is_atom(a)) ) { + if ( _(u3_ca_is_atom(a)) ) { u3_cs_atom* a_u = u3_ca_to_ptr(a); - if ( !u3_so(u3_ca_is_atom(b)) || - u3_so(u3_ca_is_cat(a)) || - u3_so(u3_ca_is_cat(b)) ) + if ( !_(u3_ca_is_atom(b)) || + _(u3_ca_is_cat(a)) || + _(u3_ca_is_cat(b)) ) { - return u3_no; + return c3n; } else { u3_cs_atom* b_u = u3_ca_to_ptr(b); @@ -556,31 +556,31 @@ _sung_x(u3_noun a, u3_noun b) b_u->mug_w && (a_u->mug_w != b_u->mug_w) ) { - return u3_no; + return c3n; } else { c3_w w_rez = a_u->len_w; c3_w w_mox = b_u->len_w; if ( w_rez != w_mox ) { - return u3_no; + return c3n; } else { c3_w i_w; for ( i_w = 0; i_w < w_rez; i_w++ ) { if ( a_u->buf_w[i_w] != b_u->buf_w[i_w] ) { - return u3_no; + return c3n; } } - return u3_yes; + return c3y; } } } } else { - if ( u3_so(u3_ca_is_atom(b)) ) { - return u3_no; + if ( _(u3_ca_is_atom(b)) ) { + return c3n; } else { u3_cs_cell* a_u = u3_ca_to_ptr(a); @@ -590,22 +590,22 @@ _sung_x(u3_noun a, u3_noun b) b_u->mug_w && (a_u->mug_w != b_u->mug_w) ) { - return u3_no; + return c3n; } else { - if ( u3_no == _sung_x(a_u->hed, b_u->hed) ) { - return u3_no; + if ( c3n == _sung_x(a_u->hed, b_u->hed) ) { + return c3n; } else { _sung_one(&a_u->hed, &b_u->hed); - if ( u3_no == _sung_x(a_u->tel, b_u->tel) ) { - return u3_no; + if ( c3n == _sung_x(a_u->tel, b_u->tel) ) { + return c3n; } else { _sung_one(&a_u->tel, &b_u->tel); - return u3_yes; + return c3y; } } } @@ -622,21 +622,21 @@ static u3_bean _sing_x(u3_noun a, u3_noun b) { - c3_assert(u3_none != a); - c3_assert(u3_none != b); + c3_assert(c3nne != a); + c3_assert(c3nne != b); if ( a == b ) { - return u3_yes; + return c3y; } else { - if ( u3_so(u3_ca_is_atom(a)) ) { + if ( _(u3_ca_is_atom(a)) ) { u3_cs_atom* a_u = u3_ca_to_ptr(a); - if ( !u3_so(u3_ca_is_atom(b)) || - u3_so(u3_ca_is_cat(a)) || - u3_so(u3_ca_is_cat(b)) ) + if ( !_(u3_ca_is_atom(b)) || + _(u3_ca_is_cat(a)) || + _(u3_ca_is_cat(b)) ) { - return u3_no; + return c3n; } else { u3_cs_atom* b_u = u3_ca_to_ptr(b); @@ -645,31 +645,31 @@ _sing_x(u3_noun a, b_u->mug_w && (a_u->mug_w != b_u->mug_w) ) { - return u3_no; + return c3n; } else { c3_w w_rez = a_u->len_w; c3_w w_mox = b_u->len_w; if ( w_rez != w_mox ) { - return u3_no; + return c3n; } else { c3_w i_w; for ( i_w = 0; i_w < w_rez; i_w++ ) { if ( a_u->buf_w[i_w] != b_u->buf_w[i_w] ) { - return u3_no; + return c3n; } } - return u3_yes; + return c3y; } } } } else { - if ( u3_so(u3_ca_is_atom(b)) ) { - return u3_no; + if ( _(u3_ca_is_atom(b)) ) { + return c3n; } else { u3_cs_cell* a_u = u3_ca_to_ptr(a); @@ -679,16 +679,16 @@ _sing_x(u3_noun a, b_u->mug_w && (a_u->mug_w != b_u->mug_w) ) { - return u3_no; + return c3n; } else { - if ( u3_no == _sing_x(u3_ca_h(a), u3_ca_h(b)) ) { - return u3_no; + if ( c3n == _sing_x(u3_ca_h(a), u3_ca_h(b)) ) { + return c3n; } - else if ( u3_no == _sing_x(u3_ca_t(a), u3_ca_t(b)) ) { - return u3_no; + else if ( c3n == _sing_x(u3_ca_t(a), u3_ca_t(b)) ) { + return c3n; } - return u3_yes; + return c3y; } } } @@ -719,7 +719,7 @@ u3_bean u3_cr_fing(u3_noun a, u3_noun b) { - return (a == b) ? u3_yes : u3_no; + return (a == b) ? c3y : c3n; } /* u3_cr_sing_cell(): @@ -731,8 +731,8 @@ u3_cr_sing_cell(u3_noun p, u3_noun q, u3_noun b) { - return u3_and(u3_so(u3_ca_is_cell(b)), - u3_and(u3_cr_sing(p, u3_ca_h(b)), + return c3a(_(u3_ca_is_cell(b)), + c3a(u3_cr_sing(p, u3_ca_h(b)), u3_cr_sing(q, u3_ca_t(b)))); } u3_bean @@ -740,8 +740,8 @@ u3_cr_fing_cell(u3_noun p, u3_noun q, u3_noun b) { - return u3_and(u3_so(u3_ca_is_cell(b)), - u3_and(u3_cr_fing(p, u3_ca_h(b)), + return c3a(_(u3_ca_is_cell(b)), + c3a(u3_cr_fing(p, u3_ca_h(b)), u3_cr_fing(q, u3_ca_t(b)))); } @@ -754,8 +754,8 @@ u3_cr_sing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) { - return u3_and(u3_so(u3_ca_is_cell(b)), - u3_and(u3_cr_sing_c(p_c, u3_ca_h(b)), + return c3a(_(u3_ca_is_cell(b)), + c3a(u3_cr_sing_c(p_c, u3_ca_h(b)), u3_cr_sing(q, u3_ca_t(b)))); } u3_bean @@ -763,8 +763,8 @@ u3_cr_fing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) { - return u3_and(u3_so(u3_ca_is_cell(b)), - u3_and(u3_cr_sing_c(p_c, u3_ca_h(b)), + return c3a(_(u3_ca_is_cell(b)), + c3a(u3_cr_sing_c(p_c, u3_ca_h(b)), u3_cr_fing(q, u3_ca_t(b)))); } @@ -778,8 +778,8 @@ u3_cr_sing_trel(u3_noun p, u3_noun r, u3_noun b) { - return u3_and(u3_so(u3_ca_is_cell(b)), - u3_and(u3_cr_sing(p, u3_ca_h(b)), + return c3a(_(u3_ca_is_cell(b)), + c3a(u3_cr_sing(p, u3_ca_h(b)), u3_cr_sing_cell(q, r, u3_ca_t(b)))); } u3_bean @@ -788,8 +788,8 @@ u3_cr_fing_trel(u3_noun p, u3_noun r, u3_noun b) { - return u3_and(u3_so(u3_ca_is_cell(b)), - u3_and(u3_cr_fing(p, u3_ca_h(b)), + return c3a(_(u3_ca_is_cell(b)), + c3a(u3_cr_fing(p, u3_ca_h(b)), u3_cr_fing_cell(q, r, u3_ca_t(b)))); } @@ -804,8 +804,8 @@ u3_cr_sing_qual(u3_noun p, u3_noun s, u3_noun b) { - return u3_and(u3_so(u3_ca_is_cell(b)), - u3_and(u3_cr_sing(p, u3_ca_h(b)), + return c3a(_(u3_ca_is_cell(b)), + c3a(u3_cr_sing(p, u3_ca_h(b)), u3_cr_sing_trel(q, r, s, u3_ca_t(b)))); } u3_bean @@ -815,8 +815,8 @@ u3_cr_fing_qual(u3_noun p, u3_noun s, u3_noun b) { - return u3_and(u3_so(u3_ca_is_cell(b)), - u3_and(u3_cr_fing(p, u3_ca_h(b)), + return c3a(_(u3_ca_is_cell(b)), + c3a(u3_cr_fing(p, u3_ca_h(b)), u3_cr_fing_trel(q, r, s, u3_ca_t(b)))); } @@ -828,24 +828,24 @@ u3_atom u3_cr_nord(u3_noun a, u3_noun b) { - c3_assert(u3_none != a); - c3_assert(u3_none != b); + c3_assert(c3nne != a); + c3_assert(c3nne != b); if ( a == b ) { return 1; } else { - if ( u3_so(u3_ca_is_atom(a)) ) { - if ( !u3_so(u3_ca_is_atom(b)) ) { + if ( _(u3_ca_is_atom(a)) ) { + if ( !_(u3_ca_is_atom(b)) ) { return 0; } else { - if ( u3_so(u3_ca_is_cat(a)) ) { - if ( u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(a)) ) { + if ( _(u3_ca_is_cat(b)) ) { return (a < b) ? 0 : 2; } else return 0; } - else if ( u3_so(u3_ca_is_cat(b)) ) { + else if ( _(u3_ca_is_cat(b)) ) { return 2; } else { @@ -874,7 +874,7 @@ u3_cr_nord(u3_noun a, } } } else { - if ( u3_so(u3_ca_is_atom(b)) ) { + if ( _(u3_ca_is_atom(b)) ) { return 2; } else { u3_atom c = u3_cr_nord(u3_ca_h(a), u3_ca_h(b)); @@ -897,24 +897,24 @@ u3_bean u3_cr_sing_c(const c3_c* a_c, u3_noun b) { - c3_assert(u3_none != b); + c3_assert(c3nne != b); - if ( !u3_so(u3_ca_is_atom(b)) ) { - return u3_no; + if ( !_(u3_ca_is_atom(b)) ) { + return c3n; } else { c3_w w_sof = strlen(a_c); c3_w i_w; if ( w_sof != u3_cr_met(3, b) ) { - return u3_no; + return c3n; } for ( i_w = 0; i_w < w_sof; i_w++ ) { if ( u3_cr_byte(i_w, b) != a_c[i_w] ) { - return u3_no; + return c3n; } } - return u3_yes; + return c3y; } } @@ -927,19 +927,19 @@ u3_cr_bush(u3_noun a, u3_noun* b, u3_noun* c) { - c3_assert(u3_none != a); + c3_assert(c3nne != a); - if ( u3_so(u3_ca_is_atom(a)) ) { - return u3_no; + if ( _(u3_ca_is_atom(a)) ) { + return c3n; } else { *b = u3_ca_h(a); - if ( u3_so(u3_ca_is_atom(*b)) ) { - return u3_no; + if ( _(u3_ca_is_atom(*b)) ) { + return c3n; } else { *c = u3_ca_t(a); - return u3_yes; + return c3y; } } } @@ -953,15 +953,15 @@ u3_cr_cell(u3_noun a, u3_noun* b, u3_noun* c) { - c3_assert(u3_none != a); + c3_assert(c3nne != a); - if ( u3_so(u3_ca_is_atom(a)) ) { - return u3_no; + if ( _(u3_ca_is_atom(a)) ) { + return c3n; } else { if ( b ) *b = u3_ca_h(a); if ( c ) *c = u3_ca_t(a); - return u3_yes; + return c3y; } } @@ -976,13 +976,13 @@ u3_cr_p(u3_noun a, { u3_noun feg, nux; - if ( (u3_yes == u3_cr_cell(a, &feg, &nux)) && - (u3_yes == u3_cr_sing(feg, b)) ) + if ( (c3y == u3_cr_cell(a, &feg, &nux)) && + (c3y == u3_cr_sing(feg, b)) ) { *c = nux; - return u3_yes; + return c3y; } - else return u3_no; + else return c3n; } /* u3_cr_pq(): @@ -997,12 +997,12 @@ u3_cr_pq(u3_noun a, { u3_noun nux; - if ( (u3_yes == u3_cr_p(a, b, &nux)) && - (u3_yes == u3_cr_cell(nux, c, d)) ) + if ( (c3y == u3_cr_p(a, b, &nux)) && + (c3y == u3_cr_cell(nux, c, d)) ) { - return u3_yes; + return c3y; } - else return u3_no; + else return c3n; } /* u3_cr_pqr(): @@ -1018,12 +1018,12 @@ u3_cr_pqr(u3_noun a, { u3_noun nux; - if ( (u3_yes == u3_cr_p(a, b, &nux)) && - (u3_yes == u3_cr_trel(nux, c, d, e)) ) + if ( (c3y == u3_cr_p(a, b, &nux)) && + (c3y == u3_cr_trel(nux, c, d, e)) ) { - return u3_yes; + return c3y; } - else return u3_no; + else return c3n; } /* u3_cr_pqrs(): @@ -1040,12 +1040,12 @@ u3_cr_pqrs(u3_noun a, { u3_noun nux; - if ( (u3_yes == u3_cr_p(a, b, &nux)) && - (u3_yes == u3_cr_qual(nux, c, d, e, f)) ) + if ( (c3y == u3_cr_p(a, b, &nux)) && + (c3y == u3_cr_qual(nux, c, d, e, f)) ) { - return u3_yes; + return c3y; } - else return u3_no; + else return c3n; } /* u3_cr_trel(): @@ -1060,12 +1060,12 @@ u3_cr_trel(u3_noun a, { u3_noun guf; - if ( (u3_yes == u3_cr_cell(a, b, &guf)) && - (u3_yes == u3_cr_cell(guf, c, d)) ) { - return u3_yes; + if ( (c3y == u3_cr_cell(a, b, &guf)) && + (c3y == u3_cr_cell(guf, c, d)) ) { + return c3y; } else { - return u3_no; + return c3n; } } @@ -1082,11 +1082,11 @@ u3_cr_qual(u3_noun a, { u3_noun guf; - if ( (u3_yes == u3_cr_cell(a, b, &guf)) && - (u3_yes == u3_cr_trel(guf, c, d, e)) ) { - return u3_yes; + if ( (c3y == u3_cr_cell(a, b, &guf)) && + (c3y == u3_cr_trel(guf, c, d, e)) ) { + return c3y; } - else return u3_no; + else return c3n; } /* u3_cr_quil(): @@ -1103,11 +1103,11 @@ u3_cr_quil(u3_noun a, { u3_noun guf; - if ( (u3_yes == u3_cr_cell(a, b, &guf)) && - (u3_yes == u3_cr_qual(guf, c, d, e, f)) ) { - return u3_yes; + if ( (c3y == u3_cr_cell(a, b, &guf)) && + (c3y == u3_cr_qual(guf, c, d, e, f)) ) { + return c3y; } - else return u3_no; + else return c3n; } /* u3_cr_hext(): @@ -1125,11 +1125,11 @@ u3_cr_hext(u3_noun a, { u3_noun guf; - if ( (u3_yes == u3_cr_cell(a, b, &guf)) && - (u3_yes == u3_cr_quil(guf, c, d, e, f, g)) ) { - return u3_yes; + if ( (c3y == u3_cr_cell(a, b, &guf)) && + (c3y == u3_cr_quil(guf, c, d, e, f, g)) ) { + return c3y; } - else return u3_no; + else return c3n; } /* u3_cr_met(): @@ -1143,8 +1143,8 @@ c3_w u3_cr_met(c3_y a_y, u3_atom b) { - c3_assert(u3_none != b); - c3_assert(u3_so(u3_ca_is_atom(b))); + c3_assert(c3nne != b); + c3_assert(_(u3_ca_is_atom(b))); if ( b == 0 ) { return 0; @@ -1156,7 +1156,7 @@ u3_cr_met(c3_y a_y, c3_w gal_w; c3_w daz_w; - if ( u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(b)) ) { gal_w = 0; daz_w = b; } @@ -1206,10 +1206,10 @@ c3_b u3_cr_bit(c3_w a_w, u3_atom b) { - c3_assert(u3_none != b); - c3_assert(u3_so(u3_ca_is_atom(b))); + c3_assert(c3nne != b); + c3_assert(_(u3_ca_is_atom(b))); - if ( u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(b)) ) { if ( a_w >= 31 ) { return 0; } @@ -1239,10 +1239,10 @@ c3_y u3_cr_byte(c3_w a_w, u3_atom b) { - c3_assert(u3_none != b); - c3_assert(u3_so(u3_ca_is_atom(b))); + c3_assert(c3nne != b); + c3_assert(_(u3_ca_is_atom(b))); - if ( u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(b)) ) { if ( a_w > 3 ) { return 0; } @@ -1276,7 +1276,7 @@ u3_cr_bytes(c3_w a_w, { c3_w i_w; - c3_assert(u3_none != d); + c3_assert(c3nne != d); /* Efficiency: don't call u3_cr_byte(). */ @@ -1293,10 +1293,10 @@ void u3_cr_mp(mpz_t a_mp, u3_atom b) { - c3_assert(u3_none != b); - c3_assert(u3_so(u3_ca_is_atom(b))); + c3_assert(c3nne != b); + c3_assert(_(u3_ca_is_atom(b))); - if ( u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(b)) ) { mpz_init_set_ui(a_mp, b); } else { @@ -1330,10 +1330,10 @@ c3_w u3_cr_word(c3_w a_w, u3_atom b) { - c3_assert(u3_none != b); - c3_assert(u3_so(u3_ca_is_atom(b))); + c3_assert(c3nne != b); + c3_assert(_(u3_ca_is_atom(b))); - if ( u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(b)) ) { if ( a_w > 0 ) { return 0; } @@ -1375,7 +1375,7 @@ u3_cr_words(c3_w a_w, { c3_w i_w; - c3_assert(u3_none != d); + c3_assert(c3nne != d); /* Efficiency: don't call u3_cr_word(). */ @@ -1402,10 +1402,10 @@ u3_cr_chop(c3_g met_g, c3_w len_w; c3_w* buf_w; - c3_assert(u3_none != src); - c3_assert(u3_so(u3_ca_is_atom(src))); + c3_assert(c3nne != src); + c3_assert(_(u3_ca_is_atom(src))); - if ( u3_so(u3_ca_is_cat(src)) ) { + if ( _(u3_ca_is_cat(src)) ) { len_w = src ? 1 : 0; buf_w = &src; } @@ -1481,11 +1481,11 @@ u3_cr_tape(u3_noun a) c3_w i_w; c3_y *a_y; - for ( i_w = 0, b=a; u3_yes == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) + for ( i_w = 0, b=a; c3y == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) ; a_y = c3_malloc(i_w + 1); - for ( i_w = 0, b=a; u3_yes == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) { + for ( i_w = 0, b=a; c3y == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) { a_y[i_w] = u3_ca_h(b); } a_y[i_w] = 0; diff --git a/g/t.c b/g/t.c index de3dcc7daf..2d50a15b03 100644 --- a/g/t.c +++ b/g/t.c @@ -25,7 +25,7 @@ u3_ct_mean(u3_noun roc) void u3_ct_drop(void) { - c3_assert(u3_so(u3du(u3R->bug.tax))); + c3_assert(_(u3du(u3R->bug.tax))); { u3_noun tax = u3R->bug.tax; @@ -42,7 +42,7 @@ u3_lo_tank(c3_l tab_l, u3_noun tac); void u3_ct_slog(u3_noun hod) { - if ( u3_yes == u3du(hod) ) { + if ( c3y == u3du(hod) ) { u3_noun pri = u3h(hod); switch ( pri ) { @@ -92,7 +92,7 @@ u3_ct_come(u3_atom cog) void u3_ct_flee(void) { - c3_assert(u3_so(u3du(u3R->pro.don))); + c3_assert(_(u3du(u3R->pro.don))); { u3_noun tax = u3R->bug.tax; diff --git a/g/v.c b/g/v.c index 0011037170..c8d19b8d87 100644 --- a/g/v.c +++ b/g/v.c @@ -105,7 +105,7 @@ u3_cv_wish(const c3_c* str_c) exp = u3_ckdb_get(u3k(u3A->yot), u3k(txt)); - if ( u3_none == exp ) { + if ( c3nne == exp ) { exp = _cv_nock_wish(u3k(txt)); u3A->yot = u3_ckdb_put(u3A->yot, u3k(txt), u3k(exp)); } @@ -161,8 +161,8 @@ u3_cv_nick(u3_noun vir, u3_noun cor) u3_noun pi_vir, qi_vir; u3_noun vix; - if ( (u3_yes == u3_cr_cell((i_vir=u3h(vir)), &pi_vir, &qi_vir)) && - (u3_yes == u3du(qi_vir)) && + if ( (c3y == u3_cr_cell((i_vir=u3h(vir)), &pi_vir, &qi_vir)) && + (c3y == u3du(qi_vir)) && (c3__hear == u3h(qi_vir)) ) { u3_noun gon; @@ -356,19 +356,19 @@ _cv_mole(u3_noun fot, u3_noun uco = u3_do("slay", san); u3_noun p_uco, q_uco, r_uco, s_uco; - if ( (u3_no == u3_cr_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || + if ( (c3n == u3_cr_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || (0 != p_uco) || (0 != q_uco) || - (u3_no == u3_sing(fot, r_uco)) ) + (c3n == u3_sing(fot, r_uco)) ) { uL(fprintf(uH, "strange mole %s\n", u3_cr_string(san))); - u3z(fot); u3z(uco); return u3_no; + u3z(fot); u3z(uco); return c3n; } else { *ato_d = u3_cr_chub(0, s_uco); - u3z(fot); u3z(uco); return u3_yes; + u3z(fot); u3z(uco); return c3y; } } @@ -379,15 +379,15 @@ _cv_lily(u3_noun fot, u3_noun txt, c3_l* tid_l) { c3_d ato_d; - if ( u3_no == _cv_mole(fot, txt, &ato_d) ) { - return u3_no; + if ( c3n == _cv_mole(fot, txt, &ato_d) ) { + return c3n; } else { if ( ato_d >= 0x80000000ULL ) { - return u3_no; + return c3n; } else { *tid_l = (c3_l) ato_d; - return u3_yes; + return c3y; } } } @@ -431,7 +431,7 @@ u3_cv_punt(u3_noun blu, c3_l tab_l, u3_noun tac) // We are calling nock here, but hopefully need no protection. // - while ( u3_yes == u3_cr_du(cat) ) { + while ( c3y == u3_cr_du(cat) ) { u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); u3_cm_wall(wol); diff --git a/g/x.c b/g/x.c index 91af5ed5da..2bb0797bc3 100644 --- a/g/x.c +++ b/g/x.c @@ -4,12 +4,12 @@ */ #include "all.h" -/* u3_cx_good(): test for u3_none. +/* u3_cx_good(): test for c3nne. */ u3_noun u3_cx_good(u3_weak som) { - if ( u3_none == som ) { + if ( c3nne == som ) { return u3_cm_bail(c3__exit); } else return som; @@ -22,7 +22,7 @@ u3_cx_at(u3_noun axe, u3_noun som) { u3_weak pro = u3_cr_at(axe, som); - if ( u3_none == pro ) { + if ( c3nne == pro ) { return u3_cm_bail(c3__exit); } else return pro; } @@ -36,7 +36,7 @@ u3_cx_cell(u3_noun a, u3_noun* b, u3_noun* c) { - if ( u3_no == u3_cr_cell(a, b, c) ) { + if ( c3n == u3_cr_cell(a, b, c) ) { u3_cm_bail(c3__exit); } } @@ -51,7 +51,7 @@ u3_cx_trel(u3_noun a, u3_noun* c, u3_noun* d) { - if ( u3_no == u3_cr_trel(a, b, c, d) ) { + if ( c3n == u3_cr_trel(a, b, c, d) ) { u3_cm_bail(c3__exit); } } @@ -67,7 +67,7 @@ u3_cx_qual(u3_noun a, u3_noun* d, u3_noun* e) { - if ( u3_no == u3_cr_qual(a, b, c, d, e) ) { + if ( c3n == u3_cr_qual(a, b, c, d, e) ) { u3_cm_bail(c3__exit); } } @@ -84,7 +84,7 @@ u3_cx_quil(u3_noun a, u3_noun* e, u3_noun* f) { - if ( u3_no == u3_cr_quil(a, b, c, d, e, f) ) { + if ( c3n == u3_cr_quil(a, b, c, d, e, f) ) { u3_cm_bail(c3__exit); } } diff --git a/g/z.c b/g/z.c index 6da8680f6d..962d88c99c 100644 --- a/g/z.c +++ b/g/z.c @@ -99,7 +99,7 @@ u3_cz_uniq(u3_noun som) u3_noun key = u3nc(c3__uniq, u3k(som)); u3_noun val = u3_ch_get(u3R->cax.har_p, key); - if ( u3_none != val ) { + if ( c3nne != val ) { u3z(key); u3z(som); return val; } else { diff --git a/include/c/defs.h b/include/c/defs.h index b323d8a7f3..1d78e791c6 100644 --- a/include/c/defs.h +++ b/include/c/defs.h @@ -7,10 +7,10 @@ # define c3y 0 # define c3n 1 -# define _(x) (c3y == (x)) -# define __(x) ((x) ? c3y : c3n) -# define c3a(x) __(_(x) && _(y)) -# define c3o(x)( __(_(x) || _(y)) +# define _(x) (c3y == (x)) +# define __(x) ((x) ? c3y : c3n) +# define c3a(x, y) __(_(x) && _(y)) +# define c3o(x, y) __(_(x) || _(y)) /** Random useful C macros. diff --git a/include/g/a.h b/include/g/a.h index 2b766af71d..8cbdc78872 100644 --- a/include/g/a.h +++ b/include/g/a.h @@ -34,9 +34,9 @@ */ typedef c3_w u3_noun; - /* u3_none - out-of-band noun. + /* c3nne - out-of-band noun. */ -# define u3_none (u3_noun)0xffffffff +# define c3nne (u3_noun)0xffffffff /* Informative typedefs. Use if you like. */ @@ -47,8 +47,8 @@ typedef u3_noun u3_trel; // must be triple typedef u3_noun u3_qual; // must be quadruple typedef u3_noun u3_quin; // must be quintuple - typedef u3_noun u3_bean; // loobean: 0 == u3_yes, 1 == u3_no - typedef u3_noun u3_weak; // may be u3_none + typedef u3_noun u3_bean; // loobean: 0 == c3y, 1 == c3n + typedef u3_noun u3_weak; // may be c3nne typedef u3_noun (*u3_funk)(u3_noun); typedef u3_noun (*u3_funq)(u3_noun, u3_noun); @@ -74,29 +74,29 @@ /* Inside a noun. */ -# define u3_ca_is_cat(som) (((som) >> 31) ? u3_no : u3_yes) -# define u3_ca_is_dog(som) (((som) >> 31) ? u3_yes : u3_no) +# define u3_ca_is_cat(som) (((som) >> 31) ? c3n : c3y) +# define u3_ca_is_dog(som) (((som) >> 31) ? c3y : c3n) -# define u3_ca_is_pug(som) ((2 == ((som) >> 30)) ? u3_yes : u3_no) -# define u3_ca_is_pom(som) ((3 == ((som) >> 30)) ? u3_yes : u3_no) +# define u3_ca_is_pug(som) ((2 == ((som) >> 30)) ? c3y : c3n) +# define u3_ca_is_pom(som) ((3 == ((som) >> 30)) ? c3y : c3n) # define u3_ca_to_off(som) ((som) & 0x3fffffff) # define u3_ca_to_ptr(som) (u3_ca_into(u3_ca_to_off(som))) # define u3_ca_to_wtr(som) ((c3_w *)u3_ca_to_ptr(som)) # define u3_ca_to_pug(off) (off | 0x80000000) # define u3_ca_to_pom(off) (off | 0xc0000000) -# define u3_ca_is_atom(som) u3_or(u3_ca_is_cat(som), \ +# define u3_ca_is_atom(som) c3o(u3_ca_is_cat(som), \ u3_ca_is_pug(som)) # define u3_ca_is_cell(som) u3_ca_is_pom(som) # define u3_ca_de_twin(dog, dog_w) ((dog & 0xc0000000) | u3_ca_outa(dog_w)) # define u3_ca_h(som) \ - ( u3_so(u3_ca_is_cell(som)) \ + ( _(u3_ca_is_cell(som)) \ ? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->hed )\ : u3_cm_bail(c3__exit) ) # define u3_ca_t(som) \ - ( u3_so(u3_ca_is_cell(som)) \ + ( _(u3_ca_is_cell(som)) \ ? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->tel )\ : u3_cm_bail(c3__exit) ) @@ -290,48 +290,48 @@ # define u3to(type, x) ((type *) u3_ca_into(x)) # define u3of(type, x) (u3_ca_outa((type *)x)) -# define u3_ca_is_north(r) ((r->cap_p > r->hat_p) ? u3_yes : u3_no) -# define u3_ca_is_south(r) ((u3_so(u3_ca_is_north(r))) ? u3_no : u3_yes) +# define u3_ca_is_north(r) __(r->cap_p > r->hat_p) +# define u3_ca_is_south(r) !u3_ca_is_north(r) -# define u3_ca_open(r) ( (u3_yes == u3_ca_is_north(r)) \ +# define u3_ca_open(r) ( (c3y == u3_ca_is_north(r)) \ ? (c3_w)(r->cap_p - r->hat_p) \ : (c3_w)(r->hat_p - r->cap_p) ) # define u3_ca_north_is_senior(r, dog) \ - u3_say((u3_ca_to_off(dog) < r->rut_p) || \ + __((u3_ca_to_off(dog) < r->rut_p) || \ (u3_ca_to_off(dog) >= r->mat_p)) # define u3_ca_north_is_junior(r, dog) \ - u3_say((u3_ca_to_off(dog) >= r->cap_p) && \ + __((u3_ca_to_off(dog) >= r->cap_p) && \ (u3_ca_to_off(dog) < r->mat_p)) # define u3_ca_north_is_normal(r, dog) \ - u3_and(u3_not(u3_ca_north_is_senior(r, dog)), \ - u3_not(u3_ca_north_is_junior(r, dog))) + c3a(!(u3_ca_north_is_senior(r, dog)), \ + !(u3_ca_north_is_junior(r, dog))) # define u3_ca_south_is_senior(r, dog) \ - u3_say((u3_ca_to_off(dog) < r->mat_p) || \ + __((u3_ca_to_off(dog) < r->mat_p) || \ (u3_ca_to_off(dog) >= r->rut_p)) # define u3_ca_south_is_junior(r, dog) \ - u3_say((u3_ca_to_off(dog) < r->cap_p) && \ + __((u3_ca_to_off(dog) < r->cap_p) && \ (u3_ca_to_off(dog) >= r->mat_p)) # define u3_ca_south_is_normal(r, dog) \ - u3_and(u3_not(u3_ca_south_is_senior(r, dog)), \ - u3_not(u3_ca_south_is_junior(r, dog))) + c3a(!(u3_ca_south_is_senior(r, dog)), \ + !(u3_ca_south_is_junior(r, dog))) # define u3_ca_is_junior(r, som) \ - ( u3_so(u3_ca_is_cat(som)) \ - ? u3_no \ - : u3_so(u3_ca_is_north(r)) \ + ( _(u3_ca_is_cat(som)) \ + ? c3n \ + : _(u3_ca_is_north(r)) \ ? u3_ca_north_is_junior(r, som) \ : u3_ca_south_is_junior(r, som) ) # define u3_ca_is_senior(r, som) \ - ( u3_so(u3_ca_is_cat(som)) \ - ? u3_yes \ - : u3_so(u3_ca_is_north(r)) \ + ( _(u3_ca_is_cat(som)) \ + ? c3y \ + : _(u3_ca_is_north(r)) \ ? u3_ca_north_is_senior(r, som) \ : u3_ca_south_is_senior(r, som) ) diff --git a/include/g/e.h b/include/g/e.h index 59bf16929e..d1dff05e55 100644 --- a/include/g/e.h +++ b/include/g/e.h @@ -81,7 +81,7 @@ /* u3_ce_grab(): garbage-collect the world, plus extra roots. */ void - u3_ce_grab(c3_c* cap_c, u3_noun som, ...); // terminate with u3_none + u3_ce_grab(c3_c* cap_c, u3_noun som, ...); // terminate with c3nne /* u3_ce_dirty(): count dirty pages. */ diff --git a/include/g/h.h b/include/g/h.h index 8aaf239321..14c8e512fd 100644 --- a/include/g/h.h +++ b/include/g/h.h @@ -62,10 +62,10 @@ ** u3_ch_slot_to_noun(): slot to cell ** u3_ch_noun_to_slot(): cell to slot */ -# define u3_ch_slot_is_null(sot) ((0 == ((sot) >> 30)) ? u3_yes : u3_no) -# define u3_ch_slot_is_node(sot) ((1 == ((sot) >> 30)) ? u3_yes : u3_no) -# define u3_ch_slot_is_noun(sot) ((1 == ((sot) >> 31)) ? u3_yes : u3_no) -# define u3_ch_slot_is_warm(sot) (((sot) & 0x40000000) ? u3_yes : u3_no) +# define u3_ch_slot_is_null(sot) ((0 == ((sot) >> 30)) ? c3y : c3n) +# define u3_ch_slot_is_node(sot) ((1 == ((sot) >> 30)) ? c3y : c3n) +# define u3_ch_slot_is_noun(sot) ((1 == ((sot) >> 31)) ? c3y : c3n) +# define u3_ch_slot_is_warm(sot) (((sot) & 0x40000000) ? c3y : c3n) # define u3_ch_slot_to_node(sot) (u3_ca_into((sot) & 0x3fffffff)) # define u3_ch_node_to_slot(ptr) (u3_ca_outa(ptr) | 0x40000000) # define u3_ch_slot_to_noun(sot) (0x40000000 | (sot)) diff --git a/include/g/j.h b/include/g/j.h index fc88627f78..e248b4e667 100644 --- a/include/g/j.h +++ b/include/g/j.h @@ -138,7 +138,7 @@ c3_l u3_cj_find(u3_noun bat); - /* u3_cj_kick(): try to kick by jet. If no kick, produce u3_none. + /* u3_cj_kick(): try to kick by jet. If no kick, produce c3nne. ** ** `axe` is RETAINED by the caller; `cor` is RETAINED iff there ** is no kick, TRANSFERRED if one. diff --git a/include/g/r.h b/include/g/r.h index d027476e46..15a44c64ea 100644 --- a/include/g/r.h +++ b/include/g/r.h @@ -8,18 +8,18 @@ # define u3_cr_du(a) u3_ca_is_cell(a) # define u3_cr_ud(a) u3_ca_is_atom(a) #else - /* u3_cr_du(): u3_yes iff `a` is cell. + /* u3_cr_du(): c3y iff `a` is cell. */ u3_bean u3_cr_du(u3_noun a); - /* u3_cr_ud(): u3_no iff `a` is cell. + /* u3_cr_ud(): c3n iff `a` is cell. */ u3_bean u3_cr_ud(u3_noun a); #endif - /* u3_cr_at(): fragment `a` of `b`, or u3_none. + /* u3_cr_at(): fragment `a` of `b`, or c3nne. */ u3_weak u3_cr_at(u3_atom a, diff --git a/include/g/x.h b/include/g/x.h index edd77d2021..ec014d4fbf 100644 --- a/include/g/x.h +++ b/include/g/x.h @@ -18,7 +18,7 @@ u3_noun u3_cx_t(u3_noun som); #endif - /* u3_cx_good(): test for u3_none. + /* u3_cx_good(): test for c3nne. */ u3_noun u3_cx_good(u3_weak som); diff --git a/j/1/add.c b/j/1/add.c index ec59306da5..537918a1bc 100644 --- a/j/1/add.c +++ b/j/1/add.c @@ -11,7 +11,7 @@ u3_cqa_add(u3_atom a, u3_atom b) { - if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { c3_w c = a + b; return u3_ci_words(1, &c); @@ -33,9 +33,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/1/dec.c b/j/1/dec.c index 5c45adabe3..7c59e55cd1 100644 --- a/j/1/dec.c +++ b/j/1/dec.c @@ -20,7 +20,7 @@ return u3_cm_error("decrement-underflow"); } else { - if ( u3_so(u3_ca_is_cat(a)) ) { + if ( _(u3_ca_is_cat(a)) ) { return a - 1; } else { @@ -38,8 +38,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || - (u3_no == u3ud(a)) ) + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/1/div.c b/j/1/div.c index ccfcd48881..d8e08aa5e8 100644 --- a/j/1/div.c +++ b/j/1/div.c @@ -15,7 +15,7 @@ return u3_cm_bail(c3__exit); } else { - if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { return a / b; } else { @@ -36,9 +36,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/1/gte.c b/j/1/gte.c index 741f92774b..4625c55e2e 100644 --- a/j/1/gte.c +++ b/j/1/gte.c @@ -10,8 +10,8 @@ u3_noun u3_cqa_gte(u3_atom a, u3_atom b) { - if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { - return u3_say(a >= b); + if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + return __(a >= b); } else { mpz_t a_mp, b_mp; @@ -20,7 +20,7 @@ u3_cr_mp(a_mp, a); u3_cr_mp(b_mp, b); - cmp = (mpz_cmp(a_mp, b_mp) >= 0) ? u3_yes : u3_no; + cmp = (mpz_cmp(a_mp, b_mp) >= 0) ? c3y : c3n; mpz_clear(a_mp); mpz_clear(b_mp); @@ -34,9 +34,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/1/gth.c b/j/1/gth.c index 801812d071..cc29b1549c 100644 --- a/j/1/gth.c +++ b/j/1/gth.c @@ -11,8 +11,8 @@ u3_cqa_gth(u3_atom a, u3_atom b) { - if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { - return u3_say(a > b); + if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + return __(a > b); } else { mpz_t a_mp, b_mp; @@ -21,7 +21,7 @@ u3_cr_mp(a_mp, a); u3_cr_mp(b_mp, b); - cmp = (mpz_cmp(a_mp, b_mp) > 0) ? u3_yes : u3_no; + cmp = (mpz_cmp(a_mp, b_mp) > 0) ? c3y : c3n; mpz_clear(a_mp); mpz_clear(b_mp); @@ -34,9 +34,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/1/lte.c b/j/1/lte.c index 08781eb12f..1dc46afb47 100644 --- a/j/1/lte.c +++ b/j/1/lte.c @@ -10,8 +10,8 @@ u3_noun u3_cqa_lte(u3_atom a, u3_atom b) { - if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { - return u3_say(a <= b); + if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + return __(a <= b); } else { mpz_t a_mp, b_mp; @@ -20,7 +20,7 @@ u3_cr_mp(a_mp, a); u3_cr_mp(b_mp, b); - cmp = (mpz_cmp(a_mp, b_mp) <= 0) ? u3_yes : u3_no; + cmp = (mpz_cmp(a_mp, b_mp) <= 0) ? c3y : c3n; mpz_clear(a_mp); mpz_clear(b_mp); @@ -33,9 +33,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/1/lth.c b/j/1/lth.c index 5e9fffe3bb..b4d5ab028a 100644 --- a/j/1/lth.c +++ b/j/1/lth.c @@ -11,8 +11,8 @@ u3_cqa_lth(u3_atom a, u3_atom b) { - if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { - return u3_say(a < b); + if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + return __(a < b); } else { mpz_t a_mp, b_mp; @@ -21,7 +21,7 @@ u3_cr_mp(a_mp, a); u3_cr_mp(b_mp, b); - cmp = (mpz_cmp(a_mp, b_mp) < 0) ? u3_yes : u3_no; + cmp = (mpz_cmp(a_mp, b_mp) < 0) ? c3y : c3n; mpz_clear(a_mp); mpz_clear(b_mp); @@ -34,9 +34,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/1/mod.c b/j/1/mod.c index 41c5c44c0b..7bc60053cb 100644 --- a/j/1/mod.c +++ b/j/1/mod.c @@ -32,9 +32,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/1/mul.c b/j/1/mul.c index a24146c935..41628b6afe 100644 --- a/j/1/mul.c +++ b/j/1/mul.c @@ -11,7 +11,7 @@ u3_cqa_mul(u3_atom a, u3_atom b) { - if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { c3_d c = ((c3_d) a) * ((c3_d) b); return u3_ci_chubs(1, &c); @@ -33,9 +33,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/1/sub.c b/j/1/sub.c index 5ebb7eda65..25d4151037 100644 --- a/j/1/sub.c +++ b/j/1/sub.c @@ -10,7 +10,7 @@ u3_noun u3_cqa_sub(u3_atom a, u3_atom b) { - if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { + if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { if ( a < b ) { return u3_cm_error("subtract-underflow"); } @@ -40,9 +40,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/2/bind.c b/j/2/bind.c index 318b0ce54a..5b0eaa2d27 100644 --- a/j/2/bind.c +++ b/j/2/bind.c @@ -24,7 +24,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_bind(a, b); diff --git a/j/2/clap.c b/j/2/clap.c index 41a20f9a55..e636186e1e 100644 --- a/j/2/clap.c +++ b/j/2/clap.c @@ -27,7 +27,7 @@ { u3_noun a, b, c; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_6, &b, u3_cv_sam_7, &c, 0) ) { return u3_cm_bail(c3__exit); diff --git a/j/2/drop.c b/j/2/drop.c index ddfa7348a1..3921f4c031 100644 --- a/j/2/drop.c +++ b/j/2/drop.c @@ -22,8 +22,8 @@ { u3_noun a; - if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_none; + if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) { + return c3nne; } else { return u3_cqb_drop(a); } diff --git a/j/2/flop.c b/j/2/flop.c index 79780606be..07bfb4191f 100644 --- a/j/2/flop.c +++ b/j/2/flop.c @@ -16,7 +16,7 @@ if ( u3_nul == a ) { return b; } - else if ( u3_no == u3du(a) ) { + else if ( c3n == u3du(a) ) { u3z(b); return u3_cm_bail(c3__exit); @@ -32,7 +32,7 @@ { u3_noun a; - if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_flop(a); diff --git a/j/2/lent.c b/j/2/lent.c index 397f72b4f3..f84e0c7347 100644 --- a/j/2/lent.c +++ b/j/2/lent.c @@ -16,7 +16,7 @@ if ( 0 == a ) { return len; } - else if ( u3_no == u3du(a) ) { + else if ( c3n == u3du(a) ) { u3z(len); return u3_cm_bail(c3__exit); } @@ -31,7 +31,7 @@ { u3_noun a; - if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_lent(a); diff --git a/j/2/levy.c b/j/2/levy.c index 089617eb0e..6caa4b9e1f 100644 --- a/j/2/levy.c +++ b/j/2/levy.c @@ -13,16 +13,16 @@ u3_noun b) { if ( 0 == a ) { - return u3_yes; + return c3y; } else { u3_noun loz; - if ( u3_no == u3du(a) ) { + if ( c3n == u3du(a) ) { return u3_cm_bail(c3__exit); } else switch ( (loz = u3_cn_slam_on(u3k(b), u3k(u3h(a)))) ) { - case u3_yes: return u3_cqb_levy(u3t(a), b); - case u3_no: return u3_no; + case c3y: return u3_cqb_levy(u3t(a), b); + case c3n: return c3n; default: u3z(loz); return u3_cm_bail(c3__exit); } @@ -34,7 +34,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_levy(a, b); diff --git a/j/2/lien.c b/j/2/lien.c index 912e129e3d..861de5e33d 100644 --- a/j/2/lien.c +++ b/j/2/lien.c @@ -12,16 +12,16 @@ u3_noun b) { if ( 0 == a ) { - return u3_no; + return c3n; } else { u3_noun loz; - if ( u3_no == u3du(a) ) { + if ( c3n == u3du(a) ) { return u3_cm_bail(c3__exit); } else switch ( (loz = u3_cn_slam_on(u3k(b), u3k(u3h(a)))) ) { - case u3_yes: return u3_yes; - case u3_no: return u3_cqb_lien(u3t(a), b); + case c3y: return c3y; + case c3n: return u3_cqb_lien(u3t(a), b); default: u3z(loz); return u3_cm_bail(c3__exit); } @@ -32,7 +32,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_lien(a, b); diff --git a/j/2/need.c b/j/2/need.c index 31c1764cf5..7dcada37f1 100644 --- a/j/2/need.c +++ b/j/2/need.c @@ -24,7 +24,7 @@ { u3_noun a; - if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_need(a); diff --git a/j/2/reel.c b/j/2/reel.c index 663f0556f4..0af994192d 100644 --- a/j/2/reel.c +++ b/j/2/reel.c @@ -15,7 +15,7 @@ if ( 0 == a ) { return u3k(u3_cr_at(u3_cv_sam_3, b)); } - else if ( u3_no == u3du(a) ) { + else if ( c3n == u3du(a) ) { return u3_cm_bail(c3__exit); } else { @@ -31,7 +31,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_reel(a, b); diff --git a/j/2/roll.c b/j/2/roll.c index 6a66dd433b..cb59720795 100644 --- a/j/2/roll.c +++ b/j/2/roll.c @@ -14,7 +14,7 @@ if ( 0 == a ) { return u3k(u3_cr_at(u3_cv_sam_3, b)); } - else if ( u3_no == u3du(a) ) { + else if ( c3n == u3du(a) ) { return u3_cm_bail(c3__exit); } else { @@ -23,7 +23,7 @@ u3_noun daz = u3_cn_slam_on(u3k(b), u3nc(gim, zor)); u3_noun vel = u3_ci_molt(u3k(b), u3_cv_sam_3, daz, 0); - if ( u3_none == vel ) { + if ( c3nne == vel ) { return u3_cm_bail(c3__exit); } else { u3_noun hox = u3_cqb_roll(u3t(a), vel); @@ -38,7 +38,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_roll(a, b); diff --git a/j/2/scag.c b/j/2/scag.c index 8cb68cc98d..8a7869bc4d 100644 --- a/j/2/scag.c +++ b/j/2/scag.c @@ -12,7 +12,7 @@ u3_atom a, u3_noun b) { - if ( u3_ne(u3_ca_is_cat(a)) ) { + if ( !_(u3_ca_is_cat(a)) ) { return u3_cm_bail(c3__fail); } else { @@ -23,7 +23,7 @@ return u3_nul; while ( i_w ) { - if ( u3_no == u3du(b) ) { + if ( c3n == u3du(b) ) { return u3_nul; } acc = u3_ci_cell( u3h(b), acc ); @@ -41,8 +41,8 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/2/skim.c b/j/2/skim.c index be748a5f2e..e205121b5f 100644 --- a/j/2/skim.c +++ b/j/2/skim.c @@ -15,15 +15,15 @@ if ( 0 == a ) { return a; } - else if ( u3_no == u3du(a) ) { + else if ( c3n == u3du(a) ) { return u3_cm_bail(c3__exit); } else { u3_noun hoz = u3_cn_slam_on(u3k(b), u3k(u3h(a))); u3_noun vyr = u3_cqb_skim(u3t(a), b); switch ( hoz ) { - case u3_yes: return u3nc(u3k(u3h(a)), vyr); - case u3_no: return vyr; + case c3y: return u3nc(u3k(u3h(a)), vyr); + case c3n: return vyr; default: u3z(hoz); u3z(vyr); return u3_cm_bail(c3__exit); @@ -36,7 +36,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_skim(a, b); diff --git a/j/2/skip.c b/j/2/skip.c index 8a20f93bc9..bd2dd9de9c 100644 --- a/j/2/skip.c +++ b/j/2/skip.c @@ -15,18 +15,18 @@ if ( 0 == a ) { return a; } - else if ( u3_no == u3du(a) ) { - return u3_none; + else if ( c3n == u3du(a) ) { + return c3nne; } else { u3_noun hoz = u3_cn_slam_on(u3k(b), u3k(u3h(a))); u3_noun vyr = u3_cqb_skip(u3t(a), b); switch ( hoz ) { - case u3_yes: return vyr; - case u3_no: return u3nc(u3k(u3h(a)), vyr); + case c3y: return vyr; + case c3n: return u3nc(u3k(u3h(a)), vyr); default: u3z(hoz); u3z(vyr); - return u3_none; + return c3nne; } } } @@ -36,8 +36,8 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_none; + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + return c3nne; } else { return u3_cqb_skip(a, b); } diff --git a/j/2/slag.c b/j/2/slag.c index c0668f2d51..0d084ceff1 100644 --- a/j/2/slag.c +++ b/j/2/slag.c @@ -10,14 +10,14 @@ u3_noun u3_cqb_slag(u3_atom a, u3_noun b) { - if ( u3_ne(u3_ca_is_cat(a)) ) { + if ( !_(u3_ca_is_cat(a)) ) { return u3_cm_bail(c3__fail); } else { c3_w len_w = a; while ( len_w ) { - if ( u3_no == u3du(b) ) { + if ( c3n == u3du(b) ) { return u3_nul; } b = u3t(b); @@ -31,8 +31,8 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/2/snag.c b/j/2/snag.c index 074a372c84..e66b180cb7 100644 --- a/j/2/snag.c +++ b/j/2/snag.c @@ -11,20 +11,20 @@ u3_cqb_snag(u3_atom a, u3_noun b) { - if ( u3_ne(u3_ca_is_cat(a)) ) { + if ( !_(u3_ca_is_cat(a)) ) { return u3_cm_bail(c3__fail); } else { c3_w len_w = a; while ( len_w ) { - if ( u3_no == u3du(b) ) { + if ( c3n == u3du(b) ) { return u3_cm_bail(c3__exit); } b = u3t(b); len_w--; } - if ( u3_no == u3du(b) ) { + if ( c3n == u3du(b) ) { return u3_cm_bail(c3__exit); } return u3k(u3h(b)); @@ -35,8 +35,8 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/2/sort.c b/j/2/sort.c index b9de2a79f4..5f3ecd8b47 100644 --- a/j/2/sort.c +++ b/j/2/sort.c @@ -22,7 +22,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_sort(a, b); diff --git a/j/2/turn.c b/j/2/turn.c index fbcbee2525..57cb2803c1 100644 --- a/j/2/turn.c +++ b/j/2/turn.c @@ -13,7 +13,7 @@ if ( 0 == a ) { return a; } - else if ( u3_no == u3du(a) ) { + else if ( c3n == u3du(a) ) { return u3_cm_bail(c3__exit); } else { @@ -28,7 +28,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_turn(a, b); diff --git a/j/2/weld.c b/j/2/weld.c index 1e3939b907..f75b602a78 100644 --- a/j/2/weld.c +++ b/j/2/weld.c @@ -14,7 +14,7 @@ if ( 0 == a ) { return u3k(b); } - else if ( u3_no == u3du(a) ) { + else if ( c3n == u3du(a) ) { return u3_cm_bail(c3__exit); } else { @@ -26,7 +26,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_weld(a, b); diff --git a/j/3/bex.c b/j/3/bex.c index b525f5c438..8dbe6ea046 100644 --- a/j/3/bex.c +++ b/j/3/bex.c @@ -12,7 +12,7 @@ { mpz_t a_mp; - if ( u3_ne(u3_ca_is_cat(a)) ) { + if ( !_(u3_ca_is_cat(a)) ) { return u3_cm_bail(c3__fail); } else { @@ -28,8 +28,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || - (u3_no == u3ud(a)) ) + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/can.c b/j/3/can.c index 3980458f35..4bb85292cd 100644 --- a/j/3/can.c +++ b/j/3/can.c @@ -11,7 +11,7 @@ u3_cqc_can(u3_atom a, u3_noun b) { - if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } else { @@ -30,13 +30,13 @@ if ( 0 == cab ) { break; } - if ( u3_no == u3du(cab) ) return u3_cm_bail(c3__fail); + if ( c3n == u3du(cab) ) return u3_cm_bail(c3__fail); i_cab = u3h(cab); - if ( u3_no == u3du(i_cab) ) return u3_cm_bail(c3__fail); + if ( c3n == u3du(i_cab) ) return u3_cm_bail(c3__fail); pi_cab = u3h(i_cab); qi_cab = u3t(i_cab); - if ( u3_no == u3_ca_is_cat(pi_cab) ) return u3_cm_bail(c3__fail); - if ( u3_no == u3ud(qi_cab) ) return u3_cm_bail(c3__fail); + if ( c3n == u3_ca_is_cat(pi_cab) ) return u3_cm_bail(c3__fail); + if ( c3n == u3ud(qi_cab) ) return u3_cm_bail(c3__fail); if ( (tot_w + pi_cab) < tot_w ) return u3_cm_bail(c3__fail); tot_w += pi_cab; @@ -74,8 +74,8 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/3/cap.c b/j/3/cap.c index f1911ace1d..4139456566 100644 --- a/j/3/cap.c +++ b/j/3/cap.c @@ -28,8 +28,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || - (u3_no == u3ud(a)) ) + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/cat.c b/j/3/cat.c index daa369b7c7..8fa540d9fc 100644 --- a/j/3/cat.c +++ b/j/3/cat.c @@ -12,7 +12,7 @@ u3_atom b, u3_atom c) { - if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } else { @@ -44,12 +44,12 @@ { u3_noun a, b, c; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_6, &b, u3_cv_sam_7, &c, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) || - (u3_no == u3ud(c)) ) + (c3n == u3ud(a)) || + (c3n == u3ud(b)) || + (c3n == u3ud(c)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/con.c b/j/3/con.c index ea7028f44a..6bdd094997 100644 --- a/j/3/con.c +++ b/j/3/con.c @@ -41,9 +41,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/cut.c b/j/3/cut.c index 3aa6ecbef9..d6b1103841 100644 --- a/j/3/cut.c +++ b/j/3/cut.c @@ -14,13 +14,13 @@ u3_atom c, u3_atom d) { - if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } - if ( u3_ne(u3_ca_is_cat(b)) ) { + if ( !_(u3_ca_is_cat(b)) ) { return 0; } - if ( u3_ne(u3_ca_is_cat(c)) ) { + if ( !_(u3_ca_is_cat(c)) ) { c = 0x7fffffff; } @@ -57,14 +57,14 @@ { u3_noun a, b, c, d; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_12, &b, u3_cv_sam_13, &c, u3_cv_sam_7, &d, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) || - (u3_no == u3ud(c)) || - (u3_no == u3ud(d)) ) + (c3n == u3ud(a)) || + (c3n == u3ud(b)) || + (c3n == u3ud(c)) || + (c3n == u3ud(d)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/dis.c b/j/3/dis.c index f483b400b8..24eec16455 100644 --- a/j/3/dis.c +++ b/j/3/dis.c @@ -40,9 +40,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/dor.c b/j/3/dor.c index 06e71d2e95..c69ed96f52 100644 --- a/j/3/dor.c +++ b/j/3/dor.c @@ -12,24 +12,24 @@ u3_atom a, u3_atom b) { - if ( u3_yes == u3_cr_sing(a, b) ) { - return u3_yes; + if ( c3y == u3_cr_sing(a, b) ) { + return c3y; } else { - if ( u3_yes == u3ud(a) ) { - if ( u3_yes == u3ud(b) ) { + if ( c3y == u3ud(a) ) { + if ( c3y == u3ud(b) ) { return u3_cqa_lth(a, b); } else { - return u3_yes; + return c3y; } } else { - if ( u3_yes == u3ud(b) ) { - return u3_no; + if ( c3y == u3ud(b) ) { + return c3n; } else { - if ( u3_yes == u3_cr_sing(u3h(a), u3h(b)) ) { + if ( c3y == u3_cr_sing(u3h(a), u3h(b)) ) { return u3_cqc_dor(u3t(a), u3t(b)); } else return u3_cqc_dor(u3h(a), u3h(b)); @@ -43,7 +43,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqc_dor(a, b); diff --git a/j/3/end.c b/j/3/end.c index ba523db4fd..3c16db06b4 100644 --- a/j/3/end.c +++ b/j/3/end.c @@ -13,10 +13,10 @@ u3_atom b, u3_atom c) { - if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } - else if ( u3_ne(u3_ca_is_cat(b)) ) { + else if ( !_(u3_ca_is_cat(b)) ) { return u3k(c); } else { @@ -48,12 +48,12 @@ { u3_noun a, b, c; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_6, &b, u3_cv_sam_7, &c, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) || - (u3_no == u3ud(c)) ) + (c3n == u3ud(a)) || + (c3n == u3ud(b)) || + (c3n == u3ud(c)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/gor.c b/j/3/gor.c index f02c3a935b..192ae293c4 100644 --- a/j/3/gor.c +++ b/j/3/gor.c @@ -17,14 +17,14 @@ if ( c_w == d_w ) { return u3_cqc_dor(a, b); } - else return (c_w < d_w) ? u3_yes : u3_no; + else return (c_w < d_w) ? c3y : c3n; } u3_noun u3_cwc_gor(u3_noun cor) { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqc_gor(a, b); diff --git a/j/3/hor.c b/j/3/hor.c index 049971060e..f64a598707 100644 --- a/j/3/hor.c +++ b/j/3/hor.c @@ -11,21 +11,21 @@ u3_cqc_hor(u3_noun a, u3_noun b) { - if ( u3_yes == u3ud(a) ) { - if ( u3_yes == u3ud(b) ) { + if ( c3y == u3ud(a) ) { + if ( c3y == u3ud(b) ) { return u3_cqc_gor(a, b); } else { - return u3_yes; + return c3y; } } else { - if ( u3_yes == u3ud(b) ) { - return u3_no; + if ( c3y == u3ud(b) ) { + return c3n; } else { u3_noun h_a = u3h(a); u3_noun h_b = u3h(b); - if ( u3_yes == u3_cr_sing(h_a, h_b) ) { + if ( c3y == u3_cr_sing(h_a, h_b) ) { return u3_cqc_gor(u3t(a), u3t(b)); } else { return u3_cqc_gor(h_a, h_b); @@ -38,7 +38,7 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqc_hor(a, b); diff --git a/j/3/lsh.c b/j/3/lsh.c index da48101b2c..e2aa2b5bf9 100644 --- a/j/3/lsh.c +++ b/j/3/lsh.c @@ -10,10 +10,10 @@ u3_noun u3_cqc_lsh(u3_atom a, u3_atom b, u3_atom c) { - if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } - else if ( u3_ne(u3_ca_is_cat(b)) ) { + else if ( !_(u3_ca_is_cat(b)) ) { return u3_cm_bail(c3__fail); } else { @@ -45,12 +45,12 @@ { u3_noun a, b, c; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_6, &b, u3_cv_sam_7, &c, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) || - (u3_no == u3ud(c)) ) + (c3n == u3ud(a)) || + (c3n == u3ud(b)) || + (c3n == u3ud(c)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/mas.c b/j/3/mas.c index f97d79f0be..86c759038f 100644 --- a/j/3/mas.c +++ b/j/3/mas.c @@ -35,8 +35,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || - (u3_no == u3ud(a)) ) + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/met.c b/j/3/met.c index bc84189270..3f34d88252 100644 --- a/j/3/met.c +++ b/j/3/met.c @@ -12,7 +12,7 @@ u3_atom a, u3_atom b) { - if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { if ( 0 == b ) { return 0; } else return 1; @@ -20,7 +20,7 @@ else { c3_w met_w = u3_cr_met(a, b); - if ( u3_ne(u3_ca_is_cat(met_w)) ) { + if ( !_(u3_ca_is_cat(met_w)) ) { return u3_ci_words(1, &met_w); } else return u3_cr_met(a, b); @@ -32,9 +32,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/mix.c b/j/3/mix.c index 02e3670c47..d076218a63 100644 --- a/j/3/mix.c +++ b/j/3/mix.c @@ -40,9 +40,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/mug.c b/j/3/mug.c index 43ea7bdb9f..43e135fbd3 100644 --- a/j/3/mug.c +++ b/j/3/mug.c @@ -12,7 +12,7 @@ { u3_noun sam; - if ( u3_none == (sam = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (sam = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__exit); } else { return u3_cr_mug(sam); diff --git a/j/3/peg.c b/j/3/peg.c index 8d321a861f..9e9097c2fc 100644 --- a/j/3/peg.c +++ b/j/3/peg.c @@ -35,9 +35,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) || + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) || (0 == a) || (0 == b) ) { diff --git a/j/3/po.c b/j/3/po.c index c6b3484d21..961dda3d11 100644 --- a/j/3/po.c +++ b/j/3/po.c @@ -10,7 +10,7 @@ static u3_noun _po_find(u3_noun buf, u3_noun a) { - if ( u3_ne(u3_ca_is_cat(a)) ) { + if ( !_(u3_ca_is_cat(a)) ) { return u3_nul; } else { @@ -38,10 +38,10 @@ { u3_noun x, a, buf; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || - (u3_no == u3du(x)) || - (u3_no == u3ud(buf = u3h(x))) || - (u3_no == u3ud(a)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || + (c3n == u3du(x)) || + (c3n == u3ud(buf = u3h(x))) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { @@ -54,10 +54,10 @@ { u3_noun x, a, buf; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || - (u3_no == u3du(x)) || - (u3_no == u3ud(buf = u3t(x))) || - (u3_no == u3ud(a)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || + (c3n == u3du(x)) || + (c3n == u3ud(buf = u3t(x))) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { @@ -71,10 +71,10 @@ { u3_noun x, a, buf; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || - (u3_no == u3du(x)) || - (u3_no == u3ud(buf = u3h(x))) || - (u3_no == u3ud(a)) || + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || + (c3n == u3du(x)) || + (c3n == u3ud(buf = u3h(x))) || + (c3n == u3ud(a)) || (a >= 256) ) { return u3_cm_bail(c3__exit); @@ -92,10 +92,10 @@ { u3_noun x, a, buf; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || - (u3_no == u3du(x)) || - (u3_no == u3ud(buf = u3t(x))) || - (u3_no == u3ud(a)) || + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || + (c3n == u3du(x)) || + (c3n == u3ud(buf = u3t(x))) || + (c3n == u3ud(a)) || (a >= 256) ) { return u3_cm_bail(c3__exit); diff --git a/j/3/rap.c b/j/3/rap.c index 7e4f2a67a4..f272aedd30 100644 --- a/j/3/rap.c +++ b/j/3/rap.c @@ -11,7 +11,7 @@ u3_cqc_rap(u3_atom a, u3_noun b) { - if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__exit); } else { @@ -31,10 +31,10 @@ if ( 0 == cab ) { break; } - else if ( u3_no == u3du(cab) ) { + else if ( c3n == u3du(cab) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3ud(h_cab = u3h(cab)) ) { + else if ( c3n == u3ud(h_cab = u3h(cab)) ) { return u3_cm_bail(c3__exit); } else if ( (tot_w + (len_w = u3_cr_met(a_g, h_cab))) < tot_w ) { @@ -75,8 +75,8 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/rip.c b/j/3/rip.c index aa7951fa59..9878dc3f01 100644 --- a/j/3/rip.c +++ b/j/3/rip.c @@ -11,7 +11,7 @@ u3_cqc_rip(u3_atom a, u3_atom b) { - if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } else { @@ -73,9 +73,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/rsh.c b/j/3/rsh.c index f27c2b649d..5c332be206 100644 --- a/j/3/rsh.c +++ b/j/3/rsh.c @@ -13,10 +13,10 @@ u3_atom b, u3_atom c) { - if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { return u3_cm_bail(c3__fail); } - else if ( u3_ne(u3_ca_is_cat(b)) ) { + else if ( !_(u3_ca_is_cat(b)) ) { return 0; } else { @@ -46,12 +46,12 @@ { u3_noun a, b, c; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_6, &b, u3_cv_sam_7, &c, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) || - (u3_no == u3ud(c)) ) + (c3n == u3ud(a)) || + (c3n == u3ud(b)) || + (c3n == u3ud(c)) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/3/vor.c b/j/3/vor.c index 629d4ddb90..8e22c53c8c 100644 --- a/j/3/vor.c +++ b/j/3/vor.c @@ -17,14 +17,14 @@ if ( c_w == d_w ) { return u3_cqc_dor(a, b); } - else return (c_w < d_w) ? u3_yes : u3_no; + else return (c_w < d_w) ? c3y : c3n; } u3_noun u3_cwc_vor(u3_noun cor) { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqc_vor(a, b); diff --git a/j/4/by_gas.c b/j/4/by_gas.c index b2bef9cafc..cb080aa715 100644 --- a/j/4/by_gas.c +++ b/j/4/by_gas.c @@ -16,20 +16,20 @@ return u3k(a); } else { - if ( u3_no == u3du(b) ) { + if ( c3n == u3du(b) ) { return u3_cm_bail(c3__exit); } else { u3_noun i_b = u3h(b); u3_noun t_b = u3t(b); - if ( u3_no == u3du(i_b) ) { + if ( c3n == u3du(i_b) ) { return u3_cm_bail(c3__exit); } else { u3_noun pi_b = u3h(i_b); u3_noun qi_b = u3t(i_b); u3_noun c; - if ( u3_none == (c = u3_cqdb_put(a, pi_b, qi_b)) ) { + if ( c3nne == (c = u3_cqdb_put(a, pi_b, qi_b)) ) { return u3_cm_bail(c3__exit); } else { u3_noun d = u3_cqdb_gas(c, t_b); @@ -47,7 +47,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdb_gas(a, b); @@ -59,7 +59,7 @@ u3_weak c = u3_cqdb_gas(a, b); u3z(a); u3z(b); - if ( u3_none == c ) { + if ( c3nne == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/by_get.c b/j/4/by_get.c index 4a92d7bd58..54038e968c 100644 --- a/j/4/by_get.c +++ b/j/4/by_get.c @@ -17,17 +17,17 @@ u3_noun l_a, n_a, r_a; u3_noun pn_a, qn_a; - if ( (u3_no == u3_cr_trel(a, &n_a, &l_a, &r_a)) || - (u3_no == u3_cr_cell(n_a, &pn_a, &qn_a) ) ) + if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) || + (c3n == u3_cr_cell(n_a, &pn_a, &qn_a) ) ) { return u3_cm_bail(c3__exit); } else { - if ( (u3_yes == u3_cr_sing(b, pn_a)) ) { + if ( (c3y == u3_cr_sing(b, pn_a)) ) { return u3nc(u3_nul, u3k(qn_a)); } else { - if ( u3_yes == u3_cqc_gor(b, pn_a) ) { + if ( c3y == u3_cqc_gor(b, pn_a) ) { return u3_cqdb_get(l_a, b); } else return u3_cqdb_get(r_a, b); @@ -41,7 +41,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdb_get(a, b); @@ -53,9 +53,9 @@ u3_noun c = u3_cqdb_get(a, b); u3z(a); u3z(b); - if ( u3_no == u3_cr_du(c) ) { + if ( c3n == u3_cr_du(c) ) { u3z(c); - return u3_none; + return c3nne; } else { u3_noun pro = u3k(u3t(c)); @@ -68,7 +68,7 @@ { u3_weak c = u3_ckdb_get(a, b); - if ( u3_none == c ) { + if ( c3nne == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/by_has.c b/j/4/by_has.c index 6b73000918..56b1499f06 100644 --- a/j/4/by_has.c +++ b/j/4/by_has.c @@ -13,23 +13,23 @@ u3_noun b) { if ( u3_nul == a ) { - return u3_no; + return c3n; } else { u3_noun l_a, n_a, r_a; u3_noun pn_a, qn_a; - if ( (u3_no == u3_cr_trel(a, &n_a, &l_a, &r_a)) || - (u3_no == u3_cr_cell(n_a, &pn_a, &qn_a)) ) + if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) || + (c3n == u3_cr_cell(n_a, &pn_a, &qn_a)) ) { return u3_cm_bail(c3__exit); } else { - if ( (u3_yes == u3_cr_sing(b, pn_a)) ) { - return u3_yes; + if ( (c3y == u3_cr_sing(b, pn_a)) ) { + return c3y; } else { - if ( u3_yes == u3_cqc_gor(b, pn_a) ) { + if ( c3y == u3_cqc_gor(b, pn_a) ) { return u3_cqdb_has(l_a, b); } else return u3_cqdb_has(r_a, b); @@ -43,7 +43,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdb_has(a, b); @@ -55,7 +55,7 @@ u3_weak c = u3_cqdb_has(a, b); u3z(a); u3z(b); - if ( u3_none == c ) { + if ( c3nne == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/by_int.c b/j/4/by_int.c index 0fb7a85812..83f8c2eed5 100644 --- a/j/4/by_int.c +++ b/j/4/by_int.c @@ -22,33 +22,33 @@ u3_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a; u3_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b; - if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { + if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { return u3_cm_bail(c3__exit); } - else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { + else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { + else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { + else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(n_a, &p_n_a, &q_n_a) ) { + else if ( c3n == u3_cr_cell(n_a, &p_n_a, &q_n_a) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(n_b, &p_n_b, &q_n_b) ) { + else if ( c3n == u3_cr_cell(n_b, &p_n_b, &q_n_b) ) { return u3_cm_bail(c3__exit); } - else if ( u3_yes == u3_cqc_vor(p_n_a, p_n_b) ) { - if ( u3_yes == u3_cr_sing(p_n_a, p_n_b) ) { + else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) { + if ( c3y == u3_cr_sing(p_n_a, p_n_b) ) { return u3nt( u3k(n_b), u3_cqdb_int(u3k(l_a), u3k(l_b)), u3_cqdb_int(u3k(r_a), u3k(r_b))); } - else if ( u3_yes == u3_cqc_hor(p_n_b, p_n_a) ) { + else if ( c3y == u3_cqc_hor(p_n_b, p_n_a) ) { return u3_cqdb_uni( u3_cqdb_int( @@ -75,14 +75,14 @@ u3k(l_b))); } } - else if ( u3_yes == u3_cr_sing(p_n_b, p_n_a) ) { + else if ( c3y == u3_cr_sing(p_n_b, p_n_a) ) { return u3nt( u3k(n_b), u3_cqdb_int(u3k(l_b), u3k(l_a)), u3_cqdb_int(u3k(r_b), u3k(r_a))); } - else if ( u3_yes == u3_cqc_hor(p_n_a, p_n_b) ) { + else if ( c3y == u3_cqc_hor(p_n_a, p_n_b) ) { return u3_cqdb_uni( u3_cqdb_int( @@ -116,7 +116,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdb_int(a, b); diff --git a/j/4/by_put.c b/j/4/by_put.c index 1ed96a48c6..5b0a224914 100644 --- a/j/4/by_put.c +++ b/j/4/by_put.c @@ -24,13 +24,13 @@ u3_noun l_a, n_a, r_a, pn_a, qn_a; u3_noun d, l_d, n_d, r_d; - if ( (u3_no == u3_cr_trel(a, &n_a, &l_a, &r_a)) || - (u3_no == u3_cr_cell(n_a, &pn_a, &qn_a)) ) + if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) || + (c3n == u3_cr_cell(n_a, &pn_a, &qn_a)) ) { return u3_cm_bail(c3__exit); } - else if ( u3_yes == u3_cr_sing(pn_a, b) ) { - if ( u3_yes == u3_cr_sing(qn_a, c) ) { + else if ( c3y == u3_cr_sing(pn_a, b) ) { + if ( c3y == u3_cr_sing(qn_a, c) ) { return u3k(a); } else { return u3nt @@ -40,10 +40,10 @@ } } else { - if ( u3_yes == u3_cqc_gor(b, pn_a) ) { + if ( c3y == u3_cqc_gor(b, pn_a) ) { d = u3_cqdb_put(l_a, b, c); - if ( u3_yes == u3_cqc_vor(pn_a, u3h(u3h(d))) ) { + if ( c3y == u3_cqc_vor(pn_a, u3h(u3h(d))) ) { return u3nt(u3k(n_a), d, u3k(r_a)); @@ -67,7 +67,7 @@ else { d = u3_cqdb_put(r_a, b, c); - if ( u3_yes == u3_cqc_vor(pn_a, u3h(u3h(d))) ) { + if ( c3y == u3_cqc_vor(pn_a, u3h(u3h(d))) ) { return u3nt(u3k(n_a), u3k(l_a), d); @@ -97,7 +97,7 @@ { u3_noun a, b, c; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &b, + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &b, u3_cv_sam_3, &c, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); diff --git a/j/4/by_uni.c b/j/4/by_uni.c index 2dca38b82d..9208a1d4a5 100644 --- a/j/4/by_uni.c +++ b/j/4/by_uni.c @@ -22,33 +22,33 @@ u3_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a; u3_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b; - if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { + if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { return u3_cm_bail(c3__exit); } - else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { + else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { return u3_cm_bail(c3__exit); } - else if ( (u3_no == u3_cr_cell(n_a, &p_n_a, &q_n_a)) ) { + else if ( (c3n == u3_cr_cell(n_a, &p_n_a, &q_n_a)) ) { return u3_cm_bail(c3__exit); } - else if ( (u3_no == u3_cr_cell(n_b, &p_n_b, &q_n_b)) ) { + else if ( (c3n == u3_cr_cell(n_b, &p_n_b, &q_n_b)) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { + else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { + else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { return u3_cm_bail(c3__exit); } - else if ( u3_yes == u3_cqc_vor(p_n_a, p_n_b) ) { - if ( u3_yes == u3_cr_sing(p_n_a, p_n_b) ) { + else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) { + if ( c3y == u3_cr_sing(p_n_a, p_n_b) ) { return u3nt(u3k(n_b), u3_cqdb_uni( u3k(l_a), u3k(l_b)), u3_cqdb_uni( u3k(r_a), u3k(r_b))); } - else if ( u3_yes == u3_cqc_hor(p_n_b, p_n_a) ) { + else if ( c3y == u3_cqc_hor(p_n_b, p_n_a) ) { return u3_cqdb_uni( u3nt( @@ -77,14 +77,14 @@ u3k(l_b)); } } - else if ( u3_yes == u3_cr_sing(p_n_b, p_n_a) ) { + else if ( c3y == u3_cr_sing(p_n_b, p_n_a) ) { return u3nt( u3k(n_b), u3_cqdb_uni(u3k(r_b), u3k(r_a)), u3_cqdb_uni(u3k(l_b), u3k(l_a))); } - else if ( u3_yes == u3_cqc_hor(p_n_a, p_n_b) ) { + else if ( c3y == u3_cqc_hor(p_n_a, p_n_b) ) { return u3_cqdb_uni( u3k(r_a), @@ -120,7 +120,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdb_uni(a, b); diff --git a/j/4/in_gas.c b/j/4/in_gas.c index 9333dd263a..689edf2bc4 100644 --- a/j/4/in_gas.c +++ b/j/4/in_gas.c @@ -16,14 +16,14 @@ return u3k(a); } else { - if ( u3_no == u3du(b) ) { + if ( c3n == u3du(b) ) { return u3_cm_bail(c3__exit); } else { u3_noun i_b = u3h(b); u3_noun t_b = u3t(b); u3_noun c; - if ( u3_none == (c = u3_cqdi_put(a, i_b)) ) { + if ( c3nne == (c = u3_cqdi_put(a, i_b)) ) { return u3_cm_bail(c3__exit); } else { u3_noun d = u3_cqdi_gas(c, t_b); @@ -40,7 +40,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdi_gas(a, b); @@ -52,7 +52,7 @@ u3_weak c = u3_cqdi_gas(a, b); u3z(a); u3z(b); - if ( u3_none == c ) { + if ( c3nne == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/in_has.c b/j/4/in_has.c index acd72c7a25..6c9f39bb1d 100644 --- a/j/4/in_has.c +++ b/j/4/in_has.c @@ -11,20 +11,20 @@ u3_cqdi_has(u3_noun a, u3_noun b) { if ( u3_nul == a ) { - return u3_no; + return c3n; } else { u3_noun l_a, n_a, r_a; - if ( (u3_no == u3_cr_mean(a, 2, &n_a, 6, &l_a, 7, &r_a, 0)) ) { + if ( (c3n == u3_cr_mean(a, 2, &n_a, 6, &l_a, 7, &r_a, 0)) ) { return u3_cm_bail(c3__exit); } else { - if ( (u3_yes == u3_cr_sing(b, n_a)) ) { - return u3_yes; + if ( (c3y == u3_cr_sing(b, n_a)) ) { + return c3y; } else { - if ( u3_yes == u3_cqc_hor(b, n_a) ) { + if ( c3y == u3_cqc_hor(b, n_a) ) { return u3_cqdi_has(l_a, b); } else return u3_cqdi_has(r_a, b); @@ -37,7 +37,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdi_has(a, b); @@ -49,7 +49,7 @@ u3_weak c = u3_cqdi_has(a, b); u3z(a); u3z(b); - if ( u3_none == c ) { + if ( c3nne == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/in_int.c b/j/4/in_int.c index 199b689904..8fcbf57fa1 100644 --- a/j/4/in_int.c +++ b/j/4/in_int.c @@ -23,30 +23,30 @@ u3_noun l_b, n_b, r_b, lr_b; u3_noun c; - if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { + if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { return u3_cm_bail(c3__exit); } - else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { + else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { return u3_cm_bail(c3__exit); } else { - if ( u3_yes == u3_cqc_vor(n_b, n_a) ) { + if ( c3y == u3_cqc_vor(n_b, n_a) ) { c = a; a = b; b = c; c = n_a; n_a = n_b; n_b = c; c = lr_a; lr_a = lr_b; lr_b = c; } - if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { + if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { + else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { return u3_cm_bail(c3__exit); } - else if ( u3_yes == u3_cr_sing(n_a, n_b) ) { + else if ( c3y == u3_cr_sing(n_a, n_b) ) { return u3nt(u3k(n_a), u3_cqdi_int(l_a, l_b), u3_cqdi_int(r_a, r_b)); } - else if ( u3_yes == u3_cqc_hor(n_b, n_a) ) { + else if ( c3y == u3_cqc_hor(n_b, n_a) ) { return u3_cqdi_uni( u3_cqdi_int( l_a, @@ -79,7 +79,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdi_int(a, b); diff --git a/j/4/in_mer.c b/j/4/in_mer.c index f4df8280ab..f67a0ad481 100644 --- a/j/4/in_mer.c +++ b/j/4/in_mer.c @@ -21,30 +21,30 @@ u3_noun l_b, n_b, r_b, lr_b; u3_noun c; - if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { + if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { return u3_cm_bail(c3__exit); } - else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { + else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { return u3_cm_bail(c3__exit); } else { - if ( u3_yes == u3_cqc_vor(n_b, n_a) ) { + if ( c3y == u3_cqc_vor(n_b, n_a) ) { c = a; a = b; b = c; c = n_a; n_a = n_b; n_b = c; c = lr_a; lr_a = lr_b; lr_b = c; } - if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { + if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { + else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { return u3_cm_bail(c3__exit); } - else if ( u3_yes == u3_cr_sing(n_a, n_b) ) { + else if ( c3y == u3_cr_sing(n_a, n_b) ) { return u3nt(u3k(n_a), u3_cqdi_mer(l_a, l_b), u3_cqdi_mer(r_a, r_b)); } - else if ( u3_yes == u3_cqc_hor(n_b, n_a) ) { + else if ( c3y == u3_cqc_hor(n_b, n_a) ) { return u3_cqdi_mer( u3nt( n_a, @@ -79,7 +79,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/4/in_put.c b/j/4/in_put.c index 404e4ed25f..81d095f789 100644 --- a/j/4/in_put.c +++ b/j/4/in_put.c @@ -19,20 +19,20 @@ u3_noun l_a, n_a, r_a, lr_a; // XX copy tree boilerplate to other pt4 u3_noun c, l_c, n_c, r_c; - if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { + if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { return u3_cm_bail(c3__exit); } - else if ( u3_yes == u3_cr_sing(n_a, b) ) { + else if ( c3y == u3_cr_sing(n_a, b) ) { return u3k(a); } - else if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { + else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { return u3_cm_bail(c3__exit); } else { - if ( u3_yes == u3_cqc_hor(b, n_a) ) { + if ( c3y == u3_cqc_hor(b, n_a) ) { c = u3_cqdi_put(l_a, b); - if ( u3_yes == u3_cqc_vor(n_a, u3h(c)) ) { + if ( c3y == u3_cqc_vor(n_a, u3h(c)) ) { return u3nt(u3k(n_a), c, u3k(r_a)); @@ -56,7 +56,7 @@ else { c = u3_cqdi_put(r_a, b); - if ( u3_yes == u3_cqc_vor(n_a, u3h(c)) ) { + if ( c3y == u3_cqc_vor(n_a, u3h(c)) ) { return u3nt(u3k(n_a), u3k(l_a), c); @@ -86,7 +86,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdi_put(a, b); diff --git a/j/4/in_tap.c b/j/4/in_tap.c index e41d4d793c..4f35384fea 100644 --- a/j/4/in_tap.c +++ b/j/4/in_tap.c @@ -17,7 +17,7 @@ } else { u3_noun l_a, n_a, r_a; - if ( (u3_no == u3_cr_trel(a, &n_a, &l_a, &r_a)) ) { + if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) ) { u3z(b); return u3_cm_bail(c3__exit); } else { @@ -42,7 +42,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdi_tap(a, b); @@ -54,7 +54,7 @@ u3_weak c = u3_cqdi_tap(a, b); u3z(a); u3z(b); - if ( u3_none == c ) { + if ( c3nne == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/in_uni.c b/j/4/in_uni.c index 83202b8982..7142627872 100644 --- a/j/4/in_uni.c +++ b/j/4/in_uni.c @@ -22,28 +22,28 @@ u3_noun l_a, n_a, r_a, lr_a; u3_noun l_b, n_b, r_b, lr_b; - if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { + if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { return u3_cm_bail(c3__exit); } - else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { + else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { return u3_cm_bail(c3__exit); } else { - if ( u3_yes == u3_cqc_vor(n_a, n_b) ) { - if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { + if ( c3y == u3_cqc_vor(n_a, n_b) ) { + if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { + else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { return u3_cm_bail(c3__exit); } - else if ( u3_yes == u3_cr_sing(n_a, n_b) ) { + else if ( c3y == u3_cr_sing(n_a, n_b) ) { return u3nt( u3k(n_b), u3_cqdi_uni(u3k(l_a), u3k(l_b)), u3_cqdi_uni(u3k(r_a), u3k(r_b))); } - else if ( u3_yes == u3_cqc_hor(n_b, n_a) ) { + else if ( c3y == u3_cqc_hor(n_b, n_a) ) { return u3_cqdi_uni( u3nt( @@ -72,20 +72,20 @@ u3k(l_b)); } } - else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { + else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { return u3_cm_bail(c3__exit); } - else if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { + else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { return u3_cm_bail(c3__exit); } - else if ( u3_yes == u3_cr_sing(n_b, n_a) ) { + else if ( c3y == u3_cr_sing(n_b, n_a) ) { return u3nt( u3k(n_b), u3_cqdi_uni(u3k(r_b), u3k(r_a)), u3_cqdi_uni(u3k(l_b), u3k(l_a))); } - else if ( u3_yes == u3_cqc_hor(n_a, n_b) ) { + else if ( c3y == u3_cqc_hor(n_a, n_b) ) { return u3_cqdi_uni( u3k(r_a), @@ -122,7 +122,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqdi_uni(a, b); diff --git a/j/5/aesc.c b/j/5/aesc.c index 3dbb1a60d4..63b278cd61 100644 --- a/j/5/aesc.c +++ b/j/5/aesc.c @@ -55,9 +55,9 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } @@ -108,9 +108,9 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } diff --git a/j/5/cue.c b/j/5/cue.c index 2c0be6309c..66c4354efb 100644 --- a/j/5/cue.c +++ b/j/5/cue.c @@ -50,7 +50,7 @@ u3_noun x = u3_ch_get(har_p, u3k(u3t(d))); p = u3_cqa_add(2, u3h(d)); - if ( u3_none == x ) { + if ( c3nne == x ) { return u3_cm_bail(c3__exit); } q = x; @@ -80,7 +80,7 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_cue(a); diff --git a/j/5/ed_puck.c b/j/5/ed_puck.c index 1dedcbb037..7768982e03 100644 --- a/j/5/ed_puck.c +++ b/j/5/ed_puck.c @@ -18,7 +18,7 @@ c3_w met_w; u3_noun a = u3_cr_at(u3_cv_sam, cor); - if ( (u3_none == a) || (u3_no == u3ud(a)) ) { + if ( (c3nne == a) || (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } diff --git a/j/5/ed_sign.c b/j/5/ed_sign.c index ff340e47fe..69210568bb 100644 --- a/j/5/ed_sign.c +++ b/j/5/ed_sign.c @@ -42,7 +42,7 @@ u3_cwee_sign(u3_noun cor) { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/5/ed_veri.c b/j/5/ed_veri.c index af150209bf..d886dc08e9 100644 --- a/j/5/ed_veri.c +++ b/j/5/ed_veri.c @@ -28,7 +28,7 @@ u3_cr_bytes(0, 32, pub_y, pk); u3_cr_bytes(0, mesm_w, mes_y, m); - ret = ed25519_verify(sig_y, mes_y, mesm_w, pub_y) == 1 ? u3_yes : u3_no; + ret = ed25519_verify(sig_y, mes_y, mesm_w, pub_y) == 1 ? c3y : c3n; free(mes_y); return ret; } @@ -37,7 +37,7 @@ u3_cwee_veri(u3_noun cor) { u3_noun a, b, c; - if ( u3_no == u3_cr_mean(cor, + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_6, &b, u3_cv_sam_7, &c, 0) ) { return u3_cm_bail(c3__fail); diff --git a/j/5/jam.c b/j/5/jam.c index c65f3cf218..9e371c3437 100644 --- a/j/5/jam.c +++ b/j/5/jam.c @@ -88,17 +88,17 @@ u3_noun c = u3_ch_get(har_p, a); u3_noun x; - if ( u3_none == c ) { + if ( c3nne == c ) { u3_ch_put(har_p, a, u3k(b)); - if ( u3_yes == u3ud(a) ) { + if ( c3y == u3ud(a) ) { x = _jam_in_flat(har_p, a, l); } else { x = _jam_in_pair(har_p, u3h(a), u3t(a), b, l); } } else { - if ( u3_yes == u3ud(a) && u3_cr_met(0, a) <= u3_cr_met(0, c) ) { + if ( c3y == u3ud(a) && u3_cr_met(0, a) <= u3_cr_met(0, c) ) { x = _jam_in_flat(har_p, a, l); } else { @@ -127,7 +127,7 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_jam(a); diff --git a/j/5/lore.c b/j/5/lore.c index d13e3b37a9..dc4e3a332b 100644 --- a/j/5/lore.c +++ b/j/5/lore.c @@ -49,8 +49,8 @@ { u3_noun lub; - if ( (u3_none == (lub = u3_cr_at(u3_cv_sam, cor))) || - (u3_no == u3ud(lub)) ) + if ( (c3nne == (lub = u3_cr_at(u3_cv_sam, cor))) || + (c3n == u3ud(lub)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/5/loss.c b/j/5/loss.c index f4e46733ad..8a4d1ddc17 100644 --- a/j/5/loss.c +++ b/j/5/loss.c @@ -97,7 +97,7 @@ hav = u3_ckdb_get(u3k(loc_u->sev), u3k(how)); teg = u3nc(u3_ci_words(1, &i_w), - (hav == u3_none) ? u3_nul : hav); + (hav == c3nne) ? u3_nul : hav); loc_u->sev = u3_ckdb_put(loc_u->sev, u3k(how), teg); } } @@ -131,7 +131,7 @@ c3_w inx_w, c3_w goy_w) { - return u3_say + return __ ( (loc_u->kct_w == inx_w) || (u3_cr_word(0, u3h(loc_u->kad[inx_w])) > goy_w) ); } @@ -143,7 +143,7 @@ c3_w inx_w, c3_w goy_w) { - return u3_say + return __ ( (0 == inx_w) || (u3_cr_word(0, u3h(loc_u->kad[inx_w - 1])) < goy_w) ); } @@ -159,15 +159,15 @@ c3_w goy_w) { while ( *inx_w <= max_w ) { - if ( u3_no == _lonk(loc_u, *inx_w, goy_w) ) { - return u3_no; + if ( c3n == _lonk(loc_u, *inx_w, goy_w) ) { + return c3n; } - if ( u3_yes == _hink(loc_u, *inx_w, goy_w) ) { - return u3_yes; + if ( c3y == _hink(loc_u, *inx_w, goy_w) ) { + return c3y; } else ++*inx_w; } - return u3_no; + return c3n; } #endif @@ -184,22 +184,22 @@ c3_assert(max_w >= *inx_w); if ( max_w == *inx_w ) { - if ( u3_no == _lonk(loc_u, *inx_w, goy_w) ) { - return u3_no; + if ( c3n == _lonk(loc_u, *inx_w, goy_w) ) { + return c3n; } - if ( u3_yes == _hink(loc_u, *inx_w, goy_w) ) { - return u3_yes; + if ( c3y == _hink(loc_u, *inx_w, goy_w) ) { + return c3y; } else { ++*inx_w; - return u3_no; + return c3n; } } else { c3_w mid_w = *inx_w + ((max_w - *inx_w) / 2); - if ( (u3_no == _lonk(loc_u, mid_w, goy_w)) || - (u3_yes == _hink(loc_u, mid_w, goy_w)) ) + if ( (c3n == _lonk(loc_u, mid_w, goy_w)) || + (c3y == _hink(loc_u, mid_w, goy_w)) ) { return _bink(loc_u, inx_w, mid_w, goy_w); } else { @@ -225,7 +225,7 @@ bik = _bink(loc_u, &inx_w, loc_u->kct_w, goy_w); - if ( u3_yes == bik ) { + if ( c3y == bik ) { _merg(loc_u, inx_w + 1, u3t(gay)); _lune(loc_u, inx_w, goy_w); } @@ -244,7 +244,7 @@ u3_noun i_hel = u3h(loc_u->hel); u3_noun guy = u3_ckdb_get(u3k(loc_u->sev), u3k(i_hel)); - if ( u3_none != guy ) { + if ( c3nne != guy ) { u3_noun gay = u3_ckb_flop(guy); _merg(loc_u, 0, gay); @@ -275,8 +275,8 @@ _listp(u3_noun lix) { while ( 1 ) { - if ( u3_nul == lix ) return u3_yes; - if ( u3_no == u3du(lix) ) return u3_no; + if ( u3_nul == lix ) return c3y; + if ( c3n == u3du(lix) ) return c3n; lix = u3t(lix); } } @@ -286,10 +286,10 @@ { u3_noun hel, hev; - if ( (u3_none == (hel = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (hev = u3_cr_at(u3_cv_sam_3, cor))) || - (u3_no == _listp(hel)) || - (u3_no == _listp(hev)) ) + if ( (c3nne == (hel = u3_cr_at(u3_cv_sam_2, cor))) || + (c3nne == (hev = u3_cr_at(u3_cv_sam_3, cor))) || + (c3n == _listp(hel)) || + (c3n == _listp(hev)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/5/mat.c b/j/5/mat.c index 2666d90c47..cb11bd43e6 100644 --- a/j/5/mat.c +++ b/j/5/mat.c @@ -45,7 +45,7 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_mat(a); diff --git a/j/5/mink.c b/j/5/mink.c index e30cbe81a6..aaf5636e64 100644 --- a/j/5/mink.c +++ b/j/5/mink.c @@ -10,7 +10,7 @@ { u3_noun bus, fol, fly; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_4, &bus, + if ( c3n == u3_cr_mean(cor, u3_cv_sam_4, &bus, u3_cv_sam_5, &fol, u3_cv_sam_3, &fly, 0) ) diff --git a/j/5/mule.c b/j/5/mule.c index 60c1b8bb05..a882bac631 100644 --- a/j/5/mule.c +++ b/j/5/mule.c @@ -9,7 +9,7 @@ { u3_noun tap; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &tap, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &tap, 0) ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/5/parse.c b/j/5/parse.c index 40fdad7d60..1a65844919 100644 --- a/j/5/parse.c +++ b/j/5/parse.c @@ -44,8 +44,8 @@ u3_cx_cell(zyc, &p_zyc, &q_zyc); u3_cx_cell(naz, &p_naz, &q_naz); - if ( u3_ne(u3_ca_is_cat(p_zyc)) || u3_ne(u3_ca_is_cat(q_zyc)) || - u3_ne(u3_ca_is_cat(p_naz)) || u3_ne(u3_ca_is_cat(q_naz)) ) + if ( !_(u3_ca_is_cat(p_zyc)) || !_(u3_ca_is_cat(q_zyc)) || + !_(u3_ca_is_cat(p_naz)) || !_(u3_ca_is_cat(q_naz)) ) { return u3_cm_bail(c3__fail); } else { @@ -66,7 +66,7 @@ u3_noun zac; u3_cx_cell(tub, &p_tub, &q_tub); - if ( u3_no == u3du(q_tub) ) { + if ( c3n == u3du(q_tub) ) { return _fail(tub); } else { @@ -94,7 +94,7 @@ u3_noun p_vex, q_vex; u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return u3k(vex); } else { u3_noun uq_vex = u3t(q_vex); @@ -109,7 +109,7 @@ u3_cx_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); - if ( u3_no == u3du(q_yit) ) { + if ( c3n == u3du(q_yit) ) { ret = u3nc(yur, u3k(q_vex)); } else { @@ -145,10 +145,10 @@ { u3_noun van, raq, vex, sab; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, u3_cv_con, &van, 0)) || - (u3_none == (raq = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (raq = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -169,7 +169,7 @@ u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return vex; } else { @@ -194,8 +194,8 @@ { u3_noun van, cus, sef, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_no == u3_cr_mean(van, u3_cv_sam_2, &cus, u3_cv_sam_3, &sef, 0)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || + (c3n == u3_cr_mean(van, u3_cv_sam_2, &cus, u3_cv_sam_3, &sef, 0)) ) { return u3_cm_bail(c3__fail); } else { @@ -216,7 +216,7 @@ u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return vex; } else { @@ -243,8 +243,8 @@ { u3_noun van, poq, sef, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_no == u3_cr_mean(van, u3_cv_sam_2, &poq, u3_cv_sam_3, &sef, 0)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || + (c3n == u3_cr_mean(van, u3_cv_sam_2, &poq, u3_cv_sam_3, &sef, 0)) ) { return u3_cm_bail(c3__fail); } else { @@ -263,7 +263,7 @@ u3_noun p_vex, q_vex; u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return u3k(vex); } else { u3_noun uq_vex = u3t(q_vex); @@ -278,7 +278,7 @@ u3_cx_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); - if ( u3_no == u3du(q_yit) ) { + if ( c3n == u3du(q_yit) ) { ret = u3nc(yur, u3k(q_yit)); } else { @@ -307,10 +307,10 @@ { u3_noun van, raq, vex, sab; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, u3_cv_con, &van, 0)) || - (u3_none == (raq = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (raq = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -339,8 +339,8 @@ { u3_noun van, huf, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_none == (huf = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || + (c3nne == (huf = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -359,7 +359,7 @@ u3_noun p_vex, q_vex; u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return u3k(vex); } else { @@ -375,7 +375,7 @@ u3_cx_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); - if ( u3_no == u3du(q_yit) ) { + if ( c3n == u3du(q_yit) ) { ret = u3nc(yur, u3_nul); } else { @@ -390,7 +390,7 @@ goy = _last(yur, p_wam); u3z(yur); - if ( u3_no == u3du(q_wam) ) { + if ( c3n == u3du(q_wam) ) { ret = u3nc(goy, u3_nul); } else { u3_noun uq_wam = u3t(q_wam); @@ -416,10 +416,10 @@ { u3_noun van, bus, vex, sab; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, u3_cv_con, &van, 0)) || - (u3_none == (bus = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (bus = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -440,7 +440,7 @@ u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return vex; } else { @@ -475,8 +475,8 @@ { u3_noun van, hez, sef, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_no == u3_cr_mean(van, u3_cv_sam_2, &hez, u3_cv_sam_3, &sef, 0)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || + (c3n == u3_cr_mean(van, u3_cv_sam_2, &hez, u3_cv_sam_3, &sef, 0)) ) { return u3_cm_bail(c3__fail); } @@ -496,13 +496,13 @@ u3_cx_cell(tub, &p_tub, &q_tub); - if ( u3_no == u3du(q_tub) ) { + if ( c3n == u3du(q_tub) ) { return _fail(tub); } else { u3_noun iq_tub = u3h(q_tub); - if ( u3_yes == u3_cr_sing(daf, iq_tub) ) { + if ( c3y == u3_cr_sing(daf, iq_tub) ) { return _next(tub); } else return _fail(tub); @@ -514,8 +514,8 @@ { u3_noun van, daf, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_none == (daf = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || + (c3nne == (daf = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -534,14 +534,14 @@ u3_cx_cell(tub, &p_tub, &q_tub); - if ( u3_no == u3du(q_tub) ) { + if ( c3n == u3du(q_tub) ) { return _fail(tub); } else { u3_noun iq_tub = u3h(q_tub); - while ( u3_yes == u3du(bud) ) { - if ( u3_yes == u3_cr_sing(u3h(bud), iq_tub) ) { + while ( c3y == u3du(bud) ) { + if ( c3y == u3_cr_sing(u3h(bud), iq_tub) ) { return _next(tub); } bud = u3t(bud); @@ -555,8 +555,8 @@ { u3_noun van, bud, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_none == (bud = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || + (c3nne == (bud = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -573,7 +573,7 @@ u3_noun p_vex, q_vex; u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return u3k(vex); } else { @@ -601,7 +601,7 @@ { u3_noun vex, sab; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { return u3_cm_bail(c3__exit); } else { return _cqe_pfix(vex, sab); @@ -618,7 +618,7 @@ u3_noun p_vex, q_vex; u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return u3k(vex); } else { @@ -634,7 +634,7 @@ u3_cx_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); - if ( u3_no == u3du(q_yit) ) { + if ( c3n == u3du(q_yit) ) { ret = u3nc(yur, u3k(q_yit)); } else { @@ -658,7 +658,7 @@ { u3_noun vex, sab; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { return u3_cm_bail(c3__exit); } else { return _cqe_plug(vex, sab); @@ -674,7 +674,7 @@ u3_noun p_vex, q_vex; u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_yes == u3du(q_vex) ) { + if ( c3y == u3du(q_vex) ) { return u3k(vex); } else { u3_noun roq = u3_cx_good(u3_cn_kick_on(u3k(sab))); @@ -697,7 +697,7 @@ { u3_noun vex, sab; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqe_pose(vex, sab); @@ -712,7 +712,7 @@ u3_noun p_vex, q_vex; u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return u3k(vex); } else { @@ -727,7 +727,7 @@ u3_cx_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); - if ( u3_no == u3du(q_yit) ) { + if ( c3n == u3du(q_yit) ) { ret = u3nc(yur, u3_nul); } else { @@ -750,7 +750,7 @@ { u3_noun vex, sab; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { return u3_cm_bail(c3__exit); } else { return _cqe_sfix(vex, sab); @@ -767,7 +767,7 @@ u3_cx_cell(tub, &p_tub, &q_tub); - if ( u3_no == u3du(q_tub) ) { + if ( c3n == u3du(q_tub) ) { return _fail(tub); } else { @@ -775,9 +775,9 @@ u3_noun iq_tub = u3h(q_tub); u3_cx_cell(zep, &p_zep, &q_zep); - if ( u3_so(u3_ca_is_cat(p_zep)) && - u3_so(u3_ca_is_cat(q_zep)) && - u3_so(u3_ca_is_cat(iq_tub)) ) + if ( _(u3_ca_is_cat(p_zep)) && + _(u3_ca_is_cat(q_zep)) && + _(u3_ca_is_cat(iq_tub)) ) { if ( (iq_tub >= p_zep) && (iq_tub <= q_zep) ) { return _next(tub); @@ -795,8 +795,8 @@ { u3_noun van, zep, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_none == (zep = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || + (c3nne == (zep = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -817,7 +817,7 @@ u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { return vex; } else { @@ -844,8 +844,8 @@ { u3_noun van, gob, sef, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_no == u3_cr_mean(van, u3_cv_sam_2, &gob, u3_cv_sam_3, &sef, 0)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || + (c3n == u3_cr_mean(van, u3_cv_sam_2, &gob, u3_cv_sam_3, &sef, 0)) ) { return u3_cm_bail(c3__fail); } else { @@ -860,23 +860,23 @@ u3_noun ort, u3_noun wan) { - if ( u3_ne(u3_ca_is_cat(ort)) ) { + if ( !_(u3_ca_is_cat(ort)) ) { return u3_cm_bail(c3__fail); } else { - if ( u3_no == u3du(wan) ) { - if ( u3_ne(u3_ca_is_cat(wan)) ) { + if ( c3n == u3du(wan) ) { + if ( !_(u3_ca_is_cat(wan)) ) { return u3_cm_bail(c3__fail); } - else return (ort < wan) ? u3_yes : u3_no; + else return (ort < wan) ? c3y : c3n; } else { u3_noun h_wan = u3h(wan); - if ( u3_ne(u3_ca_is_cat(h_wan)) ) { + if ( !_(u3_ca_is_cat(h_wan)) ) { return u3_cm_bail(c3__fail); } - else return (ort < h_wan) ? u3_yes : u3_no; + else return (ort < h_wan) ? c3y : c3n; } } } @@ -889,17 +889,17 @@ u3_noun p_tub, q_tub; u3_cx_cell(tub, &p_tub, &q_tub); - if ( u3_no == u3du(q_tub) ) { + if ( c3n == u3du(q_tub) ) { return _fail(tub); } else { u3_noun iq_tub = u3h(q_tub); - if ( u3_ne(u3_ca_is_cat(iq_tub)) ) { + if ( !_(u3_ca_is_cat(iq_tub)) ) { return u3_cm_bail(c3__fail); } else while ( 1 ) { - if ( u3_no == u3du(hel) ) { + if ( c3n == u3du(hel) ) { return _fail(tub); } else { @@ -910,25 +910,25 @@ u3_cx_trel(hel, &n_hel, &l_hel, &r_hel); u3_cx_cell(n_hel, &pn_hel, &qn_hel); - if ( (u3_no == u3du(pn_hel)) ) { - bit_o = u3_say((iq_tub == pn_hel)); + if ( (c3n == u3du(pn_hel)) ) { + bit_o = __((iq_tub == pn_hel)); } else { u3_noun hpn_hel = u3h(pn_hel); u3_noun tpn_hel = u3t(pn_hel); - if ( u3_ne(u3_ca_is_cat(hpn_hel)) || - u3_ne(u3_ca_is_cat(tpn_hel)) ) { + if ( !_(u3_ca_is_cat(hpn_hel)) || + !_(u3_ca_is_cat(tpn_hel)) ) { return _fail(tub); } - else bit_o = u3_say((iq_tub >= hpn_hel) && (iq_tub <= tpn_hel)); + else bit_o = __((iq_tub >= hpn_hel) && (iq_tub <= tpn_hel)); } - if ( u3_yes == bit_o ) { + if ( c3y == bit_o ) { return u3_cx_good (u3_cn_slam_on(u3k(qn_hel), u3k(tub))); } else { - if ( u3_yes == _stew_wor(iq_tub, pn_hel) ) { + if ( c3y == _stew_wor(iq_tub, pn_hel) ) { hel = l_hel; } else hel = r_hel; @@ -943,8 +943,8 @@ { u3_noun con, hel, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &con, 0)) || - (u3_none == (hel = u3_cr_at(2, con))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &con, 0)) || + (c3nne == (hel = u3_cr_at(2, con))) ) { return u3_cm_bail(c3__fail); } else { @@ -965,7 +965,7 @@ u3_noun ret; u3_cx_cell(vex, &p_vex, &q_vex); - if ( u3_no == u3du(q_vex) ) { + if ( c3n == u3du(q_vex) ) { ret = u3nq(u3k(p_vex), u3_nul, u3k(rud), @@ -980,7 +980,7 @@ wag = _cqe_stir_fun(rud, raq, fel, quq_vex); u3_cx_cell(wag, &p_wag, &q_wag); - if ( u3_no == u3du(q_wag) ) { + if ( c3n == u3du(q_wag) ) { return u3_cm_bail(c3__fail); } uq_wag = u3t(q_wag); @@ -1005,8 +1005,8 @@ { u3_noun van, rud, raq, fel, tub; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_no == u3_cr_mean(van, u3_cv_sam_2, &rud, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || + (c3n == u3_cr_mean(van, u3_cv_sam_2, &rud, u3_cv_sam_6, &raq, u3_cv_sam_7, &fel, 0)) ) diff --git a/j/5/rd.c b/j/5/rd.c index c77f5d27f0..2630b22063 100644 --- a/j/5/rd.c +++ b/j/5/rd.c @@ -29,8 +29,8 @@ union doub { { u3_noun a; - if (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, 0) - || u3_no == u3ud(a)) { + if (c3n == u3_cr_mean(cor, u3_cv_sam, &a, 0) + || c3n == u3ud(a)) { return u3_cm_bail(c3__exit); } else { @@ -56,9 +56,9 @@ union doub { { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } @@ -85,9 +85,9 @@ union doub { { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } @@ -114,9 +114,9 @@ union doub { { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } @@ -143,9 +143,9 @@ union doub { { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } @@ -163,7 +163,7 @@ union doub { c.c = u3_cr_chub(0, a); d.c = u3_cr_chub(0, b); - return u3_say(c.d <= d.d); + return __(c.d <= d.d); } u3_noun @@ -171,9 +171,9 @@ union doub { { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } @@ -191,7 +191,7 @@ union doub { c.c = u3_cr_chub(0, a); d.c = u3_cr_chub(0, b); - return u3_say(c.d < d.d); + return __(c.d < d.d); } u3_noun @@ -199,9 +199,9 @@ union doub { { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } @@ -219,7 +219,7 @@ union doub { c.c = u3_cr_chub(0, a); d.c = u3_cr_chub(0, b); - return u3_say(c.d >= d.d); + return __(c.d >= d.d); } u3_noun @@ -227,9 +227,9 @@ union doub { { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } @@ -247,7 +247,7 @@ union doub { c.c = u3_cr_chub(0, a); d.c = u3_cr_chub(0, b); - return u3_say(c.d > d.d); + return __(c.d > d.d); } u3_noun @@ -255,9 +255,9 @@ union doub { { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || - u3_no == u3ud(a) || - u3_no == u3ud(b) ) + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + c3n == u3ud(a) || + c3n == u3ud(b) ) { return u3_cm_bail(c3__exit); } diff --git a/j/5/repg.c b/j/5/repg.c index 54f7819445..1f28588e8f 100644 --- a/j/5/repg.c +++ b/j/5/repg.c @@ -128,9 +128,9 @@ u3_noun rad; u3_noun rep; - if ( (u3_none == (lub = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (rad = u3_cr_at(u3_cv_sam_6, cor))) || - (u3_none == (rep = u3_cr_at(u3_cv_sam_7, cor))) ) + if ( (c3nne == (lub = u3_cr_at(u3_cv_sam_2, cor))) || + (c3nne == (rad = u3_cr_at(u3_cv_sam_6, cor))) || + (c3nne == (rep = u3_cr_at(u3_cv_sam_7, cor))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/5/rexp.c b/j/5/rexp.c index 7bbd08b175..1bed65827b 100644 --- a/j/5/rexp.c +++ b/j/5/rexp.c @@ -129,8 +129,8 @@ u3_noun lub; u3_noun rad; - if ( (u3_none == (lub = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (rad = u3_cr_at(u3_cv_sam_3, cor))) ) + if ( (c3nne == (lub = u3_cr_at(u3_cv_sam_2, cor))) || + (c3nne == (rad = u3_cr_at(u3_cv_sam_3, cor))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/5/rub.c b/j/5/rub.c index a617c7ec26..c81c228c66 100644 --- a/j/5/rub.c +++ b/j/5/rub.c @@ -26,7 +26,7 @@ u3_atom y = u3_cqa_inc(x); // Sanity check: crash if decoding more bits than available - if ( u3_yes == u3_cqa_gth(x, m)) { + if ( c3y == u3_cqa_gth(x, m)) { // fprintf(stderr, "[%%rub-hard %d %d %d]\r\n", a, x, m); return u3_cm_bail(c3__exit); } @@ -34,7 +34,7 @@ u3z(x); x = y; } - if ( u3_yes == u3_cr_sing(x, a) ) { + if ( c3y == u3_cr_sing(x, a) ) { u3z(x); return u3nc(1, 0); } @@ -71,9 +71,9 @@ { u3_noun a, b; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || - (u3_no == u3ud(a)) || - (u3_no == u3ud(b)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + (c3n == u3ud(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/5/shax.c b/j/5/shax.c index d13c1a57c6..a6c3f571df 100644 --- a/j/5/shax.c +++ b/j/5/shax.c @@ -45,7 +45,7 @@ u3_cqe_shal(u3_atom a, u3_atom b) { - c3_assert(u3_so(u3_ca_is_cat(a))); + c3_assert(_(u3_ca_is_cat(a))); c3_y* fat_y = c3_malloc(a + 1); u3_cr_bytes(0, a, fat_y, b); @@ -87,8 +87,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || - (u3_no == u3ud(a)) ) + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } else { @@ -101,11 +101,11 @@ { u3_noun a, b; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (b = u3_cr_at(u3_cv_sam_3, cor))) || - (u3_no == u3ud(a)) || - (u3_no == u3_ca_is_cat(a)) || - (u3_no == u3ud(b)) ) + if ( (c3nne == (a = u3_cr_at(u3_cv_sam_2, cor))) || + (c3nne == (b = u3_cr_at(u3_cv_sam_3, cor))) || + (c3n == u3ud(a)) || + (c3n == u3_ca_is_cat(a)) || + (c3n == u3ud(b)) ) { return u3_cm_bail(c3__exit); } else { @@ -118,10 +118,10 @@ { u3_noun sal, ruz; - if ( (u3_none == (sal = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (ruz = u3_cr_at(u3_cv_sam_3, cor))) || - (u3_no == u3ud(sal)) || - (u3_no == u3ud(ruz)) ) + if ( (c3nne == (sal = u3_cr_at(u3_cv_sam_2, cor))) || + (c3nne == (ruz = u3_cr_at(u3_cv_sam_3, cor))) || + (c3n == u3ud(sal)) || + (c3n == u3ud(ruz)) ) { return u3_cm_bail(c3__exit); } else { @@ -137,7 +137,7 @@ { u3_noun l = u3_nul; - if ( u3_ne(u3_ca_is_cat(b)) ) { + if ( !_(u3_ca_is_cat(b)) ) { return u3_cm_bail(c3__fail); } while ( 0 != b ) { @@ -185,7 +185,7 @@ { u3_noun a, b; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { return u3_cm_bail(c3__exit); } else { return u3_cqeo_raw(a, b); diff --git a/j/5/tape.c b/j/5/tape.c index 78ebad7e18..42cd854ddc 100644 --- a/j/5/tape.c +++ b/j/5/tape.c @@ -11,10 +11,10 @@ _norm( u3_noun a) { - if ( u3_no == u3du(a) ) { + if ( c3n == u3du(a) ) { return u3_nul; } else { - return u3nc(((u3_yes == u3du(u3h(a))) ? u3_nul : u3k(u3h(a))), + return u3nc(((c3y == u3du(u3h(a))) ? u3_nul : u3k(u3h(a))), _norm(u3t(a))); } } @@ -25,10 +25,10 @@ { while ( 1 ) { if ( u3_nul == a ) { - return u3_yes; + return c3y; } - if ( u3_no == u3ud(u3h(a)) ) { - return u3_no; + if ( c3n == u3ud(u3h(a)) ) { + return c3n; } a = u3t(a); } @@ -37,7 +37,7 @@ u3_noun u3_cqe_tape(u3_noun a) { - if ( u3_yes == _good(a) ) { + if ( c3y == _good(a) ) { return u3k(a); } else { return _norm(a); @@ -48,7 +48,7 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_tape(a); diff --git a/j/5/trip.c b/j/5/trip.c index 59004a8470..f299fdd0be 100644 --- a/j/5/trip.c +++ b/j/5/trip.c @@ -10,7 +10,7 @@ u3_noun u3_cqe_trip(u3_atom a) { - if ( u3_no == u3ud(a) ) { + if ( c3n == u3ud(a) ) { return u3_cm_bail(c3__exit); } return u3_cqc_rip(3, a); @@ -20,7 +20,7 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_trip(a); diff --git a/j/6/ap.c b/j/6/ap.c index 610bd285c3..824c0cf6ff 100644 --- a/j/6/ap.c +++ b/j/6/ap.c @@ -116,7 +116,7 @@ } _open_do_p(tssg) // =~ { - if ( u3_ne(u3du(p_gen)) ) { + if ( !_(u3du(p_gen)) ) { return u3nc(0, 1); } else { u3_noun tp_gen = u3t(p_gen); @@ -181,7 +181,7 @@ _open_do_p(wtbr) // ?| { if ( (u3_nul == p_gen) ) { - return u3nt(c3__dtzz, 'f', u3_no); + return u3nt(c3__dtzz, 'f', c3n); } else { u3_noun ip_gen = u3h(p_gen); @@ -190,7 +190,7 @@ return u3nq (c3__wtcl, u3k(ip_gen), - u3nt(c3__dtzz, 'f', u3_yes), + u3nt(c3__dtzz, 'f', c3y), _open_in_wtbr(ter, tp_gen)); } } @@ -253,7 +253,7 @@ _open_do_p(wtpm) // ?& { if ( (u3_nul == p_gen) ) { - return u3nt(c3__dtzz, 'f', u3_yes); + return u3nt(c3__dtzz, 'f', c3y); } else { u3_noun ip_gen = u3h(p_gen); @@ -263,7 +263,7 @@ (c3__wtcl, u3k(ip_gen), _open_in_wtpm(ter, tp_gen), - u3nt(c3__dtzz, 'f', u3_no)); + u3nt(c3__dtzz, 'f', c3n)); } } _open_do_pqr(wtls) // ?+ @@ -303,8 +303,8 @@ return u3nq (c3__wtcl, u3k(p_gen), - u3nt(c3__dtzz, 'f', u3_no), - u3nt(c3__dtzz, 'f', u3_yes)); + u3nt(c3__dtzz, 'f', c3n), + u3nt(c3__dtzz, 'f', c3y)); } /*** **** @@ -591,7 +591,7 @@ u3_noun r_gen, u3_noun nob) { - if ( u3_no == u3du(r_gen) ) { + if ( c3n == u3du(r_gen) ) { return u3k(nob); } else { u3_noun ir_gen = u3h(r_gen); @@ -672,7 +672,7 @@ u3_noun hq_gen = u3h(q_gen); u3_noun tq_gen = u3t(q_gen); - if ( u3_no == u3du(tq_gen) ) { + if ( c3n == u3du(tq_gen) ) { return u3nt(c3__tsgr, u3nc(u3_nul, 3), u3k(hq_gen)); @@ -691,7 +691,7 @@ } _open_do_pq(smcl) { - if ( u3_no == u3du(q_gen) ) { + if ( c3n == u3du(q_gen) ) { return u3nc(c3__zpzp, u3_nul); } else if ( u3_nul == u3t(q_gen) ) { @@ -744,7 +744,7 @@ { u3_noun p_gen, q_gen, r_gen, s_gen; - if ( u3_yes == u3ud(gen) ) { + if ( c3y == u3ud(gen) ) { // printf("studly\n"); // u3_err("stud m", gen); return u3_cm_bail(c3__exit); @@ -755,7 +755,7 @@ u3_nul); } else switch ( u3h(gen) ) { - default: return u3_none; + default: return c3nne; case u3_nul: { return u3nt @@ -770,19 +770,19 @@ # define _open_pq(stem) \ case c3__##stem: \ - if ( u3_no == u3_cr_cell(u3t(gen), &p_gen, &q_gen) ) { \ + if ( c3n == u3_cr_cell(u3t(gen), &p_gen, &q_gen) ) { \ return u3_cm_bail(c3__fail); \ } else return _open_in_##stem(ter, p_gen, q_gen); # define _open_pqr(stem) \ case c3__##stem: \ - if ( u3_no == u3_cr_trel(u3t(gen), &p_gen, &q_gen, &r_gen) ) { \ + if ( c3n == u3_cr_trel(u3t(gen), &p_gen, &q_gen, &r_gen) ) { \ return u3_cm_bail(c3__fail); \ } else return _open_in_##stem(ter, p_gen, q_gen, r_gen); # define _open_pqrs(stem) \ case c3__##stem: \ - if ( u3_no == u3_cr_qual\ + if ( c3n == u3_cr_qual\ (u3t(gen), &p_gen, &q_gen, &r_gen, &s_gen) )\ { \ return u3_cm_bail(c3__fail); \ @@ -869,7 +869,7 @@ { u3_noun p_gen, q_gen; - if ( u3_yes == u3ud(gen) ) { + if ( c3y == u3ud(gen) ) { return u3nc(u3k(gen), u3_nul); } else switch ( u3h(gen) ) { @@ -884,7 +884,7 @@ return u3k(u3t(gen)); } case c3__cnts: { - if ( u3_no == u3_cr_cell(u3t(gen), &p_gen, &q_gen) ) { + if ( c3n == u3_cr_cell(u3t(gen), &p_gen, &q_gen) ) { return u3_cm_bail(c3__fail); } else { @@ -897,7 +897,7 @@ } } case c3__zpcb: { - if ( u3_no == u3_cr_cell(u3t(gen), &p_gen, &q_gen) ) { + if ( c3n == u3_cr_cell(u3t(gen), &p_gen, &q_gen) ) { return u3_cm_bail(c3__fail); } else return u3_cqfp_rake(q_gen); @@ -910,7 +910,7 @@ { u3_noun gen; - if ( u3_none == (gen = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (gen = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { return u3_cqfp_rake(gen); @@ -927,23 +927,23 @@ u3_noun p_gen, q_gen; u3_noun ret; - if ( u3_yes == u3du(u3h(gen)) ) { - return u3nt(u3_yes, + if ( c3y == u3du(u3h(gen)) ) { + return u3nt(c3y, u3k(u3h(gen)), u3k(u3t(gen))); } else switch ( u3h(gen) ) { case c3__tsgr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); { - if ( (u3_no == u3du(p_gen)) || (u3_nul != u3h(p_gen)) ) { - return u3nc(u3_no, u3k(gen)); + if ( (c3n == u3du(p_gen)) || (u3_nul != u3h(p_gen)) ) { + return u3nc(c3n, u3k(gen)); } else { u3_noun pyr = u3_cqfp_hack(ter, q_gen); - if ( u3_yes == u3h(pyr) ) { + if ( c3y == u3h(pyr) ) { ret = u3nt - (u3_yes, + (c3y, u3nt(c3__tsgr, u3k(p_gen), u3k(u3h(u3t(pyr)))), @@ -953,7 +953,7 @@ } else { ret = u3nc - (u3_no, + (c3n, u3nt(c3__tsgr, u3k(p_gen), u3k(u3t(pyr)))); @@ -966,9 +966,9 @@ { u3_noun pyr = u3_cqfp_hack(ter, q_gen); - if ( u3_yes == u3h(pyr) ) { + if ( c3y == u3h(pyr) ) { ret = u3nt - (u3_yes, + (c3y, u3nt(c3__zpcb, u3k(p_gen), u3k(u3h(u3t(pyr)))), @@ -978,7 +978,7 @@ } else { ret = u3nc - (u3_no, + (c3n, u3nt(c3__zpcb, u3k(p_gen), u3k(u3t(pyr)))); @@ -992,11 +992,11 @@ { u3_noun voq = _ap_open_l(ter, gen); - if ( u3_none == voq ) { - return u3nc(u3_no, u3k(gen)); + if ( c3nne == voq ) { + return u3nc(c3n, u3k(gen)); } - else if ( u3_yes == u3_cr_sing(voq, gen) ) { - return u3nc(u3_no, voq); + else if ( c3y == u3_cr_sing(voq, gen) ) { + return u3nc(c3n, voq); } else { ret = u3_cqfp_hack(ter, voq); @@ -1013,7 +1013,7 @@ { u3_noun gen; - if ( u3_none == (gen = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (gen = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { u3_noun ter = u3_cr_at(u3_cv_con, cor); @@ -1047,7 +1047,7 @@ { u3_noun pro = _open_in(ter, gen); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { return _ap_open_n(ter, gen); @@ -1065,7 +1065,7 @@ { u3_noun gen; - if ( u3_none == (gen = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (gen = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { u3_noun ter = u3_cr_at(u3_cv_con, cor); diff --git a/j/6/bull.c b/j/6/bull.c index 8aafaa0ca2..bad6ab1743 100644 --- a/j/6/bull.c +++ b/j/6/bull.c @@ -26,7 +26,7 @@ { u3_noun bid, der; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &bid, u3_cv_sam_3, &der, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &bid, u3_cv_sam_3, &der, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_bull(bid, der); diff --git a/j/6/cell.c b/j/6/cell.c index ca0ed35515..14859c03d0 100644 --- a/j/6/cell.c +++ b/j/6/cell.c @@ -22,7 +22,7 @@ { u3_noun hed, tal; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &hed, u3_cv_sam_3, &tal, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &hed, u3_cv_sam_3, &tal, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_cell(hed, tal); diff --git a/j/6/comb.c b/j/6/comb.c index 0e298693ab..328f992bfb 100644 --- a/j/6/comb.c +++ b/j/6/comb.c @@ -12,21 +12,21 @@ u3_noun mal, u3_noun buz) { - if ( (u3_none == mal) || (u3_none == buz) ) { - return u3_none; + if ( (c3nne == mal) || (c3nne == buz) ) { + return c3nne; } else { u3_noun p_mal, q_mal, p_buz, q_buz, pp_buz, pq_buz; - if ( (u3_yes == u3_cr_p(mal, 0, &p_mal)) && (0 != p_mal) ) { - if ( (u3_yes == u3_cr_p(buz, 0, &p_buz)) && (0 != p_buz) ) { + if ( (c3y == u3_cr_p(mal, 0, &p_mal)) && (0 != p_mal) ) { + if ( (c3y == u3_cr_p(buz, 0, &p_buz)) && (0 != p_buz) ) { return u3nc( 0, u3_cqc_peg(p_mal, p_buz)); } - else if ( u3_yes == u3_cr_pq(buz, 2, &p_buz, &q_buz) && - u3_yes == u3_cr_p(p_buz, 0, &pp_buz) && - u3_yes == u3_cr_p(q_buz, 0, &pq_buz) ) + else if ( c3y == u3_cr_pq(buz, 2, &p_buz, &q_buz) && + c3y == u3_cr_p(p_buz, 0, &pp_buz) && + c3y == u3_cr_p(q_buz, 0, &pq_buz) ) { return u3nt (2, @@ -39,9 +39,9 @@ u3k(buz)); } #if 1 - else if ( (u3_yes == u3_cr_bush(mal, &p_mal, &q_mal)) && - (u3_yes == u3du(p_mal)) && - (u3_yes == u3du(q_mal)) && + else if ( (c3y == u3_cr_bush(mal, &p_mal, &q_mal)) && + (c3y == u3du(p_mal)) && + (c3y == u3du(q_mal)) && (0 == u3h(q_mal)) && (1 == u3t(q_mal)) ) { @@ -49,8 +49,8 @@ u3k(buz)); } #endif - else if ( (u3_yes == u3_cr_p(buz, 0, &p_buz)) && - (u3_yes == u3_cr_sing(1, p_buz)) ) + else if ( (c3y == u3_cr_p(buz, 0, &p_buz)) && + (c3y == u3_cr_sing(1, p_buz)) ) { return u3k(mal); } @@ -64,8 +64,8 @@ { u3_noun mal, buz; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &mal, u3_cv_sam_3, &buz, 0) ) { - return u3_none; + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &mal, u3_cv_sam_3, &buz, 0) ) { + return c3nne; } else { return u3_cqf_comb(mal, buz); } diff --git a/j/6/cons.c b/j/6/cons.c index e61798fb5a..c6f2ebe577 100644 --- a/j/6/cons.c +++ b/j/6/cons.c @@ -14,22 +14,22 @@ { u3_noun p_vur, p_sed; - if ( u3_yes == u3_cr_p(vur, 1, &p_vur) && - u3_yes == u3_cr_p(sed, 1, &p_sed) ) { + if ( c3y == u3_cr_p(vur, 1, &p_vur) && + c3y == u3_cr_p(sed, 1, &p_sed) ) { return u3nt(1, u3k(p_vur), u3k(p_sed)); } - else if ( u3_yes == u3_cr_p(vur, 0, &p_vur) && - u3_yes == u3_cr_p(sed, 0, &p_sed) && - !(u3_yes == u3_cr_sing(1, p_vur)) && - !(u3_yes == u3_cr_sing(p_vur, p_sed)) && + else if ( c3y == u3_cr_p(vur, 0, &p_vur) && + c3y == u3_cr_p(sed, 0, &p_sed) && + !(c3y == u3_cr_sing(1, p_vur)) && + !(c3y == u3_cr_sing(p_vur, p_sed)) && (0 == u3_cr_nord(p_vur, p_sed)) ) { u3_atom fub = u3_cqa_div(p_vur, 2); u3_atom nof = u3_cqa_div(p_sed, 2); - if ( u3_yes == u3_cr_sing(fub, nof) ) { + if ( c3y == u3_cr_sing(fub, nof) ) { u3z(nof); return u3nc(0, fub); @@ -47,7 +47,7 @@ { u3_noun vur, sed; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vur, u3_cv_sam_3, &sed, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &vur, u3_cv_sam_3, &sed, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_cons(vur, sed); diff --git a/j/6/core.c b/j/6/core.c index 57f651693d..0f696a788b 100644 --- a/j/6/core.c +++ b/j/6/core.c @@ -24,7 +24,7 @@ { u3_noun pac, con; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &pac, u3_cv_sam_3, &con, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &pac, u3_cv_sam_3, &con, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_core(pac, con); diff --git a/j/6/cube.c b/j/6/cube.c index 4865d8b94b..843aadc255 100644 --- a/j/6/cube.c +++ b/j/6/cube.c @@ -24,7 +24,7 @@ { u3_noun dil, goq; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &dil, u3_cv_sam_3, &goq, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &dil, u3_cv_sam_3, &goq, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_cube(dil, goq); diff --git a/j/6/face.c b/j/6/face.c index 456e2dbc92..9753bb5621 100644 --- a/j/6/face.c +++ b/j/6/face.c @@ -24,7 +24,7 @@ { u3_noun cog, tip; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &cog, u3_cv_sam_3, &tip, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &cog, u3_cv_sam_3, &tip, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_face(cog, tip); diff --git a/j/6/fine.c b/j/6/fine.c index d8b45f9caf..eb5e589e0e 100644 --- a/j/6/fine.c +++ b/j/6/fine.c @@ -27,7 +27,7 @@ { u3_noun fuv, lup, mar; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &fuv, + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &fuv, u3_cv_sam_6, &lup, u3_cv_sam_7, &mar, 0) ) { return u3_cm_bail(c3__fail); diff --git a/j/6/fitz.c b/j/6/fitz.c index ae63b123b1..40da480b20 100644 --- a/j/6/fitz.c +++ b/j/6/fitz.c @@ -24,10 +24,10 @@ if ( yaz_y && wix_y ) { if ( !wix_y || (wix_y > yaz_y) ) { - return u3_no; + return c3n; } } - return u3_yes; + return c3y; } u3_noun @@ -37,8 +37,8 @@ { c3_w i_w, met_w = c3_min(u3_cr_met(3, yaz), u3_cr_met(3, wix)); - if ( u3_no == _fitz_fiz(yaz, wix) ) { - return u3_no; + if ( c3n == _fitz_fiz(yaz, wix) ) { + return c3n; } for ( i_w = 0; i_w < met_w; i_w++ ) { c3_y yaz_y = u3_cr_byte(i_w, yaz); @@ -48,10 +48,10 @@ if ( (wix_y >= 'A') && (wix_y <= 'Z') ) wix_y = 0; if ( yaz_y && wix_y && (yaz_y != wix_y) ) { - return u3_no; + return c3n; } } - return u3_yes; + return c3y; } u3_noun @@ -60,9 +60,9 @@ { u3_noun yaz, wix; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &yaz, u3_cv_sam_3, &wix, 0)) || - (u3_no == u3ud(yaz)) || - (u3_no == u3ud(wix)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &yaz, u3_cv_sam_3, &wix, 0)) || + (c3n == u3ud(yaz)) || + (c3n == u3ud(wix)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/flan.c b/j/6/flan.c index b84cc99096..26a335d6d0 100644 --- a/j/6/flan.c +++ b/j/6/flan.c @@ -12,14 +12,14 @@ u3_noun bos, u3_noun nif) { - if ( u3_yes == u3_cr_sing(1, u3h(bos)) ) { + if ( c3y == u3_cr_sing(1, u3h(bos)) ) { if ( (u3_nul == u3t(bos)) ) { return u3k(nif); } else return u3k(bos); } else { - if ( u3_yes == u3_cr_sing(1, u3h(nif)) ) { + if ( c3y == u3_cr_sing(1, u3h(nif)) ) { if ( (u3_nul == u3t(nif)) ) { return u3k(bos); } @@ -30,7 +30,7 @@ (6, u3k(bos), u3k(nif), - u3nc(1, u3_no)); + u3nc(1, c3n)); } } } @@ -40,7 +40,7 @@ { u3_noun bos, nif; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &bos, u3_cv_sam_3, &nif, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &bos, u3_cv_sam_3, &nif, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_flan(bos, nif); diff --git a/j/6/flay.c b/j/6/flay.c index 8927847687..a01845c599 100644 --- a/j/6/flay.c +++ b/j/6/flay.c @@ -11,7 +11,7 @@ _flay_roll( u3_noun quz) { - if ( u3_no == u3du(quz) ) { + if ( c3n == u3du(quz) ) { return c3__void; } else { u3_noun voo = _flay_roll(u3t(quz)); @@ -33,9 +33,9 @@ switch ( u3h(q_pok) ) { default: return u3_cm_bail(c3__fail); - case u3_yes: typ = u3k(u3t(q_pok)); + case c3y: typ = u3k(u3t(q_pok)); break; - case u3_no: typ = _flay_roll(u3t(u3t(q_pok))); + case c3n: typ = _flay_roll(u3t(u3t(q_pok))); break; } return u3nc(u3k(p_pok), typ); @@ -47,8 +47,8 @@ { u3_noun pok; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &pok, 0)) || - (u3_no == u3du(pok)) ) { + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &pok, 0)) || + (c3n == u3du(pok)) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_flay(pok); diff --git a/j/6/flip.c b/j/6/flip.c index 01739a3d47..462e8fbb8a 100644 --- a/j/6/flip.c +++ b/j/6/flip.c @@ -11,22 +11,22 @@ u3_cqf_flip( u3_noun hel) { - if ( u3_yes == u3_cr_sing(1, u3h(hel)) ) { - if ( (u3_yes == u3t(hel)) ) { - return u3nc(1, u3_no); + if ( c3y == u3_cr_sing(1, u3h(hel)) ) { + if ( (c3y == u3t(hel)) ) { + return u3nc(1, c3n); } else { - c3_assert((u3_no == u3t(hel))); + c3_assert((c3n == u3t(hel))); - return u3nc(1, u3_yes); + return u3nc(1, c3y); } } else { return u3nq (6, u3k(hel), - u3nc(1, u3_no), - u3nc(1, u3_yes)); + u3nc(1, c3n), + u3nc(1, c3y)); } } u3_noun @@ -35,7 +35,7 @@ { u3_noun hel; - if ( u3_none == (hel = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (hel = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_flip(hel); diff --git a/j/6/flor.c b/j/6/flor.c index 497a6f6aa4..4aefab2383 100644 --- a/j/6/flor.c +++ b/j/6/flor.c @@ -12,14 +12,14 @@ u3_noun bos, u3_noun nif) { - if ( u3_yes == u3_cr_sing(1, u3h(bos)) ) { + if ( c3y == u3_cr_sing(1, u3h(bos)) ) { if ( (u3_nul == u3t(bos)) ) { return u3k(bos); } else return u3k(nif); } else { - if ( u3_yes == u3_cr_sing(1, u3h(nif)) ) { + if ( c3y == u3_cr_sing(1, u3h(nif)) ) { if ( (u3_nul == u3t(nif)) ) { return u3k(nif); } @@ -29,7 +29,7 @@ return u3nq (6, u3k(bos), - u3nc(1, u3_yes), + u3nc(1, c3y), u3k(nif)); } } @@ -40,7 +40,7 @@ { u3_noun bos, nif; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &bos, u3_cv_sam_3, &nif, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &bos, u3_cv_sam_3, &nif, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_flor(bos, nif); diff --git a/j/6/fork.c b/j/6/fork.c index 111b3f7cec..7dd4729eec 100644 --- a/j/6/fork.c +++ b/j/6/fork.c @@ -12,7 +12,7 @@ u3_noun hoz, u3_noun bur) { - if ( u3_yes == u3_cr_sing(hoz, bur) ) { + if ( c3y == u3_cr_sing(hoz, bur) ) { return u3k(hoz); } else if ( c3__void == bur ) { @@ -30,7 +30,7 @@ { u3_noun hoz, bur; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &hoz, u3_cv_sam_3, &bur, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &hoz, u3_cv_sam_3, &bur, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_fork(hoz, bur); diff --git a/j/6/hike.c b/j/6/hike.c index d8428bc594..9ede557f8e 100644 --- a/j/6/hike.c +++ b/j/6/hike.c @@ -21,7 +21,7 @@ u3_noun tool = u3t(u3h(pac)); u3_noun list_tool = _lily_hike_belt_root(u3t(pac)); - if ( u3_yes == u3_cr_sing(1, axis) ) { + if ( c3y == u3_cr_sing(1, axis) ) { return u3nc(u3k(tool), list_tool); } @@ -45,7 +45,7 @@ { if ( (1 != axis) && - (u3_yes == u3_cr_sing(2, u3_cqc_cap(axis))) ) + (c3y == u3_cr_sing(2, u3_cqc_cap(axis))) ) { u3_atom axis_tap = u3_cqc_mas(axis); @@ -76,7 +76,7 @@ { if ( (1 != axis) && - (u3_yes == u3_cr_sing(3, u3_cqc_cap(axis))) ) + (c3y == u3_cr_sing(3, u3_cqc_cap(axis))) ) { u3_atom axis_tap = u3_cqc_mas(axis); @@ -135,8 +135,8 @@ { u3_noun axe, pac; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &axe, u3_cv_sam_3, &pac, 0)) || - (u3_no == u3ud(axe)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &axe, u3_cv_sam_3, &pac, 0)) || + (c3n == u3ud(axe)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/look.c b/j/6/look.c index 5becdf8c5c..58041823ed 100644 --- a/j/6/look.c +++ b/j/6/look.c @@ -20,7 +20,7 @@ u3_noun n_dab, l_dab, r_dab; u3_cr_trel(dab, &n_dab, &l_dab, &r_dab); - if ( u3_no == u3du(n_dab) ) { + if ( c3n == u3du(n_dab) ) { return u3_cm_bail(c3__fail); } else { @@ -28,8 +28,8 @@ u3_noun qn_dab = u3t(n_dab); if ( (u3_nul == l_dab) && (u3_nul == r_dab) ) { - if ( (u3_yes == u3du(qn_dab)) && - (u3_yes == u3_cr_sing(cog, pn_dab)) ) { + if ( (c3y == u3du(qn_dab)) && + (c3y == u3_cr_sing(cog, pn_dab)) ) { return u3nt(u3_nul, u3k(axe), u3k(qn_dab)); @@ -39,14 +39,14 @@ } } else if ( (u3_nul == l_dab) ) { - if ( (u3_yes == u3du(qn_dab)) && - (u3_yes == u3_cr_sing(cog, pn_dab)) ) { + if ( (c3y == u3du(qn_dab)) && + (c3y == u3_cr_sing(cog, pn_dab)) ) { return u3nt(u3_nul, u3_cqc_peg(axe, 2), u3k(qn_dab)); } else { - if ( u3_yes == u3_cqc_gor(cog, pn_dab) ) { + if ( c3y == u3_cqc_gor(cog, pn_dab) ) { return u3_nul; } else { @@ -60,14 +60,14 @@ } } else if ( (u3_nul == r_dab) ) { - if ( (u3_yes == u3du(qn_dab)) && - (u3_yes == u3_cr_sing(cog, pn_dab)) ) { + if ( (c3y == u3du(qn_dab)) && + (c3y == u3_cr_sing(cog, pn_dab)) ) { return u3nt(u3_nul, u3_cqc_peg(axe, 2), u3k(qn_dab)); } else { - if ( u3_yes == u3_cqc_gor(cog, pn_dab) ) { + if ( c3y == u3_cqc_gor(cog, pn_dab) ) { u3_noun pro; axe = u3_cqc_peg(axe, 3); @@ -81,14 +81,14 @@ } } else { - if ( (u3_yes == u3du(qn_dab)) && - (u3_yes == u3_cr_sing(cog, pn_dab)) ) { + if ( (c3y == u3du(qn_dab)) && + (c3y == u3_cr_sing(cog, pn_dab)) ) { return u3nt(u3_nul, u3_cqc_peg(axe, 2), u3k(qn_dab)); } else { - if ( u3_yes == u3_cqc_gor(cog, pn_dab) ) { + if ( c3y == u3_cqc_gor(cog, pn_dab) ) { u3_noun pro; axe = u3_cqc_peg(axe, 6); @@ -126,7 +126,7 @@ { u3_noun cog, dab; - if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &cog, u3_cv_sam_3, &dab, 0) ) { + if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &cog, u3_cv_sam_3, &dab, 0) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_look(cog, dab); diff --git a/j/6/slot.c b/j/6/slot.c index a1fdb1a41b..bf9993c1d6 100644 --- a/j/6/slot.c +++ b/j/6/slot.c @@ -14,7 +14,7 @@ fprintf(stderr, "slot axe %d\r\n", axe); - if ( u3_none == fag ) { + if ( c3nne == fag ) { return u3_cm_bail(c3__exit); } else { @@ -22,8 +22,8 @@ } c3_w i_w, met_w = c3_min(u3_cr_met(3, axe), u3_cr_met(3, vax)); - if ( u3_no == _slot_fiz(axe, vax) ) { - return u3_no; + if ( c3n == _slot_fiz(axe, vax) ) { + return c3n; } for ( i_w = 0; i_w < met_w; i_w++ ) { c3_y axe_y = u3_cr_byte(i_w, axe); @@ -33,10 +33,10 @@ if ( (vax_y >= 'A') && (vax_y <= 'Z') ) vax_y = 0; if ( axe_y && vax_y && (axe_y != vax_y) ) { - return u3_no; + return c3n; } } - return u3_yes; + return c3y; } u3_noun @@ -44,9 +44,9 @@ { u3_noun axe, vax; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &axe, u3_cv_sam_3, &vax, 0)) || - (u3_no == u3ud(axe)) || - (u3_no == u3du(vax)) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &axe, u3_cv_sam_3, &vax, 0)) || + (c3n == u3ud(axe)) || + (c3n == u3du(vax)) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/type.c b/j/6/type.c index 3ee082d8f4..3f8624b5b2 100644 --- a/j/6/type.c +++ b/j/6/type.c @@ -8,7 +8,7 @@ { u3_noun p_sut, q_sut, r_sut; - if ( u3_no == u3du(sut) ) switch ( sut ) { + if ( c3n == u3du(sut) ) switch ( sut ) { default: return u3_cm_bail(c3__fail); case c3__noun: diff --git a/j/6/ut_burn.c b/j/6/ut_burn.c index 44315ea585..5fc4c54e23 100644 --- a/j/6/ut_burn.c +++ b/j/6/ut_burn.c @@ -15,7 +15,7 @@ { u3_noun p_sut, q_sut, pq_sut, qq_sut, rq_sut, prq_sut, qrq_sut; - if ( u3_no == u3du(sut) ) switch ( sut ) { + if ( c3n == u3du(sut) ) switch ( sut ) { default: return u3_cm_bail(c3__fail); case c3__noun: return 0; @@ -59,7 +59,7 @@ } case c3__hold: p_sut = u3t(sut); { - if ( (u3_yes == u3_cqdi_has(gil, sut)) ) { + if ( (c3y == u3_cqdi_has(gil, sut)) ) { u3_noun sux = u3_cqfu_dunq(van, "type", sut); u3_ct_push(u3nc(c3__mean, sux)); @@ -95,7 +95,7 @@ c3_m fun_m = c3__burn; u3_noun pro = u3_cz_find(fun_m, sut); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { @@ -111,7 +111,7 @@ { u3_noun sut; - if ( u3_none == (sut = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (sut = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { return u3_cqfu_burn(cor, sut); diff --git a/j/6/ut_busk.c b/j/6/ut_busk.c index cded03a054..b15731b4db 100644 --- a/j/6/ut_busk.c +++ b/j/6/ut_busk.c @@ -30,12 +30,12 @@ { u3_noun sut, cog, hyp, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &cog, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &cog, u3_cv_sam_3, &hyp, u3_cv_con, &van, 0)) || - (u3_no == u3ud(cog)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3n == u3ud(cog)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_bust.c b/j/6/ut_bust.c index fca21d35a5..05d718553a 100644 --- a/j/6/ut_bust.c +++ b/j/6/ut_bust.c @@ -23,7 +23,7 @@ u3_noun wox = u3_cqfu_mint(van, sut, c3__noun, woo); u3_noun ret = u3_cn_nock_on(yib, u3k(u3t(wox))); - if ( u3_none == ret ) { + if ( c3nne == ret ) { return u3_cm_error("bust-nock"); } u3z(wox); @@ -40,8 +40,8 @@ { u3_noun sut, dib, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &dib, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &dib, u3_cv_con, &van, 0)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -60,7 +60,7 @@ c3_m fun_m = c3__bust; u3_noun pro = u3_cz_find_2(fun_m, sut, dib); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_conk.c b/j/6/ut_conk.c index fa2269a176..2ed309a2da 100644 --- a/j/6/ut_conk.c +++ b/j/6/ut_conk.c @@ -10,7 +10,7 @@ u3_bean _cqfu_conk(u3_noun van, u3_noun sut, u3_noun got) { - if ( u3_yes == u3ud(got) ) { + if ( c3y == u3ud(got) ) { return u3_cqf_face(got, sut); } else switch ( u3h(got) ) { @@ -30,10 +30,10 @@ u3_bean vet = u3_cr_at(u3_cqfu_van_vet, van); u3_noun hed, tal, deh, lat, ret; - if ( u3_yes == vet ) { + if ( c3y == vet ) { u3_noun cel = u3nt(c3__cell, c3__noun, c3__noun); - if ( u3_no == u3_cqfu_nest(van, cel, u3_yes, sut) ) { + if ( c3n == u3_cqfu_nest(van, cel, c3y, sut) ) { return u3_cm_bail(c3__fail); } u3z(cel); @@ -62,10 +62,10 @@ { u3_noun sut, got, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &got, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &got, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_crop.c b/j/6/ut_crop.c index d8456a3073..97159a3976 100644 --- a/j/6/ut_crop.c +++ b/j/6/ut_crop.c @@ -22,7 +22,7 @@ u3_noun rep = u3_cqfu_repo(van, sut); u3_noun ret = _crop_dext(van, rep, ref, bix); - if ( u3_yes == u3_cr_sing(ret, rep) ) { + if ( c3y == u3_cr_sing(ret, rep) ) { if ( c3__void == rep ) { return c3__void; } else { @@ -45,17 +45,17 @@ { u3_noun p_sut, q_sut, p_ref, q_ref; - if ( u3_no == u3du(ref) ) { + if ( c3n == u3du(ref) ) { switch ( ref ) { case c3__void: return u3k(sut); case c3__noun: return c3__void; default: return u3_cm_bail(c3__fail); } } - if ( u3_yes == u3_cr_sing(sut, ref) ) { + if ( c3y == u3_cr_sing(sut, ref) ) { return c3__void; } - if ( u3_no == u3du(sut) ) switch ( sut ) { + if ( c3n == u3du(sut) ) switch ( sut ) { default: return u3_cm_bail(c3__fail); case c3__noun: return _crop_repo(van, sut, ref, bix); @@ -90,8 +90,8 @@ else if ( c3__cell == u3h(ref) ) { u3_cx_cell(u3t(ref), &p_ref, &q_ref); - if ( u3_yes == u3_cqfu_nest - (van, p_ref, u3_no, p_sut) ) + if ( c3y == u3_cqfu_nest + (van, p_ref, c3n, p_sut) ) { u3_noun foz = _crop_dext(van, q_sut, q_ref, bix); u3_noun ret = u3_cqf_cell(p_sut, foz); @@ -113,7 +113,7 @@ case c3__cube: u3_cx_cell(u3t(sut), &p_sut, &q_sut); { if ( (c3__cube == u3h(ref)) && - (u3_yes == u3_cr_sing(p_sut, u3h(u3t(ref)))) ) + (c3y == u3_cr_sing(p_sut, u3h(u3t(ref)))) ) { return c3__void; } @@ -121,7 +121,7 @@ u3_noun foz = _crop_dext(van, q_sut, ref, bix); u3_noun ret; - if ( u3_yes == u3_cqfu_firm(van, foz, p_sut) ) { + if ( c3y == u3_cqfu_firm(van, foz, p_sut) ) { ret = u3_cqf_cube(p_sut, foz); } else ret = c3__void; @@ -153,7 +153,7 @@ { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( u3_yes == u3_cqdi_has(bix, hud) ) { + if ( c3y == u3_cqdi_has(bix, hud) ) { # if 0 u3_noun dun = u3_cqfu_dunq(van, "type", sut); u3_noun niz = u3_cqfu_dunq(van, "over", ref); @@ -235,8 +235,8 @@ { u3_noun sut, ref, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -252,7 +252,7 @@ c3_m fun_m = c3__crop; u3_noun pro = u3_cz_find_2(fun_m, sut, ref); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_cull.c b/j/6/ut_cull.c index ef32b8b355..e9367294ef 100644 --- a/j/6/ut_cull.c +++ b/j/6/ut_cull.c @@ -23,14 +23,14 @@ { u3_noun ret, p_sut, q_sut; - if ( u3_no == u3du(sut) ) switch ( sut ) { + if ( c3n == u3du(sut) ) switch ( sut ) { default: return u3_cm_bail(c3__fail); case c3__noun: { u3_noun pyr = u3_cqfu_repo(van, sut); u3_noun yot = _cqfu_cull(van, pyr, pol, axe, ref); - if ( u3_yes == u3_cr_sing(pyr, yot) ) { + if ( c3y == u3_cr_sing(pyr, yot) ) { ret = u3k(sut); } else { ret = u3k(yot); @@ -55,7 +55,7 @@ u3_noun hic = _cqfu_cull (van, q_sut, pol, axe, ref); - if ( u3_yes == u3_cr_sing(hic, q_sut) ) { + if ( c3y == u3_cr_sing(hic, q_sut) ) { ret = u3k(sut); } else { ret = u3_cqf_bull(p_sut, hic); @@ -97,7 +97,7 @@ u3_noun hic = _cqfu_cull (van, q_sut, pol, axe, ref); - if ( u3_yes == u3_cr_sing(hic, q_sut) ) { + if ( c3y == u3_cr_sing(hic, q_sut) ) { ret = u3k(sut); } else { ret = u3_cqf_face(p_sut, hic); @@ -108,7 +108,7 @@ } case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); { - if ( u3_yes == u3_cqdi_has(vil, sut) ) { + if ( c3y == u3_cqdi_has(vil, sut) ) { return c3__void; } else { u3_noun zoc = u3_cqdi_put(vil, sut); @@ -131,7 +131,7 @@ u3_noun pyr = u3_cqfu_repo(van, sut); u3_noun yot = _cull_in(van, pyr, pol, axe, ref, now, lat, vil); - if ( u3_yes == u3_cr_sing(pyr, yot) ) { + if ( c3y == u3_cr_sing(pyr, yot) ) { if ( c3__void == pyr ) { ret = c3__void; } @@ -157,7 +157,7 @@ u3_noun ref) { if ( 1 == axe ) { - if ( u3_yes == pol ) { + if ( c3y == pol ) { return u3_cqfu_fuse(van, sut, ref); } else { return u3_cqfu_crop(van, sut, ref); @@ -177,12 +177,12 @@ { u3_noun sut, axe, pol, ref, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &pol, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &pol, u3_cv_sam_6, &axe, u3_cv_sam_7, &ref, u3_cv_con, &van, 0)) || - (u3_no == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3n == u3ud(axe)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -200,7 +200,7 @@ c3_m fun_m = c3__cull; u3_noun pro = u3_cz_find_4(fun_m, sut, pol, axe, ref); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_find.c b/j/6/ut_find.c index a8dd38a252..04eeb4abb1 100644 --- a/j/6/ut_find.c +++ b/j/6/ut_find.c @@ -18,18 +18,18 @@ { u3_noun p_sut, q_sut; - if ( u3_yes == u3ud(sut) ) { + if ( c3y == u3ud(sut) ) { return u3nc(u3k(dep), u3_nul); } else switch ( u3h(sut) ) { default: return u3nc(u3k(dep), u3_nul); case c3__bull: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { - if ( u3_no == u3_cr_sing(cog, u3h(p_sut)) ) { + if ( c3n == u3_cr_sing(cog, u3h(p_sut)) ) { return _fino_in (van, q_sut, dep, way, cog, gil); } @@ -51,7 +51,7 @@ } } case c3__cell: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { u3_noun taf = _fino_in(van, p_sut, dep, way, cog, gil); @@ -97,9 +97,9 @@ u3_noun pq_sut, qq_sut, rq_sut; u3_noun prq_sut, qrq_sut; - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || - (u3_no == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || - (u3_no == u3_cr_cell(rq_sut, &prq_sut, &qrq_sut)) ) + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || + (c3n == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || + (c3n == u3_cr_cell(rq_sut, &prq_sut, &qrq_sut)) ) { return u3_cm_bail(c3__fail); } else { @@ -130,7 +130,7 @@ u3_cr_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); - if ( u3_no == u3_cqfu_park + if ( c3n == u3_cqfu_park (van, sut, way, puq_taf) ) { u3_noun weh = u3_cqfu_shep @@ -185,10 +185,10 @@ } } case c3__face: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { - if ( u3_no == u3_cr_sing(cog, p_sut) ) { + if ( c3n == u3_cr_sing(cog, p_sut) ) { return u3nc(u3k(dep), u3_nul); } else { if ( 0 == dep ) { @@ -210,14 +210,14 @@ return pro; } case c3__fork: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } - if ( (u3_yes == u3_cqdi_has(gil, q_sut)) ) { + if ( (c3y == u3_cqdi_has(gil, q_sut)) ) { return _fino_in(van, p_sut, dep, way, cog, gil); } - else if ( (u3_yes == u3_cqdi_has(gil, p_sut)) ) { + else if ( (c3y == u3_cqdi_has(gil, p_sut)) ) { return _fino_in(van, q_sut, dep, way, cog, gil); } else { @@ -238,14 +238,14 @@ u3_cr_mean(q_yor, 6, &puq_yor, 7, &quq_yor, 0); } - if ( u3_yes == u3_cr_sing(hax, yor) ) { + if ( c3y == u3_cr_sing(hax, yor) ) { ret = u3k(hax); } else { - if ( (u3_no == u3_cr_sing(p_hax, p_yor)) || + if ( (c3n == u3_cr_sing(p_hax, p_yor)) || ((u3_nul == q_hax) || (u3_nul == q_yor)) || - (u3_no == u3_cr_sing(puq_hax, puq_yor)) || - (u3_no == u3_cr_sing(u3h(quq_hax), u3h(quq_yor))) ) + (c3n == u3_cr_sing(puq_hax, puq_yor)) || + (c3n == u3_cr_sing(u3h(quq_hax), u3h(quq_yor))) ) { return u3_cm_error("find-fork"); } @@ -271,7 +271,7 @@ u3_cx_cell(u3t(quq_hax), &pquq_hax, &qquq_hax); u3_cx_cell(u3t(quq_yor), &pquq_yor, &qquq_yor); - if ( u3_no == u3_cr_sing(pquq_hax, pquq_yor) ) { + if ( c3n == u3_cr_sing(pquq_hax, pquq_yor) ) { return u3_cm_error("find-fork"); } else { ret = u3nc @@ -302,9 +302,9 @@ pquq_yor, &ppquq_yor, &qpquq_yor, &rpquq_yor, &spquq_yor); - if ( (u3_no == u3_cr_sing(ppquq_hax, ppquq_yor)) || - (u3_no == u3_cr_sing(qpquq_hax, qpquq_yor)) || - (u3_no == u3_cr_sing(rpquq_hax, rpquq_yor)) ) + if ( (c3n == u3_cr_sing(ppquq_hax, ppquq_yor)) || + (c3n == u3_cr_sing(qpquq_hax, qpquq_yor)) || + (c3n == u3_cr_sing(rpquq_hax, rpquq_yor)) ) { return u3_cm_error("find-fork"); } @@ -339,7 +339,7 @@ } case c3__hold: p_sut = u3t(sut); { - if ( (u3_yes == u3_cqdi_has(gil, sut)) ) { + if ( (c3y == u3_cqdi_has(gil, sut)) ) { return u3nc(u3k(dep), u3_nul); } else { @@ -367,20 +367,20 @@ { u3_noun p_sut, q_sut, pp_sut, qp_sut, rp_sut, sp_sut; - if ( u3_yes == u3ud(sut) ) { + if ( c3y == u3ud(sut) ) { return u3nc(u3k(dep), u3_nul); } else switch ( u3h(sut) ) { default: return u3nc(u3k(dep), u3_nul); case c3__bull: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || - (u3_no == u3_cr_qual(p_sut, &pp_sut, &qp_sut, &rp_sut, &sp_sut)) ) + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || + (c3n == u3_cr_qual(p_sut, &pp_sut, &qp_sut, &rp_sut, &sp_sut)) ) { return u3_cm_bail(c3__fail); } else { - if ( u3_no == u3_cr_sing(cog, pp_sut) ) { + if ( c3n == u3_cr_sing(cog, pp_sut) ) { return _find_in (van, q_sut, dep, way, cog, gil); } @@ -391,7 +391,7 @@ u3nq( u3_nul, u3k(rp_sut), - u3_yes, + c3y, u3k(sp_sut))); } else { return _find_in @@ -404,7 +404,7 @@ } } case c3__cell: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { u3_noun taf = _find_in(van, p_sut, dep, way, cog, gil); @@ -450,9 +450,9 @@ u3_noun pq_sut, qq_sut, rq_sut; u3_noun prq_sut, qrq_sut; - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || - (u3_no == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || - (u3_no == u3_cr_cell(rq_sut, &prq_sut, &qrq_sut)) ) + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || + (c3n == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || + (c3n == u3_cr_cell(rq_sut, &prq_sut, &qrq_sut)) ) { return u3_cm_bail(c3__fail); } else { @@ -483,7 +483,7 @@ u3_cr_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); - if ( u3_no == u3_cqfu_park + if ( c3n == u3_cqfu_park (van, sut, way, puq_taf) ) { u3_noun weh = u3_cqfu_shep @@ -526,7 +526,7 @@ u3nq( u3_nul, 1, - u3_no, + c3n, u3nc (u3_cqc_peg(2, pu_zem), u3nc( @@ -538,16 +538,16 @@ } } case c3__face: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { - if ( u3_no == u3_cr_sing(cog, p_sut) ) { + if ( c3n == u3_cr_sing(cog, p_sut) ) { return u3nc(u3k(dep), u3_nul); } else { if ( 0 == dep ) { return u3nc (0, - u3nq(u3_nul, 1, u3_yes, u3k(q_sut))); + u3nq(u3_nul, 1, c3y, u3k(q_sut))); } else { return u3nc (u3_cqa_dec(dep), u3_nul); @@ -563,14 +563,14 @@ return pro; } case c3__fork: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } - if ( (u3_yes == u3_cqdi_has(gil, q_sut)) ) { + if ( (c3y == u3_cqdi_has(gil, q_sut)) ) { return _find_in(van, p_sut, dep, way, cog, gil); } - else if ( (u3_yes == u3_cqdi_has(gil, p_sut)) ) { + else if ( (c3y == u3_cqdi_has(gil, p_sut)) ) { return _find_in(van, q_sut, dep, way, cog, gil); } else { @@ -591,19 +591,19 @@ u3_cr_mean(q_yor, 6, &puq_yor, 7, &quq_yor, 0); } - if ( u3_yes == u3_cr_sing(hax, yor) ) { + if ( c3y == u3_cr_sing(hax, yor) ) { ret = u3k(hax); } else { - if ( (u3_no == u3_cr_sing(p_hax, p_yor)) || + if ( (c3n == u3_cr_sing(p_hax, p_yor)) || ((u3_nul == q_hax) || (u3_nul == q_yor)) || - (u3_no == u3_cr_sing(puq_hax, puq_yor)) || - (u3_no == u3_cr_sing(u3h(quq_hax), u3h(quq_yor))) ) + (c3n == u3_cr_sing(puq_hax, puq_yor)) || + (c3n == u3_cr_sing(u3h(quq_hax), u3h(quq_yor))) ) { return u3_cm_error("find-fork"); } switch ( u3h(quq_hax) ) { - case u3_yes: { + case c3y: { u3_noun pquq_hax = u3t(quq_hax); u3_noun pquq_yor = u3t(quq_yor); @@ -614,17 +614,17 @@ ( u3_nul, u3k(puq_hax), - u3_yes, + c3y, u3_cqf_fork(pquq_hax, pquq_yor))); break; } - case u3_no: { + case c3n: { u3_noun pquq_hax, qquq_hax, pquq_yor, qquq_yor; u3_cx_cell(u3t(quq_hax), &pquq_hax, &qquq_hax); u3_cx_cell(u3t(quq_yor), &pquq_yor, &qquq_yor); - if ( u3_no == u3_cr_sing(pquq_hax, pquq_yor) ) { + if ( c3n == u3_cr_sing(pquq_hax, pquq_yor) ) { return u3_cm_error("find-fork"); } else { ret = u3nc @@ -633,7 +633,7 @@ u3nq (u3_nul, u3k(puq_hax), - u3_no, + c3n, u3nc (u3k(pquq_hax), u3_cqb_weld @@ -651,7 +651,7 @@ } case c3__hold: p_sut = u3t(sut); { - if ( (u3_yes == u3_cqdi_has(gil, sut)) ) { + if ( (c3y == u3_cqdi_has(gil, sut)) ) { return u3nc(u3k(dep), u3_nul); } else { @@ -698,12 +698,12 @@ { u3_noun sut, dep, way, cog, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &dep, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &dep, u3_cv_sam_6, &way, u3_cv_sam_7, &cog, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -722,7 +722,7 @@ c3_m fun_m = c3__fino; u3_noun pro = u3_cz_find_4(fun_m, sut, dep, way, cog); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { @@ -741,12 +741,12 @@ { u3_noun sut, dep, way, cog, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &dep, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &dep, u3_cv_sam_6, &way, u3_cv_sam_7, &cog, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -765,7 +765,7 @@ c3_m fun_m = c3__find; u3_noun pro = u3_cz_find_4(fun_m, sut, dep, way, cog); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_fink.c b/j/6/ut_fink.c index 019105bee4..81e34979ea 100644 --- a/j/6/ut_fink.c +++ b/j/6/ut_fink.c @@ -54,12 +54,12 @@ { u3_noun sut, dep, way, cog, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &dep, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &dep, u3_cv_sam_6, &way, u3_cv_sam_7, &cog, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_fire.c b/j/6/ut_fire.c index f7a3d25561..67702ab119 100644 --- a/j/6/ut_fire.c +++ b/j/6/ut_fire.c @@ -19,8 +19,8 @@ u3k(gen)); u3_bean ret; - if ( u3_yes == u3_cqdi_has(rib, key) ) { - ret = u3_yes; + if ( c3y == u3_cqdi_has(rib, key) ) { + ret = c3y; } else { u3_noun rob = u3_cqdi_put(rib, key); @@ -45,12 +45,12 @@ u3_noun p_typ, q_typ, pq_typ, qq_typ, rq_typ; u3_noun h_gat, t_gat; - if ( (u3_no == u3du(typ)) || (c3__core != u3h(typ)) ) { + if ( (c3n == u3du(typ)) || (c3__core != u3h(typ)) ) { return u3_cm_error("fire-core"); } else if - ( (u3_no == u3_cr_cell(u3t(typ), &p_typ, &q_typ)) || - (u3_no == u3_cr_trel(q_typ, &pq_typ, &qq_typ, &rq_typ)) || - (u3_no == u3_cr_cell(gat, &h_gat, &t_gat)) ) + ( (c3n == u3_cr_cell(u3t(typ), &p_typ, &q_typ)) || + (c3n == u3_cr_trel(q_typ, &pq_typ, &qq_typ, &rq_typ)) || + (c3n == u3_cr_cell(gat, &h_gat, &t_gat)) ) { return u3_cm_bail(c3__fail); } else { @@ -58,9 +58,9 @@ (c3__core, u3k(qq_typ), u3k(q_typ)); if ( c3__ash == u3h(gat) ) { - if ( (u3_yes == vet) && - (u3_no == u3_cqfu_nest - (van, qq_typ, u3_yes, p_typ)) ) + if ( (c3y == vet) && + (c3n == u3_cqfu_nest + (van, qq_typ, c3y, p_typ)) ) { #if 0 u3_noun dun = u3_cqfu_dunq(van, "need", qq_typ); @@ -78,9 +78,9 @@ else { c3_assert(c3__elm == u3h(gat)); - if ( (u3_yes == vet) && - // (u3_no == u3_cr_sing(p_typ, qq_typ)) && - (u3_no == _fire_mull(van, typ, dox, t_gat)) ) + if ( (c3y == vet) && + // (c3n == u3_cr_sing(p_typ, qq_typ)) && + (c3n == _fire_mull(van, typ, dox, t_gat)) ) { #if 0 u3_noun dun = u3_cqfu_dunq(van, "wild", typ); @@ -112,7 +112,7 @@ u3_noun i_hag = u3h(hag); u3_noun t_hag = u3t(hag); - if ( u3_no == u3du(i_hag) ) { + if ( c3n == u3du(i_hag) ) { return u3_cm_bail(c3__fail); } else { return u3nc @@ -130,7 +130,7 @@ u3_bean vet = u3_cr_at(u3_cqfu_van_vet, van); { - if ( (u3_yes == u3du(hag)) && (u3_nul == u3t(hag)) ) { + if ( (c3y == u3du(hag)) && (u3_nul == u3t(hag)) ) { u3_noun i_hag = u3h(hag); u3_noun pi_hag = u3h(i_hag); u3_noun qi_hag = u3t(i_hag); @@ -138,7 +138,7 @@ if ( c3__elm == u3h(qi_hag) ) { u3_noun qqi_hag = u3t(qi_hag); - if ( u3_yes == u3du(qqi_hag) && + if ( c3y == u3du(qqi_hag) && (u3_nul == u3h(qqi_hag)) && (1 == u3t(qqi_hag)) ) { @@ -158,8 +158,8 @@ { u3_noun sut, hag, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &hag, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &hag, u3_cv_con, &van, 0)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_firm.c b/j/6/ut_firm.c index 50230f38a7..5fd50019b5 100644 --- a/j/6/ut_firm.c +++ b/j/6/ut_firm.c @@ -15,16 +15,16 @@ { u3_noun p_sut, q_sut; - if ( u3_no == u3du(sut) ) switch ( sut ) { + if ( c3n == u3du(sut) ) switch ( sut ) { default: return u3_cm_bail(c3__fail); case c3__noun: { - return u3_yes; + return c3y; } case c3__void: { - return u3_no; + return c3n; } } else switch ( u3h(sut) ) { @@ -38,19 +38,19 @@ { u3_noun nun = u3_cr_at(u3h(u3t(u3t(p_sut))), dib); - if ( u3_none == nun ) { - return u3_no; + if ( c3nne == nun ) { + return c3n; } else { - return u3_and(_cqfu_firm(van, q_sut, dib), + return c3a(_cqfu_firm(van, q_sut, dib), _cqfu_firm(van, u3t(u3t(u3t(p_sut))), nun)); } } case c3__cell: u3_cx_cell(u3t(sut), &p_sut, &q_sut); { - return u3_and + return c3a (u3du(dib), - u3_and(_cqfu_firm(van, p_sut, u3h(dib)), + c3a(_cqfu_firm(van, p_sut, u3h(dib)), _cqfu_firm(van, q_sut, u3t(dib)))); } case c3__core: u3_cx_cell(u3t(sut), &p_sut, &q_sut); @@ -60,9 +60,9 @@ u3_cx_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); u3_cx_cell(rq_sut, &prq_sut, &qrq_sut); - return u3_and + return c3a (u3du(dib), - u3_and + c3a (_cqfu_firm(van, p_sut, u3h(dib)), ((u3_nul == prq_sut) ? u3_cm_error("firm-core") : u3_cr_sing(prq_sut, u3t(dib))))); @@ -77,7 +77,7 @@ } case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); { - return u3_or(_cqfu_firm(van, p_sut, dib), + return c3o(_cqfu_firm(van, p_sut, dib), _cqfu_firm(van, q_sut, dib)); } case c3__hold: @@ -99,8 +99,8 @@ { u3_noun sut, dib, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &dib, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &dib, u3_cv_con, &van, 0)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_fish.c b/j/6/ut_fish.c index 1c63376c2a..70b9f762b6 100644 --- a/j/6/ut_fish.c +++ b/j/6/ut_fish.c @@ -16,7 +16,7 @@ { u3_noun p_sut, q_sut; - if ( u3_yes == u3ud(sut) ) switch ( sut ) { + if ( c3y == u3ud(sut) ) switch ( sut ) { default: return u3_cm_bail(c3__fail); case c3__noun: { @@ -40,7 +40,7 @@ return u3_cm_error("bull-fish"); } case c3__cell: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { u3_noun hut = u3nt(3, 0, u3k(axe)); @@ -65,7 +65,7 @@ return u3nc(0, 0); } case c3__cube: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { return u3nt @@ -75,14 +75,14 @@ } } case c3__face: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { return _fish_in(van, q_sut, axe, vit); } } case c3__fork: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { @@ -99,7 +99,7 @@ case c3__hold: { p_sut = u3t(sut); { - if ( (u3_yes == u3_cqdi_has(vit, sut)) ) { + if ( (c3y == u3_cqdi_has(vit, sut)) ) { // u3_noun dun = u3_cqfu_dunq(van, "type", sut); u3_noun niz = u3_cqfu_shep (van, "axis", 'd', u3k(axe)); @@ -140,9 +140,9 @@ { u3_noun sut, axe, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &axe, u3_cv_con, &van, 0)) || - (u3_no == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &axe, u3_cv_con, &van, 0)) || + (c3n == u3ud(axe)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -158,7 +158,7 @@ c3_m fun_m = c3__fish; u3_noun pro = u3_cz_find_2(fun_m, sut, axe); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_fuse.c b/j/6/ut_fuse.c index 5b116fc3f1..aa74a5e76e 100644 --- a/j/6/ut_fuse.c +++ b/j/6/ut_fuse.c @@ -20,7 +20,7 @@ u3_noun rep = u3_cqfu_repo(van, sut); u3_noun ret = _fuse_in(van, rep, ref, bix); - if ( u3_yes == u3_cr_sing(ret, rep) ) { + if ( c3y == u3_cr_sing(ret, rep) ) { if ( c3__void == rep ) { return c3__void; } else { @@ -43,10 +43,10 @@ { u3_noun p_sut, q_sut; - if ( u3_yes == u3_cr_sing(sut, ref) || (c3__noun == ref) ) { + if ( c3y == u3_cr_sing(sut, ref) || (c3__noun == ref) ) { return u3k(sut); } - if ( u3_no == u3du(sut) ) switch ( sut ) { + if ( c3n == u3du(sut) ) switch ( sut ) { default: return u3_cm_bail(c3__fail); case c3__noun: @@ -63,9 +63,9 @@ case c3__atom: { - if ( u3_yes == u3du(ref) ) { + if ( c3y == u3du(ref) ) { if ( c3__atom == u3h(ref) ) { - if ( u3_yes == u3_cqf_fitz(u3t(ref), u3t(sut)) ) { + if ( c3y == u3_cqf_fitz(u3t(ref), u3t(sut)) ) { return u3k(sut); } else return u3k(ref); } @@ -87,7 +87,7 @@ { u3_noun p_ref, q_ref; - if ( u3_yes == u3_cr_pq(ref, c3__cell, &p_ref, &q_ref) ) { + if ( c3y == u3_cr_pq(ref, c3__cell, &p_ref, &q_ref) ) { u3_noun hed = _fuse_in(van, p_sut, p_ref, bix); u3_noun tal = _fuse_in(van, q_sut, q_ref, bix); u3_noun ret = u3_cqf_cell(hed, tal); @@ -107,7 +107,7 @@ u3_noun foz = _fuse_in(van, q_sut, ref, bix); u3_noun ret; - if ( u3_no == u3_cqfu_firm(van, foz, p_sut) ) { + if ( c3n == u3_cqfu_firm(van, foz, p_sut) ) { ret = c3__void; } else { ret = u3_cqf_cube(p_sut, foz); @@ -137,7 +137,7 @@ { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( u3_yes == u3_cqdi_has(bix, hud) ) { + if ( c3y == u3_cqdi_has(bix, hud) ) { // u3_noun dun = u3_cqfu_dunq(van, "type", sut); // u3_noun niz = u3_cqfu_dunq(van, "over", ref); @@ -174,8 +174,8 @@ { u3_noun sut, ref, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -191,7 +191,7 @@ c3_m fun_m = c3__fuse; u3_noun pro = u3_cz_find_2(fun_m, sut, ref); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_heal.c b/j/6/ut_heal.c index c7f603df93..04ef1ae7df 100644 --- a/j/6/ut_heal.c +++ b/j/6/ut_heal.c @@ -20,7 +20,7 @@ { u3_noun p_sut, q_sut; - if ( u3_no == u3du(sut) ) { + if ( c3n == u3du(sut) ) { return u3_cm_error("heal-name"); } else switch ( u3h(sut) ) { @@ -32,7 +32,7 @@ } case c3__bull: u3_cx_cell(u3t(sut), &p_sut, &q_sut); { - if ( u3_yes == u3_cr_sing(u3h(p_sut), u3t(qog)) ) { + if ( c3y == u3_cr_sing(u3h(p_sut), u3t(qog)) ) { return u3k(ref); } else { @@ -48,7 +48,7 @@ } case c3__face: u3_cx_cell(u3t(sut), &p_sut, &q_sut); { - if ( u3_yes == u3_cr_sing(p_sut, u3t(qog)) ) { + if ( c3y == u3_cr_sing(p_sut, u3t(qog)) ) { return u3_cqf_face(p_sut, ref); } else return u3_cm_error("heal-name"); @@ -85,7 +85,7 @@ { u3_noun p_sut, q_sut; - if ( u3_no == u3du(sut) ) { + if ( c3n == u3du(sut) ) { goto repo; } else switch ( u3h(sut) ) { @@ -151,7 +151,7 @@ } case c3__hold: { - if ( (u3_yes == u3_cqdi_has(gil, sut)) ) { + if ( (c3y == u3_cqdi_has(gil, sut)) ) { return c3__void; } else { @@ -220,13 +220,13 @@ { u3_noun van, sut, qog, axe, ref; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &qog, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &qog, u3_cv_sam_6, &axe, u3_cv_sam_7, &ref, u3_cv_con, &van, 0)) || - (u3_no == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3n == u3ud(axe)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_mint.c b/j/6/ut_mint.c index 10d6717d0d..dfe1165454 100644 --- a/j/6/ut_mint.c +++ b/j/6/ut_mint.c @@ -28,8 +28,8 @@ int FOO; u3_bean vet = u3_cr_at(u3_cqfu_van_vet, van); switch ( vet ) { - case u3_no: - case u3_yes: return vet; + case c3n: + case c3y: return vet; default: return u3_cm_bail(c3__fail); } } @@ -54,7 +54,7 @@ int FOO; u3_noun q_pok = u3t(pok); u3_noun ret; - if ( u3_yes == u3h(q_pok) ) { + if ( c3y == u3h(q_pok) ) { u3_noun pq_pok = u3t(q_pok); ret = u3nc( @@ -120,8 +120,8 @@ int FOO; u3_noun gol, u3_noun typ) { - if ( (u3_yes == _mint_vet(van)) && - (u3_no == u3_cqfu_nest(van, gol, u3_yes, typ)) ) + if ( (c3y == _mint_vet(van)) && + (c3n == u3_cqfu_nest(van, gol, c3y, typ)) ) { // u3_noun dun = u3_cqfu_dunq(van, "need", gol); // u3_noun niz = u3_cqfu_dunq(van, "have", typ); @@ -164,7 +164,7 @@ int FOO; u3_noun hej) { while ( 1 ) { - if ( u3_no == u3du(mew) ) { + if ( c3n == u3du(mew) ) { u3_noun gim = u3_cqfu_fire(van, sut, rag); u3_noun fol = u3_cqf_hike(p_lar, hej); @@ -209,10 +209,10 @@ int FOO; switch ( tov ) { default: return u3_cm_bail(c3__fail); - case u3_yes: + case c3y: von = u3k(van); break; - case u3_no: - von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, u3_no, 0); break; + case c3n: + von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); break; } { u3_noun mil = u3_cqfu_mint(von, sut, c3__noun, gen); @@ -237,7 +237,7 @@ int FOO; u3_noun n_dab, l_dab, r_dab; u3_cr_trel(dab, &n_dab, &l_dab, &r_dab); - if ( u3_no == u3du(n_dab) ) { + if ( c3n == u3du(n_dab) ) { return u3_cm_bail(c3__fail); } else { @@ -247,11 +247,11 @@ int FOO; switch ( u3h(qn_dab) ) { default: return u3_cm_bail(c3__exit); case c3__ash: { - vad = _mint_brew(van, sut, u3_yes, u3t(qn_dab)); + vad = _mint_brew(van, sut, c3y, u3t(qn_dab)); break; } case c3__elm: { - vad = _mint_brew(van, sut, u3_no, u3t(qn_dab)); + vad = _mint_brew(van, sut, c3n, u3t(qn_dab)); break; } } @@ -341,10 +341,10 @@ int FOO; u3_noun ret; if ( (c3__void == sut) && - !((u3_yes == u3du(gen)) && (c3__zpcb == u3h(gen))) ) + !((c3y == u3du(gen)) && (c3__zpcb == u3h(gen))) ) { - if ( (u3_no == _mint_vet(van)) - || ((u3_yes == u3du(gen)) && + if ( (c3n == _mint_vet(van)) + || ((c3y == u3du(gen)) && ((c3__zpfs == u3h(gen)) || (c3__zpzp == u3h(gen)))) ) { return u3nt(c3__void, 0, 0); @@ -354,7 +354,7 @@ int FOO; } } - if ( u3_no == u3du(gen) ) { + if ( c3n == u3du(gen) ) { u3_noun ter = u3_cr_at(u3_cv_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); @@ -363,7 +363,7 @@ int FOO; return ret; } - else if ( u3_yes == u3du(u3h(gen)) ) { + else if ( c3y == u3du(u3h(gen)) ) { _mint_used(); { u3_noun hed = _mint_in(van, sut, c3__noun, u3h(gen)); @@ -385,7 +385,7 @@ int FOO; u3_noun ter = u3_cr_at(u3_cv_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); - if ( u3_yes == u3_cr_sing(rex, gen) ) { + if ( c3y == u3_cr_sing(rex, gen) ) { #if 1 u3_noun zix = u3_cqfu_shep(van, "gene", 'q', u3k(gen)); @@ -537,7 +537,7 @@ int FOO; case c3__dtzz: u3_cx_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun boc = (u3_no == u3ud(q_gen)) + u3_noun boc = (c3n == u3ud(q_gen)) ? c3__noun : u3nc(c3__atom, u3k(p_gen)); u3_noun typ = u3_cqf_cube(q_gen, boc); @@ -677,7 +677,7 @@ int FOO; FOO = 1; fprintf(stderr, "\r\n"); - bar = u3_cqfu_nest(van, huz, u3_no, goz); + bar = u3_cqfu_nest(van, huz, c3n, goz); fprintf(stderr, "kthx: bar %d\r\n", bar); FOO = 0; } @@ -806,7 +806,7 @@ int FOO; u3_noun hum = _mint_in(van, sut, gol, q_gen); u3_noun bez; - if ( u3_yes == u3ud(p_gen) ) { + if ( c3y == u3ud(p_gen) ) { bez = u3k(p_gen); } else { bez = u3nc(u3k(u3h(p_gen)), @@ -822,7 +822,7 @@ int FOO; case c3__zpts: p_gen = u3t(gen); _mint_used(); { - u3_noun von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, u3_no, 0); + u3_noun von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); u3_noun sev = _mint_corn(von, sut, p_gen); u3z(von); @@ -891,7 +891,7 @@ int FOO; case c3__zpfs: p_gen = u3t(gen); _mint_used(); { - if ( u3_yes == _mint_vet(van) ) { + if ( c3y == _mint_vet(van) ) { u3_noun zur = u3_cqfu_play(van, sut, p_gen); u3_noun dun = u3_cqfu_dunq(van, "lost", zur); @@ -927,11 +927,11 @@ int FOO; { u3_noun sut, gol, gen, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &gol, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &gol, u3_cv_sam_3, &gen, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -949,7 +949,7 @@ int FOO; u3_noun vrf = u3_cr_at(u3_cqfu_van_vrf, van); u3_noun pro = u3_cz_find_4(fun_m, vrf, sut, gol, gen); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_mull.c b/j/6/ut_mull.c index 5227914abd..3125ca5673 100644 --- a/j/6/ut_mull.c +++ b/j/6/ut_mull.c @@ -18,8 +18,8 @@ u3_bean vet = u3_cr_at(u3_cqfu_van_vet, van); switch ( vet ) { - case u3_no: - case u3_yes: return vet; + case c3n: + case c3y: return vet; default: return u3_cm_bail(c3__fail); } } @@ -67,7 +67,7 @@ u3_noun q_pok = u3t(pok); u3_noun ret; - if ( u3_yes == u3h(q_pok) ) { + if ( c3y == u3h(q_pok) ) { u3_noun pq_pok = u3t(q_pok); ret = u3nc( @@ -130,7 +130,7 @@ u3_noun gol, u3_noun typ) { - if ( u3_no == u3_cqfu_nest(van, gol, u3_yes, typ) ) { + if ( c3n == u3_cqfu_nest(van, gol, c3y, typ) ) { // u3_noun dun = u3_cqfu_dunq(van, "need", gol); // u3_noun niz = u3_cqfu_dunq(van, "have", typ); @@ -153,7 +153,7 @@ u3_noun n_dab, l_dab, r_dab; u3_cr_trel(dab, &n_dab, &l_dab, &r_dab); - if ( u3_no == u3du(n_dab) ) { + if ( c3n == u3du(n_dab) ) { u3_cm_bail(c3__fail); } else { @@ -256,7 +256,7 @@ u3_noun q_yom) { while ( 1 ) { - if ( u3_no == u3du(mew) ) { + if ( c3n == u3du(mew) ) { return u3nc(p_yom, q_yom); } else { u3_noun i_mew = u3h(mew); @@ -303,7 +303,7 @@ u3_noun p_gen, q_gen, r_gen; u3_noun ret; - if ( u3_no == u3du(gen) ) { + if ( c3n == u3du(gen) ) { u3_noun ter = u3_cr_at(u3_cv_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); @@ -312,7 +312,7 @@ return ret; } - else if ( u3_yes == u3du(u3h(gen)) ) { + else if ( c3y == u3du(u3h(gen)) ) { _mull_used(); { u3_noun hed = _mull_in(van, sut, c3__noun, dox, u3h(gen)); @@ -332,7 +332,7 @@ u3_noun ter = u3_cr_at(u3_cv_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); - if ( u3_yes == u3_cr_sing(rex, gen) ) { + if ( c3y == u3_cr_sing(rex, gen) ) { #if 1 u3_noun zix = u3_cqfu_shep (van, "gene", 'q', u3k(gen)); @@ -384,8 +384,8 @@ u3_noun p_pov = u3_cqfu_fish(van, p_waz, p_syx); u3_noun q_pov = u3_cqfu_fish(van, q_waz, q_syx); - if ( (u3_no == u3_cr_sing(p_syx, q_syx)) || - (u3_no == u3_cr_sing(p_pov, q_pov)) ) + if ( (c3n == u3_cr_sing(p_syx, q_syx)) || + (c3n == u3_cr_sing(p_pov, q_pov)) ) { return u3_cm_error("mull-bonk-b"); } @@ -506,7 +506,7 @@ u3_noun tof = u3nt (c3__cube, u3k(q_gen), - (u3_yes == u3du(q_gen)) + (c3y == u3du(q_gen)) ? c3__noun : u3nc(c3__atom, u3k(p_gen))); @@ -662,7 +662,7 @@ u3_noun pq_vug = u3h(q_vug); u3_noun qq_vug = u3t(q_vug); - if ( u3_and(u3_cr_sing(p_lar, p_vug), u3_cr_sing(pq_lar, pq_vug)) ) { + if ( c3a(u3_cr_sing(p_lar, p_vug), u3_cr_sing(pq_lar, pq_vug)) ) { u3_cm_error("mull-bonk-e"); } { @@ -670,7 +670,7 @@ u3_noun yom = _mull_edit (van, sut, dox, mew, u3k(qq_lar), u3k(qq_vug)); - u3_noun von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, u3_no, 0); + u3_noun von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); u3_noun p_ret = u3_cqfu_fire(van, sut, u3h(yom)); u3_noun q_ret = u3_cqfu_fire(von, sut, u3t(yom)); @@ -818,13 +818,13 @@ u3_noun dox, u3_noun gen) { - if ( u3_no == _mull_vet(van) ) { - return u3_yes; + if ( c3n == _mull_vet(van) ) { + return c3y; } else { u3_noun mul = _mull_in(van, sut, gol, dox, gen); u3z(mul); - return u3_yes; + return c3y; } } @@ -835,12 +835,12 @@ { u3_noun sut, gol, dox, gen, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &gol, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &gol, u3_cv_sam_6, &dox, u3_cv_sam_7, &gen, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -858,7 +858,7 @@ c3_m fun_m = c3__mull; u3_noun pro = u3_cz_find_4(fun_m, sut, gol, dox, gen); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_nest.c b/j/6/ut_nest.c index 19474cde2f..72bb11745f 100644 --- a/j/6/ut_nest.c +++ b/j/6/ut_nest.c @@ -27,7 +27,7 @@ if ( u3_nul == dab ) { return u3_cr_sing(u3_nul, hem); } else if ( u3_nul == hem ) { - return u3_no; + return c3n; } else { u3_noun n_dab, l_dab, r_dab; u3_noun n_hem, l_hem, r_hem; @@ -36,26 +36,26 @@ u3_cx_trel(dab, &n_dab, &l_dab, &r_dab); u3_cx_trel(hem, &n_hem, &l_hem, &r_hem); - if ( (u3_no == _nest_cram + if ( (c3n == _nest_cram (van, sut, tel, ref, l_dab, l_hem, gil)) || - (u3_no == _nest_cram + (c3n == _nest_cram (van, sut, tel, ref, r_dab, r_hem, gil)) ) { - return u3_no; + return c3n; } u3_cx_cell(n_dab, &pn_dab, &qn_dab); u3_cx_cell(n_hem, &pn_hem, &qn_hem); - if ( u3_no == u3_cr_sing(pn_dab, pn_hem) ) { - return u3_no; + if ( c3n == u3_cr_sing(pn_dab, pn_hem) ) { + return c3n; } else { - if ( (u3_no == u3du(qn_dab)) || (u3_no == u3du(qn_hem)) ) { + if ( (c3n == u3du(qn_dab)) || (c3n == u3du(qn_hem)) ) { return u3_cm_bail(c3__fail); } else switch ( u3h(qn_dab) ) { default: return u3_cm_bail(c3__exit); case c3__ash: { if ( c3__ash != u3h(qn_hem) ) { - return u3_no; + return c3n; } else { u3_noun pqn_dab = u3t(qn_dab); u3_noun pqn_hem = u3t(qn_hem); @@ -98,26 +98,26 @@ u3_cx_cell(rq_sut, &prq_sut, &qrq_sut); u3_cx_cell(rq_ref, &prq_ref, &qrq_ref); - if ( u3_yes == u3_cr_sing(q_sut, q_ref) ) { + if ( c3y == u3_cr_sing(q_sut, q_ref) ) { return _nest_dext(van, p_sut, tel, p_ref, gil); } - else if ( (u3_no == _nest_dext(van, qq_sut, tel, p_sut, gil)) || - (u3_no == _nest_dext(van, p_sut, tel, qq_sut, gil)) || - (u3_no == _nest_dext(van, qq_ref, tel, p_ref, gil)) ) + else if ( (c3n == _nest_dext(van, qq_sut, tel, p_sut, gil)) || + (c3n == _nest_dext(van, p_sut, tel, qq_sut, gil)) || + (c3n == _nest_dext(van, qq_ref, tel, p_ref, gil)) ) { - return u3_no; + return c3n; } else { if ( (pq_sut != pq_ref) && (c3__gold != pq_ref) ) { - return u3_no; + return c3n; } else { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( (u3_yes == u3_cqdi_has(gil, hud)) ) { + if ( (c3y == u3_cqdi_has(gil, hud)) ) { u3z(hud); - return u3_yes; + return c3y; } else { u3_noun zoc = u3_cqdi_put(gil, hud); @@ -134,8 +134,8 @@ u3z(zoc); u3z(hud); - if ( u3_no == ret ) { - return u3_no; + if ( c3n == ret ) { + return c3n; } else { switch ( pq_sut ) { @@ -143,7 +143,7 @@ case c3__gold: { return - u3_and(_nest_dext(van, qq_sut, tel, qq_ref, gil), + c3a(_nest_dext(van, qq_sut, tel, qq_ref, gil), _nest_dext(van, qq_ref, tel, qq_sut, gil)); } case c3__iron: { @@ -158,7 +158,7 @@ return ret; } case c3__lead: { - return u3_yes; + return c3y; } case c3__zinc: { u3_noun s_pal = u3_cqfu_peek @@ -189,11 +189,11 @@ { u3_noun p_sut, q_sut, p_ref, q_ref; - if ( (u3_no == u3du(sut)) ) switch ( sut ) { + if ( (c3n == u3du(sut)) ) switch ( sut ) { default: return u3_cm_bail(c3__fail); case c3__noun: { - return u3_yes; + return c3y; } case c3__void: { return _nest_sint(van, sut, tel, ref, gil); @@ -203,67 +203,67 @@ default: return u3_cm_bail(c3__fail); case c3__atom: { - if ( (u3_yes == u3du(ref)) && (c3__atom == u3h(ref)) ) { - if ( u3_no == u3_cqf_fitz(u3t(sut), u3t(ref)) ) { + if ( (c3y == u3du(ref)) && (c3__atom == u3h(ref)) ) { + if ( c3n == u3_cqf_fitz(u3t(sut), u3t(ref)) ) { // u3_err("fitz: need", u3t(sut)); // u3_err("fitz: have", u3t(ref)); - return u3_no; + return c3n; } - return u3_yes; + return c3y; } else return _nest_sint(van, sut, tel, ref, gil); } case c3__bull: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { return _nest_dext(van, q_sut, tel, ref, gil); } } case c3__cell: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { - if ( u3_yes == u3_cr_pq(ref, c3__cell, &p_ref, &q_ref) ) { - return u3_and(_nest_dext(van, p_sut, tel, p_ref, gil), + if ( c3y == u3_cr_pq(ref, c3__cell, &p_ref, &q_ref) ) { + return c3a(_nest_dext(van, p_sut, tel, p_ref, gil), _nest_dext(van, q_sut, tel, q_ref, gil)); } else return _nest_sint(van, sut, tel, ref, gil); } } case c3__core: { - if ( u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut) ) { + if ( c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut) ) { return u3_cm_bail(c3__fail); } else { - if ( (u3_yes == u3_cr_pq(ref, c3__core, &p_ref, &q_ref)) ) { + if ( (c3y == u3_cr_pq(ref, c3__core, &p_ref, &q_ref)) ) { return _nest_cong(van, sut, tel, ref, gil); } else return _nest_sint(van, sut, tel, ref, gil); } } case c3__cube: { - if ( u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut) ) { + if ( c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut) ) { return u3_cm_bail(c3__fail); } else { - if ( u3_yes == u3_cr_pq(ref, c3__cube, &p_ref, &q_ref) ) { + if ( c3y == u3_cr_pq(ref, c3__cube, &p_ref, &q_ref) ) { return u3_cr_sing(p_sut, p_ref); } else return _nest_sint(van, sut, tel, ref, gil); } } case c3__face: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { return _nest_dext(van, q_sut, tel, ref, gil); } } case c3__fork: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { - if ( u3_no == u3du(ref) ) switch ( ref ) { + if ( c3n == u3du(ref) ) switch ( ref ) { default: return _nest_sint(van, sut, tel, ref, gil); case c3__noun: @@ -279,18 +279,18 @@ break; } - return u3_or(_nest_dext(van, p_sut, u3_no, ref, gil), - _nest_dext(van, q_sut, u3_no, ref, gil)); + return c3o(_nest_dext(van, p_sut, c3n, ref, gil), + _nest_dext(van, q_sut, c3n, ref, gil)); } } case c3__hold: p_sut = u3t(sut); { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( (u3_yes == u3_cqdi_has(gil, hud)) ) { + if ( (c3y == u3_cqdi_has(gil, hud)) ) { u3z(hud); - return u3_yes; + return c3y; } else { u3_noun zoc = u3_cqdi_put(gil, hud); u3_noun fop = u3_cqfu_rest(van, sut, p_sut); @@ -316,7 +316,7 @@ { u3_bean tyn = _nest_dext_in(van, sut, tel, ref, gil); - if ( (u3_yes == tyn) || (u3_no == tel) ) { + if ( (c3y == tyn) || (c3n == tel) ) { return tyn; } else { // u3_noun dun = u3_cqfu_dunq(van, "need", sut); @@ -338,15 +338,15 @@ u3_noun gil) { - if ( (u3_yes == u3_cr_sing(sut, ref)) ) { - return u3_yes; + if ( (c3y == u3_cr_sing(sut, ref)) ) { + return c3y; } { c3_m fun_m = c3__nest; u3_noun pro = u3_cz_find_2(fun_m, sut, ref); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { @@ -367,12 +367,12 @@ { u3_noun p_ref, q_ref; - if ( (u3_no == u3du(ref)) ) { + if ( (c3n == u3du(ref)) ) { switch ( ref ) { default: return u3_cm_bail(c3__fail); - case c3__noun: return u3_no; - case c3__void: return u3_yes; + case c3__noun: return c3n; + case c3__void: return c3y; } } else { @@ -380,15 +380,15 @@ default: { return u3_cm_bail(c3__fail); } - case c3__atom: return u3_no; + case c3__atom: return c3n; case c3__bull: { - if ( u3_no == u3_cr_trel(ref, 0, &p_ref, &q_ref) ) { + if ( c3n == u3_cr_trel(ref, 0, &p_ref, &q_ref) ) { return u3_cm_bail(c3__fail); } else { return _nest_dext(van, sut, tel, q_ref, gil); } } - case c3__cell: return u3_no; + case c3__cell: return c3n; case c3__core: { u3_noun gam = u3_cqfu_repo(van, ref); u3_bean hiv = _nest_dext(van, sut, tel, gam, gil); @@ -397,23 +397,23 @@ return hiv; } case c3__cube: { - if ( u3_no == u3_cr_trel(ref, 0, &p_ref, &q_ref) ) { + if ( c3n == u3_cr_trel(ref, 0, &p_ref, &q_ref) ) { return u3_cm_bail(c3__fail); } else { return _nest_dext(van, sut, tel, q_ref, gil); } } case c3__face: { - if ( u3_no == u3_cr_trel(ref, 0, &p_ref, &q_ref) ) { + if ( c3n == u3_cr_trel(ref, 0, &p_ref, &q_ref) ) { return u3_cm_bail(c3__fail); } else { return _nest_dext(van, sut, tel, q_ref, gil); } } case c3__fork: { - if ( (u3_yes == u3_cr_mean(ref, 6, &p_ref, 7, &q_ref, 0)) ) { - return u3_and(_nest_dext(van, sut, u3_no, p_ref, gil), - _nest_dext(van, sut, u3_no, q_ref, gil)); + if ( (c3y == u3_cr_mean(ref, 6, &p_ref, 7, &q_ref, 0)) ) { + return c3a(_nest_dext(van, sut, c3n, p_ref, gil), + _nest_dext(van, sut, c3n, q_ref, gil)); } else return u3_cm_bail(c3__fail); } @@ -423,10 +423,10 @@ u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( (u3_yes == u3_cqdi_has(gil, hud)) ) { + if ( (c3y == u3_cqdi_has(gil, hud)) ) { u3z(hud); - return u3_yes; + return c3y; } else { u3_noun zoc = u3_cqdi_put(gil, hud); u3_noun gam = u3_cqfu_repo(van, ref); @@ -464,12 +464,12 @@ { u3_noun sut, tel, ref, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &tel, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &tel, u3_cv_sam_3, &ref, u3_cv_con, &van, 0)) || - (u3_no == u3ud(tel)) || (tel > 1) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3n == u3ud(tel)) || (tel > 1) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_park.c b/j/6/ut_park.c index f6c6480255..55928fea35 100644 --- a/j/6/ut_park.c +++ b/j/6/ut_park.c @@ -14,12 +14,12 @@ u3_noun way, u3_atom axe) { - if ( u3_no == u3du(sut) || c3__core != u3h(sut) ) { + if ( c3n == u3du(sut) || c3__core != u3h(sut) ) { return u3_cm_bail(c3__fail); } - // else if ( u3_no == u3_cj_hook(u3k(van), "vet") ) { - else if ( u3_no == u3_cr_at(u3_cqfu_van_vet, van) ) { - return u3_yes; + // else if ( c3n == u3_cj_hook(u3k(van), "vet") ) { + else if ( c3n == u3_cr_at(u3_cqfu_van_vet, van) ) { + return c3y; } else { u3_noun p_sut, q_sut, pq_sut; @@ -29,18 +29,18 @@ if ( c3__both == way ) { if ( c3__gold == pq_sut ) { - return u3_yes; - } else return u3_no; + return c3y; + } else return c3n; } if ( c3__read == way ) { switch ( pq_sut ) { default: return u3_cm_bail(c3__fail); - case c3__gold: return u3_yes; - case c3__lead: return u3_no; - case c3__iron: return u3_no; + case c3__gold: return c3y; + case c3__lead: return c3n; + case c3__iron: return c3n; case c3__zinc: return - u3_and(u3_not(u3_cr_sing(1, axe)), + c3a(!(u3_cr_sing(1, axe)), u3_cr_sing(2, u3_cqc_cap(axe))); } } @@ -48,15 +48,15 @@ switch ( pq_sut ) { default: return u3_cm_bail(c3__fail); - case c3__gold: return u3_yes; - case c3__lead: return u3_no; + case c3__gold: return c3y; + case c3__lead: return c3n; case c3__iron: return - u3_and(u3_not(u3_cr_sing(1, axe)), + c3a(!(u3_cr_sing(1, axe)), u3_cr_sing(2, u3_cqc_cap(axe))); - case c3__zinc: return u3_no; + case c3__zinc: return c3n; } } - else if ( c3__free == way ) { return u3_yes; } + else if ( c3__free == way ) { return c3y; } else return u3_cm_bail(c3__fail); } } @@ -69,12 +69,12 @@ { u3_noun sut, way, axe, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &way, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &way, u3_cv_sam_3, &axe, u3_cv_con, &van, 0)) || - (u3_no == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3n == u3ud(axe)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_peek.c b/j/6/ut_peek.c index 2889168970..a71f6bfb24 100644 --- a/j/6/ut_peek.c +++ b/j/6/ut_peek.c @@ -21,7 +21,7 @@ u3_noun p_sut, q_sut; u3_noun pro; - if ( (u3_no == u3du(sut)) ) switch ( sut ) { + if ( (c3n == u3du(sut)) ) switch ( sut ) { default: return u3_cm_bail(c3__fail); case c3__noun: { @@ -38,14 +38,14 @@ return c3__void; } case c3__bull: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { return _peek_in(van, q_sut, way, axe, gil); } } case c3__cell: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { u3_atom tip = u3_cqc_cap(axe); @@ -67,9 +67,9 @@ u3_noun pq_sut, qq_sut, rq_sut; u3_noun prq_sut, qrq_sut; - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || - (u3_no == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || - (u3_no == u3_cr_cell(rq_sut, &prq_sut, &qrq_sut)) ) + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || + (c3n == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || + (c3n == u3_cr_cell(rq_sut, &prq_sut, &qrq_sut)) ) { return u3_cm_bail(c3__fail); } else { @@ -77,7 +77,7 @@ u3_atom tap = u3_cqc_mas(axe); if ( 3 == tip ) { - if ( u3_no == u3_cqfu_park(van, sut, way, tap) ) + if ( c3n == u3_cqfu_park(van, sut, way, tap) ) { // u3_noun dun = u3_cqfu_dunq(van, "type", sut); u3_noun waz = u3_cqfu_shep @@ -100,21 +100,21 @@ } } case c3__cube: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { return _peek_in(van, q_sut, way, axe, gil); } } case c3__face: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { return _peek_in(van, q_sut, way, axe, gil); } } case c3__fork: { - if ( (u3_no == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { + if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { return u3_cm_bail(c3__fail); } else { u3_noun hed = _peek_in(van, p_sut, way, axe, gil); @@ -130,7 +130,7 @@ } case c3__hold: { p_sut = u3t(sut); - if ( (u3_yes == u3_cqdi_has(gil, sut)) ) { + if ( (c3y == u3_cqdi_has(gil, sut)) ) { return c3__void; } else { @@ -168,12 +168,12 @@ { u3_noun sut, way, axe, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &way, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &way, u3_cv_sam_3, &axe, u3_cv_con, &van, 0)) || - (u3_no == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3n == u3ud(axe)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -190,7 +190,7 @@ c3_m fun_m = c3__peek; u3_noun pro = u3_cz_find_3(fun_m, sut, way, axe); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_play.c b/j/6/ut_play.c index 789c320778..699b372fdf 100644 --- a/j/6/ut_play.c +++ b/j/6/ut_play.c @@ -57,7 +57,7 @@ u3_noun q_pok = u3t(pok); u3_noun ret; - if ( u3_yes == u3h(q_pok) ) { + if ( c3y == u3h(q_pok) ) { u3_noun pq_pok = u3t(q_pok); ret = u3nc( @@ -89,7 +89,7 @@ u3_noun rag) { while ( 1 ) { - if ( u3_no == u3du(mew) ) { + if ( c3n == u3du(mew) ) { return rag; } else { u3_noun i_mew = u3h(mew); @@ -163,13 +163,13 @@ { u3_noun p_gen, q_gen, r_gen; - if ( u3_no == u3du(gen) ) { + if ( c3n == u3du(gen) ) { open: { u3_noun ter = u3_cr_at(u3_cv_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); u3_noun ret; - if ( u3_yes == u3_cr_sing(rex, gen) ) { + if ( c3y == u3_cr_sing(rex, gen) ) { u3_noun zix = u3_cqfu_shep (van, "gene", 'q', u3k(gen)); @@ -182,7 +182,7 @@ return ret; } } - else if ( u3_yes == u3du(u3h(gen)) ) { + else if ( c3y == u3du(u3h(gen)) ) { _play_used(); { u3_noun dis = _play_x(van, sut, u3h(gen)); @@ -264,7 +264,7 @@ case c3__dtzz: u3_cx_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { - u3_noun boc = (u3_no == u3ud(q_gen)) + u3_noun boc = (c3n == u3ud(q_gen)) ? c3__noun : u3nc(c3__atom, u3k(p_gen)); u3_noun ret = u3_cqf_cube(q_gen, boc); @@ -508,7 +508,7 @@ u3_noun sut, u3_noun gen) { - u3_noun von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, u3_no, 0); + u3_noun von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); u3_noun ret = _play_x(von, sut, gen); u3z(von); @@ -523,8 +523,8 @@ { u3_noun sut, gen, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &gen, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &gen, u3_cv_con, &van, 0)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_repo.c b/j/6/ut_repo.c index 805b35deb5..f72fddf119 100644 --- a/j/6/ut_repo.c +++ b/j/6/ut_repo.c @@ -14,7 +14,7 @@ { u3_noun p_sut, q_sut; - if ( u3_no == u3du(sut) ) switch ( sut ) { + if ( c3n == u3du(sut) ) switch ( sut ) { default: return u3k(sut); case c3__noun: @@ -28,28 +28,28 @@ } case c3__bull: { - if ( u3_no == u3_cr_cell(u3t(sut), &p_sut, &q_sut)) { + if ( c3n == u3_cr_cell(u3t(sut), &p_sut, &q_sut)) { return u3_cm_bail(c3__fail); } else { return u3k(q_sut); } } case c3__core: { - if ( u3_no == u3_cr_cell(u3t(sut), &p_sut, &q_sut) ) { + if ( c3n == u3_cr_cell(u3t(sut), &p_sut, &q_sut) ) { return u3_cm_bail(c3__fail); } else { return u3nt(c3__cell, c3__noun, u3k(p_sut)); } } case c3__cube: { - if ( u3_no == u3_cr_cell(u3t(sut), &p_sut, &q_sut)) { + if ( c3n == u3_cr_cell(u3t(sut), &p_sut, &q_sut)) { return u3_cm_bail(c3__fail); } else { return u3k(q_sut); } } case c3__face: { - if ( u3_no == u3_cr_cell(u3t(sut), &p_sut, &q_sut)) { + if ( c3n == u3_cr_cell(u3t(sut), &p_sut, &q_sut)) { return u3_cm_bail(c3__fail); } else { return u3k(q_sut); @@ -68,7 +68,7 @@ { u3_noun sut; - if ( u3_none == (sut = u3_cr_at(u3_cv_sam, cor)) ) { + if ( c3nne == (sut = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { return u3_cqfu_repo(cor, sut); diff --git a/j/6/ut_rest.c b/j/6/ut_rest.c index 2b2c8d3698..b1f8633ced 100644 --- a/j/6/ut_rest.c +++ b/j/6/ut_rest.c @@ -41,7 +41,7 @@ u3_noun nog, u3_noun fub) { - if ( u3_no == u3du(nog) ) { + if ( c3n == u3du(nog) ) { return fub; } else { u3_noun buf = _rest_in_fork @@ -74,9 +74,9 @@ u3_noun leg) { if ( u3_nul == leg ) { - return u3_no; + return c3n; } else { - return u3_or(u3_cqdi_has(fan, u3h(leg)), + return c3o(u3_cqdi_has(fan, u3h(leg)), _rest_hit_fan(fan, u3t(leg))); } } @@ -86,7 +86,7 @@ { u3_noun fan = u3_cr_at(u3_cqfu_van_fan, van); - if ( u3_yes == _rest_hit_fan(fan, leg) ) { + if ( c3y == _rest_hit_fan(fan, leg) ) { return u3_cm_error("rest-loop"); } else { @@ -108,8 +108,8 @@ { u3_noun sut, leg, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &leg, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &leg, u3_cv_con, &van, 0)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -125,7 +125,7 @@ c3_m fun_m = c3__rest; u3_noun pro = u3_cz_find_2(fun_m, sut, leg); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { diff --git a/j/6/ut_seek.c b/j/6/ut_seek.c index 2170fcfe50..605481eff4 100644 --- a/j/6/ut_seek.c +++ b/j/6/ut_seek.c @@ -96,7 +96,7 @@ u3_noun hey, ret; u3_cr_cell(tor, &p_tor, &q_tor); - if ( u3_yes == u3h(q_tor) ) { + if ( c3y == u3h(q_tor) ) { return u3_nul; } u3_cr_cell(u3t(q_tor), &pq_tor, &qq_tor); @@ -113,7 +113,7 @@ ret = u3nq (u3_nul, - u3_no, + c3n, u3_cqc_peg(pq_tor, _seek_silk_yaw(hey)), _seek_silk_fum(hey, qq_tor)); @@ -131,9 +131,9 @@ { if ( u3_nul == hyp ) { return u3nt - (1, u3_yes, u3k(sut)); + (1, c3y, u3k(sut)); } - else if ( u3_no == u3du(hyp) ) { + else if ( c3n == u3du(hyp) ) { return u3_cm_bail(c3__fail); } else { @@ -143,17 +143,17 @@ u3_noun p_zar, q_zar; u3_noun yip, syp, ret; - if ( u3_yes == u3du(i_hyp) ) { + if ( c3y == u3du(i_hyp) ) { yip = u3k(i_hyp); } else { - yip = u3nt(u3_no, 0, u3k(i_hyp)); + yip = u3nt(c3n, 0, u3k(i_hyp)); } zar = _cqfu_seek(van, sut, way, t_hyp); u3_cr_cell(zar, &p_zar, &q_zar); #if 0 - if ( u3_yes == u3h(yip) ) { + if ( c3y == u3h(yip) ) { sic = u3_nul; } else { // sic = _seek_silk(van, u3h(u3t(yip)), zar); @@ -167,7 +167,7 @@ } #endif - if ( u3_yes == u3h(q_zar) ) { + if ( c3y == u3h(q_zar) ) { syp = u3k(u3t(q_zar)); } else { u3_noun pq_zar, qq_zar; @@ -180,10 +180,10 @@ u3z(wip); } - if ( u3_no == u3h(yip) ) { + if ( c3n == u3h(yip) ) { u3_noun p_yip, q_yip, hud; - if ( u3_no == u3_cr_cell(u3t(yip), &p_yip, &q_yip) ) { + if ( c3n == u3_cr_cell(u3t(yip), &p_yip, &q_yip) ) { return u3_cm_bail(c3__fail); } hud = u3_cqfu_fink(van, syp, p_yip, way, q_yip); @@ -200,13 +200,13 @@ else { u3_noun p_yip = u3t(yip); - if ( u3_no == u3ud(p_yip) ) { + if ( c3n == u3ud(p_yip) ) { return u3_cm_bail(c3__fail); } else { ret = u3nt (u3_cqc_peg(p_zar, p_yip), - u3_yes, + c3y, u3_cqfu_peek(van, syp, way, p_yip)); } } @@ -224,11 +224,11 @@ { u3_noun sut, way, hyp, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &way, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &way, u3_cv_sam_3, &hyp, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -245,7 +245,7 @@ c3_m fun_m = c3__seek; u3_noun pro = u3_cz_find_3(fun_m, sut, way, hyp); - if ( u3_none != pro ) { + if ( c3nne != pro ) { return pro; } else { @@ -265,7 +265,7 @@ u3_noun p_zar = u3h(zar); u3_noun q_zar = u3t(zar); - if ( u3_yes != u3h(q_zar) ) { + if ( c3y != u3h(q_zar) ) { return u3_cm_bail(c3__exit); } else { @@ -281,11 +281,11 @@ { u3_noun sut, way, hyp, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &way, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &way, u3_cv_sam_3, &hyp, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_sift.c b/j/6/ut_sift.c index 8b617b057d..bcc4d253df 100644 --- a/j/6/ut_sift.c +++ b/j/6/ut_sift.c @@ -13,10 +13,10 @@ { u3_noun sut, ref, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &ref, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_swab.c b/j/6/ut_swab.c index b9eb463a27..e374ce0687 100644 --- a/j/6/ut_swab.c +++ b/j/6/ut_swab.c @@ -15,7 +15,7 @@ u3_noun sut, u3_noun har) { - if ( u3_no == u3du(har) ) { + if ( c3n == u3du(har) ) { return u3_nul; } else { u3_noun i_har = u3h(har); @@ -39,10 +39,10 @@ { u3_noun van, sut, har; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &har, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &har, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_tock.c b/j/6/ut_tock.c index 87a07f8edb..66bc63542b 100644 --- a/j/6/ut_tock.c +++ b/j/6/ut_tock.c @@ -15,7 +15,7 @@ u3_noun mur, u3_noun men) { - if ( u3_no == u3du(men) ) { + if ( c3n == u3du(men) ) { return u3nc(u3_nul, u3_nul); } else { @@ -34,7 +34,7 @@ ret = u3nc( ( (u3_nul == p_mox) ? u3nc(u3_nul, u3k(p_geq)) - : (u3_no == u3_cr_sing(p_geq, u3t(p_mox))) + : (c3n == u3_cr_sing(p_geq, u3t(p_mox))) ? u3_cm_bail(c3__exit) : u3k(p_mox) ), u3nc(u3nc(u3k(q_geq), u3k(qi_men)), u3k(q_mox))); @@ -75,12 +75,12 @@ { u3_noun van, sut, peh, mur, men; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &peh, + if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &peh, u3_cv_sam_6, &mur, u3_cv_sam_7, &men, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_wrap.c b/j/6/ut_wrap.c index 22d205130a..b8062dfea7 100644 --- a/j/6/ut_wrap.c +++ b/j/6/ut_wrap.c @@ -13,7 +13,7 @@ { u3_noun p_sut, q_sut; - if ( u3_no == u3du(sut) ) { + if ( c3n == u3du(sut) ) { return u3_cm_error("wrap-type"); } else switch ( u3h(sut) ) { @@ -23,7 +23,7 @@ { u3_noun pq_sut, qq_sut, rq_sut; - if ( u3_no == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut) ) { + if ( c3n == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut) ) { return u3_cm_bail(c3__fail); } else if ( c3__gold != pq_sut ) { @@ -62,8 +62,8 @@ { u3_noun sut, yoz, van; - if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &yoz, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &yoz, u3_cv_con, &van, 0)) || + (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/dash.c b/j/dash.c index 0cc9162752..836c73bd27 100644 --- a/j/dash.c +++ b/j/dash.c @@ -4,57 +4,57 @@ */ #include "all.h" -static u3_cs_harm _mood__hoon_add_a[] = {{".2", u3_cwa_add, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_dec_a[] = {{".2", u3_cwa_dec, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_div_a[] = {{".2", u3_cwa_div, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_gte_a[] = {{".2", u3_cwa_gte, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_gth_a[] = {{".2", u3_cwa_gth, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_lte_a[] = {{".2", u3_cwa_lte, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_lth_a[] = {{".2", u3_cwa_lth, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_mod_a[] = {{".2", u3_cwa_mod, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_mul_a[] = {{".2", u3_cwa_mul, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_sub_a[] = {{".2", u3_cwa_sub, u3_yes}, {}}; +static u3_cs_harm _mood__hoon_add_a[] = {{".2", u3_cwa_add, c3y}, {}}; +static u3_cs_harm _mood__hoon_dec_a[] = {{".2", u3_cwa_dec, c3y}, {}}; +static u3_cs_harm _mood__hoon_div_a[] = {{".2", u3_cwa_div, c3y}, {}}; +static u3_cs_harm _mood__hoon_gte_a[] = {{".2", u3_cwa_gte, c3y}, {}}; +static u3_cs_harm _mood__hoon_gth_a[] = {{".2", u3_cwa_gth, c3y}, {}}; +static u3_cs_harm _mood__hoon_lte_a[] = {{".2", u3_cwa_lte, c3y}, {}}; +static u3_cs_harm _mood__hoon_lth_a[] = {{".2", u3_cwa_lth, c3y}, {}}; +static u3_cs_harm _mood__hoon_mod_a[] = {{".2", u3_cwa_mod, c3y}, {}}; +static u3_cs_harm _mood__hoon_mul_a[] = {{".2", u3_cwa_mul, c3y}, {}}; +static u3_cs_harm _mood__hoon_sub_a[] = {{".2", u3_cwa_sub, c3y}, {}}; -static u3_cs_harm _mood__hoon_bind_a[] = {{".2", u3_cwb_bind, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_clap_a[] = {{".2", u3_cwb_clap, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_drop_a[] = {{".2", u3_cwb_drop, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_flop_a[] = {{".2", u3_cwb_flop, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_lent_a[] = {{".2", u3_cwb_lent, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_levy_a[] = {{".2", u3_cwb_levy, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_lien_a[] = {{".2", u3_cwb_lien, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_need_a[] = {{".2", u3_cwb_need, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_reel_a[] = {{".2", u3_cwb_reel, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_roll_a[] = {{".2", u3_cwb_roll, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_skim_a[] = {{".2", u3_cwb_skim, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_skip_a[] = {{".2", u3_cwb_skip, u3_yes}, {}}; -// static u3_cs_harm _mood__hoon_scag_a[] = {{".2", u3_cwb_scag, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_slag_a[] = {{".2", u3_cwb_slag, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_snag_a[] = {{".2", u3_cwb_snag, u3_yes}, {}}; -// static u3_cs_harm _mood__hoon_sort_a[] = {{".2", u3_cwb_sort, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_turn_a[] = {{".2", u3_cwb_turn, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_weld_a[] = {{".2", u3_cwb_weld, u3_yes}, {}}; +static u3_cs_harm _mood__hoon_bind_a[] = {{".2", u3_cwb_bind, c3y}, {}}; +static u3_cs_harm _mood__hoon_clap_a[] = {{".2", u3_cwb_clap, c3y}, {}}; +static u3_cs_harm _mood__hoon_drop_a[] = {{".2", u3_cwb_drop, c3y}, {}}; +static u3_cs_harm _mood__hoon_flop_a[] = {{".2", u3_cwb_flop, c3y}, {}}; +static u3_cs_harm _mood__hoon_lent_a[] = {{".2", u3_cwb_lent, c3y}, {}}; +static u3_cs_harm _mood__hoon_levy_a[] = {{".2", u3_cwb_levy, c3y}, {}}; +static u3_cs_harm _mood__hoon_lien_a[] = {{".2", u3_cwb_lien, c3y}, {}}; +static u3_cs_harm _mood__hoon_need_a[] = {{".2", u3_cwb_need, c3y}, {}}; +static u3_cs_harm _mood__hoon_reel_a[] = {{".2", u3_cwb_reel, c3y}, {}}; +static u3_cs_harm _mood__hoon_roll_a[] = {{".2", u3_cwb_roll, c3y}, {}}; +static u3_cs_harm _mood__hoon_skim_a[] = {{".2", u3_cwb_skim, c3y}, {}}; +static u3_cs_harm _mood__hoon_skip_a[] = {{".2", u3_cwb_skip, c3y}, {}}; +// static u3_cs_harm _mood__hoon_scag_a[] = {{".2", u3_cwb_scag, c3y}, {}}; +static u3_cs_harm _mood__hoon_slag_a[] = {{".2", u3_cwb_slag, c3y}, {}}; +static u3_cs_harm _mood__hoon_snag_a[] = {{".2", u3_cwb_snag, c3y}, {}}; +// static u3_cs_harm _mood__hoon_sort_a[] = {{".2", u3_cwb_sort, c3y}, {}}; +static u3_cs_harm _mood__hoon_turn_a[] = {{".2", u3_cwb_turn, c3y}, {}}; +static u3_cs_harm _mood__hoon_weld_a[] = {{".2", u3_cwb_weld, c3y}, {}}; -static u3_cs_harm _mood__hoon_bex_a[] = {{".2", u3_cwc_bex, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_can_a[] = {{".2", u3_cwc_can, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_cap_a[] = {{".2", u3_cwc_cap, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_cat_a[] = {{".2", u3_cwc_cat, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_con_a[] = {{".2", u3_cwc_con, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_cut_a[] = {{".2", u3_cwc_cut, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_dis_a[] = {{".2", u3_cwc_dis, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_dor_a[] = {{".2", u3_cwc_dor, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_end_a[] = {{".2", u3_cwc_end, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_gor_a[] = {{".2", u3_cwc_gor, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_hor_a[] = {{".2", u3_cwc_hor, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_lsh_a[] = {{".2", u3_cwc_lsh, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_mas_a[] = {{".2", u3_cwc_mas, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_met_a[] = {{".2", u3_cwc_met, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_mix_a[] = {{".2", u3_cwc_mix, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_mug_a[] = {{".2", u3_cwc_mug, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_peg_a[] = {{".2", u3_cwc_peg, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_rap_a[] = {{".2", u3_cwc_rap, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_rip_a[] = {{".2", u3_cwc_rip, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_rsh_a[] = {{".2", u3_cwc_rsh, u3_yes}, {}}; -static u3_cs_harm _mood__hoon_vor_a[] = {{".2", u3_cwc_vor, u3_yes}, {}}; +static u3_cs_harm _mood__hoon_bex_a[] = {{".2", u3_cwc_bex, c3y}, {}}; +static u3_cs_harm _mood__hoon_can_a[] = {{".2", u3_cwc_can, c3y}, {}}; +static u3_cs_harm _mood__hoon_cap_a[] = {{".2", u3_cwc_cap, c3y}, {}}; +static u3_cs_harm _mood__hoon_cat_a[] = {{".2", u3_cwc_cat, c3y}, {}}; +static u3_cs_harm _mood__hoon_con_a[] = {{".2", u3_cwc_con, c3y}, {}}; +static u3_cs_harm _mood__hoon_cut_a[] = {{".2", u3_cwc_cut, c3y}, {}}; +static u3_cs_harm _mood__hoon_dis_a[] = {{".2", u3_cwc_dis, c3y}, {}}; +static u3_cs_harm _mood__hoon_dor_a[] = {{".2", u3_cwc_dor, c3y}, {}}; +static u3_cs_harm _mood__hoon_end_a[] = {{".2", u3_cwc_end, c3y}, {}}; +static u3_cs_harm _mood__hoon_gor_a[] = {{".2", u3_cwc_gor, c3y}, {}}; +static u3_cs_harm _mood__hoon_hor_a[] = {{".2", u3_cwc_hor, c3y}, {}}; +static u3_cs_harm _mood__hoon_lsh_a[] = {{".2", u3_cwc_lsh, c3y}, {}}; +static u3_cs_harm _mood__hoon_mas_a[] = {{".2", u3_cwc_mas, c3y}, {}}; +static u3_cs_harm _mood__hoon_met_a[] = {{".2", u3_cwc_met, c3y}, {}}; +static u3_cs_harm _mood__hoon_mix_a[] = {{".2", u3_cwc_mix, c3y}, {}}; +static u3_cs_harm _mood__hoon_mug_a[] = {{".2", u3_cwc_mug, c3y}, {}}; +static u3_cs_harm _mood__hoon_peg_a[] = {{".2", u3_cwc_peg, c3y}, {}}; +static u3_cs_harm _mood__hoon_rap_a[] = {{".2", u3_cwc_rap, c3y}, {}}; +static u3_cs_harm _mood__hoon_rip_a[] = {{".2", u3_cwc_rip, c3y}, {}}; +static u3_cs_harm _mood__hoon_rsh_a[] = {{".2", u3_cwc_rsh, c3y}, {}}; +static u3_cs_harm _mood__hoon_vor_a[] = {{".2", u3_cwc_vor, c3y}, {}}; static u3_cs_harm _mood__hoon__po_ind_a[] = {{".2", u3_cwcp_ind}, {}}; static u3_cs_harm _mood__hoon__po_ins_a[] = {{".2", u3_cwcp_ins}, {}}; @@ -68,13 +68,13 @@ static u3_cs_core _mood__hoon__po_d[] = {} }; -static u3_cs_harm _mood__hoon__by_gas_a[] = {{".2", u3_cwdb_gas, u3_yes}, {}}; -static u3_cs_harm _mood__hoon__by_get_a[] = {{".2", u3_cwdb_get, u3_yes}, {}}; -static u3_cs_harm _mood__hoon__by_has_a[] = {{".2", u3_cwdb_has, u3_yes}, {}}; -static u3_cs_harm _mood__hoon__by_int_a[] = {{".2", u3_cwdb_int, u3_yes}, {}}; -static u3_cs_harm _mood__hoon__by_put_a[] = {{".2", u3_cwdb_put, u3_yes}, {}}; -static u3_cs_harm _mood__hoon__by_tap_a[] = {{".2", u3_cwdb_tap, u3_yes}, {}}; -static u3_cs_harm _mood__hoon__by_uni_a[] = {{".2", u3_cwdb_uni, u3_yes}, {}}; +static u3_cs_harm _mood__hoon__by_gas_a[] = {{".2", u3_cwdb_gas, c3y}, {}}; +static u3_cs_harm _mood__hoon__by_get_a[] = {{".2", u3_cwdb_get, c3y}, {}}; +static u3_cs_harm _mood__hoon__by_has_a[] = {{".2", u3_cwdb_has, c3y}, {}}; +static u3_cs_harm _mood__hoon__by_int_a[] = {{".2", u3_cwdb_int, c3y}, {}}; +static u3_cs_harm _mood__hoon__by_put_a[] = {{".2", u3_cwdb_put, c3y}, {}}; +static u3_cs_harm _mood__hoon__by_tap_a[] = {{".2", u3_cwdb_tap, c3y}, {}}; +static u3_cs_harm _mood__hoon__by_uni_a[] = {{".2", u3_cwdb_uni, c3y}, {}}; static u3_cs_core _mood__hoon__by_d[] = { { "gas", _mood__hoon__by_gas_a }, { "get", _mood__hoon__by_get_a }, diff --git a/v/ames.c b/v/ames.c index f967625eb9..21845999e9 100644 --- a/v/ames.c +++ b/v/ames.c @@ -51,7 +51,7 @@ _ames_czar(c3_y imp_y, c3_s* por_s) { u3_ames* sam_u = &u3_Host.sam_u; - if ( u3_yes == u3_Host.ops_u.loh ) { + if ( c3y == u3_Host.ops_u.loh ) { *por_s = 31337 + imp_y; return 0x7f000001; } @@ -126,22 +126,22 @@ _ames_lane_ip(u3_noun lan, c3_s* por_s, c3_w* pip_w) *por_s= (c3_s) u3h(u3t(u3t(lan))); *pip_w = u3_cr_word(0, u3t(u3t(u3t(lan)))); - return u3_yes; + return c3y; } break; case c3__is: { u3_noun pq_lan = u3h(u3t(u3t(lan))); - if ( u3_nul == pq_lan ) return u3_no; + if ( u3_nul == pq_lan ) return c3n; else return _ames_lane_ip(u3t(pq_lan), por_s, pip_w); } break; case c3__ix: { *por_s = (c3_s) u3h(u3t(u3t(lan))); *pip_w = u3_cr_word(0, u3t(u3t(u3t(lan)))); - return u3_yes; + return c3y; } break; } - return u3_no; + return c3n; } /* An unusual lameness in libuv. @@ -190,7 +190,7 @@ u3_ames_ef_send(u3_noun lan, u3_noun pac) return; } - if ( u3_yes == _ames_lane_ip(lan, &por_s, &pip_w) ) { + if ( c3y == _ames_lane_ip(lan, &por_s, &pip_w) ) { c3_w len_w = u3_cr_met(3, pac); c3_y* buf_y = c3_malloc(len_w); @@ -249,7 +249,7 @@ _ames_time_cb(uv_timer_t* tim_uo) (u3nt(u3_blip, c3__ames, u3_nul), u3nc(c3__wake, u3_nul)); } - u3_lo_shut(u3_no); + u3_lo_shut(c3n); } /* _ames_recv_cb(): receive callback. @@ -282,7 +282,7 @@ _ames_recv_cb(uv_udp_t* wax_u, msg)); } _ames_free(buf_u->base); - u3_lo_shut(u3_yes); + u3_lo_shut(c3y); } } @@ -300,7 +300,7 @@ u3_ames_io_init() u3_noun num = u3_dc("slaw", 'p', imp); c3_y num_y; - if ( u3_no == u3du(num) ) { + if ( c3n == u3du(num) ) { uL(fprintf(uH, "malformed emperor: %s\n", u3_Host.ops_u.imp_c)); exit(1); } @@ -380,8 +380,8 @@ u3_ames_io_poll() u3_noun wen = u3_cv_keep(u3nt(u3_blip, c3__ames, u3_nul)); if ( (u3_nul != wen) && - (u3_yes == u3du(wen)) && - (u3_yes == u3ud(u3t(wen))) ) + (c3y == u3du(wen)) && + (c3y == u3ud(u3t(wen))) ) { c3_d gap_d = u3_time_gap_ms(u3k(u3A->now), u3k(u3t(wen))); c3_w lem_w = (time(0) - sam_u->law_w); @@ -389,18 +389,18 @@ u3_ames_io_poll() gap_d = c3_min(gap_d, (c3_d)(1000 * lef_w)); - if ( u3_yes == sam_u->alm ) { + if ( c3y == sam_u->alm ) { uv_timer_stop(&sam_u->tim_u); } - else sam_u->alm = u3_yes; + else sam_u->alm = c3y; uv_timer_start(&sam_u->tim_u, _ames_time_cb, gap_d, 0); } else { - if ( u3_yes == sam_u->alm ) { + if ( c3y == sam_u->alm ) { uv_timer_stop(&sam_u->tim_u); } - sam_u->alm = u3_no; + sam_u->alm = c3n; } u3z(wen); } diff --git a/v/batz.c b/v/batz.c index 74f6c01716..be93c51b46 100644 --- a/v/batz.c +++ b/v/batz.c @@ -29,7 +29,7 @@ u3_batz_io_init(void) u3_batz* beh_u = &u3_Host.beh_u; uv_timer_init(u3L, &beh_u->tim_u); - beh_u->alm = u3_no; + beh_u->alm = c3n; } /* u3_batz_io_exit(): terminate timer. @@ -55,7 +55,7 @@ _batz_time_cb(uv_timer_t* tim_u) (u3nt(u3_blip, c3__batz, u3_nul), u3nc(c3__wake, u3_nul)); } - u3_lo_shut(u3_no); + u3_lo_shut(c3n); } /* u3_batz_io_poll(): update batz IO state. @@ -67,25 +67,25 @@ u3_batz_io_poll(void) u3_noun wen = u3_cv_keep(u3nt(u3_blip, c3__batz, u3_nul)); if ( (u3_nul != wen) && - (u3_yes == u3du(wen)) && - (u3_yes == u3ud(u3t(wen))) ) + (c3y == u3du(wen)) && + (c3y == u3ud(u3t(wen))) ) { c3_d gap_d = u3_time_gap_ms(u3k(u3A->now), u3k(u3t(wen))); gap_d += beh_u->run_w; - if ( u3_yes == beh_u->alm ) { + if ( c3y == beh_u->alm ) { uv_timer_stop(&beh_u->tim_u); } - else beh_u->alm = u3_yes; + else beh_u->alm = c3y; uv_timer_start(&beh_u->tim_u, _batz_time_cb, gap_d, 0); } else { - if ( u3_yes == beh_u->alm ) { + if ( c3y == beh_u->alm ) { uv_timer_stop(&beh_u->tim_u); } - beh_u->alm = u3_no; + beh_u->alm = c3n; } u3z(wen); } diff --git a/v/cttp.c b/v/cttp.c index cf719c66f7..85952e9f26 100644 --- a/v/cttp.c +++ b/v/cttp.c @@ -220,7 +220,7 @@ _cttp_octs_to_bod(u3_noun oct) { c3_w len_w; - if ( u3_ne(u3_ca_is_cat(u3h(oct))) ) { // 2GB max + if ( !_(u3_ca_is_cat(u3h(oct))) ) { // 2GB max u3_cm_bail(c3__fail); return 0; } len_w = u3h(oct); @@ -302,7 +302,7 @@ _cttp_mcut_path(c3_c* buf_c, c3_w len_w, c3_c sep_c, u3_noun pax) static c3_w _cttp_mcut_host(c3_c* buf_c, c3_w len_w, u3_noun hot) { - if ( u3_yes == u3h(hot) ) { + if ( c3y == u3h(hot) ) { len_w = _cttp_mcut_path(buf_c, len_w, '.', u3_ckb_flop(u3k(u3t(hot)))); } else { @@ -329,7 +329,7 @@ _cttp_mcut_pfix(c3_c* buf_c, c3_w len_w, u3_noun hat) u3_noun q_hat = u3h(u3t(hat)); u3_noun r_hat = u3t(u3t(hat)); - if ( u3_yes == p_hat ) { + if ( c3y == p_hat ) { len_w = _cttp_mcut_str(buf_c, len_w, "https://"); } else { len_w = _cttp_mcut_str(buf_c, len_w, "http://"); @@ -639,7 +639,7 @@ _cttp_message_complete(http_parser* par_u) c3_assert(ceq_u == coc_u->qec_u); coc_u->qec_u = 0; } - if ( u3_yes == coc_u->sec ) { + if ( c3y == coc_u->sec ) { SSL_shutdown(coc_u->ssl.ssl_u); _cttp_ccon_cryp_rout(coc_u); // uL(fprintf(uH, "cttp: close b: %p\n", coc_u)); @@ -834,7 +834,7 @@ _cttp_ccon_fail_cb(uv_handle_t* wax_u) static void _cttp_ccon_fail(u3_ccon* coc_u, u3_bean say) { - if ( u3_yes == say ) { + if ( c3y == say ) { uL(fprintf(uH, "cttp: ERROR\n")); } @@ -859,7 +859,7 @@ _cttp_ccon_kick_resolve_cb(uv_getaddrinfo_t* adr_u, c3_assert(u3_csat_dead == coc_u->sat_e); if ( 0 != sas_i ) { - _cttp_ccon_fail(coc_u, u3_yes); + _cttp_ccon_fail(coc_u, c3y); } else { coc_u->ipf_w = ntohl(((struct sockaddr_in *)aif_u->ai_addr)-> @@ -890,7 +890,7 @@ _cttp_ccon_kick_resolve(u3_ccon* coc_u) _cttp_ccon_kick_resolve_cb, coc_u->hot_c, por_c, &hin_u) ) { - _cttp_ccon_fail(coc_u, u3_yes); + _cttp_ccon_fail(coc_u, c3y); } } @@ -905,10 +905,10 @@ _cttp_ccon_kick_connect_cb(uv_connect_t* cot_u, c3_assert(u3_csat_addr == coc_u->sat_e); if ( 0 != sas_i ) { - _cttp_ccon_fail(coc_u, u3_yes); + _cttp_ccon_fail(coc_u, c3y); } else { - coc_u->sat_e = (u3_yes == coc_u->sec) ? + coc_u->sat_e = (c3y == coc_u->sec) ? u3_csat_crop : u3_csat_clyr; _cttp_ccon_kick(coc_u); @@ -925,7 +925,7 @@ _cttp_ccon_kick_connect(u3_ccon* coc_u) c3_assert(u3_csat_addr == coc_u->sat_e); if ( 0 != uv_tcp_init(u3L, &coc_u->wax_u) ) { - _cttp_ccon_fail(coc_u, u3_yes); + _cttp_ccon_fail(coc_u, c3y); } add_u.sin_family = AF_INET; @@ -937,7 +937,7 @@ _cttp_ccon_kick_connect(u3_ccon* coc_u) (const struct sockaddr*) & add_u, _cttp_ccon_kick_connect_cb) ) { - _cttp_ccon_fail(coc_u, u3_yes); + _cttp_ccon_fail(coc_u, c3y); } } @@ -959,12 +959,12 @@ _cttp_ccon_kick_write_cb(uv_write_t* wri_u, c3_i sas_i) _u3_write_t* ruq_u = (void *)wri_u; if ( 0 != sas_i ) { - _cttp_ccon_fail(ruq_u->coc_u, u3_yes); + _cttp_ccon_fail(ruq_u->coc_u, c3y); } free(ruq_u->buf_y); free(ruq_u); } - u3_lo_shut(u3_no); + u3_lo_shut(c3n); } /* _cttp_ccon_kick_write() @@ -1008,7 +1008,7 @@ _cttp_ccon_kick_write_buf(u3_ccon* coc_u, uv_buf_t buf_u) &buf_u, 1, _cttp_ccon_kick_write_cb) ) { - _cttp_ccon_fail(coc_u, u3_yes); + _cttp_ccon_fail(coc_u, c3y); } } @@ -1112,7 +1112,7 @@ _cttp_ccon_pars_shov(u3_ccon* coc_u, void* buf_u, ssize_t siz_i) siz_i) ) { uL(fprintf(uH, "http: parse error\n")); - _cttp_ccon_fail(coc_u, u3_no); + _cttp_ccon_fail(coc_u, c3n); } } } @@ -1168,10 +1168,10 @@ _cttp_ccon_kick_read_cryp_cb(uv_stream_t* tcp_u, u3_lo_open(); { if ( siz_w == UV_EOF ) { - _cttp_ccon_fail(coc_u, u3_no); + _cttp_ccon_fail(coc_u, c3n); } else if ( siz_w < 0 ) { uL(fprintf(uH, "cttp: read 2: %s\n", uv_strerror(siz_w))); - _cttp_ccon_fail(coc_u, u3_yes); + _cttp_ccon_fail(coc_u, c3y); } else { u3_creq* ceq_u = coc_u->ceq_u; @@ -1188,7 +1188,7 @@ _cttp_ccon_kick_read_cryp_cb(uv_stream_t* tcp_u, free(buf_u->base); } } - u3_lo_shut(u3_yes); + u3_lo_shut(c3y); } /* _cttp_ccon_read_clyr_cb() @@ -1214,10 +1214,10 @@ _cttp_ccon_kick_read_clyr_cb(uv_stream_t* tcp_u, u3_lo_open(); { if ( siz_w == UV_EOF ) { - _cttp_ccon_fail(coc_u, u3_no); + _cttp_ccon_fail(coc_u, c3n); } else if ( siz_w < 0 ) { uL(fprintf(uH, "cttp: read 1: %s\n", uv_strerror(siz_w))); - _cttp_ccon_fail(coc_u, u3_yes); + _cttp_ccon_fail(coc_u, c3y); } else { _cttp_ccon_pars_shov(coc_u, buf_u->base, siz_w); @@ -1226,7 +1226,7 @@ _cttp_ccon_kick_read_clyr_cb(uv_stream_t* tcp_u, free(buf_u->base); } } - u3_lo_shut(u3_yes); + u3_lo_shut(c3y); } /* _cttp_ccon_kick_read_clyr(): start reading on insecure socket. @@ -1408,7 +1408,7 @@ _cttp_creq_new(c3_l num_l, u3_noun hes) ceq_u->num_l = num_l; ceq_u->sec = sec; ceq_u->por_s = (u3_nul == pus) ? - ( (u3_yes == sec) ? 443 : 80 ) : u3t(pus); + ( (c3y == sec) ? 443 : 80 ) : u3t(pus); ceq_u->hot_c = _cttp_creq_host(u3k(hot)); // XX duplicate work with url ceq_u->url_c = _cttp_creq_url(u3k(pul)); @@ -1490,7 +1490,7 @@ _cttp_ccon_fire(u3_ccon* coc_u, u3_creq* ceq_u) _cttp_ccon_fire_str(coc_u, "User-Agent: urbit/vere.0.2\r\n"); _cttp_ccon_fire_str(coc_u, "Accept: */*\r\n"); // XX it's more painful than it's worth to deal with SSL+Keepalive - if ( u3_no == coc_u->sec ) { + if ( c3n == coc_u->sec ) { _cttp_ccon_fire_str(coc_u, "Connection: Keep-Alive\r\n"); } _cttp_ccon_fire_body(coc_u, _cttp_bud("Host", ceq_u->hot_c)); @@ -1516,7 +1516,7 @@ static void _cttp_ccon_fill(u3_ccon* coc_u) { u3_creq* ceq_u = coc_u->ceq_u; - u3_bean fir_t = u3_yes; + u3_bean fir_t = c3y; while ( ceq_u ) { // @@ -1535,14 +1535,14 @@ _cttp_ccon_fill(u3_ccon* coc_u) // // Extend for any other non-idempotent method (XX add). // - if ( (u3_no == fir_t) && (u3_hmet_nop == ceq_u->met_e) ) { + if ( (c3n == fir_t) && (u3_hmet_nop == ceq_u->met_e) ) { ceq_u = ceq_u->nex_u; continue; } - if ( (u3_no == fir_t) && (u3_hmet_post == ceq_u->met_e) ) { + if ( (c3n == fir_t) && (u3_hmet_post == ceq_u->met_e) ) { return; } - fir_t = u3_no; + fir_t = c3n; _cttp_ccon_fire(coc_u, ceq_u); ceq_u = ceq_u->nex_u; } @@ -1553,9 +1553,9 @@ _cttp_ccon_fill(u3_ccon* coc_u) static void _cttp_ccon_send(u3_ccon* coc_u, u3_creq* ceq_u) { - u3_bean nou = ((0 == coc_u->ceq_u) ? u3_yes : u3_no); + u3_bean nou = ((0 == coc_u->ceq_u) ? c3y : c3n); - if ( u3_yes == nou ) { + if ( c3y == nou ) { c3_assert(0 == coc_u->qec_u); coc_u->ceq_u = coc_u->qec_u = ceq_u; diff --git a/v/http.c b/v/http.c index 298e309026..bd7ce40f8b 100644 --- a/v/http.c +++ b/v/http.c @@ -260,8 +260,8 @@ _http_respond_request(u3_hreq* req_u, } free(rep_u); - c3_assert(u3_no == req_u->end); - req_u->end = u3_yes; + c3_assert(c3n == req_u->end); + req_u->end = c3y; } /* _http_conn_free_early(): free http connection on failure. @@ -548,8 +548,8 @@ _http_req_new(u3_hcon* hon_u) else req_u->ipf_w = ntohl(adr_u.sin_addr.s_addr); } - req_u->liv = u3_no; - req_u->end = u3_no; + req_u->liv = c3n; + req_u->end = c3n; req_u->url_c = 0; @@ -609,7 +609,7 @@ _http_conn_read_cb(uv_stream_t* tcp_u, free(buf_u->base); } } - u3_lo_shut(u3_yes); + u3_lo_shut(c3y); } /* _http_conn_new(): create http connection. @@ -787,7 +787,7 @@ _http_octs_to_bod(u3_noun oct) { c3_w len_w; - if ( u3_ne(u3_ca_is_cat(u3h(oct))) ) { + if ( !_(u3_ca_is_cat(u3h(oct))) ) { // 2GB max u3_cm_bail(c3__fail); return 0; } @@ -821,7 +821,7 @@ _http_pox_to_noun(c3_w sev_l, c3_w coq_l, c3_w seq_l) u3_nul)); } -/* _http_request_to_noun(): translate http request into noun, or u3_none. +/* _http_request_to_noun(): translate http request into noun, or c3nne. */ static u3_noun _http_request_to_noun(u3_hreq* req_u) @@ -829,7 +829,7 @@ _http_request_to_noun(u3_hreq* req_u) u3_noun med, url, hed, bod; switch ( req_u->met_e ) { - default: fprintf(stderr, "strange request\r\n"); return u3_none; + default: fprintf(stderr, "strange request\r\n"); return c3nne; case u3_hmet_put: { med = c3__put; break; } case u3_hmet_get: { med = c3__get; break; } case u3_hmet_post: { med = c3__post; break; } @@ -848,7 +848,7 @@ _http_new_response(c3_l sev_l, c3_l coq_l, c3_l seq_l, u3_noun rep) { u3_noun p_rep, q_rep, r_rep; - if ( u3_no == u3_cr_trel(rep, &p_rep, &q_rep, &r_rep) ) { + if ( c3n == u3_cr_trel(rep, &p_rep, &q_rep, &r_rep) ) { uL(fprintf(uH, "strange response\n")); return 0; } @@ -874,7 +874,7 @@ _http_request(u3_hreq* req_u) { u3_noun req = _http_request_to_noun(req_u); - if ( u3_none != req ) { + if ( c3nne != req ) { u3_noun pox = _http_pox_to_noun(req_u->hon_u->htp_u->sev_l, req_u->hon_u->coq_l, req_u->seq_l); @@ -882,7 +882,7 @@ _http_request(u3_hreq* req_u) u3_cv_plan(pox, u3nq(c3__this, req_u->hon_u->htp_u->sec, - u3nc(u3_yes, u3_ci_words(1, &req_u->ipf_w)), + u3nc(c3y, u3_ci_words(1, &req_u->ipf_w)), req)); } } @@ -909,7 +909,7 @@ _http_flush(u3_hcon* hon_u) u3_hbod* rub_u = req_u->rub_u; if ( 0 == rub_u ) { - if ( u3_yes == req_u->end ) { + if ( c3y == req_u->end ) { hon_u->req_u = req_u->nex_u; if ( 0 == hon_u->req_u ) { c3_assert(req_u == hon_u->qer_u); @@ -1054,7 +1054,7 @@ _http_start(u3_http* htp_u) } } uL(fprintf(uH, "http: live (%s) on %d\n", - (u3_yes == htp_u->sec) ? "\"secure\"" : "insecure", + (c3y == htp_u->sec) ? "\"secure\"" : "insecure", htp_u->por_w)); break; } @@ -1072,7 +1072,7 @@ u3_http_io_init() htp_u->sev_l = u3A->sev_l + 1; htp_u->coq_l = 1; htp_u->por_w = 8443; - htp_u->sec = u3_yes; + htp_u->sec = c3y; htp_u->hon_u = 0; htp_u->nex_u = 0; @@ -1089,7 +1089,7 @@ u3_http_io_init() htp_u->sev_l = u3A->sev_l; htp_u->coq_l = 1; htp_u->por_w = 8080; - htp_u->sec = u3_no; + htp_u->sec = c3n; htp_u->hon_u = 0; htp_u->nex_u = 0; diff --git a/v/loop.c b/v/loop.c index b4d032cac0..1a7d2940a3 100644 --- a/v/loop.c +++ b/v/loop.c @@ -80,7 +80,7 @@ _lo_signal_handle_term(int x) { if ( !u3_Critical ) { Sigcause = sig_terminate; - u3_Host.liv = u3_no; + u3_Host.liv = c3n; longjmp(Signal_buf, 1); } } @@ -308,7 +308,7 @@ u3_lo_punt(c3_l tab_l, u3_noun tac) // We are calling nock here, but hopefully need no protection. // - while ( u3_yes == u3_cr_du(cat) ) { + while ( c3y == u3_cr_du(cat) ) { u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); _lo_wall(wol); @@ -348,7 +348,7 @@ u3_lo_open(void) if ( (u3H->rod_u.how.fag_w & u3_cs_flag_gc) || (u3H->rod_u.how.fag_w & u3_cs_flag_debug) ) { - u3_ce_grab("lo_open", u3_none); + u3_ce_grab("lo_open", c3nne); } _lo_time(); } @@ -358,35 +358,35 @@ u3_lo_open(void) void u3_lo_shut(u3_bean inn) { - // u3_ce_grab("lo_shut a", u3_none); + // u3_ce_grab("lo_shut a", c3nne); // process actions // u3_raft_work(); - // u3_lo_grab("lo_shut b", u3_none); + // u3_lo_grab("lo_shut b", c3nne); // update time // _lo_time(); - // u3_lo_grab("lo_shut c", u3_none); + // u3_lo_grab("lo_shut c", c3nne); // for input operations, poll fs (XX not permanent) // XX remove raty_lead guard // - if ( u3_yes == inn ) { + if ( c3y == inn ) { u3_unix_ef_look(); } - // u3_lo_grab("lo_shut d", u3_none); + // u3_lo_grab("lo_shut d", c3nne); // clean shutdown // - if ( u3_no == u3_Host.liv ) { + if ( c3n == u3_Host.liv ) { // direct save and die // - // u3_lo_grab("lo_exit", u3_none); + // u3_lo_grab("lo_exit", c3nne); // u3_loom_save(u3A->ent_d); // u3_loom_exit(); u3_ct_boff(); @@ -559,7 +559,7 @@ u3_lo_loop() u3_raft_init(); u3_ct_boot(); // activate profiling - if ( u3_no == u3_Host.ops_u.bat ) { + if ( c3n == u3_Host.ops_u.bat ) { uv_run(u3L, UV_RUN_DEFAULT); } } @@ -589,7 +589,7 @@ u3_lo_lead(void) u3_Host.sav_u.ent_d = rec_u->ent_d; #endif - if ( u3_yes == u3_Host.ops_u.nuu ) { + if ( c3y == u3_Host.ops_u.nuu ) { u3_term_ef_boil(1); } @@ -654,25 +654,25 @@ _lo_mark() static void _lo_word(FILE* fil_u, c3_w wod_w) { - u3_bean top = u3_yes; + u3_bean top = c3y; if ( wod_w / (1000 * 1000 * 1000) ) { fprintf(fil_u, "%u.", wod_w / (1000 * 1000 * 1000)); wod_w %= (1000 * 1000 * 1000); - top = u3_no; + top = c3n; } if ( wod_w / (1000 * 1000) ) { - fprintf(fil_u, ((top == u3_yes) ? "%u." : "%03u."), + fprintf(fil_u, ((top == c3y) ? "%u." : "%03u."), wod_w / (1000 * 1000)); wod_w %= (1000 * 1000); - top = u3_no; + top = c3n; } if ( wod_w / 1000 ) { - fprintf(fil_u, ((top == u3_yes) ? "%u." : "%03u."), wod_w / 1000); + fprintf(fil_u, ((top == c3y) ? "%u." : "%03u."), wod_w / 1000); wod_w %= 1000; - top = u3_no; + top = c3n; } - fprintf(fil_u, ((top == u3_yes) ? "%u" : "%03u"), wod_w); + fprintf(fil_u, ((top == c3y) ? "%u" : "%03u"), wod_w); } /* u3_lo_grab(): garbage-collect the world, plus roots. @@ -689,10 +689,10 @@ u3_lo_grab(c3_c* cap_c, u3_noun som, ...) va_start(vap, som); - if ( som != u3_none ) { + if ( som != c3nne ) { siz_w += u3_cm_mark_noun(som); - while ( u3_none != (tur = va_arg(vap, u3_noun)) ) { + while ( c3nne != (tur = va_arg(vap, u3_noun)) ) { siz_w += u3_cm_mark_noun(tur); } } @@ -700,7 +700,7 @@ u3_lo_grab(c3_c* cap_c, u3_noun som, ...) } lec_w = u3_cm_sweep(siz_w); - // if ( lec_w || (u3_yes == u3_Flag_Verbose) ) + // if ( lec_w || (c3y == u3_Flag_Verbose) ) if ( lec_w || !strcmp("init", cap_c) ) { FILE* fil_u = uH; fprintf(fil_u, "%s: gc: ", cap_c); @@ -720,6 +720,6 @@ u3_lo_grab(c3_c* cap_c, u3_noun som, ...) } #endif } - u3_wire_lan(u3_Wire) = u3_yes; + u3_wire_lan(u3_Wire) = c3y; } #endif diff --git a/v/main.c b/v/main.c index c791d30103..52e728c2a6 100644 --- a/v/main.c +++ b/v/main.c @@ -34,9 +34,9 @@ _main_readw(const c3_c* str_c, c3_w max_w, c3_w* out_w) if ( *str_c != '\0' && *end_c == '\0' && par_w < max_w ) { *out_w = par_w; - return u3_yes; + return c3y; } - else return u3_no; + else return c3n; } /* _main_getopt(): extract option map from command line. @@ -47,23 +47,23 @@ _main_getopt(c3_i argc, c3_c** argv) c3_i ch_i; c3_w arg_w; - u3_Host.ops_u.abo = u3_no; - u3_Host.ops_u.bat = u3_no; - u3_Host.ops_u.gab = u3_no; - u3_Host.ops_u.loh = u3_no; - u3_Host.ops_u.dem = u3_no; - u3_Host.ops_u.fog = u3_no; - u3_Host.ops_u.fak = u3_no; - u3_Host.ops_u.pro = u3_no; - u3_Host.ops_u.veb = u3_yes; - u3_Host.ops_u.nuu = u3_no; - u3_Host.ops_u.mem = u3_no; + u3_Host.ops_u.abo = c3n; + u3_Host.ops_u.bat = c3n; + u3_Host.ops_u.gab = c3n; + u3_Host.ops_u.loh = c3n; + u3_Host.ops_u.dem = c3n; + u3_Host.ops_u.fog = c3n; + u3_Host.ops_u.fak = c3n; + u3_Host.ops_u.pro = c3n; + u3_Host.ops_u.veb = c3y; + u3_Host.ops_u.nuu = c3n; + u3_Host.ops_u.mem = c3n; u3_Host.ops_u.kno_w = DefaultKernel; while ( (ch_i = getopt(argc, argv, "I:X:f:k:l:n:p:r:LabcdgqvFM")) != -1 ) { switch ( ch_i ) { case 'M': { - u3_Host.ops_u.mem = u3_yes; + u3_Host.ops_u.mem = c3y; break; } case 'I': { @@ -72,25 +72,25 @@ _main_getopt(c3_i argc, c3_c** argv) } case 'X': { if ( 0 != strcmp("wtf", optarg) ) { - return u3_no; - } else u3_Host.ops_u.fog = u3_yes; + return c3n; + } else u3_Host.ops_u.fog = c3y; break; } case 'f': { - if ( u3_no == _main_readw(optarg, 100, &u3_Host.ops_u.fuz_w) ) { - return u3_no; + if ( c3n == _main_readw(optarg, 100, &u3_Host.ops_u.fuz_w) ) { + return c3n; } break; } case 'k': { - if ( u3_no == _main_readw(optarg, 256, &u3_Host.ops_u.kno_w) ) { - return u3_no; + if ( c3n == _main_readw(optarg, 256, &u3_Host.ops_u.kno_w) ) { + return c3n; } break; } case 'l': { - if ( u3_no == _main_readw(optarg, 65536, &arg_w) ) { - return u3_no; + if ( c3n == _main_readw(optarg, 65536, &arg_w) ) { + return c3n; } else u3_Host.ops_u.rop_s = arg_w; break; } @@ -99,8 +99,8 @@ _main_getopt(c3_i argc, c3_c** argv) break; } case 'p': { - if ( u3_no == _main_readw(optarg, 65536, &arg_w) ) { - return u3_no; + if ( c3n == _main_readw(optarg, 65536, &arg_w) ) { + return c3n; } else u3_Host.ops_u.por_s = arg_w; break; } @@ -108,33 +108,33 @@ _main_getopt(c3_i argc, c3_c** argv) u3_Host.ops_u.raf_c = strdup(optarg); break; } - case 'L': { u3_Host.ops_u.loh = u3_yes; break; } + case 'L': { u3_Host.ops_u.loh = c3y; break; } case 'F': { - u3_Host.ops_u.loh = u3_yes; - u3_Host.ops_u.fak = u3_yes; + u3_Host.ops_u.loh = c3y; + u3_Host.ops_u.fak = c3y; break; } - case 'a': { u3_Host.ops_u.abo = u3_yes; break; } - case 'b': { u3_Host.ops_u.bat = u3_yes; break; } - case 'c': { u3_Host.ops_u.nuu = u3_yes; break; } - case 'd': { u3_Host.ops_u.dem = u3_yes; break; } - case 'g': { u3_Host.ops_u.gab = u3_yes; break; } - case 'q': { u3_Host.ops_u.veb = u3_no; break; } - case 'v': { u3_Host.ops_u.veb = u3_yes; break; } + case 'a': { u3_Host.ops_u.abo = c3y; break; } + case 'b': { u3_Host.ops_u.bat = c3y; break; } + case 'c': { u3_Host.ops_u.nuu = c3y; break; } + case 'd': { u3_Host.ops_u.dem = c3y; break; } + case 'g': { u3_Host.ops_u.gab = c3y; break; } + case 'q': { u3_Host.ops_u.veb = c3n; break; } + case 'v': { u3_Host.ops_u.veb = c3y; break; } case '?': default: { - return u3_no; + return c3n; } } } if ( u3_Host.ops_u.rop_s == 0 && u3_Host.ops_u.raf_c != 0 ) { fprintf(stderr, "The -r flag requires -l.\n"); - return u3_no; + return c3n; } - if ( u3_yes == u3_Host.ops_u.bat ) { - u3_Host.ops_u.dem = u3_yes; - u3_Host.ops_u.nuu = u3_yes; + if ( c3y == u3_Host.ops_u.bat ) { + u3_Host.ops_u.dem = c3y; + u3_Host.ops_u.nuu = c3y; } @@ -152,7 +152,7 @@ _main_getopt(c3_i argc, c3_c** argv) } if ( argc != (optind + 1) ) { - return u3_no; + return c3n; } else { { c3_c* ash_c; @@ -163,7 +163,7 @@ _main_getopt(c3_i argc, c3_c** argv) } u3_Host.cpu_c = strdup(argv[optind]); - return u3_yes; + return c3y; } } @@ -283,7 +283,7 @@ main(c3_i argc, { // Parse options. // - if ( u3_no == _main_getopt(argc, argv) ) { + if ( c3n == _main_getopt(argc, argv) ) { u3_ve_usage(argc, argv); return 1; } @@ -295,7 +295,7 @@ main(c3_i argc, printf("vere: urbit home is %s\n", u3_Host.cpu_c); printf("vere: hostname is %s\n", u3_Host.ops_u.nam_c); - if ( u3_yes == u3_Host.ops_u.dem && u3_no == u3_Host.ops_u.bat ) { + if ( c3y == u3_Host.ops_u.dem && c3n == u3_Host.ops_u.bat ) { printf("vere: running as daemon\n"); } @@ -325,7 +325,7 @@ main(c3_i argc, #if 0 /* Initial checkpoint. */ - if ( u3_so(u3_Host.ops_u.nuu) ) { + if ( _(u3_Host.ops_u.nuu) ) { printf("about to save.\r\n"); u3_ce_save(); printf("saved.\r\n"); @@ -333,7 +333,7 @@ main(c3_i argc, #endif } - // u3_ce_grab("main", u3_none); + // u3_ce_grab("main", c3nne); u3_lo_loop(); return 0; diff --git a/v/raft.c b/v/raft.c index 9d07ac88e3..44de8e2f66 100644 --- a/v/raft.c +++ b/v/raft.c @@ -178,7 +178,7 @@ _raft_promote(u3_raft* raf_u) raf_u->typ_e = u3_raty_lead; // TODO boot in multiuser mode u3_sist_boot(); - if ( u3_no == u3_Host.ops_u.bat ) { + if ( c3n == u3_Host.ops_u.bat ) { u3_lo_lead(); } } @@ -359,8 +359,8 @@ _raft_revo_done(u3_rreq* req_u, c3_w suc_w) c3_assert(c3__revo == req_u->msg_u->typ_w); if ( suc_w && req_u->msg_u->tem_w == raf_u->tem_w ) { - if ( u3_no == ron_u->nam_u->vog ) { - ron_u->nam_u->vog = u3_yes; + if ( c3n == ron_u->nam_u->vog ) { + ron_u->nam_u->vog = c3y; raf_u->vot_w++; } else { @@ -693,10 +693,10 @@ _raft_write_cb(uv_write_t* wri_u, c3_i sas_i) static void _raft_conn_work(u3_rcon* ron_u) { - c3_assert(u3_yes == ron_u->liv); - if ( u3_yes == ron_u->red ) { + c3_assert(c3y == ron_u->liv); + if ( c3y == ron_u->red ) { c3_assert(ron_u->red_u); - ron_u->red = u3_no; + ron_u->red = c3n; while (1) { u3_rmsg msg_u; ssize_t ret_i = _raft_rmsg_read(ron_u->red_u, &msg_u); @@ -799,16 +799,16 @@ _raft_conn_read_cb(uv_stream_t* tcp_u, // do nothing } else { - if ( u3_yes == ron_u->liv ) { + if ( c3y == ron_u->liv ) { ron_u->red_u = _raft_rbuf_grow(ron_u->red_u, (c3_y*)buf_u->base, siz_i); - ron_u->red = u3_yes; + ron_u->red = c3y; _raft_conn_work(ron_u); } else uL(fprintf(uH, "XX raft: read on dead conn %p\n", ron_u)); } } free(buf_u->base); - u3_lo_shut(u3_no); + u3_lo_shut(c3n); } /* _raft_conn_new(): allocate a new raft connection. @@ -822,12 +822,12 @@ _raft_conn_new(u3_raft* raf_u) ron_u->red_u = 0; ron_u->out_u = ron_u->tou_u = 0; ron_u->red_u = 0; - ron_u->red = u3_no; + ron_u->red = c3n; ron_u->wri_u = 0; ron_u->nam_u = 0; ron_u->raf_u = raf_u; ron_u->nex_u = 0; - ron_u->liv = u3_no; + ron_u->liv = c3n; return ron_u; } @@ -838,11 +838,11 @@ static u3_bean _raft_remove_run(u3_rcon* ron_u) { u3_raft* raf_u = ron_u->raf_u; - u3_bean suc = u3_no; + u3_bean suc = c3n; if ( raf_u->run_u == ron_u ) { raf_u->run_u = ron_u->nex_u; - suc = u3_yes; + suc = c3y; } else { u3_rcon* pre_u = raf_u->run_u; @@ -850,7 +850,7 @@ _raft_remove_run(u3_rcon* ron_u) while ( pre_u ) { if ( pre_u->nex_u == ron_u ) { pre_u->nex_u = ron_u->nex_u; - suc = u3_yes; + suc = c3y; break; } else pre_u = pre_u->nex_u; @@ -900,14 +900,14 @@ _raft_conn_free(uv_handle_t* had_u) // Unlink references. if ( ron_u->nam_u ) { - c3_assert(u3_no == _raft_remove_run(ron_u)); + c3_assert(c3n == _raft_remove_run(ron_u)); if ( ron_u->nam_u->ron_u == ron_u ) { ron_u->nam_u->ron_u = 0; } } else { u3_bean suc = _raft_remove_run(ron_u); - c3_assert(u3_yes == suc); + c3_assert(c3y == suc); // Slow, expensive debug assert. { u3_rnam* nam_u = raf_u->nam_u; @@ -947,13 +947,13 @@ _raft_conn_free(uv_handle_t* had_u) static void _raft_conn_dead(u3_rcon* ron_u) { - if ( u3_no == ron_u->liv ) { + if ( c3n == ron_u->liv ) { //uL(fprintf(uH, "raft: conn already dead %p\n", ron_u)); return; } else { uL(fprintf(uH, "raft: conn_dead %p\n", ron_u)); - ron_u->liv = u3_no; + ron_u->liv = c3n; } uv_read_stop((uv_stream_t*)&ron_u->wax_u); @@ -982,7 +982,7 @@ _raft_listen_cb(uv_stream_t* str_u, c3_i sas_i) free(ron_u); } else { - ron_u->liv = u3_yes; + ron_u->liv = c3y; uv_read_start((uv_stream_t*)&ron_u->wax_u, _raft_alloc, @@ -1010,7 +1010,7 @@ _raft_connect_cb(uv_connect_t* con_u, c3_i sas_i) else { c3_assert(ron_u->nam_u); uL(fprintf(uH, "raft: connected to %s\n", ron_u->nam_u->str_c)); - ron_u->liv = u3_yes; + ron_u->liv = c3y; uv_read_start((uv_stream_t*)&ron_u->wax_u, _raft_alloc, @@ -1073,7 +1073,7 @@ _raft_conn_all(u3_raft* raf_u, void (*con_f)(u3_rcon* ron_u)) u3_rcon* ron_u; while ( nam_u ) { - if ( 0 == nam_u->ron_u || u3_no == nam_u->ron_u->liv ) { + if ( 0 == nam_u->ron_u || c3n == nam_u->ron_u->liv ) { struct addrinfo hit_u; uv_getaddrinfo_t* raq_u = c3_malloc(sizeof(*raq_u)); @@ -1116,7 +1116,7 @@ _raft_conn_all(u3_raft* raf_u, void (*con_f)(u3_rcon* ron_u)) //uL(fprintf(uH, "raft: existing connection %p for %s\n", // nam_u->ron_u, nam_u->str_c)); con_f(nam_u->ron_u); - if ( u3_yes == nam_u->ron_u->liv ) { + if ( c3y == nam_u->ron_u->liv ) { _raft_conn_work(nam_u->ron_u); } } @@ -1256,7 +1256,7 @@ _raft_start_election(u3_raft* raf_u) u3_rnam* nam_u; for ( nam_u = raf_u->nam_u; nam_u; nam_u = nam_u->nex_u ) { - nam_u->vog = u3_no; + nam_u->vog = c3n; } } raf_u->vot_w = 1; @@ -1455,7 +1455,7 @@ _raft_sure(u3_noun ovo, u3_noun vir, u3_noun cor) u3_cr_mug(cor); u3_cr_mug(u3A->roc); - if ( u3_no == u3_cr_sing(cor, u3A->roc) ) { + if ( c3n == u3_cr_sing(cor, u3A->roc) ) { u3A->roe = u3nc(u3nc(vir, ovo), u3A->roe); u3z(u3A->roc); @@ -1630,12 +1630,12 @@ _raft_comm(c3_d bid_d) u3_cs_cart* egg_u = u3to(u3_cs_cart, egg_p); if ( egg_u->ent_d <= bid_d ) { - egg_u->cit = u3_yes; + egg_u->cit = c3y; } else break; egg_p = egg_u->nex_p; } - u3_lo_shut(u3_yes); + u3_lo_shut(c3y); } static void @@ -1710,7 +1710,7 @@ u3_raft_work(void) u3p(u3_cs_cart) egg_p = u3A->ova.egg_p; u3_cs_cart* egg_u = u3to(u3_cs_cart, u3A->ova.egg_p); - if ( u3_yes == egg_u->did ) { + if ( c3y == egg_u->did ) { vir = egg_u->vir; if ( egg_p == u3A->ova.geg_p ) { @@ -1721,7 +1721,7 @@ u3_raft_work(void) c3_assert(egg_u->nex_p != 0); u3A->ova.egg_p = egg_u->nex_p; } - egg_u->cit = u3_yes; + egg_u->cit = c3y; u3_ca_free(egg_u); } else break; @@ -1768,8 +1768,8 @@ u3_raft_work(void) u3p(u3_cs_cart) egg_p = u3of(u3_cs_cart, egg_u); egg_u->nex_p = 0; - egg_u->cit = u3_no; - egg_u->did = u3_no; + egg_u->cit = c3n; + egg_u->did = c3n; egg_u->vir = vir; ron = u3_cke_jam(u3nc(u3k(u3A->now), ovo)); @@ -1794,7 +1794,7 @@ u3_raft_work(void) u3A->ova.geg_p = egg_p; } _raft_kick_all(vir); - egg_u->did = u3_yes; + egg_u->did = c3y; egg_u->vir = 0; } } diff --git a/v/reck.c b/v/reck.c index 3a55a5759c..664d5b95b7 100644 --- a/v/reck.c +++ b/v/reck.c @@ -30,19 +30,19 @@ _reck_mole(u3_noun fot, u3_noun uco = u3_do("slay", san); u3_noun p_uco, q_uco, r_uco, s_uco; - if ( (u3_no == u3_cr_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || + if ( (c3n == u3_cr_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || (0 != p_uco) || (0 != q_uco) || - (u3_no == u3_cr_sing(fot, r_uco)) ) + (c3n == u3_cr_sing(fot, r_uco)) ) { uL(fprintf(uH, "strange mole %s\n", u3_cr_string(san))); - u3z(fot); u3z(uco); return u3_no; + u3z(fot); u3z(uco); return c3n; } else { *ato_d = u3_cr_chub(0, s_uco); - u3z(fot); u3z(uco); return u3_yes; + u3z(fot); u3z(uco); return c3y; } } @@ -53,15 +53,15 @@ _reck_lily(u3_noun fot, u3_noun txt, c3_l* tid_l) { c3_d ato_d; - if ( u3_no == _reck_mole(fot, txt, &ato_d) ) { - return u3_no; + if ( c3n == _reck_mole(fot, txt, &ato_d) ) { + return c3n; } else { if ( ato_d >= 0x80000000ULL ) { - return u3_no; + return c3n; } else { *tid_l = (c3_l) ato_d; - return u3_yes; + return c3y; } } } @@ -73,29 +73,29 @@ _reck_kick_term(u3_noun pox, c3_l tid_l, u3_noun fav) { u3_noun p_fav; - if ( u3_no == u3du(fav) ) { - u3z(pox); u3z(fav); return u3_no; + if ( c3n == u3du(fav) ) { + u3z(pox); u3z(fav); return c3n; } else switch ( u3h(fav) ) { - default: u3z(pox); u3z(fav); return u3_no; + default: u3z(pox); u3z(fav); return c3n; case c3__bbye: { - u3z(pox); u3z(fav); return u3_yes; + u3z(pox); u3z(fav); return c3y; } break; case c3__blit: p_fav = u3t(fav); { u3_term_ef_blit(tid_l, u3k(p_fav)); - u3z(pox); u3z(fav); return u3_yes; + u3z(pox); u3z(fav); return c3y; } break; case c3__logo: { - u3_Host.liv = u3_no; + u3_Host.liv = c3n; u3_Host.xit_i = u3t(fav); - u3z(pox); u3z(fav); return u3_yes; + u3z(pox); u3z(fav); return c3y; } break; case c3__init: p_fav = u3t(fav); @@ -105,7 +105,7 @@ _reck_kick_term(u3_noun pox, c3_l tid_l, u3_noun fav) u3_unix_ef_init(u3k(p_fav)); // uL(fprintf(uH, "kick: init: %d\n", p_fav)); - u3z(pox); u3z(fav); return u3_yes; + u3z(pox); u3z(fav); return c3y; } break; } c3_assert(!"not reached"); return 0; @@ -122,28 +122,28 @@ _reck_kick_http(u3_noun pox, { u3_noun p_fav, q_fav; - if ( u3_no == u3du(fav) ) { - u3z(pox); u3z(fav); return u3_no; + if ( c3n == u3du(fav) ) { + u3z(pox); u3z(fav); return c3n; } else switch ( u3h(fav) ) { - default: u3z(pox); u3z(fav); return u3_no; + default: u3z(pox); u3z(fav); return c3n; case c3__thus: p_fav = u3h(u3t(fav)); q_fav = u3t(u3t(fav)); { u3_cttp_ef_thus(u3_cr_word(0, p_fav), u3k(q_fav)); u3z(pox); u3z(fav); - return u3_yes; + return c3y; } case c3__thou: p_fav = u3t(fav); { u3_http_ef_thou(sev_l, coq_l, seq_l, u3k(p_fav)); u3z(pox); u3z(fav); - return u3_yes; + return c3y; } break; } - c3_assert(!"not reached"); return u3_no; + c3_assert(!"not reached"); return c3n; } /* _reck_kick_sync(): apply sync outputs. @@ -159,13 +159,13 @@ _reck_kick_sync(u3_noun pox, u3_noun fav) u3_noun rel = u3k(u3t(u3t(u3t(fav)))); u3_unix_ef_ergo(who, syd, rel); - u3z(pox); u3z(fav); return u3_yes; + u3z(pox); u3z(fav); return c3y; } break; } // XX obviously not right! // - u3z(pox); u3z(fav); return u3_no; + u3z(pox); u3z(fav); return c3n; } static u3_bean @@ -178,10 +178,10 @@ _reck_kick_newt(u3_noun pox, u3_noun fav) u3_noun pac = u3k(u3t(u3t(fav))); u3_ames_ef_send(lan, pac); - u3z(pox); u3z(fav); return u3_yes; + u3z(pox); u3z(fav); return c3y; } break; } - u3z(pox); u3z(fav); return u3_no; + u3z(pox); u3z(fav); return c3n; } /* _reck_kick_ames(): apply packet network outputs. @@ -200,10 +200,10 @@ _reck_kick_ames(u3_noun pox, u3_noun fav) u3_unix_ef_init(u3k(p_fav)); // uL(fprintf(uH, "kick: init: %d\n", p_fav)); - u3z(pox); u3z(fav); return u3_yes; + u3z(pox); u3z(fav); return c3y; } break; } - u3z(pox); u3z(fav); return u3_no; + u3z(pox); u3z(fav); return c3n; } /* _reck_kick_spec(): apply an effect, by path. @@ -213,51 +213,51 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) { u3_noun i_pox, t_pox; - if ( (u3_no == u3_cr_cell(pox, &i_pox, &t_pox)) || + if ( (c3n == u3_cr_cell(pox, &i_pox, &t_pox)) || ((i_pox != u3_blip) && (i_pox != c3__gold) && (i_pox != c3__iron) && (i_pox != c3__lead)) ) { - u3z(pox); u3z(fav); return u3_no; + u3z(pox); u3z(fav); return c3n; } else { u3_noun it_pox, tt_pox; - if ( (u3_no == u3_cr_cell(t_pox, &it_pox, &tt_pox)) ) { - u3z(pox); u3z(fav); return u3_no; + if ( (c3n == u3_cr_cell(t_pox, &it_pox, &tt_pox)) ) { + u3z(pox); u3z(fav); return c3n; } else switch ( it_pox ) { - default: return u3_no; + default: return c3n; case c3__http: { u3_noun pud = tt_pox; u3_noun p_pud, t_pud, tt_pud, q_pud, r_pud, s_pud; c3_l sev_l, coq_l, seq_l; - if ( (u3_no == u3_cr_cell(pud, &p_pud, &t_pud)) || - (u3_no == _reck_lily(c3__uv, u3k(p_pud), &sev_l)) ) + if ( (c3n == u3_cr_cell(pud, &p_pud, &t_pud)) || + (c3n == _reck_lily(c3__uv, u3k(p_pud), &sev_l)) ) { - u3z(pox); u3z(fav); return u3_no; + u3z(pox); u3z(fav); return c3n; } if ( u3_nul == t_pud ) { coq_l = seq_l = 0; } else { - if ( (u3_no == u3_cr_cell(t_pud, &q_pud, &tt_pud)) || - (u3_no == _reck_lily(c3__ud, u3k(q_pud), &coq_l)) ) + if ( (c3n == u3_cr_cell(t_pud, &q_pud, &tt_pud)) || + (c3n == _reck_lily(c3__ud, u3k(q_pud), &coq_l)) ) { - u3z(pox); u3z(fav); return u3_no; + u3z(pox); u3z(fav); return c3n; } if ( u3_nul == tt_pud ) { seq_l = 0; } else { - if ( (u3_no == u3_cr_cell(tt_pud, &r_pud, &s_pud)) || + if ( (c3n == u3_cr_cell(tt_pud, &r_pud, &s_pud)) || (u3_nul != s_pud) || - (u3_no == _reck_lily(c3__ud, u3k(r_pud), &seq_l)) ) + (c3n == _reck_lily(c3__ud, u3k(r_pud), &seq_l)) ) { - u3z(pox); u3z(fav); return u3_no; + u3z(pox); u3z(fav); return c3n; } } } @@ -275,7 +275,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) case c3__ames: { if ( (u3_nul != tt_pox) ) { - u3z(pox); u3z(fav); return u3_no; + u3z(pox); u3z(fav); return c3n; } else { return _reck_kick_ames(pox, fav); @@ -287,12 +287,12 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) u3_noun p_pud, q_pud; c3_l tid_l; - if ( (u3_no == u3_cr_cell(pud, &p_pud, &q_pud)) || + if ( (c3n == u3_cr_cell(pud, &p_pud, &q_pud)) || (u3_nul != q_pud) || - (u3_no == _reck_lily(c3__ud, u3k(p_pud), &tid_l)) ) + (c3n == _reck_lily(c3__ud, u3k(p_pud), &tid_l)) ) { uL(fprintf(uH, "term: bad tire\n")); - u3z(pox); u3z(fav); return u3_no; + u3z(pox); u3z(fav); return c3n; } else { return _reck_kick_term(pox, tid_l, fav); } @@ -300,7 +300,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) } } c3_assert(!"not reached"); - return u3_no; + return c3n; } /* _reck_kick_norm(): non path-specific effect handling. @@ -308,11 +308,11 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) static u3_bean _reck_kick_norm(u3_noun pox, u3_noun fav) { - if ( u3_no == u3du(fav) ) { - u3z(pox); u3z(fav); return u3_no; + if ( c3n == u3du(fav) ) { + u3z(pox); u3z(fav); return c3n; } else switch ( u3h(fav) ) { - default: u3z(pox); u3z(fav); return u3_no; + default: u3z(pox); u3z(fav); return c3n; case c3__vega: { @@ -321,18 +321,18 @@ _reck_kick_norm(u3_noun pox, u3_noun fav) // u3_ds_wipe(u3_Wire); // doesn't work - return u3_yes; + return c3y; } case c3__exit: { uL(fprintf(uH, "<<>>\n")); u3_lo_bail(); - u3z(pox); u3z(fav); return u3_yes; + u3z(pox); u3z(fav); return c3y; } break; } - c3_assert(!"not reached"); return u3_no; - u3z(pox); u3z(fav); return u3_no; + c3_assert(!"not reached"); return c3n; + u3z(pox); u3z(fav); return c3n; } /* u3_reck_kick(): handle effect. @@ -340,8 +340,8 @@ _reck_kick_norm(u3_noun pox, u3_noun fav) void u3_reck_kick(u3_noun ovo) { - if ( (u3_no == _reck_kick_spec(u3k(u3h(ovo)), u3k(u3t(ovo)))) && - (u3_no == _reck_kick_norm(u3k(u3h(ovo)), u3k(u3t(ovo)))) ) + if ( (c3n == _reck_kick_spec(u3k(u3h(ovo)), u3k(u3t(ovo)))) && + (c3n == _reck_kick_norm(u3k(u3h(ovo)), u3k(u3t(ovo)))) ) { u3_noun tox = u3_do("spat", u3k(u3h(ovo))); diff --git a/v/save.c b/v/save.c index ba03977dd8..32b671e21e 100644 --- a/v/save.c +++ b/v/save.c @@ -32,7 +32,7 @@ _save_time_cb(uv_timer_t* tim_u) if ( u3A->ent_d > sav_u->ent_d ) { // uL(fprintf(uH, "autosaving... ent_d %llu\n", u3A->ent_d)); - // u3_ce_grab("save", u3_none); + // u3_ce_grab("save", c3nne); u3_ce_save(); sav_u->ent_d = u3A->ent_d; diff --git a/v/sist.c b/v/sist.c index 78b7caca3d..31662612c5 100644 --- a/v/sist.c +++ b/v/sist.c @@ -342,14 +342,14 @@ _sist_cask(c3_c* dir_c, u3_bean nun) uH; while ( 1 ) { - printf("passcode for %s%s? ~", dir_c, (u3_yes == nun) ? " [none]" : ""); + printf("passcode for %s%s? ~", dir_c, (c3y == nun) ? " [none]" : ""); paw_c[0] = 0; c3_fpurge(stdin); fgets(paw_c, 59, stdin); if ( '\n' == paw_c[0] ) { - if ( u3_yes == nun ) { + if ( c3y == nun ) { key = 0; break; } else { @@ -436,7 +436,7 @@ _sist_bask(c3_c* pop_c, u3_bean may) if ( (ans_c[0] != 'y') && (ans_c[0] != 'n') ) { continue; } else { - yam = (ans_c[0] != 'n') ? u3_yes : u3_no; + yam = (ans_c[0] != 'n') ? c3y : c3n; break; } } @@ -814,7 +814,7 @@ _sist_rest() c3_d las_d = 0; u3_noun roe = u3_nul; u3_noun sev_l, tno_l, key_l, sal_l; - u3_bean ohh = u3_no; + u3_bean ohh = c3n; if ( 0 != u3A->ent_d ) { u3_noun ent; @@ -904,7 +904,7 @@ _sist_rest() u3_noun key; while ( 1 ) { - pas = pas ? pas : _sist_cask(u3_Host.cpu_c, u3_no); + pas = pas ? pas : _sist_cask(u3_Host.cpu_c, c3n); key = _sist_fatt(sal_l, pas); @@ -926,7 +926,7 @@ _sist_rest() { c3_d ent_d; c3_d end_d; - u3_bean rup = u3_no; + u3_bean rup = c3n; end_d = u3Z->lug_u.len_d; ent_d = 0; @@ -956,21 +956,21 @@ _sist_rest() } if ( lar_u.syn_w != u3_cr_mug((c3_w)tar_d) ) { - if ( u3_no == rup ) { + if ( c3n == rup ) { uL(fprintf(uH, "corruption detected; attempting to fix\n")); - rup = u3_yes; + rup = c3y; } uL(fprintf(uH, "lar:%x mug:%x\n", lar_u.syn_w, u3_cr_mug((c3_w)tar_d))); end_d--; u3Z->lug_u.len_d--; continue; } - else if ( u3_yes == rup ) { + else if ( c3y == rup ) { uL(fprintf(uH, "matched at %x\n", lar_u.syn_w)); - rup = u3_no; + rup = c3n; } if ( lar_u.ent_d == 0 ) { - ohh = u3_yes; + ohh = c3y; } #if 0 @@ -1032,7 +1032,7 @@ _sist_rest() u3_noun dep; dep = u3_dc("de:crua", u3k(u3A->key), ron); - if ( u3_no == u3du(dep) ) { + if ( c3n == u3du(dep) ) { uL(fprintf(uH, "record (%s) is corrupt (k)\n", ful_c)); u3_lo_bail(); } @@ -1076,13 +1076,13 @@ _sist_rest() u3_noun ovo = u3t(i_roe); u3_cv_time(u3k(now)); - if ( (u3_yes == u3_Host.ops_u.vno) && + if ( (c3y == u3_Host.ops_u.vno) && ( (c3__veer == u3h(u3t(ovo)) || (c3__vega == u3h(u3t(ovo)))) ) ) { fprintf(stderr, "replay: skipped veer\n"); } - else if ( u3_yes == u3_Host.ops_u.fog && + else if ( c3y == u3_Host.ops_u.fog && u3_nul == t_roe ) { fprintf(stderr, "replay: -Xwtf, skipped last event\n"); } @@ -1098,7 +1098,7 @@ _sist_rest() if ( 0 == (xno_w % 1000) ) { uL(fprintf(uH, "{%d}\n", xno_w)); - // u3_lo_grab("rest", rou, u3_none); + // u3_lo_grab("rest", rou, c3nne); } } u3z(rou); @@ -1140,7 +1140,7 @@ _sist_rest() #endif // Increment sequence numbers. New logs start at 1. - if ( u3_yes == ohh ) { + if ( c3y == ohh ) { uL(fprintf(uH, "rest: bumping ent_d, don't panic.\n")); u3_ular lar_u; c3_d end_d; @@ -1214,8 +1214,8 @@ u3_sist_boot(void) { uL(fprintf(uH, "sist: booting\n")); - if ( u3_yes == u3_Host.ops_u.nuu ) { - u3_noun pig = u3_none; + if ( c3y == u3_Host.ops_u.nuu ) { + u3_noun pig = c3nne; if ( 0 == u3_Host.ops_u.imp_c ) { c3_c get_c[2049]; @@ -1240,7 +1240,7 @@ u3_sist_boot(void) else { u3_noun gen = u3_nul; u3_noun gun = u3_nul; - if (u3_no == u3_Host.ops_u.fak) { + if (c3n == u3_Host.ops_u.fak) { gen = _sist_text("generator"); gun = u3_dc("slaw", c3__uw, gen); diff --git a/v/temp.c b/v/temp.c index d6ad3222ba..c3b1dc3f88 100644 --- a/v/temp.c +++ b/v/temp.c @@ -29,7 +29,7 @@ u3_temp_io_init(void) u3_temp* teh_u = &u3_Host.teh_u; uv_timer_init(u3L, &teh_u->tim_u); - teh_u->alm = u3_no; + teh_u->alm = c3n; } /* u3_temp_io_exit(): terminate timer. @@ -55,7 +55,7 @@ _temp_time_cb(uv_timer_t* tim_u) (u3nt(u3_blip, c3__temp, u3_nul), u3nc(c3__wake, u3_nul)); } - u3_lo_shut(u3_no); + u3_lo_shut(c3n); } /* u3_temp_io_poll(): update temp IO state. @@ -67,25 +67,25 @@ u3_temp_io_poll(void) u3_noun wen = u3_cv_keep(u3nt(u3_blip, c3__temp, u3_nul)); if ( (u3_nul != wen) && - (u3_yes == u3du(wen)) && - (u3_yes == u3ud(u3t(wen))) ) + (c3y == u3du(wen)) && + (c3y == u3ud(u3t(wen))) ) { c3_d gap_d = u3_time_gap_ms(u3k(u3A->now), u3k(u3t(wen))); gap_d += teh_u->run_w; - if ( u3_yes == teh_u->alm ) { + if ( c3y == teh_u->alm ) { uv_timer_stop(&teh_u->tim_u); } - else teh_u->alm = u3_yes; + else teh_u->alm = c3y; uv_timer_start(&teh_u->tim_u, _temp_time_cb, gap_d, 0); } else { - if ( u3_yes == teh_u->alm ) { + if ( c3y == teh_u->alm ) { uv_timer_stop(&teh_u->tim_u); } - teh_u->alm = u3_no; + teh_u->alm = c3n; } u3z(wen); } diff --git a/v/term.c b/v/term.c index 7691e6ff8e..ebbcc5795a 100644 --- a/v/term.c +++ b/v/term.c @@ -95,7 +95,7 @@ u3_term_io_init() { u3_utty* uty_u = calloc(1, sizeof(u3_utty)); - if ( u3_yes == u3_Host.ops_u.dem ) { + if ( c3y == u3_Host.ops_u.dem ) { uty_u->fid_i = 1; uv_pipe_init(u3L, &(uty_u->pop_u), 0); @@ -217,8 +217,8 @@ u3_term_io_init() uty_u->tat_u.mir.len_w = 0; uty_u->tat_u.mir.cus_w = 0; - uty_u->tat_u.esc.ape = u3_no; - uty_u->tat_u.esc.bra = u3_no; + uty_u->tat_u.esc.ape = c3n; + uty_u->tat_u.esc.bra = c3n; uty_u->tat_u.fut.len_w = 0; uty_u->tat_u.fut.wid_w = 0; @@ -233,7 +233,7 @@ u3_term_io_init() u3_Host.uty_u = uty_u; } - if ( u3_no == u3_Host.ops_u.dem ) { + if ( c3n == u3_Host.ops_u.dem ) { // Start raw input. // { @@ -287,8 +287,8 @@ _term_listen_cb(uv_stream_t *wax_u, int sas_i) tty_u->tat_u.mir.len_w = 0; tty_u->tat_u.mir.cus_w = 0; - tty_u->tat_u.esc.ape = u3_no; - tty_u->tat_u.esc.bra = u3_no; + tty_u->tat_u.esc.ape = c3n; + tty_u->tat_u.esc.bra = c3n; tty_u->tat_u.fut.len_w = 0; tty_u->tat_u.fut.wid_w = 0; @@ -365,7 +365,7 @@ u3_term_io_talk(void) void u3_term_io_exit(void) { - if ( u3_yes == u3_Host.ops_u.dem ) { + if ( c3y == u3_Host.ops_u.dem ) { uv_close((uv_handle_t*)&u3_Host.uty_u->pop_u, NULL); } else { @@ -599,7 +599,7 @@ _term_it_refresh_line(u3_utty* uty_u) static void _term_it_show_more(u3_utty* uty_u) { - if ( u3_yes == u3_Host.ops_u.dem ) { + if ( c3y == u3_Host.ops_u.dem ) { _term_it_write_str(uty_u, "\n"); } else { _term_it_write_str(uty_u, "\r\n"); @@ -639,7 +639,7 @@ _term_it_path(u3_bean fyl, u3_noun pax) while ( u3_nul != wiz ) { c3_w tis_w = u3_cr_met(3, u3h(wiz)); - if ( (u3_yes == fyl) && (u3_nul == u3t(wiz)) ) { + if ( (c3y == fyl) && (u3_nul == u3t(wiz)) ) { *waq_c++ = '.'; } else *waq_c++ = '/'; @@ -662,7 +662,7 @@ _term_it_save(u3_noun pax, u3_noun pad) c3_c* pax_c; pax = u3nt(c3_s4('.','u','r','b'), c3_s3('p','u','t'), pax); - pax_c = _term_it_path(u3_yes, pax); + pax_c = _term_it_path(c3y, pax); u3_walk_save(pax_c, 0, pad); free(pax_c); @@ -760,8 +760,8 @@ _term_io_suck_char(u3_utty* uty_u, c3_y cay_y) { u3_utat* tat_u = &uty_u->tat_u; - if ( u3_yes == tat_u->esc.ape ) { - if ( u3_yes == tat_u->esc.bra ) { + if ( c3y == tat_u->esc.ape ) { + if ( c3y == tat_u->esc.bra ) { switch ( cay_y ) { default: { _term_it_write_txt(uty_u, uty_u->ufo_u.out.bel_y); @@ -772,18 +772,18 @@ _term_io_suck_char(u3_utty* uty_u, c3_y cay_y) case 'C': _term_io_belt(uty_u, u3nc(c3__aro, 'r')); break; case 'D': _term_io_belt(uty_u, u3nc(c3__aro, 'l')); break; } - tat_u->esc.ape = tat_u->esc.bra = u3_no; + tat_u->esc.ape = tat_u->esc.bra = c3n; } else { if ( (cay_y >= 'a') && (cay_y <= 'z') ) { - tat_u->esc.ape = u3_no; + tat_u->esc.ape = c3n; _term_io_belt(uty_u, u3nc(c3__met, cay_y)); } else if ( ('[' == cay_y) || ('O' == cay_y) ) { - tat_u->esc.bra = u3_yes; + tat_u->esc.bra = c3y; } else { - tat_u->esc.ape = u3_no; + tat_u->esc.ape = c3n; _term_it_write_txt(uty_u, uty_u->ufo_u.out.bel_y); } @@ -822,7 +822,7 @@ _term_io_suck_char(u3_utty* uty_u, c3_y cay_y) _term_io_belt(uty_u, u3nc(c3__ctl, ('a' + (cay_y - 1)))); } else if ( 27 == cay_y ) { - tat_u->esc.ape = u3_yes; + tat_u->esc.ape = c3y; } else if ( cay_y >= 128 ) { tat_u->fut.len_w = 1; @@ -862,7 +862,7 @@ _term_read_tn_cb(uv_stream_t* tcp_u, err: free(buf_u->base); } - u3_lo_shut(u3_yes); + u3_lo_shut(c3y); } /* _term_suck(): process a chunk of input @@ -898,7 +898,7 @@ _term_suck(u3_utty* uty_u, const c3_y* buf, ssize_t siz_i) } } } - u3_lo_shut(u3_yes); + u3_lo_shut(c3y); } /* _term_read_cb(): server read callback. @@ -1030,20 +1030,20 @@ _term_ef_blit(u3_utty* uty_u, switch ( u3h(blt) ) { default: break; case c3__bel: { - if ( u3_no == u3_Host.ops_u.dem ) { + if ( c3n == u3_Host.ops_u.dem ) { _term_it_write_txt(uty_u, uty_u->ufo_u.out.bel_y); } } break; case c3__clr: { - if ( u3_no == u3_Host.ops_u.dem ) { + if ( c3n == u3_Host.ops_u.dem ) { _term_it_show_blank(uty_u); _term_it_refresh_line(uty_u); } } break; case c3__hop: { - if ( u3_no == u3_Host.ops_u.dem ) { + if ( c3n == u3_Host.ops_u.dem ) { _term_it_show_cursor(uty_u, u3t(blt)); } } break; @@ -1061,7 +1061,7 @@ _term_ef_blit(u3_utty* uty_u, } } - if ( u3_no == u3_Host.ops_u.dem ) { + if ( c3n == u3_Host.ops_u.dem ) { _term_it_show_clear(uty_u); _term_it_show_line(uty_u, lin_w, len_w); } else { @@ -1111,7 +1111,7 @@ u3_term_ef_blit(c3_l tid_l, { u3_noun bis = bls; - while ( u3_yes == u3du(bis) ) { + while ( c3y == u3du(bis) ) { _term_ef_blit(uty_u, u3k(u3h(bis))); bis = u3t(bis); } @@ -1134,7 +1134,7 @@ u3_term_io_hija(void) c3_assert(0); } else { - if ( u3_no == u3_Host.ops_u.dem ) { + if ( c3n == u3_Host.ops_u.dem ) { if ( 0 != tcsetattr(1, TCSADRAIN, &uty_u->bak_u) ) { c3_assert(!"hija-tcsetattr"); } @@ -1172,7 +1172,7 @@ u3_term_io_loja(int x) c3_assert(0); } else { - if ( u3_yes == u3_Host.ops_u.dem ) { + if ( c3y == u3_Host.ops_u.dem ) { fflush(stdout); } else { diff --git a/v/time.c b/v/time.c index 1bed2d45c1..695f7afe77 100644 --- a/v/time.c +++ b/v/time.c @@ -147,7 +147,7 @@ u3_time_out_ts(struct timespec* tim_ts, u3_noun now) c3_d u3_time_gap_ms(u3_noun now, u3_noun wen) { - if ( u3_no == u3_cka_gth(u3k(wen), u3k(now)) ) { + if ( c3n == u3_cka_gth(u3k(wen), u3k(now)) ) { u3z(wen); u3z(now); return 0ULL; } diff --git a/v/unix.c b/v/unix.c index 5923870a39..49f9010147 100644 --- a/v/unix.c +++ b/v/unix.c @@ -163,12 +163,12 @@ _unix_dir_dry(u3_udir* dir_u) u3_udir* dis_u; u3_ufil* fil_u; - dir_u->dry = u3_yes; + dir_u->dry = c3y; for ( dis_u = dir_u->dis_u; dis_u; dis_u = dis_u->nex_u ) { _unix_dir_dry(dis_u); } for ( fil_u = dir_u->fil_u; fil_u; fil_u = fil_u->nex_u ) { - fil_u->dry = u3_yes; + fil_u->dry = c3y; } } @@ -196,7 +196,7 @@ _unix_fs_event_cb(uv_fs_event_t* was_u, c3_w slot = u3_Host.unx_u.lot_w++ % 1024; free(u3_Host.unx_u.sylo[slot].pax_c); u3_Host.unx_u.sylo[slot].pax_c = 0; - u3_Host.unx_u.sylo[slot].unx = u3_yes; + u3_Host.unx_u.sylo[slot].unx = c3y; u3_Host.unx_u.sylo[slot].wer_m = c3_s4('u','v','s','y'); u3_Host.unx_u.sylo[slot].wot_m = 0; u3_Host.unx_u.sylo[slot].pax_c = strdup(nod_u->pax_c); @@ -204,7 +204,7 @@ _unix_fs_event_cb(uv_fs_event_t* was_u, { while ( nod_u ) { - nod_u->dry = u3_no; + nod_u->dry = c3n; nod_u = (u3_unod*) nod_u->par_u; } } @@ -220,8 +220,8 @@ _unix_file_watch(u3_ufil* fil_u, { // (1) build data structure // - fil_u->non = u3_no; - fil_u->dry = u3_no; + fil_u->non = c3n; + fil_u->dry = c3n; fil_u->pax_c = pax_c; { c3_c* dot_c = strrchr(pax_c, '.'); @@ -273,14 +273,14 @@ _unix_file_form(u3_udir* dir_u, c3_w pax_w = strlen(dir_u->pax_c); c3_w pre_w = strlen(pre_c); c3_w ext_w = strlen(ext_c); - c3_w ket_w = (u3_yes == ket) ? 1 : 0; + c3_w ket_w = (c3y == ket) ? 1 : 0; c3_c* pax_c = c3_malloc(pax_w + 1 + pre_w + 1 + ket_w + ext_w + 1); strncpy(pax_c, dir_u->pax_c, pax_w); pax_c[pax_w] = '/'; strncpy(pax_c + pax_w + 1, pre_c, pre_w); pax_c[pax_w + 1 + pre_w] = '.'; - if ( u3_yes == ket ) { + if ( c3y == ket ) { pax_c[pax_w + 1 + pre_w + 1] = '^'; } strncpy(pax_c + pax_w + 1 + pre_w + 1 + ket_w, ext_c, ext_w); @@ -299,8 +299,8 @@ _unix_dir_watch(u3_udir* dir_u, u3_udir* par_u, c3_c* pax_c) { // (1) build data structure // - dir_u->yes = u3_yes; - dir_u->dry = u3_no; + dir_u->yes = c3y; + dir_u->dry = c3n; dir_u->pax_c = pax_c; dir_u->par_u = par_u; dir_u->dis_u = 0; @@ -435,12 +435,12 @@ static u3_bean _unix_file_update(u3_ufil* fil_u, mpz_t mod_mp) { if ( 0 == mpz_cmp(mod_mp, fil_u->mod_mp) ) { - return u3_no; + return c3n; } else { mpz_clear(fil_u->mod_mp); mpz_init_set(fil_u->mod_mp, mod_mp); - return u3_yes; + return c3y; } } #endif @@ -450,7 +450,7 @@ _unix_file_update(u3_ufil* fil_u, mpz_t mod_mp) static void _unix_dir_update(u3_udir* dir_u, DIR* rid_u) { - if ( u3_yes == dir_u->dry ) { + if ( c3y == dir_u->dry ) { return; } else { @@ -460,7 +460,7 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u) u3_ufil** fil_u; for ( dis_u = &(dir_u->dis_u); *dis_u; ) { - if ( u3_yes == (*dis_u)->dry ) { + if ( c3y == (*dis_u)->dry ) { dis_u = &(*dis_u)->nex_u; } else { @@ -487,7 +487,7 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u) // Check all wet files to see if they need deleting. // for ( fil_u = &(dir_u->fil_u); *fil_u; ) { - if ( u3_yes == (*fil_u)->dry ) { + if ( c3y == (*fil_u)->dry ) { fil_u = &(*fil_u)->nex_u; } else { @@ -699,7 +699,7 @@ _unix_file_tame(u3_ufil* fil_u) c3_c* pax_c = fil_u->pax_c + (fas_c-fil_u->pax_c) + 1; if ( !fil_u->dot_c ) { - return u3_none; + return c3nne; } else { c3_c* ext_c = fil_u->dot_c + 1; @@ -736,10 +736,10 @@ static u3_noun _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) { u3_weak ole; - if ( u3_no == u3du(wib) ) { + if ( c3n == u3du(wib) ) { ole = u3_ckdb_get(u3k(pam), u3k(wib)); - if ( u3_none == ole ) { + if ( c3nne == ole ) { ole = u3_do("cosh", u3nt(0, woz, u3_nul)); } else { u3_noun elo; @@ -757,7 +757,7 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) ole = u3_ckdb_get(u3k(pam), u3k(fid)); - if ( u3_none == ole ) { + if ( c3nne == ole ) { ole = u3nt (0, u3_nul, u3_ckdb_put(u3_nul, u3k(har), @@ -769,7 +769,7 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) u3_weak tup = u3_ckdb_get(u3k(roo), u3k(har)); u3_noun oor, elo; - if ( u3_none == tup ) { + if ( c3nne == tup ) { tup = u3_do("cosh", u3nt(0, woz, u3_nul)); } else { u3_noun upt; @@ -813,9 +813,9 @@ _unix_dir_ankh(u3_udir* dir_u) for ( fil_u = dir_u->par_u->fil_u; fil_u; fil_u = fil_u->nex_u ) { // uL(fprintf(uH, "top %s\n", fil_u->pax_c)); u3_noun wib = _unix_file_tame(fil_u); - if ( u3_none == wib ) continue; + if ( c3nne == wib ) continue; u3_noun dur = _unix_dir_name(dir_u); - if ( u3_no == u3_cr_sing(dur, u3h(wib)) ) { // wrong desk + if ( c3n == u3_cr_sing(dur, u3h(wib)) ) { // wrong desk u3z(wib); u3z(dur); continue; } @@ -848,13 +848,13 @@ _find_mug(u3_noun som, c3_l mug_l) else { u3_weak pro; - if ( u3_so(u3du(som)) ) { - if ( (pro = _find_mug(u3h(som), mug_l)) != u3_none ) { + if ( _(u3du(som)) ) { + if ( (pro = _find_mug(u3h(som), mug_l)) != c3nne ) { return pro; } else return _find_mug(u3t(som), mug_l); } - else return u3_none; + else return c3nne; } } #endif @@ -893,19 +893,19 @@ _unix_ankh_sing_map(u3_noun mun, u3_noun mur) // retain u3_noun n_mun, l_mun, r_mun; u3_noun n_mur, l_mur, r_mur; - if ( (u3_nul == mun) && (u3_nul == mur) ) { return u3_yes; } - if ( (u3_nul == mun) || (u3_nul == mur) ) { return u3_no; } + if ( (u3_nul == mun) && (u3_nul == mur) ) { return c3y; } + if ( (u3_nul == mun) || (u3_nul == mur) ) { return c3n; } u3_cx_trel(mun, &n_mun, &l_mun, &r_mun); u3_cx_trel(mur, &n_mur, &l_mur, &r_mur); - if ( (u3_no == (u3_cr_sing(u3h(n_mun), u3h(n_mur)))) || - (u3_no == _unix_ankh_sing_in(u3t(n_mun), u3t(n_mur))) || - (u3_no == _unix_ankh_sing_map(l_mun, l_mur)) || - (u3_no == _unix_ankh_sing_map(r_mun, r_mur)) ) + if ( (c3n == (u3_cr_sing(u3h(n_mun), u3h(n_mur)))) || + (c3n == _unix_ankh_sing_in(u3t(n_mun), u3t(n_mur))) || + (c3n == _unix_ankh_sing_map(l_mun, l_mur)) || + (c3n == _unix_ankh_sing_map(r_mun, r_mur)) ) { - return u3_no; - } else return u3_yes; + return c3n; + } else return c3y; } /* _unix_node_sing(): test node equality. @@ -913,8 +913,8 @@ _unix_ankh_sing_map(u3_noun mun, u3_noun mur) // retain static u3_bean _unix_node_sing(u3_noun xud, u3_noun bud) { - if ( (u3_nul == xud) && (u3_nul == bud) ) { return u3_yes; } - if ( (u3_nul == xud) || (u3_nul == bud) ) { return u3_no; } + if ( (u3_nul == xud) && (u3_nul == bud) ) { return c3y; } + if ( (u3_nul == xud) || (u3_nul == bud) ) { return c3n; } return u3_cr_sing(u3t(u3t(xud)), u3t(u3t(bud))); } @@ -930,8 +930,8 @@ _unix_ankh_sing_in(u3_noun xun, u3_noun bur) // retain u3_cx_trel(xun, &p_xun, &q_xun, &r_xun); u3_cx_trel(bur, &p_bur, &q_bur, &r_bur); - if ( u3_no == _unix_node_sing(q_xun, q_bur) ) { - return u3_no; + if ( c3n == _unix_node_sing(q_xun, q_bur) ) { + return c3n; } return _unix_ankh_sing_map(r_xun, r_bur); } @@ -941,16 +941,16 @@ _unix_ankh_sing_in(u3_noun xun, u3_noun bur) // retain static u3_bean _unix_ankh_sing(u3_noun xun, u3_noun bur) // retain { - if ( u3_yes == u3_cr_sing(xun, bur) ) { - return u3_yes; + if ( c3y == u3_cr_sing(xun, bur) ) { + return c3y; } else { - if ( u3_no == _unix_ankh_sing_in(xun, bur) ) { + if ( c3n == _unix_ankh_sing_in(xun, bur) ) { // fprintf(stderr, "uas: no, no (%x, %x)\r\n", u3_mug(xun), u3_mug(bur)); - return u3_no; + return c3n; } else { // fprintf(stderr, "uas: no, yes\r\n"); - return u3_yes; + return c3y; } } } @@ -969,12 +969,12 @@ _unix_desk_sync_into(u3_noun who, xun = _unix_dir_ankh(dir_u); bur = _unix_desk_peek(hox, u3k(syd), u3k(u3A->wen)); - if ( (u3_no == u3_cr_sing(u3h(xun), u3h(bur)))) + if ( (c3n == u3_cr_sing(u3h(xun), u3h(bur)))) { doz = u3_dc("cost", xun, bur); pax = u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul); - fav = u3nq(c3__into, who, syd, u3nc(u3_yes, doz)); + fav = u3nq(c3__into, who, syd, u3nc(c3y, doz)); u3_cv_plan(pax, fav); } @@ -990,7 +990,7 @@ _unix_ship_update(u3_uhot* hot_u) { u3_udir* dir_u = &(hot_u->dir_u); - if ( u3_no == dir_u->dry ) { + if ( c3n == dir_u->dry ) { DIR* rid_u = _unix_opendir(dir_u->pax_c); u3_udir* dis_u; u3_noun who, hox; @@ -1030,7 +1030,7 @@ _unix_hot_gain(u3_noun who, u3_bean mek) DIR* rid_u = opendir(pax_c); if ( !rid_u ) { - if ( u3_yes == mek ) { + if ( c3y == mek ) { _unix_mkdir(pax_c); } else { u3z(who); @@ -1120,8 +1120,8 @@ _unix_desk_sync_tofu(u3_udir* dir_u, u3_noun ext, u3_noun mis) { - c3_c* pox_c = _unix_file_form(dir_u, u3k(pre), u3_no, u3k(ext)); - c3_c* pux_c = _unix_file_form(dir_u, u3k(pre), u3_yes, u3k(ext)); + c3_c* pox_c = _unix_file_form(dir_u, u3k(pre), c3n, u3k(ext)); + c3_c* pux_c = _unix_file_form(dir_u, u3k(pre), c3y, u3k(ext)); u3_ufil** fil_u; // uL(fprintf(uH, "tofu pox_c %s op %s\n", pox_c, u3_cr_string(u3h(mis)))); @@ -1147,7 +1147,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u, u3_ufil* ded_u = *fil_u; #ifdef SYNCLOG - u3_Host.unx_u.sylo[slot].unx = u3_no; + u3_Host.unx_u.sylo[slot].unx = c3n; u3_Host.unx_u.sylo[slot].wer_m = c3_s4('t','o','f','u'); u3_Host.unx_u.sylo[slot].wot_m = c3__del; u3_Host.unx_u.sylo[slot].pax_c = strdup(ded_u->pax_c); @@ -1177,7 +1177,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u, god = u3k(u3t(mis)); } - if ( u3_yes == u3du(god) ) { + if ( c3y == u3du(god) ) { oat = u3_cke_jam(god); pax_c = pux_c; free(pox_c); } else { @@ -1186,7 +1186,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u, } #ifdef SYNCLOG - u3_Host.unx_u.sylo[slot].unx = u3_no; + u3_Host.unx_u.sylo[slot].unx = c3n; u3_Host.unx_u.sylo[slot].wer_m = c3_s4('t','o','f','u'); u3_Host.unx_u.sylo[slot].wot_m = u3h(mis); u3_Host.unx_u.sylo[slot].pax_c = strdup(pax_c); @@ -1219,10 +1219,10 @@ _unix_desk_sync_tofu(u3_udir* dir_u, static void _unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mis) { - if ( (u3_no == u3du(pax)) ) { + if ( (c3n == u3du(pax)) ) { c3_assert(!"tack"); } - else if ( u3_no == u3du(u3t(pax)) ) { // at toplevel + else if ( c3n == u3du(u3t(pax)) ) { // at toplevel u3_noun i_pax = u3h(pax); u3_noun t_pax = u3t(pax); c3_c* par_u = strrchr(dir_u->pax_c, '/') + 1; @@ -1297,7 +1297,7 @@ _unix_desk_sync_ergo(u3_noun hox, { u3_noun bur = _unix_desk_peek(hox, syd, lok); - if ( u3_no == u3_cr_sing(xun, bur) ) { + if ( c3n == u3_cr_sing(xun, bur) ) { u3_noun doz = u3_dc("cost", bur, xun); _unix_desk_sync_soba(*dir_u, doz); @@ -1313,12 +1313,12 @@ _unix_desk_sync_ergo(u3_noun hox, void u3_unix_ef_init(u3_noun who) { - _unix_hot_gain(u3k(who), u3_yes); + _unix_hot_gain(u3k(who), c3y); u3_cv_plan(u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul), u3nq(c3__into, who, u3_blip, - u3nt(u3_yes, u3nc(0, 0), u3_nul))); + u3nt(c3y, u3nc(0, 0), u3_nul))); } /* u3_unix_ef_ergo(): update filesystem, outbound. @@ -1370,7 +1370,7 @@ u3_unix_ef_look(void) mpz_clear(who_mp); if ( 0 == hot_u ) { - _unix_hot_gain(u3k(who), u3_no); + _unix_hot_gain(u3k(who), c3n); } } } @@ -1424,7 +1424,7 @@ static void _unix_ef_sync(uv_check_t* han_u) { u3_lo_open(); - u3_lo_shut(u3_yes); + u3_lo_shut(c3y); } /* _unix_sign_cb: signal callback. @@ -1439,7 +1439,7 @@ _unix_sign_cb(uv_signal_t* sil_u, c3_i num_i) case SIGTERM: fprintf(stderr, "\r\ncaught signal %d\r\n", num_i); - u3_Host.liv = u3_no; + u3_Host.liv = c3n; break; case SIGINT: fprintf(stderr, "\r\ninterrupt\r\n"); @@ -1449,7 +1449,7 @@ _unix_sign_cb(uv_signal_t* sil_u, c3_i num_i) // case SIGCHLD: u3_save_ef_chld(); break; } } - u3_lo_shut(u3_yes); + u3_lo_shut(c3y); } /* u3_unix_ef_hold() diff --git a/v/walk.c b/v/walk.c index 575155e9fd..f55ed62f22 100644 --- a/v/walk.c +++ b/v/walk.c @@ -35,7 +35,7 @@ _walk_ok(u3_noun nod) { u3_noun don = u3_cn_mung(u3k(u2A->toy.arch), u3k(nod)); - if ( u3_no == u3_sing(nod, don) ) { + if ( c3n == u3_sing(nod, don) ) { c3_assert(0); } u3z(don); @@ -207,10 +207,10 @@ _walk_in(const c3_c* dir_c, c3_w len_w) dat = u3_cke_cue(dat); } hax = u3_do("sham", u3k(dat)); - if ( u3_none == get ) { get = u3_nul; } + if ( c3nne == get ) { get = u3_nul; } - get = u3_ckdb_put(get, ext, u3nt(u3_yes, hax, dat)); - map = u3_ckdb_put(map, nam, u3nc(u3_no, get)); + get = u3_ckdb_put(get, ext, u3nt(c3y, hax, dat)); + map = u3_ckdb_put(map, nam, u3nc(c3n, get)); } free(nam_c); free(ext_c); @@ -220,7 +220,7 @@ _walk_in(const c3_c* dir_c, c3_w len_w) if ( u3_nul != dir ) { map = u3_ckdb_put - (map, u3_ci_string(fil_c), u3nc(u3_no, dir)); + (map, u3_ci_string(fil_c), u3nc(c3n, dir)); } else u3z(tim); } @@ -248,7 +248,7 @@ u3_walk(const c3_c* dir_c, u3_noun old) c3_assert(0); } else { - return u3nc(u3_no, + return u3nc(c3n, _walk_in(dir_c, strlen(dir_c))); } } @@ -286,7 +286,7 @@ u3_path(u3_bean fyl, u3_noun pax) while ( u3_nul != wiz ) { c3_w tis_w = u3_cr_met(3, u3h(wiz)); - if ( (u3_yes == fyl) && (u3_nul == u3t(wiz)) ) { + if ( (c3y == fyl) && (u3_nul == u3t(wiz)) ) { *waq_c++ = '.'; } else *waq_c++ = '/'; From a7215257ac06edb37bbebb1dafb224ec7d549ece Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 5 Nov 2014 13:54:52 -0800 Subject: [PATCH 05/14] Some renamings and cleanups. --- Makefile | 4 +-- {include => i}/all.h | 2 -- i/c/c3.md | 60 +++++++++++++++++++++++++++++++++++++ {include => i}/c/defs.h | 0 {include => i}/c/motes.h | 0 {include => i}/c/portable.h | 0 {include => i}/c/types.h | 0 {include => i}/g/a.h | 0 {include => i}/g/e.h | 0 {include => i}/g/h.h | 0 {include => i}/g/i.h | 0 {include => i}/g/j.h | 0 {include => i}/g/m.h | 0 {include => i}/g/n.h | 0 {include => i}/g/r.h | 0 {include => i}/g/t.h | 0 {include => i}/g/v.h | 0 {include => i}/g/x.h | 0 {include => i}/g/z.h | 0 {include => i}/j/k.h | 0 {include => i}/j/q.h | 0 {include => i}/j/w.h | 0 {include => i}/v/vere.h | 0 include/c/comd.h | 22 -------------- include/c/tune.h | 0 25 files changed, 62 insertions(+), 26 deletions(-) rename {include => i}/all.h (98%) create mode 100644 i/c/c3.md rename {include => i}/c/defs.h (100%) rename {include => i}/c/motes.h (100%) rename {include => i}/c/portable.h (100%) rename {include => i}/c/types.h (100%) rename {include => i}/g/a.h (100%) rename {include => i}/g/e.h (100%) rename {include => i}/g/h.h (100%) rename {include => i}/g/i.h (100%) rename {include => i}/g/j.h (100%) rename {include => i}/g/m.h (100%) rename {include => i}/g/n.h (100%) rename {include => i}/g/r.h (100%) rename {include => i}/g/t.h (100%) rename {include => i}/g/v.h (100%) rename {include => i}/g/x.h (100%) rename {include => i}/g/z.h (100%) rename {include => i}/j/k.h (100%) rename {include => i}/j/q.h (100%) rename {include => i}/j/w.h (100%) rename {include => i}/v/vere.h (100%) delete mode 100644 include/c/comd.h delete mode 100644 include/c/tune.h diff --git a/Makefile b/Makefile index 3bb1aab675..3a44d0fa1f 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ else LIBS=-lssl -lcrypto -lgmp -lncurses -lsigsegv $(OSLIBS) endif -INCLUDE=include +INCLUDE=i MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\" # NOTFORCHECKIN - restore -O3 @@ -337,7 +337,7 @@ $(LIBANACHRONISM): $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBRE2) $(CXX) $(CXXFLAGS) -c $< $(LIBRE2) -o $@ -$(V_OFILES): include/v/vere.h +$(V_OFILES): i/v/vere.h $(BIN)/vere: $(LIBCRE) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) mkdir -p $(BIN) diff --git a/include/all.h b/i/all.h similarity index 98% rename from include/all.h rename to i/all.h index c52db8a14a..5f6c0941d1 100644 --- a/include/all.h +++ b/i/all.h @@ -38,11 +38,9 @@ /** c: the c3 layer, C portability and definitions. **/ # include "c/portable.h" -# include "c/tune.h" # include "c/types.h" # include "c/defs.h" # include "c/motes.h" -# include "c/comd.h" /** miscellaneous definitions and data structures. **/ diff --git a/i/c/c3.md b/i/c/c3.md new file mode 100644 index 0000000000..231946b3a1 --- /dev/null +++ b/i/c/c3.md @@ -0,0 +1,60 @@ +# u3: noun processing in C. + +`u3` is the C library that makes Urbit work. If it wasn't called +`u3`, it might be called `libnoun` - it's a library for making +and storing nouns. + +What's a noun? A noun is either a cell or an atom. A cell is an +ordered pair of any two nouns. An atom is an unsigned integer of +any size. + +To the C programmer, this is not a terribly complicated data +structure, so why do you need a library for it? + +One: nouns have a well-defined computation kernel, Nock, whose +spec fits on a page and gzips to 340 bytes. But the only +arithmetic operation in Nock is increment. So it's nontrivial +to compute both efficiently and correctly. + +Two: `u3` is designed to support "permanent computing," ie, a +single-level store which is transparently checkpointed. This +implies a specialized memory-management model. + +Does `u3` depend on the higher levels of Urbit, Arvo and Hoon? +Yes and no. It expects you to load something shaped like an Arvo +kernel, and use it as an event-processing function. But you +don't need to use this feature if you don't want, and your kernel +can be anything you want. + + +## u3: l + +The best way to introduce `u3` is with a simple map of the Urbit +build directory - folding things we don't care about right now: + + g/ u3 implementation + g/a.c allocation + g/e.c persistence + g/h.c hashtables + g/i.c noun construction + g/j.c jet control + g/m.c master state + g/n.c nock execution + g/r.c noun access, error returns + g/t.c tracing/profiling + g/v.c arvo kernel + g/x.c noun access, error crashes + g/z.c memoization/caching + i/ all includes + i/v Urbit systems headers + i/g u3 headers (matching filenames) + i/c c3 headers + i/c/ + v/ Urbit systems code + + outside/ all external bundled code + +# C3: C in the Urbit environment + +Urbit has two distinct - but easily confused - contexts where +we program in C. Logically, Urbit is a pure noun processing diff --git a/include/c/defs.h b/i/c/defs.h similarity index 100% rename from include/c/defs.h rename to i/c/defs.h diff --git a/include/c/motes.h b/i/c/motes.h similarity index 100% rename from include/c/motes.h rename to i/c/motes.h diff --git a/include/c/portable.h b/i/c/portable.h similarity index 100% rename from include/c/portable.h rename to i/c/portable.h diff --git a/include/c/types.h b/i/c/types.h similarity index 100% rename from include/c/types.h rename to i/c/types.h diff --git a/include/g/a.h b/i/g/a.h similarity index 100% rename from include/g/a.h rename to i/g/a.h diff --git a/include/g/e.h b/i/g/e.h similarity index 100% rename from include/g/e.h rename to i/g/e.h diff --git a/include/g/h.h b/i/g/h.h similarity index 100% rename from include/g/h.h rename to i/g/h.h diff --git a/include/g/i.h b/i/g/i.h similarity index 100% rename from include/g/i.h rename to i/g/i.h diff --git a/include/g/j.h b/i/g/j.h similarity index 100% rename from include/g/j.h rename to i/g/j.h diff --git a/include/g/m.h b/i/g/m.h similarity index 100% rename from include/g/m.h rename to i/g/m.h diff --git a/include/g/n.h b/i/g/n.h similarity index 100% rename from include/g/n.h rename to i/g/n.h diff --git a/include/g/r.h b/i/g/r.h similarity index 100% rename from include/g/r.h rename to i/g/r.h diff --git a/include/g/t.h b/i/g/t.h similarity index 100% rename from include/g/t.h rename to i/g/t.h diff --git a/include/g/v.h b/i/g/v.h similarity index 100% rename from include/g/v.h rename to i/g/v.h diff --git a/include/g/x.h b/i/g/x.h similarity index 100% rename from include/g/x.h rename to i/g/x.h diff --git a/include/g/z.h b/i/g/z.h similarity index 100% rename from include/g/z.h rename to i/g/z.h diff --git a/include/j/k.h b/i/j/k.h similarity index 100% rename from include/j/k.h rename to i/j/k.h diff --git a/include/j/q.h b/i/j/q.h similarity index 100% rename from include/j/q.h rename to i/j/q.h diff --git a/include/j/w.h b/i/j/w.h similarity index 100% rename from include/j/w.h rename to i/j/w.h diff --git a/include/v/vere.h b/i/v/vere.h similarity index 100% rename from include/v/vere.h rename to i/v/vere.h diff --git a/include/c/comd.h b/include/c/comd.h deleted file mode 100644 index 2bcf5929ee..0000000000 --- a/include/c/comd.h +++ /dev/null @@ -1,22 +0,0 @@ -/* include/comd.h -** -** This file is in the public domain. -*/ - /** Functions. - **/ - /* c3_comd_init(): - ** - ** Initialize the readline console. Return the history filename. - */ - c3_c* // produce - c3_comd_init(void); - - /* c3_comd_line(): - ** - ** Read a line from the console, saving to history file `fel`. - ** - ** Returns 0 iff the console has exited. - */ - c3_c* // produce - c3_comd_line(const c3_c *fel_c, - const c3_c *prm_c); // retain diff --git a/include/c/tune.h b/include/c/tune.h deleted file mode 100644 index e69de29bb2..0000000000 From 87d8169c5790b7dc6adadfbef357da728656b182 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 5 Nov 2014 15:36:30 -0800 Subject: [PATCH 06/14] Fix sed follies. --- Spec/u3.md | 176 +++++++++++++++++++++++++++++++ g/a.c | 10 +- g/e.c | 6 +- g/h.c | 20 ++-- g/i.c | 8 +- g/j.c | 74 ++++++------- g/m.c | 4 +- g/n.c | 4 +- g/r.c | 50 ++++----- g/v.c | 2 +- g/x.c | 6 +- g/z.c | 2 +- i/c/c3.md | 60 ----------- i/g/a.h | 6 +- i/g/e.h | 2 +- i/g/j.h | 2 +- i/g/r.h | 2 +- i/g/x.h | 2 +- j/1/dec.c | 2 +- j/2/drop.c | 4 +- j/2/flop.c | 2 +- j/2/lent.c | 2 +- j/2/need.c | 2 +- j/2/roll.c | 2 +- j/2/skip.c | 6 +- j/3/bex.c | 2 +- j/3/cap.c | 2 +- j/3/mas.c | 2 +- j/3/mug.c | 2 +- j/4/by_gas.c | 4 +- j/4/by_get.c | 4 +- j/4/by_has.c | 2 +- j/4/in_gas.c | 4 +- j/4/in_has.c | 2 +- j/4/in_tap.c | 2 +- j/5/cue.c | 4 +- j/5/ed_puck.c | 2 +- j/5/jam.c | 4 +- j/5/lore.c | 2 +- j/5/loss.c | 8 +- j/5/mat.c | 2 +- j/5/parse.c | 16 +-- j/5/repg.c | 6 +- j/5/rexp.c | 4 +- j/5/shax.c | 10 +- j/5/tape.c | 2 +- j/5/trip.c | 2 +- j/6/ap.c | 12 +-- j/6/comb.c | 6 +- j/6/flip.c | 2 +- j/6/slot.c | 2 +- j/6/ut_burn.c | 4 +- j/6/ut_busk.c | 2 +- j/6/ut_bust.c | 6 +- j/6/ut_conk.c | 2 +- j/6/ut_crop.c | 4 +- j/6/ut_cull.c | 4 +- j/6/ut_find.c | 8 +- j/6/ut_fink.c | 2 +- j/6/ut_fire.c | 2 +- j/6/ut_firm.c | 4 +- j/6/ut_fish.c | 4 +- j/6/ut_fuse.c | 4 +- j/6/ut_heal.c | 2 +- j/6/ut_mint.c | 4 +- j/6/ut_mull.c | 4 +- j/6/ut_nest.c | 4 +- j/6/ut_park.c | 2 +- j/6/ut_peek.c | 4 +- j/6/ut_play.c | 2 +- j/6/ut_repo.c | 2 +- j/6/ut_rest.c | 4 +- j/6/ut_seek.c | 6 +- j/6/ut_sift.c | 2 +- j/6/ut_swab.c | 2 +- j/6/ut_tock.c | 2 +- j/6/ut_wrap.c | 2 +- urbit.spec => outside/urbit.spec | 0 v/http.c | 6 +- v/loop.c | 16 +-- v/main.c | 2 +- v/save.c | 2 +- v/sist.c | 4 +- v/unix.c | 14 +-- v/walk.c | 2 +- 85 files changed, 408 insertions(+), 292 deletions(-) create mode 100644 Spec/u3.md delete mode 100644 i/c/c3.md rename urbit.spec => outside/urbit.spec (100%) diff --git a/Spec/u3.md b/Spec/u3.md new file mode 100644 index 0000000000..f1143455ef --- /dev/null +++ b/Spec/u3.md @@ -0,0 +1,176 @@ +# u3: noun processing in C. + +`u3` is the C library that makes Urbit work. If it wasn't called +`u3`, it might be called `libnoun` - it's a library for making +and storing nouns. + +What's a noun? A noun is either a cell or an atom. A cell is an +ordered pair of any two nouns. An atom is an unsigned integer of +any size. + +To the C programmer, this is not a terribly complicated data +structure, so why do you need a library for it? + +One: nouns have a well-defined computation kernel, Nock, whose +spec fits on a page and gzips to 340 bytes. But the only +arithmetic operation in Nock is increment. So it's nontrivial +to compute both efficiently and correctly. + +Two: `u3` is designed to support "permanent computing," ie, a +single-level store which is transparently checkpointed. This +implies a specialized memory-management model. + +Does `u3` depend on the higher levels of Urbit, Arvo and Hoon? +Yes and no. It expects you to load something shaped like an Arvo +kernel, and use it as an event-processing function. But you +don't need to use this feature if you don't want, and your kernel +can be anything you want. + + +## u3: files and directory + +The best way to introduce `u3` is with a simple map of the Urbit +build directory - folding things we don't care about right now: + + g/ u3 implementation + g/a.c allocation + g/e.c persistence + g/h.c hashtables + g/i.c noun construction + g/j.c jet control + g/m.c master state + g/n.c nock execution + g/r.c noun access, error returns + g/t.c tracing/profiling + g/v.c arvo kernel + g/x.c noun access, error crashes + g/z.c memoization/caching + i/ all includes + i/v vere systems headers + i/g u3 headers (matching g/ names) + i/c c3 headers + i/c/defs.h miscellaneous c3 macros + i/c/motes.h symbolic constants + i/c/portable.h portability definitions + i/c/types.h c3 types + j/ jets + j/dash.c jet structures + j/1 tier 1 jets: basic math + j/2 tier 2 jets: lists + j/3 tier 3 jets: bit twiddling + j/4 tier 4 jets: containers + j/5 tier 5 jets: misc + j/6 tier 6 jets: hoon + v/ vere systems code + outside/ all external bundled code + +(The `v/` code is part of `vere`, which uses `u3` to run Urbit.) + + +## c3: C in the Urbit environment + +When writing C code in u3, please of course follow the +conventions of the code around you as regards indentation, etc. +It's especially important that every function have a header +comment, even if it says nothing interesting. + +But some of our idiosyncrasies go beyond convention. Yes, we've +done awful things to C. Here's what we did and why we did. + +### c3: integer types + +First, it's generally acknowledged that underspecified integer +types are C's worst disaster. C99 fixed this, but the `stdint` +types are wordy and annoying. We've replaced them with: + + /* Good integers. + */ + typedef uint64_t c3_d; // double-word + typedef int64_t c3_ds; // signed double-word + typedef uint32_t c3_w; // word + typedef int32_t c3_ws; // signed word + typedef uint16_t c3_s; // short + typedef int16_t c3_ss; // signed short + typedef uint8_t c3_y; // byte + typedef int8_t c3_ys; // signed byte + typedef uint8_t c3_b; // bit + + typedef uint8_t c3_t; // boolean + typedef uint8_t c3_o; // loobean + typedef uint8_t c3_g; // 32-bit log - 0-31 bits + typedef uint32_t c3_l; // little; 31-bit unsigned integer + typedef uint32_t c3_m; // mote; also c3_l; LSB first a-z 4-char string. + + /* Bad integers. + */ + typedef char c3_c; // does not match int8_t or uint8_t + typedef int c3_i; // int - really bad + typedef uintptr_t c3_p; // pointer-length uint - really really bad + typedef intptr_t c3_ps; // pointer-length int - really really bad + +Some of these need explanation. A loobean is a Nock boolean - +Nock, for mysterious reasons, uses 0 as true (always say "yes") +and 1 as false (always say "no"). + +Nock and/or Hoon cannot tell the difference between a short atom +and a long one, but at the `u3` level every atom under `2^31` is +direct. The `c3_l` type is useful to annotate this. A `c3_m` is +a mote - a string of up to 4 characters in a `c3_l`, least +significant byte first. A `c3_g` should be a 5-bit atom. Of +course, C cannot enforce these constraints, only document them. + +Use the "bad" - ie, poorly specified - integer types only when +interfacing with external code that expects them. + +An enormous number of motes are defined in `i/c/motes.h`. There +is no reason to delete motes that aren't being used, or even to +modularize the definitions. Keep them alphabetical, though. + +### c3: variables and variable naming + +The C3 style uses Hoon style TLV variable names, with a quasi +Hungarian syntax. This is weird, but works really well, as +long as what you're doing isn't hideous. + +A TLV variable name is a random pronounceable three-letter +string, sometimes with some vague relationship to its meaning, +but usually not. Usually CVC (consonant-vowel-consonant) is a +good choice. + +You should use TLVs much the way math people use Greek letters. +The same concept should in general get the same name across +different contexts. When you're working in a given area, you'll +tend to remember the binding from TLV to concept by sheer power +of associative memory. When you come back to it, it's not that +hard to relearn. And of course, when in doubt, comment it. + +Variables take pseudo-Hungarian suffixes, matching in general the +suffix of the integer type: + + c3_w wor_w; // 32-bit word + +Unlike in true Hungarian, there is no change for pointer +variables. Structure variables take a `_u` suffix; + +### c3: loobeans + +The code (from `defs.h`) tells the story: + + # define c3y 0 + # define c3n 1 + + # define _(x) (c3y == (x)) + # define __(x) ((x) ? c3y : c3n) + # define c3a(x, y) __(_(x) && _(y)) + # define c3o(x, y) __(_(x) || _(y)) + +In short, use `_()` to turn a loobean into a boolean, `__` to go +the other way. Use `!` as usual, `c3y` for yes and `c3n` for no, +`c3a` for and and `c3o` for or. + + +## u3: introduction to the noun world + + + + diff --git a/g/a.c b/g/a.c index 0203db89ce..05e5220daf 100644 --- a/g/a.c +++ b/g/a.c @@ -584,7 +584,7 @@ static u3_noun _me_copy_north(u3_noun); static u3_noun _me_copy_north_in(u3_noun som) { - c3_assert(c3nne != som); + c3_assert(u3_none != som); if ( _(u3_ca_is_cat(som)) ) { return som; } @@ -676,7 +676,7 @@ static u3_noun _me_copy_south(u3_noun); static u3_noun _me_copy_south_in(u3_noun som) { - c3_assert(c3nne != som); + c3_assert(u3_none != som); if ( _(u3_ca_is_cat(som)) ) { return som; } @@ -827,7 +827,7 @@ _me_take_south(u3_noun dog) u3_noun u3_ca_take(u3_noun som) { - c3_assert(c3nne != som); + c3_assert(u3_none != som); if ( _(u3_ca_is_cat(som)) ) { return som; @@ -985,7 +985,7 @@ top: u3_noun u3_ca_gain(u3_noun som) { - c3_assert(c3nne != som); + c3_assert(u3_none != som); if ( _(u3_ca_is_cat(som)) ) { return som; @@ -1338,7 +1338,7 @@ _ca_detect(u3p(u3_ch_root) har_p, u3_noun fum, u3_noun som, c3_d axe_d) if ( som == fum ) { return axe_d; } - else if ( !_(u3du(fum)) || (c3nne != u3_ch_get(har_p, fum)) ) { + else if ( !_(u3du(fum)) || (u3_none != u3_ch_get(har_p, fum)) ) { return 0; } else { diff --git a/g/e.c b/g/e.c index 82632ca782..2e054046eb 100644 --- a/g/e.c +++ b/g/e.c @@ -862,7 +862,7 @@ u3_ce_init(c3_o chk_o) /* u3_ce_grab(): garbage-collect the world, plus extra roots, then */ void -u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with c3nne +u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with u3_none { // u3_ch_free(u3R->cax.har_p); // u3R->cax.har_p = u3_ch_new(); @@ -875,10 +875,10 @@ u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with c3nne va_start(vap, som); - if ( som != c3nne ) { + if ( som != u3_none ) { u3_ca_mark_noun(som); - while ( c3nne != (tur = va_arg(vap, u3_noun)) ) { + while ( u3_none != (tur = va_arg(vap, u3_noun)) ) { u3_ca_mark_noun(tur); } } diff --git a/g/h.c b/g/h.c index f094d11601..a0f142de31 100644 --- a/g/h.c +++ b/g/h.c @@ -313,7 +313,7 @@ _ch_buck_get(u3_ch_buck* hab_u, u3_noun key) return u3_ca_gain(u3t(hab_u->kev[i_w])); } } - return c3nne; + return u3_none; } /* _ch_node_get(): read in node. @@ -329,7 +329,7 @@ _ch_node_get(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) map_w = han_u->map_w; if ( !(map_w & (1 << bit_w)) ) { - return c3nne; + return u3_none; } else { c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); @@ -342,7 +342,7 @@ _ch_node_get(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) return u3_ca_gain(u3t(kev)); } else { - return c3nne; + return u3_none; } } else { @@ -370,7 +370,7 @@ u3_ch_get(u3p(u3_ch_root) har_p, u3_noun key) c3_w sot_w = har_u->sot_w[inx_w]; if ( _(u3_ch_slot_is_null(sot_w)) ) { - return c3nne; + return u3_none; } else if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); @@ -380,7 +380,7 @@ u3_ch_get(u3p(u3_ch_root) har_p, u3_noun key) return u3_ca_gain(u3t(kev)); } else { - return c3nne; + return u3_none; } } else { @@ -402,7 +402,7 @@ _ch_buck_gut(u3_ch_buck* hab_u, u3_noun key) return u3_ca_gain(u3t(hab_u->kev[i_w])); } } - return c3nne; + return u3_none; } /* _ch_node_gut(): read in node, unifying key nouns. @@ -418,7 +418,7 @@ _ch_node_gut(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) map_w = han_u->map_w; if ( !(map_w & (1 << bit_w)) ) { - return c3nne; + return u3_none; } else { c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); @@ -431,7 +431,7 @@ _ch_node_gut(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) return u3_ca_gain(u3t(kev)); } else { - return c3nne; + return u3_none; } } else { @@ -459,7 +459,7 @@ u3_ch_gut(u3p(u3_ch_root) har_p, u3_noun key) c3_w sot_w = har_u->sot_w[inx_w]; if ( _(u3_ch_slot_is_null(sot_w)) ) { - return c3nne; + return u3_none; } else if ( _(u3_ch_slot_is_noun(sot_w)) ) { u3_noun kev = u3_ch_slot_to_noun(sot_w); @@ -469,7 +469,7 @@ u3_ch_gut(u3p(u3_ch_root) har_p, u3_noun key) return u3_ca_gain(u3t(kev)); } else { - return c3nne; + return u3_none; } } else { diff --git a/g/i.c b/g/i.c index 8473723d20..6aa87cfac9 100644 --- a/g/i.c +++ b/g/i.c @@ -168,7 +168,7 @@ u3_ci_mp(mpz_t a_mp) u3_noun u3_ci_vint(u3_noun a) { - c3_assert(c3nne != a); + c3_assert(u3_none != a); if ( _(u3_ca_is_cat(a)) ) { c3_w vin_w = (a + 1); @@ -199,8 +199,8 @@ u3_ci_vint(u3_noun a) u3_noun u3_ci_cell(u3_noun a, u3_noun b) { - c3_assert(c3nne != a); - c3_assert(c3nne != b); + c3_assert(u3_none != a); + c3_assert(u3_none != b); c3_assert(!_(u3_ca_is_junior(u3R, a))); c3_assert(!_(u3_ca_is_junior(u3R, b))); @@ -292,7 +292,7 @@ u3_ci_heximal(u3_noun a); /* u3_ci_list(): ** -** Generate a null-terminated list, with `c3nne` as terminator. +** Generate a null-terminated list, with `u3_none` as terminator. */ u3_noun u3_ci_list(u3_weak one, ...); diff --git a/g/j.c b/g/j.c index 01815dd192..b0e5001242 100644 --- a/g/j.c +++ b/g/j.c @@ -80,7 +80,7 @@ static u3_weak _cj_by_gut(u3_noun a, u3_noun b) { if ( u3_nul == a ) { - return c3nne; + return u3_none; } else { u3_noun l_a, n_a, r_a; @@ -140,16 +140,16 @@ _cj_je_fsck(u3_noun clu) c3_l axe_l; if ( c3n == u3_cr_trel(clu, &p_clu, &q_clu, &r_clu) ) { - u3z(clu); return c3nne; + u3z(clu); return u3_none; } if ( 0 == (nam_c = _cj_chum(p_clu)) ) { - u3z(clu); return c3nne; + u3z(clu); return u3_none; } while ( _(u3du(q_clu)) && (10 == u3h(q_clu)) ) { q_clu = u3t(u3t(q_clu)); } if ( !_(u3du(q_clu)) ) { - u3z(clu); free(nam_c); return c3nne; + u3z(clu); free(nam_c); return u3_none; } if ( (1 == u3h(q_clu)) && (0 == u3t(q_clu)) ) { @@ -157,7 +157,7 @@ _cj_je_fsck(u3_noun clu) } else { if ( (0 != u3h(q_clu)) || !_(u3_ca_is_cat(axe_l = u3t(q_clu))) ) { - u3z(clu); free(nam_c); return c3nne; + u3z(clu); free(nam_c); return u3_none; } } @@ -171,7 +171,7 @@ _cj_je_fsck(u3_noun clu) (c3n == u3_cr_cell(ir_clu, &pir_clu, &qir_clu)) || (c3n == u3ud(pir_clu)) ) { - u3z(huk); u3z(clu); free(nam_c); return c3nne; + u3z(huk); u3z(clu); free(nam_c); return u3_none; } huk = u3_ckdb_put(huk, u3k(pir_clu), u3k(qir_clu)); r_clu = tr_clu; @@ -204,14 +204,14 @@ _cj_cold_find_sys(u3_noun bat) while ( 1 ) { u3_noun pro = _cj_by_gut(u3h(rod_u->jed.das), bat); - if ( pro != c3nne ) { + if ( pro != u3_none ) { return pro; } if ( !rod_u->par_u ) break; rod_u = rod_u->par_u; } - return c3nne; + return u3_none; } /* _cj_cold_mine(): in cold mode, declare a core. RETAINS. @@ -234,19 +234,19 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) else { u3_weak rah = u3_cr_at(q_cey, cor); - if ( (c3nne == rah) || !_(u3du(rah)) ) { + if ( (u3_none == rah) || !_(u3du(rah)) ) { fprintf(stderr, "fund: %s is bogus\r\n", u3_cr_string(p_cey)); - return c3nne; + return u3_none; } else { u3_noun soh = _cj_cold_find_sys(u3h(rah)); - if ( c3nne == soh ) { + if ( u3_none == soh ) { fprintf(stderr, "fund: in %s, parent %x not found at %d\r\n", u3_cr_string(p_cey), u3_cr_mug(u3h(rah)), q_cey); - return c3nne; + return u3_none; } else { mop = u3nq(u3k(p_cey), u3k(q_cey), c3y, u3k(soh)); @@ -261,7 +261,7 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) u3_noun hoe = u3_ckdb_get(u3k(u3t(u3R->jed.das)), u3k(soh)); u3_noun sab; - if ( c3nne == hoe ) { + if ( u3_none == hoe ) { sab = u3nt(u3nc(u3k(bat), u3k(r_cey)), u3_nul, u3_nul); } else { @@ -286,7 +286,7 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) } } -/* _cj_warm_fend(): in warm state, return c3nne or calx. RETAINS. +/* _cj_warm_fend(): in warm state, return u3_none or calx. RETAINS. */ u3_weak _cj_warm_fend(u3_noun bat) @@ -296,14 +296,14 @@ _cj_warm_fend(u3_noun bat) while ( 1 ) { u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat); - if ( c3nne != jaw ) { + if ( u3_none != jaw ) { return jaw; } if ( rod_u->par_u ) { rod_u = rod_u->par_u; } - else return c3nne; + else return u3_none; } } @@ -339,7 +339,7 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc) u3_noun nam = u3_ci_string(jet_u->fcs_c); u3_noun fol = u3_ckdb_get(u3k(huc), nam); - if ( c3nne == fol ) { + if ( u3_none == fol ) { fprintf(stderr, "jets: activate: bad fcs %s\r\n", jet_u->fcs_c); } else { @@ -468,7 +468,7 @@ _cj_warm_ream_un(u3_noun soh) u3_noun cax; c3_l jax_l; - if ( c3nne != (cax = u3_ch_get(u3R->jed.har_p, u3h(u3h(sab)))) ) { + if ( u3_none != (cax = u3_ch_get(u3R->jed.har_p, u3h(u3h(sab)))) ) { jax_l = u3h(cax); u3z(cax); } @@ -555,7 +555,7 @@ _cj_warm_mine(u3_noun clu, u3_noun cor) if ( !_(u3du(cor)) ) { u3z(clu); } - else if ( c3nne != (cax = _cj_warm_fend(bat)) ) { + else if ( u3_none != (cax = _cj_warm_fend(bat)) ) { u3z(cax); u3z(clu); } else { @@ -563,12 +563,12 @@ _cj_warm_mine(u3_noun clu, u3_noun cor) // fprintf(stderr, "warm_mine %s\r\n", u3_cr_string(u3h(cey))); - if ( c3nne != cey ) { + if ( u3_none != cey ) { u3_noun huc = u3t(u3t(cey)); u3_noun pax = u3h(u3t(cey)); u3_noun mop; - if ( c3nne != (mop = _cj_cold_mine(cey, cor)) ) { + if ( u3_none != (mop = _cj_cold_mine(cey, cor)) ) { c3_l jax_l = _cj_boil_mine(mop, cor); // fprintf(stderr, "warm: bat %x\r\n", u3_cr_mug(bat)); @@ -613,7 +613,7 @@ _cj_find(u3_noun bat) while ( 1 ) { u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat); - if ( c3nne != jaw ) { + if ( u3_none != jaw ) { u3_assure(u3_ca_is_cat(u3h(jaw))); #if 0 @@ -651,7 +651,7 @@ _cj_soft(u3_noun cor, u3_noun axe) extern int SLAY; -/* _cj_kick_z(): try to kick by jet. If no kick, produce c3nne. +/* _cj_kick_z(): try to kick by jet. If no kick, produce u3_none. ** ** `cor` is RETAINED iff there is no kick, TRANSFERRED if one. ** `axe` is RETAINED. @@ -660,17 +660,17 @@ static u3_weak _cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe) { if ( 0 == ham_u->fun_f ) { - return c3nne; + return u3_none; } if ( !_(ham_u->liv) ) { - return c3nne; + return u3_none; } else { if ( _(ham_u->ice) ) { u3_weak pro = ham_u->fun_f(cor); - if ( c3nne != pro ) { + if ( u3_none != pro ) { u3z(cor); return pro; } @@ -682,7 +682,7 @@ _cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe) pro = ham_u->fun_f(u3k(cor)); ham_u->ice = c3n; - if ( c3nne == pro ) { + if ( u3_none == pro ) { u3z(cor); return pro; } @@ -708,7 +708,7 @@ _cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe) #endif } } - return c3nne; + return u3_none; } } @@ -725,7 +725,7 @@ _cj_hook_in(u3_noun cor, { u3_weak cax = _cj_warm_fend(bat); - if ( c3nne == cax ) { return u3_cm_bail(c3__fail); } + if ( u3_none == cax ) { return u3_cm_bail(c3__fail); } { u3_noun jax, pax, huc, hap; @@ -735,7 +735,7 @@ _cj_hook_in(u3_noun cor, u3_cs_core* cop_u = &u3D.ray_u[jax_l]; u3_noun fol = u3_ckdb_get(u3k(huc), u3_ci_string(tam_c)); - if ( c3nne == fol ) { + if ( u3_none == fol ) { // The caller wants a deeper core. // if ( 0 == pax ) { return u3_cm_bail(c3__fail); } @@ -753,8 +753,8 @@ _cj_hook_in(u3_noun cor, if ( (0 == axe_l) || (c3n == jet_o) || - (c3nne == (inx_l = u3_ckdb_get(u3k(hap), axe_l))) || - (c3nne == (pro = _cj_kick_z(cor, + (u3_none == (inx_l = u3_ckdb_get(u3k(hap), axe_l))) || + (u3_none == (pro = _cj_kick_z(cor, cop_u, &cop_u->arm_u[inx_l], axe_l))) ) @@ -812,18 +812,18 @@ u3_cj_hook(u3_noun cor, u3_weak u3_cj_kick(u3_noun cor, u3_noun axe) { - if ( !_(u3du(cor)) ) { return c3nne; } + if ( !_(u3du(cor)) ) { return u3_none; } { u3_noun bat = u3h(cor); u3_weak cax = _cj_warm_fend(bat); - if ( c3nne == cax ) { return c3nne; } + if ( u3_none == cax ) { return u3_none; } { u3_noun hap = u3h(u3t(u3t(cax))); u3_noun inx = u3_ckdb_get(u3k(hap), u3k(axe)); - if ( c3nne == inx ) { - u3z(cax); return c3nne; + if ( u3_none == inx ) { + u3z(cax); return u3_none; } else { c3_l jax_l = u3h(cax); @@ -849,7 +849,7 @@ u3_cj_kink(u3_noun cor, { u3_weak pro = u3_cj_kick(cor, axe); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { return u3_cn_nock_on(cor, u3nq(9, axe, 0, 1)); diff --git a/g/m.c b/g/m.c index a500e4366b..f44beef198 100644 --- a/g/m.c +++ b/g/m.c @@ -761,7 +761,7 @@ u3_cm_soft_top(c3_w sec_w, // timer seconds /* Make sure the inner routine did not create garbage. */ if ( u3R->how.fag_w & u3_cs_flag_debug ) { - u3_ce_grab("top", pro, c3nne); + u3_ce_grab("top", pro, u3_none); } /* Revert to external signal regime. @@ -842,7 +842,7 @@ u3_cm_soft_run(u3_noun fly, pro = fun_f(aga, agb); if ( u3R->how.fag_w & u3_cs_flag_debug ) { - u3_ce_grab("top", pro, c3nne); + u3_ce_grab("top", pro, u3_none); } /* Produce success, on the old road. diff --git a/g/n.c b/g/n.c index b58d14a54d..3807b21b77 100644 --- a/g/n.c +++ b/g/n.c @@ -76,7 +76,7 @@ _cn_hint(u3_noun zep, { u3_noun pro = u3_cz_find_2(c3__nock, bus, nex); - if ( pro != c3nne ) { + if ( pro != u3_none ) { u3z(bus); u3z(nex); return pro; } @@ -254,7 +254,7 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) u3_noun seb = u3_cn_nock_on(bus, u3k(c_gal)); u3_noun pro = u3_cj_kick(seb, b_gal); - if ( c3nne != pro ) { + if ( u3_none != pro ) { u3_ca_lose(fol); return pro; } diff --git a/g/r.c b/g/r.c index 14b78db110..be21f1f8fc 100644 --- a/g/r.c +++ b/g/r.c @@ -16,7 +16,7 @@ _frag_word(c3_w a_w, u3_noun b) while ( dep_w ) { if ( c3n == u3_ca_is_cell(b) ) { - return c3nne; + return u3_none; } else { u3_cs_cell* b_u = u3_ca_to_ptr(b); @@ -38,7 +38,7 @@ _frag_deep(c3_w a_w, u3_noun b) while ( dep_w ) { if ( c3n == u3_ca_is_cell(b) ) { - return c3nne; + return u3_none; } else { u3_cs_cell* b_u = u3_ca_to_ptr(b); @@ -52,17 +52,17 @@ _frag_deep(c3_w a_w, u3_noun b) /* u3_cr_at(): ** -** Return fragment (a) of (b), or c3nne if not applicable. +** Return fragment (a) of (b), or u3_none if not applicable. */ u3_weak u3_cr_at(u3_atom a, u3_noun b) { - c3_assert(c3nne != a); - c3_assert(c3nne != b); + c3_assert(u3_none != a); + c3_assert(u3_none != b); if ( 0 == a ) { - return c3nne; + return u3_none; } if ( _(u3_ca_is_cat(a)) ) { @@ -70,7 +70,7 @@ u3_cr_at(u3_atom a, } else { if ( !_(u3_ca_is_pug(a)) ) { - return c3nne; + return u3_none; } else { u3_cs_atom* a_u = u3_ca_to_ptr(a); @@ -82,7 +82,7 @@ u3_cr_at(u3_atom a, while ( len_w ) { b = _frag_deep(a_u->buf_w[len_w - 1], b); - if ( c3nne == b ) { + if ( u3_none == b ) { return b; } else { len_w--; @@ -156,7 +156,7 @@ u3_cr_mean(u3_noun som, c3_w len_w; struct _mean_pair* prs_m; - c3_assert(c3nne != som); + c3_assert(u3_none != som); /* Count. */ @@ -382,7 +382,7 @@ _mug_words_buf(c3_w off_w, c3_w nwd_w, u3_noun veb) c3_w u3_cr_mug(u3_noun veb) { - c3_assert(c3nne != veb); + c3_assert(u3_none != veb); if ( _(u3_ca_is_cat(veb)) ) { c3_w x_w = veb; @@ -622,8 +622,8 @@ static u3_bean _sing_x(u3_noun a, u3_noun b) { - c3_assert(c3nne != a); - c3_assert(c3nne != b); + c3_assert(u3_none != a); + c3_assert(u3_none != b); if ( a == b ) { return c3y; @@ -828,8 +828,8 @@ u3_atom u3_cr_nord(u3_noun a, u3_noun b) { - c3_assert(c3nne != a); - c3_assert(c3nne != b); + c3_assert(u3_none != a); + c3_assert(u3_none != b); if ( a == b ) { return 1; @@ -897,7 +897,7 @@ u3_bean u3_cr_sing_c(const c3_c* a_c, u3_noun b) { - c3_assert(c3nne != b); + c3_assert(u3_none != b); if ( !_(u3_ca_is_atom(b)) ) { return c3n; @@ -927,7 +927,7 @@ u3_cr_bush(u3_noun a, u3_noun* b, u3_noun* c) { - c3_assert(c3nne != a); + c3_assert(u3_none != a); if ( _(u3_ca_is_atom(a)) ) { return c3n; @@ -953,7 +953,7 @@ u3_cr_cell(u3_noun a, u3_noun* b, u3_noun* c) { - c3_assert(c3nne != a); + c3_assert(u3_none != a); if ( _(u3_ca_is_atom(a)) ) { return c3n; @@ -1143,7 +1143,7 @@ c3_w u3_cr_met(c3_y a_y, u3_atom b) { - c3_assert(c3nne != b); + c3_assert(u3_none != b); c3_assert(_(u3_ca_is_atom(b))); if ( b == 0 ) { @@ -1206,7 +1206,7 @@ c3_b u3_cr_bit(c3_w a_w, u3_atom b) { - c3_assert(c3nne != b); + c3_assert(u3_none != b); c3_assert(_(u3_ca_is_atom(b))); if ( _(u3_ca_is_cat(b)) ) { @@ -1239,7 +1239,7 @@ c3_y u3_cr_byte(c3_w a_w, u3_atom b) { - c3_assert(c3nne != b); + c3_assert(u3_none != b); c3_assert(_(u3_ca_is_atom(b))); if ( _(u3_ca_is_cat(b)) ) { @@ -1276,7 +1276,7 @@ u3_cr_bytes(c3_w a_w, { c3_w i_w; - c3_assert(c3nne != d); + c3_assert(u3_none != d); /* Efficiency: don't call u3_cr_byte(). */ @@ -1293,7 +1293,7 @@ void u3_cr_mp(mpz_t a_mp, u3_atom b) { - c3_assert(c3nne != b); + c3_assert(u3_none != b); c3_assert(_(u3_ca_is_atom(b))); if ( _(u3_ca_is_cat(b)) ) { @@ -1330,7 +1330,7 @@ c3_w u3_cr_word(c3_w a_w, u3_atom b) { - c3_assert(c3nne != b); + c3_assert(u3_none != b); c3_assert(_(u3_ca_is_atom(b))); if ( _(u3_ca_is_cat(b)) ) { @@ -1375,7 +1375,7 @@ u3_cr_words(c3_w a_w, { c3_w i_w; - c3_assert(c3nne != d); + c3_assert(u3_none != d); /* Efficiency: don't call u3_cr_word(). */ @@ -1402,7 +1402,7 @@ u3_cr_chop(c3_g met_g, c3_w len_w; c3_w* buf_w; - c3_assert(c3nne != src); + c3_assert(u3_none != src); c3_assert(_(u3_ca_is_atom(src))); if ( _(u3_ca_is_cat(src)) ) { diff --git a/g/v.c b/g/v.c index c8d19b8d87..a45ebcf6e5 100644 --- a/g/v.c +++ b/g/v.c @@ -105,7 +105,7 @@ u3_cv_wish(const c3_c* str_c) exp = u3_ckdb_get(u3k(u3A->yot), u3k(txt)); - if ( c3nne == exp ) { + if ( u3_none == exp ) { exp = _cv_nock_wish(u3k(txt)); u3A->yot = u3_ckdb_put(u3A->yot, u3k(txt), u3k(exp)); } diff --git a/g/x.c b/g/x.c index 2bb0797bc3..5bc4e43084 100644 --- a/g/x.c +++ b/g/x.c @@ -4,12 +4,12 @@ */ #include "all.h" -/* u3_cx_good(): test for c3nne. +/* u3_cx_good(): test for u3_none. */ u3_noun u3_cx_good(u3_weak som) { - if ( c3nne == som ) { + if ( u3_none == som ) { return u3_cm_bail(c3__exit); } else return som; @@ -22,7 +22,7 @@ u3_cx_at(u3_noun axe, u3_noun som) { u3_weak pro = u3_cr_at(axe, som); - if ( c3nne == pro ) { + if ( u3_none == pro ) { return u3_cm_bail(c3__exit); } else return pro; } diff --git a/g/z.c b/g/z.c index 962d88c99c..6da8680f6d 100644 --- a/g/z.c +++ b/g/z.c @@ -99,7 +99,7 @@ u3_cz_uniq(u3_noun som) u3_noun key = u3nc(c3__uniq, u3k(som)); u3_noun val = u3_ch_get(u3R->cax.har_p, key); - if ( c3nne != val ) { + if ( u3_none != val ) { u3z(key); u3z(som); return val; } else { diff --git a/i/c/c3.md b/i/c/c3.md deleted file mode 100644 index 231946b3a1..0000000000 --- a/i/c/c3.md +++ /dev/null @@ -1,60 +0,0 @@ -# u3: noun processing in C. - -`u3` is the C library that makes Urbit work. If it wasn't called -`u3`, it might be called `libnoun` - it's a library for making -and storing nouns. - -What's a noun? A noun is either a cell or an atom. A cell is an -ordered pair of any two nouns. An atom is an unsigned integer of -any size. - -To the C programmer, this is not a terribly complicated data -structure, so why do you need a library for it? - -One: nouns have a well-defined computation kernel, Nock, whose -spec fits on a page and gzips to 340 bytes. But the only -arithmetic operation in Nock is increment. So it's nontrivial -to compute both efficiently and correctly. - -Two: `u3` is designed to support "permanent computing," ie, a -single-level store which is transparently checkpointed. This -implies a specialized memory-management model. - -Does `u3` depend on the higher levels of Urbit, Arvo and Hoon? -Yes and no. It expects you to load something shaped like an Arvo -kernel, and use it as an event-processing function. But you -don't need to use this feature if you don't want, and your kernel -can be anything you want. - - -## u3: l - -The best way to introduce `u3` is with a simple map of the Urbit -build directory - folding things we don't care about right now: - - g/ u3 implementation - g/a.c allocation - g/e.c persistence - g/h.c hashtables - g/i.c noun construction - g/j.c jet control - g/m.c master state - g/n.c nock execution - g/r.c noun access, error returns - g/t.c tracing/profiling - g/v.c arvo kernel - g/x.c noun access, error crashes - g/z.c memoization/caching - i/ all includes - i/v Urbit systems headers - i/g u3 headers (matching filenames) - i/c c3 headers - i/c/ - v/ Urbit systems code - - outside/ all external bundled code - -# C3: C in the Urbit environment - -Urbit has two distinct - but easily confused - contexts where -we program in C. Logically, Urbit is a pure noun processing diff --git a/i/g/a.h b/i/g/a.h index 8cbdc78872..7c917577d3 100644 --- a/i/g/a.h +++ b/i/g/a.h @@ -34,9 +34,9 @@ */ typedef c3_w u3_noun; - /* c3nne - out-of-band noun. + /* u3_none - out-of-band noun. */ -# define c3nne (u3_noun)0xffffffff +# define u3_none (u3_noun)0xffffffff /* Informative typedefs. Use if you like. */ @@ -48,7 +48,7 @@ typedef u3_noun u3_qual; // must be quadruple typedef u3_noun u3_quin; // must be quintuple typedef u3_noun u3_bean; // loobean: 0 == c3y, 1 == c3n - typedef u3_noun u3_weak; // may be c3nne + typedef u3_noun u3_weak; // may be u3_none typedef u3_noun (*u3_funk)(u3_noun); typedef u3_noun (*u3_funq)(u3_noun, u3_noun); diff --git a/i/g/e.h b/i/g/e.h index d1dff05e55..59bf16929e 100644 --- a/i/g/e.h +++ b/i/g/e.h @@ -81,7 +81,7 @@ /* u3_ce_grab(): garbage-collect the world, plus extra roots. */ void - u3_ce_grab(c3_c* cap_c, u3_noun som, ...); // terminate with c3nne + u3_ce_grab(c3_c* cap_c, u3_noun som, ...); // terminate with u3_none /* u3_ce_dirty(): count dirty pages. */ diff --git a/i/g/j.h b/i/g/j.h index e248b4e667..fc88627f78 100644 --- a/i/g/j.h +++ b/i/g/j.h @@ -138,7 +138,7 @@ c3_l u3_cj_find(u3_noun bat); - /* u3_cj_kick(): try to kick by jet. If no kick, produce c3nne. + /* u3_cj_kick(): try to kick by jet. If no kick, produce u3_none. ** ** `axe` is RETAINED by the caller; `cor` is RETAINED iff there ** is no kick, TRANSFERRED if one. diff --git a/i/g/r.h b/i/g/r.h index 15a44c64ea..47868895bf 100644 --- a/i/g/r.h +++ b/i/g/r.h @@ -19,7 +19,7 @@ u3_cr_ud(u3_noun a); #endif - /* u3_cr_at(): fragment `a` of `b`, or c3nne. + /* u3_cr_at(): fragment `a` of `b`, or u3_none. */ u3_weak u3_cr_at(u3_atom a, diff --git a/i/g/x.h b/i/g/x.h index ec014d4fbf..edd77d2021 100644 --- a/i/g/x.h +++ b/i/g/x.h @@ -18,7 +18,7 @@ u3_noun u3_cx_t(u3_noun som); #endif - /* u3_cx_good(): test for c3nne. + /* u3_cx_good(): test for u3_none. */ u3_noun u3_cx_good(u3_weak som); diff --git a/j/1/dec.c b/j/1/dec.c index 7c59e55cd1..65ad1dea97 100644 --- a/j/1/dec.c +++ b/j/1/dec.c @@ -38,7 +38,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); diff --git a/j/2/drop.c b/j/2/drop.c index 3921f4c031..ddfa7348a1 100644 --- a/j/2/drop.c +++ b/j/2/drop.c @@ -22,8 +22,8 @@ { u3_noun a; - if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) { - return c3nne; + if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { + return u3_none; } else { return u3_cqb_drop(a); } diff --git a/j/2/flop.c b/j/2/flop.c index 07bfb4191f..aa51339f05 100644 --- a/j/2/flop.c +++ b/j/2/flop.c @@ -32,7 +32,7 @@ { u3_noun a; - if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_flop(a); diff --git a/j/2/lent.c b/j/2/lent.c index f84e0c7347..f7f35d1b8d 100644 --- a/j/2/lent.c +++ b/j/2/lent.c @@ -31,7 +31,7 @@ { u3_noun a; - if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_lent(a); diff --git a/j/2/need.c b/j/2/need.c index 7dcada37f1..31c1764cf5 100644 --- a/j/2/need.c +++ b/j/2/need.c @@ -24,7 +24,7 @@ { u3_noun a; - if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__exit); } else { return u3_cqb_need(a); diff --git a/j/2/roll.c b/j/2/roll.c index cb59720795..168b8fe474 100644 --- a/j/2/roll.c +++ b/j/2/roll.c @@ -23,7 +23,7 @@ u3_noun daz = u3_cn_slam_on(u3k(b), u3nc(gim, zor)); u3_noun vel = u3_ci_molt(u3k(b), u3_cv_sam_3, daz, 0); - if ( c3nne == vel ) { + if ( u3_none == vel ) { return u3_cm_bail(c3__exit); } else { u3_noun hox = u3_cqb_roll(u3t(a), vel); diff --git a/j/2/skip.c b/j/2/skip.c index bd2dd9de9c..f74560f848 100644 --- a/j/2/skip.c +++ b/j/2/skip.c @@ -16,7 +16,7 @@ return a; } else if ( c3n == u3du(a) ) { - return c3nne; + return u3_none; } else { u3_noun hoz = u3_cn_slam_on(u3k(b), u3k(u3h(a))); u3_noun vyr = u3_cqb_skip(u3t(a), b); @@ -26,7 +26,7 @@ case c3n: return u3nc(u3k(u3h(a)), vyr); default: u3z(hoz); u3z(vyr); - return c3nne; + return u3_none; } } } @@ -37,7 +37,7 @@ u3_noun a, b; if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return c3nne; + return u3_none; } else { return u3_cqb_skip(a, b); } diff --git a/j/3/bex.c b/j/3/bex.c index 8dbe6ea046..4a2666784a 100644 --- a/j/3/bex.c +++ b/j/3/bex.c @@ -28,7 +28,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); diff --git a/j/3/cap.c b/j/3/cap.c index 4139456566..d351368374 100644 --- a/j/3/cap.c +++ b/j/3/cap.c @@ -28,7 +28,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); diff --git a/j/3/mas.c b/j/3/mas.c index 86c759038f..468dc8661a 100644 --- a/j/3/mas.c +++ b/j/3/mas.c @@ -35,7 +35,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); diff --git a/j/3/mug.c b/j/3/mug.c index 43e135fbd3..43ea7bdb9f 100644 --- a/j/3/mug.c +++ b/j/3/mug.c @@ -12,7 +12,7 @@ { u3_noun sam; - if ( c3nne == (sam = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (sam = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__exit); } else { return u3_cr_mug(sam); diff --git a/j/4/by_gas.c b/j/4/by_gas.c index cb080aa715..29ff346875 100644 --- a/j/4/by_gas.c +++ b/j/4/by_gas.c @@ -29,7 +29,7 @@ u3_noun qi_b = u3t(i_b); u3_noun c; - if ( c3nne == (c = u3_cqdb_put(a, pi_b, qi_b)) ) { + if ( u3_none == (c = u3_cqdb_put(a, pi_b, qi_b)) ) { return u3_cm_bail(c3__exit); } else { u3_noun d = u3_cqdb_gas(c, t_b); @@ -59,7 +59,7 @@ u3_weak c = u3_cqdb_gas(a, b); u3z(a); u3z(b); - if ( c3nne == c ) { + if ( u3_none == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/by_get.c b/j/4/by_get.c index 54038e968c..57f6581f55 100644 --- a/j/4/by_get.c +++ b/j/4/by_get.c @@ -55,7 +55,7 @@ u3z(a); u3z(b); if ( c3n == u3_cr_du(c) ) { u3z(c); - return c3nne; + return u3_none; } else { u3_noun pro = u3k(u3t(c)); @@ -68,7 +68,7 @@ { u3_weak c = u3_ckdb_get(a, b); - if ( c3nne == c ) { + if ( u3_none == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/by_has.c b/j/4/by_has.c index 56b1499f06..8f71e50b95 100644 --- a/j/4/by_has.c +++ b/j/4/by_has.c @@ -55,7 +55,7 @@ u3_weak c = u3_cqdb_has(a, b); u3z(a); u3z(b); - if ( c3nne == c ) { + if ( u3_none == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/in_gas.c b/j/4/in_gas.c index 689edf2bc4..d58307ed52 100644 --- a/j/4/in_gas.c +++ b/j/4/in_gas.c @@ -23,7 +23,7 @@ u3_noun t_b = u3t(b); u3_noun c; - if ( c3nne == (c = u3_cqdi_put(a, i_b)) ) { + if ( u3_none == (c = u3_cqdi_put(a, i_b)) ) { return u3_cm_bail(c3__exit); } else { u3_noun d = u3_cqdi_gas(c, t_b); @@ -52,7 +52,7 @@ u3_weak c = u3_cqdi_gas(a, b); u3z(a); u3z(b); - if ( c3nne == c ) { + if ( u3_none == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/in_has.c b/j/4/in_has.c index 6c9f39bb1d..01eac84f0f 100644 --- a/j/4/in_has.c +++ b/j/4/in_has.c @@ -49,7 +49,7 @@ u3_weak c = u3_cqdi_has(a, b); u3z(a); u3z(b); - if ( c3nne == c ) { + if ( u3_none == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/4/in_tap.c b/j/4/in_tap.c index 4f35384fea..aff144f370 100644 --- a/j/4/in_tap.c +++ b/j/4/in_tap.c @@ -54,7 +54,7 @@ u3_weak c = u3_cqdi_tap(a, b); u3z(a); u3z(b); - if ( c3nne == c ) { + if ( u3_none == c ) { return u3_cm_bail(c3__exit); } else return c; diff --git a/j/5/cue.c b/j/5/cue.c index 66c4354efb..2c0be6309c 100644 --- a/j/5/cue.c +++ b/j/5/cue.c @@ -50,7 +50,7 @@ u3_noun x = u3_ch_get(har_p, u3k(u3t(d))); p = u3_cqa_add(2, u3h(d)); - if ( c3nne == x ) { + if ( u3_none == x ) { return u3_cm_bail(c3__exit); } q = x; @@ -80,7 +80,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_cue(a); diff --git a/j/5/ed_puck.c b/j/5/ed_puck.c index 7768982e03..9414cdea9b 100644 --- a/j/5/ed_puck.c +++ b/j/5/ed_puck.c @@ -18,7 +18,7 @@ c3_w met_w; u3_noun a = u3_cr_at(u3_cv_sam, cor); - if ( (c3nne == a) || (c3n == u3ud(a)) ) { + if ( (u3_none == a) || (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); } diff --git a/j/5/jam.c b/j/5/jam.c index 9e371c3437..cfe55bc6bf 100644 --- a/j/5/jam.c +++ b/j/5/jam.c @@ -88,7 +88,7 @@ u3_noun c = u3_ch_get(har_p, a); u3_noun x; - if ( c3nne == c ) { + if ( u3_none == c ) { u3_ch_put(har_p, a, u3k(b)); if ( c3y == u3ud(a) ) { @@ -127,7 +127,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_jam(a); diff --git a/j/5/lore.c b/j/5/lore.c index dc4e3a332b..4bed2335f7 100644 --- a/j/5/lore.c +++ b/j/5/lore.c @@ -49,7 +49,7 @@ { u3_noun lub; - if ( (c3nne == (lub = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (lub = u3_cr_at(u3_cv_sam, cor))) || (c3n == u3ud(lub)) ) { return u3_cm_bail(c3__fail); diff --git a/j/5/loss.c b/j/5/loss.c index 8a4d1ddc17..4d029a942a 100644 --- a/j/5/loss.c +++ b/j/5/loss.c @@ -97,7 +97,7 @@ hav = u3_ckdb_get(u3k(loc_u->sev), u3k(how)); teg = u3nc(u3_ci_words(1, &i_w), - (hav == c3nne) ? u3_nul : hav); + (hav == u3_none) ? u3_nul : hav); loc_u->sev = u3_ckdb_put(loc_u->sev, u3k(how), teg); } } @@ -244,7 +244,7 @@ u3_noun i_hel = u3h(loc_u->hel); u3_noun guy = u3_ckdb_get(u3k(loc_u->sev), u3k(i_hel)); - if ( c3nne != guy ) { + if ( u3_none != guy ) { u3_noun gay = u3_ckb_flop(guy); _merg(loc_u, 0, gay); @@ -286,8 +286,8 @@ { u3_noun hel, hev; - if ( (c3nne == (hel = u3_cr_at(u3_cv_sam_2, cor))) || - (c3nne == (hev = u3_cr_at(u3_cv_sam_3, cor))) || + if ( (u3_none == (hel = u3_cr_at(u3_cv_sam_2, cor))) || + (u3_none == (hev = u3_cr_at(u3_cv_sam_3, cor))) || (c3n == _listp(hel)) || (c3n == _listp(hev)) ) { diff --git a/j/5/mat.c b/j/5/mat.c index cb11bd43e6..2666d90c47 100644 --- a/j/5/mat.c +++ b/j/5/mat.c @@ -45,7 +45,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_mat(a); diff --git a/j/5/parse.c b/j/5/parse.c index 1a65844919..627cca878d 100644 --- a/j/5/parse.c +++ b/j/5/parse.c @@ -148,7 +148,7 @@ if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, u3_cv_con, &van, 0)) || - (c3nne == (raq = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (raq = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -310,7 +310,7 @@ if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, u3_cv_con, &van, 0)) || - (c3nne == (raq = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (raq = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -340,7 +340,7 @@ u3_noun van, huf, tub; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (c3nne == (huf = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (huf = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -419,7 +419,7 @@ if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, u3_cv_con, &van, 0)) || - (c3nne == (bus = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (bus = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -515,7 +515,7 @@ u3_noun van, daf, tub; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (c3nne == (daf = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (daf = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -556,7 +556,7 @@ u3_noun van, bud, tub; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (c3nne == (bud = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (bud = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -796,7 +796,7 @@ u3_noun van, zep, tub; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (c3nne == (zep = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (zep = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -944,7 +944,7 @@ u3_noun con, hel, tub; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &con, 0)) || - (c3nne == (hel = u3_cr_at(2, con))) ) + (u3_none == (hel = u3_cr_at(2, con))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/5/repg.c b/j/5/repg.c index 1f28588e8f..54f7819445 100644 --- a/j/5/repg.c +++ b/j/5/repg.c @@ -128,9 +128,9 @@ u3_noun rad; u3_noun rep; - if ( (c3nne == (lub = u3_cr_at(u3_cv_sam_2, cor))) || - (c3nne == (rad = u3_cr_at(u3_cv_sam_6, cor))) || - (c3nne == (rep = u3_cr_at(u3_cv_sam_7, cor))) ) + if ( (u3_none == (lub = u3_cr_at(u3_cv_sam_2, cor))) || + (u3_none == (rad = u3_cr_at(u3_cv_sam_6, cor))) || + (u3_none == (rep = u3_cr_at(u3_cv_sam_7, cor))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/5/rexp.c b/j/5/rexp.c index 1bed65827b..7bbd08b175 100644 --- a/j/5/rexp.c +++ b/j/5/rexp.c @@ -129,8 +129,8 @@ u3_noun lub; u3_noun rad; - if ( (c3nne == (lub = u3_cr_at(u3_cv_sam_2, cor))) || - (c3nne == (rad = u3_cr_at(u3_cv_sam_3, cor))) ) + if ( (u3_none == (lub = u3_cr_at(u3_cv_sam_2, cor))) || + (u3_none == (rad = u3_cr_at(u3_cv_sam_3, cor))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/5/shax.c b/j/5/shax.c index a6c3f571df..b268db1767 100644 --- a/j/5/shax.c +++ b/j/5/shax.c @@ -87,7 +87,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || (c3n == u3ud(a)) ) { return u3_cm_bail(c3__exit); @@ -101,8 +101,8 @@ { u3_noun a, b; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam_2, cor))) || - (c3nne == (b = u3_cr_at(u3_cv_sam_3, cor))) || + if ( (u3_none == (a = u3_cr_at(u3_cv_sam_2, cor))) || + (u3_none == (b = u3_cr_at(u3_cv_sam_3, cor))) || (c3n == u3ud(a)) || (c3n == u3_ca_is_cat(a)) || (c3n == u3ud(b)) ) @@ -118,8 +118,8 @@ { u3_noun sal, ruz; - if ( (c3nne == (sal = u3_cr_at(u3_cv_sam_2, cor))) || - (c3nne == (ruz = u3_cr_at(u3_cv_sam_3, cor))) || + if ( (u3_none == (sal = u3_cr_at(u3_cv_sam_2, cor))) || + (u3_none == (ruz = u3_cr_at(u3_cv_sam_3, cor))) || (c3n == u3ud(sal)) || (c3n == u3ud(ruz)) ) { diff --git a/j/5/tape.c b/j/5/tape.c index 42cd854ddc..f2562998ff 100644 --- a/j/5/tape.c +++ b/j/5/tape.c @@ -48,7 +48,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_tape(a); diff --git a/j/5/trip.c b/j/5/trip.c index f299fdd0be..e79eb14e4f 100644 --- a/j/5/trip.c +++ b/j/5/trip.c @@ -20,7 +20,7 @@ { u3_noun a; - if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) { + if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { return u3_cm_bail(c3__fail); } else { return u3_cqe_trip(a); diff --git a/j/6/ap.c b/j/6/ap.c index 824c0cf6ff..926f20f6d6 100644 --- a/j/6/ap.c +++ b/j/6/ap.c @@ -755,7 +755,7 @@ u3_nul); } else switch ( u3h(gen) ) { - default: return c3nne; + default: return u3_none; case u3_nul: { return u3nt @@ -910,7 +910,7 @@ { u3_noun gen; - if ( c3nne == (gen = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (gen = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { return u3_cqfp_rake(gen); @@ -992,7 +992,7 @@ { u3_noun voq = _ap_open_l(ter, gen); - if ( c3nne == voq ) { + if ( u3_none == voq ) { return u3nc(c3n, u3k(gen)); } else if ( c3y == u3_cr_sing(voq, gen) ) { @@ -1013,7 +1013,7 @@ { u3_noun gen; - if ( c3nne == (gen = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (gen = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { u3_noun ter = u3_cr_at(u3_cv_con, cor); @@ -1047,7 +1047,7 @@ { u3_noun pro = _open_in(ter, gen); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { return _ap_open_n(ter, gen); @@ -1065,7 +1065,7 @@ { u3_noun gen; - if ( c3nne == (gen = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (gen = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { u3_noun ter = u3_cr_at(u3_cv_con, cor); diff --git a/j/6/comb.c b/j/6/comb.c index 328f992bfb..e118673f10 100644 --- a/j/6/comb.c +++ b/j/6/comb.c @@ -12,8 +12,8 @@ u3_noun mal, u3_noun buz) { - if ( (c3nne == mal) || (c3nne == buz) ) { - return c3nne; + if ( (u3_none == mal) || (u3_none == buz) ) { + return u3_none; } else { u3_noun p_mal, q_mal, p_buz, q_buz, pp_buz, pq_buz; @@ -65,7 +65,7 @@ u3_noun mal, buz; if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &mal, u3_cv_sam_3, &buz, 0) ) { - return c3nne; + return u3_none; } else { return u3_cqf_comb(mal, buz); } diff --git a/j/6/flip.c b/j/6/flip.c index 462e8fbb8a..b18739bc79 100644 --- a/j/6/flip.c +++ b/j/6/flip.c @@ -35,7 +35,7 @@ { u3_noun hel; - if ( c3nne == (hel = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (hel = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { return u3_cqf_flip(hel); diff --git a/j/6/slot.c b/j/6/slot.c index bf9993c1d6..a028f60d3f 100644 --- a/j/6/slot.c +++ b/j/6/slot.c @@ -14,7 +14,7 @@ fprintf(stderr, "slot axe %d\r\n", axe); - if ( c3nne == fag ) { + if ( u3_none == fag ) { return u3_cm_bail(c3__exit); } else { diff --git a/j/6/ut_burn.c b/j/6/ut_burn.c index 5fc4c54e23..cb10c61e9d 100644 --- a/j/6/ut_burn.c +++ b/j/6/ut_burn.c @@ -95,7 +95,7 @@ c3_m fun_m = c3__burn; u3_noun pro = u3_cz_find(fun_m, sut); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { @@ -111,7 +111,7 @@ { u3_noun sut; - if ( c3nne == (sut = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (sut = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { return u3_cqfu_burn(cor, sut); diff --git a/j/6/ut_busk.c b/j/6/ut_busk.c index b15731b4db..5b31c53feb 100644 --- a/j/6/ut_busk.c +++ b/j/6/ut_busk.c @@ -35,7 +35,7 @@ u3_cv_con, &van, 0)) || (c3n == u3ud(cog)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_bust.c b/j/6/ut_bust.c index 05d718553a..5a0e3f8790 100644 --- a/j/6/ut_bust.c +++ b/j/6/ut_bust.c @@ -23,7 +23,7 @@ u3_noun wox = u3_cqfu_mint(van, sut, c3__noun, woo); u3_noun ret = u3_cn_nock_on(yib, u3k(u3t(wox))); - if ( c3nne == ret ) { + if ( u3_none == ret ) { return u3_cm_error("bust-nock"); } u3z(wox); @@ -41,7 +41,7 @@ u3_noun sut, dib, van; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &dib, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -60,7 +60,7 @@ c3_m fun_m = c3__bust; u3_noun pro = u3_cz_find_2(fun_m, sut, dib); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_conk.c b/j/6/ut_conk.c index 2ed309a2da..18878ba32f 100644 --- a/j/6/ut_conk.c +++ b/j/6/ut_conk.c @@ -65,7 +65,7 @@ if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &got, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_crop.c b/j/6/ut_crop.c index 97159a3976..d0aae8afaf 100644 --- a/j/6/ut_crop.c +++ b/j/6/ut_crop.c @@ -236,7 +236,7 @@ u3_noun sut, ref, van; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -252,7 +252,7 @@ c3_m fun_m = c3__crop; u3_noun pro = u3_cz_find_2(fun_m, sut, ref); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_cull.c b/j/6/ut_cull.c index e9367294ef..3bff522bef 100644 --- a/j/6/ut_cull.c +++ b/j/6/ut_cull.c @@ -182,7 +182,7 @@ u3_cv_sam_7, &ref, u3_cv_con, &van, 0)) || (c3n == u3ud(axe)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -200,7 +200,7 @@ c3_m fun_m = c3__cull; u3_noun pro = u3_cz_find_4(fun_m, sut, pol, axe, ref); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_find.c b/j/6/ut_find.c index 04eeb4abb1..0bbc8dec8e 100644 --- a/j/6/ut_find.c +++ b/j/6/ut_find.c @@ -703,7 +703,7 @@ u3_cv_sam_7, &cog, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -722,7 +722,7 @@ c3_m fun_m = c3__fino; u3_noun pro = u3_cz_find_4(fun_m, sut, dep, way, cog); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { @@ -746,7 +746,7 @@ u3_cv_sam_7, &cog, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -765,7 +765,7 @@ c3_m fun_m = c3__find; u3_noun pro = u3_cz_find_4(fun_m, sut, dep, way, cog); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_fink.c b/j/6/ut_fink.c index 81e34979ea..70ebfacbcd 100644 --- a/j/6/ut_fink.c +++ b/j/6/ut_fink.c @@ -59,7 +59,7 @@ u3_cv_sam_7, &cog, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_fire.c b/j/6/ut_fire.c index 67702ab119..fa88947460 100644 --- a/j/6/ut_fire.c +++ b/j/6/ut_fire.c @@ -159,7 +159,7 @@ u3_noun sut, hag, van; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &hag, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_firm.c b/j/6/ut_firm.c index 5fd50019b5..4b3e5094e5 100644 --- a/j/6/ut_firm.c +++ b/j/6/ut_firm.c @@ -38,7 +38,7 @@ { u3_noun nun = u3_cr_at(u3h(u3t(u3t(p_sut))), dib); - if ( c3nne == nun ) { + if ( u3_none == nun ) { return c3n; } else { return c3a(_cqfu_firm(van, q_sut, dib), @@ -100,7 +100,7 @@ u3_noun sut, dib, van; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &dib, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_fish.c b/j/6/ut_fish.c index 70b9f762b6..6f1d048fd1 100644 --- a/j/6/ut_fish.c +++ b/j/6/ut_fish.c @@ -142,7 +142,7 @@ if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &axe, u3_cv_con, &van, 0)) || (c3n == u3ud(axe)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -158,7 +158,7 @@ c3_m fun_m = c3__fish; u3_noun pro = u3_cz_find_2(fun_m, sut, axe); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_fuse.c b/j/6/ut_fuse.c index aa74a5e76e..816bc4c9a3 100644 --- a/j/6/ut_fuse.c +++ b/j/6/ut_fuse.c @@ -175,7 +175,7 @@ u3_noun sut, ref, van; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -191,7 +191,7 @@ c3_m fun_m = c3__fuse; u3_noun pro = u3_cz_find_2(fun_m, sut, ref); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_heal.c b/j/6/ut_heal.c index 04ef1ae7df..38190593b4 100644 --- a/j/6/ut_heal.c +++ b/j/6/ut_heal.c @@ -226,7 +226,7 @@ u3_cv_con, &van, 0)) || (c3n == u3ud(axe)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_mint.c b/j/6/ut_mint.c index dfe1165454..cfd05e27e8 100644 --- a/j/6/ut_mint.c +++ b/j/6/ut_mint.c @@ -931,7 +931,7 @@ int FOO; u3_cv_sam_3, &gen, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -949,7 +949,7 @@ int FOO; u3_noun vrf = u3_cr_at(u3_cqfu_van_vrf, van); u3_noun pro = u3_cz_find_4(fun_m, vrf, sut, gol, gen); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_mull.c b/j/6/ut_mull.c index 3125ca5673..f21099250d 100644 --- a/j/6/ut_mull.c +++ b/j/6/ut_mull.c @@ -840,7 +840,7 @@ u3_cv_sam_7, &gen, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -858,7 +858,7 @@ c3_m fun_m = c3__mull; u3_noun pro = u3_cz_find_4(fun_m, sut, gol, dox, gen); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_nest.c b/j/6/ut_nest.c index 72bb11745f..92b7fb3775 100644 --- a/j/6/ut_nest.c +++ b/j/6/ut_nest.c @@ -346,7 +346,7 @@ c3_m fun_m = c3__nest; u3_noun pro = u3_cz_find_2(fun_m, sut, ref); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { @@ -469,7 +469,7 @@ u3_cv_con, &van, 0)) || (c3n == u3ud(tel)) || (tel > 1) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_park.c b/j/6/ut_park.c index 55928fea35..62b77aae49 100644 --- a/j/6/ut_park.c +++ b/j/6/ut_park.c @@ -74,7 +74,7 @@ u3_cv_con, &van, 0)) || (c3n == u3ud(axe)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_peek.c b/j/6/ut_peek.c index a71f6bfb24..0e1e0b9199 100644 --- a/j/6/ut_peek.c +++ b/j/6/ut_peek.c @@ -173,7 +173,7 @@ u3_cv_con, &van, 0)) || (c3n == u3ud(axe)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -190,7 +190,7 @@ c3_m fun_m = c3__peek; u3_noun pro = u3_cz_find_3(fun_m, sut, way, axe); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_play.c b/j/6/ut_play.c index 699b372fdf..8f35f03d2c 100644 --- a/j/6/ut_play.c +++ b/j/6/ut_play.c @@ -524,7 +524,7 @@ u3_noun sut, gen, van; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &gen, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_repo.c b/j/6/ut_repo.c index f72fddf119..c96298da30 100644 --- a/j/6/ut_repo.c +++ b/j/6/ut_repo.c @@ -68,7 +68,7 @@ { u3_noun sut; - if ( c3nne == (sut = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (sut = u3_cr_at(u3_cv_sam, cor)) ) { return u3_cm_bail(c3__fail); } else { return u3_cqfu_repo(cor, sut); diff --git a/j/6/ut_rest.c b/j/6/ut_rest.c index b1f8633ced..4c4aee66d2 100644 --- a/j/6/ut_rest.c +++ b/j/6/ut_rest.c @@ -109,7 +109,7 @@ u3_noun sut, leg, van; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &leg, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -125,7 +125,7 @@ c3_m fun_m = c3__rest; u3_noun pro = u3_cz_find_2(fun_m, sut, leg); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { diff --git a/j/6/ut_seek.c b/j/6/ut_seek.c index 605481eff4..8561f7f441 100644 --- a/j/6/ut_seek.c +++ b/j/6/ut_seek.c @@ -228,7 +228,7 @@ u3_cv_sam_3, &hyp, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { @@ -245,7 +245,7 @@ c3_m fun_m = c3__seek; u3_noun pro = u3_cz_find_3(fun_m, sut, way, hyp); - if ( c3nne != pro ) { + if ( u3_none != pro ) { return pro; } else { @@ -285,7 +285,7 @@ u3_cv_sam_3, &hyp, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_sift.c b/j/6/ut_sift.c index bcc4d253df..b760d6cbf6 100644 --- a/j/6/ut_sift.c +++ b/j/6/ut_sift.c @@ -16,7 +16,7 @@ if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_swab.c b/j/6/ut_swab.c index e374ce0687..bdf3f183ae 100644 --- a/j/6/ut_swab.c +++ b/j/6/ut_swab.c @@ -42,7 +42,7 @@ if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &har, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_tock.c b/j/6/ut_tock.c index 66bc63542b..6725ce4683 100644 --- a/j/6/ut_tock.c +++ b/j/6/ut_tock.c @@ -80,7 +80,7 @@ u3_cv_sam_7, &men, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/j/6/ut_wrap.c b/j/6/ut_wrap.c index b8062dfea7..2cac45efdf 100644 --- a/j/6/ut_wrap.c +++ b/j/6/ut_wrap.c @@ -63,7 +63,7 @@ u3_noun sut, yoz, van; if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &yoz, u3_cv_con, &van, 0)) || - (c3nne == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) { return u3_cm_bail(c3__fail); } else { diff --git a/urbit.spec b/outside/urbit.spec similarity index 100% rename from urbit.spec rename to outside/urbit.spec diff --git a/v/http.c b/v/http.c index bd7ce40f8b..6afe0bf451 100644 --- a/v/http.c +++ b/v/http.c @@ -821,7 +821,7 @@ _http_pox_to_noun(c3_w sev_l, c3_w coq_l, c3_w seq_l) u3_nul)); } -/* _http_request_to_noun(): translate http request into noun, or c3nne. +/* _http_request_to_noun(): translate http request into noun, or u3_none. */ static u3_noun _http_request_to_noun(u3_hreq* req_u) @@ -829,7 +829,7 @@ _http_request_to_noun(u3_hreq* req_u) u3_noun med, url, hed, bod; switch ( req_u->met_e ) { - default: fprintf(stderr, "strange request\r\n"); return c3nne; + default: fprintf(stderr, "strange request\r\n"); return u3_none; case u3_hmet_put: { med = c3__put; break; } case u3_hmet_get: { med = c3__get; break; } case u3_hmet_post: { med = c3__post; break; } @@ -874,7 +874,7 @@ _http_request(u3_hreq* req_u) { u3_noun req = _http_request_to_noun(req_u); - if ( c3nne != req ) { + if ( u3_none != req ) { u3_noun pox = _http_pox_to_noun(req_u->hon_u->htp_u->sev_l, req_u->hon_u->coq_l, req_u->seq_l); diff --git a/v/loop.c b/v/loop.c index 1a7d2940a3..999a68879d 100644 --- a/v/loop.c +++ b/v/loop.c @@ -348,7 +348,7 @@ u3_lo_open(void) if ( (u3H->rod_u.how.fag_w & u3_cs_flag_gc) || (u3H->rod_u.how.fag_w & u3_cs_flag_debug) ) { - u3_ce_grab("lo_open", c3nne); + u3_ce_grab("lo_open", u3_none); } _lo_time(); } @@ -358,19 +358,19 @@ u3_lo_open(void) void u3_lo_shut(u3_bean inn) { - // u3_ce_grab("lo_shut a", c3nne); + // u3_ce_grab("lo_shut a", u3_none); // process actions // u3_raft_work(); - // u3_lo_grab("lo_shut b", c3nne); + // u3_lo_grab("lo_shut b", u3_none); // update time // _lo_time(); - // u3_lo_grab("lo_shut c", c3nne); + // u3_lo_grab("lo_shut c", u3_none); // for input operations, poll fs (XX not permanent) // XX remove raty_lead guard @@ -379,14 +379,14 @@ u3_lo_shut(u3_bean inn) u3_unix_ef_look(); } - // u3_lo_grab("lo_shut d", c3nne); + // u3_lo_grab("lo_shut d", u3_none); // clean shutdown // if ( c3n == u3_Host.liv ) { // direct save and die // - // u3_lo_grab("lo_exit", c3nne); + // u3_lo_grab("lo_exit", u3_none); // u3_loom_save(u3A->ent_d); // u3_loom_exit(); u3_ct_boff(); @@ -689,10 +689,10 @@ u3_lo_grab(c3_c* cap_c, u3_noun som, ...) va_start(vap, som); - if ( som != c3nne ) { + if ( som != u3_none ) { siz_w += u3_cm_mark_noun(som); - while ( c3nne != (tur = va_arg(vap, u3_noun)) ) { + while ( u3_none != (tur = va_arg(vap, u3_noun)) ) { siz_w += u3_cm_mark_noun(tur); } } diff --git a/v/main.c b/v/main.c index 52e728c2a6..b188be2d17 100644 --- a/v/main.c +++ b/v/main.c @@ -333,7 +333,7 @@ main(c3_i argc, #endif } - // u3_ce_grab("main", c3nne); + // u3_ce_grab("main", u3_none); u3_lo_loop(); return 0; diff --git a/v/save.c b/v/save.c index 32b671e21e..ba03977dd8 100644 --- a/v/save.c +++ b/v/save.c @@ -32,7 +32,7 @@ _save_time_cb(uv_timer_t* tim_u) if ( u3A->ent_d > sav_u->ent_d ) { // uL(fprintf(uH, "autosaving... ent_d %llu\n", u3A->ent_d)); - // u3_ce_grab("save", c3nne); + // u3_ce_grab("save", u3_none); u3_ce_save(); sav_u->ent_d = u3A->ent_d; diff --git a/v/sist.c b/v/sist.c index 31662612c5..f592ed88fc 100644 --- a/v/sist.c +++ b/v/sist.c @@ -1098,7 +1098,7 @@ _sist_rest() if ( 0 == (xno_w % 1000) ) { uL(fprintf(uH, "{%d}\n", xno_w)); - // u3_lo_grab("rest", rou, c3nne); + // u3_lo_grab("rest", rou, u3_none); } } u3z(rou); @@ -1215,7 +1215,7 @@ u3_sist_boot(void) uL(fprintf(uH, "sist: booting\n")); if ( c3y == u3_Host.ops_u.nuu ) { - u3_noun pig = c3nne; + u3_noun pig = u3_none; if ( 0 == u3_Host.ops_u.imp_c ) { c3_c get_c[2049]; diff --git a/v/unix.c b/v/unix.c index 49f9010147..db46fd4578 100644 --- a/v/unix.c +++ b/v/unix.c @@ -699,7 +699,7 @@ _unix_file_tame(u3_ufil* fil_u) c3_c* pax_c = fil_u->pax_c + (fas_c-fil_u->pax_c) + 1; if ( !fil_u->dot_c ) { - return c3nne; + return u3_none; } else { c3_c* ext_c = fil_u->dot_c + 1; @@ -739,7 +739,7 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) if ( c3n == u3du(wib) ) { ole = u3_ckdb_get(u3k(pam), u3k(wib)); - if ( c3nne == ole ) { + if ( u3_none == ole ) { ole = u3_do("cosh", u3nt(0, woz, u3_nul)); } else { u3_noun elo; @@ -757,7 +757,7 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) ole = u3_ckdb_get(u3k(pam), u3k(fid)); - if ( c3nne == ole ) { + if ( u3_none == ole ) { ole = u3nt (0, u3_nul, u3_ckdb_put(u3_nul, u3k(har), @@ -769,7 +769,7 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) u3_weak tup = u3_ckdb_get(u3k(roo), u3k(har)); u3_noun oor, elo; - if ( c3nne == tup ) { + if ( u3_none == tup ) { tup = u3_do("cosh", u3nt(0, woz, u3_nul)); } else { u3_noun upt; @@ -813,7 +813,7 @@ _unix_dir_ankh(u3_udir* dir_u) for ( fil_u = dir_u->par_u->fil_u; fil_u; fil_u = fil_u->nex_u ) { // uL(fprintf(uH, "top %s\n", fil_u->pax_c)); u3_noun wib = _unix_file_tame(fil_u); - if ( c3nne == wib ) continue; + if ( u3_none == wib ) continue; u3_noun dur = _unix_dir_name(dir_u); if ( c3n == u3_cr_sing(dur, u3h(wib)) ) { // wrong desk u3z(wib); u3z(dur); @@ -849,12 +849,12 @@ _find_mug(u3_noun som, c3_l mug_l) u3_weak pro; if ( _(u3du(som)) ) { - if ( (pro = _find_mug(u3h(som), mug_l)) != c3nne ) { + if ( (pro = _find_mug(u3h(som), mug_l)) != u3_none ) { return pro; } else return _find_mug(u3t(som), mug_l); } - else return c3nne; + else return u3_none; } } #endif diff --git a/v/walk.c b/v/walk.c index f55ed62f22..f54630d8f1 100644 --- a/v/walk.c +++ b/v/walk.c @@ -207,7 +207,7 @@ _walk_in(const c3_c* dir_c, c3_w len_w) dat = u3_cke_cue(dat); } hax = u3_do("sham", u3k(dat)); - if ( c3nne == get ) { get = u3_nul; } + if ( u3_none == get ) { get = u3_nul; } get = u3_ckdb_put(get, ext, u3nt(c3y, hax, dat)); map = u3_ckdb_put(map, nam, u3nc(c3n, get)); From 138711c7cd0894918b6f82f450e4abc0bd315976 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 5 Nov 2014 16:02:36 -0800 Subject: [PATCH 07/14] Another great renaming. --- g/a.c | 170 +++++++++++++------------- g/e.c | 138 ++++++++++----------- g/i.c | 12 +- g/j.c | 30 ++--- g/m.c | 26 ++-- g/r.c | 46 +++---- g/v.c | 12 +- i/g/a.h | 62 +++++----- i/g/e.h | 36 +++--- i/g/j.h | 32 ++--- i/g/m.h | 2 +- i/g/n.h | 71 ++++++----- i/g/v.h | 28 ++--- j/dash.c | 366 +++++++++++++++++++++++++++---------------------------- v/loop.c | 4 +- v/raft.c | 16 +-- 16 files changed, 524 insertions(+), 527 deletions(-) diff --git a/g/a.c b/g/a.c index 05e5220daf..490fc07d50 100644 --- a/g/a.c +++ b/g/a.c @@ -31,10 +31,10 @@ _box_slot(c3_w siz_w) /* _box_make(): construct a box. */ -u3_cs_box* +u3_ca_box* _box_make(void* box_v, c3_w siz_w, c3_w use_w) { - u3_cs_box* box_u = box_v; + u3_ca_box* box_u = box_v; c3_w* box_w = box_v; c3_assert(siz_w >= u3_cc_minimum); @@ -55,10 +55,10 @@ _box_make(void* box_v, c3_w siz_w, c3_w use_w) /* _box_attach(): attach a box to the free list. */ void -_box_attach(u3_cs_box* box_u) +_box_attach(u3_ca_box* box_u) { - c3_assert(box_u->siz_w >= (1 + c3_wiseof(u3_cs_fbox))); - c3_assert(0 != u3of(u3_cs_fbox, box_u)); + c3_assert(box_u->siz_w >= (1 + c3_wiseof(u3_ca_fbox))); + c3_assert(0 != u3of(u3_ca_fbox, box_u)); #if 0 // For debugging, fill the box with beef. @@ -66,7 +66,7 @@ _box_attach(u3_cs_box* box_u) c3_w* box_w = (void *)box_u; c3_w i_w; - for ( i_w = c3_wiseof(u3_cs_box); (i_w + 1) < box_u->siz_w; i_w++ ) { + for ( i_w = c3_wiseof(u3_ca_box); (i_w + 1) < box_u->siz_w; i_w++ ) { box_w[i_w] = 0xdeadbeef; } } @@ -75,14 +75,14 @@ _box_attach(u3_cs_box* box_u) u3R->all.fre_w += box_u->siz_w; { c3_w sel_w = _box_slot(box_u->siz_w); - u3p(u3_cs_fbox) fre_p = u3of(u3_cs_fbox, box_u); - u3p(u3_cs_fbox)* pfr_p = &u3R->all.fre_p[sel_w]; - u3p(u3_cs_fbox) nex_p = *pfr_p; + u3p(u3_ca_fbox) fre_p = u3of(u3_ca_fbox, box_u); + u3p(u3_ca_fbox)* pfr_p = &u3R->all.fre_p[sel_w]; + u3p(u3_ca_fbox) nex_p = *pfr_p; - u3to(u3_cs_fbox, fre_p)->pre_p = 0; - u3to(u3_cs_fbox, fre_p)->nex_p = nex_p; - if ( u3to(u3_cs_fbox, fre_p)->nex_p ) { - u3to(u3_cs_fbox, u3to(u3_cs_fbox, fre_p)->nex_p)->pre_p = fre_p; + u3to(u3_ca_fbox, fre_p)->pre_p = 0; + u3to(u3_ca_fbox, fre_p)->nex_p = nex_p; + if ( u3to(u3_ca_fbox, fre_p)->nex_p ) { + u3to(u3_ca_fbox, u3to(u3_ca_fbox, fre_p)->nex_p)->pre_p = fre_p; } (*pfr_p) = fre_p; } @@ -91,21 +91,21 @@ _box_attach(u3_cs_box* box_u) /* _box_detach(): detach a box from the free list. */ void -_box_detach(u3_cs_box* box_u) +_box_detach(u3_ca_box* box_u) { - u3p(u3_cs_fbox) fre_p = u3of(u3_cs_fbox, box_u); - u3p(u3_cs_fbox) pre_p = u3to(u3_cs_fbox, fre_p)->pre_p; - u3p(u3_cs_fbox) nex_p = u3to(u3_cs_fbox, fre_p)->nex_p; + u3p(u3_ca_fbox) fre_p = u3of(u3_ca_fbox, box_u); + u3p(u3_ca_fbox) pre_p = u3to(u3_ca_fbox, fre_p)->pre_p; + u3p(u3_ca_fbox) nex_p = u3to(u3_ca_fbox, fre_p)->nex_p; u3R->all.fre_w -= box_u->siz_w; if ( nex_p ) { - c3_assert(u3to(u3_cs_fbox, nex_p)->pre_p == fre_p); - u3to(u3_cs_fbox, nex_p)->pre_p = pre_p; + c3_assert(u3to(u3_ca_fbox, nex_p)->pre_p == fre_p); + u3to(u3_ca_fbox, nex_p)->pre_p = pre_p; } if ( pre_p ) { - c3_assert(u3to(u3_cs_fbox, pre_p)->nex_p == fre_p); - u3to(u3_cs_fbox, pre_p)->nex_p = nex_p; + c3_assert(u3to(u3_ca_fbox, pre_p)->nex_p == fre_p); + u3to(u3_ca_fbox, pre_p)->nex_p = nex_p; } else { c3_w sel_w = _box_slot(box_u->siz_w); @@ -171,7 +171,7 @@ u3_ca_sane(void) c3_w i_w; for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) { - u3_cs_fbox* fre_u = u3R->all.fre_u[i_w]; + u3_ca_fbox* fre_u = u3R->all.fre_u[i_w]; while ( fre_u ) { if ( fre_u == u3R->all.fre_u[i_w] ) { @@ -206,7 +206,7 @@ _ca_walloc(c3_w len_w) // fprintf(stderr, "walloc %d: *pfr_p %x\n", len_w, u3R->all.fre_p[sel_w]); while ( 1 ) { - u3p(u3_cs_fbox) *pfr_p = &u3R->all.fre_p[sel_w]; + u3p(u3_ca_fbox) *pfr_p = &u3R->all.fre_p[sel_w]; while ( 1 ) { if ( 0 == *pfr_p ) { @@ -221,34 +221,34 @@ _ca_walloc(c3_w len_w) } } else { - if ( siz_w > u3to(u3_cs_fbox, *pfr_p)->box_u.siz_w ) { + if ( siz_w > u3to(u3_ca_fbox, *pfr_p)->box_u.siz_w ) { /* This free block is too small. Continue searching. */ - pfr_p = &(u3to(u3_cs_fbox, *pfr_p)->nex_p); + pfr_p = &(u3to(u3_ca_fbox, *pfr_p)->nex_p); continue; } else { - u3_cs_box* box_u = &(u3to(u3_cs_fbox, *pfr_p)->box_u); + u3_ca_box* box_u = &(u3to(u3_ca_fbox, *pfr_p)->box_u); /* We have found a free block of adequate size. Remove it ** from the free list. */ { { - c3_assert((0 == u3to(u3_cs_fbox, *pfr_p)->pre_p) || - (u3to(u3_cs_fbox, u3to(u3_cs_fbox, *pfr_p)->pre_p)->nex_p + c3_assert((0 == u3to(u3_ca_fbox, *pfr_p)->pre_p) || + (u3to(u3_ca_fbox, u3to(u3_ca_fbox, *pfr_p)->pre_p)->nex_p == (*pfr_p))); - c3_assert((0 == u3to(u3_cs_fbox, *pfr_p)->nex_p) || - (u3to(u3_cs_fbox, u3to(u3_cs_fbox, *pfr_p)->nex_p)->pre_p + c3_assert((0 == u3to(u3_ca_fbox, *pfr_p)->nex_p) || + (u3to(u3_ca_fbox, u3to(u3_ca_fbox, *pfr_p)->nex_p)->pre_p == (*pfr_p))); } - if ( 0 != u3to(u3_cs_fbox, *pfr_p)->nex_p ) { - u3to(u3_cs_fbox, u3to(u3_cs_fbox, *pfr_p)->nex_p)->pre_p = - u3to(u3_cs_fbox, *pfr_p)->pre_p; + if ( 0 != u3to(u3_ca_fbox, *pfr_p)->nex_p ) { + u3to(u3_ca_fbox, u3to(u3_ca_fbox, *pfr_p)->nex_p)->pre_p = + u3to(u3_ca_fbox, *pfr_p)->pre_p; } - *pfr_p = u3to(u3_cs_fbox, *pfr_p)->nex_p; + *pfr_p = u3to(u3_ca_fbox, *pfr_p)->nex_p; } /* If we can chop off another block, do it. @@ -289,12 +289,12 @@ u3_ca_walloc(c3_w len_w) #if 0 if ( (703 == u3_Code) && - u3_ca_botox(ptr_v) == (u3_cs_box*)(void *)0x200dfe3e4 ) { + u3_ca_botox(ptr_v) == (u3_ca_box*)(void *)0x200dfe3e4 ) { static int xuc_i; printf("xuc_i %d\r\n", xuc_i); if ( 1 == xuc_i ) { - u3_cs_box* box_u = u3_ca_botox(ptr_v); + u3_ca_box* box_u = u3_ca_botox(ptr_v); box_u->cod_w = 999; FOO = 1; @@ -323,7 +323,7 @@ u3_ca_wealloc(void* lag_v, c3_w len_w) return u3_ca_malloc(len_w); } else { - u3_cs_box* box_u = u3_ca_botox(lag_v); + u3_ca_box* box_u = u3_ca_botox(lag_v); c3_w* old_w = lag_v; c3_w tiz_w = c3_min(box_u->siz_w, len_w); { @@ -352,7 +352,7 @@ u3_ca_realloc(void* lag_v, c3_w len_w) void u3_ca_free(void* tox_v) { - u3_cs_box* box_u = u3_ca_botox(tox_v); + u3_ca_box* box_u = u3_ca_botox(tox_v); c3_w* box_w = (c3_w *)(void *)box_u; c3_assert(box_u->use_w != 0); @@ -365,7 +365,7 @@ u3_ca_free(void* tox_v) { c3_w i_w; - for ( i_w = c3_wiseof(u3_cs_box); (i_w + 1) < box_u->siz_w; i_w++ ) { + for ( i_w = c3_wiseof(u3_ca_box); (i_w + 1) < box_u->siz_w; i_w++ ) { box_w[i_w] = 0xdeadbeef; } } @@ -376,7 +376,7 @@ u3_ca_free(void* tox_v) */ if ( box_w != u3_ca_into(u3R->rut_p) ) { c3_w laz_w = *(box_w - 1); - u3_cs_box* pox_u = (u3_cs_box*)(void *)(box_w - laz_w); + u3_ca_box* pox_u = (u3_ca_box*)(void *)(box_w - laz_w); if ( 0 == pox_u->use_w ) { _box_detach(pox_u); @@ -393,7 +393,7 @@ u3_ca_free(void* tox_v) u3R->hat_p = u3_ca_outa(box_w); } else { - u3_cs_box* nox_u = (u3_cs_box*)(void *)(box_w + box_u->siz_w); + u3_ca_box* nox_u = (u3_ca_box*)(void *)(box_w + box_u->siz_w); if ( 0 == nox_u->use_w ) { _box_detach(nox_u); @@ -406,7 +406,7 @@ u3_ca_free(void* tox_v) /* Try to coalesce with the block above. */ if ( (box_w + box_u->siz_w) != u3_ca_into(u3R->rut_p) ) { - u3_cs_box* nox_u = (u3_cs_box*)(void *)(box_w + box_u->siz_w); + u3_ca_box* nox_u = (u3_ca_box*)(void *)(box_w + box_u->siz_w); if ( 0 == nox_u->use_w ) { _box_detach(nox_u); @@ -421,7 +421,7 @@ u3_ca_free(void* tox_v) } else { c3_w laz_w = *(box_w - 1); - u3_cs_box* pox_u = (u3_cs_box*)(void *)(box_w - laz_w); + u3_ca_box* pox_u = (u3_ca_box*)(void *)(box_w - laz_w); if ( 0 == pox_u->use_w ) { _box_detach(pox_u); @@ -451,13 +451,13 @@ _me_wash_north(u3_noun dog) c3_assert(c3y == u3_ca_is_dog(dog)); // c3_assert(c3y == u3_ca_north_is_junior(u3R, dog)); { - u3_cs_noun* dog_u = u3_ca_to_ptr(dog); + u3_ca_noun* dog_u = u3_ca_to_ptr(dog); if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } if ( _(u3_ca_is_pom(dog)) ) { - u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u; + u3_ca_cell* god_u = (u3_ca_cell *)(void *)dog_u; _me_wash_north_in(god_u->hed); _me_wash_north_in(god_u->tel); @@ -482,13 +482,13 @@ _me_wash_south(u3_noun dog) c3_assert(c3y == u3_ca_is_dog(dog)); // c3_assert(c3y == u3_ca_south_is_junior(u3R, dog)); { - u3_cs_noun* dog_u = u3_ca_to_ptr(dog); + u3_ca_noun* dog_u = u3_ca_to_ptr(dog); if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } if ( _(u3_ca_is_pom(dog)) ) { - u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u; + u3_ca_cell* god_u = (u3_ca_cell *)(void *)dog_u; _me_wash_south_in(god_u->hed); _me_wash_south_in(god_u->tel); @@ -525,7 +525,7 @@ static void _me_gain_use(u3_noun dog) { c3_w* dog_w = u3_ca_to_ptr(dog); - u3_cs_box* box_u = u3_ca_botox(dog_w); + u3_ca_box* box_u = u3_ca_botox(dog_w); if ( 0x7fffffff == box_u->use_w ) { u3_cm_bail(c3__fail); @@ -565,7 +565,7 @@ _me_gain_use(u3_noun dog) static c3_w bug_w = 0; if ( FOO && u3_ca_botox(u3_ca_to_ptr(dog)) == (void *)0x200dfe3e4 ) { - u3_cs_box* box_u = u3_ca_botox(u3_ca_to_ptr(dog)); + u3_ca_box* box_u = u3_ca_botox(u3_ca_to_ptr(dog)); printf("GAIN %d %d\r\n", bug_w, box_u->use_w); if ( bug_w == 8 ) { abort(); } @@ -617,7 +617,7 @@ _me_copy_north(u3_noun dog) return dog; } else { - u3_cs_noun* dog_u = u3_ca_to_ptr(dog); + u3_ca_noun* dog_u = u3_ca_to_ptr(dog); /* Borrow mug slot to record new destination. */ @@ -631,10 +631,10 @@ _me_copy_north(u3_noun dog) } else { if ( c3y == u3_ca_is_pom(dog) ) { - u3_cs_cell* old_u = u3_ca_to_ptr(dog); - c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); + u3_ca_cell* old_u = u3_ca_to_ptr(dog); + c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_ca_cell)); u3_noun new = u3_ca_de_twin(dog, new_w); - u3_cs_cell* new_u = (u3_cs_cell*)(void *)new_w; + u3_ca_cell* new_u = (u3_ca_cell*)(void *)new_w; new_u->mug_w = old_u->mug_w; new_u->hed = _me_copy_north_in(old_u->hed); @@ -646,10 +646,10 @@ _me_copy_north(u3_noun dog) return new; } else { - u3_cs_atom* old_u = u3_ca_to_ptr(dog); - c3_w* new_w = u3_ca_walloc(old_u->len_w + c3_wiseof(u3_cs_atom)); + u3_ca_atom* old_u = u3_ca_to_ptr(dog); + c3_w* new_w = u3_ca_walloc(old_u->len_w + c3_wiseof(u3_ca_atom)); u3_noun new = u3_ca_de_twin(dog, new_w); - u3_cs_atom* new_u = (u3_cs_atom*)(void *)new_w; + u3_ca_atom* new_u = (u3_ca_atom*)(void *)new_w; new_u->mug_w = old_u->mug_w; new_u->len_w = old_u->len_w; @@ -709,7 +709,7 @@ _me_copy_south(u3_noun dog) return dog; } else { - u3_cs_noun* dog_u = u3_ca_to_ptr(dog); + u3_ca_noun* dog_u = u3_ca_to_ptr(dog); /* Borrow mug slot to record new destination. */ @@ -725,10 +725,10 @@ _me_copy_south(u3_noun dog) } else { if ( c3y == u3_ca_is_pom(dog) ) { - u3_cs_cell* old_u = u3_ca_to_ptr(dog); - c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); + u3_ca_cell* old_u = u3_ca_to_ptr(dog); + c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_ca_cell)); u3_noun new = u3_ca_de_twin(dog, new_w); - u3_cs_cell* new_u = (u3_cs_cell*)(void *)new_w; + u3_ca_cell* new_u = (u3_ca_cell*)(void *)new_w; // printf("south: cell %p to %p\r\n", old_u, new_u); @@ -743,10 +743,10 @@ _me_copy_south(u3_noun dog) return new; } else { - u3_cs_atom* old_u = u3_ca_to_ptr(dog); - c3_w* new_w = u3_ca_walloc(old_u->len_w + c3_wiseof(u3_cs_atom)); + u3_ca_atom* old_u = u3_ca_to_ptr(dog); + c3_w* new_w = u3_ca_walloc(old_u->len_w + c3_wiseof(u3_ca_atom)); u3_noun new = u3_ca_de_twin(dog, new_w); - u3_cs_atom* new_u = (u3_cs_atom*)(void *)new_w; + u3_ca_atom* new_u = (u3_ca_atom*)(void *)new_w; // printf("south: atom %p to %p\r\n", old_u, new_u); @@ -850,7 +850,7 @@ u3_ca_left(u3_noun som) return c3y; } else { - u3_cs_noun* dog_u = u3_ca_to_ptr(som); + u3_ca_noun* dog_u = u3_ca_to_ptr(som); return __(0 != (dog_u->mug_w >> 31)); } @@ -908,7 +908,7 @@ _me_lose_north(u3_noun dog) top: if ( c3y == u3_ca_north_is_normal(u3R, dog) ) { c3_w* dog_w = u3_ca_to_ptr(dog); - u3_cs_box* box_u = u3_ca_botox(dog_w); + u3_ca_box* box_u = u3_ca_botox(dog_w); if ( box_u->use_w > 1 ) { box_u->use_w -= 1; @@ -919,7 +919,7 @@ top: } else { if ( _(u3_ca_is_pom(dog)) ) { - u3_cs_cell* dog_u = (void *)dog_w; + u3_ca_cell* dog_u = (void *)dog_w; u3_noun h_dog = dog_u->hed; u3_noun t_dog = dog_u->tel; @@ -948,7 +948,7 @@ _me_lose_south(u3_noun dog) top: if ( c3y == u3_ca_south_is_normal(u3R, dog) ) { c3_w* dog_w = u3_ca_to_ptr(dog); - u3_cs_box* box_u = u3_ca_botox(dog_w); + u3_ca_box* box_u = u3_ca_botox(dog_w); if ( box_u->use_w > 1 ) { box_u->use_w -= 1; @@ -959,7 +959,7 @@ top: } else { if ( _(u3_ca_is_pom(dog)) ) { - u3_cs_cell* dog_u = (void *)dog_w; + u3_ca_cell* dog_u = (void *)dog_w; u3_noun h_dog = dog_u->hed; u3_noun t_dog = dog_u->tel; @@ -1021,7 +1021,7 @@ u3_ca_use(u3_noun som) } else { c3_w* dog_w = u3_ca_to_ptr(som); - u3_cs_box* box_u = u3_ca_botox(dog_w); + u3_ca_box* box_u = u3_ca_botox(dog_w); return box_u->use_w; } @@ -1047,7 +1047,7 @@ u3_ca_mark_ptr(void* ptr_v) } } { - u3_cs_box* box_u = u3_ca_botox(ptr_v); + u3_ca_box* box_u = u3_ca_botox(ptr_v); c3_w siz_w; #ifdef U3_MEMORY_DEBUG @@ -1160,10 +1160,10 @@ u3_ca_sweep(c3_c* cap_c) : (u3R->rut_p - u3R->hat_p); for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) { - u3p(u3_cs_fbox) fre_p = u3R->all.fre_p[i_w]; + u3p(u3_ca_fbox) fre_p = u3R->all.fre_p[i_w]; while ( fre_p ) { - u3_cs_fbox* fre_u = u3to(u3_cs_fbox, fre_p); + u3_ca_fbox* fre_u = u3to(u3_ca_fbox, fre_p); fre_w += fre_u->box_u.siz_w; fre_p = fre_u->nex_p; @@ -1182,7 +1182,7 @@ u3_ca_sweep(c3_c* cap_c) c3_w* end_w = u3_ca_into(end_p); while ( box_w < end_w ) { - u3_cs_box* box_u = (void *)box_w; + u3_ca_box* box_u = (void *)box_w; #ifdef U3_MEMORY_DEBUG if ( box_u->use_w != box_u->eus_w ) { @@ -1193,7 +1193,7 @@ u3_ca_sweep(c3_c* cap_c) else { printf("weak %p %x (%d, %d)\r\n", box_u, - ((u3_cs_noun *)(u3_ca_boxto(box_w)))->mug_w, + ((u3_ca_noun *)(u3_ca_boxto(box_w)))->mug_w, box_u->use_w, box_u->eus_w); // u3_cm_p("weak", u3_ca_to_pom(u3_ca_outa(u3_ca_boxto(box_w)))); } @@ -1202,8 +1202,8 @@ u3_ca_sweep(c3_c* cap_c) else { printf("leak %p %x (%d)\r\n", box_u, - ((u3_cs_noun *)(u3_ca_boxto(box_w)))->mug_w - ? ((u3_cs_noun *)(u3_ca_boxto(box_w)))->mug_w + ((u3_ca_noun *)(u3_ca_boxto(box_w)))->mug_w + ? ((u3_ca_noun *)(u3_ca_boxto(box_w)))->mug_w : u3_cr_mug(u3_ca_to_pom(u3_ca_outa(u3_ca_boxto(box_w)))), box_u->use_w); // u3_cm_p("leak", u3_ca_to_pom(u3_ca_outa(u3_ca_boxto(box_w)))); @@ -1262,8 +1262,8 @@ u3_ca_sweep(c3_c* cap_c) c3_w* u3_ca_slab(c3_w len_w) { - c3_w* nov_w = u3_ca_walloc(len_w + c3_wiseof(u3_cs_atom)); - u3_cs_atom* pug_u = (void *)nov_w; + c3_w* nov_w = u3_ca_walloc(len_w + c3_wiseof(u3_ca_atom)); + u3_ca_atom* pug_u = (void *)nov_w; pug_u->mug_w = 0; pug_u->len_w = len_w; @@ -1293,8 +1293,8 @@ u3_ca_slaq(c3_g met_g, c3_w len_w) u3_noun u3_ca_malt(c3_w* sal_w) { - c3_w* nov_w = (sal_w - c3_wiseof(u3_cs_atom)); - u3_cs_atom* nov_u = (void *)nov_w; + c3_w* nov_w = (sal_w - c3_wiseof(u3_ca_atom)); + u3_ca_atom* nov_u = (void *)nov_w; c3_w len_w; for ( len_w = nov_u->len_w; len_w; len_w-- ) { @@ -1310,8 +1310,8 @@ u3_ca_malt(c3_w* sal_w) u3_noun u3_ca_moot(c3_w* sal_w) { - c3_w* nov_w = (sal_w - c3_wiseof(u3_cs_atom)); - u3_cs_atom* nov_u = (void*)nov_w; + c3_w* nov_w = (sal_w - c3_wiseof(u3_ca_atom)); + u3_ca_atom* nov_u = (void*)nov_w; c3_w len_w = nov_u->len_w; c3_w las_w = nov_u->buf_w[len_w - 1]; @@ -1379,8 +1379,8 @@ u3_ca_detect(u3_noun fum, u3_noun som) u3_noun u3_ca_mint(c3_w* sal_w, c3_w len_w) { - c3_w* nov_w = (sal_w - c3_wiseof(u3_cs_atom)); - u3_cs_atom* nov_u = (void*)nov_w; + c3_w* nov_w = (sal_w - c3_wiseof(u3_ca_atom)); + u3_ca_atom* nov_u = (void*)nov_w; /* See if we can free the slab entirely. */ @@ -1407,7 +1407,7 @@ u3_ca_mint(c3_w* sal_w, c3_w len_w) if ( dif_w >= u3_cc_minimum ) { c3_w* box_w = (void *)u3_ca_botox(nov_w); - c3_w* end_w = (nov_w + c3_wiseof(u3_cs_atom) + len_w + 1); + c3_w* end_w = (nov_w + c3_wiseof(u3_ca_atom) + len_w + 1); c3_w asz_w = (end_w - box_w); c3_w bsz_w = box_w[0] - asz_w; diff --git a/g/e.c b/g/e.c index 2e054046eb..18bdbc6493 100644 --- a/g/e.c +++ b/g/e.c @@ -17,7 +17,7 @@ struct { c3_w nor_w; c3_w sou_w; - c3_w mug_w[u3_cc_pages]; + c3_w mug_w[u3_ca_pages]; } u3K; /* _ce_check_page(): checksum page. @@ -25,8 +25,8 @@ struct { static c3_w _ce_check_page(c3_w pag_w) { - c3_w* mem_w = u3_Loom + (pag_w << u3_cc_page); - c3_w mug_w = u3_cr_mug_words(mem_w, (1 << u3_cc_page)); + c3_w* mem_w = u3_Loom + (pag_w << u3_ca_page); + c3_w mug_w = u3_cr_mug_words(mem_w, (1 << u3_ca_page)); return mug_w; } @@ -44,8 +44,8 @@ u3_ce_check(c3_c* cap_c) u3_cm_water(&nwr_w, &swu_w); - nor_w = (nwr_w + ((1 << u3_cc_page) - 1)) >> u3_cc_page; - sou_w = (swu_w + ((1 << u3_cc_page) - 1)) >> u3_cc_page; + nor_w = (nwr_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; + sou_w = (swu_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; } /* Count dirty pages. @@ -62,9 +62,9 @@ u3_ce_check(c3_c* cap_c) sum_w += mug_w; } for ( i_w = 0; i_w < sou_w; i_w++ ) { - mug_w = _ce_check_page((u3_cc_pages - (i_w + 1))); + mug_w = _ce_check_page((u3_ca_pages - (i_w + 1))); if ( strcmp(cap_c, "boot") ) { - c3_assert(mug_w == u3K.mug_w[(u3_cc_pages - (i_w + 1))]); + c3_assert(mug_w == u3K.mug_w[(u3_ca_pages - (i_w + 1))]); } sum_w += mug_w; } @@ -80,14 +80,14 @@ u3_ce_fault(void* adr_v, c3_i ser_i) { c3_w* adr_w = (c3_w*) adr_v; - if ( (adr_w < u3_Loom) || (adr_w > (u3_Loom + u3_cc_words)) ) { + if ( (adr_w < u3_Loom) || (adr_w > (u3_Loom + u3_ca_words)) ) { fprintf(stderr, "address %p out of loom!\r\n", adr_v); c3_assert(0); return 0; } else { c3_w off_w = (adr_w - u3_Loom); - c3_w pag_w = off_w >> u3_cc_page; + c3_w pag_w = off_w >> u3_ca_page; c3_w blk_w = (pag_w >> 5); c3_w bit_w = (pag_w & 31); @@ -95,8 +95,8 @@ u3_ce_fault(void* adr_v, c3_i ser_i) c3_assert(0 == (u3P.dit_w[blk_w] & (1 << bit_w))); u3P.dit_w[blk_w] |= (1 << bit_w); - if ( -1 == mprotect((void *)(u3_Loom + (pag_w << u3_cc_page)), - (1 << (u3_cc_page + 2)), + if ( -1 == mprotect((void *)(u3_Loom + (pag_w << u3_ca_page)), + (1 << (u3_ca_page + 2)), (PROT_READ | PROT_WRITE)) ) { perror("mprotect"); @@ -110,7 +110,7 @@ u3_ce_fault(void* adr_v, c3_i ser_i) /* _ce_image_open(): open or create image. */ static c3_o -_ce_image_open(u3_cs_image* img_u, c3_o nuu_o) +_ce_image_open(u3_ce_image* img_u, c3_o nuu_o) { c3_i mod_i = _(nuu_o) ? (O_RDWR | O_CREAT) : O_RDWR; c3_c ful_c[8193]; @@ -139,8 +139,8 @@ _ce_image_open(u3_cs_image* img_u, c3_o nuu_o) } else { c3_d siz_d = buf_u.st_size; - c3_d pgs_d = (siz_d + (c3_d)((1 << (u3_cc_page + 2)) - 1)) >> - (c3_d)(u3_cc_page + 2); + c3_d pgs_d = (siz_d + (c3_d)((1 << (u3_ca_page + 2)) - 1)) >> + (c3_d)(u3_ca_page + 2); if ( c3y == nuu_o ) { if ( siz_d ) { @@ -150,7 +150,7 @@ _ce_image_open(u3_cs_image* img_u, c3_o nuu_o) return c3y; } else { - if ( siz_d != (pgs_d << (c3_d)(u3_cc_page + 2)) ) { + if ( siz_d != (pgs_d << (c3_d)(u3_ca_page + 2)) ) { fprintf(stderr, "%s: corrupt size %llx\r\n", ful_c, siz_d); return c3n; } @@ -168,8 +168,8 @@ _ce_image_open(u3_cs_image* img_u, c3_o nuu_o) static void _ce_patch_write_control(u3_cs_patch* pat_u) { - c3_w len_w = sizeof(u3_cs_control) + - (pat_u->con_u->pgs_w * sizeof(u3_cs_line)); + c3_w len_w = sizeof(u3_ce_control) + + (pat_u->con_u->pgs_w * sizeof(u3_ce_line)); if ( len_w != write(pat_u->ctl_i, pat_u->con_u, len_w) ) { c3_assert(0); @@ -196,8 +196,8 @@ _ce_patch_read_control(u3_cs_patch* pat_u) pat_u->con_u = malloc(len_w); if ( (len_w != read(pat_u->ctl_i, pat_u->con_u, len_w)) || - (len_w != sizeof(u3_cs_control) + - (pat_u->con_u->pgs_w * sizeof(u3_cs_line))) ) + (len_w != sizeof(u3_ce_control) + + (pat_u->con_u->pgs_w * sizeof(u3_ce_line))) ) { free(pat_u->con_u); pat_u->con_u = 0; @@ -254,20 +254,20 @@ _ce_patch_verify(u3_cs_patch* pat_u) for ( i_w = 0; i_w < pat_u->con_u->pgs_w; i_w++ ) { c3_w pag_w = pat_u->con_u->mem_u[i_w].pag_w; c3_w mug_w = pat_u->con_u->mem_u[i_w].mug_w; - c3_w mem_w[1 << u3_cc_page]; + c3_w mem_w[1 << u3_ca_page]; - if ( -1 == lseek(pat_u->mem_i, (i_w << (u3_cc_page + 2)), SEEK_SET) ) { + if ( -1 == lseek(pat_u->mem_i, (i_w << (u3_ca_page + 2)), SEEK_SET) ) { perror("seek"); c3_assert(0); return c3n; } - if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3_cc_page + 2))) ) { + if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3_ca_page + 2))) ) { perror("read"); c3_assert(0); return c3n; } { - c3_w nug_w = u3_cr_mug_words(mem_w, (1 << u3_cc_page)); + c3_w nug_w = u3_cr_mug_words(mem_w, (1 << u3_ca_page)); if ( mug_w != nug_w ) { printf("_ce_patch_verify: mug mismatch %d/%d; (%x, %x)\r\n", @@ -351,11 +351,11 @@ _ce_patch_write_page(u3_cs_patch* pat_u, c3_w pgc_w, c3_w* mem_w) { - if ( -1 == lseek(pat_u->mem_i, (pgc_w << (u3_cc_page + 2)), SEEK_SET) ) { + if ( -1 == lseek(pat_u->mem_i, (pgc_w << (u3_ca_page + 2)), SEEK_SET) ) { c3_assert(0); } - if ( (1 << (u3_cc_page + 2)) != - write(pat_u->mem_i, mem_w, (1 << (u3_cc_page + 2))) ) + if ( (1 << (u3_ca_page + 2)) != + write(pat_u->mem_i, mem_w, (1 << (u3_ca_page + 2))) ) { c3_assert(0); } @@ -387,21 +387,21 @@ _ce_patch_save_page(u3_cs_patch* pat_u, c3_w bit_w = (pag_w & 31); if ( u3P.dit_w[blk_w] & (1 << bit_w) ) { - c3_w* mem_w = u3_Loom + (pag_w << u3_cc_page); + c3_w* mem_w = u3_Loom + (pag_w << u3_ca_page); pat_u->con_u->mem_u[pgc_w].pag_w = pag_w; pat_u->con_u->mem_u[pgc_w].mug_w = u3_cr_mug_words(mem_w, - (1 << u3_cc_page)); + (1 << u3_ca_page)); #if 0 u3K.mug_w[pag_w] = pat_u->con_u->mem_u[pgc_w].mug_w; printf("save: page %d, mug %x\r\n", - pag_w, u3_cr_mug_words(mem_w, (1 << u3_cc_page))); + pag_w, u3_cr_mug_words(mem_w, (1 << u3_ca_page))); #endif _ce_patch_write_page(pat_u, pgc_w, mem_w); - if ( -1 == mprotect(u3_Loom + (pag_w << u3_cc_page), - (1 << (u3_cc_page + 2)), + if ( -1 == mprotect(u3_Loom + (pag_w << u3_ca_page), + (1 << (u3_ca_page + 2)), PROT_READ) ) { c3_assert(0); @@ -422,8 +422,8 @@ _ce_patch_junk_page(u3_cs_patch* pat_u, c3_w blk_w = (pag_w >> 5); c3_w bit_w = (pag_w & 31); - if ( -1 == mprotect(u3_Loom + (pag_w << u3_cc_page), - (1 << (u3_cc_page + 2)), + if ( -1 == mprotect(u3_Loom + (pag_w << u3_ca_page), + (1 << (u3_ca_page + 2)), PROT_READ) ) { c3_assert(0); @@ -447,8 +447,8 @@ u3_ce_dirty(void) u3_cm_water(&nwr_w, &swu_w); - nor_w = (nwr_w + ((1 << u3_cc_page) - 1)) >> u3_cc_page; - sou_w = (swu_w + ((1 << u3_cc_page) - 1)) >> u3_cc_page; + nor_w = (nwr_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; + sou_w = (swu_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; } // u3K.nor_w = nor_w; // u3K.sou_w = sou_w; @@ -462,7 +462,7 @@ u3_ce_dirty(void) pgs_w = _ce_patch_count_page(i_w, pgs_w); } for ( i_w = 0; i_w < sou_w; i_w++ ) { - pgs_w = _ce_patch_count_page((u3_cc_pages - (i_w + 1)), pgs_w); + pgs_w = _ce_patch_count_page((u3_ca_pages - (i_w + 1)), pgs_w); } } return pgs_w; @@ -484,8 +484,8 @@ _ce_patch_compose(void) u3_cm_water(&nwr_w, &swu_w); - nor_w = (nwr_w + ((1 << u3_cc_page) - 1)) >> u3_cc_page; - sou_w = (swu_w + ((1 << u3_cc_page) - 1)) >> u3_cc_page; + nor_w = (nwr_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; + sou_w = (swu_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; } // u3K.nor_w = nor_w; // u3K.sou_w = sou_w; @@ -499,7 +499,7 @@ _ce_patch_compose(void) pgs_w = _ce_patch_count_page(i_w, pgs_w); } for ( i_w = 0; i_w < sou_w; i_w++ ) { - pgs_w = _ce_patch_count_page((u3_cc_pages - (i_w + 1)), pgs_w); + pgs_w = _ce_patch_count_page((u3_ca_pages - (i_w + 1)), pgs_w); } } @@ -512,16 +512,16 @@ _ce_patch_compose(void) c3_w i_w, pgc_w; _ce_patch_create(pat_u); - pat_u->con_u = malloc(sizeof(u3_cs_control) + (pgs_w * sizeof(u3_cs_line))); + pat_u->con_u = malloc(sizeof(u3_ce_control) + (pgs_w * sizeof(u3_ce_line))); pgc_w = 0; for ( i_w = 0; i_w < nor_w; i_w++ ) { pgc_w = _ce_patch_save_page(pat_u, i_w, pgc_w); } for ( i_w = 0; i_w < sou_w; i_w++ ) { - pgc_w = _ce_patch_save_page(pat_u, (u3_cc_pages - (i_w + 1)), pgc_w); + pgc_w = _ce_patch_save_page(pat_u, (u3_ca_pages - (i_w + 1)), pgc_w); } - for ( i_w = nor_w; i_w < (u3_cc_pages - sou_w); i_w++ ) { + for ( i_w = nor_w; i_w < (u3_ca_pages - sou_w); i_w++ ) { _ce_patch_junk_page(pat_u, i_w); } @@ -562,7 +562,7 @@ _ce_patch_sync(u3_cs_patch* pat_u) /* _ce_image_sync(): make sure image is synced to disk. */ static void -_ce_image_sync(u3_cs_image* img_u) +_ce_image_sync(u3_ce_image* img_u) { _ce_sync(img_u->fid_i); } @@ -578,12 +578,12 @@ _ce_patch_apply(u3_cs_patch* pat_u) //printf("image: sou_w %d, new %d\r\n", u3P.sou_u.pgs_w, pat_u->con_u->sou_w); if ( u3P.nor_u.pgs_w > pat_u->con_u->nor_w ) { - ftruncate(u3P.nor_u.fid_i, u3P.nor_u.pgs_w << (u3_cc_page + 2)); + ftruncate(u3P.nor_u.fid_i, u3P.nor_u.pgs_w << (u3_ca_page + 2)); } u3P.nor_u.pgs_w = pat_u->con_u->nor_w; if ( u3P.sou_u.pgs_w > pat_u->con_u->sou_w ) { - ftruncate(u3P.sou_u.fid_i, u3P.sou_u.pgs_w << (u3_cc_page + 2)); + ftruncate(u3P.sou_u.fid_i, u3P.sou_u.pgs_w << (u3_ca_page + 2)); } u3P.sou_u.pgs_w = pat_u->con_u->sou_w; @@ -597,7 +597,7 @@ _ce_patch_apply(u3_cs_patch* pat_u) for ( i_w = 0; i_w < pat_u->con_u->pgs_w; i_w++ ) { c3_w pag_w = pat_u->con_u->mem_u[i_w].pag_w; - c3_w mem_w[1 << u3_cc_page]; + c3_w mem_w[1 << u3_ca_page]; c3_i fid_i; c3_w off_w; @@ -607,25 +607,25 @@ _ce_patch_apply(u3_cs_patch* pat_u) } else { fid_i = u3P.sou_u.fid_i; - off_w = (u3_cc_pages - (pag_w + 1)); + off_w = (u3_ca_pages - (pag_w + 1)); } - if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3_cc_page + 2))) ) { + if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3_ca_page + 2))) ) { perror("apply: read"); c3_assert(0); } else { - if ( -1 == lseek(fid_i, (off_w << (u3_cc_page + 2)), SEEK_SET) ) { + if ( -1 == lseek(fid_i, (off_w << (u3_ca_page + 2)), SEEK_SET) ) { perror("apply: lseek"); c3_assert(0); } - if ( -1 == write(fid_i, mem_w, (1 << (u3_cc_page + 2))) ) { + if ( -1 == write(fid_i, mem_w, (1 << (u3_ca_page + 2))) ) { perror("apply: write"); c3_assert(0); } } #if 0 - printf("apply: %d, %x\n", pag_w, u3_cr_mug_words(mem_w, (1 << u3_cc_page))); + printf("apply: %d, %x\n", pag_w, u3_cr_mug_words(mem_w, (1 << u3_ca_page))); #endif } } @@ -633,7 +633,7 @@ _ce_patch_apply(u3_cs_patch* pat_u) /* _ce_image_blit(): apply image to memory. */ static void -_ce_image_blit(u3_cs_image* img_u, +_ce_image_blit(u3_ce_image* img_u, c3_w* ptr_w, c3_ws stp_ws) { @@ -641,17 +641,17 @@ _ce_image_blit(u3_cs_image* img_u, lseek(img_u->fid_i, 0, SEEK_SET); for ( i_w=0; i_w < img_u->pgs_w; i_w++ ) { - if ( -1 == read(img_u->fid_i, ptr_w, (1 << (u3_cc_page + 2))) ) { + if ( -1 == read(img_u->fid_i, ptr_w, (1 << (u3_ca_page + 2))) ) { perror("read"); c3_assert(0); } #if 0 { c3_w off_w = (ptr_w - u3_Loom); - c3_w pag_w = (off_w >> u3_cc_page); + c3_w pag_w = (off_w >> u3_ca_page); printf("blit: page %d, mug %x\r\n", pag_w, - u3_cr_mug_words(ptr_w, (1 << u3_cc_page))); + u3_cr_mug_words(ptr_w, (1 << u3_ca_page))); } #endif ptr_w += stp_ws; @@ -662,26 +662,26 @@ _ce_image_blit(u3_cs_image* img_u, /* _ce_image_fine(): compare image to memory. */ static void -_ce_image_fine(u3_cs_image* img_u, +_ce_image_fine(u3_ce_image* img_u, c3_w* ptr_w, c3_ws stp_ws) { c3_w i_w; - c3_w buf_w[1 << u3_cc_page]; + c3_w buf_w[1 << u3_ca_page]; lseek(img_u->fid_i, 0, SEEK_SET); for ( i_w=0; i_w < img_u->pgs_w; i_w++ ) { c3_w mem_w, fil_w; - if ( -1 == read(img_u->fid_i, buf_w, (1 << (u3_cc_page + 2))) ) { + if ( -1 == read(img_u->fid_i, buf_w, (1 << (u3_ca_page + 2))) ) { perror("read"); c3_assert(0); } - mem_w = u3_cr_mug_words(ptr_w, (1 << u3_cc_page)); - fil_w = u3_cr_mug_words(buf_w, (1 << u3_cc_page)); + mem_w = u3_cr_mug_words(ptr_w, (1 << u3_ca_page)); + fil_w = u3_cr_mug_words(buf_w, (1 << u3_ca_page)); if ( mem_w != fil_w ) { - c3_w pag_w = (ptr_w - u3_Loom) >> u3_cc_page; + c3_w pag_w = (ptr_w - u3_Loom) >> u3_ca_page; fprintf(stderr, "mismatch: page %d, mem_w %x, fil_w %x, K %x\r\n", pag_w, @@ -731,11 +731,11 @@ u3_ce_save(void) { _ce_image_fine(&u3P.nor_u, u3_Loom, - (1 << u3_cc_page)); + (1 << u3_ca_page)); _ce_image_fine(&u3P.sou_u, - (u3_Loom + (1 << u3_cc_bits) - (1 << u3_cc_page)), - -(1 << u3_cc_page)); + (u3_Loom + (1 << u3_ca_bits) - (1 << u3_ca_page)), + -(1 << u3_ca_page)); c3_assert(u3P.nor_u.pgs_w == u3K.nor_w); c3_assert(u3P.sou_u.pgs_w == u3K.sou_w); @@ -832,7 +832,7 @@ u3_ce_init(c3_o chk_o) /* Map at fixed address. */ { - c3_w len_w = u3_cc_bytes; + c3_w len_w = u3_ca_bytes; void* map_v; map_v = mmap((void *)u3_Loom, @@ -943,13 +943,13 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) { _ce_image_blit(&u3P.nor_u, u3_Loom, - (1 << u3_cc_page)); + (1 << u3_ca_page)); _ce_image_blit(&u3P.sou_u, - (u3_Loom + (1 << u3_cc_bits) - (1 << u3_cc_page)), - -(1 << u3_cc_page)); + (u3_Loom + (1 << u3_ca_bits) - (1 << u3_ca_page)), + -(1 << u3_ca_page)); - if ( 0 != mprotect((void *)u3_Loom, u3_cc_bytes, PROT_READ) ) { + if ( 0 != mprotect((void *)u3_Loom, u3_ca_bytes, PROT_READ) ) { perror("protect"); c3_assert(0); } diff --git a/g/i.c b/g/i.c index 6aa87cfac9..ecaf2eafdd 100644 --- a/g/i.c +++ b/g/i.c @@ -30,8 +30,8 @@ u3_ci_words(c3_w a_w, /* Allocate, fill, return. */ { - c3_w* nov_w = u3_ca_walloc(a_w + c3_wiseof(u3_cs_atom)); - u3_cs_atom* nov_u = (void*)nov_w; + c3_w* nov_w = u3_ca_walloc(a_w + c3_wiseof(u3_ca_atom)); + u3_ca_atom* nov_u = (void*)nov_w; nov_u->mug_w = 0; nov_u->len_w = a_w; @@ -108,8 +108,8 @@ u3_ci_bytes(c3_w a_w, */ { c3_w len_w = (a_w + 3) >> 2; - c3_w* nov_w = u3_ca_walloc((len_w + c3_wiseof(u3_cs_atom))); - u3_cs_atom* nov_u = (void*)nov_w; + c3_w* nov_w = u3_ca_walloc((len_w + c3_wiseof(u3_ca_atom))); + u3_ca_atom* nov_u = (void*)nov_w; nov_u->mug_w = 0; nov_u->len_w = len_w; @@ -206,8 +206,8 @@ u3_ci_cell(u3_noun a, u3_noun b) c3_assert(!_(u3_ca_is_junior(u3R, b))); { - c3_w* nov_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); - u3_cs_cell* nov_u = (void *)nov_w; + c3_w* nov_w = u3_ca_walloc(c3_wiseof(u3_ca_cell)); + u3_ca_cell* nov_u = (void *)nov_w; u3_noun pro; nov_u->mug_w = 0; diff --git a/g/j.c b/g/j.c index b0e5001242..78c87c82f0 100644 --- a/g/j.c +++ b/g/j.c @@ -7,14 +7,14 @@ /* _cj_count(): count and link dashboard entries. */ static c3_w - _cj_count(u3_cs_core* par_u, u3_cs_core* dev_u) + _cj_count(u3_ce_core* par_u, u3_ce_core* dev_u) { c3_w len_l = 0; c3_w i_w; if ( dev_u ) { for ( i_w = 0; 0 != dev_u[i_w].cos_c; i_w++ ) { - u3_cs_core* kid_u = &dev_u[i_w]; + u3_ce_core* kid_u = &dev_u[i_w]; kid_u->par_u = par_u; len_l += _cj_count(kid_u, kid_u->dev_u); @@ -25,13 +25,13 @@ /* _cj_install(): install dashboard entries. */ static c3_w - _cj_install(u3_cs_core* ray_u, c3_w jax_l, u3_cs_core* dev_u) + _cj_install(u3_ce_core* ray_u, c3_w jax_l, u3_ce_core* dev_u) { c3_w i_w; if ( dev_u ) { for ( i_w = 0; 0 != dev_u[i_w].cos_c; i_w++ ) { - u3_cs_core* kid_u = &dev_u[i_w]; + u3_ce_core* kid_u = &dev_u[i_w]; kid_u->jax_l = jax_l; ray_u[jax_l++] = *kid_u; @@ -313,12 +313,12 @@ static u3_noun _cj_warm_hump(c3_l jax_l, u3_noun huc) { u3_noun hap = u3_nul; - u3_cs_core* cop_u; + u3_ce_core* cop_u; /* Compute axes of all correctly declared arms. */ if ( jax_l && (cop_u = &u3D.ray_u[jax_l])->arm_u ) { - u3_cs_harm* jet_u; + u3_ce_harm* jet_u; c3_l i_l; for ( i_l = 0; (jet_u = &cop_u->arm_u[i_l])->fcs_c; i_l++ ) { @@ -362,8 +362,8 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc) static c3_l _cj_boil_mean(c3_l par_l, u3_noun mop, u3_noun bat) { - u3_cs_core* par_u; - u3_cs_core* dev_u; + u3_ce_core* par_u; + u3_ce_core* dev_u; if ( 0 != par_l ) { par_u = &u3D.ray_u[par_l]; @@ -376,7 +376,7 @@ _cj_boil_mean(c3_l par_l, u3_noun mop, u3_noun bat) { c3_w i_l = 0; - u3_cs_core* cop_u; + u3_ce_core* cop_u; while ( (cop_u = &dev_u[i_l])->cos_c ) { if ( _(u3_cr_sing_c(cop_u->cos_c, u3h(mop))) ) { @@ -596,8 +596,8 @@ u3_cj_boot(void) u3D.len_l =_cj_count(0, u3D.dev_u); u3D.all_l = (2 * u3D.len_l) + 1024; // horrid heuristic - u3D.ray_u = (u3_cs_core*) malloc(u3D.all_l * sizeof(u3_cs_core)); - memset(u3D.ray_u, 0, (u3D.all_l * sizeof(u3_cs_core))); + u3D.ray_u = (u3_ce_core*) malloc(u3D.all_l * sizeof(u3_ce_core)); + memset(u3D.ray_u, 0, (u3D.all_l * sizeof(u3_ce_core))); jax_l = _cj_install(u3D.ray_u, 1, u3D.dev_u); fprintf(stderr, "boot: installed %d jets\n", jax_l); @@ -657,7 +657,7 @@ extern int SLAY; ** `axe` is RETAINED. */ static u3_weak -_cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe) +_cj_kick_z(u3_noun cor, u3_ce_core* cop_u, u3_ce_harm* ham_u, u3_atom axe) { if ( 0 == ham_u->fun_f ) { return u3_none; @@ -732,7 +732,7 @@ _cj_hook_in(u3_noun cor, u3_cx_qual(cax, &jax, &pax, &hap, &huc); { c3_l jax_l = jax; - u3_cs_core* cop_u = &u3D.ray_u[jax_l]; + u3_ce_core* cop_u = &u3D.ray_u[jax_l]; u3_noun fol = u3_ckdb_get(u3k(huc), u3_ci_string(tam_c)); if ( u3_none == fol ) { @@ -827,9 +827,9 @@ u3_cj_kick(u3_noun cor, u3_noun axe) } else { c3_l jax_l = u3h(cax); - u3_cs_core* cop_u = &u3D.ray_u[jax_l]; + u3_ce_core* cop_u = &u3D.ray_u[jax_l]; c3_l inx_l = inx; - u3_cs_harm* ham_u = &cop_u->arm_u[inx_l]; + u3_ce_harm* ham_u = &cop_u->arm_u[inx_l]; u3_noun pro; u3z(cax); diff --git a/g/m.c b/g/m.c index f44beef198..8f1b9cb65c 100644 --- a/g/m.c +++ b/g/m.c @@ -138,7 +138,7 @@ _cm_signal_recover(c3_l sig_l, u3_noun arg) // A top-level crash - rather odd. We should GC. // _cm_emergency("recover: top", sig_l); - u3H->rod_u.how.fag_w |= u3_cs_flag_gc; + u3H->rod_u.how.fag_w |= u3_ca_flag_gc; // Reset the top road - the problem could be a fat cap. // @@ -369,21 +369,21 @@ u3_cm_boot(c3_o nuu_o, c3_o bug_o) { if ( c3y == nuu_o ) { u3H = (void *)_boot_north(u3_Loom + 1, - c3_wiseof(u3_cs_home), - u3_cc_words - 1); + c3_wiseof(u3_cv_home), + u3_ca_words - 1); u3R = &u3H->rod_u; _boot_parts(); } else { u3H = (void *)_find_north(u3_Loom + 1, - c3_wiseof(u3_cs_home), - u3_cc_words - 1); + c3_wiseof(u3_cv_home), + u3_ca_words - 1); u3R = &u3H->rod_u; } if ( _(bug_o) ) { - u3R->how.fag_w |= u3_cs_flag_debug; + u3R->how.fag_w |= u3_ca_flag_debug; } } @@ -409,7 +409,7 @@ u3_cm_dump(void) : u3R->rut_w - u3R->hat_w; for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) { - u3_cs_fbox* fre_u = u3R->all.fre_u[i_w]; + u3_ca_fbox* fre_u = u3R->all.fre_u[i_w]; while ( fre_u ) { fre_w += fre_u->box_u.siz_w; @@ -424,7 +424,7 @@ u3_cm_dump(void) c3_w mem_w = 0; while ( box_w < (_(u3_ca_is_north(u3R)) ? u3R->hat_w : u3R->rut_w) ) { - u3_cs_box* box_u = (void *)box_w; + u3_ca_box* box_u = (void *)box_w; if ( 0 != box_u->use_w ) { #ifdef U3_MEMORY_DEBUG @@ -611,8 +611,8 @@ u3_cm_leap(c3_w pad_w) /* Set up the new road. */ { - if ( u3R->how.fag_w & u3_cs_flag_debug ) { - rod_u->how.fag_w |= u3_cs_flag_debug; + if ( u3R->how.fag_w & u3_ca_flag_debug ) { + rod_u->how.fag_w |= u3_ca_flag_debug; } u3R = rod_u; _boot_parts(); @@ -721,7 +721,7 @@ u3_cm_water(c3_w* low_w, c3_w* hig_w) c3_assert(u3R == &u3H->rod_u); *low_w = (u3H->rod_u.hat_p - u3H->rod_u.rut_p); - *hig_w = (u3H->rod_u.mat_p - u3H->rod_u.cap_p) + c3_wiseof(u3_cs_home); + *hig_w = (u3H->rod_u.mat_p - u3H->rod_u.cap_p) + c3_wiseof(u3_cv_home); } /* u3_cm_soft_top(): top-level safety wrapper. @@ -760,7 +760,7 @@ u3_cm_soft_top(c3_w sec_w, // timer seconds /* Make sure the inner routine did not create garbage. */ - if ( u3R->how.fag_w & u3_cs_flag_debug ) { + if ( u3R->how.fag_w & u3_ca_flag_debug ) { u3_ce_grab("top", pro, u3_none); } @@ -841,7 +841,7 @@ u3_cm_soft_run(u3_noun fly, if ( 0 == (why = u3_cm_trap()) ) { pro = fun_f(aga, agb); - if ( u3R->how.fag_w & u3_cs_flag_debug ) { + if ( u3R->how.fag_w & u3_ca_flag_debug ) { u3_ce_grab("top", pro, u3_none); } diff --git a/g/r.c b/g/r.c index be21f1f8fc..159268e118 100644 --- a/g/r.c +++ b/g/r.c @@ -19,7 +19,7 @@ _frag_word(c3_w a_w, u3_noun b) return u3_none; } else { - u3_cs_cell* b_u = u3_ca_to_ptr(b); + u3_ca_cell* b_u = u3_ca_to_ptr(b); b = *(((u3_noun*)&(b_u->hed)) + (1 & (a_w >> (dep_w - 1)))); dep_w--; @@ -41,7 +41,7 @@ _frag_deep(c3_w a_w, u3_noun b) return u3_none; } else { - u3_cs_cell* b_u = u3_ca_to_ptr(b); + u3_ca_cell* b_u = u3_ca_to_ptr(b); b = *(((u3_noun*)&(b_u->hed)) + (1 & (a_w >> (dep_w - 1)))); dep_w--; @@ -73,7 +73,7 @@ u3_cr_at(u3_atom a, return u3_none; } else { - u3_cs_atom* a_u = u3_ca_to_ptr(a); + u3_ca_atom* a_u = u3_ca_to_ptr(a); c3_w len_w = a_u->len_w; b = _frag_word(a_u->buf_w[len_w - 1], b); @@ -256,7 +256,7 @@ _mug_bytes(c3_w off_w, c3_w nby_w, c3_y* byt_y) static __inline__ c3_w _mug_words_in_buf(c3_w off_w, c3_w nwd_w, u3_noun veb) { - u3_cs_atom* veb_u = u3_ca_to_ptr(veb); + u3_ca_atom* veb_u = u3_ca_to_ptr(veb); if ( 0 == nwd_w ) { return off_w; @@ -389,14 +389,14 @@ u3_cr_mug(u3_noun veb) return _mug_words(2166136261, (veb ? 1 : 0), &x_w); } else { - u3_cs_noun* veb_u = u3_ca_to_ptr(veb); + u3_ca_noun* veb_u = u3_ca_to_ptr(veb); if ( veb_u->mug_w ) { return veb_u->mug_w; } else { if ( _(u3_ca_is_cell(veb)) ) { - u3_cs_cell* veb_u = u3_ca_to_ptr(veb); + u3_ca_cell* veb_u = u3_ca_to_ptr(veb); u3_noun hed = veb_u->hed; u3_noun tel = veb_u->tel; @@ -404,7 +404,7 @@ u3_cr_mug(u3_noun veb) return veb_u->mug_w; } else { - u3_cs_atom* veb_u = u3_ca_to_ptr(veb); + u3_ca_atom* veb_u = u3_ca_to_ptr(veb); c3_w len_w = veb_u->len_w; veb_u->mug_w = _mug_words_buf(2166136261, len_w, veb); @@ -541,7 +541,7 @@ _sung_x(u3_noun a, u3_noun b) } else { if ( _(u3_ca_is_atom(a)) ) { - u3_cs_atom* a_u = u3_ca_to_ptr(a); + u3_ca_atom* a_u = u3_ca_to_ptr(a); if ( !_(u3_ca_is_atom(b)) || _(u3_ca_is_cat(a)) || @@ -550,7 +550,7 @@ _sung_x(u3_noun a, u3_noun b) return c3n; } else { - u3_cs_atom* b_u = u3_ca_to_ptr(b); + u3_ca_atom* b_u = u3_ca_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -583,8 +583,8 @@ _sung_x(u3_noun a, u3_noun b) return c3n; } else { - u3_cs_cell* a_u = u3_ca_to_ptr(a); - u3_cs_cell* b_u = u3_ca_to_ptr(b); + u3_ca_cell* a_u = u3_ca_to_ptr(a); + u3_ca_cell* b_u = u3_ca_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -630,7 +630,7 @@ _sing_x(u3_noun a, } else { if ( _(u3_ca_is_atom(a)) ) { - u3_cs_atom* a_u = u3_ca_to_ptr(a); + u3_ca_atom* a_u = u3_ca_to_ptr(a); if ( !_(u3_ca_is_atom(b)) || _(u3_ca_is_cat(a)) || @@ -639,7 +639,7 @@ _sing_x(u3_noun a, return c3n; } else { - u3_cs_atom* b_u = u3_ca_to_ptr(b); + u3_ca_atom* b_u = u3_ca_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -672,8 +672,8 @@ _sing_x(u3_noun a, return c3n; } else { - u3_cs_cell* a_u = u3_ca_to_ptr(a); - u3_cs_cell* b_u = u3_ca_to_ptr(b); + u3_ca_cell* a_u = u3_ca_to_ptr(a); + u3_ca_cell* b_u = u3_ca_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -849,8 +849,8 @@ u3_cr_nord(u3_noun a, return 2; } else { - u3_cs_atom* a_u = u3_ca_to_ptr(a); - u3_cs_atom* b_u = u3_ca_to_ptr(b); + u3_ca_atom* a_u = u3_ca_to_ptr(a); + u3_ca_atom* b_u = u3_ca_to_ptr(b); c3_w w_rez = a_u->len_w; c3_w w_mox = b_u->len_w; @@ -1161,7 +1161,7 @@ u3_cr_met(c3_y a_y, daz_w = b; } else { - u3_cs_atom* b_u = u3_ca_to_ptr(b); + u3_ca_atom* b_u = u3_ca_to_ptr(b); gal_w = (b_u->len_w) - 1; daz_w = b_u->buf_w[gal_w]; @@ -1216,7 +1216,7 @@ u3_cr_bit(c3_w a_w, else return (1 & (b >> a_w)); } else { - u3_cs_atom* b_u = u3_ca_to_ptr(b); + u3_ca_atom* b_u = u3_ca_to_ptr(b); c3_y vut_y = (a_w & 31); c3_w pix_w = (a_w >> 5); @@ -1249,7 +1249,7 @@ u3_cr_byte(c3_w a_w, else return (255 & (b >> (a_w << 3))); } else { - u3_cs_atom* b_u = u3_ca_to_ptr(b); + u3_ca_atom* b_u = u3_ca_to_ptr(b); c3_y vut_y = (a_w & 3); c3_w pix_w = (a_w >> 2); @@ -1300,7 +1300,7 @@ u3_cr_mp(mpz_t a_mp, mpz_init_set_ui(a_mp, b); } else { - u3_cs_atom* b_u = u3_ca_to_ptr(b); + u3_ca_atom* b_u = u3_ca_to_ptr(b); c3_w len_w = b_u->len_w; /* Slight deficiency in the GMP API. @@ -1340,7 +1340,7 @@ u3_cr_word(c3_w a_w, else return b; } else { - u3_cs_atom* b_u = u3_ca_to_ptr(b); + u3_ca_atom* b_u = u3_ca_to_ptr(b); if ( a_w >= b_u->len_w ) { return 0; @@ -1410,7 +1410,7 @@ u3_cr_chop(c3_g met_g, buf_w = &src; } else { - u3_cs_atom* src_u = u3_ca_to_ptr(src); + u3_ca_atom* src_u = u3_ca_to_ptr(src); len_w = src_u->len_w; buf_w = src_u->buf_w; diff --git a/g/v.c b/g/v.c index a45ebcf6e5..9897478853 100644 --- a/g/v.c +++ b/g/v.c @@ -61,11 +61,11 @@ u3_cv_jack(void) void u3_cv_hose(void) { - u3p(u3_cs_cart) egg_p = u3A->ova.egg_p; + u3p(u3_cv_cart) egg_p = u3A->ova.egg_p; while ( egg_p ) { - u3_cs_cart* egg_u = u3to(u3_cs_cart, egg_p); - u3p(u3_cs_cart) nex_p = egg_u->nex_p; + u3_cv_cart* egg_u = u3to(u3_cv_cart, egg_p); + u3p(u3_cv_cart) nex_p = egg_u->nex_p; u3_ca_lose(egg_u->vir); u3_ca_free(egg_u); @@ -496,10 +496,10 @@ u3_cv_louse(c3_m how_m) /* _cv_mark_ova(): mark ova queue. */ static void -_cv_mark_ova(u3p(u3_cs_cart) egg_p) +_cv_mark_ova(u3p(u3_cv_cart) egg_p) { while ( egg_p ) { - u3_cs_cart* egg_u = u3to(u3_cs_cart, egg_p); + u3_cv_cart* egg_u = u3to(u3_cv_cart, egg_p); u3_ca_mark_ptr(egg_u); u3_ca_mark_noun(egg_u->vir); @@ -513,7 +513,7 @@ _cv_mark_ova(u3p(u3_cs_cart) egg_p) void u3_cv_mark(void) { - u3_cs_arvo* arv_u = &(u3H->arv_u); + u3_cv_arvo* arv_u = &(u3H->arv_u); u3_ca_mark_noun(arv_u->yot); u3_ca_mark_noun(arv_u->now); diff --git a/i/g/a.h b/i/g/a.h index 7c917577d3..d449cf06db 100644 --- a/i/g/a.h +++ b/i/g/a.h @@ -6,15 +6,15 @@ **/ # undef U3_MEMORY_DEBUG # ifdef U3_MEMORY_DEBUG -# define u3_leak_on(x) (u3_Code = x) -# define u3_leak_off (u3_Code = 0) +# define u3_ca_leak_on(x) (u3_Code = x) +# define u3_ca_leak_off (u3_Code = 0) # endif -# define u3_cc_bits U3_OS_LoomBits // 28, max 29 -# define u3_cc_page 12 // 16Kbyte pages -# define u3_cc_pages (1 << (u3_cc_bits - u3_cc_page)) // 2^16 pages -# define u3_cc_words (1 << u3_cc_bits) -# define u3_cc_bytes (c3_w)((1 << (2 + u3_cc_bits))) +# define u3_ca_bits U3_OS_LoomBits // 28, max 29 +# define u3_ca_page 12 // 16Kbyte pages +# define u3_ca_pages (1 << (u3_ca_bits - u3_ca_page)) // 2^16 pages +# define u3_ca_words (1 << u3_ca_bits) +# define u3_ca_bytes (c3_w)((1 << (2 + u3_ca_bits))) /** Data structures. @@ -58,19 +58,19 @@ */ typedef struct { c3_w mug_w; - } u3_cs_noun; + } u3_ca_noun; typedef struct { c3_w mug_w; c3_w len_w; c3_w buf_w[0]; - } u3_cs_atom; + } u3_ca_atom; typedef struct { c3_w mug_w; u3_noun hed; u3_noun tel; - } u3_cs_cell; + } u3_ca_cell; /* Inside a noun. */ @@ -92,15 +92,15 @@ # define u3_ca_h(som) \ ( _(u3_ca_is_cell(som)) \ - ? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->hed )\ + ? ( ((u3_ca_cell *)u3_ca_to_ptr(som))->hed )\ : u3_cm_bail(c3__exit) ) # define u3_ca_t(som) \ ( _(u3_ca_is_cell(som)) \ - ? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->tel )\ + ? ( ((u3_ca_cell *)u3_ca_to_ptr(som))->tel )\ : u3_cm_bail(c3__exit) ) - /* u3_cs_box: classic allocation box. + /* u3_ca_box: classic allocation box. ** ** The box size is also stored at the end of the box in classic ** bad ass malloc style. Hence a box is: @@ -115,32 +115,32 @@ ** ** Do not attempt to adjust this structure! */ - typedef struct _u3_cs_box { + typedef struct _u3_ca_box { c3_w siz_w; // size of this box c3_w use_w; // reference count; free if 0 # ifdef U3_MEMORY_DEBUG c3_w eus_w; // recomputed refcount c3_w cod_w; // tracing code # endif - } u3_cs_box; + } u3_ca_box; -# define u3_ca_boxed(len_w) (len_w + c3_wiseof(u3_cs_box) + 1) +# define u3_ca_boxed(len_w) (len_w + c3_wiseof(u3_ca_box) + 1) # define u3_ca_boxto(box_v) ( (void *) \ ( ((c3_w *)(void*)(box_v)) + \ - c3_wiseof(u3_cs_box) ) ) -# define u3_ca_botox(tox_v) ( (struct _u3_cs_box *) \ + c3_wiseof(u3_ca_box) ) ) +# define u3_ca_botox(tox_v) ( (struct _u3_ca_box *) \ (void *) \ ( ((c3_w *)(void*)(tox_v)) - \ - c3_wiseof(u3_cs_box) ) ) + c3_wiseof(u3_ca_box) ) ) - /* u3_cs_fbox: free node in heap. Sets minimum node size. + /* u3_ca_fbox: free node in heap. Sets minimum node size. ** */ - typedef struct _u3_cs_fbox { - u3_cs_box box_u; - u3p(struct _u3_cs_fbox) pre_p; - u3p(struct _u3_cs_fbox) nex_p; - } u3_cs_fbox; + typedef struct _u3_ca_fbox { + u3_ca_box box_u; + u3p(struct _u3_ca_fbox) pre_p; + u3p(struct _u3_ca_fbox) nex_p; + } u3_ca_fbox; # define u3_cc_minimum 6 # define u3_cc_fbox_no 28 @@ -241,7 +241,7 @@ } how; // struct { // allocation pools - u3p(u3_cs_fbox) fre_p[u3_cc_fbox_no]; // heap by node size log + u3p(u3_ca_fbox) fre_p[u3_cc_fbox_no]; // heap by node size log c3_w fre_w; // number of free words } all; @@ -274,11 +274,11 @@ /** Flags. **/ - enum u3_cs_flag { - u3_cs_flag_debug = 0x1, // debug memory - u3_cs_flag_gc = 0x2, // garbage collect once - u3_cs_flag_sand = 0x4, // sand mode, bump allocation - u3_cs_flag_die = 0x8 // process was asked to exit + enum u3_ca_flag { + u3_ca_flag_debug = 0x1, // debug memory + u3_ca_flag_gc = 0x2, // garbage collect once + u3_ca_flag_sand = 0x4, // sand mode, bump allocation + u3_ca_flag_die = 0x8 // process was asked to exit }; diff --git a/i/g/e.h b/i/g/e.h index 59bf16929e..6124475c44 100644 --- a/i/g/e.h +++ b/i/g/e.h @@ -4,55 +4,55 @@ */ /** Data structures. **/ - /* u3_cs_line: control line. + /* u3_ce_line: control line. */ - typedef struct _u3_cs_line { + typedef struct _u3_ce_line { c3_w pag_w; c3_w mug_w; - } u3_cs_line; + } u3_ce_line; - /* u3_cs_control: memory change, control file. + /* u3_ce_control: memory change, control file. */ - typedef struct _u3_cs_control { + typedef struct _u3_ce_control { c3_d evt_d; // event number c3_w nor_w; // new page count north c3_w sou_w; // new page count south c3_w pgs_w; // number of changed pages - u3_cs_line mem_u[0]; // per page - } u3_cs_control; + u3_ce_line mem_u[0]; // per page + } u3_ce_control; /* u3_cs_patch: memory change, top level. */ typedef struct _u3_cs_patch { c3_i ctl_i; c3_i mem_i; - u3_cs_control* con_u; + u3_ce_control* con_u; } u3_cs_patch; - /* u3_cs_image: memory segment, open file. + /* u3_ce_image: memory segment, open file. */ - typedef struct _u3_cs_image { + typedef struct _u3_ce_image { c3_c* nam_c; // segment name c3_i fid_i; // open file, or 0 c3_w pgs_w; // length in pages - } u3_cs_image; + } u3_ce_image; - /* u3_cs_pool: entire memory system. + /* u3_ce_pool: entire memory system. */ - typedef struct _u3_cs_pool { + typedef struct _u3_ce_pool { c3_c* cpu_c; // path to c3_d evt_d; // last patch written at event - c3_w dit_w[u3_cc_pages >> 5]; // touched since last save - u3_cs_image nor_u; // north segment - u3_cs_image sou_u; // south segment - } u3_cs_pool; + c3_w dit_w[u3_ca_pages >> 5]; // touched since last save + u3_ce_image nor_u; // north segment + u3_ce_image sou_u; // south segment + } u3_ce_pool; /** Globals. **/ /* u3_Pool / u3P: global memory control. */ - c3_global u3_cs_pool u3_Pool; + c3_global u3_ce_pool u3_Pool; # define u3P u3_Pool diff --git a/i/g/j.h b/i/g/j.h index fc88627f78..464185913e 100644 --- a/i/g/j.h +++ b/i/g/j.h @@ -62,9 +62,9 @@ *** *** All of these are transient structures allocated with malloc. **/ - /* u3_cs_harm: jet arm. + /* u3_ce_harm: jet arm. */ - typedef struct _u3_cs_harm { + typedef struct _u3_ce_harm { c3_c* fcs_c; // `.axe` or name u3_noun (*fun_f)(u3_noun); // compute or 0 / semitransfer // u3_bean (*val_f)(u3_noun); // validate or 0 / retain @@ -72,34 +72,34 @@ c3_o tot; // total (never punts) c3_o liv; // live (enabled) c3_l axe_l; // computed/discovered axis - struct _u3_cs_core* cop_u; // containing core - } u3_cs_harm; + struct _u3_ce_core* cop_u; // containing core + } u3_ce_harm; - /* u3_cs_core: driver definition. + /* u3_ce_core: driver definition. */ - typedef struct _u3_cs_core { + typedef struct _u3_ce_core { c3_c* cos_c; // control string - struct _u3_cs_harm* arm_u; // blank-terminated static list - struct _u3_cs_core* dev_u; // blank-terminated static list - struct _u3_cs_core* par_u; // dynamic parent pointer + struct _u3_ce_harm* arm_u; // blank-terminated static list + struct _u3_ce_core* dev_u; // blank-terminated static list + struct _u3_ce_core* par_u; // dynamic parent pointer c3_l axe_l; // axis to parent c3_l jax_l; // index in global dashboard - } u3_cs_core; + } u3_ce_core; - /* u3_cs_dash, u3_Dash, u3D: jet dashboard singleton + /* u3_ce_dash, u3_Dash, u3D: jet dashboard singleton */ - typedef struct _u3_cs_dash { - u3_cs_core* dev_u; // null-terminated static list + typedef struct _u3_ce_dash { + u3_ce_core* dev_u; // null-terminated static list c3_l len_l; // dynamic array length c3_l all_l; // allocated length - u3_cs_core* ray_u; // dynamic array by axis - } u3_cs_dash; + u3_ce_core* ray_u; // dynamic array by axis + } u3_ce_dash; /** Globals. **/ /* u3_Dash: jet dashboard. */ - extern u3_cs_dash u3_Dash; + extern u3_ce_dash u3_Dash; # define u3D u3_Dash diff --git a/i/g/m.h b/i/g/m.h index e2bbff2d18..21e873d13c 100644 --- a/i/g/m.h +++ b/i/g/m.h @@ -12,7 +12,7 @@ /* u3_cm_trap(): setjmp within road. */ #if 0 - u3_bean + c3_o u3_cm_trap(void); #else # define u3_cm_trap() (u3_noun)(setjmp(u3R->esc.buf)) diff --git a/i/g/n.h b/i/g/n.h index 8fa4b666dd..6b9e3eb7cb 100644 --- a/i/g/n.h +++ b/i/g/n.h @@ -2,47 +2,44 @@ ** ** This file is in the public domain. */ - /** Generic computation. - **/ - /* u3_cn_nock_on(): produce .*(bus fol). - */ - u3_noun - u3_cn_nock_on(u3_noun bus, u3_noun fol); + /** Functions. + **/ + /* u3_cn_nock_on(): produce .*(bus fol). + */ + u3_noun + u3_cn_nock_on(u3_noun bus, u3_noun fol); - /* u3_cn_slam_on(): produce (gat sam). - */ - u3_noun - u3_cn_slam_on(u3_noun gat, u3_noun sam); + /* u3_cn_slam_on(): produce (gat sam). + */ + u3_noun + u3_cn_slam_on(u3_noun gat, u3_noun sam); - /* u3_cn_kick_on(): fire `gat` without changing the sample. - */ - u3_noun - u3_cn_kick_on(u3_noun gat); + /* u3_cn_kick_on(): fire `gat` without changing the sample. + */ + u3_noun + u3_cn_kick_on(u3_noun gat); - /* u3_cn_nock_un(): produce .*(bus fol), as ++toon. - */ - u3_noun - u3_cn_nock_un(u3_noun bus, u3_noun fol); + /* u3_cn_nock_un(): produce .*(bus fol), as ++toon. + */ + u3_noun + u3_cn_nock_un(u3_noun bus, u3_noun fol); - /* u3_cn_slam_un(): produce (gat sam), as ++toon. - */ - u3_noun - u3_cn_slam_un(u3_noun gat, u3_noun sam); - - /* u3_cn_nock_in(): produce .*(bus fol), as ++toon, in namespace. - */ - u3_noun - u3_cn_nock_in(u3_noun fly, u3_noun bus, u3_noun fol); - - /* u3_cn_slam_in(): produce (gat sam), as ++toon, in namespace. - */ - u3_noun - u3_cn_slam_in(u3_noun fly, u3_noun gat, u3_noun sam); - - /* u3_cn_nock_an(): as slam_in(), but with empty fly. - */ - u3_noun - u3_cn_nock_an(u3_noun bus, u3_noun fol); + /* u3_cn_slam_un(): produce (gat sam), as ++toon. + */ + u3_noun + u3_cn_slam_un(u3_noun gat, u3_noun sam); + /* u3_cn_nock_in(): produce .*(bus fol), as ++toon, in namespace. + */ + u3_noun + u3_cn_nock_in(u3_noun fly, u3_noun bus, u3_noun fol); + /* u3_cn_slam_in(): produce (gat sam), as ++toon, in namespace. + */ + u3_noun + u3_cn_slam_in(u3_noun fly, u3_noun gat, u3_noun sam); + /* u3_cn_nock_an(): as slam_in(), but with empty fly. + */ + u3_noun + u3_cn_nock_an(u3_noun bus, u3_noun fol); diff --git a/i/g/v.h b/i/g/v.h index cb9b6f24dc..39f2737da3 100644 --- a/i/g/v.h +++ b/i/g/v.h @@ -6,19 +6,19 @@ **/ /* u3_cart: ovum carton. */ - struct _u3_cs_arvo; + struct _u3_cv_arvo; - typedef struct _u3_cs_cart { + typedef struct _u3_cv_cart { u3_noun vir; // effects of ovum u3_bean did; // cart considered for commit? u3_bean cit; // cart committed? c3_d ent_d; // entry in raft queue? - u3p(struct _u3_cs_cart) nex_p; - } u3_cs_cart; + u3p(struct _u3_cv_cart) nex_p; + } u3_cv_cart; - /* u3_cs_arvo: modern arvo structure. + /* u3_cv_arvo: modern arvo structure. */ - typedef struct _u3_cs_arvo { + typedef struct _u3_cv_arvo { c3_d ent_d; // event number u3_noun yot; // cached gates u3_noun now; // current time, as noun @@ -34,24 +34,24 @@ u3_noun roc; // kernel core struct { // ova waiting to process - u3p(u3_cs_cart) egg_p; // exit of ovum queue - u3p(u3_cs_cart) geg_p; // entry of ovum queue + u3p(u3_cv_cart) egg_p; // exit of ovum queue + u3p(u3_cv_cart) geg_p; // entry of ovum queue } ova; - } u3_cs_arvo; + } u3_cv_arvo; - /* u3_cs_home: all internal (within image) state. + /* u3_cv_home: all internal (within image) state. */ - typedef struct _u3_cs_home { + typedef struct _u3_cv_home { u3_cs_road rod_u; // storage state - u3_cs_arvo arv_u; // arvo state - } u3_cs_home; + u3_cv_arvo arv_u; // arvo state + } u3_cv_home; /** Globals. **/ /* u3_Home / u3H: root of thread. */ - c3_global u3_cs_home* u3_Home; + c3_global u3_cv_home* u3_Home; # define u3H u3_Home # define u3A (&(u3_Home->arv_u)) diff --git a/j/dash.c b/j/dash.c index 836c73bd27..ca34ea7b3a 100644 --- a/j/dash.c +++ b/j/dash.c @@ -4,63 +4,63 @@ */ #include "all.h" -static u3_cs_harm _mood__hoon_add_a[] = {{".2", u3_cwa_add, c3y}, {}}; -static u3_cs_harm _mood__hoon_dec_a[] = {{".2", u3_cwa_dec, c3y}, {}}; -static u3_cs_harm _mood__hoon_div_a[] = {{".2", u3_cwa_div, c3y}, {}}; -static u3_cs_harm _mood__hoon_gte_a[] = {{".2", u3_cwa_gte, c3y}, {}}; -static u3_cs_harm _mood__hoon_gth_a[] = {{".2", u3_cwa_gth, c3y}, {}}; -static u3_cs_harm _mood__hoon_lte_a[] = {{".2", u3_cwa_lte, c3y}, {}}; -static u3_cs_harm _mood__hoon_lth_a[] = {{".2", u3_cwa_lth, c3y}, {}}; -static u3_cs_harm _mood__hoon_mod_a[] = {{".2", u3_cwa_mod, c3y}, {}}; -static u3_cs_harm _mood__hoon_mul_a[] = {{".2", u3_cwa_mul, c3y}, {}}; -static u3_cs_harm _mood__hoon_sub_a[] = {{".2", u3_cwa_sub, c3y}, {}}; +static u3_ce_harm _mood__hoon_add_a[] = {{".2", u3_cwa_add, c3y}, {}}; +static u3_ce_harm _mood__hoon_dec_a[] = {{".2", u3_cwa_dec, c3y}, {}}; +static u3_ce_harm _mood__hoon_div_a[] = {{".2", u3_cwa_div, c3y}, {}}; +static u3_ce_harm _mood__hoon_gte_a[] = {{".2", u3_cwa_gte, c3y}, {}}; +static u3_ce_harm _mood__hoon_gth_a[] = {{".2", u3_cwa_gth, c3y}, {}}; +static u3_ce_harm _mood__hoon_lte_a[] = {{".2", u3_cwa_lte, c3y}, {}}; +static u3_ce_harm _mood__hoon_lth_a[] = {{".2", u3_cwa_lth, c3y}, {}}; +static u3_ce_harm _mood__hoon_mod_a[] = {{".2", u3_cwa_mod, c3y}, {}}; +static u3_ce_harm _mood__hoon_mul_a[] = {{".2", u3_cwa_mul, c3y}, {}}; +static u3_ce_harm _mood__hoon_sub_a[] = {{".2", u3_cwa_sub, c3y}, {}}; -static u3_cs_harm _mood__hoon_bind_a[] = {{".2", u3_cwb_bind, c3y}, {}}; -static u3_cs_harm _mood__hoon_clap_a[] = {{".2", u3_cwb_clap, c3y}, {}}; -static u3_cs_harm _mood__hoon_drop_a[] = {{".2", u3_cwb_drop, c3y}, {}}; -static u3_cs_harm _mood__hoon_flop_a[] = {{".2", u3_cwb_flop, c3y}, {}}; -static u3_cs_harm _mood__hoon_lent_a[] = {{".2", u3_cwb_lent, c3y}, {}}; -static u3_cs_harm _mood__hoon_levy_a[] = {{".2", u3_cwb_levy, c3y}, {}}; -static u3_cs_harm _mood__hoon_lien_a[] = {{".2", u3_cwb_lien, c3y}, {}}; -static u3_cs_harm _mood__hoon_need_a[] = {{".2", u3_cwb_need, c3y}, {}}; -static u3_cs_harm _mood__hoon_reel_a[] = {{".2", u3_cwb_reel, c3y}, {}}; -static u3_cs_harm _mood__hoon_roll_a[] = {{".2", u3_cwb_roll, c3y}, {}}; -static u3_cs_harm _mood__hoon_skim_a[] = {{".2", u3_cwb_skim, c3y}, {}}; -static u3_cs_harm _mood__hoon_skip_a[] = {{".2", u3_cwb_skip, c3y}, {}}; -// static u3_cs_harm _mood__hoon_scag_a[] = {{".2", u3_cwb_scag, c3y}, {}}; -static u3_cs_harm _mood__hoon_slag_a[] = {{".2", u3_cwb_slag, c3y}, {}}; -static u3_cs_harm _mood__hoon_snag_a[] = {{".2", u3_cwb_snag, c3y}, {}}; -// static u3_cs_harm _mood__hoon_sort_a[] = {{".2", u3_cwb_sort, c3y}, {}}; -static u3_cs_harm _mood__hoon_turn_a[] = {{".2", u3_cwb_turn, c3y}, {}}; -static u3_cs_harm _mood__hoon_weld_a[] = {{".2", u3_cwb_weld, c3y}, {}}; +static u3_ce_harm _mood__hoon_bind_a[] = {{".2", u3_cwb_bind, c3y}, {}}; +static u3_ce_harm _mood__hoon_clap_a[] = {{".2", u3_cwb_clap, c3y}, {}}; +static u3_ce_harm _mood__hoon_drop_a[] = {{".2", u3_cwb_drop, c3y}, {}}; +static u3_ce_harm _mood__hoon_flop_a[] = {{".2", u3_cwb_flop, c3y}, {}}; +static u3_ce_harm _mood__hoon_lent_a[] = {{".2", u3_cwb_lent, c3y}, {}}; +static u3_ce_harm _mood__hoon_levy_a[] = {{".2", u3_cwb_levy, c3y}, {}}; +static u3_ce_harm _mood__hoon_lien_a[] = {{".2", u3_cwb_lien, c3y}, {}}; +static u3_ce_harm _mood__hoon_need_a[] = {{".2", u3_cwb_need, c3y}, {}}; +static u3_ce_harm _mood__hoon_reel_a[] = {{".2", u3_cwb_reel, c3y}, {}}; +static u3_ce_harm _mood__hoon_roll_a[] = {{".2", u3_cwb_roll, c3y}, {}}; +static u3_ce_harm _mood__hoon_skim_a[] = {{".2", u3_cwb_skim, c3y}, {}}; +static u3_ce_harm _mood__hoon_skip_a[] = {{".2", u3_cwb_skip, c3y}, {}}; +// static u3_ce_harm _mood__hoon_scag_a[] = {{".2", u3_cwb_scag, c3y}, {}}; +static u3_ce_harm _mood__hoon_slag_a[] = {{".2", u3_cwb_slag, c3y}, {}}; +static u3_ce_harm _mood__hoon_snag_a[] = {{".2", u3_cwb_snag, c3y}, {}}; +// static u3_ce_harm _mood__hoon_sort_a[] = {{".2", u3_cwb_sort, c3y}, {}}; +static u3_ce_harm _mood__hoon_turn_a[] = {{".2", u3_cwb_turn, c3y}, {}}; +static u3_ce_harm _mood__hoon_weld_a[] = {{".2", u3_cwb_weld, c3y}, {}}; -static u3_cs_harm _mood__hoon_bex_a[] = {{".2", u3_cwc_bex, c3y}, {}}; -static u3_cs_harm _mood__hoon_can_a[] = {{".2", u3_cwc_can, c3y}, {}}; -static u3_cs_harm _mood__hoon_cap_a[] = {{".2", u3_cwc_cap, c3y}, {}}; -static u3_cs_harm _mood__hoon_cat_a[] = {{".2", u3_cwc_cat, c3y}, {}}; -static u3_cs_harm _mood__hoon_con_a[] = {{".2", u3_cwc_con, c3y}, {}}; -static u3_cs_harm _mood__hoon_cut_a[] = {{".2", u3_cwc_cut, c3y}, {}}; -static u3_cs_harm _mood__hoon_dis_a[] = {{".2", u3_cwc_dis, c3y}, {}}; -static u3_cs_harm _mood__hoon_dor_a[] = {{".2", u3_cwc_dor, c3y}, {}}; -static u3_cs_harm _mood__hoon_end_a[] = {{".2", u3_cwc_end, c3y}, {}}; -static u3_cs_harm _mood__hoon_gor_a[] = {{".2", u3_cwc_gor, c3y}, {}}; -static u3_cs_harm _mood__hoon_hor_a[] = {{".2", u3_cwc_hor, c3y}, {}}; -static u3_cs_harm _mood__hoon_lsh_a[] = {{".2", u3_cwc_lsh, c3y}, {}}; -static u3_cs_harm _mood__hoon_mas_a[] = {{".2", u3_cwc_mas, c3y}, {}}; -static u3_cs_harm _mood__hoon_met_a[] = {{".2", u3_cwc_met, c3y}, {}}; -static u3_cs_harm _mood__hoon_mix_a[] = {{".2", u3_cwc_mix, c3y}, {}}; -static u3_cs_harm _mood__hoon_mug_a[] = {{".2", u3_cwc_mug, c3y}, {}}; -static u3_cs_harm _mood__hoon_peg_a[] = {{".2", u3_cwc_peg, c3y}, {}}; -static u3_cs_harm _mood__hoon_rap_a[] = {{".2", u3_cwc_rap, c3y}, {}}; -static u3_cs_harm _mood__hoon_rip_a[] = {{".2", u3_cwc_rip, c3y}, {}}; -static u3_cs_harm _mood__hoon_rsh_a[] = {{".2", u3_cwc_rsh, c3y}, {}}; -static u3_cs_harm _mood__hoon_vor_a[] = {{".2", u3_cwc_vor, c3y}, {}}; +static u3_ce_harm _mood__hoon_bex_a[] = {{".2", u3_cwc_bex, c3y}, {}}; +static u3_ce_harm _mood__hoon_can_a[] = {{".2", u3_cwc_can, c3y}, {}}; +static u3_ce_harm _mood__hoon_cap_a[] = {{".2", u3_cwc_cap, c3y}, {}}; +static u3_ce_harm _mood__hoon_cat_a[] = {{".2", u3_cwc_cat, c3y}, {}}; +static u3_ce_harm _mood__hoon_con_a[] = {{".2", u3_cwc_con, c3y}, {}}; +static u3_ce_harm _mood__hoon_cut_a[] = {{".2", u3_cwc_cut, c3y}, {}}; +static u3_ce_harm _mood__hoon_dis_a[] = {{".2", u3_cwc_dis, c3y}, {}}; +static u3_ce_harm _mood__hoon_dor_a[] = {{".2", u3_cwc_dor, c3y}, {}}; +static u3_ce_harm _mood__hoon_end_a[] = {{".2", u3_cwc_end, c3y}, {}}; +static u3_ce_harm _mood__hoon_gor_a[] = {{".2", u3_cwc_gor, c3y}, {}}; +static u3_ce_harm _mood__hoon_hor_a[] = {{".2", u3_cwc_hor, c3y}, {}}; +static u3_ce_harm _mood__hoon_lsh_a[] = {{".2", u3_cwc_lsh, c3y}, {}}; +static u3_ce_harm _mood__hoon_mas_a[] = {{".2", u3_cwc_mas, c3y}, {}}; +static u3_ce_harm _mood__hoon_met_a[] = {{".2", u3_cwc_met, c3y}, {}}; +static u3_ce_harm _mood__hoon_mix_a[] = {{".2", u3_cwc_mix, c3y}, {}}; +static u3_ce_harm _mood__hoon_mug_a[] = {{".2", u3_cwc_mug, c3y}, {}}; +static u3_ce_harm _mood__hoon_peg_a[] = {{".2", u3_cwc_peg, c3y}, {}}; +static u3_ce_harm _mood__hoon_rap_a[] = {{".2", u3_cwc_rap, c3y}, {}}; +static u3_ce_harm _mood__hoon_rip_a[] = {{".2", u3_cwc_rip, c3y}, {}}; +static u3_ce_harm _mood__hoon_rsh_a[] = {{".2", u3_cwc_rsh, c3y}, {}}; +static u3_ce_harm _mood__hoon_vor_a[] = {{".2", u3_cwc_vor, c3y}, {}}; -static u3_cs_harm _mood__hoon__po_ind_a[] = {{".2", u3_cwcp_ind}, {}}; -static u3_cs_harm _mood__hoon__po_ins_a[] = {{".2", u3_cwcp_ins}, {}}; -static u3_cs_harm _mood__hoon__po_tod_a[] = {{".2", u3_cwcp_tod}, {}}; -static u3_cs_harm _mood__hoon__po_tos_a[] = {{".2", u3_cwcp_tos}, {}}; -static u3_cs_core _mood__hoon__po_d[] = +static u3_ce_harm _mood__hoon__po_ind_a[] = {{".2", u3_cwcp_ind}, {}}; +static u3_ce_harm _mood__hoon__po_ins_a[] = {{".2", u3_cwcp_ins}, {}}; +static u3_ce_harm _mood__hoon__po_tod_a[] = {{".2", u3_cwcp_tod}, {}}; +static u3_ce_harm _mood__hoon__po_tos_a[] = {{".2", u3_cwcp_tos}, {}}; +static u3_ce_core _mood__hoon__po_d[] = { { "ind", _mood__hoon__po_ind_a }, { "ins", _mood__hoon__po_ins_a }, { "tod", _mood__hoon__po_tod_a }, @@ -68,14 +68,14 @@ static u3_cs_core _mood__hoon__po_d[] = {} }; -static u3_cs_harm _mood__hoon__by_gas_a[] = {{".2", u3_cwdb_gas, c3y}, {}}; -static u3_cs_harm _mood__hoon__by_get_a[] = {{".2", u3_cwdb_get, c3y}, {}}; -static u3_cs_harm _mood__hoon__by_has_a[] = {{".2", u3_cwdb_has, c3y}, {}}; -static u3_cs_harm _mood__hoon__by_int_a[] = {{".2", u3_cwdb_int, c3y}, {}}; -static u3_cs_harm _mood__hoon__by_put_a[] = {{".2", u3_cwdb_put, c3y}, {}}; -static u3_cs_harm _mood__hoon__by_tap_a[] = {{".2", u3_cwdb_tap, c3y}, {}}; -static u3_cs_harm _mood__hoon__by_uni_a[] = {{".2", u3_cwdb_uni, c3y}, {}}; -static u3_cs_core _mood__hoon__by_d[] = +static u3_ce_harm _mood__hoon__by_gas_a[] = {{".2", u3_cwdb_gas, c3y}, {}}; +static u3_ce_harm _mood__hoon__by_get_a[] = {{".2", u3_cwdb_get, c3y}, {}}; +static u3_ce_harm _mood__hoon__by_has_a[] = {{".2", u3_cwdb_has, c3y}, {}}; +static u3_ce_harm _mood__hoon__by_int_a[] = {{".2", u3_cwdb_int, c3y}, {}}; +static u3_ce_harm _mood__hoon__by_put_a[] = {{".2", u3_cwdb_put, c3y}, {}}; +static u3_ce_harm _mood__hoon__by_tap_a[] = {{".2", u3_cwdb_tap, c3y}, {}}; +static u3_ce_harm _mood__hoon__by_uni_a[] = {{".2", u3_cwdb_uni, c3y}, {}}; +static u3_ce_core _mood__hoon__by_d[] = { { "gas", _mood__hoon__by_gas_a }, { "get", _mood__hoon__by_get_a }, { "has", _mood__hoon__by_has_a }, @@ -86,14 +86,14 @@ static u3_cs_core _mood__hoon__by_d[] = {} }; -static u3_cs_harm _mood__hoon__in_gas_a[] = {{".2", u3_cwdi_gas}, {}}; -static u3_cs_harm _mood__hoon__in_has_a[] = {{".2", u3_cwdi_has}, {}}; -static u3_cs_harm _mood__hoon__in_mer_a[] = {{".2", u3_cwdi_mer}, {}}; -static u3_cs_harm _mood__hoon__in_int_a[] = {{".2", u3_cwdi_int}, {}}; -static u3_cs_harm _mood__hoon__in_put_a[] = {{".2", u3_cwdi_put}, {}}; -static u3_cs_harm _mood__hoon__in_tap_a[] = {{".2", u3_cwdi_tap}, {}}; -static u3_cs_harm _mood__hoon__in_uni_a[] = {{".2", u3_cwdi_uni}, {}}; -static u3_cs_core _mood__hoon__in_d[] = +static u3_ce_harm _mood__hoon__in_gas_a[] = {{".2", u3_cwdi_gas}, {}}; +static u3_ce_harm _mood__hoon__in_has_a[] = {{".2", u3_cwdi_has}, {}}; +static u3_ce_harm _mood__hoon__in_mer_a[] = {{".2", u3_cwdi_mer}, {}}; +static u3_ce_harm _mood__hoon__in_int_a[] = {{".2", u3_cwdi_int}, {}}; +static u3_ce_harm _mood__hoon__in_put_a[] = {{".2", u3_cwdi_put}, {}}; +static u3_ce_harm _mood__hoon__in_tap_a[] = {{".2", u3_cwdi_tap}, {}}; +static u3_ce_harm _mood__hoon__in_uni_a[] = {{".2", u3_cwdi_uni}, {}}; +static u3_ce_core _mood__hoon__in_d[] = { { "gas", _mood__hoon__in_gas_a }, { "has", _mood__hoon__in_has_a }, { "mer", _mood__hoon__in_mer_a }, @@ -104,108 +104,108 @@ static u3_cs_core _mood__hoon__in_d[] = {} }; -static u3_cs_harm _mood__hoon_cue_a[] = {{".2", u3_cwe_cue}, {}}; -static u3_cs_harm _mood__hoon_jam_a[] = {{".2", u3_cwe_jam}, {}}; -static u3_cs_harm _mood__hoon_mat_a[] = {{".2", u3_cwe_mat}, {}}; -static u3_cs_harm _mood__hoon_rub_a[] = {{".2", u3_cwe_rub}, {}}; -static u3_cs_harm _mood__hoon_lore_a[] = {{".2", u3_cwe_lore}, {}}; -static u3_cs_harm _mood__hoon_loss_a[] = {{".2", u3_cwe_loss}, {}}; -static u3_cs_harm _mood__hoon_mink_a[] = {{".2", u3_cwe_mink}, {}}; -static u3_cs_harm _mood__hoon_mule_a[] = {{".2", u3_cwe_mule}, {}}; -static u3_cs_harm _mood__hoon_repg_a[] = {{".2", u3_cwe_repg}, {}}; -static u3_cs_harm _mood__hoon_rexp_a[] = {{".2", u3_cwe_rexp}, {}}; -static u3_cs_harm _mood__hoon_trip_a[] = {{".2", u3_cwe_trip}, {}}; +static u3_ce_harm _mood__hoon_cue_a[] = {{".2", u3_cwe_cue}, {}}; +static u3_ce_harm _mood__hoon_jam_a[] = {{".2", u3_cwe_jam}, {}}; +static u3_ce_harm _mood__hoon_mat_a[] = {{".2", u3_cwe_mat}, {}}; +static u3_ce_harm _mood__hoon_rub_a[] = {{".2", u3_cwe_rub}, {}}; +static u3_ce_harm _mood__hoon_lore_a[] = {{".2", u3_cwe_lore}, {}}; +static u3_ce_harm _mood__hoon_loss_a[] = {{".2", u3_cwe_loss}, {}}; +static u3_ce_harm _mood__hoon_mink_a[] = {{".2", u3_cwe_mink}, {}}; +static u3_ce_harm _mood__hoon_mule_a[] = {{".2", u3_cwe_mule}, {}}; +static u3_ce_harm _mood__hoon_repg_a[] = {{".2", u3_cwe_repg}, {}}; +static u3_ce_harm _mood__hoon_rexp_a[] = {{".2", u3_cwe_rexp}, {}}; +static u3_ce_harm _mood__hoon_trip_a[] = {{".2", u3_cwe_trip}, {}}; -static u3_cs_harm _mood__hoon__aesc_en_a[] = {{".2", u3_cwea_en}, {}}; -static u3_cs_harm _mood__hoon__aesc_de_a[] = {{".2", u3_cwea_en}, {}}; -static u3_cs_core _mood__hoon__aesc_d[] = +static u3_ce_harm _mood__hoon__aesc_en_a[] = {{".2", u3_cwea_en}, {}}; +static u3_ce_harm _mood__hoon__aesc_de_a[] = {{".2", u3_cwea_en}, {}}; +static u3_ce_core _mood__hoon__aesc_d[] = { { "en", _mood__hoon__aesc_en_a }, { "de", _mood__hoon__aesc_de_a }, {} }; -static u3_cs_harm _mood__hoon__bend_fun_a[] = {{".2", u3_cwe_bend_fun}, {}}; -static u3_cs_core _mood__hoon__bend_d[] = +static u3_ce_harm _mood__hoon__bend_fun_a[] = {{".2", u3_cwe_bend_fun}, {}}; +static u3_ce_core _mood__hoon__bend_d[] = { { "fun", _mood__hoon__bend_fun_a }, {} }; -static u3_cs_harm _mood__hoon__cold_fun_a[] = {{".2", u3_cwe_cold_fun}, {}}; -static u3_cs_core _mood__hoon__cold_d[] = +static u3_ce_harm _mood__hoon__cold_fun_a[] = {{".2", u3_cwe_cold_fun}, {}}; +static u3_ce_core _mood__hoon__cold_d[] = { { "fun", _mood__hoon__cold_fun_a }, {} }; -static u3_cs_harm _mood__hoon__cook_fun_a[] = {{".2", u3_cwe_cook_fun}, {}}; -static u3_cs_core _mood__hoon__cook_d[] = +static u3_ce_harm _mood__hoon__cook_fun_a[] = {{".2", u3_cwe_cook_fun}, {}}; +static u3_ce_core _mood__hoon__cook_d[] = { { "fun", _mood__hoon__cook_fun_a }, {} }; -static u3_cs_harm _mood__hoon__comp_fun_a[] = {{".2", u3_cwe_comp_fun}, {}}; -static u3_cs_core _mood__hoon__comp_d[] = +static u3_ce_harm _mood__hoon__comp_fun_a[] = {{".2", u3_cwe_comp_fun}, {}}; +static u3_ce_core _mood__hoon__comp_d[] = { { "fun", _mood__hoon__comp_fun_a }, {} }; -static u3_cs_harm _mood__hoon__easy_fun_a[] = {{".2", u3_cwe_easy_fun}, {}}; -static u3_cs_core _mood__hoon__easy_d[] = +static u3_ce_harm _mood__hoon__easy_fun_a[] = {{".2", u3_cwe_easy_fun}, {}}; +static u3_ce_core _mood__hoon__easy_d[] = { { "fun", _mood__hoon__easy_fun_a }, {} }; -static u3_cs_harm _mood__hoon__glue_fun_a[] = {{".2", u3_cwe_glue_fun}, {}}; -static u3_cs_core _mood__hoon__glue_d[] = +static u3_ce_harm _mood__hoon__glue_fun_a[] = {{".2", u3_cwe_glue_fun}, {}}; +static u3_ce_core _mood__hoon__glue_d[] = { { "fun", _mood__hoon__glue_fun_a }, {} }; -static u3_cs_harm _mood__hoon__here_fun_a[] = {{".2", u3_cwe_here_fun}, {}}; -static u3_cs_core _mood__hoon__here_d[] = +static u3_ce_harm _mood__hoon__here_fun_a[] = {{".2", u3_cwe_here_fun}, {}}; +static u3_ce_core _mood__hoon__here_d[] = { { "fun", _mood__hoon__here_fun_a }, {} }; -static u3_cs_harm _mood__hoon__just_fun_a[] = {{".2", u3_cwe_just_fun}, {}}; -static u3_cs_core _mood__hoon__just_d[] = +static u3_ce_harm _mood__hoon__just_fun_a[] = {{".2", u3_cwe_just_fun}, {}}; +static u3_ce_core _mood__hoon__just_d[] = { { "fun", _mood__hoon__just_fun_a }, {} }; -static u3_cs_harm _mood__hoon__mask_fun_a[] = {{".2", u3_cwe_mask_fun}, {}}; -static u3_cs_core _mood__hoon__mask_d[] = +static u3_ce_harm _mood__hoon__mask_fun_a[] = {{".2", u3_cwe_mask_fun}, {}}; +static u3_ce_core _mood__hoon__mask_d[] = { { "fun", _mood__hoon__mask_fun_a }, {} }; -static u3_cs_harm _mood__hoon__shim_fun_a[] = {{".2", u3_cwe_shim_fun}, {}}; -static u3_cs_core _mood__hoon__shim_d[] = +static u3_ce_harm _mood__hoon__shim_fun_a[] = {{".2", u3_cwe_shim_fun}, {}}; +static u3_ce_core _mood__hoon__shim_d[] = { { "fun", _mood__hoon__shim_fun_a }, {} }; -static u3_cs_harm _mood__hoon__stag_fun_a[] = {{".2", u3_cwe_stag_fun}, {}}; -static u3_cs_core _mood__hoon__stag_d[] = +static u3_ce_harm _mood__hoon__stag_fun_a[] = {{".2", u3_cwe_stag_fun}, {}}; +static u3_ce_core _mood__hoon__stag_d[] = { { "fun", _mood__hoon__stag_fun_a }, {} }; -static u3_cs_harm _mood__hoon__stew_fun_a[] = {{".2", u3_cwe_stew_fun}, {}}; -static u3_cs_core _mood__hoon__stew_d[] = +static u3_ce_harm _mood__hoon__stew_fun_a[] = {{".2", u3_cwe_stew_fun}, {}}; +static u3_ce_core _mood__hoon__stew_d[] = { { "fun", _mood__hoon__stew_fun_a }, {} }; -static u3_cs_harm _mood__hoon__stir_fun_a[] = {{".2", u3_cwe_stir_fun}, {}}; -static u3_cs_core _mood__hoon__stir_d[] = +static u3_ce_harm _mood__hoon__stir_fun_a[] = {{".2", u3_cwe_stir_fun}, {}}; +static u3_ce_core _mood__hoon__stir_d[] = { { "fun", _mood__hoon__stir_fun_a }, {} }; -static u3_cs_harm _mood__hoon__og_raw_a[] = {{".2", u3_cweo_raw}, {}}; -static u3_cs_core _mood__hoon__og_d[] = +static u3_ce_harm _mood__hoon__og_raw_a[] = {{".2", u3_cweo_raw}, {}}; +static u3_ce_core _mood__hoon__og_d[] = { { "raw", _mood__hoon__og_raw_a }, {} }; -static u3_cs_harm _mood__hoon__rd_sun_a[] = {{".2", u3_cwer_sun}, {}}; -static u3_cs_harm _mood__hoon__rd_mul_a[] = {{".2", u3_cwer_mul}, {}}; -static u3_cs_harm _mood__hoon__rd_div_a[] = {{".2", u3_cwer_div}, {}}; -static u3_cs_harm _mood__hoon__rd_add_a[] = {{".2", u3_cwer_add}, {}}; -static u3_cs_harm _mood__hoon__rd_sub_a[] = {{".2", u3_cwer_sub}, {}}; -static u3_cs_harm _mood__hoon__rd_lte_a[] = {{".2", u3_cwer_lte}, {}}; -static u3_cs_harm _mood__hoon__rd_lth_a[] = {{".2", u3_cwer_lth}, {}}; -static u3_cs_harm _mood__hoon__rd_gte_a[] = {{".2", u3_cwer_gte}, {}}; -static u3_cs_harm _mood__hoon__rd_gth_a[] = {{".2", u3_cwer_gth}, {}}; -static u3_cs_core _mood__hoon__rd_d[] = +static u3_ce_harm _mood__hoon__rd_sun_a[] = {{".2", u3_cwer_sun}, {}}; +static u3_ce_harm _mood__hoon__rd_mul_a[] = {{".2", u3_cwer_mul}, {}}; +static u3_ce_harm _mood__hoon__rd_div_a[] = {{".2", u3_cwer_div}, {}}; +static u3_ce_harm _mood__hoon__rd_add_a[] = {{".2", u3_cwer_add}, {}}; +static u3_ce_harm _mood__hoon__rd_sub_a[] = {{".2", u3_cwer_sub}, {}}; +static u3_ce_harm _mood__hoon__rd_lte_a[] = {{".2", u3_cwer_lte}, {}}; +static u3_ce_harm _mood__hoon__rd_lth_a[] = {{".2", u3_cwer_lth}, {}}; +static u3_ce_harm _mood__hoon__rd_gte_a[] = {{".2", u3_cwer_gte}, {}}; +static u3_ce_harm _mood__hoon__rd_gth_a[] = {{".2", u3_cwer_gth}, {}}; +static u3_ce_core _mood__hoon__rd_d[] = { { "sun", _mood__hoon__rd_sun_a }, { "mul", _mood__hoon__rd_mul_a }, { "div", _mood__hoon__rd_div_a }, @@ -218,71 +218,71 @@ static u3_cs_core _mood__hoon__rd_d[] = {} }; -static u3_cs_harm _mood__hoon__coed__ed_puck_a[] = {{".2", u3_cwee_puck}, {}}; -static u3_cs_harm _mood__hoon__coed__ed_sign_a[] = {{".2", u3_cwee_sign}, {}}; -static u3_cs_harm _mood__hoon__coed__ed_veri_a[] = {{".2", u3_cwee_veri}, {}}; -static u3_cs_core _mood__hoon__coed__ed_d[] = +static u3_ce_harm _mood__hoon__coed__ed_puck_a[] = {{".2", u3_cwee_puck}, {}}; +static u3_ce_harm _mood__hoon__coed__ed_sign_a[] = {{".2", u3_cwee_sign}, {}}; +static u3_ce_harm _mood__hoon__coed__ed_veri_a[] = {{".2", u3_cwee_veri}, {}}; +static u3_ce_core _mood__hoon__coed__ed_d[] = { { "sign", _mood__hoon__coed__ed_sign_a }, { "puck", _mood__hoon__coed__ed_puck_a }, { "veri", _mood__hoon__coed__ed_veri_a }, {} }; -static u3_cs_core _mood__hoon__coed_d[] = +static u3_ce_core _mood__hoon__coed_d[] = { { "ed", 0, _mood__hoon__coed__ed_d }, {} }; -static u3_cs_harm _mood__hoon_pfix_a[] = {{".2", u3_cwe_pfix}, {}}; -static u3_cs_harm _mood__hoon_plug_a[] = {{".2", u3_cwe_plug}, {}}; -static u3_cs_harm _mood__hoon_pose_a[] = {{".2", u3_cwe_pose}, {}}; -static u3_cs_harm _mood__hoon_sfix_a[] = {{".2", u3_cwe_sfix}, {}}; -static u3_cs_harm _mood__hoon_shax_a[] = {{".2", u3_cwe_shax}, {}}; -static u3_cs_harm _mood__hoon_shas_a[] = {{".2", u3_cwe_shas}, {}}; -static u3_cs_harm _mood__hoon_shal_a[] = {{".2", u3_cwe_shal}, {}}; +static u3_ce_harm _mood__hoon_pfix_a[] = {{".2", u3_cwe_pfix}, {}}; +static u3_ce_harm _mood__hoon_plug_a[] = {{".2", u3_cwe_plug}, {}}; +static u3_ce_harm _mood__hoon_pose_a[] = {{".2", u3_cwe_pose}, {}}; +static u3_ce_harm _mood__hoon_sfix_a[] = {{".2", u3_cwe_sfix}, {}}; +static u3_ce_harm _mood__hoon_shax_a[] = {{".2", u3_cwe_shax}, {}}; +static u3_ce_harm _mood__hoon_shas_a[] = {{".2", u3_cwe_shas}, {}}; +static u3_ce_harm _mood__hoon_shal_a[] = {{".2", u3_cwe_shal}, {}}; -static u3_cs_harm _mood__hoon_bull_a[] = {{".2", u3_cwf_bull}, {}}; -static u3_cs_harm _mood__hoon_cell_a[] = {{".2", u3_cwf_cell}, {}}; -static u3_cs_harm _mood__hoon_comb_a[] = {{".2", u3_cwf_comb}, {}}; -static u3_cs_harm _mood__hoon_cons_a[] = {{".2", u3_cwf_cons}, {}}; -static u3_cs_harm _mood__hoon_core_a[] = {{".2", u3_cwf_core}, {}}; -static u3_cs_harm _mood__hoon_cube_a[] = {{".2", u3_cwf_cube}, {}}; -static u3_cs_harm _mood__hoon_face_a[] = {{".2", u3_cwf_face}, {}}; -static u3_cs_harm _mood__hoon_fitz_a[] = {{".2", u3_cwf_fitz}, {}}; -static u3_cs_harm _mood__hoon_flan_a[] = {{".2", u3_cwf_flan}, {}}; -static u3_cs_harm _mood__hoon_flay_a[] = {{".2", u3_cwf_flay}, {}}; -static u3_cs_harm _mood__hoon_flip_a[] = {{".2", u3_cwf_flip}, {}}; -static u3_cs_harm _mood__hoon_flor_a[] = {{".2", u3_cwf_flor}, {}}; -static u3_cs_harm _mood__hoon_fork_a[] = {{".2", u3_cwf_fork}, {}}; -static u3_cs_harm _mood__hoon_hike_a[] = {{".2", u3_cwf_hike}, {}}; -static u3_cs_harm _mood__hoon_look_a[] = {{".2", u3_cwf_look}, {}}; +static u3_ce_harm _mood__hoon_bull_a[] = {{".2", u3_cwf_bull}, {}}; +static u3_ce_harm _mood__hoon_cell_a[] = {{".2", u3_cwf_cell}, {}}; +static u3_ce_harm _mood__hoon_comb_a[] = {{".2", u3_cwf_comb}, {}}; +static u3_ce_harm _mood__hoon_cons_a[] = {{".2", u3_cwf_cons}, {}}; +static u3_ce_harm _mood__hoon_core_a[] = {{".2", u3_cwf_core}, {}}; +static u3_ce_harm _mood__hoon_cube_a[] = {{".2", u3_cwf_cube}, {}}; +static u3_ce_harm _mood__hoon_face_a[] = {{".2", u3_cwf_face}, {}}; +static u3_ce_harm _mood__hoon_fitz_a[] = {{".2", u3_cwf_fitz}, {}}; +static u3_ce_harm _mood__hoon_flan_a[] = {{".2", u3_cwf_flan}, {}}; +static u3_ce_harm _mood__hoon_flay_a[] = {{".2", u3_cwf_flay}, {}}; +static u3_ce_harm _mood__hoon_flip_a[] = {{".2", u3_cwf_flip}, {}}; +static u3_ce_harm _mood__hoon_flor_a[] = {{".2", u3_cwf_flor}, {}}; +static u3_ce_harm _mood__hoon_fork_a[] = {{".2", u3_cwf_fork}, {}}; +static u3_ce_harm _mood__hoon_hike_a[] = {{".2", u3_cwf_hike}, {}}; +static u3_ce_harm _mood__hoon_look_a[] = {{".2", u3_cwf_look}, {}}; -static u3_cs_harm _mood__hoon__ut_busk_a[] = {{".2", u3_cwfu_busk}, {}}; -static u3_cs_harm _mood__hoon__ut_bust_a[] = {{".2", u3_cwfu_bust}, {}}; -static u3_cs_harm _mood__hoon__ut_conk_a[] = {{".2", u3_cwfu_conk}, {}}; -static u3_cs_harm _mood__hoon__ut_crop_a[] = {{".2", u3_cwfu_crop}, {}}; -static u3_cs_harm _mood__hoon__ut_cull_a[] = {{".2", u3_cwfu_cull}, {}}; -static u3_cs_harm _mood__hoon__ut_find_a[] = {{".2", u3_cwfu_find}, {}}; -static u3_cs_harm _mood__hoon__ut_fino_a[] = {{".2", u3_cwfu_fino}, {}}; -static u3_cs_harm _mood__hoon__ut_fink_a[] = {{".2", u3_cwfu_fink}, {}}; -static u3_cs_harm _mood__hoon__ut_fire_a[] = {{".2", u3_cwfu_fire}, {}}; -static u3_cs_harm _mood__hoon__ut_firm_a[] = {{".2", u3_cwfu_firm}, {}}; -static u3_cs_harm _mood__hoon__ut_fish_a[] = {{".2", u3_cwfu_fish}, {}}; -static u3_cs_harm _mood__hoon__ut_fuse_a[] = {{".2", u3_cwfu_fuse}, {}}; -static u3_cs_harm _mood__hoon__ut_heal_a[] = {{".2", u3_cwfu_heal}, {}}; -static u3_cs_harm _mood__hoon__ut_mint_a[] = {{".2", u3_cwfu_mint}, {}}; -static u3_cs_harm _mood__hoon__ut_mull_a[] = {{".2", u3_cwfu_mull}, {}}; -static u3_cs_harm _mood__hoon__ut_nest_a[] = {{".2", u3_cwfu_nest}, {}}; -static u3_cs_harm _mood__hoon__ut_park_a[] = {{".2", u3_cwfu_park}, {}}; -static u3_cs_harm _mood__hoon__ut_peek_a[] = {{".2", u3_cwfu_peek}, {}}; -static u3_cs_harm _mood__hoon__ut_play_a[] = {{".2", u3_cwfu_play}, {}}; -static u3_cs_harm _mood__hoon__ut_rest_a[] = {{".2", u3_cwfu_rest}, {}}; -static u3_cs_harm _mood__hoon__ut_seek_a[] = {{".2", u3_cwfu_seek}, {}}; -static u3_cs_harm _mood__hoon__ut_seep_a[] = {{".2", u3_cwfu_seep}, {}}; -static u3_cs_harm _mood__hoon__ut_snub_a[] = {{".2", u3_cwfu_snub}, {}}; -static u3_cs_harm _mood__hoon__ut_tock_a[] = {{".2", u3_cwfu_tock}, {}}; -static u3_cs_harm _mood__hoon__ut_wrap_a[] = {{".2", u3_cwfu_wrap}, {}}; +static u3_ce_harm _mood__hoon__ut_busk_a[] = {{".2", u3_cwfu_busk}, {}}; +static u3_ce_harm _mood__hoon__ut_bust_a[] = {{".2", u3_cwfu_bust}, {}}; +static u3_ce_harm _mood__hoon__ut_conk_a[] = {{".2", u3_cwfu_conk}, {}}; +static u3_ce_harm _mood__hoon__ut_crop_a[] = {{".2", u3_cwfu_crop}, {}}; +static u3_ce_harm _mood__hoon__ut_cull_a[] = {{".2", u3_cwfu_cull}, {}}; +static u3_ce_harm _mood__hoon__ut_find_a[] = {{".2", u3_cwfu_find}, {}}; +static u3_ce_harm _mood__hoon__ut_fino_a[] = {{".2", u3_cwfu_fino}, {}}; +static u3_ce_harm _mood__hoon__ut_fink_a[] = {{".2", u3_cwfu_fink}, {}}; +static u3_ce_harm _mood__hoon__ut_fire_a[] = {{".2", u3_cwfu_fire}, {}}; +static u3_ce_harm _mood__hoon__ut_firm_a[] = {{".2", u3_cwfu_firm}, {}}; +static u3_ce_harm _mood__hoon__ut_fish_a[] = {{".2", u3_cwfu_fish}, {}}; +static u3_ce_harm _mood__hoon__ut_fuse_a[] = {{".2", u3_cwfu_fuse}, {}}; +static u3_ce_harm _mood__hoon__ut_heal_a[] = {{".2", u3_cwfu_heal}, {}}; +static u3_ce_harm _mood__hoon__ut_mint_a[] = {{".2", u3_cwfu_mint}, {}}; +static u3_ce_harm _mood__hoon__ut_mull_a[] = {{".2", u3_cwfu_mull}, {}}; +static u3_ce_harm _mood__hoon__ut_nest_a[] = {{".2", u3_cwfu_nest}, {}}; +static u3_ce_harm _mood__hoon__ut_park_a[] = {{".2", u3_cwfu_park}, {}}; +static u3_ce_harm _mood__hoon__ut_peek_a[] = {{".2", u3_cwfu_peek}, {}}; +static u3_ce_harm _mood__hoon__ut_play_a[] = {{".2", u3_cwfu_play}, {}}; +static u3_ce_harm _mood__hoon__ut_rest_a[] = {{".2", u3_cwfu_rest}, {}}; +static u3_ce_harm _mood__hoon__ut_seek_a[] = {{".2", u3_cwfu_seek}, {}}; +static u3_ce_harm _mood__hoon__ut_seep_a[] = {{".2", u3_cwfu_seep}, {}}; +static u3_ce_harm _mood__hoon__ut_snub_a[] = {{".2", u3_cwfu_snub}, {}}; +static u3_ce_harm _mood__hoon__ut_tock_a[] = {{".2", u3_cwfu_tock}, {}}; +static u3_ce_harm _mood__hoon__ut_wrap_a[] = {{".2", u3_cwfu_wrap}, {}}; -static u3_cs_core _mood__hoon__ut_d[] = +static u3_ce_core _mood__hoon__ut_d[] = { { "busk", _mood__hoon__ut_busk_a }, { "bust", _mood__hoon__ut_bust_a }, @@ -311,13 +311,13 @@ static u3_cs_core _mood__hoon__ut_d[] = { "wrap", _mood__hoon__ut_wrap_a }, {} }; -static u3_cs_harm _mood__hoon__ut_a[] = +static u3_ce_harm _mood__hoon__ut_a[] = { {"burn", u3_cwfu_burn}, {"repo", u3_cwfu_repo}, {} }; -static u3_cs_harm _mood__hoon__ap_a[] = +static u3_ce_harm _mood__hoon__ap_a[] = { // {"hack", u3_cwfp_open}, // {"late", u3_cwfp_open}, {"open", u3_cwfp_open}, @@ -326,14 +326,14 @@ static u3_cs_harm _mood__hoon__ap_a[] = }; #if 0 -static u3_cs_harm _mood__hoon__al_a[] = +static u3_ce_harm _mood__hoon__al_a[] = { {"bunt", u3_cwfl_bunt}, {"whip", u3_cwfl_whip}, {} }; #endif -static u3_cs_core _mood__hoon_d[] = +static u3_ce_core _mood__hoon_d[] = { { "add", _mood__hoon_add_a }, { "dec", _mood__hoon_dec_a }, { "div", _mood__hoon_div_a }, @@ -455,22 +455,22 @@ static u3_cs_core _mood__hoon_d[] = {} }; -static u3_cs_core _mood_d[] = +static u3_ce_core _mood_d[] = { { "hoon", 0, _mood__hoon_d }, {} }; -static u3_cs_core _k164_d[] = +static u3_ce_core _k164_d[] = { { "mood", 0, _mood_d }, {} }; -static u3_cs_core _d[] = { +static u3_ce_core _d[] = { { "k164", 0, _k164_d}, {} }; -u3_cs_dash +u3_ce_dash u3_Dash = { _d, 0, diff --git a/v/loop.c b/v/loop.c index 999a68879d..551f87bf54 100644 --- a/v/loop.c +++ b/v/loop.c @@ -345,8 +345,8 @@ _lo_time(void) void u3_lo_open(void) { - if ( (u3H->rod_u.how.fag_w & u3_cs_flag_gc) || - (u3H->rod_u.how.fag_w & u3_cs_flag_debug) ) + if ( (u3H->rod_u.how.fag_w & u3_ca_flag_gc) || + (u3H->rod_u.how.fag_w & u3_ca_flag_debug) ) { u3_ce_grab("lo_open", u3_none); } diff --git a/v/raft.c b/v/raft.c index 44de8e2f66..3864da6f1c 100644 --- a/v/raft.c +++ b/v/raft.c @@ -1621,13 +1621,13 @@ _raft_punk(u3_noun ovo) static void _raft_comm(c3_d bid_d) { - u3p(u3_cs_cart) egg_p; + u3p(u3_cv_cart) egg_p; u3_lo_open(); egg_p = u3A->ova.egg_p; while ( egg_p ) { - u3_cs_cart* egg_u = u3to(u3_cs_cart, egg_p); + u3_cv_cart* egg_u = u3to(u3_cv_cart, egg_p); if ( egg_u->ent_d <= bid_d ) { egg_u->cit = c3y; @@ -1707,8 +1707,8 @@ u3_raft_work(void) // Delete finished events. // while ( u3A->ova.egg_p ) { - u3p(u3_cs_cart) egg_p = u3A->ova.egg_p; - u3_cs_cart* egg_u = u3to(u3_cs_cart, u3A->ova.egg_p); + u3p(u3_cv_cart) egg_p = u3A->ova.egg_p; + u3_cv_cart* egg_u = u3to(u3_cv_cart, u3A->ova.egg_p); if ( c3y == egg_u->did ) { vir = egg_u->vir; @@ -1764,8 +1764,8 @@ u3_raft_work(void) u3z(ova); ova = nex; if ( u3_nul != ovo ) { - u3_cs_cart* egg_u = u3_ca_malloc(sizeof(*egg_u)); - u3p(u3_cs_cart) egg_p = u3of(u3_cs_cart, egg_u); + u3_cv_cart* egg_u = u3_ca_malloc(sizeof(*egg_u)); + u3p(u3_cv_cart) egg_p = u3of(u3_cv_cart, egg_u); egg_u->nex_p = 0; egg_u->cit = c3n; @@ -1789,8 +1789,8 @@ u3_raft_work(void) u3A->ova.geg_p = u3A->ova.egg_p = egg_p; } else { - c3_assert(0 == u3to(u3_cs_cart, u3A->ova.geg_p)->nex_p); - u3to(u3_cs_cart, u3A->ova.geg_p)->nex_p = egg_p; + c3_assert(0 == u3to(u3_cv_cart, u3A->ova.geg_p)->nex_p); + u3to(u3_cv_cart, u3A->ova.geg_p)->nex_p = egg_p; u3A->ova.geg_p = egg_p; } _raft_kick_all(vir); From 4855a9d1d88cc98d7249dad7d45d5640a1cd99d4 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 5 Nov 2014 16:20:01 -0800 Subject: [PATCH 08/14] Another great renaming. --- Spec/u3.md | 1 - g/a.c | 554 +++++++++++++++++++++++++------------------------- g/e.c | 206 +++++++++---------- g/h.c | 294 +++++++++++++-------------- g/i.c | 128 ++++++------ g/j.c | 230 ++++++++++----------- g/m.c | 282 ++++++++++++------------- g/n.c | 176 ++++++++-------- g/r.c | 438 +++++++++++++++++++-------------------- g/t.c | 60 +++--- g/v.c | 222 ++++++++++---------- g/x.c | 46 ++--- g/z.c | 44 ++-- i/all.h | 41 ++-- i/g/a.h | 322 ++++++++++++++--------------- i/g/e.h | 60 +++--- i/g/h.h | 88 ++++---- i/g/i.h | 44 ++-- i/g/j.h | 72 +++---- i/g/m.h | 120 +++++------ i/g/n.h | 32 +-- i/g/r.h | 188 ++++++++--------- i/g/t.h | 44 ++-- i/g/v.h | 122 +++++------ i/g/x.h | 38 ++-- i/g/z.h | 24 +-- j/1/add.c | 14 +- j/1/dec.c | 14 +- j/1/div.c | 14 +- j/1/gte.c | 10 +- j/1/gth.c | 10 +- j/1/lte.c | 10 +- j/1/lth.c | 10 +- j/1/mod.c | 12 +- j/1/mul.c | 14 +- j/1/sub.c | 16 +- j/2/bind.c | 6 +- j/2/clap.c | 10 +- j/2/drop.c | 2 +- j/2/flop.c | 6 +- j/2/lent.c | 8 +- j/2/levy.c | 10 +- j/2/lien.c | 10 +- j/2/need.c | 6 +- j/2/reel.c | 10 +- j/2/roll.c | 16 +- j/2/scag.c | 10 +- j/2/skim.c | 10 +- j/2/skip.c | 4 +- j/2/slag.c | 8 +- j/2/snag.c | 12 +- j/2/sort.c | 6 +- j/2/turn.c | 8 +- j/2/weld.c | 6 +- j/3/bex.c | 10 +- j/3/can.c | 26 +-- j/3/cap.c | 10 +- j/3/cat.c | 28 +-- j/3/con.c | 20 +- j/3/cut.c | 28 +-- j/3/dis.c | 18 +- j/3/dor.c | 8 +- j/3/end.c | 24 +-- j/3/gor.c | 8 +- j/3/hor.c | 6 +- j/3/lsh.c | 30 +-- j/3/mas.c | 8 +- j/3/met.c | 14 +- j/3/mix.c | 18 +- j/3/mug.c | 6 +- j/3/peg.c | 6 +- j/3/po.c | 24 +-- j/3/rap.c | 28 +-- j/3/rip.c | 24 +-- j/3/rsh.c | 26 +-- j/3/vor.c | 8 +- j/4/by_gas.c | 12 +- j/4/by_get.c | 16 +- j/4/by_has.c | 14 +- j/4/by_int.c | 32 +-- j/4/by_put.c | 22 +- j/4/by_uni.c | 32 +-- j/4/in_gas.c | 10 +- j/4/in_has.c | 12 +- j/4/in_int.c | 22 +- j/4/in_mer.c | 22 +- j/4/in_put.c | 18 +- j/4/in_tap.c | 10 +- j/4/in_uni.c | 32 +-- j/5/aesc.c | 36 ++-- j/5/cue.c | 18 +- j/5/ed_puck.c | 12 +- j/5/ed_sign.c | 16 +- j/5/ed_veri.c | 16 +- j/5/jam.c | 28 +-- j/5/lore.c | 14 +- j/5/loss.c | 18 +- j/5/mat.c | 4 +- j/5/mink.c | 10 +- j/5/mule.c | 8 +- j/5/parse.c | 310 ++++++++++++++-------------- j/5/rd.c | 80 ++++---- j/5/repg.c | 26 +-- j/5/rexp.c | 18 +- j/5/rub.c | 10 +- j/5/shax.c | 38 ++-- j/5/tape.c | 4 +- j/5/trip.c | 6 +- j/6/al.c | 12 +- j/6/ap.c | 60 +++--- j/6/bull.c | 4 +- j/6/cell.c | 4 +- j/6/comb.c | 18 +- j/6/cons.c | 20 +- j/6/core.c | 4 +- j/6/cube.c | 4 +- j/6/face.c | 4 +- j/6/fine.c | 8 +- j/6/fitz.c | 18 +- j/6/flan.c | 8 +- j/6/flay.c | 6 +- j/6/flip.c | 6 +- j/6/flor.c | 8 +- j/6/fork.c | 6 +- j/6/hike.c | 10 +- j/6/look.c | 16 +- j/6/slot.c | 14 +- j/6/type.c | 14 +- j/6/ut.c | 24 +-- j/6/ut_burn.c | 34 ++-- j/6/ut_busk.c | 10 +- j/6/ut_bust.c | 14 +- j/6/ut_conk.c | 14 +- j/6/ut_crop.c | 48 ++--- j/6/ut_cull.c | 38 ++-- j/6/ut_find.c | 174 ++++++++-------- j/6/ut_fink.c | 26 +-- j/6/ut_fire.c | 38 ++-- j/6/ut_firm.c | 34 ++-- j/6/ut_fish.c | 38 ++-- j/6/ut_fuse.c | 36 ++-- j/6/ut_gain.c | 6 +- j/6/ut_heal.c | 40 ++-- j/6/ut_lose.c | 6 +- j/6/ut_mint.c | 120 +++++------ j/6/ut_mull.c | 128 ++++++------ j/6/ut_nest.c | 112 +++++----- j/6/ut_park.c | 34 ++-- j/6/ut_peek.c | 52 ++--- j/6/ut_play.c | 80 ++++---- j/6/ut_repo.c | 22 +- j/6/ut_rest.c | 16 +- j/6/ut_seek.c | 50 ++--- j/6/ut_sift.c | 8 +- j/6/ut_swab.c | 8 +- j/6/ut_tack.c | 8 +- j/6/ut_tock.c | 18 +- j/6/ut_wrap.c | 20 +- j/dash.c | 366 ++++++++++++++++----------------- v/ames.c | 30 +-- v/batz.c | 4 +- v/cttp.c | 26 +-- v/http.c | 28 +-- v/loop.c | 48 ++--- v/main.c | 8 +- v/raft.c | 50 ++--- v/reck.c | 28 +-- v/save.c | 4 +- v/sist.c | 94 ++++----- v/temp.c | 4 +- v/term.c | 42 ++-- v/time.c | 14 +- v/unix.c | 90 ++++---- v/walk.c | 32 +-- 174 files changed, 3905 insertions(+), 3915 deletions(-) diff --git a/Spec/u3.md b/Spec/u3.md index f1143455ef..12fe9c385b 100644 --- a/Spec/u3.md +++ b/Spec/u3.md @@ -168,7 +168,6 @@ In short, use `_()` to turn a loobean into a boolean, `__` to go the other way. Use `!` as usual, `c3y` for yes and `c3n` for no, `c3a` for and and `c3o` for or. - ## u3: introduction to the noun world diff --git a/g/a.c b/g/a.c index 490fc07d50..56f2ab4a9c 100644 --- a/g/a.c +++ b/g/a.c @@ -31,10 +31,10 @@ _box_slot(c3_w siz_w) /* _box_make(): construct a box. */ -u3_ca_box* +u3a_box* _box_make(void* box_v, c3_w siz_w, c3_w use_w) { - u3_ca_box* box_u = box_v; + u3a_box* box_u = box_v; c3_w* box_w = box_v; c3_assert(siz_w >= u3_cc_minimum); @@ -55,10 +55,10 @@ _box_make(void* box_v, c3_w siz_w, c3_w use_w) /* _box_attach(): attach a box to the free list. */ void -_box_attach(u3_ca_box* box_u) +_box_attach(u3a_box* box_u) { - c3_assert(box_u->siz_w >= (1 + c3_wiseof(u3_ca_fbox))); - c3_assert(0 != u3of(u3_ca_fbox, box_u)); + c3_assert(box_u->siz_w >= (1 + c3_wiseof(u3a_fbox))); + c3_assert(0 != u3of(u3a_fbox, box_u)); #if 0 // For debugging, fill the box with beef. @@ -66,7 +66,7 @@ _box_attach(u3_ca_box* box_u) c3_w* box_w = (void *)box_u; c3_w i_w; - for ( i_w = c3_wiseof(u3_ca_box); (i_w + 1) < box_u->siz_w; i_w++ ) { + for ( i_w = c3_wiseof(u3a_box); (i_w + 1) < box_u->siz_w; i_w++ ) { box_w[i_w] = 0xdeadbeef; } } @@ -75,14 +75,14 @@ _box_attach(u3_ca_box* box_u) u3R->all.fre_w += box_u->siz_w; { c3_w sel_w = _box_slot(box_u->siz_w); - u3p(u3_ca_fbox) fre_p = u3of(u3_ca_fbox, box_u); - u3p(u3_ca_fbox)* pfr_p = &u3R->all.fre_p[sel_w]; - u3p(u3_ca_fbox) nex_p = *pfr_p; + u3p(u3a_fbox) fre_p = u3of(u3a_fbox, box_u); + u3p(u3a_fbox)* pfr_p = &u3R->all.fre_p[sel_w]; + u3p(u3a_fbox) nex_p = *pfr_p; - u3to(u3_ca_fbox, fre_p)->pre_p = 0; - u3to(u3_ca_fbox, fre_p)->nex_p = nex_p; - if ( u3to(u3_ca_fbox, fre_p)->nex_p ) { - u3to(u3_ca_fbox, u3to(u3_ca_fbox, fre_p)->nex_p)->pre_p = fre_p; + u3to(u3a_fbox, fre_p)->pre_p = 0; + u3to(u3a_fbox, fre_p)->nex_p = nex_p; + if ( u3to(u3a_fbox, fre_p)->nex_p ) { + u3to(u3a_fbox, u3to(u3a_fbox, fre_p)->nex_p)->pre_p = fre_p; } (*pfr_p) = fre_p; } @@ -91,21 +91,21 @@ _box_attach(u3_ca_box* box_u) /* _box_detach(): detach a box from the free list. */ void -_box_detach(u3_ca_box* box_u) +_box_detach(u3a_box* box_u) { - u3p(u3_ca_fbox) fre_p = u3of(u3_ca_fbox, box_u); - u3p(u3_ca_fbox) pre_p = u3to(u3_ca_fbox, fre_p)->pre_p; - u3p(u3_ca_fbox) nex_p = u3to(u3_ca_fbox, fre_p)->nex_p; + u3p(u3a_fbox) fre_p = u3of(u3a_fbox, box_u); + u3p(u3a_fbox) pre_p = u3to(u3a_fbox, fre_p)->pre_p; + u3p(u3a_fbox) nex_p = u3to(u3a_fbox, fre_p)->nex_p; u3R->all.fre_w -= box_u->siz_w; if ( nex_p ) { - c3_assert(u3to(u3_ca_fbox, nex_p)->pre_p == fre_p); - u3to(u3_ca_fbox, nex_p)->pre_p = pre_p; + c3_assert(u3to(u3a_fbox, nex_p)->pre_p == fre_p); + u3to(u3a_fbox, nex_p)->pre_p = pre_p; } if ( pre_p ) { - c3_assert(u3to(u3_ca_fbox, pre_p)->nex_p == fre_p); - u3to(u3_ca_fbox, pre_p)->nex_p = nex_p; + c3_assert(u3to(u3a_fbox, pre_p)->nex_p == fre_p); + u3to(u3a_fbox, pre_p)->nex_p = nex_p; } else { c3_w sel_w = _box_slot(box_u->siz_w); @@ -120,21 +120,21 @@ _box_detach(u3_ca_box* box_u) static c3_w* _me_road_all_hat(c3_w len_w) { - if ( len_w > u3_ca_open(u3R) ) { - u3_cm_bail(c3__meme); return 0; + if ( len_w > u3a_open(u3R) ) { + u3m_bail(c3__meme); return 0; } - if ( c3y == u3_ca_is_north(u3R) ) { + if ( c3y == u3a_is_north(u3R) ) { u3_post all_p; all_p = u3R->hat_p; u3R->hat_p += len_w; - return u3_ca_into(all_p); + return u3a_into(all_p); } else { u3R->hat_p -= len_w; - return u3_ca_into(u3R->hat_p); + return u3a_into(u3R->hat_p); } } @@ -144,34 +144,34 @@ _me_road_all_hat(c3_w len_w) static c3_w* _me_road_all_cap(c3_w len_w) { - if ( len_w > u3_ca_open(u3R) ) { - u3_cm_bail(c3__meme); return 0; + if ( len_w > u3a_open(u3R) ) { + u3m_bail(c3__meme); return 0; } - if ( c3y == u3_ca_is_north(u3R) ) { + if ( c3y == u3a_is_north(u3R) ) { u3R->cap_p -= len_w; - return u3_ca_into(u3R->cap_p); + return u3a_into(u3R->cap_p); } else { u3_post all_p; all_p = u3R->cap_p; u3R->cap_p += len_w; - return u3_ca_into(all_p); + return u3a_into(all_p); } } #endif #if 0 -/* u3_ca_sane(): check allocator sanity. +/* u3a_sane(): check allocator sanity. */ void -u3_ca_sane(void) +u3a_sane(void) { c3_w i_w; for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) { - u3_ca_fbox* fre_u = u3R->all.fre_u[i_w]; + u3a_fbox* fre_u = u3R->all.fre_u[i_w]; while ( fre_u ) { if ( fre_u == u3R->all.fre_u[i_w] ) { @@ -190,12 +190,12 @@ u3_ca_sane(void) } #endif -/* _ca_walloc(): u3_ca_walloc() internals. +/* _ca_walloc(): u3a_walloc() internals. */ static void* _ca_walloc(c3_w len_w) { - c3_w siz_w = c3_max(u3_cc_minimum, u3_ca_boxed(len_w)); + c3_w siz_w = c3_max(u3_cc_minimum, u3a_boxed(len_w)); c3_w sel_w = _box_slot(siz_w); // XX: this logic is totally bizarre, but preserve it. @@ -206,7 +206,7 @@ _ca_walloc(c3_w len_w) // fprintf(stderr, "walloc %d: *pfr_p %x\n", len_w, u3R->all.fre_p[sel_w]); while ( 1 ) { - u3p(u3_ca_fbox) *pfr_p = &u3R->all.fre_p[sel_w]; + u3p(u3a_fbox) *pfr_p = &u3R->all.fre_p[sel_w]; while ( 1 ) { if ( 0 == *pfr_p ) { @@ -217,38 +217,38 @@ _ca_walloc(c3_w len_w) else { /* Nothing in top free list. Chip away at the hat. */ - return u3_ca_boxto(_box_make(_me_road_all_hat(siz_w), siz_w, 1)); + return u3a_boxto(_box_make(_me_road_all_hat(siz_w), siz_w, 1)); } } else { - if ( siz_w > u3to(u3_ca_fbox, *pfr_p)->box_u.siz_w ) { + if ( siz_w > u3to(u3a_fbox, *pfr_p)->box_u.siz_w ) { /* This free block is too small. Continue searching. */ - pfr_p = &(u3to(u3_ca_fbox, *pfr_p)->nex_p); + pfr_p = &(u3to(u3a_fbox, *pfr_p)->nex_p); continue; } else { - u3_ca_box* box_u = &(u3to(u3_ca_fbox, *pfr_p)->box_u); + u3a_box* box_u = &(u3to(u3a_fbox, *pfr_p)->box_u); /* We have found a free block of adequate size. Remove it ** from the free list. */ { { - c3_assert((0 == u3to(u3_ca_fbox, *pfr_p)->pre_p) || - (u3to(u3_ca_fbox, u3to(u3_ca_fbox, *pfr_p)->pre_p)->nex_p + c3_assert((0 == u3to(u3a_fbox, *pfr_p)->pre_p) || + (u3to(u3a_fbox, u3to(u3a_fbox, *pfr_p)->pre_p)->nex_p == (*pfr_p))); - c3_assert((0 == u3to(u3_ca_fbox, *pfr_p)->nex_p) || - (u3to(u3_ca_fbox, u3to(u3_ca_fbox, *pfr_p)->nex_p)->pre_p + c3_assert((0 == u3to(u3a_fbox, *pfr_p)->nex_p) || + (u3to(u3a_fbox, u3to(u3a_fbox, *pfr_p)->nex_p)->pre_p == (*pfr_p))); } - if ( 0 != u3to(u3_ca_fbox, *pfr_p)->nex_p ) { - u3to(u3_ca_fbox, u3to(u3_ca_fbox, *pfr_p)->nex_p)->pre_p = - u3to(u3_ca_fbox, *pfr_p)->pre_p; + if ( 0 != u3to(u3a_fbox, *pfr_p)->nex_p ) { + u3to(u3a_fbox, u3to(u3a_fbox, *pfr_p)->nex_p)->pre_p = + u3to(u3a_fbox, *pfr_p)->pre_p; } - *pfr_p = u3to(u3_ca_fbox, *pfr_p)->nex_p; + *pfr_p = u3to(u3a_fbox, *pfr_p)->nex_p; } /* If we can chop off another block, do it. @@ -261,7 +261,7 @@ _ca_walloc(c3_w len_w) c3_w lef_w = (box_u->siz_w - siz_w); _box_attach(_box_make(end_w, lef_w, 0)); - return u3_ca_boxto(_box_make(box_w, siz_w, 1)); + return u3a_boxto(_box_make(box_w, siz_w, 1)); } else { c3_assert(0 == box_u->use_w); @@ -270,7 +270,7 @@ _ca_walloc(c3_w len_w) #ifdef U3_MEMORY_DEBUG box_u->cod_w = u3_Code; #endif - return u3_ca_boxto(box_u); + return u3a_boxto(box_u); } } } @@ -280,21 +280,21 @@ _ca_walloc(c3_w len_w) int FOO; -/* u3_ca_walloc(): allocate storage words on hat. +/* u3a_walloc(): allocate storage words on hat. */ void* -u3_ca_walloc(c3_w len_w) +u3a_walloc(c3_w len_w) { void* ptr_v = _ca_walloc(len_w); #if 0 if ( (703 == u3_Code) && - u3_ca_botox(ptr_v) == (u3_ca_box*)(void *)0x200dfe3e4 ) { + u3a_botox(ptr_v) == (u3a_box*)(void *)0x200dfe3e4 ) { static int xuc_i; printf("xuc_i %d\r\n", xuc_i); if ( 1 == xuc_i ) { - u3_ca_box* box_u = u3_ca_botox(ptr_v); + u3a_box* box_u = u3a_botox(ptr_v); box_u->cod_w = 999; FOO = 1; @@ -306,53 +306,53 @@ u3_ca_walloc(c3_w len_w) return ptr_v; } -/* u3_ca_malloc(): allocate storage measured in bytes. +/* u3a_malloc(): allocate storage measured in bytes. */ void* -u3_ca_malloc(c3_w len_w) +u3a_malloc(c3_w len_w) { - return u3_ca_walloc((len_w + 3) >> 2); + return u3a_walloc((len_w + 3) >> 2); } -/* u3_ca_wealloc(): realloc in words. +/* u3a_wealloc(): realloc in words. */ void* -u3_ca_wealloc(void* lag_v, c3_w len_w) +u3a_wealloc(void* lag_v, c3_w len_w) { if ( !lag_v ) { - return u3_ca_malloc(len_w); + return u3a_malloc(len_w); } else { - u3_ca_box* box_u = u3_ca_botox(lag_v); + u3a_box* box_u = u3a_botox(lag_v); c3_w* old_w = lag_v; c3_w tiz_w = c3_min(box_u->siz_w, len_w); { - c3_w* new_w = u3_ca_walloc(len_w); + c3_w* new_w = u3a_walloc(len_w); c3_w i_w; for ( i_w = 0; i_w < tiz_w; i_w++ ) { new_w[i_w] = old_w[i_w]; } - u3_ca_free(lag_v); + u3a_free(lag_v); return new_w; } } } -/* u3_ca_realloc(): realloc in bytes. +/* u3a_realloc(): realloc in bytes. */ void* -u3_ca_realloc(void* lag_v, c3_w len_w) +u3a_realloc(void* lag_v, c3_w len_w) { - return u3_ca_wealloc(lag_v, (len_w + 3) >> 2); + return u3a_wealloc(lag_v, (len_w + 3) >> 2); } -/* u3_ca_free(): free storage. +/* u3a_free(): free storage. */ void -u3_ca_free(void* tox_v) +u3a_free(void* tox_v) { - u3_ca_box* box_u = u3_ca_botox(tox_v); + u3a_box* box_u = u3a_botox(tox_v); c3_w* box_w = (c3_w *)(void *)box_u; c3_assert(box_u->use_w != 0); @@ -365,18 +365,18 @@ u3_ca_free(void* tox_v) { c3_w i_w; - for ( i_w = c3_wiseof(u3_ca_box); (i_w + 1) < box_u->siz_w; i_w++ ) { + for ( i_w = c3_wiseof(u3a_box); (i_w + 1) < box_u->siz_w; i_w++ ) { box_w[i_w] = 0xdeadbeef; } } #endif - if ( c3y == u3_ca_is_north(u3R) ) { + if ( c3y == u3a_is_north(u3R) ) { /* Try to coalesce with the block below. */ - if ( box_w != u3_ca_into(u3R->rut_p) ) { + if ( box_w != u3a_into(u3R->rut_p) ) { c3_w laz_w = *(box_w - 1); - u3_ca_box* pox_u = (u3_ca_box*)(void *)(box_w - laz_w); + u3a_box* pox_u = (u3a_box*)(void *)(box_w - laz_w); if ( 0 == pox_u->use_w ) { _box_detach(pox_u); @@ -389,11 +389,11 @@ u3_ca_free(void* tox_v) /* Try to coalesce with the block above, or the wilderness. */ - if ( (box_w + box_u->siz_w) == u3_ca_into(u3R->hat_p) ) { - u3R->hat_p = u3_ca_outa(box_w); + if ( (box_w + box_u->siz_w) == u3a_into(u3R->hat_p) ) { + u3R->hat_p = u3a_outa(box_w); } else { - u3_ca_box* nox_u = (u3_ca_box*)(void *)(box_w + box_u->siz_w); + u3a_box* nox_u = (u3a_box*)(void *)(box_w + box_u->siz_w); if ( 0 == nox_u->use_w ) { _box_detach(nox_u); @@ -405,8 +405,8 @@ u3_ca_free(void* tox_v) else { /* Try to coalesce with the block above. */ - if ( (box_w + box_u->siz_w) != u3_ca_into(u3R->rut_p) ) { - u3_ca_box* nox_u = (u3_ca_box*)(void *)(box_w + box_u->siz_w); + if ( (box_w + box_u->siz_w) != u3a_into(u3R->rut_p) ) { + u3a_box* nox_u = (u3a_box*)(void *)(box_w + box_u->siz_w); if ( 0 == nox_u->use_w ) { _box_detach(nox_u); @@ -416,12 +416,12 @@ u3_ca_free(void* tox_v) /* Try to coalesce with the block below, or with the wilderness. */ - if ( box_w == u3_ca_into(u3R->hat_p) ) { - u3R->hat_p = u3_ca_outa(box_w + box_u->siz_w); + if ( box_w == u3a_into(u3R->hat_p) ) { + u3R->hat_p = u3a_outa(box_w + box_u->siz_w); } else { c3_w laz_w = *(box_w - 1); - u3_ca_box* pox_u = (u3_ca_box*)(void *)(box_w - laz_w); + u3a_box* pox_u = (u3a_box*)(void *)(box_w - laz_w); if ( 0 == pox_u->use_w ) { _box_detach(pox_u); @@ -440,24 +440,24 @@ static void _me_wash_north(u3_noun dog); static void _me_wash_north_in(u3_noun som) { - if ( _(u3_ca_is_cat(som)) ) return; - if ( !_(u3_ca_north_is_junior(u3R, som)) ) return; + if ( _(u3a_is_cat(som)) ) return; + if ( !_(u3a_north_is_junior(u3R, som)) ) return; _me_wash_north(som); } static void _me_wash_north(u3_noun dog) { - c3_assert(c3y == u3_ca_is_dog(dog)); - // c3_assert(c3y == u3_ca_north_is_junior(u3R, dog)); + c3_assert(c3y == u3a_is_dog(dog)); + // c3_assert(c3y == u3a_north_is_junior(u3R, dog)); { - u3_ca_noun* dog_u = u3_ca_to_ptr(dog); + u3a_noun* dog_u = u3a_to_ptr(dog); if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } - if ( _(u3_ca_is_pom(dog)) ) { - u3_ca_cell* god_u = (u3_ca_cell *)(void *)dog_u; + if ( _(u3a_is_pom(dog)) ) { + u3a_cell* god_u = (u3a_cell *)(void *)dog_u; _me_wash_north_in(god_u->hed); _me_wash_north_in(god_u->tel); @@ -471,24 +471,24 @@ static void _me_wash_south(u3_noun dog); static void _me_wash_south_in(u3_noun som) { - if ( _(u3_ca_is_cat(som)) ) return; - if ( !_(u3_ca_south_is_junior(u3R, som)) ) return; + if ( _(u3a_is_cat(som)) ) return; + if ( !_(u3a_south_is_junior(u3R, som)) ) return; _me_wash_south(som); } static void _me_wash_south(u3_noun dog) { - c3_assert(c3y == u3_ca_is_dog(dog)); - // c3_assert(c3y == u3_ca_south_is_junior(u3R, dog)); + c3_assert(c3y == u3a_is_dog(dog)); + // c3_assert(c3y == u3a_south_is_junior(u3R, dog)); { - u3_ca_noun* dog_u = u3_ca_to_ptr(dog); + u3a_noun* dog_u = u3a_to_ptr(dog); if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } - if ( _(u3_ca_is_pom(dog)) ) { - u3_ca_cell* god_u = (u3_ca_cell *)(void *)dog_u; + if ( _(u3a_is_pom(dog)) ) { + u3a_cell* god_u = (u3a_cell *)(void *)dog_u; _me_wash_south_in(god_u->hed); _me_wash_south_in(god_u->tel); @@ -496,21 +496,21 @@ _me_wash_south(u3_noun dog) } } -/* u3_ca_wash(): wash all lazy mugs. RETAIN. +/* u3a_wash(): wash all lazy mugs. RETAIN. */ void -u3_ca_wash(u3_noun som) +u3a_wash(u3_noun som) { - if ( _(u3_ca_is_cat(som)) ) { + if ( _(u3a_is_cat(som)) ) { return; } - if ( _(u3_ca_is_north(u3R)) ) { - if ( _(u3_ca_north_is_junior(u3R, som)) ) { + if ( _(u3a_is_north(u3R)) ) { + if ( _(u3a_north_is_junior(u3R, som)) ) { _me_wash_north(som); } } else { - if ( _(u3_ca_south_is_junior(u3R, som)) ) { + if ( _(u3a_south_is_junior(u3R, som)) ) { _me_wash_south(som); } } @@ -524,15 +524,15 @@ extern u3_noun BDA, BDB; static void _me_gain_use(u3_noun dog) { - c3_w* dog_w = u3_ca_to_ptr(dog); - u3_ca_box* box_u = u3_ca_botox(dog_w); + c3_w* dog_w = u3a_to_ptr(dog); + u3a_box* box_u = u3a_botox(dog_w); if ( 0x7fffffff == box_u->use_w ) { - u3_cm_bail(c3__fail); + u3m_bail(c3__fail); } else { if ( box_u->use_w == 0 ) { - u3_cm_bail(c3__foul); + u3m_bail(c3__foul); } box_u->use_w += 1; @@ -540,7 +540,7 @@ _me_gain_use(u3_noun dog) // if ( u3_Code && !box_u->cod_w ) { box_u->cod_w = u3_Code; } #if 0 - if ( u3_cr_mug(dog) == 0x15d47649 ) { + if ( u3r_mug(dog) == 0x15d47649 ) { static c3_w bug_w = 0; printf("bad %x %d %d\r\n", dog, bug_w, box_u->use_w); @@ -564,8 +564,8 @@ _me_gain_use(u3_noun dog) { static c3_w bug_w = 0; - if ( FOO && u3_ca_botox(u3_ca_to_ptr(dog)) == (void *)0x200dfe3e4 ) { - u3_ca_box* box_u = u3_ca_botox(u3_ca_to_ptr(dog)); + if ( FOO && u3a_botox(u3a_to_ptr(dog)) == (void *)0x200dfe3e4 ) { + u3a_box* box_u = u3a_botox(u3a_to_ptr(dog)); printf("GAIN %d %d\r\n", bug_w, box_u->use_w); if ( bug_w == 8 ) { abort(); } @@ -585,16 +585,16 @@ static u3_noun _me_copy_north_in(u3_noun som) { c3_assert(u3_none != som); - if ( _(u3_ca_is_cat(som)) ) { + if ( _(u3a_is_cat(som)) ) { return som; } else { u3_noun dog = som; - if ( _(u3_ca_north_is_senior(u3R, dog)) ) { + if ( _(u3a_north_is_senior(u3R, dog)) ) { return dog; } - else if ( _(u3_ca_north_is_junior(u3R, dog)) ) { + else if ( _(u3a_north_is_junior(u3R, dog)) ) { return _me_copy_north(dog); } else { @@ -608,33 +608,33 @@ _me_copy_north_in(u3_noun som) static u3_noun _me_copy_north(u3_noun dog) { - c3_assert(c3y == u3_ca_north_is_junior(u3R, dog)); + c3_assert(c3y == u3a_north_is_junior(u3R, dog)); - if ( !_(u3_ca_north_is_junior(u3R, dog)) ) { - if ( !_(u3_ca_north_is_senior(u3R, dog)) ) { + if ( !_(u3a_north_is_junior(u3R, dog)) ) { + if ( !_(u3a_north_is_senior(u3R, dog)) ) { _me_gain_use(dog); } return dog; } else { - u3_ca_noun* dog_u = u3_ca_to_ptr(dog); + u3a_noun* dog_u = u3a_to_ptr(dog); /* Borrow mug slot to record new destination. */ if ( dog_u->mug_w >> 31 ) { u3_noun nov = (u3_noun) dog_u->mug_w; - c3_assert(_(u3_ca_north_is_normal(u3R, nov))); + c3_assert(_(u3a_north_is_normal(u3R, nov))); _me_gain_use(nov); return nov; } else { - if ( c3y == u3_ca_is_pom(dog) ) { - u3_ca_cell* old_u = u3_ca_to_ptr(dog); - c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_ca_cell)); - u3_noun new = u3_ca_de_twin(dog, new_w); - u3_ca_cell* new_u = (u3_ca_cell*)(void *)new_w; + if ( c3y == u3a_is_pom(dog) ) { + u3a_cell* old_u = u3a_to_ptr(dog); + c3_w* new_w = u3a_walloc(c3_wiseof(u3a_cell)); + u3_noun new = u3a_de_twin(dog, new_w); + u3a_cell* new_u = (u3a_cell*)(void *)new_w; new_u->mug_w = old_u->mug_w; new_u->hed = _me_copy_north_in(old_u->hed); @@ -646,10 +646,10 @@ _me_copy_north(u3_noun dog) return new; } else { - u3_ca_atom* old_u = u3_ca_to_ptr(dog); - c3_w* new_w = u3_ca_walloc(old_u->len_w + c3_wiseof(u3_ca_atom)); - u3_noun new = u3_ca_de_twin(dog, new_w); - u3_ca_atom* new_u = (u3_ca_atom*)(void *)new_w; + u3a_atom* old_u = u3a_to_ptr(dog); + c3_w* new_w = u3a_walloc(old_u->len_w + c3_wiseof(u3a_atom)); + u3_noun new = u3a_de_twin(dog, new_w); + u3a_atom* new_u = (u3a_atom*)(void *)new_w; new_u->mug_w = old_u->mug_w; new_u->len_w = old_u->len_w; @@ -677,16 +677,16 @@ static u3_noun _me_copy_south_in(u3_noun som) { c3_assert(u3_none != som); - if ( _(u3_ca_is_cat(som)) ) { + if ( _(u3a_is_cat(som)) ) { return som; } else { u3_noun dog = som; - if ( _(u3_ca_south_is_senior(u3R, dog)) ) { + if ( _(u3a_south_is_senior(u3R, dog)) ) { return dog; } - else if ( _(u3_ca_south_is_junior(u3R, dog)) ) { + else if ( _(u3a_south_is_junior(u3R, dog)) ) { return _me_copy_south(dog); } else { @@ -700,35 +700,35 @@ _me_copy_south_in(u3_noun som) static u3_noun _me_copy_south(u3_noun dog) { - c3_assert(c3y == u3_ca_south_is_junior(u3R, dog)); + c3_assert(c3y == u3a_south_is_junior(u3R, dog)); - if ( !_(u3_ca_south_is_junior(u3R, dog)) ) { - if ( !_(u3_ca_south_is_senior(u3R, dog)) ) { + if ( !_(u3a_south_is_junior(u3R, dog)) ) { + if ( !_(u3a_south_is_senior(u3R, dog)) ) { _me_gain_use(dog); } return dog; } else { - u3_ca_noun* dog_u = u3_ca_to_ptr(dog); + u3a_noun* dog_u = u3a_to_ptr(dog); /* Borrow mug slot to record new destination. */ if ( dog_u->mug_w >> 31 ) { u3_noun nov = (u3_noun) dog_u->mug_w; - // printf("south: %p is already %p\r\n", dog_u, u3_ca_to_ptr(nov)); + // printf("south: %p is already %p\r\n", dog_u, u3a_to_ptr(nov)); - c3_assert(_(u3_ca_south_is_normal(u3R, nov))); + c3_assert(_(u3a_south_is_normal(u3R, nov))); _me_gain_use(nov); return nov; } else { - if ( c3y == u3_ca_is_pom(dog) ) { - u3_ca_cell* old_u = u3_ca_to_ptr(dog); - c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_ca_cell)); - u3_noun new = u3_ca_de_twin(dog, new_w); - u3_ca_cell* new_u = (u3_ca_cell*)(void *)new_w; + if ( c3y == u3a_is_pom(dog) ) { + u3a_cell* old_u = u3a_to_ptr(dog); + c3_w* new_w = u3a_walloc(c3_wiseof(u3a_cell)); + u3_noun new = u3a_de_twin(dog, new_w); + u3a_cell* new_u = (u3a_cell*)(void *)new_w; // printf("south: cell %p to %p\r\n", old_u, new_u); @@ -743,10 +743,10 @@ _me_copy_south(u3_noun dog) return new; } else { - u3_ca_atom* old_u = u3_ca_to_ptr(dog); - c3_w* new_w = u3_ca_walloc(old_u->len_w + c3_wiseof(u3_ca_atom)); - u3_noun new = u3_ca_de_twin(dog, new_w); - u3_ca_atom* new_u = (u3_ca_atom*)(void *)new_w; + u3a_atom* old_u = u3a_to_ptr(dog); + c3_w* new_w = u3a_walloc(old_u->len_w + c3_wiseof(u3a_atom)); + u3_noun new = u3a_de_twin(dog, new_w); + u3a_atom* new_u = (u3a_atom*)(void *)new_w; // printf("south: atom %p to %p\r\n", old_u, new_u); @@ -775,17 +775,17 @@ _me_copy_south(u3_noun dog) static u3_noun _me_take_north(u3_noun dog) { - if ( c3y == u3_ca_north_is_senior(u3R, dog) ) { + if ( c3y == u3a_north_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; } - else if ( c3y == u3_ca_north_is_junior(u3R, dog) ) { + else if ( c3y == u3a_north_is_junior(u3R, dog) ) { /* junior pointers are copied */ u3_noun mos = _me_copy_north(dog); - // printf("north: %p to %p\r\n", u3_ca_to_ptr(dog), u3_ca_to_ptr(mos)); + // printf("north: %p to %p\r\n", u3a_to_ptr(dog), u3a_to_ptr(mos)); return mos; } else { @@ -801,17 +801,17 @@ _me_take_north(u3_noun dog) static u3_noun _me_take_south(u3_noun dog) { - if ( c3y == u3_ca_south_is_senior(u3R, dog) ) { + if ( c3y == u3a_south_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; } - else if ( c3y == u3_ca_south_is_junior(u3R, dog) ) { + else if ( c3y == u3a_south_is_junior(u3R, dog) ) { /* junior pointers are copied */ u3_noun mos = _me_copy_south(dog); - // printf("south: %p to %p\r\n", u3_ca_to_ptr(dog), u3_ca_to_ptr(mos)); + // printf("south: %p to %p\r\n", u3a_to_ptr(dog), u3a_to_ptr(mos)); return mos; } else { @@ -822,35 +822,35 @@ _me_take_south(u3_noun dog) } } -/* u3_ca_take(): gain, copying juniors. +/* u3a_take(): gain, copying juniors. */ u3_noun -u3_ca_take(u3_noun som) +u3a_take(u3_noun som) { c3_assert(u3_none != som); - if ( _(u3_ca_is_cat(som)) ) { + if ( _(u3a_is_cat(som)) ) { return som; } else { - return _(u3_ca_is_north(u3R)) + return _(u3a_is_north(u3R)) ? _me_take_north(som) : _me_take_south(som); } } -/* u3_ca_left(): true of junior if preserved. +/* u3a_left(): true of junior if preserved. */ c3_o -u3_ca_left(u3_noun som) +u3a_left(u3_noun som) { - if ( _(u3_ca_is_cat(som)) || - !_(u3_ca_is_junior(u3R, som)) ) + if ( _(u3a_is_cat(som)) || + !_(u3a_is_junior(u3R, som)) ) { return c3y; } else { - u3_ca_noun* dog_u = u3_ca_to_ptr(som); + u3a_noun* dog_u = u3a_to_ptr(som); return __(0 != (dog_u->mug_w >> 31)); } @@ -861,7 +861,7 @@ u3_ca_left(u3_noun som) static u3_noun _me_gain_north(u3_noun dog) { - if ( c3y == u3_ca_north_is_senior(u3R, dog) ) { + if ( c3y == u3a_north_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; @@ -869,7 +869,7 @@ _me_gain_north(u3_noun dog) else { /* junior nouns are disallowed */ - c3_assert(!_(u3_ca_north_is_junior(u3R, dog))); + c3_assert(!_(u3a_north_is_junior(u3R, dog))); /* normal pointers are refcounted */ @@ -883,7 +883,7 @@ _me_gain_north(u3_noun dog) static u3_noun _me_gain_south(u3_noun dog) { - if ( c3y == u3_ca_south_is_senior(u3R, dog) ) { + if ( c3y == u3a_south_is_senior(u3R, dog) ) { /* senior pointers are not refcounted */ return dog; @@ -891,7 +891,7 @@ _me_gain_south(u3_noun dog) else { /* junior nouns are disallowed */ - c3_assert(!_(u3_ca_south_is_junior(u3R, dog))); + c3_assert(!_(u3a_south_is_junior(u3R, dog))); /* normal nouns are refcounted */ @@ -906,34 +906,34 @@ static void _me_lose_north(u3_noun dog) { top: - if ( c3y == u3_ca_north_is_normal(u3R, dog) ) { - c3_w* dog_w = u3_ca_to_ptr(dog); - u3_ca_box* box_u = u3_ca_botox(dog_w); + if ( c3y == u3a_north_is_normal(u3R, dog) ) { + c3_w* dog_w = u3a_to_ptr(dog); + u3a_box* box_u = u3a_botox(dog_w); if ( box_u->use_w > 1 ) { box_u->use_w -= 1; } else { if ( 0 == box_u->use_w ) { - u3_cm_bail(c3__foul); + u3m_bail(c3__foul); } else { - if ( _(u3_ca_is_pom(dog)) ) { - u3_ca_cell* dog_u = (void *)dog_w; + if ( _(u3a_is_pom(dog)) ) { + u3a_cell* dog_u = (void *)dog_w; u3_noun h_dog = dog_u->hed; u3_noun t_dog = dog_u->tel; - if ( !_(u3_ca_is_cat(h_dog)) ) { + if ( !_(u3a_is_cat(h_dog)) ) { _me_lose_north(h_dog); } - u3_ca_free(dog_w); - if ( !_(u3_ca_is_cat(t_dog)) ) { + u3a_free(dog_w); + if ( !_(u3a_is_cat(t_dog)) ) { dog = t_dog; goto top; } } else { - u3_ca_free(dog_w); + u3a_free(dog_w); } } } @@ -946,64 +946,64 @@ static void _me_lose_south(u3_noun dog) { top: - if ( c3y == u3_ca_south_is_normal(u3R, dog) ) { - c3_w* dog_w = u3_ca_to_ptr(dog); - u3_ca_box* box_u = u3_ca_botox(dog_w); + if ( c3y == u3a_south_is_normal(u3R, dog) ) { + c3_w* dog_w = u3a_to_ptr(dog); + u3a_box* box_u = u3a_botox(dog_w); if ( box_u->use_w > 1 ) { box_u->use_w -= 1; } else { if ( 0 == box_u->use_w ) { - u3_cm_bail(c3__foul); + u3m_bail(c3__foul); } else { - if ( _(u3_ca_is_pom(dog)) ) { - u3_ca_cell* dog_u = (void *)dog_w; + if ( _(u3a_is_pom(dog)) ) { + u3a_cell* dog_u = (void *)dog_w; u3_noun h_dog = dog_u->hed; u3_noun t_dog = dog_u->tel; - if ( !_(u3_ca_is_cat(h_dog)) ) { + if ( !_(u3a_is_cat(h_dog)) ) { _me_lose_south(h_dog); } - u3_ca_free(dog_w); - if ( !_(u3_ca_is_cat(t_dog)) ) { + u3a_free(dog_w); + if ( !_(u3a_is_cat(t_dog)) ) { dog = t_dog; goto top; } } else { - u3_ca_free(dog_w); + u3a_free(dog_w); } } } } } -/* u3_ca_gain(): gain a reference count in normal space. +/* u3a_gain(): gain a reference count in normal space. */ u3_noun -u3_ca_gain(u3_noun som) +u3a_gain(u3_noun som) { c3_assert(u3_none != som); - if ( _(u3_ca_is_cat(som)) ) { + if ( _(u3a_is_cat(som)) ) { return som; } else { - return _(u3_ca_is_north(u3R)) + return _(u3a_is_north(u3R)) ? _me_gain_north(som) : _me_gain_south(som); } } -/* u3_ca_lose(): lose a reference count. +/* u3a_lose(): lose a reference count. */ void -u3_ca_lose(u3_noun som) +u3a_lose(u3_noun som) { - if ( !_(u3_ca_is_cat(som)) ) { - if ( _(u3_ca_is_north(u3R)) ) { + if ( !_(u3a_is_cat(som)) ) { + if ( _(u3a_is_north(u3R)) ) { _me_lose_north(som); } else { _me_lose_south(som); @@ -1011,43 +1011,43 @@ u3_ca_lose(u3_noun som) } } -/* u3_ca_use(): reference count. +/* u3a_use(): reference count. */ c3_w -u3_ca_use(u3_noun som) +u3a_use(u3_noun som) { - if ( _(u3_ca_is_cat(som)) ) { + if ( _(u3a_is_cat(som)) ) { return 1; } else { - c3_w* dog_w = u3_ca_to_ptr(som); - u3_ca_box* box_u = u3_ca_botox(dog_w); + c3_w* dog_w = u3a_to_ptr(som); + u3a_box* box_u = u3a_botox(dog_w); return box_u->use_w; } } -/* u3_ca_mark_ptr(): mark a pointer for gc. Produce size if first mark. +/* u3a_mark_ptr(): mark a pointer for gc. Produce size if first mark. */ c3_w -u3_ca_mark_ptr(void* ptr_v) +u3a_mark_ptr(void* ptr_v) { - if ( _(u3_ca_is_north(u3R)) ) { - if ( !((ptr_v >= u3_ca_into(u3R->rut_p)) && - (ptr_v < u3_ca_into(u3R->hat_p))) ) + if ( _(u3a_is_north(u3R)) ) { + if ( !((ptr_v >= u3a_into(u3R->rut_p)) && + (ptr_v < u3a_into(u3R->hat_p))) ) { return 0; } } else { - if ( !((ptr_v >= u3_ca_into(u3R->hat_p)) && - (ptr_v < u3_ca_into(u3R->rut_p))) ) + if ( !((ptr_v >= u3a_into(u3R->hat_p)) && + (ptr_v < u3a_into(u3R->rut_p))) ) { return 0; } } { - u3_ca_box* box_u = u3_ca_botox(ptr_v); + u3a_box* box_u = u3a_botox(ptr_v); c3_w siz_w; #ifdef U3_MEMORY_DEBUG @@ -1083,20 +1083,20 @@ u3_ca_mark_ptr(void* ptr_v) } } -/* u3_ca_mark_noun(): mark a noun for gc. Produce size. +/* u3a_mark_noun(): mark a noun for gc. Produce size. */ c3_w -u3_ca_mark_noun(u3_noun som) +u3a_mark_noun(u3_noun som) { c3_w siz_w = 0; while ( 1 ) { - if ( _(u3_ca_is_senior(u3R, som)) ) { + if ( _(u3a_is_senior(u3R, som)) ) { return siz_w; } else { - c3_w* dog_w = u3_ca_to_ptr(som); - c3_w new_w = u3_ca_mark_ptr(dog_w); + c3_w* dog_w = u3a_to_ptr(som); + c3_w new_w = u3a_mark_ptr(dog_w); if ( 0 == new_w ) { return siz_w; @@ -1104,7 +1104,7 @@ u3_ca_mark_noun(u3_noun som) else { siz_w += new_w; if ( _(u3du(som)) ) { - siz_w += u3_ca_mark_noun(u3h(som)); + siz_w += u3a_mark_noun(u3h(som)); som = u3t(som); } else return siz_w; @@ -1113,10 +1113,10 @@ u3_ca_mark_noun(u3_noun som) } } -/* u3_ca_print_memory: print memory amount. +/* u3a_print_memory: print memory amount. */ void -u3_ca_print_memory(c3_c* cap_c, c3_w wor_w) +u3a_print_memory(c3_c* cap_c, c3_w wor_w) { c3_w byt_w = (wor_w * 4); c3_w gib_w = (byt_w / 1000000000); @@ -1141,10 +1141,10 @@ u3_ca_print_memory(c3_c* cap_c, c3_w wor_w) } } -/* u3_ca_sweep(): sweep a fully marked road. +/* u3a_sweep(): sweep a fully marked road. */ void -u3_ca_sweep(c3_c* cap_c) +u3a_sweep(c3_c* cap_c) { c3_w neg_w, pos_w, leq_w, weq_w, tot_w, caf_w; @@ -1155,15 +1155,15 @@ u3_ca_sweep(c3_c* cap_c) c3_w fre_w = 0; c3_w i_w; - end_w = _(u3_ca_is_north(u3R)) + end_w = _(u3a_is_north(u3R)) ? (u3R->hat_p - u3R->rut_p) : (u3R->rut_p - u3R->hat_p); for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) { - u3p(u3_ca_fbox) fre_p = u3R->all.fre_p[i_w]; + u3p(u3a_fbox) fre_p = u3R->all.fre_p[i_w]; while ( fre_p ) { - u3_ca_fbox* fre_u = u3to(u3_ca_fbox, fre_p); + u3a_fbox* fre_u = u3to(u3a_fbox, fre_p); fre_w += fre_u->box_u.siz_w; fre_p = fre_u->nex_p; @@ -1176,13 +1176,13 @@ u3_ca_sweep(c3_c* cap_c) */ pos_w = leq_w = weq_w = 0; { - u3_post box_p = _(u3_ca_is_north(u3R)) ? u3R->rut_p : u3R->hat_p; - u3_post end_p = _(u3_ca_is_north(u3R)) ? u3R->hat_p : u3R->rut_p; - c3_w* box_w = u3_ca_into(box_p); - c3_w* end_w = u3_ca_into(end_p); + u3_post box_p = _(u3a_is_north(u3R)) ? u3R->rut_p : u3R->hat_p; + u3_post end_p = _(u3a_is_north(u3R)) ? u3R->hat_p : u3R->rut_p; + c3_w* box_w = u3a_into(box_p); + c3_w* end_w = u3a_into(end_p); while ( box_w < end_w ) { - u3_ca_box* box_u = (void *)box_w; + u3a_box* box_u = (void *)box_w; #ifdef U3_MEMORY_DEBUG if ( box_u->use_w != box_u->eus_w ) { @@ -1193,24 +1193,24 @@ u3_ca_sweep(c3_c* cap_c) else { printf("weak %p %x (%d, %d)\r\n", box_u, - ((u3_ca_noun *)(u3_ca_boxto(box_w)))->mug_w, + ((u3a_noun *)(u3a_boxto(box_w)))->mug_w, box_u->use_w, box_u->eus_w); - // u3_cm_p("weak", u3_ca_to_pom(u3_ca_outa(u3_ca_boxto(box_w)))); + // u3m_p("weak", u3a_to_pom(u3a_outa(u3a_boxto(box_w)))); } weq_w += box_u->siz_w; } else { printf("leak %p %x (%d)\r\n", box_u, - ((u3_ca_noun *)(u3_ca_boxto(box_w)))->mug_w - ? ((u3_ca_noun *)(u3_ca_boxto(box_w)))->mug_w - : u3_cr_mug(u3_ca_to_pom(u3_ca_outa(u3_ca_boxto(box_w)))), + ((u3a_noun *)(u3a_boxto(box_w)))->mug_w + ? ((u3a_noun *)(u3a_boxto(box_w)))->mug_w + : u3r_mug(u3a_to_pom(u3a_outa(u3a_boxto(box_w)))), box_u->use_w); - // u3_cm_p("leak", u3_ca_to_pom(u3_ca_outa(u3_ca_boxto(box_w)))); + // u3m_p("leak", u3a_to_pom(u3a_outa(u3a_boxto(box_w)))); leq_w += box_u->siz_w; } if ( box_u->cod_w ) { - u3_cm_p(" code", box_u->cod_w); + u3m_p(" code", box_u->cod_w); } box_u->use_w = box_u->eus_w; } @@ -1239,31 +1239,31 @@ u3_ca_sweep(c3_c* cap_c) } } - tot_w = _(u3_ca_is_north(u3R)) + tot_w = _(u3a_is_north(u3R)) ? u3R->mat_p - u3R->rut_p : u3R->rut_p - u3R->mat_p; - caf_w = _(u3_ca_is_north(u3R)) + caf_w = _(u3a_is_north(u3R)) ? u3R->mat_p - u3R->cap_p : u3R->cap_p - u3R->mat_p; - // u3_ca_print_memory("available", (tot_w - pos_w)); - // u3_ca_print_memory("allocated", pos_w); - // u3_ca_print_memory("volatile", caf_w); - u3_ca_print_memory("leaked", leq_w); - u3_ca_print_memory("weaked", weq_w); + // u3a_print_memory("available", (tot_w - pos_w)); + // u3a_print_memory("allocated", pos_w); + // u3a_print_memory("volatile", caf_w); + u3a_print_memory("leaked", leq_w); + u3a_print_memory("weaked", weq_w); c3_assert((pos_w + leq_w + weq_w) == neg_w); if ( 0 != leq_w || (0 != weq_w) ) { c3_assert(0); } } -/* u3_ca_slab(): create a length-bounded proto-atom. +/* u3a_slab(): create a length-bounded proto-atom. */ c3_w* -u3_ca_slab(c3_w len_w) +u3a_slab(c3_w len_w) { - c3_w* nov_w = u3_ca_walloc(len_w + c3_wiseof(u3_ca_atom)); - u3_ca_atom* pug_u = (void *)nov_w; + c3_w* nov_w = u3a_walloc(len_w + c3_wiseof(u3a_atom)); + u3a_atom* pug_u = (void *)nov_w; pug_u->mug_w = 0; pug_u->len_w = len_w; @@ -1280,21 +1280,21 @@ u3_ca_slab(c3_w len_w) return pug_u->buf_w; } -/* u3_ca_slaq(): u3_ca_slaq() with a defined blocksize. +/* u3a_slaq(): u3a_slaq() with a defined blocksize. */ c3_w* -u3_ca_slaq(c3_g met_g, c3_w len_w) +u3a_slaq(c3_g met_g, c3_w len_w) { - return u3_ca_slab(((len_w << met_g) + 31) >> 5); + return u3a_slab(((len_w << met_g) + 31) >> 5); } -/* u3_ca_malt(): measure and finish a proto-atom. +/* u3a_malt(): measure and finish a proto-atom. */ u3_noun -u3_ca_malt(c3_w* sal_w) +u3a_malt(c3_w* sal_w) { - c3_w* nov_w = (sal_w - c3_wiseof(u3_ca_atom)); - u3_ca_atom* nov_u = (void *)nov_w; + c3_w* nov_w = (sal_w - c3_wiseof(u3a_atom)); + u3a_atom* nov_u = (void *)nov_w; c3_w len_w; for ( len_w = nov_u->len_w; len_w; len_w-- ) { @@ -1302,16 +1302,16 @@ u3_ca_malt(c3_w* sal_w) break; } } - return u3_ca_mint(sal_w, len_w); + return u3a_mint(sal_w, len_w); } -/* u3_ca_moot(): finish a pre-measured proto-atom; dangerous. +/* u3a_moot(): finish a pre-measured proto-atom; dangerous. */ u3_noun -u3_ca_moot(c3_w* sal_w) +u3a_moot(c3_w* sal_w) { - c3_w* nov_w = (sal_w - c3_wiseof(u3_ca_atom)); - u3_ca_atom* nov_u = (void*)nov_w; + c3_w* nov_w = (sal_w - c3_wiseof(u3a_atom)); + u3a_atom* nov_u = (void*)nov_w; c3_w len_w = nov_u->len_w; c3_w las_w = nov_u->buf_w[len_w - 1]; @@ -1319,32 +1319,32 @@ u3_ca_moot(c3_w* sal_w) c3_assert(0 != las_w); if ( 1 == len_w ) { - if ( _(u3_ca_is_cat(las_w)) ) { - u3_ca_free(nov_w); + if ( _(u3a_is_cat(las_w)) ) { + u3a_free(nov_w); return las_w; } } - return u3_ca_to_pug(u3_ca_outa(nov_w)); + return u3a_to_pug(u3a_outa(nov_w)); } #if 0 -/* _ca_detect(): in u3_ca_detect(). +/* _ca_detect(): in u3a_detect(). */ static c3_d -_ca_detect(u3p(u3_ch_root) har_p, u3_noun fum, u3_noun som, c3_d axe_d) +_ca_detect(u3p(u3h_root) har_p, u3_noun fum, u3_noun som, c3_d axe_d) { while ( 1 ) { if ( som == fum ) { return axe_d; } - else if ( !_(u3du(fum)) || (u3_none != u3_ch_get(har_p, fum)) ) { + else if ( !_(u3du(fum)) || (u3_none != u3h_get(har_p, fum)) ) { return 0; } else { c3_d eax_d; - u3_ch_put(har_p, fum, 0); + u3h_put(har_p, fum, 0); if ( 0 != (eax_d = _ca_detect(har_p, u3h(fum), som, 2ULL * axe_d)) ) { return c3y; @@ -1357,43 +1357,43 @@ _ca_detect(u3p(u3_ch_root) har_p, u3_noun fum, u3_noun som, c3_d axe_d) } } -/* u3_ca_detect(): for debugging, check if (som) is referenced from (fum). +/* u3a_detect(): for debugging, check if (som) is referenced from (fum). ** ** (som) and (fum) are both RETAINED. */ c3_d -u3_ca_detect(u3_noun fum, u3_noun som) +u3a_detect(u3_noun fum, u3_noun som) { - u3p(u3_ch_root) har_p = u3_ch_new(); + u3p(u3h_root) har_p = u3h_new(); c3_o ret_o; ret_o = _ca_detect(har_p, fum, som, 1); - u3_ch_free(har_p); + u3h_free(har_p); return ret_o; } #endif -/* u3_ca_mint(): finish a measured proto-atom. +/* u3a_mint(): finish a measured proto-atom. */ u3_noun -u3_ca_mint(c3_w* sal_w, c3_w len_w) +u3a_mint(c3_w* sal_w, c3_w len_w) { - c3_w* nov_w = (sal_w - c3_wiseof(u3_ca_atom)); - u3_ca_atom* nov_u = (void*)nov_w; + c3_w* nov_w = (sal_w - c3_wiseof(u3a_atom)); + u3a_atom* nov_u = (void*)nov_w; /* See if we can free the slab entirely. */ if ( len_w == 0 ) { - u3_ca_free(nov_w); + u3a_free(nov_w); return 0; } else if ( len_w == 1 ) { c3_w low_w = nov_u->buf_w[0]; - if ( _(u3_ca_is_cat(low_w)) ) { - u3_ca_free(nov_w); + if ( _(u3a_is_cat(low_w)) ) { + u3a_free(nov_w); return low_w; } @@ -1406,8 +1406,8 @@ u3_ca_mint(c3_w* sal_w, c3_w len_w) c3_w dif_w = (old_w - len_w); if ( dif_w >= u3_cc_minimum ) { - c3_w* box_w = (void *)u3_ca_botox(nov_w); - c3_w* end_w = (nov_w + c3_wiseof(u3_ca_atom) + len_w + 1); + c3_w* box_w = (void *)u3a_botox(nov_w); + c3_w* end_w = (nov_w + c3_wiseof(u3a_atom) + len_w + 1); c3_w asz_w = (end_w - box_w); c3_w bsz_w = box_w[0] - asz_w; @@ -1418,14 +1418,14 @@ u3_ca_mint(c3_w* sal_w, c3_w len_w) } nov_u->len_w = len_w; } - return u3_ca_to_pug(u3_ca_outa(nov_w)); + return u3a_to_pug(u3a_outa(nov_w)); } #ifdef U3_MEMORY_DEBUG -/* u3_ca_lush(): leak push. +/* u3a_lush(): leak push. */ c3_w -u3_ca_lush(c3_w lab_w) +u3a_lush(c3_w lab_w) { c3_w cod_w = u3_Code; @@ -1433,10 +1433,10 @@ u3_ca_lush(c3_w lab_w) return cod_w; } -/* u3_ca_lop(): leak pop. +/* u3a_lop(): leak pop. */ void -u3_ca_lop(c3_w lab_w) +u3a_lop(c3_w lab_w) { u3_Code = 0; } diff --git a/g/e.c b/g/e.c index 18bdbc6493..61ed358341 100644 --- a/g/e.c +++ b/g/e.c @@ -17,7 +17,7 @@ struct { c3_w nor_w; c3_w sou_w; - c3_w mug_w[u3_ca_pages]; + c3_w mug_w[u3a_pages]; } u3K; /* _ce_check_page(): checksum page. @@ -25,16 +25,16 @@ struct { static c3_w _ce_check_page(c3_w pag_w) { - c3_w* mem_w = u3_Loom + (pag_w << u3_ca_page); - c3_w mug_w = u3_cr_mug_words(mem_w, (1 << u3_ca_page)); + c3_w* mem_w = u3_Loom + (pag_w << u3a_page); + c3_w mug_w = u3r_mug_words(mem_w, (1 << u3a_page)); return mug_w; } -/* u3_ce_check(): compute a checksum on all memory within the watermarks. +/* u3e_check(): compute a checksum on all memory within the watermarks. */ void -u3_ce_check(c3_c* cap_c) +u3e_check(c3_c* cap_c) { c3_w nor_w = 0; c3_w sou_w = 0; @@ -42,10 +42,10 @@ u3_ce_check(c3_c* cap_c) { c3_w nwr_w, swu_w; - u3_cm_water(&nwr_w, &swu_w); + u3m_water(&nwr_w, &swu_w); - nor_w = (nwr_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; - sou_w = (swu_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; + nor_w = (nwr_w + ((1 << u3a_page) - 1)) >> u3a_page; + sou_w = (swu_w + ((1 << u3a_page) - 1)) >> u3a_page; } /* Count dirty pages. @@ -62,9 +62,9 @@ u3_ce_check(c3_c* cap_c) sum_w += mug_w; } for ( i_w = 0; i_w < sou_w; i_w++ ) { - mug_w = _ce_check_page((u3_ca_pages - (i_w + 1))); + mug_w = _ce_check_page((u3a_pages - (i_w + 1))); if ( strcmp(cap_c, "boot") ) { - c3_assert(mug_w == u3K.mug_w[(u3_ca_pages - (i_w + 1))]); + c3_assert(mug_w == u3K.mug_w[(u3a_pages - (i_w + 1))]); } sum_w += mug_w; } @@ -73,21 +73,21 @@ u3_ce_check(c3_c* cap_c) } #endif -/* u3_ce_fault(): handle a memory event with libsigsegv protocol. +/* u3e_fault(): handle a memory event with libsigsegv protocol. */ c3_i -u3_ce_fault(void* adr_v, c3_i ser_i) +u3e_fault(void* adr_v, c3_i ser_i) { c3_w* adr_w = (c3_w*) adr_v; - if ( (adr_w < u3_Loom) || (adr_w > (u3_Loom + u3_ca_words)) ) { + if ( (adr_w < u3_Loom) || (adr_w > (u3_Loom + u3a_words)) ) { fprintf(stderr, "address %p out of loom!\r\n", adr_v); c3_assert(0); return 0; } else { c3_w off_w = (adr_w - u3_Loom); - c3_w pag_w = off_w >> u3_ca_page; + c3_w pag_w = off_w >> u3a_page; c3_w blk_w = (pag_w >> 5); c3_w bit_w = (pag_w & 31); @@ -95,8 +95,8 @@ u3_ce_fault(void* adr_v, c3_i ser_i) c3_assert(0 == (u3P.dit_w[blk_w] & (1 << bit_w))); u3P.dit_w[blk_w] |= (1 << bit_w); - if ( -1 == mprotect((void *)(u3_Loom + (pag_w << u3_ca_page)), - (1 << (u3_ca_page + 2)), + if ( -1 == mprotect((void *)(u3_Loom + (pag_w << u3a_page)), + (1 << (u3a_page + 2)), (PROT_READ | PROT_WRITE)) ) { perror("mprotect"); @@ -110,7 +110,7 @@ u3_ce_fault(void* adr_v, c3_i ser_i) /* _ce_image_open(): open or create image. */ static c3_o -_ce_image_open(u3_ce_image* img_u, c3_o nuu_o) +_ce_image_open(u3e_image* img_u, c3_o nuu_o) { c3_i mod_i = _(nuu_o) ? (O_RDWR | O_CREAT) : O_RDWR; c3_c ful_c[8193]; @@ -139,8 +139,8 @@ _ce_image_open(u3_ce_image* img_u, c3_o nuu_o) } else { c3_d siz_d = buf_u.st_size; - c3_d pgs_d = (siz_d + (c3_d)((1 << (u3_ca_page + 2)) - 1)) >> - (c3_d)(u3_ca_page + 2); + c3_d pgs_d = (siz_d + (c3_d)((1 << (u3a_page + 2)) - 1)) >> + (c3_d)(u3a_page + 2); if ( c3y == nuu_o ) { if ( siz_d ) { @@ -150,7 +150,7 @@ _ce_image_open(u3_ce_image* img_u, c3_o nuu_o) return c3y; } else { - if ( siz_d != (pgs_d << (c3_d)(u3_ca_page + 2)) ) { + if ( siz_d != (pgs_d << (c3_d)(u3a_page + 2)) ) { fprintf(stderr, "%s: corrupt size %llx\r\n", ful_c, siz_d); return c3n; } @@ -168,8 +168,8 @@ _ce_image_open(u3_ce_image* img_u, c3_o nuu_o) static void _ce_patch_write_control(u3_cs_patch* pat_u) { - c3_w len_w = sizeof(u3_ce_control) + - (pat_u->con_u->pgs_w * sizeof(u3_ce_line)); + c3_w len_w = sizeof(u3e_control) + + (pat_u->con_u->pgs_w * sizeof(u3e_line)); if ( len_w != write(pat_u->ctl_i, pat_u->con_u, len_w) ) { c3_assert(0); @@ -196,8 +196,8 @@ _ce_patch_read_control(u3_cs_patch* pat_u) pat_u->con_u = malloc(len_w); if ( (len_w != read(pat_u->ctl_i, pat_u->con_u, len_w)) || - (len_w != sizeof(u3_ce_control) + - (pat_u->con_u->pgs_w * sizeof(u3_ce_line))) ) + (len_w != sizeof(u3e_control) + + (pat_u->con_u->pgs_w * sizeof(u3e_line))) ) { free(pat_u->con_u); pat_u->con_u = 0; @@ -254,20 +254,20 @@ _ce_patch_verify(u3_cs_patch* pat_u) for ( i_w = 0; i_w < pat_u->con_u->pgs_w; i_w++ ) { c3_w pag_w = pat_u->con_u->mem_u[i_w].pag_w; c3_w mug_w = pat_u->con_u->mem_u[i_w].mug_w; - c3_w mem_w[1 << u3_ca_page]; + c3_w mem_w[1 << u3a_page]; - if ( -1 == lseek(pat_u->mem_i, (i_w << (u3_ca_page + 2)), SEEK_SET) ) { + if ( -1 == lseek(pat_u->mem_i, (i_w << (u3a_page + 2)), SEEK_SET) ) { perror("seek"); c3_assert(0); return c3n; } - if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3_ca_page + 2))) ) { + if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3a_page + 2))) ) { perror("read"); c3_assert(0); return c3n; } { - c3_w nug_w = u3_cr_mug_words(mem_w, (1 << u3_ca_page)); + c3_w nug_w = u3r_mug_words(mem_w, (1 << u3a_page)); if ( mug_w != nug_w ) { printf("_ce_patch_verify: mug mismatch %d/%d; (%x, %x)\r\n", @@ -351,11 +351,11 @@ _ce_patch_write_page(u3_cs_patch* pat_u, c3_w pgc_w, c3_w* mem_w) { - if ( -1 == lseek(pat_u->mem_i, (pgc_w << (u3_ca_page + 2)), SEEK_SET) ) { + if ( -1 == lseek(pat_u->mem_i, (pgc_w << (u3a_page + 2)), SEEK_SET) ) { c3_assert(0); } - if ( (1 << (u3_ca_page + 2)) != - write(pat_u->mem_i, mem_w, (1 << (u3_ca_page + 2))) ) + if ( (1 << (u3a_page + 2)) != + write(pat_u->mem_i, mem_w, (1 << (u3a_page + 2))) ) { c3_assert(0); } @@ -387,21 +387,21 @@ _ce_patch_save_page(u3_cs_patch* pat_u, c3_w bit_w = (pag_w & 31); if ( u3P.dit_w[blk_w] & (1 << bit_w) ) { - c3_w* mem_w = u3_Loom + (pag_w << u3_ca_page); + c3_w* mem_w = u3_Loom + (pag_w << u3a_page); pat_u->con_u->mem_u[pgc_w].pag_w = pag_w; - pat_u->con_u->mem_u[pgc_w].mug_w = u3_cr_mug_words(mem_w, - (1 << u3_ca_page)); + pat_u->con_u->mem_u[pgc_w].mug_w = u3r_mug_words(mem_w, + (1 << u3a_page)); #if 0 u3K.mug_w[pag_w] = pat_u->con_u->mem_u[pgc_w].mug_w; printf("save: page %d, mug %x\r\n", - pag_w, u3_cr_mug_words(mem_w, (1 << u3_ca_page))); + pag_w, u3r_mug_words(mem_w, (1 << u3a_page))); #endif _ce_patch_write_page(pat_u, pgc_w, mem_w); - if ( -1 == mprotect(u3_Loom + (pag_w << u3_ca_page), - (1 << (u3_ca_page + 2)), + if ( -1 == mprotect(u3_Loom + (pag_w << u3a_page), + (1 << (u3a_page + 2)), PROT_READ) ) { c3_assert(0); @@ -422,8 +422,8 @@ _ce_patch_junk_page(u3_cs_patch* pat_u, c3_w blk_w = (pag_w >> 5); c3_w bit_w = (pag_w & 31); - if ( -1 == mprotect(u3_Loom + (pag_w << u3_ca_page), - (1 << (u3_ca_page + 2)), + if ( -1 == mprotect(u3_Loom + (pag_w << u3a_page), + (1 << (u3a_page + 2)), PROT_READ) ) { c3_assert(0); @@ -431,10 +431,10 @@ _ce_patch_junk_page(u3_cs_patch* pat_u, u3P.dit_w[blk_w] &= ~(1 << bit_w); } -/* u3_ce_dirty(): count dirty pages. +/* u3e_dirty(): count dirty pages. */ c3_w -u3_ce_dirty(void) +u3e_dirty(void) { c3_w pgs_w = 0; c3_w nor_w = 0; @@ -445,10 +445,10 @@ u3_ce_dirty(void) { c3_w nwr_w, swu_w; - u3_cm_water(&nwr_w, &swu_w); + u3m_water(&nwr_w, &swu_w); - nor_w = (nwr_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; - sou_w = (swu_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; + nor_w = (nwr_w + ((1 << u3a_page) - 1)) >> u3a_page; + sou_w = (swu_w + ((1 << u3a_page) - 1)) >> u3a_page; } // u3K.nor_w = nor_w; // u3K.sou_w = sou_w; @@ -462,7 +462,7 @@ u3_ce_dirty(void) pgs_w = _ce_patch_count_page(i_w, pgs_w); } for ( i_w = 0; i_w < sou_w; i_w++ ) { - pgs_w = _ce_patch_count_page((u3_ca_pages - (i_w + 1)), pgs_w); + pgs_w = _ce_patch_count_page((u3a_pages - (i_w + 1)), pgs_w); } } return pgs_w; @@ -482,10 +482,10 @@ _ce_patch_compose(void) { c3_w nwr_w, swu_w; - u3_cm_water(&nwr_w, &swu_w); + u3m_water(&nwr_w, &swu_w); - nor_w = (nwr_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; - sou_w = (swu_w + ((1 << u3_ca_page) - 1)) >> u3_ca_page; + nor_w = (nwr_w + ((1 << u3a_page) - 1)) >> u3a_page; + sou_w = (swu_w + ((1 << u3a_page) - 1)) >> u3a_page; } // u3K.nor_w = nor_w; // u3K.sou_w = sou_w; @@ -499,7 +499,7 @@ _ce_patch_compose(void) pgs_w = _ce_patch_count_page(i_w, pgs_w); } for ( i_w = 0; i_w < sou_w; i_w++ ) { - pgs_w = _ce_patch_count_page((u3_ca_pages - (i_w + 1)), pgs_w); + pgs_w = _ce_patch_count_page((u3a_pages - (i_w + 1)), pgs_w); } } @@ -512,16 +512,16 @@ _ce_patch_compose(void) c3_w i_w, pgc_w; _ce_patch_create(pat_u); - pat_u->con_u = malloc(sizeof(u3_ce_control) + (pgs_w * sizeof(u3_ce_line))); + pat_u->con_u = malloc(sizeof(u3e_control) + (pgs_w * sizeof(u3e_line))); pgc_w = 0; for ( i_w = 0; i_w < nor_w; i_w++ ) { pgc_w = _ce_patch_save_page(pat_u, i_w, pgc_w); } for ( i_w = 0; i_w < sou_w; i_w++ ) { - pgc_w = _ce_patch_save_page(pat_u, (u3_ca_pages - (i_w + 1)), pgc_w); + pgc_w = _ce_patch_save_page(pat_u, (u3a_pages - (i_w + 1)), pgc_w); } - for ( i_w = nor_w; i_w < (u3_ca_pages - sou_w); i_w++ ) { + for ( i_w = nor_w; i_w < (u3a_pages - sou_w); i_w++ ) { _ce_patch_junk_page(pat_u, i_w); } @@ -562,7 +562,7 @@ _ce_patch_sync(u3_cs_patch* pat_u) /* _ce_image_sync(): make sure image is synced to disk. */ static void -_ce_image_sync(u3_ce_image* img_u) +_ce_image_sync(u3e_image* img_u) { _ce_sync(img_u->fid_i); } @@ -578,12 +578,12 @@ _ce_patch_apply(u3_cs_patch* pat_u) //printf("image: sou_w %d, new %d\r\n", u3P.sou_u.pgs_w, pat_u->con_u->sou_w); if ( u3P.nor_u.pgs_w > pat_u->con_u->nor_w ) { - ftruncate(u3P.nor_u.fid_i, u3P.nor_u.pgs_w << (u3_ca_page + 2)); + ftruncate(u3P.nor_u.fid_i, u3P.nor_u.pgs_w << (u3a_page + 2)); } u3P.nor_u.pgs_w = pat_u->con_u->nor_w; if ( u3P.sou_u.pgs_w > pat_u->con_u->sou_w ) { - ftruncate(u3P.sou_u.fid_i, u3P.sou_u.pgs_w << (u3_ca_page + 2)); + ftruncate(u3P.sou_u.fid_i, u3P.sou_u.pgs_w << (u3a_page + 2)); } u3P.sou_u.pgs_w = pat_u->con_u->sou_w; @@ -597,7 +597,7 @@ _ce_patch_apply(u3_cs_patch* pat_u) for ( i_w = 0; i_w < pat_u->con_u->pgs_w; i_w++ ) { c3_w pag_w = pat_u->con_u->mem_u[i_w].pag_w; - c3_w mem_w[1 << u3_ca_page]; + c3_w mem_w[1 << u3a_page]; c3_i fid_i; c3_w off_w; @@ -607,25 +607,25 @@ _ce_patch_apply(u3_cs_patch* pat_u) } else { fid_i = u3P.sou_u.fid_i; - off_w = (u3_ca_pages - (pag_w + 1)); + off_w = (u3a_pages - (pag_w + 1)); } - if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3_ca_page + 2))) ) { + if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3a_page + 2))) ) { perror("apply: read"); c3_assert(0); } else { - if ( -1 == lseek(fid_i, (off_w << (u3_ca_page + 2)), SEEK_SET) ) { + if ( -1 == lseek(fid_i, (off_w << (u3a_page + 2)), SEEK_SET) ) { perror("apply: lseek"); c3_assert(0); } - if ( -1 == write(fid_i, mem_w, (1 << (u3_ca_page + 2))) ) { + if ( -1 == write(fid_i, mem_w, (1 << (u3a_page + 2))) ) { perror("apply: write"); c3_assert(0); } } #if 0 - printf("apply: %d, %x\n", pag_w, u3_cr_mug_words(mem_w, (1 << u3_ca_page))); + printf("apply: %d, %x\n", pag_w, u3r_mug_words(mem_w, (1 << u3a_page))); #endif } } @@ -633,7 +633,7 @@ _ce_patch_apply(u3_cs_patch* pat_u) /* _ce_image_blit(): apply image to memory. */ static void -_ce_image_blit(u3_ce_image* img_u, +_ce_image_blit(u3e_image* img_u, c3_w* ptr_w, c3_ws stp_ws) { @@ -641,17 +641,17 @@ _ce_image_blit(u3_ce_image* img_u, lseek(img_u->fid_i, 0, SEEK_SET); for ( i_w=0; i_w < img_u->pgs_w; i_w++ ) { - if ( -1 == read(img_u->fid_i, ptr_w, (1 << (u3_ca_page + 2))) ) { + if ( -1 == read(img_u->fid_i, ptr_w, (1 << (u3a_page + 2))) ) { perror("read"); c3_assert(0); } #if 0 { c3_w off_w = (ptr_w - u3_Loom); - c3_w pag_w = (off_w >> u3_ca_page); + c3_w pag_w = (off_w >> u3a_page); printf("blit: page %d, mug %x\r\n", pag_w, - u3_cr_mug_words(ptr_w, (1 << u3_ca_page))); + u3r_mug_words(ptr_w, (1 << u3a_page))); } #endif ptr_w += stp_ws; @@ -662,26 +662,26 @@ _ce_image_blit(u3_ce_image* img_u, /* _ce_image_fine(): compare image to memory. */ static void -_ce_image_fine(u3_ce_image* img_u, +_ce_image_fine(u3e_image* img_u, c3_w* ptr_w, c3_ws stp_ws) { c3_w i_w; - c3_w buf_w[1 << u3_ca_page]; + c3_w buf_w[1 << u3a_page]; lseek(img_u->fid_i, 0, SEEK_SET); for ( i_w=0; i_w < img_u->pgs_w; i_w++ ) { c3_w mem_w, fil_w; - if ( -1 == read(img_u->fid_i, buf_w, (1 << (u3_ca_page + 2))) ) { + if ( -1 == read(img_u->fid_i, buf_w, (1 << (u3a_page + 2))) ) { perror("read"); c3_assert(0); } - mem_w = u3_cr_mug_words(ptr_w, (1 << u3_ca_page)); - fil_w = u3_cr_mug_words(buf_w, (1 << u3_ca_page)); + mem_w = u3r_mug_words(ptr_w, (1 << u3a_page)); + fil_w = u3r_mug_words(buf_w, (1 << u3a_page)); if ( mem_w != fil_w ) { - c3_w pag_w = (ptr_w - u3_Loom) >> u3_ca_page; + c3_w pag_w = (ptr_w - u3_Loom) >> u3a_page; fprintf(stderr, "mismatch: page %d, mem_w %x, fil_w %x, K %x\r\n", pag_w, @@ -695,10 +695,10 @@ _ce_image_fine(u3_ce_image* img_u, } #endif -/* u3_ce_save(): save current changes. +/* u3e_save(): save current changes. */ void -u3_ce_save(void) +u3e_save(void) { u3_cs_patch* pat_u; @@ -714,7 +714,7 @@ u3_ce_save(void) // Sync the patch files. // - // u3_ca_print_memory("sync: save", 4096 * pat_u->con_u->pgs_w); + // u3a_print_memory("sync: save", 4096 * pat_u->con_u->pgs_w); _ce_patch_sync(pat_u); // Verify the patch - because why not? @@ -731,11 +731,11 @@ u3_ce_save(void) { _ce_image_fine(&u3P.nor_u, u3_Loom, - (1 << u3_ca_page)); + (1 << u3a_page)); _ce_image_fine(&u3P.sou_u, - (u3_Loom + (1 << u3_ca_bits) - (1 << u3_ca_page)), - -(1 << u3_ca_page)); + (u3_Loom + (1 << u3a_bits) - (1 << u3a_page)), + -(1 << u3a_page)); c3_assert(u3P.nor_u.pgs_w == u3K.nor_w); c3_assert(u3P.sou_u.pgs_w == u3K.sou_w); @@ -814,17 +814,17 @@ _ce_limits(void) static void _ce_signals(void) { - if ( 0 != sigsegv_install_handler(u3_ce_fault) ) { + if ( 0 != sigsegv_install_handler(u3e_fault) ) { fprintf(stderr, "sigsegv install failed\n"); exit(1); } // signal(SIGINT, _loom_stop); } -/* u3_ce_init(): start the environment, with/without checkpointing. +/* u3e_init(): start the environment, with/without checkpointing. */ void -u3_ce_init(c3_o chk_o) +u3e_init(c3_o chk_o) { _ce_limits(); _ce_signals(); @@ -832,7 +832,7 @@ u3_ce_init(c3_o chk_o) /* Map at fixed address. */ { - c3_w len_w = u3_ca_bytes; + c3_w len_w = u3a_bytes; void* map_v; map_v = mmap((void *)u3_Loom, @@ -859,16 +859,16 @@ u3_ce_init(c3_o chk_o) } } -/* u3_ce_grab(): garbage-collect the world, plus extra roots, then +/* u3e_grab(): garbage-collect the world, plus extra roots, then */ void -u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with u3_none +u3e_grab(c3_c* cap_c, u3_noun som, ...) // terminate with u3_none { - // u3_ch_free(u3R->cax.har_p); - // u3R->cax.har_p = u3_ch_new(); + // u3h_free(u3R->cax.har_p); + // u3R->cax.har_p = u3h_new(); - u3_cv_mark(); - u3_cm_mark(); + u3v_mark(); + u3m_mark(); { va_list vap; u3_noun tur; @@ -876,23 +876,23 @@ u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with u3_none va_start(vap, som); if ( som != u3_none ) { - u3_ca_mark_noun(som); + u3a_mark_noun(som); while ( u3_none != (tur = va_arg(vap, u3_noun)) ) { - u3_ca_mark_noun(tur); + u3a_mark_noun(tur); } } va_end(vap); } - u3_ca_sweep(cap_c); + u3a_sweep(cap_c); } -/* u3_ce_boot(): start the u3 system. +/* u3e_boot(): start the u3 system. */ void -u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) +u3e_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) { - u3_ce_init(nuu_o); + u3e_init(nuu_o); u3P.cpu_c = cpu_c; u3P.nor_u.nam_c = "north"; @@ -943,13 +943,13 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) { _ce_image_blit(&u3P.nor_u, u3_Loom, - (1 << u3_ca_page)); + (1 << u3a_page)); _ce_image_blit(&u3P.sou_u, - (u3_Loom + (1 << u3_ca_bits) - (1 << u3_ca_page)), - -(1 << u3_ca_page)); + (u3_Loom + (1 << u3a_bits) - (1 << u3a_page)), + -(1 << u3a_page)); - if ( 0 != mprotect((void *)u3_Loom, u3_ca_bytes, PROT_READ) ) { + if ( 0 != mprotect((void *)u3_Loom, u3a_bytes, PROT_READ) ) { perror("protect"); c3_assert(0); } @@ -966,11 +966,11 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) /* Construct or activate the allocator. */ - u3_cm_boot(nuu_o, bug_o); + u3m_boot(nuu_o, bug_o); /* Initialize the jet system. */ - u3_cj_boot(); + u3j_boot(); /* Install the kernel. */ @@ -983,12 +983,12 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c) snprintf(pas_c, 2048, "%s/urbit.pill", U3_LIB); } printf("boot: loading %s\r\n", pas_c); - u3_cv_make(pas_c); + u3v_make(pas_c); - u3_cv_jack(); + u3v_jack(); } else { - u3_cv_hose(); - u3_cj_ream(); + u3v_hose(); + u3j_ream(); } } diff --git a/g/h.c b/g/h.c index a0f142de31..4595c96c4e 100644 --- a/g/h.c +++ b/g/h.c @@ -7,13 +7,13 @@ static void* _ch_some_add(void* han_v, c3_w, c3_w, u3_noun); static void* _ch_some_new(c3_w lef_w); -/* u3_ch_new(): create hashtable. +/* u3h_new(): create hashtable. */ -u3p(u3_ch_root) -u3_ch_new(void) +u3p(u3h_root) +u3h_new(void) { - u3_ch_root* har_u = u3_ca_walloc(c3_wiseof(u3_ch_root)); - u3p(u3_ch_root) har_p = u3of(u3_ch_root, har_u); + u3h_root* har_u = u3a_walloc(c3_wiseof(u3h_root)); + u3p(u3h_root) har_p = u3of(u3h_root, har_u); c3_w i_w; har_u->clk_w = 0; @@ -33,10 +33,10 @@ _ch_popcount(c3_w num_w) /* _ch_buck_new(): create new, empty bucket. */ -static u3_ch_buck* +static u3h_buck* _ch_buck_new(void) { - u3_ch_buck* hab_u = u3_ca_walloc(c3_wiseof(u3_ch_buck)); + u3h_buck* hab_u = u3a_walloc(c3_wiseof(u3h_buck)); hab_u->len_w = 0; return hab_u; @@ -44,14 +44,14 @@ _ch_buck_new(void) /* ha_buck_add(): add to bucket. */ -static u3_ch_buck* -_ch_buck_add(u3_ch_buck* hab_u, u3_noun kev) +static u3h_buck* +_ch_buck_add(u3h_buck* hab_u, u3_noun kev) { c3_w i_w; for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { - if ( c3y == u3_cr_sing(u3h(kev), u3h(hab_u->kev[i_w])) ) { - u3_ca_lose(hab_u->kev[i_w]); + if ( c3y == u3r_sing(u3h(kev), u3h(hab_u->kev[i_w])) ) { + u3a_lose(hab_u->kev[i_w]); hab_u->kev[i_w] = kev; return hab_u; @@ -60,29 +60,29 @@ _ch_buck_add(u3_ch_buck* hab_u, u3_noun kev) { c3_w len_w = hab_u->len_w; - u3_ch_buck* bah_u = u3_ca_walloc(c3_wiseof(u3_ch_buck) + + u3h_buck* bah_u = u3a_walloc(c3_wiseof(u3h_buck) + (len_w + 1) * c3_wiseof(u3_noun)); bah_u->len_w = len_w + 1; bah_u->kev[0] = kev; - // Optimize: use u3_ca_wealloc(). + // Optimize: use u3a_wealloc(). // for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { bah_u->kev[i_w + 1] = hab_u->kev[i_w]; } - u3_ca_free(hab_u); + u3a_free(hab_u); return bah_u; } } /* _ch_node_new(): create new, empty node. */ -static u3_ch_node* +static u3h_node* _ch_node_new(void) { - u3_ch_node* han_u = u3_ca_walloc(c3_wiseof(u3_ch_node)); + u3h_node* han_u = u3a_walloc(c3_wiseof(u3h_node)); han_u->map_w = 0; return han_u; @@ -90,8 +90,8 @@ _ch_node_new(void) /* _ch_node_add(): add to node. */ -static u3_ch_node* -_ch_node_add(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun kev) +static u3h_node* +_ch_node_add(u3h_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun kev) { c3_w bit_w, inx_w, map_w, i_w; @@ -104,24 +104,24 @@ _ch_node_add(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun kev) if ( map_w & (1 << bit_w) ) { c3_w sot_w = han_u->sot_w[inx_w]; - if ( _(u3_ch_slot_is_node(sot_w)) ) { - void* hav_v = u3_ch_slot_to_node(sot_w); + if ( _(u3h_slot_is_node(sot_w)) ) { + void* hav_v = u3h_slot_to_node(sot_w); hav_v = _ch_some_add(hav_v, lef_w, rem_w, kev); - han_u->sot_w[inx_w] = u3_ch_node_to_slot(hav_v); + han_u->sot_w[inx_w] = u3h_node_to_slot(hav_v); return han_u; } else { - u3_noun kov = u3_ch_slot_to_noun(sot_w); + u3_noun kov = u3h_slot_to_noun(sot_w); - if ( c3y == u3_cr_sing(u3h(kev), u3h(kov)) ) { - u3_ca_lose(kov); - han_u->sot_w[inx_w] = u3_ch_noun_to_slot(kev); + if ( c3y == u3r_sing(u3h(kev), u3h(kov)) ) { + u3a_lose(kov); + han_u->sot_w[inx_w] = u3h_noun_to_slot(kev); return han_u; } else { - c3_w rom_w = u3_cr_mug(u3h(kov)) & ((1 << lef_w) - 1); + c3_w rom_w = u3r_mug(u3h(kov)) & ((1 << lef_w) - 1); void* hav_v = _ch_some_new(lef_w); // Optimize: need a custom collision create. @@ -129,28 +129,28 @@ _ch_node_add(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun kev) hav_v = _ch_some_add(hav_v, lef_w, rem_w, kev); hav_v = _ch_some_add(hav_v, lef_w, rom_w, kov); - han_u->sot_w[inx_w] = u3_ch_node_to_slot(hav_v); + han_u->sot_w[inx_w] = u3h_node_to_slot(hav_v); return han_u; } } } else { - // Optimize: use u3_ca_wealloc. + // Optimize: use u3a_wealloc. // c3_w len_w = _ch_popcount(map_w); - u3_ch_node* nah_u = u3_ca_walloc(c3_wiseof(u3_ch_node) + - ((len_w + 1) * c3_wiseof(u3_ch_slot))); + u3h_node* nah_u = u3a_walloc(c3_wiseof(u3h_node) + + ((len_w + 1) * c3_wiseof(u3h_slot))); nah_u->map_w = han_u->map_w | (1 << bit_w); for ( i_w = 0; i_w < inx_w; i_w++ ) { nah_u->sot_w[i_w] = han_u->sot_w[i_w]; } - nah_u->sot_w[inx_w] = u3_ch_noun_to_slot(kev); + nah_u->sot_w[inx_w] = u3h_noun_to_slot(kev); for ( i_w = inx_w; i_w < len_w; i_w++ ) { nah_u->sot_w[i_w + 1] = han_u->sot_w[i_w]; } - u3_ca_free(han_u); + u3a_free(han_u); return nah_u; } } @@ -179,50 +179,50 @@ _ch_some_add(void* han_v, c3_w lef_w, c3_w rem_w, u3_noun kev) else return _ch_node_add(han_v, lef_w, rem_w, kev); } -/* u3_ch_put(): insert in hashtable. +/* u3h_put(): insert in hashtable. ** ** `key` is RETAINED; `val` is transferred. */ void -u3_ch_put(u3p(u3_ch_root) har_p, u3_noun key, u3_noun val) +u3h_put(u3p(u3h_root) har_p, u3_noun key, u3_noun val) { - u3_ch_root* har_u = u3to(u3_ch_root, har_p); + u3h_root* har_u = u3to(u3h_root, har_p); u3_noun kev = u3nc(u3k(key), val); - c3_w mug_w = u3_cr_mug(key); + c3_w mug_w = u3r_mug(key); c3_w inx_w = (mug_w >> 25); c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w sot_w = har_u->sot_w[inx_w]; - if ( _(u3_ch_slot_is_null(sot_w)) ) { - har_u->sot_w[inx_w] = u3_ch_noun_to_slot(kev); + if ( _(u3h_slot_is_null(sot_w)) ) { + har_u->sot_w[inx_w] = u3h_noun_to_slot(kev); } else { - u3_ch_node* han_u; + u3h_node* han_u; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kov = u3_ch_slot_to_noun(sot_w); - c3_w rom_w = u3_cr_mug(u3h(kov)) & ((1 << 25) - 1); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kov = u3h_slot_to_noun(sot_w); + c3_w rom_w = u3r_mug(u3h(kov)) & ((1 << 25) - 1); han_u = _ch_node_new(); han_u = _ch_node_add(han_u, 25, rem_w, kev); han_u = _ch_node_add(han_u, 25, rom_w, kov); } else { - han_u = _ch_node_add(u3_ch_slot_to_node(sot_w), 25, rem_w, kev); + han_u = _ch_node_add(u3h_slot_to_node(sot_w), 25, rem_w, kev); } - har_u->sot_w[inx_w] = u3_ch_node_to_slot(han_u); + har_u->sot_w[inx_w] = u3h_node_to_slot(han_u); } } /* _ch_buck_hum(): read in bucket. */ static c3_o -_ch_buck_hum(u3_ch_buck* hab_u, c3_w mug_w) +_ch_buck_hum(u3h_buck* hab_u, c3_w mug_w) { c3_w i_w; for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { - if ( mug_w == u3_cr_mug(u3h(hab_u->kev[i_w])) ) { + if ( mug_w == u3r_mug(u3h(hab_u->kev[i_w])) ) { return c3y; } } @@ -232,7 +232,7 @@ _ch_buck_hum(u3_ch_buck* hab_u, c3_w mug_w) /* _ch_node_hum(): read in node. */ static c3_o -_ch_node_hum(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, c3_w mug_w) +_ch_node_hum(u3h_node* han_u, c3_w lef_w, c3_w rem_w, c3_w mug_w) { c3_w bit_w, map_w; @@ -248,10 +248,10 @@ _ch_node_hum(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, c3_w mug_w) c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); c3_w sot_w = han_u->sot_w[inx_w]; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - if ( mug_w == u3_cr_mug(u3h(kev)) ) { + if ( mug_w == u3r_mug(u3h(kev)) ) { return c3y; } else { @@ -259,7 +259,7 @@ _ch_node_hum(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, c3_w mug_w) } } else { - void* hav_v = u3_ch_slot_to_node(sot_w); + void* hav_v = u3h_slot_to_node(sot_w); if ( 0 == lef_w ) { return _ch_buck_hum(hav_v, mug_w); @@ -269,25 +269,25 @@ _ch_node_hum(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, c3_w mug_w) } } -/* u3_ch_hum(): read from hashtable. +/* u3h_hum(): read from hashtable. ** ** `key` is RETAINED. */ c3_o -u3_ch_hum(u3p(u3_ch_root) har_p, c3_w mug_w) +u3h_hum(u3p(u3h_root) har_p, c3_w mug_w) { - u3_ch_root* har_u = u3to(u3_ch_root, har_p); + u3h_root* har_u = u3to(u3h_root, har_p); c3_w inx_w = (mug_w >> 25); c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w sot_w = har_u->sot_w[inx_w]; - if ( _(u3_ch_slot_is_null(sot_w)) ) { + if ( _(u3h_slot_is_null(sot_w)) ) { return c3n; } - else if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + else if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - if ( mug_w == u3_cr_mug(u3h(kev)) ) { + if ( mug_w == u3r_mug(u3h(kev)) ) { return c3y; } else { @@ -295,7 +295,7 @@ u3_ch_hum(u3p(u3_ch_root) har_p, c3_w mug_w) } } else { - u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); + u3h_node* han_u = u3h_slot_to_node(sot_w); return _ch_node_hum(han_u, 25, rem_w, mug_w); } @@ -304,13 +304,13 @@ u3_ch_hum(u3p(u3_ch_root) har_p, c3_w mug_w) /* _ch_buck_get(): read in bucket. */ static u3_weak -_ch_buck_get(u3_ch_buck* hab_u, u3_noun key) +_ch_buck_get(u3h_buck* hab_u, u3_noun key) { c3_w i_w; for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { - if ( _(u3_cr_sing(key, u3h(hab_u->kev[i_w]))) ) { - return u3_ca_gain(u3t(hab_u->kev[i_w])); + if ( _(u3r_sing(key, u3h(hab_u->kev[i_w]))) ) { + return u3a_gain(u3t(hab_u->kev[i_w])); } } return u3_none; @@ -319,7 +319,7 @@ _ch_buck_get(u3_ch_buck* hab_u, u3_noun key) /* _ch_node_get(): read in node. */ static u3_weak -_ch_node_get(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) +_ch_node_get(u3h_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) { c3_w bit_w, map_w; @@ -335,18 +335,18 @@ _ch_node_get(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); c3_w sot_w = han_u->sot_w[inx_w]; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - if ( _(u3_cr_sing(key, u3h(kev))) ) { - return u3_ca_gain(u3t(kev)); + if ( _(u3r_sing(key, u3h(kev))) ) { + return u3a_gain(u3t(kev)); } else { return u3_none; } } else { - void* hav_v = u3_ch_slot_to_node(sot_w); + void* hav_v = u3h_slot_to_node(sot_w); if ( 0 == lef_w ) { return _ch_buck_get(hav_v, key); @@ -356,35 +356,35 @@ _ch_node_get(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) } } -/* u3_ch_get(): read from hashtable. +/* u3h_get(): read from hashtable. ** ** `key` is RETAINED. */ u3_weak -u3_ch_get(u3p(u3_ch_root) har_p, u3_noun key) +u3h_get(u3p(u3h_root) har_p, u3_noun key) { - u3_ch_root* har_u = u3to(u3_ch_root, har_p); - c3_w mug_w = u3_cr_mug(key); + u3h_root* har_u = u3to(u3h_root, har_p); + c3_w mug_w = u3r_mug(key); c3_w inx_w = (mug_w >> 25); c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w sot_w = har_u->sot_w[inx_w]; - if ( _(u3_ch_slot_is_null(sot_w)) ) { + if ( _(u3h_slot_is_null(sot_w)) ) { return u3_none; } - else if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + else if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - if ( _(u3_cr_sing(key, u3h(kev))) ) { - har_u->sot_w[inx_w] = u3_ch_noun_be_warm(sot_w); - return u3_ca_gain(u3t(kev)); + if ( _(u3r_sing(key, u3h(kev))) ) { + har_u->sot_w[inx_w] = u3h_noun_be_warm(sot_w); + return u3a_gain(u3t(kev)); } else { return u3_none; } } else { - u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); + u3h_node* han_u = u3h_slot_to_node(sot_w); return _ch_node_get(han_u, 25, rem_w, key); } @@ -393,13 +393,13 @@ u3_ch_get(u3p(u3_ch_root) har_p, u3_noun key) /* _ch_buck_gut(): read in bucket, unifying key nouns. */ static u3_weak -_ch_buck_gut(u3_ch_buck* hab_u, u3_noun key) +_ch_buck_gut(u3h_buck* hab_u, u3_noun key) { c3_w i_w; for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { - if ( _(u3_cr_sung(key, u3h(hab_u->kev[i_w]))) ) { - return u3_ca_gain(u3t(hab_u->kev[i_w])); + if ( _(u3r_sung(key, u3h(hab_u->kev[i_w]))) ) { + return u3a_gain(u3t(hab_u->kev[i_w])); } } return u3_none; @@ -408,7 +408,7 @@ _ch_buck_gut(u3_ch_buck* hab_u, u3_noun key) /* _ch_node_gut(): read in node, unifying key nouns. */ static u3_weak -_ch_node_gut(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) +_ch_node_gut(u3h_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) { c3_w bit_w, map_w; @@ -424,18 +424,18 @@ _ch_node_gut(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); c3_w sot_w = han_u->sot_w[inx_w]; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - if ( _(u3_cr_sung(key, u3h(kev))) ) { - return u3_ca_gain(u3t(kev)); + if ( _(u3r_sung(key, u3h(kev))) ) { + return u3a_gain(u3t(kev)); } else { return u3_none; } } else { - void* hav_v = u3_ch_slot_to_node(sot_w); + void* hav_v = u3h_slot_to_node(sot_w); if ( 0 == lef_w ) { return _ch_buck_gut(hav_v, key); @@ -445,35 +445,35 @@ _ch_node_gut(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key) } } -/* u3_ch_gut(): read from hashtable, unifying key nouns. +/* u3h_gut(): read from hashtable, unifying key nouns. ** ** `key` is RETAINED. */ u3_weak -u3_ch_gut(u3p(u3_ch_root) har_p, u3_noun key) +u3h_gut(u3p(u3h_root) har_p, u3_noun key) { - u3_ch_root* har_u = u3to(u3_ch_root, har_p); - c3_w mug_w = u3_cr_mug(key); + u3h_root* har_u = u3to(u3h_root, har_p); + c3_w mug_w = u3r_mug(key); c3_w inx_w = (mug_w >> 25); c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w sot_w = har_u->sot_w[inx_w]; - if ( _(u3_ch_slot_is_null(sot_w)) ) { + if ( _(u3h_slot_is_null(sot_w)) ) { return u3_none; } - else if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + else if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - if ( _(u3_cr_sung(key, u3h(kev))) ) { - har_u->sot_w[inx_w] = u3_ch_noun_be_warm(sot_w); - return u3_ca_gain(u3t(kev)); + if ( _(u3r_sung(key, u3h(kev))) ) { + har_u->sot_w[inx_w] = u3h_noun_be_warm(sot_w); + return u3a_gain(u3t(kev)); } else { return u3_none; } } else { - u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); + u3h_node* han_u = u3h_slot_to_node(sot_w); return _ch_node_gut(han_u, 25, rem_w, key); } @@ -482,20 +482,20 @@ u3_ch_gut(u3p(u3_ch_root) har_p, u3_noun key) /* _ch_free_buck(): free bucket */ static void -_ch_free_buck(u3_ch_buck* hab_u) +_ch_free_buck(u3h_buck* hab_u) { c3_w i_w; for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { - u3_ca_lose(hab_u->kev[i_w]); + u3a_lose(hab_u->kev[i_w]); } - u3_ca_free(hab_u); + u3a_free(hab_u); } /* _ch_free_node(): free node. */ static void -_ch_free_node(u3_ch_node* han_u, c3_w lef_w) +_ch_free_node(u3h_node* han_u, c3_w lef_w) { c3_w len_w = _ch_popcount(han_u->map_w); c3_w i_w; @@ -505,13 +505,13 @@ _ch_free_node(u3_ch_node* han_u, c3_w lef_w) for ( i_w = 0; i_w < len_w; i_w++ ) { c3_w sot_w = han_u->sot_w[i_w]; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - u3_ca_lose(kev); + u3a_lose(kev); } else { - void* hav_v = u3_ch_slot_to_node(sot_w); + void* hav_v = u3h_slot_to_node(sot_w); if ( 0 == lef_w ) { _ch_free_buck(hav_v); @@ -520,38 +520,38 @@ _ch_free_node(u3_ch_node* han_u, c3_w lef_w) } } } - u3_ca_free(han_u); + u3a_free(han_u); } -/* u3_ch_free(): free hashtable. +/* u3h_free(): free hashtable. */ void -u3_ch_free(u3p(u3_ch_root) har_p) +u3h_free(u3p(u3h_root) har_p) { - u3_ch_root* har_u = u3to(u3_ch_root, har_p); + u3h_root* har_u = u3to(u3h_root, har_p); c3_w i_w; for ( i_w = 0; i_w < 64; i_w++ ) { c3_w sot_w = har_u->sot_w[i_w]; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - u3_ca_lose(kev); + u3a_lose(kev); } - else if ( _(u3_ch_slot_is_node(sot_w)) ) { - u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); + else if ( _(u3h_slot_is_node(sot_w)) ) { + u3h_node* han_u = u3h_slot_to_node(sot_w); _ch_free_node(han_u, 25); } } - u3_ca_free(har_u); + u3a_free(har_u); } /* _ch_walk_buck(): walk bucket for gc. */ static void -_ch_walk_buck(u3_ch_buck* hab_u, void (*fun_f)(u3_noun)) +_ch_walk_buck(u3h_buck* hab_u, void (*fun_f)(u3_noun)) { c3_w i_w; @@ -563,7 +563,7 @@ _ch_walk_buck(u3_ch_buck* hab_u, void (*fun_f)(u3_noun)) /* _ch_walk_node(): walk node for gc. */ static void -_ch_walk_node(u3_ch_node* han_u, c3_w lef_w, void (*fun_f)(u3_noun)) +_ch_walk_node(u3h_node* han_u, c3_w lef_w, void (*fun_f)(u3_noun)) { c3_w len_w = _ch_popcount(han_u->map_w); c3_w i_w; @@ -573,13 +573,13 @@ _ch_walk_node(u3_ch_node* han_u, c3_w lef_w, void (*fun_f)(u3_noun)) for ( i_w = 0; i_w < len_w; i_w++ ) { c3_w sot_w = han_u->sot_w[i_w]; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); fun_f(kev); } else { - void* hav_v = u3_ch_slot_to_node(sot_w); + void* hav_v = u3h_slot_to_node(sot_w); if ( 0 == lef_w ) { _ch_walk_buck(hav_v, fun_f); @@ -590,24 +590,24 @@ _ch_walk_node(u3_ch_node* han_u, c3_w lef_w, void (*fun_f)(u3_noun)) } } -/* u3_ch_walk(): walk hashtable for gc. +/* u3h_walk(): walk hashtable for gc. */ void -u3_ch_walk(u3p(u3_ch_root) har_p, void (*fun_f)(u3_noun)) +u3h_walk(u3p(u3h_root) har_p, void (*fun_f)(u3_noun)) { - u3_ch_root* har_u = u3to(u3_ch_root, har_p); + u3h_root* har_u = u3to(u3h_root, har_p); c3_w i_w; for ( i_w = 0; i_w < 64; i_w++ ) { c3_w sot_w = har_u->sot_w[i_w]; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); fun_f(kev); } - else if ( _(u3_ch_slot_is_node(sot_w)) ) { - u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); + else if ( _(u3h_slot_is_node(sot_w)) ) { + u3h_node* han_u = u3h_slot_to_node(sot_w); _ch_walk_node(han_u, 25, fun_f); } @@ -618,20 +618,20 @@ u3_ch_walk(u3p(u3_ch_root) har_p, void (*fun_f)(u3_noun)) /* _ch_mark_buck(): mark bucket for gc. */ static void -_ch_mark_buck(u3_ch_buck* hab_u) +_ch_mark_buck(u3h_buck* hab_u) { c3_w i_w; for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { - u3_ca_mark_noun(hab_u->kev[i_w]); + u3a_mark_noun(hab_u->kev[i_w]); } - u3_ca_mark_ptr(hab_u); + u3a_mark_ptr(hab_u); } /* _ch_mark_node(): mark node for gc. */ static void -_ch_mark_node(u3_ch_node* han_u, c3_w lef_w) +_ch_mark_node(u3h_node* han_u, c3_w lef_w) { c3_w len_w = _ch_popcount(han_u->map_w); c3_w i_w; @@ -641,13 +641,13 @@ _ch_mark_node(u3_ch_node* han_u, c3_w lef_w) for ( i_w = 0; i_w < len_w; i_w++ ) { c3_w sot_w = han_u->sot_w[i_w]; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - u3_ca_mark_noun(kev); + u3a_mark_noun(kev); } else { - void* hav_v = u3_ch_slot_to_node(sot_w); + void* hav_v = u3h_slot_to_node(sot_w); if ( 0 == lef_w ) { _ch_mark_buck(hav_v); @@ -656,30 +656,30 @@ _ch_mark_node(u3_ch_node* han_u, c3_w lef_w) } } } - u3_ca_mark_ptr(han_u); + u3a_mark_ptr(han_u); } -/* u3_ch_mark(): mark hashtable for gc. +/* u3h_mark(): mark hashtable for gc. */ void -u3_ch_mark(u3p(u3_ch_root) har_p) +u3h_mark(u3p(u3h_root) har_p) { - u3_ch_root* har_u = u3to(u3_ch_root, har_p); + u3h_root* har_u = u3to(u3h_root, har_p); c3_w i_w; for ( i_w = 0; i_w < 64; i_w++ ) { c3_w sot_w = har_u->sot_w[i_w]; - if ( _(u3_ch_slot_is_noun(sot_w)) ) { - u3_noun kev = u3_ch_slot_to_noun(sot_w); + if ( _(u3h_slot_is_noun(sot_w)) ) { + u3_noun kev = u3h_slot_to_noun(sot_w); - u3_ca_mark_noun(kev); + u3a_mark_noun(kev); } - else if ( _(u3_ch_slot_is_node(sot_w)) ) { - u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); + else if ( _(u3h_slot_is_node(sot_w)) ) { + u3h_node* han_u = u3h_slot_to_node(sot_w); _ch_mark_node(han_u, 25); } } - u3_ca_mark_ptr(har_u); + u3a_mark_ptr(har_u); } diff --git a/g/i.c b/g/i.c index ecaf2eafdd..99e0ee7e26 100644 --- a/g/i.c +++ b/g/i.c @@ -4,12 +4,12 @@ */ #include "all.h" -/* u3_ci_words(): +/* u3i_words(): ** ** Copy [a] words from [b] into an atom. */ u3_noun -u3_ci_words(c3_w a_w, +u3i_words(c3_w a_w, const c3_w* b_w) { /* Strip trailing zeroes. @@ -30,8 +30,8 @@ u3_ci_words(c3_w a_w, /* Allocate, fill, return. */ { - c3_w* nov_w = u3_ca_walloc(a_w + c3_wiseof(u3_ca_atom)); - u3_ca_atom* nov_u = (void*)nov_w; + c3_w* nov_w = u3a_walloc(a_w + c3_wiseof(u3a_atom)); + u3a_atom* nov_u = (void*)nov_w; nov_u->mug_w = 0; nov_u->len_w = a_w; @@ -45,16 +45,16 @@ u3_ci_words(c3_w a_w, nov_u->buf_w[i_w] = b_w[i_w]; } } - return u3_ca_to_pug(u3_ca_outa(nov_w)); + return u3a_to_pug(u3a_outa(nov_w)); } } -/* u3_ci_chubs(): +/* u3i_chubs(): ** ** Construct `a` double-words from `b`, LSD first, as an atom. */ u3_atom -u3_ci_chubs(c3_w a_w, +u3i_chubs(c3_w a_w, const c3_d* b_d) { c3_w *b_w = c3_malloc(a_w * 8); @@ -65,17 +65,17 @@ u3_ci_chubs(c3_w a_w, b_w[(2 * i_w)] = b_d[i_w] & 0xffffffffULL; b_w[(2 * i_w) + 1] = b_d[i_w] >> 32ULL; } - p = u3_ci_words((a_w * 2), b_w); + p = u3i_words((a_w * 2), b_w); free(b_w); return p; } -/* u3_ci_bytes(): +/* u3i_bytes(): ** ** Copy `a` bytes from `b` to an LSB first atom. */ u3_noun -u3_ci_bytes(c3_w a_w, +u3i_bytes(c3_w a_w, const c3_y* b_y) { /* Strip trailing zeroes. @@ -108,8 +108,8 @@ u3_ci_bytes(c3_w a_w, */ { c3_w len_w = (a_w + 3) >> 2; - c3_w* nov_w = u3_ca_walloc((len_w + c3_wiseof(u3_ca_atom))); - u3_ca_atom* nov_u = (void*)nov_w; + c3_w* nov_w = u3a_walloc((len_w + c3_wiseof(u3a_atom))); + u3a_atom* nov_u = (void*)nov_w; nov_u->mug_w = 0; nov_u->len_w = len_w; @@ -133,16 +133,16 @@ u3_ci_bytes(c3_w a_w, nov_u->buf_w[i_w >> 2] |= (b_y[i_w] << ((i_w & 3) * 8)); } } - return u3_ca_to_pug(u3_ca_outa(nov_w)); + return u3a_to_pug(u3a_outa(nov_w)); } } -/* u3_ci_mp(): +/* u3i_mp(): ** ** Copy the GMP integer `a` into an atom, and clear it. */ u3_noun -u3_ci_mp(mpz_t a_mp) +u3i_mp(mpz_t a_mp) { /* Efficiency: unnecessary copy. */ @@ -157,66 +157,66 @@ u3_ci_mp(mpz_t a_mp) mpz_export(buz_w, 0, -1, 4, 0, 0, a_mp); mpz_clear(a_mp); - return u3_ci_words(pyg_w, buz_w); + return u3i_words(pyg_w, buz_w); } } -/* u3_ci_vint(): +/* u3i_vint(): ** ** Create `a + 1`. */ u3_noun -u3_ci_vint(u3_noun a) +u3i_vint(u3_noun a) { c3_assert(u3_none != a); - if ( _(u3_ca_is_cat(a)) ) { + if ( _(u3a_is_cat(a)) ) { c3_w vin_w = (a + 1); if ( a == 0x7fffffff ) { - return u3_ci_words(1, &vin_w); + return u3i_words(1, &vin_w); } else return vin_w; } - else if ( _(u3_ca_is_cell(a)) ) { - return u3_cm_bail(c3__exit); + else if ( _(u3a_is_cell(a)) ) { + return u3m_bail(c3__exit); } else { mpz_t a_mp; - u3_cr_mp(a_mp, a); - u3_ca_lose(a); + u3r_mp(a_mp, a); + u3a_lose(a); mpz_add_ui(a_mp, a_mp, 1); - return u3_ci_mp(a_mp); + return u3i_mp(a_mp); } } -/* u3_ci_cell(): +/* u3i_cell(): ** ** Produce the cell `[a b]`. */ u3_noun -u3_ci_cell(u3_noun a, u3_noun b) +u3i_cell(u3_noun a, u3_noun b) { c3_assert(u3_none != a); c3_assert(u3_none != b); - c3_assert(!_(u3_ca_is_junior(u3R, a))); - c3_assert(!_(u3_ca_is_junior(u3R, b))); + c3_assert(!_(u3a_is_junior(u3R, a))); + c3_assert(!_(u3a_is_junior(u3R, b))); { - c3_w* nov_w = u3_ca_walloc(c3_wiseof(u3_ca_cell)); - u3_ca_cell* nov_u = (void *)nov_w; + c3_w* nov_w = u3a_walloc(c3_wiseof(u3a_cell)); + u3a_cell* nov_u = (void *)nov_w; u3_noun pro; nov_u->mug_w = 0; nov_u->hed = a; nov_u->tel = b; - pro = u3_ca_to_pom(u3_ca_outa(nov_w)); + pro = u3a_to_pom(u3a_outa(nov_w)); #if 0 - if ( 0x15d47649 == u3_cr_mug(pro) ) { + if ( 0x15d47649 == u3r_mug(pro) ) { fprintf(stderr, "BAD %x\r\n", pro); BAD = pro; } @@ -224,81 +224,81 @@ u3_ci_cell(u3_noun a, u3_noun b) #if 1 return pro; #else - if ( !FOO ) return u3_ca_to_pom(u3_ca_outa(nov_w)); + if ( !FOO ) return u3a_to_pom(u3a_outa(nov_w)); else { - u3_noun pro = u3_ca_to_pom(u3_ca_outa(nov_w)); + u3_noun pro = u3a_to_pom(u3a_outa(nov_w)); - u3_cm_p("leaked", pro); - printf("pro %u, %x\r\n", pro, u3_cr_mug(pro)); + u3m_p("leaked", pro); + printf("pro %u, %x\r\n", pro, u3r_mug(pro)); abort(); } #endif } } -/* u3_ci_trel(): +/* u3i_trel(): ** ** Produce the triple `[a b c]`. */ u3_noun -u3_ci_trel(u3_noun a, u3_noun b, u3_noun c) +u3i_trel(u3_noun a, u3_noun b, u3_noun c) { - return u3_ci_cell(a, u3_ci_cell(b, c)); + return u3i_cell(a, u3i_cell(b, c)); } -/* u3_ci_qual(): +/* u3i_qual(): ** ** Produce the cell `[a b c d]`. */ u3_noun -u3_ci_qual(u3_noun a, u3_noun b, u3_noun c, u3_noun d) +u3i_qual(u3_noun a, u3_noun b, u3_noun c, u3_noun d) { - return u3_ci_cell(a, u3_ci_trel(b, c, d)); + return u3i_cell(a, u3i_trel(b, c, d)); } -/* u3_ci_string(): +/* u3i_string(): ** ** Produce an LSB-first atom from the C string `a`. */ u3_noun -u3_ci_string(const c3_c* a_c) +u3i_string(const c3_c* a_c) { - return u3_ci_bytes(strlen(a_c), (c3_y *)a_c); + return u3i_bytes(strlen(a_c), (c3_y *)a_c); } -/* u3_ci_tape(): from a C string, to a list of bytes. +/* u3i_tape(): from a C string, to a list of bytes. */ u3_atom -u3_ci_tape(const c3_c* txt_c) +u3i_tape(const c3_c* txt_c) { if ( !*txt_c ) { return u3_nul; - } else return u3_ci_cell(*txt_c, u3_ci_tape(txt_c + 1)); + } else return u3i_cell(*txt_c, u3i_tape(txt_c + 1)); } -/* u3_ci_decimal(): +/* u3i_decimal(): ** ** Parse `a` as a list of decimal digits. */ u3_atom -u3_ci_decimal(u3_noun a); +u3i_decimal(u3_noun a); -/* u3_ci_heximal(): +/* u3i_heximal(): ** ** Parse `a` as a list of hex digits. */ u3_noun -u3_ci_heximal(u3_noun a); +u3i_heximal(u3_noun a); -/* u3_ci_list(): +/* u3i_list(): ** ** Generate a null-terminated list, with `u3_none` as terminator. */ u3_noun -u3_ci_list(u3_weak one, ...); +u3i_list(u3_weak one, ...); -/* u3_ci_molt(): +/* u3i_molt(): ** ** Mutate `som` with a 0-terminated list of axis, noun pairs. ** Axes must be cats (31 bit). @@ -334,7 +334,7 @@ u3_ci_list(u3_weak one, ...); struct _molt_pair* pms_m) // transfer { if ( len_w == 0 ) { - return u3_ca_gain(som); + return u3a_gain(som); } else if ( (len_w == 1) && (1 == pms_m[0].axe_w) ) { return pms_m[0].som; @@ -342,18 +342,18 @@ u3_ci_list(u3_weak one, ...); else { c3_w cut_w = _molt_cut(len_w, pms_m); - if ( c3n == u3_ca_is_cell(som) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3a_is_cell(som) ) { + return u3m_bail(c3__exit); } else { - return u3_ci_cell - (_molt_apply(u3_ca_h(som), cut_w, pms_m), - _molt_apply(u3_ca_t(som), (len_w - cut_w), (pms_m + cut_w))); + return u3i_cell + (_molt_apply(u3a_h(som), cut_w, pms_m), + _molt_apply(u3a_t(som), (len_w - cut_w), (pms_m + cut_w))); } } } u3_noun -u3_ci_molt(u3_noun som, ...) +u3i_molt(u3_noun som, ...) { va_list ap; c3_w len_w; @@ -392,7 +392,7 @@ u3_ci_molt(u3_noun som, ...) /* Apply. */ pro = _molt_apply(som, len_w, pms_m); - u3_ca_lose(som); + u3a_lose(som); return pro; } diff --git a/g/j.c b/g/j.c index 78c87c82f0..4b15b94636 100644 --- a/g/j.c +++ b/g/j.c @@ -7,14 +7,14 @@ /* _cj_count(): count and link dashboard entries. */ static c3_w - _cj_count(u3_ce_core* par_u, u3_ce_core* dev_u) + _cj_count(u3e_core* par_u, u3e_core* dev_u) { c3_w len_l = 0; c3_w i_w; if ( dev_u ) { for ( i_w = 0; 0 != dev_u[i_w].cos_c; i_w++ ) { - u3_ce_core* kid_u = &dev_u[i_w]; + u3e_core* kid_u = &dev_u[i_w]; kid_u->par_u = par_u; len_l += _cj_count(kid_u, kid_u->dev_u); @@ -25,13 +25,13 @@ /* _cj_install(): install dashboard entries. */ static c3_w - _cj_install(u3_ce_core* ray_u, c3_w jax_l, u3_ce_core* dev_u) + _cj_install(u3e_core* ray_u, c3_w jax_l, u3e_core* dev_u) { c3_w i_w; if ( dev_u ) { for ( i_w = 0; 0 != dev_u[i_w].cos_c; i_w++ ) { - u3_ce_core* kid_u = &dev_u[i_w]; + u3e_core* kid_u = &dev_u[i_w]; kid_u->jax_l = jax_l; ray_u[jax_l++] = *kid_u; @@ -52,10 +52,10 @@ _cj_axis(u3_noun fol) while ( _(u3du(fol)) && (10 == u3h(fol)) ) { fol = u3t(u3t(fol)); } - if ( !_(u3_cr_trel(fol, &p_fol, &q_fol, &r_fol)) ) { - if ( !_(u3_cr_cell(fol, &p_fol, &q_fol)) || + if ( !_(u3r_trel(fol, &p_fol, &q_fol, &r_fol)) ) { + if ( !_(u3r_cell(fol, &p_fol, &q_fol)) || (0 != p_fol) || - (!_(u3_ca_is_cat(q_fol))) ) + (!_(u3a_is_cat(q_fol))) ) { fprintf(stderr, "axis: bad a\r\n"); return 0; @@ -65,7 +65,7 @@ _cj_axis(u3_noun fol) else { if ( 9 != p_fol ) { fprintf(stderr, "axis: bad b\r\n"); return 0; } - if ( !_(u3_ca_is_cat(q_fol)) ) + if ( !_(u3a_is_cat(q_fol)) ) { fprintf(stderr, "axis: bad c\r\n"); return 0; } if ( !_(u3du(r_fol)) || (0 != u3h(r_fol)) || (1 != u3t(r_fol)) ) { fprintf(stderr, "axis: bad d\r\n"); return 0; } @@ -86,10 +86,10 @@ _cj_by_gut(u3_noun a, u3_noun b) u3_noun l_a, n_a, r_a; u3_noun pn_a, qn_a; - u3_cx_trel(a, &n_a, &l_a, &r_a); - u3_cx_cell(n_a, &pn_a, &qn_a); + u3x_trel(a, &n_a, &l_a, &r_a); + u3x_cell(n_a, &pn_a, &qn_a); { - if ( (c3y == u3_cr_sing(b, pn_a)) ) { + if ( (c3y == u3r_sing(b, pn_a)) ) { return qn_a; } else { @@ -108,16 +108,16 @@ static c3_c* _cj_chum(u3_noun chu) { if ( _(u3ud(chu)) ) { - return u3_cr_string(chu); + return u3r_string(chu); } else { u3_noun h_chu = u3h(chu); u3_noun t_chu = u3t(chu); - if ( !_(u3_ca_is_cat(t_chu)) ) { + if ( !_(u3a_is_cat(t_chu)) ) { return 0; } else { - c3_c* h_chu_c = u3_cr_string(h_chu); + c3_c* h_chu_c = u3r_string(h_chu); c3_c buf[33]; memset(buf, 0, 33); @@ -139,7 +139,7 @@ _cj_je_fsck(u3_noun clu) c3_c* nam_c; c3_l axe_l; - if ( c3n == u3_cr_trel(clu, &p_clu, &q_clu, &r_clu) ) { + if ( c3n == u3r_trel(clu, &p_clu, &q_clu, &r_clu) ) { u3z(clu); return u3_none; } if ( 0 == (nam_c = _cj_chum(p_clu)) ) { @@ -156,7 +156,7 @@ _cj_je_fsck(u3_noun clu) axe_l = 0; } else { - if ( (0 != u3h(q_clu)) || !_(u3_ca_is_cat(axe_l = u3t(q_clu))) ) { + if ( (0 != u3h(q_clu)) || !_(u3a_is_cat(axe_l = u3t(q_clu))) ) { u3z(clu); free(nam_c); return u3_none; } } @@ -167,8 +167,8 @@ _cj_je_fsck(u3_noun clu) while ( _(u3du(r_clu)) ) { u3_noun ir_clu, tr_clu, pir_clu, qir_clu; - if ( (c3n == u3_cr_cell(r_clu, &ir_clu, &tr_clu)) || - (c3n == u3_cr_cell(ir_clu, &pir_clu, &qir_clu)) || + if ( (c3n == u3r_cell(r_clu, &ir_clu, &tr_clu)) || + (c3n == u3r_cell(ir_clu, &pir_clu, &qir_clu)) || (c3n == u3ud(pir_clu)) ) { u3z(huk); u3z(clu); free(nam_c); return u3_none; @@ -178,7 +178,7 @@ _cj_je_fsck(u3_noun clu) } } u3z(clu); - return u3nt(u3_ci_string(nam_c), axe_l, huk); + return u3nt(u3i_string(nam_c), axe_l, huk); } /* _cj_sham(): ++sham. @@ -199,7 +199,7 @@ _cj_sham(u3_noun som) // XX wrong, does not match ++sham static u3_weak _cj_cold_find_sys(u3_noun bat) { - u3_cs_road* rod_u = u3R; + u3a_road* rod_u = u3R; while ( 1 ) { u3_noun pro = _cj_by_gut(u3h(rod_u->jed.das), bat); @@ -222,7 +222,7 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) u3_noun bat = u3h(cor); u3_noun p_cey, q_cey, r_cey; - u3_cr_trel(cey, &p_cey, &q_cey, &r_cey); + u3r_trel(cey, &p_cey, &q_cey, &r_cey); { /* Calculate semantic identity (mop). */ @@ -232,10 +232,10 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) mop = u3nq(u3k(p_cey), 3, c3n, u3k(bat)); } else { - u3_weak rah = u3_cr_at(q_cey, cor); + u3_weak rah = u3r_at(q_cey, cor); if ( (u3_none == rah) || !_(u3du(rah)) ) { - fprintf(stderr, "fund: %s is bogus\r\n", u3_cr_string(p_cey)); + fprintf(stderr, "fund: %s is bogus\r\n", u3r_string(p_cey)); return u3_none; } else { @@ -243,8 +243,8 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) if ( u3_none == soh ) { fprintf(stderr, "fund: in %s, parent %x not found at %d\r\n", - u3_cr_string(p_cey), - u3_cr_mug(u3h(rah)), + u3r_string(p_cey), + u3r_mug(u3h(rah)), q_cey); return u3_none; } @@ -291,10 +291,10 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) u3_weak _cj_warm_fend(u3_noun bat) { - u3_cs_road* rod_u = u3R; + u3a_road* rod_u = u3R; while ( 1 ) { - u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat); + u3_weak jaw = u3h_gut(rod_u->jed.har_p, bat); if ( u3_none != jaw ) { return jaw; @@ -313,12 +313,12 @@ static u3_noun _cj_warm_hump(c3_l jax_l, u3_noun huc) { u3_noun hap = u3_nul; - u3_ce_core* cop_u; + u3e_core* cop_u; /* Compute axes of all correctly declared arms. */ if ( jax_l && (cop_u = &u3D.ray_u[jax_l])->arm_u ) { - u3_ce_harm* jet_u; + u3e_harm* jet_u; c3_l i_l; for ( i_l = 0; (jet_u = &cop_u->arm_u[i_l])->fcs_c; i_l++ ) { @@ -336,7 +336,7 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc) } } else { - u3_noun nam = u3_ci_string(jet_u->fcs_c); + u3_noun nam = u3i_string(jet_u->fcs_c); u3_noun fol = u3_ckdb_get(u3k(huc), nam); if ( u3_none == fol ) { @@ -362,8 +362,8 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc) static c3_l _cj_boil_mean(c3_l par_l, u3_noun mop, u3_noun bat) { - u3_ce_core* par_u; - u3_ce_core* dev_u; + u3e_core* par_u; + u3e_core* dev_u; if ( 0 != par_l ) { par_u = &u3D.ray_u[par_l]; @@ -376,16 +376,16 @@ _cj_boil_mean(c3_l par_l, u3_noun mop, u3_noun bat) { c3_w i_l = 0; - u3_ce_core* cop_u; + u3e_core* cop_u; while ( (cop_u = &dev_u[i_l])->cos_c ) { - if ( _(u3_cr_sing_c(cop_u->cos_c, u3h(mop))) ) { + if ( _(u3r_sing_c(cop_u->cos_c, u3h(mop))) ) { #if 0 fprintf(stderr, "boil: bound jet %d/%s/%s/%x\r\n", cop_u->jax_l, cop_u->cos_c, par_u ? par_u->cos_c : "~", - u3_cr_mug(bat)); + u3r_mug(bat)); #endif return cop_u->jax_l; } @@ -402,15 +402,15 @@ _cj_boil_mine(u3_noun mop, u3_noun cor) { u3_noun p_mop, q_mop, r_mop, hr_mop, tr_mop; - u3_cx_trel(mop, &p_mop, &q_mop, &r_mop); - u3_cx_cell(r_mop, &hr_mop, &tr_mop); + u3x_trel(mop, &p_mop, &q_mop, &r_mop); + u3x_cell(r_mop, &hr_mop, &tr_mop); { c3_l par_l; // Calculate parent axis. // if ( c3y == hr_mop ) { - u3_noun cax = _cj_warm_fend(u3h(u3_cr_at(q_mop, cor))); + u3_noun cax = _cj_warm_fend(u3h(u3r_at(q_mop, cor))); par_l = u3h(cax); u3z(cax); @@ -431,7 +431,7 @@ _cj_warm_ream_be(c3_l jax_l, u3_noun bat, u3_noun huc) { - u3_ch_put(u3R->jed.har_p, + u3h_put(u3R->jed.har_p, bat, u3nq(jax_l, u3k(pax), @@ -449,8 +449,8 @@ _cj_warm_ream_is(c3_l jax_l, if ( u3_nul != sab ) { u3_noun n_sab, l_sab, r_sab, pn_sab, qn_sab; - u3_cx_trel(sab, &n_sab, &l_sab, &r_sab); - u3_cx_cell(n_sab, &pn_sab, &qn_sab); + u3x_trel(sab, &n_sab, &l_sab, &r_sab); + u3x_cell(n_sab, &pn_sab, &qn_sab); _cj_warm_ream_be(jax_l, pax, pn_sab, qn_sab); _cj_warm_ream_is(jax_l, pax, l_sab); @@ -468,7 +468,7 @@ _cj_warm_ream_un(u3_noun soh) u3_noun cax; c3_l jax_l; - if ( u3_none != (cax = u3_ch_get(u3R->jed.har_p, u3h(u3h(sab)))) ) { + if ( u3_none != (cax = u3h_get(u3R->jed.har_p, u3h(u3h(sab)))) ) { jax_l = u3h(cax); u3z(cax); } @@ -488,8 +488,8 @@ _cj_warm_ream_at(u3_noun soh, u3_noun cag) u3_noun sab = u3t(cag); u3_noun p_mop, q_mop, r_mop, hr_mop, tr_mop; - u3_cx_trel(mop, &p_mop, &q_mop, &r_mop); - u3_cx_cell(r_mop, &hr_mop, &tr_mop); + u3x_trel(mop, &p_mop, &q_mop, &r_mop); + u3x_cell(r_mop, &hr_mop, &tr_mop); { c3_l par_l, jax_l; @@ -513,8 +513,8 @@ _cj_warm_ream_in(u3_noun taw) if ( u3_nul != taw ) { u3_noun n_taw, l_taw, r_taw, pn_taw, qn_taw; - u3_cx_trel(taw, &n_taw, &l_taw, &r_taw); - u3_cx_cell(n_taw, &pn_taw, &qn_taw); + u3x_trel(taw, &n_taw, &l_taw, &r_taw); + u3x_cell(n_taw, &pn_taw, &qn_taw); _cj_warm_ream_at(pn_taw, qn_taw); _cj_warm_ream_in(l_taw); @@ -533,13 +533,13 @@ _cj_warm_ream(void) } } -/* u3_cj_ream(): reream after restoring from checkpoint. +/* u3j_ream(): reream after restoring from checkpoint. */ void -u3_cj_ream(void) +u3j_ream(void) { - u3_ch_free(u3R->jed.har_p); - u3R->jed.har_p = u3_ch_new(); + u3h_free(u3R->jed.har_p); + u3R->jed.har_p = u3h_new(); _cj_warm_ream(); } @@ -561,7 +561,7 @@ _cj_warm_mine(u3_noun clu, u3_noun cor) else { u3_noun cey = _cj_je_fsck(clu); - // fprintf(stderr, "warm_mine %s\r\n", u3_cr_string(u3h(cey))); + // fprintf(stderr, "warm_mine %s\r\n", u3r_string(u3h(cey))); if ( u3_none != cey ) { u3_noun huc = u3t(u3t(cey)); @@ -571,8 +571,8 @@ _cj_warm_mine(u3_noun clu, u3_noun cor) if ( u3_none != (mop = _cj_cold_mine(cey, cor)) ) { c3_l jax_l = _cj_boil_mine(mop, cor); - // fprintf(stderr, "warm: bat %x\r\n", u3_cr_mug(bat)); - u3_ch_put(u3R->jed.har_p, + // fprintf(stderr, "warm: bat %x\r\n", u3r_mug(bat)); + u3h_put(u3R->jed.har_p, bat, u3nq(jax_l, u3k(pax), @@ -586,18 +586,18 @@ _cj_warm_mine(u3_noun clu, u3_noun cor) u3z(cor); } -/* u3_cj_boot(): initialize jet system. +/* u3j_boot(): initialize jet system. */ void -u3_cj_boot(void) +u3j_boot(void) { c3_w jax_l; u3D.len_l =_cj_count(0, u3D.dev_u); u3D.all_l = (2 * u3D.len_l) + 1024; // horrid heuristic - u3D.ray_u = (u3_ce_core*) malloc(u3D.all_l * sizeof(u3_ce_core)); - memset(u3D.ray_u, 0, (u3D.all_l * sizeof(u3_ce_core))); + u3D.ray_u = (u3e_core*) malloc(u3D.all_l * sizeof(u3e_core)); + memset(u3D.ray_u, 0, (u3D.all_l * sizeof(u3e_core))); jax_l = _cj_install(u3D.ray_u, 1, u3D.dev_u); fprintf(stderr, "boot: installed %d jets\n", jax_l); @@ -608,13 +608,13 @@ u3_cj_boot(void) c3_l _cj_find(u3_noun bat) { - u3_cs_road* rod_u = u3R; + u3a_road* rod_u = u3R; while ( 1 ) { - u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat); + u3_weak jaw = u3h_gut(rod_u->jed.har_p, bat); if ( u3_none != jaw ) { - u3_assure(u3_ca_is_cat(u3h(jaw))); + u3_assure(u3a_is_cat(u3h(jaw))); #if 0 if ( rod_u != u3R ) { @@ -631,10 +631,10 @@ _cj_find(u3_noun bat) } } -/* u3_cj_find(): search for jet. `bat` is RETAINED. +/* u3j_find(): search for jet. `bat` is RETAINED. */ c3_l -u3_cj_find(u3_noun bat) +u3j_find(u3_noun bat) { return _cj_find(bat); } @@ -644,9 +644,9 @@ u3_cj_find(u3_noun bat) static u3_noun _cj_soft(u3_noun cor, u3_noun axe) { - u3_noun arm = u3_cx_at(axe, cor); + u3_noun arm = u3x_at(axe, cor); - return u3_cn_nock_on(cor, u3k(arm)); + return u3n_nock_on(cor, u3k(arm)); } extern int SLAY; @@ -657,7 +657,7 @@ extern int SLAY; ** `axe` is RETAINED. */ static u3_weak -_cj_kick_z(u3_noun cor, u3_ce_core* cop_u, u3_ce_harm* ham_u, u3_atom axe) +_cj_kick_z(u3_noun cor, u3e_core* cop_u, u3e_harm* ham_u, u3_atom axe) { if ( 0 == ham_u->fun_f ) { return u3_none; @@ -690,15 +690,15 @@ _cj_kick_z(u3_noun cor, u3_ce_core* cop_u, u3_ce_harm* ham_u, u3_atom axe) ame = _cj_soft(cor, axe); ham_u->liv = c3y; - if ( c3n == u3_cr_sing(ame, pro) ) { + if ( c3n == u3r_sing(ame, pro) ) { fprintf(stderr, "test: %s %s: mismatch: good %x, bad %x\r\n", cop_u->cos_c, (!strcmp(".2", ham_u->fcs_c)) ? "$" : ham_u->fcs_c, - u3_cr_mug(ame), - u3_cr_mug(pro)); + u3r_mug(ame), + u3r_mug(pro)); c3_assert(0); - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { #if 1 @@ -721,26 +721,26 @@ _cj_hook_in(u3_noun cor, { u3_noun bat = u3h(cor); - if ( !_(u3du(cor)) ) { return u3_cm_bail(c3__fail); } + if ( !_(u3du(cor)) ) { return u3m_bail(c3__fail); } { u3_weak cax = _cj_warm_fend(bat); - if ( u3_none == cax ) { return u3_cm_bail(c3__fail); } + if ( u3_none == cax ) { return u3m_bail(c3__fail); } { u3_noun jax, pax, huc, hap; - u3_cx_qual(cax, &jax, &pax, &hap, &huc); + u3x_qual(cax, &jax, &pax, &hap, &huc); { c3_l jax_l = jax; - u3_ce_core* cop_u = &u3D.ray_u[jax_l]; - u3_noun fol = u3_ckdb_get(u3k(huc), u3_ci_string(tam_c)); + u3e_core* cop_u = &u3D.ray_u[jax_l]; + u3_noun fol = u3_ckdb_get(u3k(huc), u3i_string(tam_c)); if ( u3_none == fol ) { // The caller wants a deeper core. // - if ( 0 == pax ) { return u3_cm_bail(c3__fail); } + if ( 0 == pax ) { return u3m_bail(c3__fail); } else { - u3_noun inn = u3k(u3_cx_at(pax, cor)); + u3_noun inn = u3k(u3x_at(pax, cor)); u3z(cax); u3z(cor); return _cj_hook_in(inn, tam_c, jet_o); @@ -761,13 +761,13 @@ _cj_hook_in(u3_noun cor, { if ( 0 == axe_l ) { u3z(cax); - return u3_cn_nock_on(cor, fol); + return u3n_nock_on(cor, fol); } else { // Tricky: the above case would work here too, but would // disable jet_o and create some infinite recursions. // u3z(cax); u3z(fol); - return u3_cn_nock_on(cor, u3k(u3_cx_at(axe_l, cor))); + return u3n_nock_on(cor, u3k(u3x_at(axe_l, cor))); } } else { @@ -780,10 +780,10 @@ _cj_hook_in(u3_noun cor, } } -/* u3_cj_soft(): execute soft hook. +/* u3j_soft(): execute soft hook. */ u3_noun -u3_cj_soft(u3_noun cor, +u3j_soft(u3_noun cor, const c3_c* tam_c) { u3_noun pro; @@ -792,10 +792,10 @@ u3_cj_soft(u3_noun cor, return pro; } -/* u3_cj_hook(): execute hook from core, or fail. +/* u3j_hook(): execute hook from core, or fail. */ u3_noun -u3_cj_hook(u3_noun cor, +u3j_hook(u3_noun cor, const c3_c* tam_c) { u3_noun pro; @@ -804,13 +804,13 @@ u3_cj_hook(u3_noun cor, return pro; } -/* u3_cj_kick(): new kick. +/* u3j_kick(): new kick. ** ** `axe` is RETAINED by the caller; `cor` is RETAINED iff there ** is no kick, TRANSFERRED if one. */ u3_weak -u3_cj_kick(u3_noun cor, u3_noun axe) +u3j_kick(u3_noun cor, u3_noun axe) { if ( !_(u3du(cor)) ) { return u3_none; } { @@ -827,9 +827,9 @@ u3_cj_kick(u3_noun cor, u3_noun axe) } else { c3_l jax_l = u3h(cax); - u3_ce_core* cop_u = &u3D.ray_u[jax_l]; + u3e_core* cop_u = &u3D.ray_u[jax_l]; c3_l inx_l = inx; - u3_ce_harm* ham_u = &cop_u->arm_u[inx_l]; + u3e_harm* ham_u = &cop_u->arm_u[inx_l]; u3_noun pro; u3z(cax); @@ -841,25 +841,25 @@ u3_cj_kick(u3_noun cor, u3_noun axe) } } -/* u3_cj_kink(): kick either by jet or by nock. +/* u3j_kink(): kick either by jet or by nock. */ u3_noun -u3_cj_kink(u3_noun cor, +u3j_kink(u3_noun cor, u3_noun axe) { - u3_weak pro = u3_cj_kick(cor, axe); + u3_weak pro = u3j_kick(cor, axe); if ( u3_none != pro ) { return pro; } else { - return u3_cn_nock_on(cor, u3nq(9, axe, 0, 1)); + return u3n_nock_on(cor, u3nq(9, axe, 0, 1)); } } -/* u3_cj_mine(): register core for jets. Produce registered core. +/* u3j_mine(): register core for jets. Produce registered core. */ void -u3_cj_mine(u3_noun clu, u3_noun cor) +u3j_mine(u3_noun clu, u3_noun cor) { _cj_warm_mine(clu, cor); } @@ -875,12 +875,12 @@ _cj_cold_reap_un(u3_noun soh, u3_noun sab, u3_noun sys) else { u3_noun n_sab, l_sab, r_sab, pn_sab, qn_sab; - u3_cx_trel(sab, &n_sab, &l_sab, &r_sab); - u3_cx_cell(n_sab, &pn_sab, &qn_sab); + u3x_trel(sab, &n_sab, &l_sab, &r_sab); + u3x_cell(n_sab, &pn_sab, &qn_sab); { sys = _cj_cold_reap_un(soh, l_sab, sys); sys = _cj_cold_reap_un(soh, r_sab, sys); - sys = u3_ckdb_put(sys, u3_ca_take(pn_sab), u3k(soh)); + sys = u3_ckdb_put(sys, u3a_take(pn_sab), u3k(soh)); return sys; } @@ -898,8 +898,8 @@ _cj_cold_reap_to(u3_noun sab, u3_noun bas) else { u3_noun n_sab, l_sab, r_sab, pn_sab, qn_sab; - u3_cx_trel(sab, &n_sab, &l_sab, &r_sab); - u3_cx_cell(n_sab, &pn_sab, &qn_sab); + u3x_trel(sab, &n_sab, &l_sab, &r_sab); + u3x_cell(n_sab, &pn_sab, &qn_sab); { bas = _cj_cold_reap_to(l_sab, bas); bas = _cj_cold_reap_to(r_sab, bas); @@ -907,10 +907,10 @@ _cj_cold_reap_to(u3_noun sab, u3_noun bas) // If the battery is not junior, or if it has been // already collected for the product, promote it. // - if ( _(u3_ca_left(pn_sab)) ) { - u3_noun bat = u3_ca_take(pn_sab); + if ( _(u3a_left(pn_sab)) ) { + u3_noun bat = u3a_take(pn_sab); - bas = u3_ckdb_put(bas, bat, u3_ca_take(qn_sab)); + bas = u3_ckdb_put(bas, bat, u3a_take(qn_sab)); } return bas; } @@ -927,8 +927,8 @@ _cj_cold_reap_at(u3_noun soh, u3_noun cag) if ( u3_nul != sab ) { u3_noun sys, haw, das; - soh = u3_ca_take(soh); - cag = u3nc(u3_ca_take(u3h(cag)), sab); + soh = u3a_take(soh); + cag = u3nc(u3a_take(u3h(cag)), sab); sys = _cj_cold_reap_un(soh, sab, u3k(u3h(u3R->jed.das))); haw = u3_ckdb_put(u3k(u3t(u3R->jed.das)), soh, cag); @@ -948,8 +948,8 @@ _cj_cold_reap_in(u3_noun taw) if ( u3_nul != taw ) { u3_noun n_taw, l_taw, r_taw, pn_taw, qn_taw; - u3_cx_trel(taw, &n_taw, &l_taw, &r_taw); - u3_cx_cell(n_taw, &pn_taw, &qn_taw); + u3x_trel(taw, &n_taw, &l_taw, &r_taw); + u3x_cell(n_taw, &pn_taw, &qn_taw); _cj_cold_reap_at(pn_taw, qn_taw); _cj_cold_reap_in(l_taw); @@ -965,26 +965,26 @@ _cj_warm_reap(u3_noun kev) u3_noun bat = u3h(kev); u3_noun cax = u3t(kev); - if ( _(u3_ca_left(bat)) ) { - u3_noun tab = u3_ca_take(bat); - u3_noun xac = u3_ca_take(cax); + if ( _(u3a_left(bat)) ) { + u3_noun tab = u3a_take(bat); + u3_noun xac = u3a_take(cax); #if 0 fprintf(stderr, "reap: bat %x (%d, %d), cax %x\r\n", - u3_cr_mug(tab), - u3_ca_is_junior(u3R, bat), - u3_ca_use(tab), - u3_cr_mug(xac)); + u3r_mug(tab), + u3a_is_junior(u3R, bat), + u3a_use(tab), + u3r_mug(xac)); #endif - u3_ch_put(u3R->jed.har_p, tab, xac); + u3h_put(u3R->jed.har_p, tab, xac); u3z(tab); } } -/* u3_cj_reap(): promote jet state. RETAINS. +/* u3j_reap(): promote jet state. RETAINS. */ void -u3_cj_reap(u3_noun das, u3p(u3_ch_root) har_p) +u3j_reap(u3_noun das, u3p(u3h_root) har_p) { _cj_cold_reap_in(u3t(das)); - u3_ch_walk(har_p, _cj_warm_reap); + u3h_walk(har_p, _cj_warm_reap); } diff --git a/g/m.c b/g/m.c index 8f1b9cb65c..7d528eea0a 100644 --- a/g/m.c +++ b/g/m.c @@ -32,7 +32,7 @@ _cm_punt(u3_noun tax) u3_noun xat; for ( xat = tax; xat; xat = u3t(xat) ) { - u3_cm_p("&", u3h(xat)); + u3m_p("&", u3h(xat)); } } #endif @@ -138,13 +138,13 @@ _cm_signal_recover(c3_l sig_l, u3_noun arg) // A top-level crash - rather odd. We should GC. // _cm_emergency("recover: top", sig_l); - u3H->rod_u.how.fag_w |= u3_ca_flag_gc; + u3H->rod_u.how.fag_w |= u3a_flag_gc; // Reset the top road - the problem could be a fat cap. // _cm_signal_reset(); - if ( (c3__meme == sig_l) && (u3_ca_open(u3R) <= 256) ) { + if ( (c3__meme == sig_l) && (u3a_open(u3R) <= 256) ) { // Out of memory at the top level. Error becomes c3__full, // and we release the emergency buffer. To continue work, // we need to readjust the image, eg, migrate to 64 bit. @@ -165,13 +165,13 @@ _cm_signal_recover(c3_l sig_l, u3_noun arg) // Descend to the innermost trace, collecting stack. // { - u3_cs_road* rod_u; + u3a_road* rod_u; u3R = &(u3H->rod_u); rod_u = u3R; while ( rod_u->kid_u ) { - tax = u3_ckb_weld(u3_ca_take(rod_u->kid_u->bug.tax), tax); + tax = u3_ckb_weld(u3a_take(rod_u->kid_u->bug.tax), tax); rod_u = rod_u->kid_u; } } @@ -199,7 +199,7 @@ _cm_signal_deep(c3_w sec_w) // go utterly haywire. // if ( 0 == u3H->rod_u.bug.mer ) { - u3H->rod_u.bug.mer = u3_ci_string("emergency buffer"); + u3H->rod_u.bug.mer = u3i_string("emergency buffer"); } if ( sec_w ) { @@ -235,18 +235,18 @@ _cm_signal_done() u3_unix_ef_move(); } -/* u3_cm_signal(): treat a nock-level exception as a signal interrupt. +/* u3m_signal(): treat a nock-level exception as a signal interrupt. */ void -u3_cm_signal(u3_noun sig_l) +u3m_signal(u3_noun sig_l) { siglongjmp(u3_Signal, sig_l); } -/* u3_cm_file(): load file, as atom, or bail. +/* u3m_file(): load file, as atom, or bail. */ u3_noun -u3_cm_file(c3_c* pas_c) +u3m_file(c3_c* pas_c) { struct stat buf_b; c3_i fid_i = open(pas_c, O_RDONLY, 0644); @@ -255,7 +255,7 @@ u3_cm_file(c3_c* pas_c) if ( (fid_i < 0) || (fstat(fid_i, &buf_b) < 0) ) { fprintf(stderr, "%s: %s\r\n", pas_c, strerror(errno)); - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } fln_w = buf_b.st_size; pad_y = c3_malloc(buf_b.st_size); @@ -265,10 +265,10 @@ u3_cm_file(c3_c* pas_c) if ( fln_w != red_w ) { free(pad_y); - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { - u3_noun pad = u3_ci_bytes(fln_w, (c3_y *)pad_y); + u3_noun pad = u3i_bytes(fln_w, (c3_y *)pad_y); free(pad_y); return pad; @@ -342,74 +342,74 @@ _boot_south(c3_w* mem_w, c3_w siz_w, c3_w len_w) static void _boot_parts(void) { - u3R->cax.har_p = u3_ch_new(); - u3R->jed.har_p = u3_ch_new(); + u3R->cax.har_p = u3h_new(); + u3R->jed.har_p = u3h_new(); u3R->jed.das = u3nc(u3_nul, u3_nul); } -/* u3_cm_mark(): mark all nouns in the road. +/* u3m_mark(): mark all nouns in the road. */ void -u3_cm_mark(void) +u3m_mark(void) { - u3_ch_mark(u3R->jed.har_p); - u3_ca_mark_noun(u3R->jed.das); - u3_ca_mark_noun(u3R->ski.flu); - u3_ca_mark_noun(u3R->bug.tax); - u3_ca_mark_noun(u3R->bug.mer); - u3_ca_mark_noun(u3R->pro.don); - u3_ca_mark_noun(u3R->pro.day); - u3_ch_mark(u3R->cax.har_p); + u3h_mark(u3R->jed.har_p); + u3a_mark_noun(u3R->jed.das); + u3a_mark_noun(u3R->ski.flu); + u3a_mark_noun(u3R->bug.tax); + u3a_mark_noun(u3R->bug.mer); + u3a_mark_noun(u3R->pro.don); + u3a_mark_noun(u3R->pro.day); + u3h_mark(u3R->cax.har_p); } -/* u3_cm_boot(): instantiate or activate image. +/* u3m_boot(): instantiate or activate image. */ void -u3_cm_boot(c3_o nuu_o, c3_o bug_o) +u3m_boot(c3_o nuu_o, c3_o bug_o) { if ( c3y == nuu_o ) { u3H = (void *)_boot_north(u3_Loom + 1, - c3_wiseof(u3_cv_home), - u3_ca_words - 1); + c3_wiseof(u3v_home), + u3a_words - 1); u3R = &u3H->rod_u; _boot_parts(); } else { u3H = (void *)_find_north(u3_Loom + 1, - c3_wiseof(u3_cv_home), - u3_ca_words - 1); + c3_wiseof(u3v_home), + u3a_words - 1); u3R = &u3H->rod_u; } if ( _(bug_o) ) { - u3R->how.fag_w |= u3_ca_flag_debug; + u3R->how.fag_w |= u3a_flag_debug; } } -/* u3_cm_clear(): clear all allocated data in road. +/* u3m_clear(): clear all allocated data in road. */ void -u3_cm_clear(void) +u3m_clear(void) { - u3_ch_free(u3R->cax.har_p); - u3_ch_free(u3R->jed.har_p); - u3_ca_lose(u3R->jed.das); + u3h_free(u3R->cax.har_p); + u3h_free(u3R->jed.har_p); + u3a_lose(u3R->jed.das); } #if 0 void -u3_cm_dump(void) +u3m_dump(void) { c3_w hat_w; c3_w fre_w = 0; c3_w i_w; - hat_w = _(u3_ca_is_north(u3R)) ? u3R->hat_w - u3R->rut_w + hat_w = _(u3a_is_north(u3R)) ? u3R->hat_w - u3R->rut_w : u3R->rut_w - u3R->hat_w; for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) { - u3_ca_fbox* fre_u = u3R->all.fre_u[i_w]; + u3a_fbox* fre_u = u3R->all.fre_u[i_w]; while ( fre_u ) { fre_w += fre_u->box_u.siz_w; @@ -420,11 +420,11 @@ u3_cm_dump(void) hat_w, fre_w, (hat_w - fre_w)); if ( 0 != (hat_w - fre_w) ) { - c3_w* box_w = _(u3_ca_is_north(u3R)) ? u3R->rut_w : u3R->hat_w; + c3_w* box_w = _(u3a_is_north(u3R)) ? u3R->rut_w : u3R->hat_w; c3_w mem_w = 0; - while ( box_w < (_(u3_ca_is_north(u3R)) ? u3R->hat_w : u3R->rut_w) ) { - u3_ca_box* box_u = (void *)box_w; + while ( box_w < (_(u3a_is_north(u3R)) ? u3R->hat_w : u3R->rut_w) ) { + u3a_box* box_u = (void *)box_w; if ( 0 != box_u->use_w ) { #ifdef U3_MEMORY_DEBUG @@ -442,7 +442,7 @@ u3_cm_dump(void) c3_w Exit; -/* u3_cm_bail(): bail out. Does not return. +/* u3m_bail(): bail out. Does not return. ** ** Bail motes: ** @@ -464,7 +464,7 @@ c3_w Exit; ** == */ c3_i -u3_cm_bail(u3_noun how) +u3m_bail(u3_noun how) { if ( (c3__exit == how) && (u3R == &u3H->rod_u) ) { abort(); @@ -492,7 +492,7 @@ u3_cm_bail(u3_noun how) c3_assert(_(u3ud(u3h(how)))); fprintf(stderr, "bail: %d\r\n", u3h(how)); - u3_cm_p("bail", u3t(how)); + u3m_p("bail", u3t(how)); } } @@ -505,8 +505,8 @@ u3_cm_bail(u3_noun how) // choice but to use the signal process; and we require the flat // form of how. // - c3_assert(_(u3_ca_is_cat(how))); - u3_cm_signal(how); + c3_assert(_(u3a_is_cat(how))); + u3m_signal(how); } /* Reconstruct a correct error ball. @@ -535,21 +535,21 @@ u3_cm_bail(u3_noun how) return 0; } -int c3_cooked() { return u3_cm_bail(c3__oops); } +int c3_cooked() { return u3m_bail(c3__oops); } -/* u3_cm_error(): bail out with %exit, ct_pushing error. +/* u3m_error(): bail out with %exit, ct_pushing error. */ c3_i -u3_cm_error(c3_c* str_c) +u3m_error(c3_c* str_c) { fprintf(stderr, "error: %s\r\n", str_c); // rong - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } -/* u3_cm_leap(): in u3R, create a new road within the existing one. +/* u3m_leap(): in u3R, create a new road within the existing one. */ void -u3_cm_leap(c3_w pad_w) +u3m_leap(c3_w pad_w) { c3_w len_w; u3_road* rod_u; @@ -563,10 +563,10 @@ u3_cm_leap(c3_w pad_w) else { pad_w -= u3R->all.fre_w; } - if ( (pad_w + c3_wiseof(u3_cs_road)) >= u3_ca_open(u3R) ) { - u3_cm_bail(c3__meme); + if ( (pad_w + c3_wiseof(u3a_road)) >= u3a_open(u3R) ) { + u3m_bail(c3__meme); } - len_w = u3_ca_open(u3R) - (pad_w + c3_wiseof(u3_cs_road)); + len_w = u3a_open(u3R) - (pad_w + c3_wiseof(u3a_road)); } /* Allocate a region on the cap. @@ -574,11 +574,11 @@ u3_cm_leap(c3_w pad_w) { u3p(c3_w) bot_p; - if ( c3y == u3_ca_is_north(u3R) ) { + if ( c3y == u3a_is_north(u3R) ) { bot_p = (u3R->cap_p - len_w); u3R->cap_p -= len_w; - rod_u = _boot_south(u3_ca_into(bot_p), c3_wiseof(u3_cs_road), len_w); + rod_u = _boot_south(u3a_into(bot_p), c3_wiseof(u3a_road), len_w); #if 0 fprintf(stderr, "leap: from north %p (cap %x), to south %p\r\n", u3R, @@ -590,7 +590,7 @@ u3_cm_leap(c3_w pad_w) bot_p = u3R->cap_p; u3R->cap_p += len_w; - rod_u = _boot_north(u3_ca_into(bot_p), c3_wiseof(u3_cs_road), len_w); + rod_u = _boot_north(u3a_into(bot_p), c3_wiseof(u3a_road), len_w); #if 0 fprintf(stderr, "leap: from north %p (cap %p), to south %p\r\n", u3R, @@ -611,26 +611,26 @@ u3_cm_leap(c3_w pad_w) /* Set up the new road. */ { - if ( u3R->how.fag_w & u3_ca_flag_debug ) { - rod_u->how.fag_w |= u3_ca_flag_debug; + if ( u3R->how.fag_w & u3a_flag_debug ) { + rod_u->how.fag_w |= u3a_flag_debug; } u3R = rod_u; _boot_parts(); } } -/* u3_cm_fall(): in u3R, return an inner road to its parent. +/* u3m_fall(): in u3R, return an inner road to its parent. */ void -u3_cm_fall() +u3m_fall() { c3_assert(0 != u3R->par_u); #if 0 fprintf(stderr, "fall: from %s %p, to %s %p (cap %p, was %p)\r\n", - _(u3_ca_is_north(u3R)) ? "north" : "south", + _(u3a_is_north(u3R)) ? "north" : "south", u3R, - _(u3_ca_is_north(u3R)) ? "north" : "south", + _(u3a_is_north(u3R)) ? "north" : "south", u3R->par_u, u3R->hat_w, u3R->rut_w); @@ -646,30 +646,30 @@ u3_cm_fall() u3R->kid_u = 0; } -/* u3_cm_hate(): new, integrated leap mechanism (enter). +/* u3m_hate(): new, integrated leap mechanism (enter). */ void -u3_cm_hate(c3_w pad_w) +u3m_hate(c3_w pad_w) { c3_assert(0 == u3R->ear_p); u3R->ear_p = u3R->cap_p; - u3_cm_leap(pad_w); + u3m_leap(pad_w); } -/* u3_cm_love(): return product from leap. +/* u3m_love(): return product from leap. */ u3_noun -u3_cm_love(u3_noun pro) +u3m_love(u3_noun pro) { u3_noun das = u3R->jed.das; - u3p(u3_ch_root) har_p = u3R->jed.har_p; + u3p(u3h_root) har_p = u3R->jed.har_p; - u3_cm_fall(); + u3m_fall(); - pro = u3_ca_take(pro); + pro = u3a_take(pro); - u3_cj_reap(das, har_p); + u3j_reap(das, har_p); u3R->cap_p = u3R->ear_p; u3R->ear_p = 0; @@ -677,12 +677,12 @@ u3_cm_love(u3_noun pro) return pro; } -/* u3_cm_golf(): record cap_p length for u3_flog(). +/* u3m_golf(): record cap_p length for u3_flog(). */ c3_w -u3_cm_golf(void) +u3m_golf(void) { - if ( c3y == u3_ca_is_north(u3R) ) { + if ( c3y == u3a_is_north(u3R) ) { return u3R->mat_p - u3R->cap_p; } else { @@ -690,14 +690,14 @@ u3_cm_golf(void) } } -/* u3_cm_flog(): reset cap_p. +/* u3m_flog(): reset cap_p. */ void -u3_cm_flog(c3_w gof_w) +u3m_flog(c3_w gof_w) { // Enable memsets in case of memory corruption. // - if ( c3y == u3_ca_is_north(u3R) ) { + if ( c3y == u3a_is_north(u3R) ) { u3_post bot_p = (u3R->mat_p - gof_w); // c3_w len_w = (bot_w - u3R->cap_w); @@ -713,21 +713,21 @@ u3_cm_flog(c3_w gof_w) } } -/* u3_cm_water(): produce watermarks. +/* u3m_water(): produce watermarks. */ void -u3_cm_water(c3_w* low_w, c3_w* hig_w) +u3m_water(c3_w* low_w, c3_w* hig_w) { c3_assert(u3R == &u3H->rod_u); *low_w = (u3H->rod_u.hat_p - u3H->rod_u.rut_p); - *hig_w = (u3H->rod_u.mat_p - u3H->rod_u.cap_p) + c3_wiseof(u3_cv_home); + *hig_w = (u3H->rod_u.mat_p - u3H->rod_u.cap_p) + c3_wiseof(u3v_home); } -/* u3_cm_soft_top(): top-level safety wrapper. +/* u3m_soft_top(): top-level safety wrapper. */ u3_noun -u3_cm_soft_top(c3_w sec_w, // timer seconds +u3m_soft_top(c3_w sec_w, // timer seconds c3_w pad_w, // base memory pad u3_funk fun_f, u3_noun arg) @@ -751,17 +751,17 @@ u3_cm_soft_top(c3_w sec_w, // timer seconds /* Record the cap, and leap. */ - u3_cm_hate(pad_w); + u3m_hate(pad_w); /* Trap for ordinary nock exceptions. */ - if ( 0 == (why = u3_cm_trap()) ) { + if ( 0 == (why = u3m_trap()) ) { pro = fun_f(arg); /* Make sure the inner routine did not create garbage. */ - if ( u3R->how.fag_w & u3_ca_flag_debug ) { - u3_ce_grab("top", pro, u3_none); + if ( u3R->how.fag_w & u3a_flag_debug ) { + u3e_grab("top", pro, u3_none); } /* Revert to external signal regime. @@ -770,12 +770,12 @@ u3_cm_soft_top(c3_w sec_w, // timer seconds /* Produce success, on the old road. */ - pro = u3nc(0, u3_cm_love(pro)); + pro = u3nc(0, u3m_love(pro)); } else { /* Overload the error result. */ - pro = u3_cm_love(why); + pro = u3m_love(why); } /* Revert to external signal regime. @@ -791,12 +791,12 @@ u3_cm_soft_top(c3_w sec_w, // timer seconds return pro; } -/* u3_cm_soft_sure(): top-level call assumed correct. +/* u3m_soft_sure(): top-level call assumed correct. */ u3_noun -u3_cm_soft_sure(u3_funk fun_f, u3_noun arg) +u3m_soft_sure(u3_funk fun_f, u3_noun arg) { - u3_noun pro, pru = u3_cm_soft_top(0, 32768, fun_f, arg); + u3_noun pro, pru = u3m_soft_top(0, 32768, fun_f, arg); c3_assert(_(u3du(pru))); pro = u3k(u3t(pru)); @@ -805,19 +805,19 @@ u3_cm_soft_sure(u3_funk fun_f, u3_noun arg) return pro; } -/* u3_cm_soft_slam: top-level call. +/* u3m_soft_slam: top-level call. */ -u3_noun _cm_slam(u3_noun arg) { return u3_cn_slam_on(u3h(arg), u3t(arg)); } +u3_noun _cm_slam(u3_noun arg) { return u3n_slam_on(u3h(arg), u3t(arg)); } u3_noun -u3_cm_soft_slam(u3_noun gat, u3_noun sam) +u3m_soft_slam(u3_noun gat, u3_noun sam) { - return u3_cm_soft_sure(_cm_slam, u3nc(gat, sam)); + return u3m_soft_sure(_cm_slam, u3nc(gat, sam)); } -/* u3_cm_soft_run(): descend into virtualization context. +/* u3m_soft_run(): descend into virtualization context. */ u3_noun -u3_cm_soft_run(u3_noun fly, +u3m_soft_run(u3_noun fly, u3_funq fun_f, u3_noun aga, u3_noun agb) @@ -826,7 +826,7 @@ u3_cm_soft_run(u3_noun fly, /* Record the cap, and leap. */ - u3_cm_hate(32768); + u3m_hate(32768); /* Configure the new road. */ @@ -838,16 +838,16 @@ u3_cm_soft_run(u3_noun fly, /* Trap for exceptions. */ - if ( 0 == (why = u3_cm_trap()) ) { + if ( 0 == (why = u3m_trap()) ) { pro = fun_f(aga, agb); - if ( u3R->how.fag_w & u3_ca_flag_debug ) { - u3_ce_grab("top", pro, u3_none); + if ( u3R->how.fag_w & u3a_flag_debug ) { + u3e_grab("top", pro, u3_none); } /* Produce success, on the old road. */ - pro = u3nc(0, u3_cm_love(pro)); + pro = u3nc(0, u3m_love(pro)); } else { /* Produce - or fall again. @@ -858,28 +858,28 @@ u3_cm_soft_run(u3_noun fly, default: c3_assert(0); return 0; case 0: { // unusual: bail with success. - pro = u3_cm_love(why); + pro = u3m_love(why); } break; case 1: { // blocking request - pro = u3_cm_love(why); + pro = u3m_love(why); } break; case 2: { // true exit - pro = u3_cm_love(why); + pro = u3m_love(why); } break; case 3: { // failure; rebail w/trace - u3_noun yod = u3_cm_love(u3t(why)); + u3_noun yod = u3m_love(u3t(why)); - u3_cm_bail + u3m_bail (u3nt(3, - u3_ca_take(u3h(yod)), + u3a_take(u3h(yod)), u3_ckb_weld(u3t(yod), u3k(u3R->bug.tax)))); } break; case 4: { // meta-bail - u3_cm_bail(u3_cm_love(u3t(why))); + u3m_bail(u3m_love(u3t(why))); } break; } } @@ -898,10 +898,10 @@ u3_cm_soft_run(u3_noun fly, return pro; } -/* u3_cm_soft_esc(): namespace lookup. Produces direct result. +/* u3m_soft_esc(): namespace lookup. Produces direct result. */ u3_noun -u3_cm_soft_esc(u3_noun sam) +u3m_soft_esc(u3_noun sam) { u3_noun why, fly, pro; @@ -914,7 +914,7 @@ u3_cm_soft_esc(u3_noun sam) /* Record the cap, and leap. */ - u3_cm_hate(32768); + u3m_hate(32768); /* Configure the new road. */ @@ -926,18 +926,18 @@ u3_cm_soft_esc(u3_noun sam) /* Trap for exceptions. */ - if ( 0 == (why = u3_cm_trap()) ) { - pro = u3_cn_slam_on(fly, sam); + if ( 0 == (why = u3m_trap()) ) { + pro = u3n_slam_on(fly, sam); /* Fall back to the old road, leaving temporary memory intact. */ - pro = u3_cm_love(pro); + pro = u3m_love(pro); } else { /* Push the error back up to the calling context - not the run we ** are in, but the caller of the run, matching pure nock semantics. */ - u3_cm_bail(u3nc(4, u3_cm_love(why))); + u3m_bail(u3nc(4, u3m_love(why))); } /* Release the sample. @@ -949,18 +949,18 @@ u3_cm_soft_esc(u3_noun sam) return pro; } -/* u3_cm_soft(): top-level wrapper. +/* u3m_soft(): top-level wrapper. ** ** Produces [0 product] or [%error (list tank)], top last. */ u3_noun -u3_cm_soft(c3_w sec_w, +u3m_soft(c3_w sec_w, u3_funk fun_f, u3_noun arg) { u3_noun why; - why = u3_cm_soft_top(sec_w, (1 << 17), fun_f, arg); // 512K pad + why = u3m_soft_top(sec_w, (1 << 17), fun_f, arg); // 512K pad if ( 0 == u3h(why) ) { return why; @@ -997,7 +997,7 @@ _cm_is_tas(u3_atom som, c3_w len_w) c3_w i_w; for ( i_w = 0; i_w < len_w; i_w++ ) { - c3_c c_c = u3_cr_byte(i_w, som); + c3_c c_c = u3r_byte(i_w, som); if ( islower(c_c) || (isdigit(c_c) && (0 != i_w) && ((len_w - 1) != i_w)) @@ -1018,7 +1018,7 @@ _cm_is_ta(u3_noun som, c3_w len_w) c3_w i_w; for ( i_w = 0; i_w < len_w; i_w++ ) { - c3_c c_c = u3_cr_byte(i_w, som); + c3_c c_c = u3r_byte(i_w, som); if ( (c_c < 32) || (c_c > 127) ) { return c3n; @@ -1076,14 +1076,14 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c) return len_w; } else { - c3_w len_w = u3_cr_met(3, som); + c3_w len_w = u3r_met(3, som); if ( _(_cm_is_tas(som, len_w)) ) { - c3_w len_w = u3_cr_met(3, som); + c3_w len_w = u3r_met(3, som); if ( str_c ) { *(str_c++) = '%'; - u3_cr_bytes(0, len_w, (c3_y *)str_c, som); + u3r_bytes(0, len_w, (c3_y *)str_c, som); str_c += len_w; } return len_w + 1; @@ -1091,14 +1091,14 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c) else if ( _(_cm_is_ta(som, len_w)) ) { if ( str_c ) { *(str_c++) = '\''; - u3_cr_bytes(0, len_w, (c3_y *)str_c, som); + u3r_bytes(0, len_w, (c3_y *)str_c, som); str_c += len_w; *(str_c++) = '\''; } return len_w + 2; } else { - c3_w len_w = u3_cr_met(3, som); + c3_w len_w = u3r_met(3, som); c3_c *buf_c = malloc(2 + (2 * len_w) + 1); c3_w i_w = 0; c3_w a_w = 0; @@ -1107,7 +1107,7 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c) buf_c[a_w++] = 'x'; for ( i_w = 0; i_w < len_w; i_w++ ) { - c3_y c_y = u3_cr_byte(len_w - (i_w + 1), som); + c3_y c_y = u3r_byte(len_w - (i_w + 1), som); if ( (i_w == 0) && (c_y <= 0xf) ) { buf_c[a_w++] = _cm_hex(c_y); @@ -1128,10 +1128,10 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c) } } -/* u3_cm_pretty(): dumb prettyprint to string. +/* u3m_pretty(): dumb prettyprint to string. */ c3_c* -u3_cm_pretty(u3_noun som) +u3m_pretty(u3_noun som) { c3_w len_w = _cm_in_pretty(som, c3y, 0); c3_c* pre_c = malloc(len_w + 1); @@ -1141,21 +1141,21 @@ u3_cm_pretty(u3_noun som) return pre_c; } -/* u3_cm_p(): dumb print with caption. +/* u3m_p(): dumb print with caption. */ void -u3_cm_p(const c3_c* cap_c, u3_noun som) +u3m_p(const c3_c* cap_c, u3_noun som) { - c3_c* pre_c = u3_cm_pretty(som); + c3_c* pre_c = u3m_pretty(som); fprintf(stderr, "%s: %s\r\n", cap_c, pre_c); free(pre_c); } -/* u3_cm_tape(): dump a tape to stdout. +/* u3m_tape(): dump a tape to stdout. */ void -u3_cm_tape(u3_noun tep) +u3m_tape(u3_noun tep) { u3_noun tap = tep; @@ -1172,15 +1172,15 @@ u3_cm_tape(u3_noun tep) u3z(tep); } -/* u3_cm_wall(): dump a wall to stdout. +/* u3m_wall(): dump a wall to stdout. */ void -u3_cm_wall(u3_noun wol) +u3m_wall(u3_noun wol) { u3_noun wal = wol; while ( u3_nul != wal ) { - u3_cm_tape(u3k(u3h(wal))); + u3m_tape(u3k(u3h(wal))); putc(13, stdout); putc(10, stdout); diff --git a/g/n.c b/g/n.c index 3807b21b77..d0c79f1277 100644 --- a/g/n.c +++ b/g/n.c @@ -16,11 +16,11 @@ _cn_hint(u3_noun zep, { switch ( zep ) { default: { - // u3_cm_p("weird zep", zep); - u3_ca_lose(zep); - u3_ca_lose(hod); + // u3m_p("weird zep", zep); + u3a_lose(zep); + u3a_lose(hod); - return u3_cn_nock_on(bus, nex); + return u3n_nock_on(bus, nex); } case c3__hunk: @@ -30,7 +30,7 @@ _cn_hint(u3_noun zep, u3_noun tac = u3nc(zep, hod); u3_noun pro; - u3_ct_push(tac); + u3t_push(tac); #if 0 if ( c3__spot == zep ) { printf("spot %d/%d : %d/%d\r\n", @@ -40,21 +40,21 @@ _cn_hint(u3_noun zep, u3t(u3t(u3t(hod)))); } #endif - pro = u3_cn_nock_on(bus, nex); - u3_ct_drop(); + pro = u3n_nock_on(bus, nex); + u3t_drop(); return pro; } case c3__slog: { - u3_ct_slog(hod); - return u3_cn_nock_on(bus, nex); + u3t_slog(hod); + return u3n_nock_on(bus, nex); } case c3__germ: { - u3_noun pro = u3_cn_nock_on(bus, nex); + u3_noun pro = u3n_nock_on(bus, nex); - if ( c3y == u3_cr_sing(pro, hod) ) { + if ( c3y == u3r_sing(pro, hod) ) { u3z(pro); return hod; } else { u3z(hod); return pro; @@ -62,27 +62,27 @@ _cn_hint(u3_noun zep, } case c3__fast: { - u3_noun pro = u3_cn_nock_on(bus, nex); + u3_noun pro = u3n_nock_on(bus, nex); - u3_cj_mine(hod, u3k(pro)); + u3j_mine(hod, u3k(pro)); return pro; } case c3__memo: { u3z(hod); #if 0 - return u3_cn_nock_on(bus, nex); + return u3n_nock_on(bus, nex); #else { - u3_noun pro = u3_cz_find_2(c3__nock, bus, nex); + u3_noun pro = u3z_find_2(c3__nock, bus, nex); if ( pro != u3_none ) { u3z(bus); u3z(nex); return pro; } - pro = u3_cn_nock_on(u3k(bus), u3k(nex)); + pro = u3n_nock_on(u3k(bus), u3k(nex)); - u3_cz_save_2(c3__nock, bus, nex, pro); + u3z_save_2(c3__nock, bus, nex, pro); u3z(bus); u3z(nex); return pro; @@ -93,9 +93,9 @@ _cn_hint(u3_noun zep, case c3__sole: { u3z(hod); { - u3_noun pro = u3_cn_nock_on(bus, nex); + u3_noun pro = u3n_nock_on(bus, nex); - // return u3_cz_uniq(pro); + // return u3z_uniq(pro); return pro; } } @@ -104,10 +104,10 @@ _cn_hint(u3_noun zep, extern u3_noun BAD; -/* u3_cn_nock_on(): produce .*(bus fol). Do not virtualize. +/* u3n_nock_on(): produce .*(bus fol). Do not virtualize. */ u3_noun -u3_cn_nock_on(u3_noun bus, u3_noun fol) +u3n_nock_on(u3_noun bus, u3_noun fol) { u3_noun hib, gal; @@ -117,26 +117,26 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) u3R->pro.nox_d += 1; - if ( c3y == u3_cr_du(hib) ) { + if ( c3y == u3r_du(hib) ) { u3_noun poz, riv; - poz = u3_cn_nock_on(u3k(bus), u3k(hib)); - riv = u3_cn_nock_on(bus, u3k(gal)); + poz = u3n_nock_on(u3k(bus), u3k(hib)); + riv = u3n_nock_on(bus, u3k(gal)); - u3_ca_lose(fol); - return u3_ci_cell(poz, riv); + u3a_lose(fol); + return u3i_cell(poz, riv); } else switch ( hib ) { - default: return u3_cm_bail(c3__exit); + default: return u3m_bail(c3__exit); case 0: { - if ( c3n == u3_cr_ud(gal) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_ud(gal) ) { + return u3m_bail(c3__exit); } else { u3_noun pro = u3k(u3at(gal, bus)); - u3_ca_lose(bus); u3_ca_lose(fol); + u3a_lose(bus); u3a_lose(fol); return pro; } } @@ -145,16 +145,16 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) case 1: { u3_noun pro = u3k(gal); - u3_ca_lose(bus); u3_ca_lose(fol); + u3a_lose(bus); u3a_lose(fol); return pro; } c3_assert(!"not reached"); case 2: { - u3_noun nex = u3_cn_nock_on(u3k(bus), u3k(u3t(gal))); - u3_noun seb = u3_cn_nock_on(bus, u3k(u3h(gal))); + u3_noun nex = u3n_nock_on(u3k(bus), u3k(u3t(gal))); + u3_noun seb = u3n_nock_on(bus, u3k(u3h(gal))); - u3_ca_lose(fol); + u3a_lose(fol); bus = seb; fol = nex; continue; @@ -164,10 +164,10 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) case 3: { u3_noun gof, pro; - gof = u3_cn_nock_on(bus, u3k(gal)); - pro = u3_cr_du(gof); + gof = u3n_nock_on(bus, u3k(gal)); + pro = u3r_du(gof); - u3_ca_lose(gof); u3_ca_lose(fol); + u3a_lose(gof); u3a_lose(fol); return pro; } c3_assert(!"not reached"); @@ -175,19 +175,19 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) case 4: { u3_noun gof, pro; - gof = u3_cn_nock_on(bus, u3k(gal)); - pro = u3_ci_vint(gof); + gof = u3n_nock_on(bus, u3k(gal)); + pro = u3i_vint(gof); - u3_ca_lose(fol); + u3a_lose(fol); return pro; } c3_assert(!"not reached"); case 5: { - u3_noun wim = u3_cn_nock_on(bus, u3k(gal)); - u3_noun pro = u3_cr_sing(u3h(wim), u3t(wim)); + u3_noun wim = u3n_nock_on(bus, u3k(gal)); + u3_noun pro = u3r_sing(u3h(wim), u3t(wim)); - u3_ca_lose(wim); u3_ca_lose(fol); + u3a_lose(wim); u3a_lose(fol); return pro; } c3_assert(!"not reached"); @@ -195,18 +195,18 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) case 6: { u3_noun b_gal, c_gal, d_gal; - u3_cx_trel(gal, &b_gal, &c_gal, &d_gal); + u3x_trel(gal, &b_gal, &c_gal, &d_gal); { - u3_noun tys = u3_cn_nock_on(u3k(bus), u3k(b_gal)); + u3_noun tys = u3n_nock_on(u3k(bus), u3k(b_gal)); u3_noun nex; if ( 0 == tys ) { nex = u3k(c_gal); } else if ( 1 == tys ) { nex = u3k(d_gal); - } else return u3_cm_bail(c3__exit); + } else return u3m_bail(c3__exit); - u3_ca_lose(fol); + u3a_lose(fol); fol = nex; continue; } @@ -216,12 +216,12 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) case 7: { u3_noun b_gal, c_gal; - u3_cx_cell(gal, &b_gal, &c_gal); + u3x_cell(gal, &b_gal, &c_gal); { - u3_noun bod = u3_cn_nock_on(bus, u3k(b_gal)); + u3_noun bod = u3n_nock_on(bus, u3k(b_gal)); u3_noun nex = u3k(c_gal); - u3_ca_lose(fol); + u3a_lose(fol); bus = bod; fol = nex; continue; @@ -232,13 +232,13 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) case 8: { u3_noun b_gal, c_gal; - u3_cx_cell(gal, &b_gal, &c_gal); + u3x_cell(gal, &b_gal, &c_gal); { - u3_noun heb = u3_cn_nock_on(u3k(bus), u3k(b_gal)); + u3_noun heb = u3n_nock_on(u3k(bus), u3k(b_gal)); u3_noun bod = u3nc(heb, bus); u3_noun nex = u3k(c_gal); - u3_ca_lose(fol); + u3a_lose(fol); bus = bod; fol = nex; continue; @@ -249,23 +249,23 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) case 9: { u3_noun b_gal, c_gal; - u3_cx_cell(gal, &b_gal, &c_gal); + u3x_cell(gal, &b_gal, &c_gal); { - u3_noun seb = u3_cn_nock_on(bus, u3k(c_gal)); - u3_noun pro = u3_cj_kick(seb, b_gal); + u3_noun seb = u3n_nock_on(bus, u3k(c_gal)); + u3_noun pro = u3j_kick(seb, b_gal); if ( u3_none != pro ) { - u3_ca_lose(fol); + u3a_lose(fol); return pro; } else { - if ( c3n == u3_cr_ud(b_gal) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_ud(b_gal) ) { + return u3m_bail(c3__exit); } else { u3_noun nex = u3k(u3at(b_gal, seb)); - u3_ca_lose(fol); + u3a_lose(fol); bus = seb; fol = nex; continue; @@ -278,17 +278,17 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) case 10: { u3_noun p_gal, q_gal; - u3_cx_cell(gal, &p_gal, &q_gal); + u3x_cell(gal, &p_gal, &q_gal); { u3_noun zep, hod, nex; - if ( c3y == u3_cr_du(p_gal) ) { + if ( c3y == u3r_du(p_gal) ) { u3_noun b_gal = u3h(p_gal); u3_noun c_gal = u3t(p_gal); u3_noun d_gal = q_gal; zep = u3k(b_gal); - hod = u3_cn_nock_on(u3k(bus), u3k(c_gal)); + hod = u3n_nock_on(u3k(bus), u3k(c_gal)); nex = u3k(d_gal); } else { @@ -300,17 +300,17 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) nex = u3k(c_gal); } - u3_ca_lose(fol); + u3a_lose(fol); return _cn_hint(zep, hod, bus, nex); } } case 11: { - u3_noun gof = u3_cn_nock_on(bus, u3k(gal)); - u3_noun val = u3_cm_soft_esc(gof); + u3_noun gof = u3n_nock_on(bus, u3k(gal)); + u3_noun val = u3m_soft_esc(gof); if ( !_(u3du(val)) ) { - u3_cm_bail(u3nt(1, gof, 0)); + u3m_bail(u3nt(1, gof, 0)); } else { u3_noun pro; @@ -327,20 +327,20 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol) } } -/* u3_cn_kick_on(): fire `gat` without changing the sample. +/* u3n_kick_on(): fire `gat` without changing the sample. */ u3_noun -u3_cn_kick_on(u3_noun gat) +u3n_kick_on(u3_noun gat) { - return u3_cj_kink(gat, 2); + return u3j_kink(gat, 2); } c3_w exc_w; -/* u3_cn_slam_on(): produce (gat sam). +/* u3n_slam_on(): produce (gat sam). */ u3_noun -u3_cn_slam_on(u3_noun gat, u3_noun sam) +u3n_slam_on(u3_noun gat, u3_noun sam) { u3_noun cor = u3nc(u3k(u3h(gat)), u3nc(sam, u3k(u3t(u3t(gat))))); @@ -353,51 +353,51 @@ u3_cn_slam_on(u3_noun gat, u3_noun sam) } #endif u3z(gat); - return u3_cn_kick_on(cor); + return u3n_kick_on(cor); } -/* u3_cn_nock_un(): produce .*(bus fol), as ++toon. +/* u3n_nock_un(): produce .*(bus fol), as ++toon. */ u3_noun -u3_cn_nock_un(u3_noun bus, u3_noun fol) +u3n_nock_un(u3_noun bus, u3_noun fol) { u3_noun fly = u3nt(u3nt(11, 0, 6), 0, 0); // |=(a=* .^(a)) - return u3_cn_nock_in(fly, bus, fol); + return u3n_nock_in(fly, bus, fol); } -/* u3_cn_slam_un(): produce (gat sam), as ++toon. +/* u3n_slam_un(): produce (gat sam), as ++toon. */ u3_noun -u3_cn_slam_un(u3_noun gat, u3_noun sam) +u3n_slam_un(u3_noun gat, u3_noun sam) { u3_noun fly = u3nt(u3nt(11, 0, 6), 0, 0); // |=(a=* .^(a)) - return u3_cn_slam_in(fly, gat, sam); + return u3n_slam_in(fly, gat, sam); } -/* u3_cn_nock_in(): produce .*(bus fol), as ++toon, in namespace. +/* u3n_nock_in(): produce .*(bus fol), as ++toon, in namespace. */ u3_noun -u3_cn_nock_in(u3_noun fly, u3_noun bus, u3_noun fol) +u3n_nock_in(u3_noun fly, u3_noun bus, u3_noun fol) { - return u3_cm_soft_run(fly, u3_cn_nock_on, bus, fol); + return u3m_soft_run(fly, u3n_nock_on, bus, fol); } -/* u3_cn_slam_in(): produce (gat sam), as ++toon, in namespace. +/* u3n_slam_in(): produce (gat sam), as ++toon, in namespace. */ u3_noun -u3_cn_slam_in(u3_noun fly, u3_noun gat, u3_noun sam) +u3n_slam_in(u3_noun fly, u3_noun gat, u3_noun sam) { - return u3_cm_soft_run(fly, u3_cn_slam_on, gat, sam); + return u3m_soft_run(fly, u3n_slam_on, gat, sam); } -/* u3_cn_nock_an(): as slam_in(), but with empty fly. +/* u3n_nock_an(): as slam_in(), but with empty fly. */ u3_noun -u3_cn_nock_an(u3_noun bus, u3_noun fol) +u3n_nock_an(u3_noun bus, u3_noun fol) { u3_noun fly = u3nt(u3nc(1, 0), 0, 0); // |=(a=* ~) - return u3_cn_nock_in(fly, bus, fol); + return u3n_nock_in(fly, bus, fol); } diff --git a/g/r.c b/g/r.c index 159268e118..018fe0797c 100644 --- a/g/r.c +++ b/g/r.c @@ -15,11 +15,11 @@ _frag_word(c3_w a_w, u3_noun b) c3_w dep_w = u3_ax_dep(a_w); while ( dep_w ) { - if ( c3n == u3_ca_is_cell(b) ) { + if ( c3n == u3a_is_cell(b) ) { return u3_none; } else { - u3_ca_cell* b_u = u3_ca_to_ptr(b); + u3a_cell* b_u = u3a_to_ptr(b); b = *(((u3_noun*)&(b_u->hed)) + (1 & (a_w >> (dep_w - 1)))); dep_w--; @@ -37,11 +37,11 @@ _frag_deep(c3_w a_w, u3_noun b) c3_w dep_w = 32; while ( dep_w ) { - if ( c3n == u3_ca_is_cell(b) ) { + if ( c3n == u3a_is_cell(b) ) { return u3_none; } else { - u3_ca_cell* b_u = u3_ca_to_ptr(b); + u3a_cell* b_u = u3a_to_ptr(b); b = *(((u3_noun*)&(b_u->hed)) + (1 & (a_w >> (dep_w - 1)))); dep_w--; @@ -50,12 +50,12 @@ _frag_deep(c3_w a_w, u3_noun b) return b; } -/* u3_cr_at(): +/* u3r_at(): ** ** Return fragment (a) of (b), or u3_none if not applicable. */ u3_weak -u3_cr_at(u3_atom a, +u3r_at(u3_atom a, u3_noun b) { c3_assert(u3_none != a); @@ -65,15 +65,15 @@ u3_cr_at(u3_atom a, return u3_none; } - if ( _(u3_ca_is_cat(a)) ) { + if ( _(u3a_is_cat(a)) ) { return _frag_word(a, b); } else { - if ( !_(u3_ca_is_pug(a)) ) { + if ( !_(u3a_is_pug(a)) ) { return u3_none; } else { - u3_ca_atom* a_u = u3_ca_to_ptr(a); + u3a_atom* a_u = u3a_to_ptr(a); c3_w len_w = a_u->len_w; b = _frag_word(a_u->buf_w[len_w - 1], b); @@ -93,7 +93,7 @@ u3_cr_at(u3_atom a, } } -/* u3_cr_mean(): +/* u3r_mean(): ** ** Attempt to deconstruct `a` by axis, noun pairs; 0 terminates. ** Axes must be sorted in tree order. @@ -136,20 +136,20 @@ u3_cr_at(u3_atom a, return c3y; } else { - if ( c3n == u3_ca_is_cell(som) ) { + if ( c3n == u3a_is_cell(som) ) { return c3n; } else { c3_w cut_w = _mean_cut(len_w, prs_m); return c3a - (_mean_extract(u3_ca_h(som), cut_w, prs_m), - _mean_extract(u3_ca_t(som), (len_w - cut_w), (prs_m + cut_w))); + (_mean_extract(u3a_h(som), cut_w, prs_m), + _mean_extract(u3a_t(som), (len_w - cut_w), (prs_m + cut_w))); } } } u3_bean -u3_cr_mean(u3_noun som, +u3r_mean(u3_noun som, ...) { va_list ap; @@ -218,12 +218,12 @@ _mug_both(c3_w lef_w, c3_w rit_w) } } -/* u3_cr_mug_both(): +/* u3r_mug_both(): ** ** Join two mugs. */ c3_w -u3_cr_mug_both(c3_w lef_w, c3_w rit_w) +u3r_mug_both(c3_w lef_w, c3_w rit_w) { return _mug_both(lef_w, rit_w); } @@ -256,7 +256,7 @@ _mug_bytes(c3_w off_w, c3_w nby_w, c3_y* byt_y) static __inline__ c3_w _mug_words_in_buf(c3_w off_w, c3_w nwd_w, u3_noun veb) { - u3_ca_atom* veb_u = u3_ca_to_ptr(veb); + u3a_atom* veb_u = u3a_to_ptr(veb); if ( 0 == nwd_w ) { return off_w; @@ -375,36 +375,36 @@ _mug_words_buf(c3_w off_w, c3_w nwd_w, u3_noun veb) } } -/* u3_cr_mug(): +/* u3r_mug(): ** ** Compute and/or recall the mug (31-bit FNV1a hash) of (a). */ c3_w -u3_cr_mug(u3_noun veb) +u3r_mug(u3_noun veb) { c3_assert(u3_none != veb); - if ( _(u3_ca_is_cat(veb)) ) { + if ( _(u3a_is_cat(veb)) ) { c3_w x_w = veb; return _mug_words(2166136261, (veb ? 1 : 0), &x_w); } else { - u3_ca_noun* veb_u = u3_ca_to_ptr(veb); + u3a_noun* veb_u = u3a_to_ptr(veb); if ( veb_u->mug_w ) { return veb_u->mug_w; } else { - if ( _(u3_ca_is_cell(veb)) ) { - u3_ca_cell* veb_u = u3_ca_to_ptr(veb); + if ( _(u3a_is_cell(veb)) ) { + u3a_cell* veb_u = u3a_to_ptr(veb); u3_noun hed = veb_u->hed; u3_noun tel = veb_u->tel; - veb_u->mug_w = u3_cr_mug_cell(hed, tel); + veb_u->mug_w = u3r_mug_cell(hed, tel); return veb_u->mug_w; } else { - u3_ca_atom* veb_u = u3_ca_to_ptr(veb); + u3a_atom* veb_u = u3a_to_ptr(veb); c3_w len_w = veb_u->len_w; veb_u->mug_w = _mug_words_buf(2166136261, len_w, veb); @@ -414,68 +414,68 @@ u3_cr_mug(u3_noun veb) } } -/* u3_cr_mug_words(): +/* u3r_mug_words(): ** ** Compute the mug of `buf`, `len`, LSW first. */ c3_w -u3_cr_mug_words(const c3_w *buf_w, +u3r_mug_words(const c3_w *buf_w, c3_w len_w) { return _mug_words(2166136261, len_w, buf_w); } -/* u3_cr_mug_string(): +/* u3r_mug_string(): ** ** Compute the mug of `a`, LSB first. */ c3_w -u3_cr_mug_string(const c3_c *a_c) +u3r_mug_string(const c3_c *a_c) { return _mug_bytes(2166136261, strlen(a_c), (c3_y *)a_c); } -/* u3_cr_mug_cell(): +/* u3r_mug_cell(): ** ** Compute the mug of the cell `[hed tel]`. */ c3_w -u3_cr_mug_cell(u3_noun hed, +u3r_mug_cell(u3_noun hed, u3_noun tel) { - c3_w lus_w = u3_cr_mug(hed); - c3_w biq_w = u3_cr_mug(tel); + c3_w lus_w = u3r_mug(hed); + c3_w biq_w = u3r_mug(tel); - return u3_cr_mug_both(lus_w, biq_w); + return u3r_mug_both(lus_w, biq_w); } -/* u3_cr_mug_trel(): +/* u3r_mug_trel(): ** ** Compute the mug of `[a b c]`. */ c3_w -u3_cr_mug_trel(u3_noun a, +u3r_mug_trel(u3_noun a, u3_noun b, u3_noun c) { - return u3_cr_mug_both - (u3_cr_mug(a), u3_cr_mug_both(u3_cr_mug(b), u3_cr_mug(c))); + return u3r_mug_both + (u3r_mug(a), u3r_mug_both(u3r_mug(b), u3r_mug(c))); } -/* u3_cr_mug_qual(): +/* u3r_mug_qual(): ** ** Compute the mug of `[a b c d]`. */ c3_w -u3_cr_mug_qual(u3_noun a, +u3r_mug_qual(u3_noun a, u3_noun b, u3_noun c, u3_noun d) { - return u3_cr_mug_both - (u3_cr_mug(a), - u3_cr_mug_both(u3_cr_mug(b), - u3_cr_mug_both(u3_cr_mug(c), u3_cr_mug(d)))); + return u3r_mug_both + (u3r_mug(a), + u3r_mug_both(u3r_mug(b), + u3r_mug_both(u3r_mug(c), u3r_mug(d)))); } /* _sung_one(): pick a unified pointer for identical (a) and (b). @@ -487,8 +487,8 @@ _sung_one(u3_noun* a, u3_noun* b) return; } else { - c3_o asr_o = u3_ca_is_senior(u3R, *a); - c3_o bsr_o = u3_ca_is_senior(u3R, *b); + c3_o asr_o = u3a_is_senior(u3R, *a); + c3_o bsr_o = u3a_is_senior(u3R, *b); if ( _(asr_o) && _(bsr_o) ) { // You shouldn't have let this happen. We don't want to @@ -506,7 +506,7 @@ _sung_one(u3_noun* a, u3_noun* b) u3z(*a); *a = *b; } - if ( u3_ca_is_north(u3R) ) { + if ( u3a_is_north(u3R) ) { if ( *a <= *b ) { u3k(*a); u3z(*b); @@ -540,17 +540,17 @@ _sung_x(u3_noun a, u3_noun b) return c3y; } else { - if ( _(u3_ca_is_atom(a)) ) { - u3_ca_atom* a_u = u3_ca_to_ptr(a); + if ( _(u3a_is_atom(a)) ) { + u3a_atom* a_u = u3a_to_ptr(a); - if ( !_(u3_ca_is_atom(b)) || - _(u3_ca_is_cat(a)) || - _(u3_ca_is_cat(b)) ) + if ( !_(u3a_is_atom(b)) || + _(u3a_is_cat(a)) || + _(u3a_is_cat(b)) ) { return c3n; } else { - u3_ca_atom* b_u = u3_ca_to_ptr(b); + u3a_atom* b_u = u3a_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -579,12 +579,12 @@ _sung_x(u3_noun a, u3_noun b) } } else { - if ( _(u3_ca_is_atom(b)) ) { + if ( _(u3a_is_atom(b)) ) { return c3n; } else { - u3_ca_cell* a_u = u3_ca_to_ptr(a); - u3_ca_cell* b_u = u3_ca_to_ptr(b); + u3a_cell* a_u = u3a_to_ptr(a); + u3a_cell* b_u = u3a_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -629,17 +629,17 @@ _sing_x(u3_noun a, return c3y; } else { - if ( _(u3_ca_is_atom(a)) ) { - u3_ca_atom* a_u = u3_ca_to_ptr(a); + if ( _(u3a_is_atom(a)) ) { + u3a_atom* a_u = u3a_to_ptr(a); - if ( !_(u3_ca_is_atom(b)) || - _(u3_ca_is_cat(a)) || - _(u3_ca_is_cat(b)) ) + if ( !_(u3a_is_atom(b)) || + _(u3a_is_cat(a)) || + _(u3a_is_cat(b)) ) { return c3n; } else { - u3_ca_atom* b_u = u3_ca_to_ptr(b); + u3a_atom* b_u = u3a_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -668,12 +668,12 @@ _sing_x(u3_noun a, } } else { - if ( _(u3_ca_is_atom(b)) ) { + if ( _(u3a_is_atom(b)) ) { return c3n; } else { - u3_ca_cell* a_u = u3_ca_to_ptr(a); - u3_ca_cell* b_u = u3_ca_to_ptr(b); + u3a_cell* a_u = u3a_to_ptr(a); + u3a_cell* b_u = u3a_to_ptr(b); if ( a_u->mug_w && b_u->mug_w && @@ -682,10 +682,10 @@ _sing_x(u3_noun a, return c3n; } else { - if ( c3n == _sing_x(u3_ca_h(a), u3_ca_h(b)) ) { + if ( c3n == _sing_x(u3a_h(a), u3a_h(b)) ) { return c3n; } - else if ( c3n == _sing_x(u3_ca_t(a), u3_ca_t(b)) ) { + else if ( c3n == _sing_x(u3a_t(a), u3a_t(b)) ) { return c3n; } return c3y; @@ -695,137 +695,137 @@ _sing_x(u3_noun a, } } -/* u3_cr_sing(): +/* u3r_sing(): ** ** Yes iff (a) and (b) are the same noun. */ u3_bean -u3_cr_sing(u3_noun a, +u3r_sing(u3_noun a, u3_noun b) { return _sing_x(a, b); } -/* u3_cr_sung(): yes iff (a) and (b) are the same noun, unifying equals. +/* u3r_sung(): yes iff (a) and (b) are the same noun, unifying equals. */ u3_bean -u3_cr_sung(u3_noun a, +u3r_sung(u3_noun a, u3_noun b) { return _sung_x(a, b); } u3_bean -u3_cr_fing(u3_noun a, +u3r_fing(u3_noun a, u3_noun b) { return (a == b) ? c3y : c3n; } -/* u3_cr_sing_cell(): +/* u3r_sing_cell(): ** ** Yes iff `[p q]` and `b` are the same noun. */ u3_bean -u3_cr_sing_cell(u3_noun p, +u3r_sing_cell(u3_noun p, u3_noun q, u3_noun b) { - return c3a(_(u3_ca_is_cell(b)), - c3a(u3_cr_sing(p, u3_ca_h(b)), - u3_cr_sing(q, u3_ca_t(b)))); + return c3a(_(u3a_is_cell(b)), + c3a(u3r_sing(p, u3a_h(b)), + u3r_sing(q, u3a_t(b)))); } u3_bean -u3_cr_fing_cell(u3_noun p, +u3r_fing_cell(u3_noun p, u3_noun q, u3_noun b) { - return c3a(_(u3_ca_is_cell(b)), - c3a(u3_cr_fing(p, u3_ca_h(b)), - u3_cr_fing(q, u3_ca_t(b)))); + return c3a(_(u3a_is_cell(b)), + c3a(u3r_fing(p, u3a_h(b)), + u3r_fing(q, u3a_t(b)))); } -/* u3_cr_sing_mixt(): +/* u3r_sing_mixt(): ** ** Yes iff `[p q]` and `b` are the same noun. */ u3_bean -u3_cr_sing_mixt(const c3_c* p_c, +u3r_sing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) { - return c3a(_(u3_ca_is_cell(b)), - c3a(u3_cr_sing_c(p_c, u3_ca_h(b)), - u3_cr_sing(q, u3_ca_t(b)))); + return c3a(_(u3a_is_cell(b)), + c3a(u3r_sing_c(p_c, u3a_h(b)), + u3r_sing(q, u3a_t(b)))); } u3_bean -u3_cr_fing_mixt(const c3_c* p_c, +u3r_fing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) { - return c3a(_(u3_ca_is_cell(b)), - c3a(u3_cr_sing_c(p_c, u3_ca_h(b)), - u3_cr_fing(q, u3_ca_t(b)))); + return c3a(_(u3a_is_cell(b)), + c3a(u3r_sing_c(p_c, u3a_h(b)), + u3r_fing(q, u3a_t(b)))); } -/* u3_cr_sing_trel(): +/* u3r_sing_trel(): ** ** Yes iff `[p q r]` and `b` are the same noun. */ u3_bean -u3_cr_sing_trel(u3_noun p, +u3r_sing_trel(u3_noun p, u3_noun q, u3_noun r, u3_noun b) { - return c3a(_(u3_ca_is_cell(b)), - c3a(u3_cr_sing(p, u3_ca_h(b)), - u3_cr_sing_cell(q, r, u3_ca_t(b)))); + return c3a(_(u3a_is_cell(b)), + c3a(u3r_sing(p, u3a_h(b)), + u3r_sing_cell(q, r, u3a_t(b)))); } u3_bean -u3_cr_fing_trel(u3_noun p, +u3r_fing_trel(u3_noun p, u3_noun q, u3_noun r, u3_noun b) { - return c3a(_(u3_ca_is_cell(b)), - c3a(u3_cr_fing(p, u3_ca_h(b)), - u3_cr_fing_cell(q, r, u3_ca_t(b)))); + return c3a(_(u3a_is_cell(b)), + c3a(u3r_fing(p, u3a_h(b)), + u3r_fing_cell(q, r, u3a_t(b)))); } -/* u3_cr_sing_qual(): +/* u3r_sing_qual(): ** ** Yes iff `[p q r]` and `b` are the same noun. */ u3_bean -u3_cr_sing_qual(u3_noun p, +u3r_sing_qual(u3_noun p, u3_noun q, u3_noun r, u3_noun s, u3_noun b) { - return c3a(_(u3_ca_is_cell(b)), - c3a(u3_cr_sing(p, u3_ca_h(b)), - u3_cr_sing_trel(q, r, s, u3_ca_t(b)))); + return c3a(_(u3a_is_cell(b)), + c3a(u3r_sing(p, u3a_h(b)), + u3r_sing_trel(q, r, s, u3a_t(b)))); } u3_bean -u3_cr_fing_qual(u3_noun p, +u3r_fing_qual(u3_noun p, u3_noun q, u3_noun r, u3_noun s, u3_noun b) { - return c3a(_(u3_ca_is_cell(b)), - c3a(u3_cr_fing(p, u3_ca_h(b)), - u3_cr_fing_trel(q, r, s, u3_ca_t(b)))); + return c3a(_(u3a_is_cell(b)), + c3a(u3r_fing(p, u3a_h(b)), + u3r_fing_trel(q, r, s, u3a_t(b)))); } -/* u3_cr_nord(): +/* u3r_nord(): ** ** Return 0, 1 or 2 if `a` is below, equal to, or above `b`. */ u3_atom -u3_cr_nord(u3_noun a, +u3r_nord(u3_noun a, u3_noun b) { c3_assert(u3_none != a); @@ -835,22 +835,22 @@ u3_cr_nord(u3_noun a, return 1; } else { - if ( _(u3_ca_is_atom(a)) ) { - if ( !_(u3_ca_is_atom(b)) ) { + if ( _(u3a_is_atom(a)) ) { + if ( !_(u3a_is_atom(b)) ) { return 0; } else { - if ( _(u3_ca_is_cat(a)) ) { - if ( _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(a)) ) { + if ( _(u3a_is_cat(b)) ) { return (a < b) ? 0 : 2; } else return 0; } - else if ( _(u3_ca_is_cat(b)) ) { + else if ( _(u3a_is_cat(b)) ) { return 2; } else { - u3_ca_atom* a_u = u3_ca_to_ptr(a); - u3_ca_atom* b_u = u3_ca_to_ptr(b); + u3a_atom* a_u = u3a_to_ptr(a); + u3a_atom* b_u = u3a_to_ptr(b); c3_w w_rez = a_u->len_w; c3_w w_mox = b_u->len_w; @@ -874,13 +874,13 @@ u3_cr_nord(u3_noun a, } } } else { - if ( _(u3_ca_is_atom(b)) ) { + if ( _(u3a_is_atom(b)) ) { return 2; } else { - u3_atom c = u3_cr_nord(u3_ca_h(a), u3_ca_h(b)); + u3_atom c = u3r_nord(u3a_h(a), u3a_h(b)); if ( 1 == c ) { - return u3_cr_nord(u3_ca_t(a), u3_ca_t(b)); + return u3r_nord(u3a_t(a), u3a_t(b)); } else { return c; } @@ -889,28 +889,28 @@ u3_cr_nord(u3_noun a, } } -/* u3_cr_sing_c(): +/* u3r_sing_c(): ** ** Yes iff (b) is the same noun as the C string a_c. */ u3_bean -u3_cr_sing_c(const c3_c* a_c, +u3r_sing_c(const c3_c* a_c, u3_noun b) { c3_assert(u3_none != b); - if ( !_(u3_ca_is_atom(b)) ) { + if ( !_(u3a_is_atom(b)) ) { return c3n; } else { c3_w w_sof = strlen(a_c); c3_w i_w; - if ( w_sof != u3_cr_met(3, b) ) { + if ( w_sof != u3r_met(3, b) ) { return c3n; } for ( i_w = 0; i_w < w_sof; i_w++ ) { - if ( u3_cr_byte(i_w, b) != a_c[i_w] ) { + if ( u3r_byte(i_w, b) != a_c[i_w] ) { return c3n; } } @@ -918,66 +918,66 @@ u3_cr_sing_c(const c3_c* a_c, } } -/* u3_cr_bush(): +/* u3r_bush(): ** ** Factor [a] as a bush [b.[p q] c]. */ u3_bean -u3_cr_bush(u3_noun a, +u3r_bush(u3_noun a, u3_noun* b, u3_noun* c) { c3_assert(u3_none != a); - if ( _(u3_ca_is_atom(a)) ) { + if ( _(u3a_is_atom(a)) ) { return c3n; } else { - *b = u3_ca_h(a); + *b = u3a_h(a); - if ( _(u3_ca_is_atom(*b)) ) { + if ( _(u3a_is_atom(*b)) ) { return c3n; } else { - *c = u3_ca_t(a); + *c = u3a_t(a); return c3y; } } } -/* u3_cr_cell(): +/* u3r_cell(): ** ** Factor (a) as a cell (b c). */ u3_bean -u3_cr_cell(u3_noun a, +u3r_cell(u3_noun a, u3_noun* b, u3_noun* c) { c3_assert(u3_none != a); - if ( _(u3_ca_is_atom(a)) ) { + if ( _(u3a_is_atom(a)) ) { return c3n; } else { - if ( b ) *b = u3_ca_h(a); - if ( c ) *c = u3_ca_t(a); + if ( b ) *b = u3a_h(a); + if ( c ) *c = u3a_t(a); return c3y; } } -/* u3_cr_p(): +/* u3r_p(): ** ** & [0] if [a] is of the form [b *c]. */ u3_bean -u3_cr_p(u3_noun a, +u3r_p(u3_noun a, u3_noun b, u3_noun* c) { u3_noun feg, nux; - if ( (c3y == u3_cr_cell(a, &feg, &nux)) && - (c3y == u3_cr_sing(feg, b)) ) + if ( (c3y == u3r_cell(a, &feg, &nux)) && + (c3y == u3r_sing(feg, b)) ) { *c = nux; return c3y; @@ -985,32 +985,32 @@ u3_cr_p(u3_noun a, else return c3n; } -/* u3_cr_pq(): +/* u3r_pq(): ** ** & [0] if [a] is of the form [b *c d]. */ u3_bean -u3_cr_pq(u3_noun a, +u3r_pq(u3_noun a, u3_noun b, u3_noun* c, u3_noun* d) { u3_noun nux; - if ( (c3y == u3_cr_p(a, b, &nux)) && - (c3y == u3_cr_cell(nux, c, d)) ) + if ( (c3y == u3r_p(a, b, &nux)) && + (c3y == u3r_cell(nux, c, d)) ) { return c3y; } else return c3n; } -/* u3_cr_pqr(): +/* u3r_pqr(): ** ** & [0] if [a] is of the form [b *c *d *e]. */ u3_bean -u3_cr_pqr(u3_noun a, +u3r_pqr(u3_noun a, u3_noun b, u3_noun* c, u3_noun* d, @@ -1018,20 +1018,20 @@ u3_cr_pqr(u3_noun a, { u3_noun nux; - if ( (c3y == u3_cr_p(a, b, &nux)) && - (c3y == u3_cr_trel(nux, c, d, e)) ) + if ( (c3y == u3r_p(a, b, &nux)) && + (c3y == u3r_trel(nux, c, d, e)) ) { return c3y; } else return c3n; } -/* u3_cr_pqrs(): +/* u3r_pqrs(): ** ** & [0] if [a] is of the form [b *c *d *e *f]. */ u3_bean -u3_cr_pqrs(u3_noun a, +u3r_pqrs(u3_noun a, u3_noun b, u3_noun* c, u3_noun* d, @@ -1040,28 +1040,28 @@ u3_cr_pqrs(u3_noun a, { u3_noun nux; - if ( (c3y == u3_cr_p(a, b, &nux)) && - (c3y == u3_cr_qual(nux, c, d, e, f)) ) + if ( (c3y == u3r_p(a, b, &nux)) && + (c3y == u3r_qual(nux, c, d, e, f)) ) { return c3y; } else return c3n; } -/* u3_cr_trel(): +/* u3r_trel(): ** ** Factor (a) as a trel (b c d). */ u3_bean -u3_cr_trel(u3_noun a, +u3r_trel(u3_noun a, u3_noun *b, u3_noun *c, u3_noun *d) { u3_noun guf; - if ( (c3y == u3_cr_cell(a, b, &guf)) && - (c3y == u3_cr_cell(guf, c, d)) ) { + if ( (c3y == u3r_cell(a, b, &guf)) && + (c3y == u3r_cell(guf, c, d)) ) { return c3y; } else { @@ -1069,12 +1069,12 @@ u3_cr_trel(u3_noun a, } } -/* u3_cr_qual(): +/* u3r_qual(): ** ** Factor (a) as a qual (b c d e). */ u3_bean -u3_cr_qual(u3_noun a, +u3r_qual(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d, @@ -1082,19 +1082,19 @@ u3_cr_qual(u3_noun a, { u3_noun guf; - if ( (c3y == u3_cr_cell(a, b, &guf)) && - (c3y == u3_cr_trel(guf, c, d, e)) ) { + if ( (c3y == u3r_cell(a, b, &guf)) && + (c3y == u3r_trel(guf, c, d, e)) ) { return c3y; } else return c3n; } -/* u3_cr_quil(): +/* u3r_quil(): ** ** Factor (a) as a quil (b c d e f). */ u3_bean -u3_cr_quil(u3_noun a, +u3r_quil(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d, @@ -1103,19 +1103,19 @@ u3_cr_quil(u3_noun a, { u3_noun guf; - if ( (c3y == u3_cr_cell(a, b, &guf)) && - (c3y == u3_cr_qual(guf, c, d, e, f)) ) { + if ( (c3y == u3r_cell(a, b, &guf)) && + (c3y == u3r_qual(guf, c, d, e, f)) ) { return c3y; } else return c3n; } -/* u3_cr_hext(): +/* u3r_hext(): ** ** Factor (a) as a hext (b c d e f g) */ u3_bean -u3_cr_hext(u3_noun a, +u3r_hext(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d, @@ -1125,14 +1125,14 @@ u3_cr_hext(u3_noun a, { u3_noun guf; - if ( (c3y == u3_cr_cell(a, b, &guf)) && - (c3y == u3_cr_quil(guf, c, d, e, f, g)) ) { + if ( (c3y == u3r_cell(a, b, &guf)) && + (c3y == u3r_quil(guf, c, d, e, f, g)) ) { return c3y; } else return c3n; } -/* u3_cr_met(): +/* u3r_met(): ** ** Return the size of (b) in bits, rounded up to ** (1 << a_y). @@ -1140,11 +1140,11 @@ u3_cr_hext(u3_noun a, ** For example, (a_y == 3) returns the size in bytes. */ c3_w -u3_cr_met(c3_y a_y, +u3r_met(c3_y a_y, u3_atom b) { c3_assert(u3_none != b); - c3_assert(_(u3_ca_is_atom(b))); + c3_assert(_(u3a_is_atom(b))); if ( b == 0 ) { return 0; @@ -1156,12 +1156,12 @@ u3_cr_met(c3_y a_y, c3_w gal_w; c3_w daz_w; - if ( _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(b)) ) { gal_w = 0; daz_w = b; } else { - u3_ca_atom* b_u = u3_ca_to_ptr(b); + u3a_atom* b_u = u3a_to_ptr(b); gal_w = (b_u->len_w) - 1; daz_w = b_u->buf_w[gal_w]; @@ -1198,25 +1198,25 @@ u3_cr_met(c3_y a_y, } } -/* u3_cr_bit(): +/* u3r_bit(): ** ** Return bit (a_w) of (b). */ c3_b -u3_cr_bit(c3_w a_w, +u3r_bit(c3_w a_w, u3_atom b) { c3_assert(u3_none != b); - c3_assert(_(u3_ca_is_atom(b))); + c3_assert(_(u3a_is_atom(b))); - if ( _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(b)) ) { if ( a_w >= 31 ) { return 0; } else return (1 & (b >> a_w)); } else { - u3_ca_atom* b_u = u3_ca_to_ptr(b); + u3a_atom* b_u = u3a_to_ptr(b); c3_y vut_y = (a_w & 31); c3_w pix_w = (a_w >> 5); @@ -1231,25 +1231,25 @@ u3_cr_bit(c3_w a_w, } } -/* u3_cr_byte(): +/* u3r_byte(): ** ** Return byte (a_w) of (b). */ c3_y -u3_cr_byte(c3_w a_w, +u3r_byte(c3_w a_w, u3_atom b) { c3_assert(u3_none != b); - c3_assert(_(u3_ca_is_atom(b))); + c3_assert(_(u3a_is_atom(b))); - if ( _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(b)) ) { if ( a_w > 3 ) { return 0; } else return (255 & (b >> (a_w << 3))); } else { - u3_ca_atom* b_u = u3_ca_to_ptr(b); + u3a_atom* b_u = u3a_to_ptr(b); c3_y vut_y = (a_w & 3); c3_w pix_w = (a_w >> 2); @@ -1264,12 +1264,12 @@ u3_cr_byte(c3_w a_w, } } -/* u3_cr_bytes(): +/* u3r_bytes(): ** ** Copy bytes (a_w) through (a_w + b_w - 1) from (d) to (c). */ void -u3_cr_bytes(c3_w a_w, +u3r_bytes(c3_w a_w, c3_w b_w, c3_y* c_y, u3_atom d) @@ -1278,29 +1278,29 @@ u3_cr_bytes(c3_w a_w, c3_assert(u3_none != d); - /* Efficiency: don't call u3_cr_byte(). + /* Efficiency: don't call u3r_byte(). */ for ( i_w = 0; i_w < b_w; i_w++ ) { - c_y[i_w] = u3_cr_byte((a_w + i_w), d); + c_y[i_w] = u3r_byte((a_w + i_w), d); } } -/* u3_cr_mp(): +/* u3r_mp(): ** ** Copy (b) into (a_mp). */ void -u3_cr_mp(mpz_t a_mp, +u3r_mp(mpz_t a_mp, u3_atom b) { c3_assert(u3_none != b); - c3_assert(_(u3_ca_is_atom(b))); + c3_assert(_(u3a_is_atom(b))); - if ( _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(b)) ) { mpz_init_set_ui(a_mp, b); } else { - u3_ca_atom* b_u = u3_ca_to_ptr(b); + u3a_atom* b_u = u3a_to_ptr(b); c3_w len_w = b_u->len_w; /* Slight deficiency in the GMP API. @@ -1322,25 +1322,25 @@ u3_cr_mp(mpz_t a_mp, } } -/* u3_cr_word(): +/* u3r_word(): ** ** Return word (a_w) of (b). */ c3_w -u3_cr_word(c3_w a_w, +u3r_word(c3_w a_w, u3_atom b) { c3_assert(u3_none != b); - c3_assert(_(u3_ca_is_atom(b))); + c3_assert(_(u3a_is_atom(b))); - if ( _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(b)) ) { if ( a_w > 0 ) { return 0; } else return b; } else { - u3_ca_atom* b_u = u3_ca_to_ptr(b); + u3a_atom* b_u = u3a_to_ptr(b); if ( a_w >= b_u->len_w ) { return 0; @@ -1349,26 +1349,26 @@ u3_cr_word(c3_w a_w, } } -/* u3_cr_chub(): +/* u3r_chub(): ** ** Return double-word (a_w) of (b). */ c3_d -u3_cr_chub(c3_w a_w, +u3r_chub(c3_w a_w, u3_atom b) { - c3_w wlo_w = u3_cr_word(a_w * 2, b); - c3_w whi_w = u3_cr_word(1 + (a_w * 2), b); + c3_w wlo_w = u3r_word(a_w * 2, b); + c3_w whi_w = u3r_word(1 + (a_w * 2), b); return (((uint64_t)whi_w) << 32ULL) | ((uint64_t)wlo_w); } -/* u3_cr_words(): +/* u3r_words(): ** ** Copy words (a_w) through (a_w + b_w - 1) from (d) to (c). */ void -u3_cr_words(c3_w a_w, +u3r_words(c3_w a_w, c3_w b_w, c3_w* c_w, u3_atom d) @@ -1377,21 +1377,21 @@ u3_cr_words(c3_w a_w, c3_assert(u3_none != d); - /* Efficiency: don't call u3_cr_word(). + /* Efficiency: don't call u3r_word(). */ for ( i_w = 0; i_w < b_w; i_w++ ) { - c_w[i_w] = u3_cr_word((a_w + i_w), d); + c_w[i_w] = u3r_word((a_w + i_w), d); } } -/* u3_cr_chop(): +/* u3r_chop(): ** ** Into the bloq space of `met`, from position `fum` for a ** span of `wid`, to position `tou`, XOR from atom `src` ** into `dst_w`. */ void -u3_cr_chop(c3_g met_g, +u3r_chop(c3_g met_g, c3_w fum_w, c3_w wid_w, c3_w tou_w, @@ -1403,14 +1403,14 @@ u3_cr_chop(c3_g met_g, c3_w* buf_w; c3_assert(u3_none != src); - c3_assert(_(u3_ca_is_atom(src))); + c3_assert(_(u3a_is_atom(src))); - if ( _(u3_ca_is_cat(src)) ) { + if ( _(u3a_is_cat(src)) ) { len_w = src ? 1 : 0; buf_w = &src; } else { - u3_ca_atom* src_u = u3_ca_to_ptr(src); + u3a_atom* src_u = u3a_to_ptr(src); len_w = src_u->len_w; buf_w = src_u->buf_w; @@ -1459,34 +1459,34 @@ u3_cr_chop(c3_g met_g, } } -/* u3_cr_string(): `a` as malloced C string. +/* u3r_string(): `a` as malloced C string. */ c3_c* -u3_cr_string(u3_atom a) +u3r_string(u3_atom a) { - c3_w met_w = u3_cr_met(3, a); + c3_w met_w = u3r_met(3, a); c3_c* str_c = c3_malloc(met_w + 1); - u3_cr_bytes(0, met_w, (c3_y*)str_c, a); + u3r_bytes(0, met_w, (c3_y*)str_c, a); str_c[met_w] = 0; return str_c; } -/* u3_cr_tape(): `a`, a list of bytes, as malloced C string. +/* u3r_tape(): `a`, a list of bytes, as malloced C string. */ c3_y* -u3_cr_tape(u3_noun a) +u3r_tape(u3_noun a) { u3_noun b; c3_w i_w; c3_y *a_y; - for ( i_w = 0, b=a; c3y == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) + for ( i_w = 0, b=a; c3y == u3a_is_cell(b); i_w++, b=u3a_t(b) ) ; a_y = c3_malloc(i_w + 1); - for ( i_w = 0, b=a; c3y == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) { - a_y[i_w] = u3_ca_h(b); + for ( i_w = 0, b=a; c3y == u3a_is_cell(b); i_w++, b=u3a_t(b) ) { + a_y[i_w] = u3a_h(b); } a_y[i_w] = 0; diff --git a/g/t.c b/g/t.c index 2d50a15b03..2237a7c011 100644 --- a/g/t.c +++ b/g/t.c @@ -4,26 +4,26 @@ */ #include "all.h" -/* u3_ct_push(): push on trace stack. +/* u3t_push(): push on trace stack. */ void -u3_ct_push(u3_noun mon) +u3t_push(u3_noun mon) { u3R->bug.tax = u3nc(mon, u3R->bug.tax); } -/* u3_ct_mean(): push `[%mean roc]` on trace stack. +/* u3t_mean(): push `[%mean roc]` on trace stack. */ void -u3_ct_mean(u3_noun roc) +u3t_mean(u3_noun roc) { u3R->bug.tax = u3nc(u3nc(c3__mean, roc), u3R->bug.tax); } -/* u3_ct_drop(): drop from meaning stack. +/* u3t_drop(): drop from meaning stack. */ void -u3_ct_drop(void) +u3t_drop(void) { c3_assert(_(u3du(u3R->bug.tax))); { @@ -37,10 +37,10 @@ u3_ct_drop(void) extern void u3_lo_tank(c3_l tab_l, u3_noun tac); -/* u3_ct_slog(): print directly. +/* u3t_slog(): print directly. */ void -u3_ct_slog(u3_noun hod) +u3t_slog(u3_noun hod) { if ( c3y == u3du(hod) ) { u3_noun pri = u3h(hod); @@ -55,42 +55,42 @@ u3_ct_slog(u3_noun hod) u3z(hod); } -/* u3_ct_heck(): profile point. +/* u3t_heck(): profile point. */ void -u3_ct_heck(u3_atom cog) +u3t_heck(u3_atom cog) { - printf("ct: heck %s\r\n", u3_cr_string(cog)); + printf("ct: heck %s\r\n", u3r_string(cog)); - if ( 0 == u3R->pro.day ) { u3R->pro.day = u3_cv_do("doss", 0); } + if ( 0 == u3R->pro.day ) { u3R->pro.day = u3v_do("doss", 0); } u3R->pro.day = u3_dc("pi-heck", cog, u3R->pro.day); } -/* u3_ct_samp(): sample. +/* u3t_samp(): sample. */ void -u3_ct_samp(void) +u3t_samp(void) { - if ( 0 == u3R->pro.day ) { u3R->pro.day = u3_cv_do("doss", 0); } + if ( 0 == u3R->pro.day ) { u3R->pro.day = u3v_do("doss", 0); } u3R->pro.day = u3_dc("pi-noon", u3k(u3R->pro.don), u3R->pro.day); } -/* u3_ct_come(): push on profile stack. +/* u3t_come(): push on profile stack. */ void -u3_ct_come(u3_atom cog) +u3t_come(u3_atom cog) { - printf("ct: come %s\r\n", u3_cr_string(cog)); + printf("ct: come %s\r\n", u3r_string(cog)); u3R->pro.don = u3nc(cog, u3R->pro.don); } -/* u3_ct_flee(): pop off profile stack. +/* u3t_flee(): pop off profile stack. */ void -u3_ct_flee(void) +u3t_flee(void) { c3_assert(_(u3du(u3R->pro.don))); { @@ -101,16 +101,16 @@ u3_ct_flee(void) } } -/* u3_ct_damp(): print and clear profile data. +/* u3t_damp(): print and clear profile data. */ void -u3_ct_damp(void) +u3t_damp(void) { if ( 0 != u3R->pro.day ) { u3_noun wol = u3_do("pi-tell", u3R->pro.day); - u3_cm_wall(wol); + u3m_wall(wol); - u3R->pro.day = u3_cv_do("doss", 0); + u3R->pro.day = u3v_do("doss", 0); } if ( 0 != u3R->pro.nox_d ) { @@ -121,12 +121,12 @@ u3_ct_damp(void) /* _ct_sigaction(): profile sigaction callback. */ -void _ct_sigaction(c3_i x_i) { u3_ct_samp(); } +void _ct_sigaction(c3_i x_i) { u3t_samp(); } -/* u3_ct_boot(): turn sampling on. +/* u3t_boot(): turn sampling on. */ void -u3_ct_boot(void) +u3t_boot(void) { printf("ct: now profiling.\r\n"); @@ -160,10 +160,10 @@ u3_ct_boot(void) #endif } -/* u3_ct_boff(): turn profile sampling off. +/* u3t_boff(): turn profile sampling off. */ void -u3_ct_boff(void) +u3t_boff(void) { #if defined(U3_OS_osx) struct sigaction sig_s; @@ -178,7 +178,7 @@ u3_ct_boff(void) setitimer(ITIMER_PROF, &itm_v, 0); sigaction(SIGPROF, &sig_s, 0); - u3_ct_damp(); + u3t_damp(); #elif defined(U3_OS_linux) // TODO: support profiling on linux #elif defined(U3_OS_bsd) diff --git a/g/v.c b/g/v.c index 9897478853..a0c7e5a61e 100644 --- a/g/v.c +++ b/g/v.c @@ -14,61 +14,61 @@ _cv_nock_wish(u3_noun txt) u3_noun fun, pro; WISH = 1; - fun = u3_cn_nock_on(u3k(u3A->roc), u3k(u3_cx_at(20, u3A->roc))); - pro = u3_cn_slam_on(fun, txt); + fun = u3n_nock_on(u3k(u3A->roc), u3k(u3x_at(20, u3A->roc))); + pro = u3n_slam_on(fun, txt); WISH = 0; return pro; } -/* u3_cv_make(): make a new pier and instantiate pill. +/* u3v_make(): make a new pier and instantiate pill. */ void -u3_cv_make(c3_c* pas_c) +u3v_make(c3_c* pas_c) { - u3_noun sys = u3_cke_cue(u3_cm_file(pas_c)); + u3_noun sys = u3_cke_cue(u3m_file(pas_c)); - printf("cv_make: loaded pill %s, as %x\n", pas_c, u3_cr_mug(sys)); + printf("cv_make: loaded pill %s, as %x\n", pas_c, u3r_mug(sys)); u3A->ken = u3k(u3h(sys)); u3A->roc = u3k(u3t(sys)); printf("cv_make: kernel %x, core %x\n", - u3_cr_mug(u3A->ken), u3_cr_mug(u3A->roc)); + u3r_mug(u3A->ken), u3r_mug(u3A->roc)); u3z(sys); } int JACK; -/* u3_cv_jack(): execute kernel formula to bind jets. +/* u3v_jack(): execute kernel formula to bind jets. */ void -u3_cv_jack(void) +u3v_jack(void) { u3_noun cor; JACK = 1; - printf("cv_jack: activating kernel %x\n", u3_cr_mug(u3A->ken)); - cor = u3_cn_nock_on(0, u3k(u3A->ken)); + printf("cv_jack: activating kernel %x\n", u3r_mug(u3A->ken)); + cor = u3n_nock_on(0, u3k(u3A->ken)); printf("cv_jack: activated\n"); JACK = 0; u3z(cor); } -/* u3_cv_hose(): clear initial ovum queue. +/* u3v_hose(): clear initial ovum queue. */ void -u3_cv_hose(void) +u3v_hose(void) { - u3p(u3_cv_cart) egg_p = u3A->ova.egg_p; + u3p(u3v_cart) egg_p = u3A->ova.egg_p; while ( egg_p ) { - u3_cv_cart* egg_u = u3to(u3_cv_cart, egg_p); - u3p(u3_cv_cart) nex_p = egg_u->nex_p; + u3v_cart* egg_u = u3to(u3v_cart, egg_p); + u3p(u3v_cart) nex_p = egg_u->nex_p; - u3_ca_lose(egg_u->vir); - u3_ca_free(egg_u); + u3a_lose(egg_u->vir); + u3a_free(egg_u); egg_p = nex_p; } @@ -77,31 +77,31 @@ u3_cv_hose(void) u3A->roe = u3_nul; } -/* u3_cv_start(): start time. +/* u3v_start(): start time. */ void -u3_cv_start(u3_noun now) +u3v_start(u3_noun now) { - u3_cv_time(now); - u3_cv_numb(); + u3v_time(now); + u3v_numb(); { - c3_c* wen_c = u3_cr_string(u3A->wen); + c3_c* wen_c = u3r_string(u3A->wen); printf("cv_start: time: %s\n", wen_c); free(wen_c); } } -/* u3_cv_wish(): text expression with cache. +/* u3v_wish(): text expression with cache. */ u3_noun -u3_cv_wish(const c3_c* str_c) +u3v_wish(const c3_c* str_c) { u3_noun exp; if ( u3R == &u3H->rod_u ) { - u3_noun txt = u3_ci_string(str_c); + u3_noun txt = u3i_string(str_c); exp = u3_ckdb_get(u3k(u3A->yot), u3k(txt)); @@ -113,10 +113,10 @@ u3_cv_wish(const c3_c* str_c) return exp; } else { - // It's probably not a good idea to use u3_cv_wish() + // It's probably not a good idea to use u3v_wish() // outside the top level... // - return _cv_nock_wish(u3_ci_string(str_c)); + return _cv_nock_wish(u3i_string(str_c)); } } @@ -125,7 +125,7 @@ u3_cv_wish(const c3_c* str_c) static u3_noun _cv_mung_in(u3_noun gam) { - u3_noun pro = u3_cn_slam_on(u3k(u3h(gam)), u3k(u3t(gam))); + u3_noun pro = u3n_slam_on(u3k(u3h(gam)), u3k(u3t(gam))); u3z(gam); return pro; } @@ -134,24 +134,24 @@ _cv_mung(c3_w sec_w, u3_noun gat, u3_noun sam) { u3_noun gam = u3nc(gat, sam); - return u3_cm_soft(0, _cv_mung_in, gam); + return u3m_soft(0, _cv_mung_in, gam); } -/* u3_cv_pike(): poke with floating core. +/* u3v_pike(): poke with floating core. */ u3_noun -u3_cv_pike(u3_noun ovo, u3_noun cor) +u3v_pike(u3_noun ovo, u3_noun cor) { - u3_noun fun = u3_cn_nock_on(cor, u3k(u3_cx_at(42, cor))); + u3_noun fun = u3n_nock_on(cor, u3k(u3x_at(42, cor))); u3_noun sam = u3nc(u3k(u3A->now), ovo); return _cv_mung(0, fun, sam); } -/* u3_cv_nick(): transform enveloped packets, [vir cor]. +/* u3v_nick(): transform enveloped packets, [vir cor]. */ u3_noun -u3_cv_nick(u3_noun vir, u3_noun cor) +u3v_nick(u3_noun vir, u3_noun cor) { if ( u3_nul == vir ) { return u3nt(u3_blip, vir, cor); @@ -161,13 +161,13 @@ u3_cv_nick(u3_noun vir, u3_noun cor) u3_noun pi_vir, qi_vir; u3_noun vix; - if ( (c3y == u3_cr_cell((i_vir=u3h(vir)), &pi_vir, &qi_vir)) && + if ( (c3y == u3r_cell((i_vir=u3h(vir)), &pi_vir, &qi_vir)) && (c3y == u3du(qi_vir)) && (c3__hear == u3h(qi_vir)) ) { u3_noun gon; - gon = u3_cv_pike(u3k(i_vir), cor); + gon = u3v_pike(u3k(i_vir), cor); if ( u3_blip != u3h(gon) ) { u3z(vir); return gon; @@ -182,11 +182,11 @@ u3_cv_nick(u3_noun vir, u3_noun cor) viz = u3_ckb_weld(vix, u3k(u3t(vir))); u3z(vir); - return u3_cv_nick(viz, cor); + return u3v_nick(viz, cor); } } else { - u3_noun nez = u3_cv_nick(u3k(u3t(vir)), cor); + u3_noun nez = u3v_nick(u3k(u3t(vir)), cor); if ( u3_blip != u3h(nez) ) { u3z(vir); @@ -211,28 +211,28 @@ u3_cv_nick(u3_noun vir, u3_noun cor) static u3_noun _cv_nock_poke(u3_noun ovo) { - u3_noun fun = u3_cn_nock_on(u3k(u3A->roc), u3k(u3_cx_at(42, u3A->roc))); + u3_noun fun = u3n_nock_on(u3k(u3A->roc), u3k(u3x_at(42, u3A->roc))); u3_noun sam, pro; sam = u3nc(u3k(u3A->now), ovo); #if 0 { - c3_c* ovi_c = u3_cr_string(u3h(u3t(ovo))); + c3_c* ovi_c = u3r_string(u3h(u3t(ovo))); u3_noun tox = u3_do("spat", u3k(u3h(ovo))); - c3_c* tox_c = u3_cr_string(tox); + c3_c* tox_c = u3r_string(tox); - printf("poke: %%%s (%x) on %s\r\n", ovi_c, u3_cr_mug(ovo), tox_c); + printf("poke: %%%s (%x) on %s\r\n", ovi_c, u3r_mug(ovo), tox_c); free(tox_c); free(ovi_c); u3z(tox); } #endif // u3_leak_on(1); - pro = u3_cn_slam_on(fun, sam); + pro = u3n_slam_on(fun, sam); // u3_leak_off; #if 0 { - c3_c* ovi_c = u3_cr_string(u3h(u3t(ovo))); + c3_c* ovi_c = u3r_string(u3h(u3t(ovo))); printf("poked: %s\r\n", ovi_c); @@ -248,10 +248,10 @@ _cv_nock_poke(u3_noun ovo) static u3_noun _cv_nock_peek(u3_noun hap) { - u3_noun fun = u3_cn_nock_on(u3k(u3A->roc), u3k(u3_cx_at(87, u3A->roc))); + u3_noun fun = u3n_nock_on(u3k(u3A->roc), u3k(u3x_at(87, u3A->roc))); u3_noun sam = u3nc(u3k(u3A->now), hap); - return u3_cn_slam_on(fun, sam); + return u3n_slam_on(fun, sam); } /* _cv_nock_keep(): call wait through hardcoded interface. @@ -259,29 +259,29 @@ _cv_nock_peek(u3_noun hap) static u3_noun _cv_nock_keep(u3_noun hap) { - u3_noun fun = u3_cn_nock_on(u3k(u3A->roc), u3k(u3_cx_at(4, u3A->roc))); + u3_noun fun = u3n_nock_on(u3k(u3A->roc), u3k(u3x_at(4, u3A->roc))); u3_noun sam = u3nc(u3k(u3A->now), hap); - return u3_cn_slam_on(fun, sam); + return u3n_slam_on(fun, sam); } -/* u3_cv_do(): use a kernel gate. +/* u3v_do(): use a kernel gate. */ u3_noun -u3_cv_do(const c3_c* txt_c, u3_noun sam) +u3v_do(const c3_c* txt_c, u3_noun sam) { - u3_noun gat = u3_cv_wish(txt_c); + u3_noun gat = u3v_wish(txt_c); u3_noun pro; #if 0 if ( &u3H->rod_u == u3R ) { - pro = u3_cm_soft_slam(gat, sam); + pro = u3m_soft_slam(gat, sam); } else { - pro = u3_cn_slam_on(gat, sam); + pro = u3n_slam_on(gat, sam); } #else - pro = u3_cn_slam_on(gat, sam); + pro = u3n_slam_on(gat, sam); #endif return pro; @@ -295,10 +295,10 @@ _cv_scot(u3_noun dim) return u3_do("scot", dim); } -/* u3_cv_time(): set the reck time. +/* u3v_time(): set the reck time. */ void -u3_cv_time(u3_noun now) +u3v_time(u3_noun now) { u3z(u3A->now); u3A->now = now; @@ -307,12 +307,12 @@ u3_cv_time(u3_noun now) u3A->wen = _cv_scot(u3nc(c3__da, u3k(u3A->now))); } -/* u3_cv_numb(): set the instance number. +/* u3v_numb(): set the instance number. */ void -u3_cv_numb() +u3v_numb() { - u3A->sev_l = u3_cr_mug(u3A->now); + u3A->sev_l = u3r_mug(u3A->now); u3z(u3A->sen); u3A->sen = _cv_scot(u3nc(c3__uv, u3A->sev_l)); } @@ -325,24 +325,24 @@ _cv_time_bump(u3_reck* rec_u) { c3_d bum_d = (1ULL << 48ULL); - u3A->now = u3_cka_add(u3A->now, u3_ci_chubs(1, &bum_d)); + u3A->now = u3_cka_add(u3A->now, u3i_chubs(1, &bum_d)); } #endif -/* u3_cv_peek(): query the reck namespace (protected). +/* u3v_peek(): query the reck namespace (protected). */ u3_noun -u3_cv_peek(u3_noun hap) +u3v_peek(u3_noun hap) { - return u3_cm_soft_sure(_cv_nock_peek, hap); + return u3m_soft_sure(_cv_nock_peek, hap); } -/* u3_cv_keep(): measure timer. +/* u3v_keep(): measure timer. */ u3_noun -u3_cv_keep(u3_noun hap) +u3v_keep(u3_noun hap) { - return u3_cm_soft_sure(_cv_nock_keep, hap); + return u3m_soft_sure(_cv_nock_keep, hap); } #if 0 @@ -356,17 +356,17 @@ _cv_mole(u3_noun fot, u3_noun uco = u3_do("slay", san); u3_noun p_uco, q_uco, r_uco, s_uco; - if ( (c3n == u3_cr_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || + if ( (c3n == u3r_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || (0 != p_uco) || (0 != q_uco) || (c3n == u3_sing(fot, r_uco)) ) { - uL(fprintf(uH, "strange mole %s\n", u3_cr_string(san))); + uL(fprintf(uH, "strange mole %s\n", u3r_string(san))); u3z(fot); u3z(uco); return c3n; } else { - *ato_d = u3_cr_chub(0, s_uco); + *ato_d = u3r_chub(0, s_uco); u3z(fot); u3z(uco); return c3y; } @@ -393,35 +393,35 @@ _cv_lily(u3_noun fot, u3_noun txt, c3_l* tid_l) } #endif -/* u3_cv_poke(): insert and apply an input ovum (protected). +/* u3v_poke(): insert and apply an input ovum (protected). */ u3_noun -u3_cv_poke(u3_noun ovo) +u3v_poke(u3_noun ovo) { return _cv_nock_poke(ovo); } -/* u3_cv_http_request(): hear http request on channel (unprotected). +/* u3v_http_request(): hear http request on channel (unprotected). */ void -u3_cv_http_request(u3_bean sec, u3_noun pox, u3_noun req) +u3v_http_request(u3_bean sec, u3_noun pox, u3_noun req) { // uL(fprintf(uH, "http: request\n")); - u3_cv_plan(pox, u3nq(c3__this, sec, 0, req)); + u3v_plan(pox, u3nq(c3__this, sec, 0, req)); } -/* u3_cv_tank(): dump single tank. +/* u3v_tank(): dump single tank. */ void -u3_cv_tank(u3_noun blu, c3_l tab_l, u3_noun tac) +u3v_tank(u3_noun blu, c3_l tab_l, u3_noun tac) { - u3_cv_punt(blu, tab_l, u3nc(tac, u3_nul)); + u3v_punt(blu, tab_l, u3nc(tac, u3_nul)); } -/* u3_cv_punt(): dump tank list. +/* u3v_punt(): dump tank list. */ void -u3_cv_punt(u3_noun blu, c3_l tab_l, u3_noun tac) +u3v_punt(u3_noun blu, c3_l tab_l, u3_noun tac) { #if 0 u3_noun blu = u3_term_get_blew(0); @@ -431,64 +431,64 @@ u3_cv_punt(u3_noun blu, c3_l tab_l, u3_noun tac) // We are calling nock here, but hopefully need no protection. // - while ( c3y == u3_cr_du(cat) ) { + while ( c3y == u3r_du(cat) ) { u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); - u3_cm_wall(wol); + u3m_wall(wol); cat = u3t(cat); } u3z(tac); u3z(blu); } -/* u3_cv_sway(): print trace. +/* u3v_sway(): print trace. */ void -u3_cv_sway(u3_noun blu, c3_l tab_l, u3_noun tax) +u3v_sway(u3_noun blu, c3_l tab_l, u3_noun tax) { u3_noun mok = u3_dc("mook", 2, tax); - u3_cv_punt(blu, tab_l, u3k(u3t(mok))); + u3v_punt(blu, tab_l, u3k(u3t(mok))); u3z(mok); } -/* u3_cv_plan(): queue ovum (external). +/* u3v_plan(): queue ovum (external). */ void -u3_cv_plan(u3_noun pax, u3_noun fav) +u3v_plan(u3_noun pax, u3_noun fav) { u3_noun egg = u3nc(pax, fav); u3A->roe = u3nc(u3nc(u3_nul, egg), u3A->roe); } -/* u3_cv_plow(): queue multiple ova (external). +/* u3v_plow(): queue multiple ova (external). */ void -u3_cv_plow(u3_noun ova) +u3v_plow(u3_noun ova) { u3_noun ovi = ova; while ( u3_nul != ovi ) { u3_noun ovo=u3h(ovi); - u3_cv_plan(u3k(u3h(ovo)), u3k(u3t(ovo))); + u3v_plan(u3k(u3h(ovo)), u3k(u3t(ovo))); ovi = u3t(ovi); } u3z(ova); } -/* u3_cv_louse(): last-minute deviltry upon a bail. +/* u3v_louse(): last-minute deviltry upon a bail. */ void -u3_cv_louse(c3_m how_m) +u3v_louse(c3_m how_m) { #if 0 if ( c3__exit == how_m ) { printf("louse: nocks: %d\n", NOX); - printf("louse: washing kernel %x %d\n", u3A->ken, u3_ca_is_dog(u3A->ken)); - u3_cm_wash(u3A->ken); + printf("louse: washing kernel %x %d\n", u3A->ken, u3a_is_dog(u3A->ken)); + u3m_wash(u3A->ken); - printf("kernel %x; washed mug %x\n", u3A->ken, u3_cr_mug(u3A->ken)); + printf("kernel %x; washed mug %x\n", u3A->ken, u3r_mug(u3A->ken)); } #endif } @@ -496,36 +496,36 @@ u3_cv_louse(c3_m how_m) /* _cv_mark_ova(): mark ova queue. */ static void -_cv_mark_ova(u3p(u3_cv_cart) egg_p) +_cv_mark_ova(u3p(u3v_cart) egg_p) { while ( egg_p ) { - u3_cv_cart* egg_u = u3to(u3_cv_cart, egg_p); + u3v_cart* egg_u = u3to(u3v_cart, egg_p); - u3_ca_mark_ptr(egg_u); - u3_ca_mark_noun(egg_u->vir); + u3a_mark_ptr(egg_u); + u3a_mark_noun(egg_u->vir); egg_p = egg_u->nex_p; } } -/* u3_cv_mark(): mark arvo kernel. +/* u3v_mark(): mark arvo kernel. */ void -u3_cv_mark(void) +u3v_mark(void) { - u3_cv_arvo* arv_u = &(u3H->arv_u); + u3v_arvo* arv_u = &(u3H->arv_u); - u3_ca_mark_noun(arv_u->yot); - u3_ca_mark_noun(arv_u->now); - u3_ca_mark_noun(arv_u->wen); - u3_ca_mark_noun(arv_u->sen); - u3_ca_mark_noun(arv_u->own); + u3a_mark_noun(arv_u->yot); + u3a_mark_noun(arv_u->now); + u3a_mark_noun(arv_u->wen); + u3a_mark_noun(arv_u->sen); + u3a_mark_noun(arv_u->own); - u3_ca_mark_noun(arv_u->roe); - u3_ca_mark_noun(arv_u->key); + u3a_mark_noun(arv_u->roe); + u3a_mark_noun(arv_u->key); - u3_ca_mark_noun(arv_u->ken); - u3_ca_mark_noun(arv_u->roc); + u3a_mark_noun(arv_u->ken); + u3a_mark_noun(arv_u->roc); _cv_mark_ova(arv_u->ova.egg_p); } diff --git a/g/x.c b/g/x.c index 5bc4e43084..62f9f8a618 100644 --- a/g/x.c +++ b/g/x.c @@ -4,88 +4,88 @@ */ #include "all.h" -/* u3_cx_good(): test for u3_none. +/* u3x_good(): test for u3_none. */ u3_noun -u3_cx_good(u3_weak som) +u3x_good(u3_weak som) { if ( u3_none == som ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else return som; } -/* u3_cx_at (u3at): fragment. +/* u3x_at (u3at): fragment. */ u3_noun -u3_cx_at(u3_noun axe, u3_noun som) +u3x_at(u3_noun axe, u3_noun som) { - u3_weak pro = u3_cr_at(axe, som); + u3_weak pro = u3r_at(axe, som); if ( u3_none == pro ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else return pro; } -/* u3_cx_cell(): +/* u3x_cell(): ** ** Divide `a` as a cell `[b c]`. */ void -u3_cx_cell(u3_noun a, +u3x_cell(u3_noun a, u3_noun* b, u3_noun* c) { - if ( c3n == u3_cr_cell(a, b, c) ) { - u3_cm_bail(c3__exit); + if ( c3n == u3r_cell(a, b, c) ) { + u3m_bail(c3__exit); } } -/* u3_cx_trel(): +/* u3x_trel(): ** ** Divide `a` as a trel `[b c d]`, or bail. */ void -u3_cx_trel(u3_noun a, +u3x_trel(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d) { - if ( c3n == u3_cr_trel(a, b, c, d) ) { - u3_cm_bail(c3__exit); + if ( c3n == u3r_trel(a, b, c, d) ) { + u3m_bail(c3__exit); } } -/* u3_cx_qual(): +/* u3x_qual(): ** ** Divide `a` as a quadruple `[b c d e]`. */ void -u3_cx_qual(u3_noun a, +u3x_qual(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d, u3_noun* e) { - if ( c3n == u3_cr_qual(a, b, c, d, e) ) { - u3_cm_bail(c3__exit); + if ( c3n == u3r_qual(a, b, c, d, e) ) { + u3m_bail(c3__exit); } } -/* u3_cx_quil(): +/* u3x_quil(): ** ** Divide `a` as a quintuple `[b c d e f]`. */ void -u3_cx_quil(u3_noun a, +u3x_quil(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d, u3_noun* e, u3_noun* f) { - if ( c3n == u3_cr_quil(a, b, c, d, e, f) ) { - u3_cm_bail(c3__exit); + if ( c3n == u3r_quil(a, b, c, d, e, f) ) { + u3m_bail(c3__exit); } } diff --git a/g/z.c b/g/z.c index 6da8680f6d..004773d7f1 100644 --- a/g/z.c +++ b/g/z.c @@ -4,80 +4,80 @@ */ #include "all.h" -/* u3_cz_find(): find in memo cache. Arguments retained. +/* u3z_find(): find in memo cache. Arguments retained. */ u3_weak -u3_cz_find(u3_mote fun, u3_noun one) +u3z_find(u3_mote fun, u3_noun one) { u3_noun key = u3nc(fun, u3k(one)); u3_noun val; - val = u3_ch_get(u3R->cax.har_p, key); + val = u3h_get(u3R->cax.har_p, key); u3z(key); return val; } u3_weak -u3_cz_find_2(u3_mote fun, u3_noun one, u3_noun two) +u3z_find_2(u3_mote fun, u3_noun one, u3_noun two) { u3_noun key = u3nt(fun, u3k(one), u3k(two)); u3_noun val; - val = u3_ch_get(u3R->cax.har_p, key); + val = u3h_get(u3R->cax.har_p, key); u3z(key); return val; } u3_weak -u3_cz_find_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri) +u3z_find_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri) { u3_noun key = u3nq(fun, u3k(one), u3k(two), u3k(tri)); u3_noun val; - val = u3_ch_get(u3R->cax.har_p, key); + val = u3h_get(u3R->cax.har_p, key); u3z(key); return val; } u3_weak -u3_cz_find_4(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun qua) +u3z_find_4(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun qua) { u3_noun key = u3nc(fun, u3nq(u3k(one), u3k(two), u3k(tri), u3k(qua))); u3_noun val; - val = u3_ch_get(u3R->cax.har_p, key); + val = u3h_get(u3R->cax.har_p, key); u3z(key); return val; } -/* u3_cz_save*(): save in memo cache. +/* u3z_save*(): save in memo cache. */ u3_noun -u3_cz_save(u3_mote fun, u3_noun one, u3_noun val) +u3z_save(u3_mote fun, u3_noun one, u3_noun val) { u3_noun key = u3nc(fun, u3k(one)); - u3_ch_put(u3R->cax.har_p, key, u3k(val)); + u3h_put(u3R->cax.har_p, key, u3k(val)); u3z(key); return val; } u3_noun -u3_cz_save_2(u3_mote fun, u3_noun one, u3_noun two, u3_noun val) +u3z_save_2(u3_mote fun, u3_noun one, u3_noun two, u3_noun val) { u3_noun key = u3nt(fun, u3k(one), u3k(two)); - u3_ch_put(u3R->cax.har_p, key, u3k(val)); + u3h_put(u3R->cax.har_p, key, u3k(val)); u3z(key); return val; } u3_noun -u3_cz_save_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun val) +u3z_save_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun val) { u3_noun key = u3nq(fun, u3k(one), u3k(two), u3k(tri)); - u3_ch_put(u3R->cax.har_p, key, u3k(val)); + u3h_put(u3R->cax.har_p, key, u3k(val)); u3z(key); return val; } u3_noun -u3_cz_save_4(u3_mote fun, +u3z_save_4(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, @@ -86,24 +86,24 @@ u3_cz_save_4(u3_mote fun, { u3_noun key = u3nc(fun, u3nq(u3k(one), u3k(two), u3k(tri), u3k(qua))); - u3_ch_put(u3R->cax.har_p, key, u3k(val)); + u3h_put(u3R->cax.har_p, key, u3k(val)); u3z(key); return val; } -/* u3_cz_uniq(): uniquify with memo cache. +/* u3z_uniq(): uniquify with memo cache. */ u3_noun -u3_cz_uniq(u3_noun som) +u3z_uniq(u3_noun som) { u3_noun key = u3nc(c3__uniq, u3k(som)); - u3_noun val = u3_ch_get(u3R->cax.har_p, key); + u3_noun val = u3h_get(u3R->cax.har_p, key); if ( u3_none != val ) { u3z(key); u3z(som); return val; } else { - u3_ch_put(u3R->cax.har_p, key, u3k(som)); + u3h_put(u3R->cax.har_p, key, u3k(som)); return som; } } diff --git a/i/all.h b/i/all.h index 5f6c0941d1..640d7aef36 100644 --- a/i/all.h +++ b/i/all.h @@ -48,46 +48,37 @@ ** ** Our Martian booleans and list terminator; empty string; not a noun. */ -# define u3_yes 0 -# define u3_no 1 # define u3_nul 0 # define u3_blip 0 /* Tools for Martian booleans. */ -# define u3_so(x) (u3_yes == (x)) -# define u3_ne(x) (u3_no == (x)) -# define u3_say(x) ( (x) ? u3_yes : u3_no ) -# define u3_not(x) ( (x == u3_yes) ? u3_no : u3_yes ) -# define u3_and(x, y) ( (u3_so(x) && u3_so(y)) ? u3_yes : u3_no ) -# define u3_or(x, y) ( (u3_so(x) || u3_so(y)) ? u3_yes : u3_no ) - -# define u3_assure(x) if ( u3_ne(x) ) { u3_cm_bail(c3__fail); } -# define u3_assent(x) if ( u3_ne(x) ) { u3_cm_bail(c3__exit); } +# define u3_assure(x) if ( !_(x) ) { u3m_bail(c3__fail); } +# define u3_assent(x) if ( !_(x) ) { u3m_bail(c3__exit); } /** Aliases - selective and syntactically unique. **/ -# define u3h(som) u3_cx_h(som) -# define u3t(som) u3_cx_t(som) -# define u3at(axe, som) u3_cx_at(axe, som) +# define u3h(som) u3x_h(som) +# define u3t(som) u3x_t(som) +# define u3at(axe, som) u3x_at(axe, som) -# define u3nc(a, b) u3_ci_cell(a, b) -# define u3nt(a, b, c) u3_ci_trel(a, b, c) -# define u3nq(a, b, c, d) u3_ci_qual(a, b, c, d) +# define u3nc(a, b) u3i_cell(a, b) +# define u3nt(a, b, c) u3i_trel(a, b, c) +# define u3nq(a, b, c, d) u3i_qual(a, b, c, d) -# define u3du(som) (u3_cr_du(som)) -# define u3ud(som) (u3_cr_ud(som)) +# define u3du(som) (u3r_du(som)) +# define u3ud(som) (u3r_ud(som)) -# define u3k(som) u3_ca_gain(som) -# define u3z(som) u3_ca_lose(som) +# define u3k(som) u3a_gain(som) +# define u3z(som) u3a_lose(som) /** Arvo macros. **/ -# define u3_do(txt_c, arg) u3_cv_do(txt_c, arg) -# define u3_dc(txt_c, a, b) u3_cv_do(txt_c, u3nc(a, b)) -# define u3_dt(txt_c, a, b, c) u3_cv_do(txt_c, u3nt(a, b, c)) -# define u3_dq(txt_c, a, b, c, d) u3_cv_do(txt_c, u3nt(a, b, c, d)) +# define u3_do(txt_c, arg) u3v_do(txt_c, arg) +# define u3_dc(txt_c, a, b) u3v_do(txt_c, u3nc(a, b)) +# define u3_dt(txt_c, a, b, c) u3v_do(txt_c, u3nt(a, b, c)) +# define u3_dq(txt_c, a, b, c, d) u3v_do(txt_c, u3nt(a, b, c, d)) /** g: the u3 layer, functions. **/ diff --git a/i/g/a.h b/i/g/a.h index d449cf06db..8892b512cc 100644 --- a/i/g/a.h +++ b/i/g/a.h @@ -6,15 +6,15 @@ **/ # undef U3_MEMORY_DEBUG # ifdef U3_MEMORY_DEBUG -# define u3_ca_leak_on(x) (u3_Code = x) -# define u3_ca_leak_off (u3_Code = 0) +# define u3a_leak_on(x) (u3_Code = x) +# define u3a_leak_off (u3_Code = 0) # endif -# define u3_ca_bits U3_OS_LoomBits // 28, max 29 -# define u3_ca_page 12 // 16Kbyte pages -# define u3_ca_pages (1 << (u3_ca_bits - u3_ca_page)) // 2^16 pages -# define u3_ca_words (1 << u3_ca_bits) -# define u3_ca_bytes (c3_w)((1 << (2 + u3_ca_bits))) +# define u3a_bits U3_OS_LoomBits // 28, max 29 +# define u3a_page 12 // 16Kbyte pages +# define u3a_pages (1 << (u3a_bits - u3a_page)) // 2^16 pages +# define u3a_words (1 << u3a_bits) +# define u3a_bytes (c3_w)((1 << (2 + u3a_bits))) /** Data structures. @@ -58,49 +58,49 @@ */ typedef struct { c3_w mug_w; - } u3_ca_noun; + } u3a_noun; typedef struct { c3_w mug_w; c3_w len_w; c3_w buf_w[0]; - } u3_ca_atom; + } u3a_atom; typedef struct { c3_w mug_w; u3_noun hed; u3_noun tel; - } u3_ca_cell; + } u3a_cell; /* Inside a noun. */ -# define u3_ca_is_cat(som) (((som) >> 31) ? c3n : c3y) -# define u3_ca_is_dog(som) (((som) >> 31) ? c3y : c3n) +# define u3a_is_cat(som) (((som) >> 31) ? c3n : c3y) +# define u3a_is_dog(som) (((som) >> 31) ? c3y : c3n) -# define u3_ca_is_pug(som) ((2 == ((som) >> 30)) ? c3y : c3n) -# define u3_ca_is_pom(som) ((3 == ((som) >> 30)) ? c3y : c3n) -# define u3_ca_to_off(som) ((som) & 0x3fffffff) -# define u3_ca_to_ptr(som) (u3_ca_into(u3_ca_to_off(som))) -# define u3_ca_to_wtr(som) ((c3_w *)u3_ca_to_ptr(som)) -# define u3_ca_to_pug(off) (off | 0x80000000) -# define u3_ca_to_pom(off) (off | 0xc0000000) +# define u3a_is_pug(som) ((2 == ((som) >> 30)) ? c3y : c3n) +# define u3a_is_pom(som) ((3 == ((som) >> 30)) ? c3y : c3n) +# define u3a_to_off(som) ((som) & 0x3fffffff) +# define u3a_to_ptr(som) (u3a_into(u3a_to_off(som))) +# define u3a_to_wtr(som) ((c3_w *)u3a_to_ptr(som)) +# define u3a_to_pug(off) (off | 0x80000000) +# define u3a_to_pom(off) (off | 0xc0000000) -# define u3_ca_is_atom(som) c3o(u3_ca_is_cat(som), \ - u3_ca_is_pug(som)) -# define u3_ca_is_cell(som) u3_ca_is_pom(som) -# define u3_ca_de_twin(dog, dog_w) ((dog & 0xc0000000) | u3_ca_outa(dog_w)) +# define u3a_is_atom(som) c3o(u3a_is_cat(som), \ + u3a_is_pug(som)) +# define u3a_is_cell(som) u3a_is_pom(som) +# define u3a_de_twin(dog, dog_w) ((dog & 0xc0000000) | u3a_outa(dog_w)) -# define u3_ca_h(som) \ - ( _(u3_ca_is_cell(som)) \ - ? ( ((u3_ca_cell *)u3_ca_to_ptr(som))->hed )\ - : u3_cm_bail(c3__exit) ) +# define u3a_h(som) \ + ( _(u3a_is_cell(som)) \ + ? ( ((u3a_cell *)u3a_to_ptr(som))->hed )\ + : u3m_bail(c3__exit) ) -# define u3_ca_t(som) \ - ( _(u3_ca_is_cell(som)) \ - ? ( ((u3_ca_cell *)u3_ca_to_ptr(som))->tel )\ - : u3_cm_bail(c3__exit) ) +# define u3a_t(som) \ + ( _(u3a_is_cell(som)) \ + ? ( ((u3a_cell *)u3a_to_ptr(som))->tel )\ + : u3m_bail(c3__exit) ) - /* u3_ca_box: classic allocation box. + /* u3a_box: classic allocation box. ** ** The box size is also stored at the end of the box in classic ** bad ass malloc style. Hence a box is: @@ -115,38 +115,38 @@ ** ** Do not attempt to adjust this structure! */ - typedef struct _u3_ca_box { + typedef struct _u3a_box { c3_w siz_w; // size of this box c3_w use_w; // reference count; free if 0 # ifdef U3_MEMORY_DEBUG c3_w eus_w; // recomputed refcount c3_w cod_w; // tracing code # endif - } u3_ca_box; + } u3a_box; -# define u3_ca_boxed(len_w) (len_w + c3_wiseof(u3_ca_box) + 1) -# define u3_ca_boxto(box_v) ( (void *) \ +# define u3a_boxed(len_w) (len_w + c3_wiseof(u3a_box) + 1) +# define u3a_boxto(box_v) ( (void *) \ ( ((c3_w *)(void*)(box_v)) + \ - c3_wiseof(u3_ca_box) ) ) -# define u3_ca_botox(tox_v) ( (struct _u3_ca_box *) \ + c3_wiseof(u3a_box) ) ) +# define u3a_botox(tox_v) ( (struct _u3a_box *) \ (void *) \ ( ((c3_w *)(void*)(tox_v)) - \ - c3_wiseof(u3_ca_box) ) ) + c3_wiseof(u3a_box) ) ) - /* u3_ca_fbox: free node in heap. Sets minimum node size. + /* u3a_fbox: free node in heap. Sets minimum node size. ** */ - typedef struct _u3_ca_fbox { - u3_ca_box box_u; - u3p(struct _u3_ca_fbox) pre_p; - u3p(struct _u3_ca_fbox) nex_p; - } u3_ca_fbox; + typedef struct _u3a_fbox { + u3a_box box_u; + u3p(struct _u3a_fbox) pre_p; + u3p(struct _u3a_fbox) nex_p; + } u3a_fbox; # define u3_cc_minimum 6 # define u3_cc_fbox_no 28 - /* u3_cs_road: contiguous allocation and execution context. + /* u3a_road: contiguous allocation and execution context. ** ** A road is a normal heap-stack system, except that the heap ** and stack can point in either direction. Therefore, inside @@ -214,12 +214,12 @@ ** In all cases, the pointer in a u3_noun is a word offset into ** u3H, the top-level road. */ - typedef struct _u3_cs_road { - struct _u3_cs_road* par_u; // parent road + typedef struct _u3a_road { + struct _u3a_road* par_u; // parent road - struct _u3_cs_road* kid_u; // child road list - struct _u3_cs_road* nex_u; // sibling road - struct _u3_cs_road* now_u; // current road pointer + struct _u3a_road* kid_u; // child road list + struct _u3a_road* nex_u; // sibling road + struct _u3a_road* now_u; // current road pointer u3p(c3_w) cap_p; // top of transient region u3p(c3_w) hat_p; // top of durable region @@ -241,12 +241,12 @@ } how; // struct { // allocation pools - u3p(u3_ca_fbox) fre_p[u3_cc_fbox_no]; // heap by node size log + u3p(u3a_fbox) fre_p[u3_cc_fbox_no]; // heap by node size log c3_w fre_w; // number of free words } all; struct { // jet dashboard - u3p(u3_ch_root) har_p; // jet index (old style) + u3p(u3h_root) har_p; // jet index (old style) u3_noun das; // dashboard (new style) } jed; @@ -266,74 +266,74 @@ } pro; struct { // memoization - u3p(u3_ch_root) har_p; // (map (pair term noun) noun) + u3p(u3h_root) har_p; // (map (pair term noun) noun) } cax; - } u3_cs_road; - typedef u3_cs_road u3_road; + } u3a_road; + typedef u3a_road u3_road; /** Flags. **/ - enum u3_ca_flag { - u3_ca_flag_debug = 0x1, // debug memory - u3_ca_flag_gc = 0x2, // garbage collect once - u3_ca_flag_sand = 0x4, // sand mode, bump allocation - u3_ca_flag_die = 0x8 // process was asked to exit + enum u3a_flag { + u3a_flag_debug = 0x1, // debug memory + u3a_flag_gc = 0x2, // garbage collect once + u3a_flag_sand = 0x4, // sand mode, bump allocation + u3a_flag_die = 0x8 // process was asked to exit }; /** Macros. **/ -# define u3_ca_into(x) ((void *)(u3_Loom + (x))) -# define u3_ca_outa(p) (((c3_w*)(void*)(p)) - u3_Loom) +# define u3a_into(x) ((void *)(u3_Loom + (x))) +# define u3a_outa(p) (((c3_w*)(void*)(p)) - u3_Loom) -# define u3to(type, x) ((type *) u3_ca_into(x)) -# define u3of(type, x) (u3_ca_outa((type *)x)) +# define u3to(type, x) ((type *) u3a_into(x)) +# define u3of(type, x) (u3a_outa((type *)x)) -# define u3_ca_is_north(r) __(r->cap_p > r->hat_p) -# define u3_ca_is_south(r) !u3_ca_is_north(r) +# define u3a_is_north(r) __(r->cap_p > r->hat_p) +# define u3a_is_south(r) !u3a_is_north(r) -# define u3_ca_open(r) ( (c3y == u3_ca_is_north(r)) \ +# define u3a_open(r) ( (c3y == u3a_is_north(r)) \ ? (c3_w)(r->cap_p - r->hat_p) \ : (c3_w)(r->hat_p - r->cap_p) ) -# define u3_ca_north_is_senior(r, dog) \ - __((u3_ca_to_off(dog) < r->rut_p) || \ - (u3_ca_to_off(dog) >= r->mat_p)) +# define u3a_north_is_senior(r, dog) \ + __((u3a_to_off(dog) < r->rut_p) || \ + (u3a_to_off(dog) >= r->mat_p)) -# define u3_ca_north_is_junior(r, dog) \ - __((u3_ca_to_off(dog) >= r->cap_p) && \ - (u3_ca_to_off(dog) < r->mat_p)) +# define u3a_north_is_junior(r, dog) \ + __((u3a_to_off(dog) >= r->cap_p) && \ + (u3a_to_off(dog) < r->mat_p)) -# define u3_ca_north_is_normal(r, dog) \ - c3a(!(u3_ca_north_is_senior(r, dog)), \ - !(u3_ca_north_is_junior(r, dog))) +# define u3a_north_is_normal(r, dog) \ + c3a(!(u3a_north_is_senior(r, dog)), \ + !(u3a_north_is_junior(r, dog))) -# define u3_ca_south_is_senior(r, dog) \ - __((u3_ca_to_off(dog) < r->mat_p) || \ - (u3_ca_to_off(dog) >= r->rut_p)) +# define u3a_south_is_senior(r, dog) \ + __((u3a_to_off(dog) < r->mat_p) || \ + (u3a_to_off(dog) >= r->rut_p)) -# define u3_ca_south_is_junior(r, dog) \ - __((u3_ca_to_off(dog) < r->cap_p) && \ - (u3_ca_to_off(dog) >= r->mat_p)) +# define u3a_south_is_junior(r, dog) \ + __((u3a_to_off(dog) < r->cap_p) && \ + (u3a_to_off(dog) >= r->mat_p)) -# define u3_ca_south_is_normal(r, dog) \ - c3a(!(u3_ca_south_is_senior(r, dog)), \ - !(u3_ca_south_is_junior(r, dog))) +# define u3a_south_is_normal(r, dog) \ + c3a(!(u3a_south_is_senior(r, dog)), \ + !(u3a_south_is_junior(r, dog))) -# define u3_ca_is_junior(r, som) \ - ( _(u3_ca_is_cat(som)) \ +# define u3a_is_junior(r, som) \ + ( _(u3a_is_cat(som)) \ ? c3n \ - : _(u3_ca_is_north(r)) \ - ? u3_ca_north_is_junior(r, som) \ - : u3_ca_south_is_junior(r, som) ) + : _(u3a_is_north(r)) \ + ? u3a_north_is_junior(r, som) \ + : u3a_south_is_junior(r, som) ) -# define u3_ca_is_senior(r, som) \ - ( _(u3_ca_is_cat(som)) \ +# define u3a_is_senior(r, som) \ + ( _(u3a_is_cat(som)) \ ? c3y \ - : _(u3_ca_is_north(r)) \ - ? u3_ca_north_is_senior(r, som) \ - : u3_ca_south_is_senior(r, som) ) + : _(u3a_is_north(r)) \ + ? u3a_north_is_senior(r, som) \ + : u3a_south_is_senior(r, som) ) /* Word axis macros. For 31-bit axes only. */ @@ -357,23 +357,23 @@ /* Conventional axes for gate call. */ -# define u3_cv_pay 3 // payload -# define u3_cv_sam 6 // sample -# define u3_cv_sam_1 6 -# define u3_cv_sam_2 12 -# define u3_cv_sam_3 13 -# define u3_cv_sam_4 24 -# define u3_cv_sam_5 25 -# define u3_cv_sam_6 26 -# define u3_cv_sam_12 52 -# define u3_cv_sam_13 53 -# define u3_cv_sam_7 27 -# define u3_cv_con 7 // context -# define u3_cv_con_2 14 // context -# define u3_cv_con_3 15 // context -# define u3_cv_con_sam 30 // sample in gate context -# define u3_cv_noc 2 // deprecated -# define u3_cv_bat 2 // battery +# define u3v_pay 3 // payload +# define u3v_sam 6 // sample +# define u3v_sam_1 6 +# define u3v_sam_2 12 +# define u3v_sam_3 13 +# define u3v_sam_4 24 +# define u3v_sam_5 25 +# define u3v_sam_6 26 +# define u3v_sam_12 52 +# define u3v_sam_13 53 +# define u3v_sam_7 27 +# define u3v_con 7 // context +# define u3v_con_2 14 // context +# define u3v_con_3 15 // context +# define u3v_con_sam 30 // sample in gate context +# define u3v_noc 2 // deprecated +# define u3v_bat 2 // battery /** Globals. @@ -397,131 +397,131 @@ **/ /* Basic allocation. */ - /* u3_ca_walloc(): allocate storage measured in words. + /* u3a_walloc(): allocate storage measured in words. */ void* - u3_ca_walloc(c3_w len_w); + u3a_walloc(c3_w len_w); - /* u3_ca_malloc(): allocate storage measured in bytes. + /* u3a_malloc(): allocate storage measured in bytes. */ void* - u3_ca_malloc(c3_w len_w); + u3a_malloc(c3_w len_w); - /* u3_ca_free(): free storage. + /* u3a_free(): free storage. */ void - u3_ca_free(void* lag_v); + u3a_free(void* lag_v); - /* u3_ca_wealloc(): word realloc. + /* u3a_wealloc(): word realloc. */ void* - u3_ca_wealloc(void* lag_v, c3_w len_w); + u3a_wealloc(void* lag_v, c3_w len_w); - /* u3_ca_realloc(): byte realloc. + /* u3a_realloc(): byte realloc. */ void* - u3_ca_realloc(void* lag_v, c3_w len_w); + u3a_realloc(void* lag_v, c3_w len_w); /* Reference and arena control. */ - /* u3_ca_gain(): gain a reference count in normal space. + /* u3a_gain(): gain a reference count in normal space. */ u3_weak - u3_ca_gain(u3_weak som); + u3a_gain(u3_weak som); - /* u3_ca_take(): gain, copying juniors. + /* u3a_take(): gain, copying juniors. */ u3_noun - u3_ca_take(u3_noun som); + u3a_take(u3_noun som); - /* u3_ca_left(): true of junior if preserved. + /* u3a_left(): true of junior if preserved. */ c3_o - u3_ca_left(u3_noun som); + u3a_left(u3_noun som); - /* u3_ca_lose(): lose a reference. + /* u3a_lose(): lose a reference. */ void - u3_ca_lose(u3_weak som); + u3a_lose(u3_weak som); - /* u3_ca_wash(): wash all lazy mugs in subtree. RETAIN. + /* u3a_wash(): wash all lazy mugs in subtree. RETAIN. */ void - u3_ca_wash(u3_noun som); + u3a_wash(u3_noun som); - /* u3_ca_use(): reference count. + /* u3a_use(): reference count. */ c3_w - u3_ca_use(u3_noun som); + u3a_use(u3_noun som); - /* u3_ca_mark_ptr(): mark a pointer for gc. Produce size. + /* u3a_mark_ptr(): mark a pointer for gc. Produce size. */ c3_w - u3_ca_mark_ptr(void* ptr_v); + u3a_mark_ptr(void* ptr_v); - /* u3_ca_mark_noun(): mark a noun for gc. Produce size. + /* u3a_mark_noun(): mark a noun for gc. Produce size. */ c3_w - u3_ca_mark_noun(u3_noun som); + u3a_mark_noun(u3_noun som); - /* u3_ca_sweep(): sweep a fully marked road. + /* u3a_sweep(): sweep a fully marked road. */ void - u3_ca_sweep(c3_c* cap_c); + u3a_sweep(c3_c* cap_c); - /* u3_ca_sane(): check allocator sanity. + /* u3a_sane(): check allocator sanity. */ void - u3_ca_sane(void); + u3a_sane(void); - /* u3_ca_detect(): axis (som) is referenced from (fum). + /* u3a_detect(): axis (som) is referenced from (fum). ** ** (som) and (fum) are both RETAINED. */ c3_d - u3_ca_detect(u3_noun fum, u3_noun som); + u3a_detect(u3_noun fum, u3_noun som); - /* u3_ca_lush(): leak push. + /* u3a_lush(): leak push. */ c3_w - u3_ca_lush(c3_w lab_w); + u3a_lush(c3_w lab_w); - /* u3_ca_lop(): leak pop. + /* u3a_lop(): leak pop. */ void - u3_ca_lop(c3_w lab_w); + u3a_lop(c3_w lab_w); - /* u3_ca_print_memory: print memory amount. + /* u3a_print_memory: print memory amount. */ void - u3_ca_print_memory(c3_c* cap_c, c3_w wor_w); + u3a_print_memory(c3_c* cap_c, c3_w wor_w); /* Atoms from proto-atoms. */ - /* u3_ca_slab(): create a length-bounded proto-atom. + /* u3a_slab(): create a length-bounded proto-atom. */ c3_w* - u3_ca_slab(c3_w len_w); + u3a_slab(c3_w len_w); - /* u3_ca_slaq(): u3_ca_slaq() with a defined blocksize. + /* u3a_slaq(): u3a_slaq() with a defined blocksize. */ c3_w* - u3_ca_slaq(c3_g met_g, c3_w len_w); + u3a_slaq(c3_g met_g, c3_w len_w); - /* u3_ca_malt(): measure and finish a proto-atom. + /* u3a_malt(): measure and finish a proto-atom. */ u3_noun - u3_ca_malt(c3_w* sal_w); + u3a_malt(c3_w* sal_w); - /* u3_ca_moot(): finish a pre-measured proto-atom; dangerous. + /* u3a_moot(): finish a pre-measured proto-atom; dangerous. */ u3_noun - u3_ca_moot(c3_w* sal_w); + u3a_moot(c3_w* sal_w); - /* u3_ca_mint(): finish a measured proto-atom. + /* u3a_mint(): finish a measured proto-atom. */ u3_noun - u3_ca_mint(c3_w* sal_w, c3_w len_w); + u3a_mint(c3_w* sal_w, c3_w len_w); diff --git a/i/g/e.h b/i/g/e.h index 6124475c44..b406322bd8 100644 --- a/i/g/e.h +++ b/i/g/e.h @@ -4,87 +4,87 @@ */ /** Data structures. **/ - /* u3_ce_line: control line. + /* u3e_line: control line. */ - typedef struct _u3_ce_line { + typedef struct _u3e_line { c3_w pag_w; c3_w mug_w; - } u3_ce_line; + } u3e_line; - /* u3_ce_control: memory change, control file. + /* u3e_control: memory change, control file. */ - typedef struct _u3_ce_control { + typedef struct _u3e_control { c3_d evt_d; // event number c3_w nor_w; // new page count north c3_w sou_w; // new page count south c3_w pgs_w; // number of changed pages - u3_ce_line mem_u[0]; // per page - } u3_ce_control; + u3e_line mem_u[0]; // per page + } u3e_control; /* u3_cs_patch: memory change, top level. */ typedef struct _u3_cs_patch { c3_i ctl_i; c3_i mem_i; - u3_ce_control* con_u; + u3e_control* con_u; } u3_cs_patch; - /* u3_ce_image: memory segment, open file. + /* u3e_image: memory segment, open file. */ - typedef struct _u3_ce_image { + typedef struct _u3e_image { c3_c* nam_c; // segment name c3_i fid_i; // open file, or 0 c3_w pgs_w; // length in pages - } u3_ce_image; + } u3e_image; - /* u3_ce_pool: entire memory system. + /* u3e_pool: entire memory system. */ - typedef struct _u3_ce_pool { + typedef struct _u3e_pool { c3_c* cpu_c; // path to c3_d evt_d; // last patch written at event - c3_w dit_w[u3_ca_pages >> 5]; // touched since last save - u3_ce_image nor_u; // north segment - u3_ce_image sou_u; // south segment - } u3_ce_pool; + c3_w dit_w[u3a_pages >> 5]; // touched since last save + u3e_image nor_u; // north segment + u3e_image sou_u; // south segment + } u3e_pool; /** Globals. **/ /* u3_Pool / u3P: global memory control. */ - c3_global u3_ce_pool u3_Pool; + c3_global u3e_pool u3_Pool; # define u3P u3_Pool /** Functions. **/ - /* u3_ce_fault(): handle a memory event with libsigsegv protocol. + /* u3e_fault(): handle a memory event with libsigsegv protocol. */ c3_i - u3_ce_fault(void* adr_v, c3_i ser_i); + u3e_fault(void* adr_v, c3_i ser_i); - /* u3_ce_save(): + /* u3e_save(): */ void - u3_ce_save(void); + u3e_save(void); - /* u3_ce_boot(): start the memory system. + /* u3e_boot(): start the memory system. */ void - u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c); + u3e_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c); - /* u3_ce_init(): start the environment, with/without checkpointing. + /* u3e_init(): start the environment, with/without checkpointing. */ void - u3_ce_init(c3_o chk_o); + u3e_init(c3_o chk_o); - /* u3_ce_grab(): garbage-collect the world, plus extra roots. + /* u3e_grab(): garbage-collect the world, plus extra roots. */ void - u3_ce_grab(c3_c* cap_c, u3_noun som, ...); // terminate with u3_none + u3e_grab(c3_c* cap_c, u3_noun som, ...); // terminate with u3_none - /* u3_ce_dirty(): count dirty pages. + /* u3e_dirty(): count dirty pages. */ c3_w - u3_ce_dirty(void); + u3e_dirty(void); diff --git a/i/g/h.h b/i/g/h.h index 14c8e512fd..91fe72bff4 100644 --- a/i/g/h.h +++ b/i/g/h.h @@ -15,10 +15,10 @@ *** clock-algorithm reclamation policy, not yet implemented. *** Search "clock algorithm" to figure it out. **/ - /* u3_ch_slot: map slot. + /* u3h_slot: map slot. ** ** Either a key-value cell or a loom offset, decoded as a pointer - ** to a u3_ch_node. Matches the u3_noun format - coordinate with + ** to a u3h_node. Matches the u3_noun format - coordinate with ** meme.h. The top two bits are: ** ** 00 - empty (in the root table only) @@ -26,95 +26,95 @@ ** 02 - entry, stale ** 03 - entry, fresh */ - typedef c3_w u3_ch_slot; + typedef c3_w u3h_slot; - /* u3_ch_node: map node. + /* u3h_node: map node. */ typedef struct { c3_w map_w; - u3_ch_slot sot_w[0]; - } u3_ch_node; + u3h_slot sot_w[0]; + } u3h_node; - /* u3_ch_root: hash root table, with future-proof clock. + /* u3h_root: hash root table, with future-proof clock. */ typedef struct { c3_w clk_w; - u3_ch_slot sot_w[64]; - } u3_ch_root; + u3h_slot sot_w[64]; + } u3h_root; - /* u3_ch_buck: bottom bucket. + /* u3h_buck: bottom bucket. */ typedef struct { c3_w len_w; u3_noun kev[0]; - } u3_ch_buck; + } u3h_buck; /** HAMT macros. *** *** Coordinate with u3_noun definition! **/ - /* u3_ch_slot_is_null(): yes iff slot is empty - ** u3_ch_slot_is_noun(): yes iff slot contains a key/value cell - ** u3_ch_slot_is_node(): yes iff slot contains a subtable/bucket - ** u3_ch_slot_is_warm(): yes iff fresh bit is set - ** u3_ch_slot_to_node(): slot to node pointer - ** u3_ch_node_to_slot(): node pointer to slot - ** u3_ch_slot_to_noun(): slot to cell - ** u3_ch_noun_to_slot(): cell to slot + /* u3h_slot_is_null(): yes iff slot is empty + ** u3h_slot_is_noun(): yes iff slot contains a key/value cell + ** u3h_slot_is_node(): yes iff slot contains a subtable/bucket + ** u3h_slot_is_warm(): yes iff fresh bit is set + ** u3h_slot_to_node(): slot to node pointer + ** u3h_node_to_slot(): node pointer to slot + ** u3h_slot_to_noun(): slot to cell + ** u3h_noun_to_slot(): cell to slot */ -# define u3_ch_slot_is_null(sot) ((0 == ((sot) >> 30)) ? c3y : c3n) -# define u3_ch_slot_is_node(sot) ((1 == ((sot) >> 30)) ? c3y : c3n) -# define u3_ch_slot_is_noun(sot) ((1 == ((sot) >> 31)) ? c3y : c3n) -# define u3_ch_slot_is_warm(sot) (((sot) & 0x40000000) ? c3y : c3n) -# define u3_ch_slot_to_node(sot) (u3_ca_into((sot) & 0x3fffffff)) -# define u3_ch_node_to_slot(ptr) (u3_ca_outa(ptr) | 0x40000000) -# define u3_ch_slot_to_noun(sot) (0x40000000 | (sot)) -# define u3_ch_noun_to_slot(som) (som) -# define u3_ch_noun_be_warm(sot) ((sot) | 0x40000000) -# define u3_ch_noun_be_cold(sot) ((sot) & ~0x40000000) +# define u3h_slot_is_null(sot) ((0 == ((sot) >> 30)) ? c3y : c3n) +# define u3h_slot_is_node(sot) ((1 == ((sot) >> 30)) ? c3y : c3n) +# define u3h_slot_is_noun(sot) ((1 == ((sot) >> 31)) ? c3y : c3n) +# define u3h_slot_is_warm(sot) (((sot) & 0x40000000) ? c3y : c3n) +# define u3h_slot_to_node(sot) (u3a_into((sot) & 0x3fffffff)) +# define u3h_node_to_slot(ptr) (u3a_outa(ptr) | 0x40000000) +# define u3h_slot_to_noun(sot) (0x40000000 | (sot)) +# define u3h_noun_to_slot(som) (som) +# define u3h_noun_be_warm(sot) ((sot) | 0x40000000) +# define u3h_noun_be_cold(sot) ((sot) & ~0x40000000) /** Functions. *** *** Needs: delete and merge functions; clock reclamation function. **/ - /* u3_ch_new(): create hashtable. + /* u3h_new(): create hashtable. */ - u3p(u3_ch_root) - u3_ch_new(void); + u3p(u3h_root) + u3h_new(void); - /* u3_ch_put(): insert in hashtable. + /* u3h_put(): insert in hashtable. ** ** `key` is RETAINED; `val` is transferred. */ void - u3_ch_put(u3p(u3_ch_root) har_p, u3_noun key, u3_noun val); + u3h_put(u3p(u3h_root) har_p, u3_noun key, u3_noun val); - /* u3_ch_get(): read from hashtable. + /* u3h_get(): read from hashtable. ** ** `key` is RETAINED. */ u3_weak - u3_ch_get(u3p(u3_ch_root) har_p, u3_noun key); + u3h_get(u3p(u3h_root) har_p, u3_noun key); - /* u3_ch_gut(): read from hashtable, unifying key nouns. + /* u3h_gut(): read from hashtable, unifying key nouns. ** ** `key` is RETAINED. */ u3_weak - u3_ch_gut(u3p(u3_ch_root) har_p, u3_noun key); + u3h_gut(u3p(u3h_root) har_p, u3_noun key); - /* u3_ch_free(): free hashtable. + /* u3h_free(): free hashtable. */ void - u3_ch_free(u3p(u3_ch_root) har_p); + u3h_free(u3p(u3h_root) har_p); - /* u3_ch_mark(): mark hashtable for gc. + /* u3h_mark(): mark hashtable for gc. */ void - u3_ch_mark(u3p(u3_ch_root) har_p); + u3h_mark(u3p(u3h_root) har_p); - /* u3_ch_walk(): traverse hashtable with key, value fn; RETAINS. + /* u3h_walk(): traverse hashtable with key, value fn; RETAINS. */ void - u3_ch_walk(u3p(u3_ch_root) har_p, void (*fun_f)(u3_noun)); + u3h_walk(u3p(u3h_root) har_p, void (*fun_f)(u3_noun)); diff --git a/i/g/i.h b/i/g/i.h index 132b0808c1..404204a748 100644 --- a/i/g/i.h +++ b/i/g/i.h @@ -4,83 +4,83 @@ */ /* General constructors. */ - /* u3_ci_words(): + /* u3i_words(): ** ** Copy [a] words from [b] into an atom. */ u3_noun - u3_ci_words(c3_w a_w, + u3i_words(c3_w a_w, const c3_w* b_w); - /* u3_ci_bytes(): + /* u3i_bytes(): ** ** Copy `a` bytes from `b` to an LSB first atom. */ u3_noun - u3_ci_bytes(c3_w a_w, + u3i_bytes(c3_w a_w, const c3_y* b_y); - /* u3_ci_mp(): + /* u3i_mp(): ** ** Copy the GMP integer `a` into an atom, and clear it. */ u3_noun - u3_ci_mp(mpz_t a_mp); + u3i_mp(mpz_t a_mp); - /* u3_ci_vint(): + /* u3i_vint(): ** ** Create `a + 1`. */ u3_noun - u3_ci_vint(u3_noun a); + u3i_vint(u3_noun a); - /* u3_ci_cell(): + /* u3i_cell(): ** ** Produce the cell `[a b]`. */ u3_noun - u3_ci_cell(u3_noun a, u3_noun b); + u3i_cell(u3_noun a, u3_noun b); - /* u3_ci_trel(): + /* u3i_trel(): ** ** Produce the triple `[a b c]`. */ u3_noun - u3_ci_trel(u3_noun a, u3_noun b, u3_noun c); + u3i_trel(u3_noun a, u3_noun b, u3_noun c); - /* u3_ci_qual(): + /* u3i_qual(): ** ** Produce the cell `[a b c d]`. */ u3_noun - u3_ci_qual(u3_noun a, u3_noun b, u3_noun c, u3_noun d); + u3i_qual(u3_noun a, u3_noun b, u3_noun c, u3_noun d); - /* u3_ci_string(): + /* u3i_string(): ** ** Produce an LSB-first atom from the C string `a`. */ u3_noun - u3_ci_string(const c3_c* a_c); + u3i_string(const c3_c* a_c); - /* u3_ci_molt(): + /* u3i_molt(): ** ** Mutate `som` with a 0-terminated list of axis, noun pairs. ** Axes must be cats (31 bit). */ u3_noun - u3_ci_molt(u3_noun som, ...); + u3i_molt(u3_noun som, ...); - /* u3_ci_chubs(): + /* u3i_chubs(): ** ** Construct `a` double-words from `b`, LSD first, as an atom. */ u3_atom - u3_ci_chubs(c3_w a_w, + u3i_chubs(c3_w a_w, const c3_d* b_d); - /* u3_ci_tape(): from a C string, to a list of bytes. + /* u3i_tape(): from a C string, to a list of bytes. */ u3_atom - u3_ci_tape(const c3_c* txt_c); + u3i_tape(const c3_c* txt_c); diff --git a/i/g/j.h b/i/g/j.h index 464185913e..60ea0099d9 100644 --- a/i/g/j.h +++ b/i/g/j.h @@ -62,9 +62,9 @@ *** *** All of these are transient structures allocated with malloc. **/ - /* u3_ce_harm: jet arm. + /* u3e_harm: jet arm. */ - typedef struct _u3_ce_harm { + typedef struct _u3e_harm { c3_c* fcs_c; // `.axe` or name u3_noun (*fun_f)(u3_noun); // compute or 0 / semitransfer // u3_bean (*val_f)(u3_noun); // validate or 0 / retain @@ -72,99 +72,99 @@ c3_o tot; // total (never punts) c3_o liv; // live (enabled) c3_l axe_l; // computed/discovered axis - struct _u3_ce_core* cop_u; // containing core - } u3_ce_harm; + struct _u3e_core* cop_u; // containing core + } u3e_harm; - /* u3_ce_core: driver definition. + /* u3e_core: driver definition. */ - typedef struct _u3_ce_core { + typedef struct _u3e_core { c3_c* cos_c; // control string - struct _u3_ce_harm* arm_u; // blank-terminated static list - struct _u3_ce_core* dev_u; // blank-terminated static list - struct _u3_ce_core* par_u; // dynamic parent pointer + struct _u3e_harm* arm_u; // blank-terminated static list + struct _u3e_core* dev_u; // blank-terminated static list + struct _u3e_core* par_u; // dynamic parent pointer c3_l axe_l; // axis to parent c3_l jax_l; // index in global dashboard - } u3_ce_core; + } u3e_core; - /* u3_ce_dash, u3_Dash, u3D: jet dashboard singleton + /* u3e_dash, u3_Dash, u3D: jet dashboard singleton */ - typedef struct _u3_ce_dash { - u3_ce_core* dev_u; // null-terminated static list + typedef struct _u3e_dash { + u3e_core* dev_u; // null-terminated static list c3_l len_l; // dynamic array length c3_l all_l; // allocated length - u3_ce_core* ray_u; // dynamic array by axis - } u3_ce_dash; + u3e_core* ray_u; // dynamic array by axis + } u3e_dash; /** Globals. **/ /* u3_Dash: jet dashboard. */ - extern u3_ce_dash u3_Dash; + extern u3e_dash u3_Dash; # define u3D u3_Dash /** Functions. **/ - /* u3_cj_boot(): initialize jet system. + /* u3j_boot(): initialize jet system. */ void - u3_cj_boot(void); + u3j_boot(void); - /* u3_cj_clear(): clear jet table to re-register. + /* u3j_clear(): clear jet table to re-register. */ void - u3_cj_clear(void); + u3j_clear(void); - /* u3_cj_hook(): + /* u3j_hook(): ** ** Execute hook from core. */ u3_noun - u3_cj_hook(u3_noun cor, + u3j_hook(u3_noun cor, const c3_c* tam_c); - /* u3_cj_soft(): + /* u3j_soft(): ** ** Execute hook from core, without jet. */ u3_noun - u3_cj_soft(u3_noun cor, + u3j_soft(u3_noun cor, const c3_c* tam_c); - /* u3_cj_find(): battery to driver number, or 0. + /* u3j_find(): battery to driver number, or 0. ** ** `bat` is RETAINED by the caller. */ c3_l - u3_cj_find(u3_noun bat); + u3j_find(u3_noun bat); - /* u3_cj_kick(): try to kick by jet. If no kick, produce u3_none. + /* u3j_kick(): try to kick by jet. If no kick, produce u3_none. ** ** `axe` is RETAINED by the caller; `cor` is RETAINED iff there ** is no kick, TRANSFERRED if one. */ u3_weak - u3_cj_kick(u3_noun cor, + u3j_kick(u3_noun cor, u3_noun axe); - /* u3_cj_kink(): kick either by jet or by nock. + /* u3j_kink(): kick either by jet or by nock. */ u3_noun - u3_cj_kink(u3_noun cor, + u3j_kink(u3_noun cor, u3_noun axe); - /* u3_cj_mine(): register core for jets. + /* u3j_mine(): register core for jets. */ void - u3_cj_mine(u3_noun clu, + u3j_mine(u3_noun clu, u3_noun cor); - /* u3_cj_ream(): refresh after restoring from checkpoint. + /* u3j_ream(): refresh after restoring from checkpoint. */ void - u3_cj_ream(void); + u3j_ream(void); - /* u3_cj_reap(): promote jet state. RETAINS. + /* u3j_reap(): promote jet state. RETAINS. */ void - u3_cj_reap(u3_noun das, u3p(u3_ch_root) har_p); + u3j_reap(u3_noun das, u3p(u3h_root) har_p); diff --git a/i/g/m.h b/i/g/m.h index 21e873d13c..f68745a4a5 100644 --- a/i/g/m.h +++ b/i/g/m.h @@ -4,26 +4,26 @@ */ /** System management. **/ - /* u3_cm_boot(): set up top-level road. + /* u3m_boot(): set up top-level road. */ void - u3_cm_boot(c3_o nuu_o, c3_o bug_o); + u3m_boot(c3_o nuu_o, c3_o bug_o); - /* u3_cm_trap(): setjmp within road. + /* u3m_trap(): setjmp within road. */ #if 0 c3_o - u3_cm_trap(void); + u3m_trap(void); #else -# define u3_cm_trap() (u3_noun)(setjmp(u3R->esc.buf)) +# define u3m_trap() (u3_noun)(setjmp(u3R->esc.buf)) #endif - /* u3_cm_signal(): treat a nock-level exception as a signal interrupt. + /* u3m_signal(): treat a nock-level exception as a signal interrupt. */ void - u3_cm_signal(u3_noun sig_l); + u3m_signal(u3_noun sig_l); - /* u3_cm_bail(): bail out. Does not return. + /* u3m_bail(): bail out. Does not return. ** ** Bail motes: ** @@ -36,138 +36,138 @@ ** %meme :: out of memory */ c3_i - u3_cm_bail(c3_m how_m); + u3m_bail(c3_m how_m); - /* u3_cm_dump(): dump the current road to stderr. + /* u3m_dump(): dump the current road to stderr. */ void - u3_cm_dump(void); + u3m_dump(void); - /* u3_cm_file(): load file, as atom, or bail. + /* u3m_file(): load file, as atom, or bail. */ u3_noun - u3_cm_file(c3_c* pas_c); + u3m_file(c3_c* pas_c); - /* u3_cm_clear(): clear all allocated data in road. + /* u3m_clear(): clear all allocated data in road. */ void - u3_cm_clear(void); + u3m_clear(void); - /* u3_cm_mark(): mark all nouns in the road. + /* u3m_mark(): mark all nouns in the road. */ void - u3_cm_mark(void); + u3m_mark(void); - /* u3_cm_error(): bail out with %exit, ct_pushing error. + /* u3m_error(): bail out with %exit, ct_pushing error. */ c3_i - u3_cm_error(c3_c* str_c); + u3m_error(c3_c* str_c); - /* u3_cm_check(): checkpoint memory to file. Asserts u3R == u3H. + /* u3m_check(): checkpoint memory to file. Asserts u3R == u3H. */ void - u3_cm_check(void); + u3m_check(void); - /* u3_cm_fall(): return to parent road. + /* u3m_fall(): return to parent road. */ void - u3_cm_fall(void); + u3m_fall(void); - /* u3_cm_hate(): new, integrated leap mechanism (enter). + /* u3m_hate(): new, integrated leap mechanism (enter). */ void - u3_cm_hate(c3_w pad_w); + u3m_hate(c3_w pad_w); - /* u3_cm_love(): return product from leap. + /* u3m_love(): return product from leap. */ u3_noun - u3_cm_love(u3_noun pro); + u3m_love(u3_noun pro); - /* u3_cm_leap(): in u3R, create a new road within the existing one. + /* u3m_leap(): in u3R, create a new road within the existing one. */ void - u3_cm_leap(c3_w pad_w); + u3m_leap(c3_w pad_w); - /* u3_cm_golf(): record cap length for u3_flog(). + /* u3m_golf(): record cap length for u3_flog(). */ c3_w - u3_cm_golf(void); + u3m_golf(void); - /* u3_cm_flog(): pop the cap. + /* u3m_flog(): pop the cap. ** ** A common sequence for inner allocation is: ** - ** c3_w gof_w = u3_cm_golf(); - ** u3_cm_leap(); + ** c3_w gof_w = u3m_golf(); + ** u3m_leap(); ** // allocate some inner stuff... - ** u3_cm_fall(); + ** u3m_fall(); ** // inner stuff is still valid, but on cap - ** u3_cm_flog(gof_w); + ** u3m_flog(gof_w); ** - ** u3_cm_flog(0) simply clears the cap. + ** u3m_flog(0) simply clears the cap. */ void - u3_cm_flog(c3_w gof_w); + u3m_flog(c3_w gof_w); - /* u3_cm_soft(): system soft wrapper. unifies unix and nock errors. + /* u3m_soft(): system soft wrapper. unifies unix and nock errors. ** ** Produces [%$ result] or [%error (list tank)]. */ u3_noun - u3_cm_soft(c3_w sec_w, u3_funk fun_f, u3_noun arg); + u3m_soft(c3_w sec_w, u3_funk fun_f, u3_noun arg); - /* u3_cm_soft_top(): top-level safety wrapper. + /* u3m_soft_top(): top-level safety wrapper. */ u3_noun - u3_cm_soft_top(c3_w sec_w, // timer seconds + u3m_soft_top(c3_w sec_w, // timer seconds c3_w pad_w, // base memory pad u3_funk fun_f, u3_noun arg); - /* u3_cm_soft_slam: top-level call. + /* u3m_soft_slam: top-level call. */ u3_noun - u3_cm_soft_slam(u3_noun gat, u3_noun sam); + u3m_soft_slam(u3_noun gat, u3_noun sam); - /* u3_cm_soft_sure(): top-level call assumed correct. + /* u3m_soft_sure(): top-level call assumed correct. */ u3_noun - u3_cm_soft_sure(u3_funk fun_f, u3_noun arg); + u3m_soft_sure(u3_funk fun_f, u3_noun arg); - /* u3_cm_soft_run(): descend into virtualization context. + /* u3m_soft_run(): descend into virtualization context. */ u3_noun - u3_cm_soft_run(u3_noun fly, + u3m_soft_run(u3_noun fly, u3_funq fun_f, u3_noun aga, u3_noun agb); - /* u3_cm_soft_esc(): namespace lookup to (unit ,*). + /* u3m_soft_esc(): namespace lookup to (unit ,*). */ u3_noun - u3_cm_soft_esc(u3_noun sam); + u3m_soft_esc(u3_noun sam); - /* u3_cm_water(): produce high and low watermarks. Asserts u3R == u3H. + /* u3m_water(): produce high and low watermarks. Asserts u3R == u3H. */ void - u3_cm_water(c3_w *low_w, c3_w *hig_w); + u3m_water(c3_w *low_w, c3_w *hig_w); - /* u3_cm_pretty(): dumb prettyprint to string. RETAIN. + /* u3m_pretty(): dumb prettyprint to string. RETAIN. */ c3_c* - u3_cm_pretty(u3_noun som); + u3m_pretty(u3_noun som); - /* u3_cm_p(): dumb print with caption. RETAIN. + /* u3m_p(): dumb print with caption. RETAIN. */ void - u3_cm_p(const c3_c* cap_c, u3_noun som); + u3m_p(const c3_c* cap_c, u3_noun som); - /* u3_cm_tape(): dump a tape to stdout. + /* u3m_tape(): dump a tape to stdout. */ void - u3_cm_tape(u3_noun tep); + u3m_tape(u3_noun tep); - /* u3_cm_wall(): dump a wall to stdout. + /* u3m_wall(): dump a wall to stdout. */ void - u3_cm_wall(u3_noun wol); + u3m_wall(u3_noun wol); diff --git a/i/g/n.h b/i/g/n.h index 6b9e3eb7cb..8599d9486d 100644 --- a/i/g/n.h +++ b/i/g/n.h @@ -4,42 +4,42 @@ */ /** Functions. **/ - /* u3_cn_nock_on(): produce .*(bus fol). + /* u3n_nock_on(): produce .*(bus fol). */ u3_noun - u3_cn_nock_on(u3_noun bus, u3_noun fol); + u3n_nock_on(u3_noun bus, u3_noun fol); - /* u3_cn_slam_on(): produce (gat sam). + /* u3n_slam_on(): produce (gat sam). */ u3_noun - u3_cn_slam_on(u3_noun gat, u3_noun sam); + u3n_slam_on(u3_noun gat, u3_noun sam); - /* u3_cn_kick_on(): fire `gat` without changing the sample. + /* u3n_kick_on(): fire `gat` without changing the sample. */ u3_noun - u3_cn_kick_on(u3_noun gat); + u3n_kick_on(u3_noun gat); - /* u3_cn_nock_un(): produce .*(bus fol), as ++toon. + /* u3n_nock_un(): produce .*(bus fol), as ++toon. */ u3_noun - u3_cn_nock_un(u3_noun bus, u3_noun fol); + u3n_nock_un(u3_noun bus, u3_noun fol); - /* u3_cn_slam_un(): produce (gat sam), as ++toon. + /* u3n_slam_un(): produce (gat sam), as ++toon. */ u3_noun - u3_cn_slam_un(u3_noun gat, u3_noun sam); + u3n_slam_un(u3_noun gat, u3_noun sam); - /* u3_cn_nock_in(): produce .*(bus fol), as ++toon, in namespace. + /* u3n_nock_in(): produce .*(bus fol), as ++toon, in namespace. */ u3_noun - u3_cn_nock_in(u3_noun fly, u3_noun bus, u3_noun fol); + u3n_nock_in(u3_noun fly, u3_noun bus, u3_noun fol); - /* u3_cn_slam_in(): produce (gat sam), as ++toon, in namespace. + /* u3n_slam_in(): produce (gat sam), as ++toon, in namespace. */ u3_noun - u3_cn_slam_in(u3_noun fly, u3_noun gat, u3_noun sam); + u3n_slam_in(u3_noun fly, u3_noun gat, u3_noun sam); - /* u3_cn_nock_an(): as slam_in(), but with empty fly. + /* u3n_nock_an(): as slam_in(), but with empty fly. */ u3_noun - u3_cn_nock_an(u3_noun bus, u3_noun fol); + u3n_nock_an(u3_noun bus, u3_noun fol); diff --git a/i/g/r.h b/i/g/r.h index 47868895bf..a089031f18 100644 --- a/i/g/r.h +++ b/i/g/r.h @@ -2,318 +2,318 @@ ** ** This file is in the public domain. */ - /** u3_cr_*: read without ever crashing. + /** u3r_*: read without ever crashing. **/ #if 1 -# define u3_cr_du(a) u3_ca_is_cell(a) -# define u3_cr_ud(a) u3_ca_is_atom(a) +# define u3r_du(a) u3a_is_cell(a) +# define u3r_ud(a) u3a_is_atom(a) #else - /* u3_cr_du(): c3y iff `a` is cell. + /* u3r_du(): c3y iff `a` is cell. */ u3_bean - u3_cr_du(u3_noun a); + u3r_du(u3_noun a); - /* u3_cr_ud(): c3n iff `a` is cell. + /* u3r_ud(): c3n iff `a` is cell. */ u3_bean - u3_cr_ud(u3_noun a); + u3r_ud(u3_noun a); #endif - /* u3_cr_at(): fragment `a` of `b`, or u3_none. + /* u3r_at(): fragment `a` of `b`, or u3_none. */ u3_weak - u3_cr_at(u3_atom a, + u3r_at(u3_atom a, u3_weak b); - /* u3_cr_mean(): + /* u3r_mean(): ** ** Attempt to deconstruct `a` by axis, noun pairs; 0 terminates. ** Axes must be sorted in tree order. */ u3_bean - u3_cr_mean(u3_noun a, + u3r_mean(u3_noun a, ...); - /* u3_cr_mug(): + /* u3r_mug(): ** ** Compute and/or recall the mug (31-bit hash) of (a). */ c3_w - u3_cr_mug(u3_noun a); + u3r_mug(u3_noun a); - /* u3_cr_mug_string(): + /* u3r_mug_string(): ** ** Compute the mug of `a`, LSB first. */ c3_w - u3_cr_mug_string(const c3_c *a_c); + u3r_mug_string(const c3_c *a_c); - /* u3_cr_mug_words(): + /* u3r_mug_words(): ** ** Compute the mug of `buf`, `len`, LSW first. */ c3_w - u3_cr_mug_words(const c3_w *buf_w, + u3r_mug_words(const c3_w *buf_w, c3_w len_w); - /* u3_cr_mug_cell(): + /* u3r_mug_cell(): ** ** Compute the mug of `[a b]`. */ c3_w - u3_cr_mug_cell(u3_noun a, + u3r_mug_cell(u3_noun a, u3_noun b); - /* u3_cr_mug_trel(): + /* u3r_mug_trel(): ** ** Compute the mug of `[a b c]`. */ c3_w - u3_cr_mug_trel(u3_noun a, + u3r_mug_trel(u3_noun a, u3_noun b, u3_noun c); - /* u3_cr_mug_qual(): + /* u3r_mug_qual(): ** ** Compute the mug of `[a b c d]`. */ c3_w - u3_cr_mug_qual(u3_noun a, + u3r_mug_qual(u3_noun a, u3_noun b, u3_noun c, u3_noun d); - /* u3_cr_mug_both(): + /* u3r_mug_both(): ** ** Join two mugs. */ c3_w - u3_cr_mug_both(c3_w a_w, + u3r_mug_both(c3_w a_w, c3_w b_w); - /* u3_cr_fing(): + /* u3r_fing(): ** ** Yes iff (a) and (b) are the same copy of the same noun. - ** (Ie, by pointer equality - u3_cr_sing with false negatives.) + ** (Ie, by pointer equality - u3r_sing with false negatives.) */ u3_bean - u3_cr_fing(u3_noun a, + u3r_fing(u3_noun a, u3_noun b); - /* u3_cr_fing_cell(): + /* u3r_fing_cell(): ** ** Yes iff `[p q]` and `b` are the same copy of the same noun. */ u3_bean - u3_cr_fing_cell(u3_noun p, + u3r_fing_cell(u3_noun p, u3_noun q, u3_noun b); - /* u3_cr_fing_mixt(): + /* u3r_fing_mixt(): ** ** Yes iff `[p q]` and `b` are the same copy of the same noun. */ u3_bean - u3_cr_fing_mixt(const c3_c* p_c, + u3r_fing_mixt(const c3_c* p_c, u3_noun q, u3_noun b); - /* u3_cr_fing_trel(): + /* u3r_fing_trel(): ** ** Yes iff `[p q r]` and `b` are the same copy of the same noun. */ u3_bean - u3_cr_fing_trel(u3_noun p, + u3r_fing_trel(u3_noun p, u3_noun q, u3_noun r, u3_noun b); - /* u3_cr_fing_qual(): + /* u3r_fing_qual(): ** ** Yes iff `[p q r s]` and `b` are the same copy of the same noun. */ u3_bean - u3_cr_fing_qual(u3_noun p, + u3r_fing_qual(u3_noun p, u3_noun q, u3_noun r, u3_noun s, u3_noun b); - /* u3_cr_sing(): + /* u3r_sing(): ** ** Yes iff (a) and (b) are the same noun. */ u3_bean - u3_cr_sing(u3_noun a, + u3r_sing(u3_noun a, u3_noun b); - /* u3_cr_sung(): yes iff (a) and (b) are the same noun, unifying equals. + /* u3r_sung(): yes iff (a) and (b) are the same noun, unifying equals. ** ** Make sure you have no live, uncounted pointers to any noun ** within (a) or (b)! */ u3_bean - u3_cr_sung(u3_noun a, + u3r_sung(u3_noun a, u3_noun b); - /* u3_cr_sing_c): + /* u3r_sing_c): ** ** Yes iff (b) is the same noun as the C string [a]. */ u3_bean - u3_cr_sing_c(const c3_c* a_c, + u3r_sing_c(const c3_c* a_c, u3_noun b); - /* u3_cr_sing_cell(): + /* u3r_sing_cell(): ** ** Yes iff `[p q]` and `b` are the same noun. */ u3_bean - u3_cr_sing_cell(u3_noun p, + u3r_sing_cell(u3_noun p, u3_noun q, u3_noun b); - /* u3_cr_sing_mixt(): + /* u3r_sing_mixt(): ** ** Yes iff `[p q]` and `b` are the same noun. */ u3_bean - u3_cr_sing_mixt(const c3_c* p_c, + u3r_sing_mixt(const c3_c* p_c, u3_noun q, u3_noun b); - /* u3_cr_sing_trel(): + /* u3r_sing_trel(): ** ** Yes iff `[p q r]` and `b` are the same noun. */ u3_bean - u3_cr_sing_trel(u3_noun p, + u3r_sing_trel(u3_noun p, u3_noun q, u3_noun r, u3_noun b); - /* u3_cr_sing_qual(): + /* u3r_sing_qual(): ** ** Yes iff `[p q r s]` and `b` are the same noun. */ u3_bean - u3_cr_sing_qual(u3_noun p, + u3r_sing_qual(u3_noun p, u3_noun q, u3_noun r, u3_noun s, u3_noun b); - /* u3_cr_nord(): + /* u3r_nord(): ** ** Return 0, 1 or 2 if `a` is below, equal to, or above `b`. */ u3_atom - u3_cr_nord(u3_noun a, + u3r_nord(u3_noun a, u3_noun b); - /* u3_cr_mold(): + /* u3r_mold(): ** ** Divide `a` as a mold `[b.[p q] c]`. */ u3_bean - u3_cr_mold(u3_noun a, + u3r_mold(u3_noun a, u3_noun* b, u3_noun* c); - /* u3_cr_cell(): + /* u3r_cell(): ** ** Divide `a` as a cell `[b c]`. */ u3_bean - u3_cr_cell(u3_noun a, + u3r_cell(u3_noun a, u3_noun* b, u3_noun* c); - /* u3_cr_trel(): + /* u3r_trel(): ** ** Divide `a` as a trel `[b c]`. */ u3_bean - u3_cr_trel(u3_noun a, + u3r_trel(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d); - /* u3_cr_qual(): + /* u3r_qual(): ** ** Divide (a) as a qual [b c d e f]. */ u3_bean - u3_cr_qual(u3_noun a, + u3r_qual(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d, u3_noun* e); - /* u3_cr_quil(): + /* u3r_quil(): ** ** Divide (a) as a quil [b c d e f]. */ u3_bean - u3_cr_quil(u3_noun a, + u3r_quil(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d, u3_noun* e, u3_noun* f); - /* u3_cr_p(): + /* u3r_p(): ** ** & [0] if [a] is of the form [b *c]. */ u3_bean - u3_cr_p(u3_noun a, + u3r_p(u3_noun a, u3_noun b, u3_noun* c); - /* u3_cr_bush(): + /* u3r_bush(): ** ** Factor [a] as a bush [b.[p q] c]. */ u3_bean - u3_cr_bush(u3_noun a, + u3r_bush(u3_noun a, u3_noun* b, u3_noun* c); - /* u3_cr_pq(): + /* u3r_pq(): ** ** & [0] if [a] is of the form [b *c d]. */ u3_bean - u3_cr_pq(u3_noun a, + u3r_pq(u3_noun a, u3_noun b, u3_noun* c, u3_noun* d); - /* u3_cr_pqr(): + /* u3r_pqr(): ** ** & [0] if [a] is of the form [b *c *d *e]. */ u3_bean - u3_cr_pqr(u3_noun a, + u3r_pqr(u3_noun a, u3_noun b, u3_noun* c, u3_noun* d, u3_noun* e); - /* u3_cr_pqrs(): + /* u3r_pqrs(): ** ** & [0] if [a] is of the form [b *c *d *e *f]. */ u3_bean - u3_cr_pqrs(u3_noun a, + u3r_pqrs(u3_noun a, u3_noun b, u3_noun* c, u3_noun* d, u3_noun* e, u3_noun* f); - /* u3_cr_met(): + /* u3r_met(): ** ** Return the size of (b) in bits, rounded up to ** (1 << a_y). @@ -321,89 +321,89 @@ ** For example, (a_y == 3) returns the size in bytes. */ c3_w - u3_cr_met(c3_y a_y, + u3r_met(c3_y a_y, u3_atom b); - /* u3_cr_bit(): + /* u3r_bit(): ** ** Return bit (a_w) of (b). */ c3_b - u3_cr_bit(c3_w a_w, + u3r_bit(c3_w a_w, u3_atom b); - /* u3_cr_byte(): + /* u3r_byte(): ** ** Return byte (a_w) of (b). */ c3_y - u3_cr_byte(c3_w a_w, + u3r_byte(c3_w a_w, u3_atom b); - /* u3_cr_bytes(): + /* u3r_bytes(): ** ** Copy bytes (a_w) through (a_w + b_w - 1) from (d) to (c). */ void - u3_cr_bytes(c3_w a_w, + u3r_bytes(c3_w a_w, c3_w b_w, c3_y* c_y, u3_atom d); - /* u3_cr_chop(): + /* u3r_chop(): ** ** Into the bloq space of `met`, from position `fum` for a ** span of `wid`, to position `tou`, XOR from atom `src` ** into ray `dst`. */ void - u3_cr_chop(c3_g met_g, + u3r_chop(c3_g met_g, c3_w fum_w, c3_w wid_w, c3_w tou_w, c3_w* dst_w, u3_atom src); - /* u3_cr_mp(): + /* u3r_mp(): ** ** Copy (b) into (a_mp). */ void - u3_cr_mp(mpz_t a_mp, + u3r_mp(mpz_t a_mp, u3_atom b); - /* u3_cr_word(): + /* u3r_word(): ** ** Return word (a_w) of (b). */ c3_w - u3_cr_word(c3_w a_w, + u3r_word(c3_w a_w, u3_atom b); - /* u3_cr_chub(): + /* u3r_chub(): ** ** Return double-word (a_w) of (b). */ c3_d - u3_cr_chub(c3_w a_w, + u3r_chub(c3_w a_w, u3_atom b); - /* u3_cr_words(): + /* u3r_words(): ** ** Copy words (a_w) through (a_w + b_w - 1) from (d) to (c). */ void - u3_cr_words(c3_w a_w, + u3r_words(c3_w a_w, c3_w b_w, c3_w* c_w, u3_atom d); - /* u3_cr_string(): `a`, a text atom, as malloced C string. + /* u3r_string(): `a`, a text atom, as malloced C string. */ c3_c* - u3_cr_string(u3_atom a); + u3r_string(u3_atom a); - /* u3_cr_tape(): `a`, a list of bytes, as malloced C string. + /* u3r_tape(): `a`, a list of bytes, as malloced C string. */ c3_y* - u3_cr_tape(u3_noun a); + u3r_tape(u3_noun a); diff --git a/i/g/t.h b/i/g/t.h index bafe33cc12..7eea6f181a 100644 --- a/i/g/t.h +++ b/i/g/t.h @@ -4,57 +4,57 @@ */ /** Tracing. **/ - /* u3_ct_push(): push on trace stack. + /* u3t_push(): push on trace stack. */ void - u3_ct_push(u3_noun mon); + u3t_push(u3_noun mon); - /* u3_ct_mean(): push `[%mean roc]` on trace stack. + /* u3t_mean(): push `[%mean roc]` on trace stack. */ void - u3_ct_mean(u3_noun roc); + u3t_mean(u3_noun roc); - /* u3_ct_drop(): drop from meaning stack. + /* u3t_drop(): drop from meaning stack. */ void - u3_ct_drop(void); + u3t_drop(void); - /* u3_ct_slog(): print directly. + /* u3t_slog(): print directly. */ void - u3_ct_slog(u3_noun hod); + u3t_slog(u3_noun hod); - /* u3_ct_heck(): profile point. + /* u3t_heck(): profile point. */ void - u3_ct_heck(u3_atom cog); + u3t_heck(u3_atom cog); - /* u3_ct_samp(): sample. + /* u3t_samp(): sample. */ void - u3_ct_samp(void); + u3t_samp(void); - /* u3_ct_come(): push on profile stack. + /* u3t_come(): push on profile stack. */ void - u3_ct_come(u3_atom cog); + u3t_come(u3_atom cog); - /* u3_ct_flee(): pop off profile stack. + /* u3t_flee(): pop off profile stack. */ void - u3_ct_flee(void); + u3t_flee(void); - /* u3_ct_damp(): print and clear profile data. + /* u3t_damp(): print and clear profile data. */ void - u3_ct_damp(void); + u3t_damp(void); - /* u3_ct_boff(): turn profile sampling off. + /* u3t_boff(): turn profile sampling off. */ void - u3_ct_boff(void); + u3t_boff(void); - /* u3_ct_boot(): turn sampling on. + /* u3t_boot(): turn sampling on. */ void - u3_ct_boot(void); + u3t_boot(void); diff --git a/i/g/v.h b/i/g/v.h index 39f2737da3..5d04728313 100644 --- a/i/g/v.h +++ b/i/g/v.h @@ -6,19 +6,19 @@ **/ /* u3_cart: ovum carton. */ - struct _u3_cv_arvo; + struct _u3v_arvo; - typedef struct _u3_cv_cart { + typedef struct _u3v_cart { u3_noun vir; // effects of ovum u3_bean did; // cart considered for commit? u3_bean cit; // cart committed? c3_d ent_d; // entry in raft queue? - u3p(struct _u3_cv_cart) nex_p; - } u3_cv_cart; + u3p(struct _u3v_cart) nex_p; + } u3v_cart; - /* u3_cv_arvo: modern arvo structure. + /* u3v_arvo: modern arvo structure. */ - typedef struct _u3_cv_arvo { + typedef struct _u3v_arvo { c3_d ent_d; // event number u3_noun yot; // cached gates u3_noun now; // current time, as noun @@ -34,140 +34,140 @@ u3_noun roc; // kernel core struct { // ova waiting to process - u3p(u3_cv_cart) egg_p; // exit of ovum queue - u3p(u3_cv_cart) geg_p; // entry of ovum queue + u3p(u3v_cart) egg_p; // exit of ovum queue + u3p(u3v_cart) geg_p; // entry of ovum queue } ova; - } u3_cv_arvo; + } u3v_arvo; - /* u3_cv_home: all internal (within image) state. + /* u3v_home: all internal (within image) state. */ - typedef struct _u3_cv_home { - u3_cs_road rod_u; // storage state - u3_cv_arvo arv_u; // arvo state - } u3_cv_home; + typedef struct _u3v_home { + u3a_road rod_u; // storage state + u3v_arvo arv_u; // arvo state + } u3v_home; /** Globals. **/ /* u3_Home / u3H: root of thread. */ - c3_global u3_cv_home* u3_Home; + c3_global u3v_home* u3_Home; # define u3H u3_Home # define u3A (&(u3_Home->arv_u)) /** Functions. **/ - /* u3_cv_do(): use a kernel function. + /* u3v_do(): use a kernel function. */ u3_noun - u3_cv_do(const c3_c* txt_c, u3_noun arg); + u3v_do(const c3_c* txt_c, u3_noun arg); - /* u3_cv_make(): make a new pier by loading a pill. + /* u3v_make(): make a new pier by loading a pill. */ void - u3_cv_make(c3_c* pas_c); + u3v_make(c3_c* pas_c); - /* u3_cv_jack(): execute kernel formula to bind jets. + /* u3v_jack(): execute kernel formula to bind jets. */ void - u3_cv_jack(void); + u3v_jack(void); - /* u3_cv_start(): start time. + /* u3v_start(): start time. */ void - u3_cv_start(u3_noun now); + u3v_start(u3_noun now); - /* u3_cv_arm(): load a kernel arm. + /* u3v_arm(): load a kernel arm. */ u3_noun - u3_cv_arm(const c3_c* txt_c); + u3v_arm(const c3_c* txt_c); - /* u3_cv_pike(): poke with floating core. + /* u3v_pike(): poke with floating core. */ u3_noun - u3_cv_pike(u3_noun ovo, u3_noun cor); + u3v_pike(u3_noun ovo, u3_noun cor); - /* u3_cv_nick(): transform enveloped packets, [vir cor]. + /* u3v_nick(): transform enveloped packets, [vir cor]. */ u3_noun - u3_cv_nick(u3_noun vir, u3_noun cor); + u3v_nick(u3_noun vir, u3_noun cor); - /* u3_cv_do(): use a kernel function. + /* u3v_do(): use a kernel function. */ u3_noun - u3_cv_do(const c3_c* txt_c, u3_noun arg); + u3v_do(const c3_c* txt_c, u3_noun arg); - /* u3_cv_wish(): text expression with cache. + /* u3v_wish(): text expression with cache. */ u3_noun - u3_cv_wish(const c3_c* str_c); + u3v_wish(const c3_c* str_c); - /* u3_cv_numb(): set the instance number. + /* u3v_numb(): set the instance number. */ void - u3_cv_numb(void); + u3v_numb(void); - /* u3_cv_time(): set the reck time. + /* u3v_time(): set the reck time. */ void - u3_cv_time(u3_noun now); + u3v_time(u3_noun now); - /* u3_cv_peek(): query the reck namespace. + /* u3v_peek(): query the reck namespace. */ u3_noun - u3_cv_peek(u3_noun hap); + u3v_peek(u3_noun hap); - /* u3_cv_keep(): measure timer. + /* u3v_keep(): measure timer. */ u3_noun - u3_cv_keep(u3_noun hap); + u3v_keep(u3_noun hap); - /* u3_cv_poke(): insert and apply an input ovum (protected). + /* u3v_poke(): insert and apply an input ovum (protected). */ u3_noun - u3_cv_poke(u3_noun ovo); + u3v_poke(u3_noun ovo); - /* u3_cv_http_request(): hear http request on channel (unprotected). + /* u3v_http_request(): hear http request on channel (unprotected). */ void - u3_cv_http_request(u3_bean sec, u3_noun pox, u3_noun req); + u3v_http_request(u3_bean sec, u3_noun pox, u3_noun req); - /* u3_cv_tank(): dump single tank. + /* u3v_tank(): dump single tank. */ void - u3_cv_tank(u3_noun blu, c3_l tab_l, u3_noun tac); + u3v_tank(u3_noun blu, c3_l tab_l, u3_noun tac); - /* u3_cv_punt(): dump tank list. + /* u3v_punt(): dump tank list. */ void - u3_cv_punt(u3_noun blu, c3_l tab_l, u3_noun tac); + u3v_punt(u3_noun blu, c3_l tab_l, u3_noun tac); - /* u3_cv_sway(): print trace. + /* u3v_sway(): print trace. */ void - u3_cv_sway(u3_noun blu, c3_l tab_l, u3_noun tax); + u3v_sway(u3_noun blu, c3_l tab_l, u3_noun tax); - /* u3_cv_plan(): queue ovum (external). + /* u3v_plan(): queue ovum (external). */ void - u3_cv_plan(u3_noun pax, u3_noun fav); + u3v_plan(u3_noun pax, u3_noun fav); - /* u3_cv_plow(): queue multiple ova (external). + /* u3v_plow(): queue multiple ova (external). */ void - u3_cv_plow(u3_noun ova); + u3v_plow(u3_noun ova); - /* u3_cv_hose(): clear initial ovum queue. + /* u3v_hose(): clear initial ovum queue. */ void - u3_cv_hose(void); + u3v_hose(void); - /* u3_cv_louse(): last-minute deviltry upon a bail. + /* u3v_louse(): last-minute deviltry upon a bail. */ void - u3_cv_louse(c3_m how_m); + u3v_louse(c3_m how_m); - /* u3_cv_mark(): mark arvo kernel. + /* u3v_mark(): mark arvo kernel. */ void - u3_cv_mark(void); + u3v_mark(void); diff --git a/i/g/x.h b/i/g/x.h index edd77d2021..7722354af4 100644 --- a/i/g/x.h +++ b/i/g/x.h @@ -2,68 +2,68 @@ ** ** This file is in the public domain. */ - /** u3_cx_*: read, but bail with c3__exit on a crash. + /** u3x_*: read, but bail with c3__exit on a crash. **/ #if 1 -# define u3_cx_h(som) u3_ca_h(som) -# define u3_cx_t(som) u3_ca_t(som) +# define u3x_h(som) u3a_h(som) +# define u3x_t(som) u3a_t(som) #else - /* u3_cx_h (u3h): head. + /* u3x_h (u3h): head. */ u3_noun - u3_cx_h(u3_noun som); + u3x_h(u3_noun som); - /* u3_cx_t (u3t): tail. + /* u3x_t (u3t): tail. */ u3_noun - u3_cx_t(u3_noun som); + u3x_t(u3_noun som); #endif - /* u3_cx_good(): test for u3_none. + /* u3x_good(): test for u3_none. */ u3_noun - u3_cx_good(u3_weak som); + u3x_good(u3_weak som); - /* u3_cx_at (u3at): fragment. + /* u3x_at (u3at): fragment. */ u3_noun - u3_cx_at(u3_noun axe, u3_noun som); + u3x_at(u3_noun axe, u3_noun som); - /* u3_cx_cell(): + /* u3x_cell(): ** ** Divide `a` as a cell `[b c]`. */ void - u3_cx_cell(u3_noun a, + u3x_cell(u3_noun a, u3_noun* b, u3_noun* c); - /* u3_cx_trel(): + /* u3x_trel(): ** ** Divide `a` as a trel `[b c d]`, or bail. */ void - u3_cx_trel(u3_noun a, + u3x_trel(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d); - /* u3_cx_qual(): + /* u3x_qual(): ** ** Divide `a` as a quadruple `[b c d e]`. */ void - u3_cx_qual(u3_noun a, + u3x_qual(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d, u3_noun* e); - /* u3_cx_quil(): + /* u3x_quil(): ** ** Divide `a` as a quintuple `[b c d e f]`. */ void - u3_cx_quil(u3_noun a, + u3x_quil(u3_noun a, u3_noun* b, u3_noun* c, u3_noun* d, diff --git a/i/g/z.h b/i/g/z.h index 58a15383e0..e645d71f1c 100644 --- a/i/g/z.h +++ b/i/g/z.h @@ -12,23 +12,23 @@ *** *** Memo functions RETAIN keys and transfer values. **/ - /* u3_cz_find*(): find in memo cache. + /* u3z_find*(): find in memo cache. */ - u3_weak u3_cz_find(u3_mote, u3_noun); - u3_weak u3_cz_find_2(u3_mote, u3_noun, u3_noun); - u3_weak u3_cz_find_3(u3_mote, u3_noun, u3_noun, u3_noun); - u3_weak u3_cz_find_4(u3_mote, u3_noun, u3_noun, u3_noun, u3_noun); + u3_weak u3z_find(u3_mote, u3_noun); + u3_weak u3z_find_2(u3_mote, u3_noun, u3_noun); + u3_weak u3z_find_3(u3_mote, u3_noun, u3_noun, u3_noun); + u3_weak u3z_find_4(u3_mote, u3_noun, u3_noun, u3_noun, u3_noun); - /* u3_cz_save*(): save in memo cache. + /* u3z_save*(): save in memo cache. */ - u3_noun u3_cz_save(u3_mote, u3_noun, u3_noun); - u3_noun u3_cz_save_2(u3_mote, u3_noun, u3_noun, u3_noun); - u3_noun u3_cz_save_3(u3_mote, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cz_save_4 + u3_noun u3z_save(u3_mote, u3_noun, u3_noun); + u3_noun u3z_save_2(u3_mote, u3_noun, u3_noun, u3_noun); + u3_noun u3z_save_3(u3_mote, u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3z_save_4 (u3_mote, u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - /* u3_cz_uniq(): uniquify with memo cache. + /* u3z_uniq(): uniquify with memo cache. */ u3_noun - u3_cz_uniq(u3_noun som); + u3z_uniq(u3_noun som); diff --git a/j/1/add.c b/j/1/add.c index 537918a1bc..378716e6a5 100644 --- a/j/1/add.c +++ b/j/1/add.c @@ -11,21 +11,21 @@ u3_cqa_add(u3_atom a, u3_atom b) { - if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { c3_w c = a + b; - return u3_ci_words(1, &c); + return u3i_words(1, &c); } else { mpz_t a_mp, b_mp; - u3_cr_mp(a_mp, a); - u3_cr_mp(b_mp, b); + u3r_mp(a_mp, a); + u3r_mp(b_mp, b); mpz_add(a_mp, a_mp, b_mp); mpz_clear(b_mp); - return u3_ci_mp(a_mp); + return u3i_mp(a_mp); } } u3_noun @@ -33,11 +33,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_add(a, b); } diff --git a/j/1/dec.c b/j/1/dec.c index 65ad1dea97..718b92b501 100644 --- a/j/1/dec.c +++ b/j/1/dec.c @@ -10,26 +10,26 @@ u3_noun u3_cqa_inc(u3_atom a) { - return u3_ci_vint(u3k(a)); + return u3i_vint(u3k(a)); } u3_noun u3_cqa_dec(u3_atom a) { if ( 0 == a ) { - return u3_cm_error("decrement-underflow"); + return u3m_error("decrement-underflow"); } else { - if ( _(u3_ca_is_cat(a)) ) { + if ( _(u3a_is_cat(a)) ) { return a - 1; } else { mpz_t a_mp; - u3_cr_mp(a_mp, a); + u3r_mp(a_mp, a); mpz_sub_ui(a_mp, a_mp, 1); - return u3_ci_mp(a_mp); + return u3i_mp(a_mp); } } } @@ -38,10 +38,10 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_dec(a); } diff --git a/j/1/div.c b/j/1/div.c index d8e08aa5e8..1aede7c179 100644 --- a/j/1/div.c +++ b/j/1/div.c @@ -12,22 +12,22 @@ u3_atom b) { if ( 0 == b ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { - if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { return a / b; } else { mpz_t a_mp, b_mp; - u3_cr_mp(a_mp, a); - u3_cr_mp(b_mp, b); + u3r_mp(a_mp, a); + u3r_mp(b_mp, b); mpz_tdiv_q(a_mp, a_mp, b_mp); mpz_clear(b_mp); - return u3_ci_mp(a_mp); + return u3i_mp(a_mp); } } } @@ -36,11 +36,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_div(a, b); } diff --git a/j/1/gte.c b/j/1/gte.c index 4625c55e2e..eb755e10e8 100644 --- a/j/1/gte.c +++ b/j/1/gte.c @@ -10,15 +10,15 @@ u3_noun u3_cqa_gte(u3_atom a, u3_atom b) { - if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { return __(a >= b); } else { mpz_t a_mp, b_mp; u3_bean cmp; - u3_cr_mp(a_mp, a); - u3_cr_mp(b_mp, b); + u3r_mp(a_mp, a); + u3r_mp(b_mp, b); cmp = (mpz_cmp(a_mp, b_mp) >= 0) ? c3y : c3n; @@ -34,11 +34,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_gte(a, b); } diff --git a/j/1/gth.c b/j/1/gth.c index cc29b1549c..80cfe83be0 100644 --- a/j/1/gth.c +++ b/j/1/gth.c @@ -11,15 +11,15 @@ u3_cqa_gth(u3_atom a, u3_atom b) { - if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { return __(a > b); } else { mpz_t a_mp, b_mp; u3_bean cmp; - u3_cr_mp(a_mp, a); - u3_cr_mp(b_mp, b); + u3r_mp(a_mp, a); + u3r_mp(b_mp, b); cmp = (mpz_cmp(a_mp, b_mp) > 0) ? c3y : c3n; @@ -34,11 +34,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_gth(a, b); } diff --git a/j/1/lte.c b/j/1/lte.c index 1dc46afb47..1f77c51be3 100644 --- a/j/1/lte.c +++ b/j/1/lte.c @@ -10,15 +10,15 @@ u3_noun u3_cqa_lte(u3_atom a, u3_atom b) { - if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { return __(a <= b); } else { mpz_t a_mp, b_mp; u3_bean cmp; - u3_cr_mp(a_mp, a); - u3_cr_mp(b_mp, b); + u3r_mp(a_mp, a); + u3r_mp(b_mp, b); cmp = (mpz_cmp(a_mp, b_mp) <= 0) ? c3y : c3n; @@ -33,11 +33,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_lte(a, b); } diff --git a/j/1/lth.c b/j/1/lth.c index b4d5ab028a..20042cf8b1 100644 --- a/j/1/lth.c +++ b/j/1/lth.c @@ -11,15 +11,15 @@ u3_cqa_lth(u3_atom a, u3_atom b) { - if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { return __(a < b); } else { mpz_t a_mp, b_mp; u3_bean cmp; - u3_cr_mp(a_mp, a); - u3_cr_mp(b_mp, b); + u3r_mp(a_mp, a); + u3r_mp(b_mp, b); cmp = (mpz_cmp(a_mp, b_mp) < 0) ? c3y : c3n; @@ -34,11 +34,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_lth(a, b); } diff --git a/j/1/mod.c b/j/1/mod.c index 7bc60053cb..f1574a48c8 100644 --- a/j/1/mod.c +++ b/j/1/mod.c @@ -13,17 +13,17 @@ u3_atom b) { if ( 0 == b ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { mpz_t a_mp, b_mp; - u3_cr_mp(a_mp, a); - u3_cr_mp(b_mp, b); + u3r_mp(a_mp, a); + u3r_mp(b_mp, b); mpz_tdiv_r(a_mp, a_mp, b_mp); mpz_clear(b_mp); - return u3_ci_mp(a_mp); + return u3i_mp(a_mp); } } @@ -32,11 +32,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_mod(a, b); } diff --git a/j/1/mul.c b/j/1/mul.c index 41628b6afe..a174d722d3 100644 --- a/j/1/mul.c +++ b/j/1/mul.c @@ -11,21 +11,21 @@ u3_cqa_mul(u3_atom a, u3_atom b) { - if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { c3_d c = ((c3_d) a) * ((c3_d) b); - return u3_ci_chubs(1, &c); + return u3i_chubs(1, &c); } else { mpz_t a_mp, b_mp; - u3_cr_mp(a_mp, a); - u3_cr_mp(b_mp, b); + u3r_mp(a_mp, a); + u3r_mp(b_mp, b); mpz_mul(a_mp, a_mp, b_mp); mpz_clear(b_mp); - return u3_ci_mp(a_mp); + return u3i_mp(a_mp); } } u3_noun @@ -33,11 +33,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_mul(a, b); } diff --git a/j/1/sub.c b/j/1/sub.c index 25d4151037..88994bb94f 100644 --- a/j/1/sub.c +++ b/j/1/sub.c @@ -10,28 +10,28 @@ u3_noun u3_cqa_sub(u3_atom a, u3_atom b) { - if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) { + if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { if ( a < b ) { - return u3_cm_error("subtract-underflow"); + return u3m_error("subtract-underflow"); } else return (a - b); } else { mpz_t a_mp, b_mp; - u3_cr_mp(a_mp, a); - u3_cr_mp(b_mp, b); + u3r_mp(a_mp, a); + u3r_mp(b_mp, b); if ( mpz_cmp(a_mp, b_mp) < 0 ) { mpz_clear(a_mp); mpz_clear(b_mp); - return u3_cm_error("subtract-underflow"); + return u3m_error("subtract-underflow"); } mpz_sub(a_mp, a_mp, b_mp); mpz_clear(b_mp); - return u3_ci_mp(a_mp); + return u3i_mp(a_mp); } } @@ -40,11 +40,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqa_sub(a, b); } diff --git a/j/2/bind.c b/j/2/bind.c index 5b0eaa2d27..c912467e63 100644 --- a/j/2/bind.c +++ b/j/2/bind.c @@ -15,7 +15,7 @@ if ( 0 == a ) { return 0; } else { - return u3nc(0, u3_cn_slam_on(u3k(b), u3k(u3t(a)))); + return u3nc(0, u3n_slam_on(u3k(b), u3k(u3t(a)))); } } u3_noun @@ -24,8 +24,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_bind(a, b); } diff --git a/j/2/clap.c b/j/2/clap.c index e636186e1e..594fb4747d 100644 --- a/j/2/clap.c +++ b/j/2/clap.c @@ -19,7 +19,7 @@ return u3k(a); } else { - return u3nc(0, u3_cn_slam_on(u3k(c), u3nc(u3k(u3t(a)), u3k(u3t(b))))); + return u3nc(0, u3n_slam_on(u3k(c), u3nc(u3k(u3t(a)), u3k(u3t(b))))); } } u3_noun @@ -27,10 +27,10 @@ { u3_noun a, b, c; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, - u3_cv_sam_6, &b, - u3_cv_sam_7, &c, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, + u3v_sam_6, &b, + u3v_sam_7, &c, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_clap(a, b, c); } diff --git a/j/2/drop.c b/j/2/drop.c index ddfa7348a1..9a1ccc7aa8 100644 --- a/j/2/drop.c +++ b/j/2/drop.c @@ -22,7 +22,7 @@ { u3_noun a; - if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { + if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) { return u3_none; } else { return u3_cqb_drop(a); diff --git a/j/2/flop.c b/j/2/flop.c index aa51339f05..22e8c808fa 100644 --- a/j/2/flop.c +++ b/j/2/flop.c @@ -19,7 +19,7 @@ else if ( c3n == u3du(a) ) { u3z(b); - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { b = u3nc(u3k(u3h(a)), b); @@ -32,8 +32,8 @@ { u3_noun a; - if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__exit); + if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_flop(a); } diff --git a/j/2/lent.c b/j/2/lent.c index f7f35d1b8d..d01dee868a 100644 --- a/j/2/lent.c +++ b/j/2/lent.c @@ -18,10 +18,10 @@ } else if ( c3n == u3du(a) ) { u3z(len); - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { - len = u3_ci_vint(len); + len = u3i_vint(len); a = u3t(a); } } @@ -31,8 +31,8 @@ { u3_noun a; - if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__exit); + if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_lent(a); } diff --git a/j/2/levy.c b/j/2/levy.c index 6caa4b9e1f..45ce843e45 100644 --- a/j/2/levy.c +++ b/j/2/levy.c @@ -18,13 +18,13 @@ u3_noun loz; if ( c3n == u3du(a) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } - else switch ( (loz = u3_cn_slam_on(u3k(b), u3k(u3h(a)))) ) { + else switch ( (loz = u3n_slam_on(u3k(b), u3k(u3h(a)))) ) { case c3y: return u3_cqb_levy(u3t(a), b); case c3n: return c3n; default: u3z(loz); - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } } } @@ -34,8 +34,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_levy(a, b); } diff --git a/j/2/lien.c b/j/2/lien.c index 861de5e33d..37b7f6bf3d 100644 --- a/j/2/lien.c +++ b/j/2/lien.c @@ -17,13 +17,13 @@ u3_noun loz; if ( c3n == u3du(a) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } - else switch ( (loz = u3_cn_slam_on(u3k(b), u3k(u3h(a)))) ) { + else switch ( (loz = u3n_slam_on(u3k(b), u3k(u3h(a)))) ) { case c3y: return c3y; case c3n: return u3_cqb_lien(u3t(a), b); default: u3z(loz); - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } } } @@ -32,8 +32,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_lien(a, b); } diff --git a/j/2/need.c b/j/2/need.c index 31c1764cf5..26b9e6e146 100644 --- a/j/2/need.c +++ b/j/2/need.c @@ -12,7 +12,7 @@ u3_noun a) { if ( 0 == a ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3k(u3t(a)); @@ -24,8 +24,8 @@ { u3_noun a; - if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__exit); + if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_need(a); } diff --git a/j/2/reel.c b/j/2/reel.c index 0af994192d..6793d681d7 100644 --- a/j/2/reel.c +++ b/j/2/reel.c @@ -13,16 +13,16 @@ u3_noun b) { if ( 0 == a ) { - return u3k(u3_cr_at(u3_cv_sam_3, b)); + return u3k(u3r_at(u3v_sam_3, b)); } else if ( c3n == u3du(a) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun gim = u3k(u3h(a)); u3_noun hur = u3_cqb_reel(u3t(a), b); - return u3_cn_slam_on(u3k(b), u3nc(gim, hur)); + return u3n_slam_on(u3k(b), u3nc(gim, hur)); } } u3_noun @@ -31,8 +31,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_reel(a, b); } diff --git a/j/2/roll.c b/j/2/roll.c index 168b8fe474..6f33d20942 100644 --- a/j/2/roll.c +++ b/j/2/roll.c @@ -12,19 +12,19 @@ u3_noun b) { if ( 0 == a ) { - return u3k(u3_cr_at(u3_cv_sam_3, b)); + return u3k(u3r_at(u3v_sam_3, b)); } else if ( c3n == u3du(a) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun gim = u3k(u3h(a)); - u3_noun zor = u3k(u3_cr_at(u3_cv_sam_3, b)); - u3_noun daz = u3_cn_slam_on(u3k(b), u3nc(gim, zor)); - u3_noun vel = u3_ci_molt(u3k(b), u3_cv_sam_3, daz, 0); + u3_noun zor = u3k(u3r_at(u3v_sam_3, b)); + u3_noun daz = u3n_slam_on(u3k(b), u3nc(gim, zor)); + u3_noun vel = u3i_molt(u3k(b), u3v_sam_3, daz, 0); if ( u3_none == vel ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun hox = u3_cqb_roll(u3t(a), vel); @@ -38,8 +38,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_roll(a, b); } diff --git a/j/2/scag.c b/j/2/scag.c index 8a7869bc4d..48af81c621 100644 --- a/j/2/scag.c +++ b/j/2/scag.c @@ -12,8 +12,8 @@ u3_atom a, u3_noun b) { - if ( !_(u3_ca_is_cat(a)) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) ) { + return u3m_bail(c3__fail); } else { u3_noun acc; @@ -26,7 +26,7 @@ if ( c3n == u3du(b) ) { return u3_nul; } - acc = u3_ci_cell( u3h(b), acc ); + acc = u3i_cell( u3h(b), acc ); b = u3t(b); i_w--; } @@ -41,10 +41,10 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqb_scag(a, b); } diff --git a/j/2/skim.c b/j/2/skim.c index e205121b5f..dcdbf7aaea 100644 --- a/j/2/skim.c +++ b/j/2/skim.c @@ -16,9 +16,9 @@ return a; } else if ( c3n == u3du(a) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { - u3_noun hoz = u3_cn_slam_on(u3k(b), u3k(u3h(a))); + u3_noun hoz = u3n_slam_on(u3k(b), u3k(u3h(a))); u3_noun vyr = u3_cqb_skim(u3t(a), b); switch ( hoz ) { @@ -26,7 +26,7 @@ case c3n: return vyr; default: u3z(hoz); u3z(vyr); - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } } } @@ -36,8 +36,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_skim(a, b); } diff --git a/j/2/skip.c b/j/2/skip.c index f74560f848..ab31f91ae7 100644 --- a/j/2/skip.c +++ b/j/2/skip.c @@ -18,7 +18,7 @@ else if ( c3n == u3du(a) ) { return u3_none; } else { - u3_noun hoz = u3_cn_slam_on(u3k(b), u3k(u3h(a))); + u3_noun hoz = u3n_slam_on(u3k(b), u3k(u3h(a))); u3_noun vyr = u3_cqb_skip(u3t(a), b); switch ( hoz ) { @@ -36,7 +36,7 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3_none; } else { return u3_cqb_skip(a, b); diff --git a/j/2/slag.c b/j/2/slag.c index 0d084ceff1..841e905d43 100644 --- a/j/2/slag.c +++ b/j/2/slag.c @@ -10,8 +10,8 @@ u3_noun u3_cqb_slag(u3_atom a, u3_noun b) { - if ( !_(u3_ca_is_cat(a)) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) ) { + return u3m_bail(c3__fail); } else { c3_w len_w = a; @@ -31,10 +31,10 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqb_slag(a, b); } diff --git a/j/2/snag.c b/j/2/snag.c index e66b180cb7..174c904e60 100644 --- a/j/2/snag.c +++ b/j/2/snag.c @@ -11,21 +11,21 @@ u3_cqb_snag(u3_atom a, u3_noun b) { - if ( !_(u3_ca_is_cat(a)) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) ) { + return u3m_bail(c3__fail); } else { c3_w len_w = a; while ( len_w ) { if ( c3n == u3du(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } b = u3t(b); len_w--; } if ( c3n == u3du(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } return u3k(u3h(b)); } @@ -35,10 +35,10 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqb_snag(a, b); } diff --git a/j/2/sort.c b/j/2/sort.c index 5f3ecd8b47..a65d118a0a 100644 --- a/j/2/sort.c +++ b/j/2/sort.c @@ -14,7 +14,7 @@ { // must think about // - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } u3_noun u3_cwb_sort( @@ -22,8 +22,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_sort(a, b); } diff --git a/j/2/turn.c b/j/2/turn.c index 57cb2803c1..a2693974d2 100644 --- a/j/2/turn.c +++ b/j/2/turn.c @@ -14,10 +14,10 @@ return a; } else if ( c3n == u3du(a) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { - u3_noun one = u3_cn_slam_on(u3k(b), u3k(u3h(a))); + u3_noun one = u3n_slam_on(u3k(b), u3k(u3h(a))); u3_noun two = u3_cqb_turn(u3t(a), b); return u3nc(one, two); @@ -28,8 +28,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_turn(a, b); } diff --git a/j/2/weld.c b/j/2/weld.c index f75b602a78..d1fba3047a 100644 --- a/j/2/weld.c +++ b/j/2/weld.c @@ -15,7 +15,7 @@ return u3k(b); } else if ( c3n == u3du(a) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3nc(u3k(u3h(a)), u3_cqb_weld(u3t(a), b)); @@ -26,8 +26,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqb_weld(a, b); } diff --git a/j/3/bex.c b/j/3/bex.c index 4a2666784a..de93a6c3cc 100644 --- a/j/3/bex.c +++ b/j/3/bex.c @@ -12,14 +12,14 @@ { mpz_t a_mp; - if ( !_(u3_ca_is_cat(a)) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) ) { + return u3m_bail(c3__fail); } else { mpz_init_set_ui(a_mp, 1); mpz_mul_2exp(a_mp, a_mp, a); - return u3_ci_mp(a_mp); + return u3i_mp(a_mp); } } u3_noun @@ -28,10 +28,10 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_bex(a); } diff --git a/j/3/can.c b/j/3/can.c index 4bb85292cd..0156770cf6 100644 --- a/j/3/can.c +++ b/j/3/can.c @@ -11,8 +11,8 @@ u3_cqc_can(u3_atom a, u3_noun b) { - if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) || (a >= 32) ) { + return u3m_bail(c3__fail); } else { c3_g a_g = a; @@ -30,14 +30,14 @@ if ( 0 == cab ) { break; } - if ( c3n == u3du(cab) ) return u3_cm_bail(c3__fail); + if ( c3n == u3du(cab) ) return u3m_bail(c3__fail); i_cab = u3h(cab); - if ( c3n == u3du(i_cab) ) return u3_cm_bail(c3__fail); + if ( c3n == u3du(i_cab) ) return u3m_bail(c3__fail); pi_cab = u3h(i_cab); qi_cab = u3t(i_cab); - if ( c3n == u3_ca_is_cat(pi_cab) ) return u3_cm_bail(c3__fail); - if ( c3n == u3ud(qi_cab) ) return u3_cm_bail(c3__fail); - if ( (tot_w + pi_cab) < tot_w ) return u3_cm_bail(c3__fail); + if ( c3n == u3a_is_cat(pi_cab) ) return u3m_bail(c3__fail); + if ( c3n == u3ud(qi_cab) ) return u3m_bail(c3__fail); + if ( (tot_w + pi_cab) < tot_w ) return u3m_bail(c3__fail); tot_w += pi_cab; cab = u3t(cab); @@ -45,8 +45,8 @@ if ( 0 == tot_w ) { return 0; } - if ( 0 == (sal_w = u3_ca_slaq(a_g, tot_w)) ) { - return u3_cm_bail(c3__fail); + if ( 0 == (sal_w = u3a_slaq(a_g, tot_w)) ) { + return u3m_bail(c3__fail); } } @@ -61,12 +61,12 @@ u3_atom pi_cab = u3h(i_cab); u3_atom qi_cab = u3t(i_cab); - u3_cr_chop(a_g, 0, pi_cab, pos_w, sal_w, qi_cab); + u3r_chop(a_g, 0, pi_cab, pos_w, sal_w, qi_cab); pos_w += pi_cab; cab = u3t(cab); } } - return u3_ca_malt(sal_w); + return u3a_malt(sal_w); } } u3_noun @@ -74,10 +74,10 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqc_can(a, b); } diff --git a/j/3/cap.c b/j/3/cap.c index d351368374..97519667a1 100644 --- a/j/3/cap.c +++ b/j/3/cap.c @@ -11,12 +11,12 @@ u3_cqc_cap( u3_atom a) { - c3_w met_w = u3_cr_met(0, a); + c3_w met_w = u3r_met(0, a); if ( met_w < 2 ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } - else if ( (1 == u3_cr_bit((met_w - 2), a)) ) { + else if ( (1 == u3r_bit((met_w - 2), a)) ) { return 3; } else { return 2; @@ -28,10 +28,10 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_cap(a); } diff --git a/j/3/cat.c b/j/3/cat.c index 8fa540d9fc..9bca4a0ae7 100644 --- a/j/3/cat.c +++ b/j/3/cat.c @@ -12,29 +12,29 @@ u3_atom b, u3_atom c) { - if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) || (a >= 32) ) { + return u3m_bail(c3__fail); } else { c3_g a_g = a; - c3_w lew_w = u3_cr_met(a_g, b); - c3_w ler_w = u3_cr_met(a_g, c); + c3_w lew_w = u3r_met(a_g, b); + c3_w ler_w = u3r_met(a_g, c); c3_w all_w = (lew_w + ler_w); if ( 0 == all_w ) { return 0; } else { - c3_w* sal_w = u3_ca_slaq(a_g, all_w); + c3_w* sal_w = u3a_slaq(a_g, all_w); if ( 0 == sal_w ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { - u3_cr_chop(a_g, 0, lew_w, 0, sal_w, b); - u3_cr_chop(a_g, 0, ler_w, lew_w, sal_w, c); + u3r_chop(a_g, 0, lew_w, 0, sal_w, b); + u3r_chop(a_g, 0, ler_w, lew_w, sal_w, c); } - // return u3_ca_moot(sal_w); - return u3_ca_malt(sal_w); + // return u3a_moot(sal_w); + return u3a_malt(sal_w); } } } @@ -44,14 +44,14 @@ { u3_noun a, b, c; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, - u3_cv_sam_6, &b, - u3_cv_sam_7, &c, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, + u3v_sam_6, &b, + u3v_sam_7, &c, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) || (c3n == u3ud(c)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_cat(a, b, c); } diff --git a/j/3/con.c b/j/3/con.c index 6bdd094997..5fce4da7f6 100644 --- a/j/3/con.c +++ b/j/3/con.c @@ -11,28 +11,28 @@ u3_cqc_con(u3_atom a, u3_atom b) { - c3_w lna_w = u3_cr_met(5, a); - c3_w lnb_w = u3_cr_met(5, b); + c3_w lna_w = u3r_met(5, a); + c3_w lnb_w = u3r_met(5, b); if ( (lna_w == 0) && (lnb_w == 0) ) { return 0; } else { c3_w len_w = c3_max(lna_w, lnb_w); - c3_w* sal_w = u3_ca_slab(len_w); + c3_w* sal_w = u3a_slab(len_w); if ( 0 == sal_w ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { c3_w i_w; - u3_cr_chop(5, 0, lna_w, 0, sal_w, a); + u3r_chop(5, 0, lna_w, 0, sal_w, a); for ( i_w = 0; i_w < lnb_w; i_w++ ) { - sal_w[i_w] |= u3_cr_word(i_w, b); + sal_w[i_w] |= u3r_word(i_w, b); } - // return u3_ca_moot(sal_w); - return u3_ca_malt(sal_w); + // return u3a_moot(sal_w); + return u3a_malt(sal_w); } } } @@ -41,11 +41,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_con(a, b); } diff --git a/j/3/cut.c b/j/3/cut.c index d6b1103841..1e61e7ac84 100644 --- a/j/3/cut.c +++ b/j/3/cut.c @@ -14,13 +14,13 @@ u3_atom c, u3_atom d) { - if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) || (a >= 32) ) { + return u3m_bail(c3__fail); } - if ( !_(u3_ca_is_cat(b)) ) { + if ( !_(u3a_is_cat(b)) ) { return 0; } - if ( !_(u3_ca_is_cat(c)) ) { + if ( !_(u3a_is_cat(c)) ) { c = 0x7fffffff; } @@ -28,7 +28,7 @@ c3_g a_g = a; c3_w b_w = b; c3_w c_w = c; - c3_w len_w = u3_cr_met(a_g, d); + c3_w len_w = u3r_met(a_g, d); if ( (0 == c_w) || (b_w >= len_w) ) { return 0; @@ -40,14 +40,14 @@ return u3k(d); } else { - c3_w* sal_w = u3_ca_slaq(a_g, c_w); + c3_w* sal_w = u3a_slaq(a_g, c_w); if ( 0 == sal_w ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } - u3_cr_chop(a_g, b_w, c_w, 0, sal_w, d); + u3r_chop(a_g, b_w, c_w, 0, sal_w, d); - return u3_ca_malt(sal_w); + return u3a_malt(sal_w); } } } @@ -57,16 +57,16 @@ { u3_noun a, b, c, d; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, - u3_cv_sam_12, &b, - u3_cv_sam_13, &c, - u3_cv_sam_7, &d, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, + u3v_sam_12, &b, + u3v_sam_13, &c, + u3v_sam_7, &d, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) || (c3n == u3ud(c)) || (c3n == u3ud(d)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_cut(a, b, c, d); } diff --git a/j/3/dis.c b/j/3/dis.c index 24eec16455..2dcad10618 100644 --- a/j/3/dis.c +++ b/j/3/dis.c @@ -11,27 +11,27 @@ u3_cqc_dis(u3_atom a, u3_atom b) { - c3_w lna_w = u3_cr_met(5, a); - c3_w lnb_w = u3_cr_met(5, b); + c3_w lna_w = u3r_met(5, a); + c3_w lnb_w = u3r_met(5, b); if ( (lna_w == 0) && (lnb_w == 0) ) { return 0; } else { c3_w len_w = c3_max(lna_w, lnb_w); - c3_w* sal_w = u3_ca_slab(len_w); + c3_w* sal_w = u3a_slab(len_w); if ( 0 == sal_w ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { c3_w i_w; - u3_cr_chop(5, 0, lna_w, 0, sal_w, a); + u3r_chop(5, 0, lna_w, 0, sal_w, a); for ( i_w = 0; i_w < len_w; i_w++ ) { - sal_w[i_w] &= (i_w >= lnb_w) ? 0 : u3_cr_word(i_w, b); + sal_w[i_w] &= (i_w >= lnb_w) ? 0 : u3r_word(i_w, b); } - return u3_ca_malt(sal_w); + return u3a_malt(sal_w); } } } @@ -40,11 +40,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_dis(a, b); } diff --git a/j/3/dor.c b/j/3/dor.c index c69ed96f52..f71083bbf5 100644 --- a/j/3/dor.c +++ b/j/3/dor.c @@ -12,7 +12,7 @@ u3_atom a, u3_atom b) { - if ( c3y == u3_cr_sing(a, b) ) { + if ( c3y == u3r_sing(a, b) ) { return c3y; } else { @@ -29,7 +29,7 @@ return c3n; } else { - if ( c3y == u3_cr_sing(u3h(a), u3h(b)) ) { + if ( c3y == u3r_sing(u3h(a), u3h(b)) ) { return u3_cqc_dor(u3t(a), u3t(b)); } else return u3_cqc_dor(u3h(a), u3h(b)); @@ -43,8 +43,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqc_dor(a, b); } diff --git a/j/3/end.c b/j/3/end.c index 3c16db06b4..a49d2a9ec5 100644 --- a/j/3/end.c +++ b/j/3/end.c @@ -13,16 +13,16 @@ u3_atom b, u3_atom c) { - if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) || (a >= 32) ) { + return u3m_bail(c3__fail); } - else if ( !_(u3_ca_is_cat(b)) ) { + else if ( !_(u3a_is_cat(b)) ) { return u3k(c); } else { c3_g a_g = a; c3_w b_w = b; - c3_w len_w = u3_cr_met(a_g, c); + c3_w len_w = u3r_met(a_g, c); if ( 0 == b_w ) { return 0; @@ -31,14 +31,14 @@ return u3k(c); } else { - c3_w* sal_w = u3_ca_slaq(a_g, b_w); + c3_w* sal_w = u3a_slaq(a_g, b_w); if ( 0 == sal_w ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } - u3_cr_chop(a_g, 0, b_w, 0, sal_w, c); + u3r_chop(a_g, 0, b_w, 0, sal_w, c); - return u3_ca_malt(sal_w); + return u3a_malt(sal_w); } } } @@ -48,14 +48,14 @@ { u3_noun a, b, c; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, - u3_cv_sam_6, &b, - u3_cv_sam_7, &c, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, + u3v_sam_6, &b, + u3v_sam_7, &c, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) || (c3n == u3ud(c)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_end(a, b, c); } diff --git a/j/3/gor.c b/j/3/gor.c index 192ae293c4..19367da2d0 100644 --- a/j/3/gor.c +++ b/j/3/gor.c @@ -11,8 +11,8 @@ u3_cqc_gor(u3_noun a, u3_noun b) { - c3_w c_w = u3_cr_mug(a); - c3_w d_w = u3_cr_mug(b); + c3_w c_w = u3r_mug(a); + c3_w d_w = u3r_mug(b); if ( c_w == d_w ) { return u3_cqc_dor(a, b); @@ -24,8 +24,8 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) ) { + return u3m_bail(c3__exit); } else { return u3_cqc_gor(a, b); } diff --git a/j/3/hor.c b/j/3/hor.c index f64a598707..19faa48403 100644 --- a/j/3/hor.c +++ b/j/3/hor.c @@ -25,7 +25,7 @@ u3_noun h_a = u3h(a); u3_noun h_b = u3h(b); - if ( c3y == u3_cr_sing(h_a, h_b) ) { + if ( c3y == u3r_sing(h_a, h_b) ) { return u3_cqc_gor(u3t(a), u3t(b)); } else { return u3_cqc_gor(h_a, h_b); @@ -38,8 +38,8 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) ) { + return u3m_bail(c3__exit); } else { return u3_cqc_hor(a, b); } diff --git a/j/3/lsh.c b/j/3/lsh.c index e2aa2b5bf9..7aa47a8788 100644 --- a/j/3/lsh.c +++ b/j/3/lsh.c @@ -10,33 +10,33 @@ u3_noun u3_cqc_lsh(u3_atom a, u3_atom b, u3_atom c) { - if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) || (a >= 32) ) { + return u3m_bail(c3__fail); } - else if ( !_(u3_ca_is_cat(b)) ) { - return u3_cm_bail(c3__fail); + else if ( !_(u3a_is_cat(b)) ) { + return u3m_bail(c3__fail); } else { c3_g a_g = a; c3_w b_w = b; - c3_w len_w = u3_cr_met(a_g, c); + c3_w len_w = u3r_met(a_g, c); if ( 0 == len_w ) { return 0; } else if ( (b_w + len_w) < len_w ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { - c3_w* sal_w = u3_ca_slaq(a_g, (b_w + len_w)); + c3_w* sal_w = u3a_slaq(a_g, (b_w + len_w)); if ( 0 == sal_w ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } - u3_cr_chop(a_g, 0, len_w, b_w, sal_w, c); + u3r_chop(a_g, 0, len_w, b_w, sal_w, c); - // return u3_ca_moot(sal_w); - return u3_ca_malt(sal_w); + // return u3a_moot(sal_w); + return u3a_malt(sal_w); } } } @@ -45,14 +45,14 @@ { u3_noun a, b, c; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, - u3_cv_sam_6, &b, - u3_cv_sam_7, &c, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, + u3v_sam_6, &b, + u3v_sam_7, &c, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) || (c3n == u3ud(c)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_lsh(a, b, c); } diff --git a/j/3/mas.c b/j/3/mas.c index 468dc8661a..bee8483df3 100644 --- a/j/3/mas.c +++ b/j/3/mas.c @@ -13,9 +13,9 @@ c3_w b_w; u3_atom c, d, e, f; - b_w = u3_cr_met(0, a); + b_w = u3r_met(0, a); if ( b_w < 2 ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { c = u3_cqc_bex((b_w - 1)); @@ -35,10 +35,10 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_mas(a); } diff --git a/j/3/met.c b/j/3/met.c index 3f34d88252..8bc332bf74 100644 --- a/j/3/met.c +++ b/j/3/met.c @@ -12,18 +12,18 @@ u3_atom a, u3_atom b) { - if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { + if ( !_(u3a_is_cat(a)) || (a >= 32) ) { if ( 0 == b ) { return 0; } else return 1; } else { - c3_w met_w = u3_cr_met(a, b); + c3_w met_w = u3r_met(a, b); - if ( !_(u3_ca_is_cat(met_w)) ) { - return u3_ci_words(1, &met_w); + if ( !_(u3a_is_cat(met_w)) ) { + return u3i_words(1, &met_w); } - else return u3_cr_met(a, b); + else return u3r_met(a, b); } } u3_noun @@ -32,11 +32,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_met(a, b); } diff --git a/j/3/mix.c b/j/3/mix.c index d076218a63..b03f44a2d9 100644 --- a/j/3/mix.c +++ b/j/3/mix.c @@ -11,27 +11,27 @@ u3_cqc_mix(u3_atom a, u3_atom b) { - c3_w lna_w = u3_cr_met(5, a); - c3_w lnb_w = u3_cr_met(5, b); + c3_w lna_w = u3r_met(5, a); + c3_w lnb_w = u3r_met(5, b); if ( (lna_w == 0) && (lnb_w == 0) ) { return 0; } else { c3_w len_w = c3_max(lna_w, lnb_w); - c3_w* sal_w = u3_ca_slab(len_w); + c3_w* sal_w = u3a_slab(len_w); if ( 0 == sal_w ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { c3_w i_w; - u3_cr_chop(5, 0, lna_w, 0, sal_w, a); + u3r_chop(5, 0, lna_w, 0, sal_w, a); for ( i_w = 0; i_w < lnb_w; i_w++ ) { - sal_w[i_w] ^= u3_cr_word(i_w, b); + sal_w[i_w] ^= u3r_word(i_w, b); } - return u3_ca_malt(sal_w); + return u3a_malt(sal_w); } } } @@ -40,11 +40,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_mix(a, b); } diff --git a/j/3/mug.c b/j/3/mug.c index 43ea7bdb9f..2d2b296683 100644 --- a/j/3/mug.c +++ b/j/3/mug.c @@ -12,9 +12,9 @@ { u3_noun sam; - if ( u3_none == (sam = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__exit); + if ( u3_none == (sam = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__exit); } else { - return u3_cr_mug(sam); + return u3r_mug(sam); } } diff --git a/j/3/peg.c b/j/3/peg.c index 9e9097c2fc..fe551ba6e9 100644 --- a/j/3/peg.c +++ b/j/3/peg.c @@ -14,7 +14,7 @@ { u3_atom c, d, e, f, g, h; - c = u3_cr_met(0, b); + c = u3r_met(0, b); d = u3_cqa_dec(c); e = u3_cqc_lsh(0, d, 1); f = u3_cqa_sub(b, e); @@ -35,13 +35,13 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) || (0 == a) || (0 == b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_peg(a, b); } diff --git a/j/3/po.c b/j/3/po.c index 961dda3d11..97c47db7bc 100644 --- a/j/3/po.c +++ b/j/3/po.c @@ -10,7 +10,7 @@ static u3_noun _po_find(u3_noun buf, u3_noun a) { - if ( !_(u3_ca_is_cat(a)) ) { + if ( !_(u3a_is_cat(a)) ) { return u3_nul; } else { @@ -21,7 +21,7 @@ c3_y byt_y[3]; c3_w but_w; - u3_cr_bytes((i_w * 3), 3, byt_y, buf); + u3r_bytes((i_w * 3), 3, byt_y, buf); but_w = (byt_y[0] | (byt_y[1] << 8) | (byt_y[2] << 16)); if ( but_w == a_w ) { @@ -38,12 +38,12 @@ { u3_noun x, a, buf; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam, &a, u3v_con_sam, &x, 0)) || (c3n == u3du(x)) || (c3n == u3ud(buf = u3h(x))) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return _po_find(buf, a); } @@ -54,12 +54,12 @@ { u3_noun x, a, buf; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam, &a, u3v_con_sam, &x, 0)) || (c3n == u3du(x)) || (c3n == u3ud(buf = u3t(x))) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return _po_find(buf, a); } @@ -71,18 +71,18 @@ { u3_noun x, a, buf; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam, &a, u3v_con_sam, &x, 0)) || (c3n == u3du(x)) || (c3n == u3ud(buf = u3h(x))) || (c3n == u3ud(a)) || (a >= 256) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { c3_y byt_y[3]; - u3_cr_bytes((a * 3), 3, byt_y, buf); + u3r_bytes((a * 3), 3, byt_y, buf); return (byt_y[0] | (byt_y[1] << 8) | (byt_y[2] << 16)); } } @@ -92,17 +92,17 @@ { u3_noun x, a, buf; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam, &a, u3v_con_sam, &x, 0)) || (c3n == u3du(x)) || (c3n == u3ud(buf = u3t(x))) || (c3n == u3ud(a)) || (a >= 256) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { c3_y byt_y[3]; - u3_cr_bytes((a * 3), 3, byt_y, buf); + u3r_bytes((a * 3), 3, byt_y, buf); return (byt_y[0] | (byt_y[1] << 8) | (byt_y[2] << 16)); } } diff --git a/j/3/rap.c b/j/3/rap.c index f272aedd30..4309322e76 100644 --- a/j/3/rap.c +++ b/j/3/rap.c @@ -11,8 +11,8 @@ u3_cqc_rap(u3_atom a, u3_noun b) { - if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { - return u3_cm_bail(c3__exit); + if ( !_(u3a_is_cat(a)) || (a >= 32) ) { + return u3m_bail(c3__exit); } else { c3_g a_g = a; @@ -32,13 +32,13 @@ break; } else if ( c3n == u3du(cab) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else if ( c3n == u3ud(h_cab = u3h(cab)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } - else if ( (tot_w + (len_w = u3_cr_met(a_g, h_cab))) < tot_w ) { - return u3_cm_bail(c3__fail); + else if ( (tot_w + (len_w = u3r_met(a_g, h_cab))) < tot_w ) { + return u3m_bail(c3__fail); } tot_w += len_w; cab = u3t(cab); @@ -46,8 +46,8 @@ if ( 0 == tot_w ) { return 0; } - if ( 0 == (sal_w = u3_ca_slaq(a_g, tot_w)) ) { - return u3_cm_bail(c3__fail); + if ( 0 == (sal_w = u3a_slaq(a_g, tot_w)) ) { + return u3m_bail(c3__fail); } } @@ -59,15 +59,15 @@ while ( 0 != cab ) { u3_noun h_cab = u3h(cab); - c3_w len_w = u3_cr_met(a_g, h_cab); + c3_w len_w = u3r_met(a_g, h_cab); - u3_cr_chop(a_g, 0, len_w, pos_w, sal_w, h_cab); + u3r_chop(a_g, 0, len_w, pos_w, sal_w, h_cab); pos_w += len_w; cab = u3t(cab); } } - // return u3_ca_moot(sal_w); - return u3_ca_malt(sal_w); + // return u3a_moot(sal_w); + return u3a_malt(sal_w); } } u3_noun @@ -75,10 +75,10 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun pro; diff --git a/j/3/rip.c b/j/3/rip.c index 9878dc3f01..7a43f5b363 100644 --- a/j/3/rip.c +++ b/j/3/rip.c @@ -11,8 +11,8 @@ u3_cqc_rip(u3_atom a, u3_atom b) { - if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) || (a >= 32) ) { + return u3m_bail(c3__fail); } else { u3_noun pir = u3_nul; @@ -20,7 +20,7 @@ c3_w i_w; if ( a_g < 5 ) { - c3_w met_w = u3_cr_met(a_g, b); + c3_w met_w = u3r_met(a_g, b); c3_w mek_w = ((1 << (1 << a_g)) - 1); for ( i_w = 0; i_w < met_w; i_w++ ) { @@ -28,7 +28,7 @@ c3_w bit_w = (pat_w << a_g); c3_w wor_w = (bit_w >> 5); c3_w sif_w = (bit_w & 31); - c3_w src_w = u3_cr_word(wor_w, b); + c3_w src_w = u3r_word(wor_w, b); c3_w rip_w = ((src_w >> sif_w) & mek_w); pir = u3nc(rip_w, pir); @@ -36,8 +36,8 @@ return pir; } else { - c3_w met_w = u3_cr_met(a_g, b); - c3_w len_w = u3_cr_met(5, b); + c3_w met_w = u3r_met(a_g, b); + c3_w len_w = u3r_met(5, b); c3_g san_g = (a_g - 5); c3_w san_w = 1 << san_g; c3_w dif_w = (met_w << san_g) - len_w; @@ -47,19 +47,19 @@ c3_w pat_w = (met_w - (i_w + 1)); c3_w wut_w = (pat_w << san_g); c3_w sap_w = ((0 == i_w) ? tub_w : san_w); - c3_w* sal_w = u3_ca_slab(sap_w); + c3_w* sal_w = u3a_slab(sap_w); if ( 0 == sal_w ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { c3_w j_w; u3_atom rip; for ( j_w = 0; j_w < sap_w; j_w++ ) { - sal_w[j_w] = u3_cr_word(wut_w + j_w, b); + sal_w[j_w] = u3r_word(wut_w + j_w, b); } - rip = u3_ca_malt(sal_w); + rip = u3a_malt(sal_w); pir = u3nc(rip, pir); } len_w -= san_w; @@ -73,11 +73,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_rip(a, b); } diff --git a/j/3/rsh.c b/j/3/rsh.c index 5c332be206..c650ddec10 100644 --- a/j/3/rsh.c +++ b/j/3/rsh.c @@ -13,30 +13,30 @@ u3_atom b, u3_atom c) { - if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(a)) || (a >= 32) ) { + return u3m_bail(c3__fail); } - else if ( !_(u3_ca_is_cat(b)) ) { + else if ( !_(u3a_is_cat(b)) ) { return 0; } else { c3_g a_g = a; c3_w b_w = b; - c3_w len_w = u3_cr_met(a_g, c); + c3_w len_w = u3r_met(a_g, c); if ( b_w >= len_w ) { return 0; } else { - c3_w* sal_w = u3_ca_slaq(a_g, (len_w - b_w)); + c3_w* sal_w = u3a_slaq(a_g, (len_w - b_w)); if ( 0 == sal_w ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } - u3_cr_chop(a_g, b_w, (len_w - b_w), 0, sal_w, c); + u3r_chop(a_g, b_w, (len_w - b_w), 0, sal_w, c); - // return u3_ca_moot(sal_w); - return u3_ca_malt(sal_w); + // return u3a_moot(sal_w); + return u3a_malt(sal_w); } } } @@ -46,14 +46,14 @@ { u3_noun a, b, c; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, - u3_cv_sam_6, &b, - u3_cv_sam_7, &c, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, + u3v_sam_6, &b, + u3v_sam_7, &c, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) || (c3n == u3ud(c)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqc_rsh(a, b, c); } diff --git a/j/3/vor.c b/j/3/vor.c index 8e22c53c8c..5b4cfdb49e 100644 --- a/j/3/vor.c +++ b/j/3/vor.c @@ -11,8 +11,8 @@ u3_cqc_vor(u3_atom a, u3_atom b) { - c3_w c_w = u3_cr_mug(u3_cr_mug(a)); - c3_w d_w = u3_cr_mug(u3_cr_mug(b)); + c3_w c_w = u3r_mug(u3r_mug(a)); + c3_w d_w = u3r_mug(u3r_mug(b)); if ( c_w == d_w ) { return u3_cqc_dor(a, b); @@ -24,8 +24,8 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) ) { + return u3m_bail(c3__exit); } else { return u3_cqc_vor(a, b); } diff --git a/j/4/by_gas.c b/j/4/by_gas.c index 29ff346875..c34a17420f 100644 --- a/j/4/by_gas.c +++ b/j/4/by_gas.c @@ -17,20 +17,20 @@ } else { if ( c3n == u3du(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun i_b = u3h(b); u3_noun t_b = u3t(b); if ( c3n == u3du(i_b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun pi_b = u3h(i_b); u3_noun qi_b = u3t(i_b); u3_noun c; if ( u3_none == (c = u3_cqdb_put(a, pi_b, qi_b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun d = u3_cqdb_gas(c, t_b); @@ -47,8 +47,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdb_gas(a, b); } @@ -60,7 +60,7 @@ u3z(a); u3z(b); if ( u3_none == c ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else return c; } diff --git a/j/4/by_get.c b/j/4/by_get.c index 57f6581f55..323000e433 100644 --- a/j/4/by_get.c +++ b/j/4/by_get.c @@ -17,13 +17,13 @@ u3_noun l_a, n_a, r_a; u3_noun pn_a, qn_a; - if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) || - (c3n == u3_cr_cell(n_a, &pn_a, &qn_a) ) ) + if ( (c3n == u3r_trel(a, &n_a, &l_a, &r_a)) || + (c3n == u3r_cell(n_a, &pn_a, &qn_a) ) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { - if ( (c3y == u3_cr_sing(b, pn_a)) ) { + if ( (c3y == u3r_sing(b, pn_a)) ) { return u3nc(u3_nul, u3k(qn_a)); } else { @@ -41,8 +41,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdb_get(a, b); } @@ -53,7 +53,7 @@ u3_noun c = u3_cqdb_get(a, b); u3z(a); u3z(b); - if ( c3n == u3_cr_du(c) ) { + if ( c3n == u3r_du(c) ) { u3z(c); return u3_none; } else { @@ -69,7 +69,7 @@ u3_weak c = u3_ckdb_get(a, b); if ( u3_none == c ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else return c; } diff --git a/j/4/by_has.c b/j/4/by_has.c index 8f71e50b95..5374564614 100644 --- a/j/4/by_has.c +++ b/j/4/by_has.c @@ -19,13 +19,13 @@ u3_noun l_a, n_a, r_a; u3_noun pn_a, qn_a; - if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) || - (c3n == u3_cr_cell(n_a, &pn_a, &qn_a)) ) + if ( (c3n == u3r_trel(a, &n_a, &l_a, &r_a)) || + (c3n == u3r_cell(n_a, &pn_a, &qn_a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { - if ( (c3y == u3_cr_sing(b, pn_a)) ) { + if ( (c3y == u3r_sing(b, pn_a)) ) { return c3y; } else { @@ -43,8 +43,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdb_has(a, b); } @@ -56,7 +56,7 @@ u3z(a); u3z(b); if ( u3_none == c ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else return c; } diff --git a/j/4/by_int.c b/j/4/by_int.c index 83f8c2eed5..af0adf8c2c 100644 --- a/j/4/by_int.c +++ b/j/4/by_int.c @@ -22,26 +22,26 @@ u3_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a; u3_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b; - if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_cell(a, &n_a, &lr_a)) ) { + return u3m_bail(c3__exit); } - else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { - return u3_cm_bail(c3__exit); + else if ( (c3n == u3r_cell(b, &n_b, &lr_b)) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(n_a, &p_n_a, &q_n_a) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(n_a, &p_n_a, &q_n_a) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(n_b, &p_n_b, &q_n_b) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(n_b, &p_n_b, &q_n_b) ) { + return u3m_bail(c3__exit); } else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) { - if ( c3y == u3_cr_sing(p_n_a, p_n_b) ) { + if ( c3y == u3r_sing(p_n_a, p_n_b) ) { return u3nt( u3k(n_b), @@ -75,7 +75,7 @@ u3k(l_b))); } } - else if ( c3y == u3_cr_sing(p_n_b, p_n_a) ) { + else if ( c3y == u3r_sing(p_n_b, p_n_a) ) { return u3nt( u3k(n_b), @@ -116,8 +116,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdb_int(a, b); } diff --git a/j/4/by_put.c b/j/4/by_put.c index 5b0a224914..e1804fa71a 100644 --- a/j/4/by_put.c +++ b/j/4/by_put.c @@ -24,13 +24,13 @@ u3_noun l_a, n_a, r_a, pn_a, qn_a; u3_noun d, l_d, n_d, r_d; - if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) || - (c3n == u3_cr_cell(n_a, &pn_a, &qn_a)) ) + if ( (c3n == u3r_trel(a, &n_a, &l_a, &r_a)) || + (c3n == u3r_cell(n_a, &pn_a, &qn_a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } - else if ( c3y == u3_cr_sing(pn_a, b) ) { - if ( c3y == u3_cr_sing(qn_a, c) ) { + else if ( c3y == u3r_sing(pn_a, b) ) { + if ( c3y == u3r_sing(qn_a, c) ) { return u3k(a); } else { return u3nt @@ -49,7 +49,7 @@ u3k(r_a)); } else { - u3_cr_trel(d, &n_d, &l_d, &r_d); + u3r_trel(d, &n_d, &l_d, &r_d); { u3_noun e = u3nt (u3k(n_d), @@ -73,7 +73,7 @@ d); } else { - u3_cr_trel(d, &n_d, &l_d, &r_d); + u3r_trel(d, &n_d, &l_d, &r_d); { u3_noun e = u3nt (u3k(n_d), @@ -97,10 +97,10 @@ { u3_noun a, b, c; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &b, - u3_cv_sam_3, &c, - u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam_2, &b, + u3v_sam_3, &c, + u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdb_put(a, b, c); } diff --git a/j/4/by_uni.c b/j/4/by_uni.c index 9208a1d4a5..c3755c4388 100644 --- a/j/4/by_uni.c +++ b/j/4/by_uni.c @@ -22,26 +22,26 @@ u3_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a; u3_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b; - if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_cell(a, &n_a, &lr_a)) ) { + return u3m_bail(c3__exit); } - else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { - return u3_cm_bail(c3__exit); + else if ( (c3n == u3r_cell(b, &n_b, &lr_b)) ) { + return u3m_bail(c3__exit); } - else if ( (c3n == u3_cr_cell(n_a, &p_n_a, &q_n_a)) ) { - return u3_cm_bail(c3__exit); + else if ( (c3n == u3r_cell(n_a, &p_n_a, &q_n_a)) ) { + return u3m_bail(c3__exit); } - else if ( (c3n == u3_cr_cell(n_b, &p_n_b, &q_n_b)) ) { - return u3_cm_bail(c3__exit); + else if ( (c3n == u3r_cell(n_b, &p_n_b, &q_n_b)) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) { + return u3m_bail(c3__exit); } else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) { - if ( c3y == u3_cr_sing(p_n_a, p_n_b) ) { + if ( c3y == u3r_sing(p_n_a, p_n_b) ) { return u3nt(u3k(n_b), u3_cqdb_uni( u3k(l_a), u3k(l_b)), @@ -77,7 +77,7 @@ u3k(l_b)); } } - else if ( c3y == u3_cr_sing(p_n_b, p_n_a) ) { + else if ( c3y == u3r_sing(p_n_b, p_n_a) ) { return u3nt( u3k(n_b), @@ -120,8 +120,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdb_uni(a, b); } diff --git a/j/4/in_gas.c b/j/4/in_gas.c index d58307ed52..61a8f42be8 100644 --- a/j/4/in_gas.c +++ b/j/4/in_gas.c @@ -17,14 +17,14 @@ } else { if ( c3n == u3du(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun i_b = u3h(b); u3_noun t_b = u3t(b); u3_noun c; if ( u3_none == (c = u3_cqdi_put(a, i_b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun d = u3_cqdi_gas(c, t_b); @@ -40,8 +40,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdi_gas(a, b); } @@ -53,7 +53,7 @@ u3z(a); u3z(b); if ( u3_none == c ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else return c; } diff --git a/j/4/in_has.c b/j/4/in_has.c index 01eac84f0f..21a8c636eb 100644 --- a/j/4/in_has.c +++ b/j/4/in_has.c @@ -16,11 +16,11 @@ else { u3_noun l_a, n_a, r_a; - if ( (c3n == u3_cr_mean(a, 2, &n_a, 6, &l_a, 7, &r_a, 0)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_mean(a, 2, &n_a, 6, &l_a, 7, &r_a, 0)) ) { + return u3m_bail(c3__exit); } else { - if ( (c3y == u3_cr_sing(b, n_a)) ) { + if ( (c3y == u3r_sing(b, n_a)) ) { return c3y; } else { @@ -37,8 +37,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdi_has(a, b); } @@ -50,7 +50,7 @@ u3z(a); u3z(b); if ( u3_none == c ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else return c; } diff --git a/j/4/in_int.c b/j/4/in_int.c index 8fcbf57fa1..379fdd1e68 100644 --- a/j/4/in_int.c +++ b/j/4/in_int.c @@ -23,11 +23,11 @@ u3_noun l_b, n_b, r_b, lr_b; u3_noun c; - if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_cell(a, &n_a, &lr_a)) ) { + return u3m_bail(c3__exit); } - else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { - return u3_cm_bail(c3__exit); + else if ( (c3n == u3r_cell(b, &n_b, &lr_b)) ) { + return u3m_bail(c3__exit); } else { if ( c3y == u3_cqc_vor(n_b, n_a) ) { @@ -35,13 +35,13 @@ c = n_a; n_a = n_b; n_b = c; c = lr_a; lr_a = lr_b; lr_b = c; } - if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) { + return u3m_bail(c3__exit); } - else if ( c3y == u3_cr_sing(n_a, n_b) ) { + else if ( c3y == u3r_sing(n_a, n_b) ) { return u3nt(u3k(n_a), u3_cqdi_int(l_a, l_b), u3_cqdi_int(r_a, r_b)); @@ -79,8 +79,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdi_int(a, b); } diff --git a/j/4/in_mer.c b/j/4/in_mer.c index f67a0ad481..0ed32e150a 100644 --- a/j/4/in_mer.c +++ b/j/4/in_mer.c @@ -21,11 +21,11 @@ u3_noun l_b, n_b, r_b, lr_b; u3_noun c; - if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_cell(a, &n_a, &lr_a)) ) { + return u3m_bail(c3__exit); } - else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { - return u3_cm_bail(c3__exit); + else if ( (c3n == u3r_cell(b, &n_b, &lr_b)) ) { + return u3m_bail(c3__exit); } else { if ( c3y == u3_cqc_vor(n_b, n_a) ) { @@ -33,13 +33,13 @@ c = n_a; n_a = n_b; n_b = c; c = lr_a; lr_a = lr_b; lr_b = c; } - if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) { + return u3m_bail(c3__exit); } - else if ( c3y == u3_cr_sing(n_a, n_b) ) { + else if ( c3y == u3r_sing(n_a, n_b) ) { return u3nt(u3k(n_a), u3_cqdi_mer(l_a, l_b), u3_cqdi_mer(r_a, r_b)); @@ -79,8 +79,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdi_mer(a, b); diff --git a/j/4/in_put.c b/j/4/in_put.c index 81d095f789..1a3aab2e28 100644 --- a/j/4/in_put.c +++ b/j/4/in_put.c @@ -19,14 +19,14 @@ u3_noun l_a, n_a, r_a, lr_a; // XX copy tree boilerplate to other pt4 u3_noun c, l_c, n_c, r_c; - if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_cell(a, &n_a, &lr_a)) ) { + return u3m_bail(c3__exit); } - else if ( c3y == u3_cr_sing(n_a, b) ) { + else if ( c3y == u3r_sing(n_a, b) ) { return u3k(a); } - else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) { + return u3m_bail(c3__exit); } else { if ( c3y == u3_cqc_hor(b, n_a) ) { @@ -38,7 +38,7 @@ u3k(r_a)); } else { - u3_cr_trel(c, &n_c, &l_c, &r_c); + u3r_trel(c, &n_c, &l_c, &r_c); { u3_noun d = u3nt (u3k(n_c), @@ -62,7 +62,7 @@ c); } else { - u3_cr_trel(c, &n_c, &l_c, &r_c); + u3r_trel(c, &n_c, &l_c, &r_c); { u3_noun d = u3nt (u3k(n_c), @@ -86,8 +86,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdi_put(a, b); } diff --git a/j/4/in_tap.c b/j/4/in_tap.c index aff144f370..c8fbe55b6b 100644 --- a/j/4/in_tap.c +++ b/j/4/in_tap.c @@ -17,9 +17,9 @@ } else { u3_noun l_a, n_a, r_a; - if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) ) { + if ( (c3n == u3r_trel(a, &n_a, &l_a, &r_a)) ) { u3z(b); - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return _tap_in (r_a, @@ -42,8 +42,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdi_tap(a, b); } @@ -55,7 +55,7 @@ u3z(a); u3z(b); if ( u3_none == c ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else return c; } diff --git a/j/4/in_uni.c b/j/4/in_uni.c index 7142627872..e8cf4ee8cf 100644 --- a/j/4/in_uni.c +++ b/j/4/in_uni.c @@ -22,21 +22,21 @@ u3_noun l_a, n_a, r_a, lr_a; u3_noun l_b, n_b, r_b, lr_b; - if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_cell(a, &n_a, &lr_a)) ) { + return u3m_bail(c3__exit); } - else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) { - return u3_cm_bail(c3__exit); + else if ( (c3n == u3r_cell(b, &n_b, &lr_b)) ) { + return u3m_bail(c3__exit); } else { if ( c3y == u3_cqc_vor(n_a, n_b) ) { - if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) { + return u3m_bail(c3__exit); } - else if ( c3y == u3_cr_sing(n_a, n_b) ) { + else if ( c3y == u3r_sing(n_a, n_b) ) { return u3nt( u3k(n_b), @@ -72,13 +72,13 @@ u3k(l_b)); } } - else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) { + return u3m_bail(c3__exit); } - else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) { - return u3_cm_bail(c3__exit); + else if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) { + return u3m_bail(c3__exit); } - else if ( c3y == u3_cr_sing(n_b, n_a) ) { + else if ( c3y == u3r_sing(n_b, n_a) ) { return u3nt( u3k(n_b), @@ -122,8 +122,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqdi_uni(a, b); } diff --git a/j/5/aesc.c b/j/5/aesc.c index 63b278cd61..21eab792d5 100644 --- a/j/5/aesc.c +++ b/j/5/aesc.c @@ -24,30 +24,30 @@ AES_KEY key_u; #endif - c3_assert(u3_cr_met(3, a) <= 32); - c3_assert(u3_cr_met(3, b) <= 16); + c3_assert(u3r_met(3, a) <= 32); + c3_assert(u3r_met(3, b) <= 16); - u3_cr_bytes(0, 32, a_y, a); - u3_cr_bytes(0, 16, b_y, b); + u3r_bytes(0, 32, a_y, a); + u3r_bytes(0, 16, b_y, b); #if defined(U3_OS_osx) if ( kCCSuccess != CCCrypt(kCCEncrypt, kCCAlgorithmAES128, kCCOptionECBMode, a_y, kCCKeySizeAES256, 0, b_y, 16, b_y, 16, &siz_i) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else c3_assert(16 == siz_i); #else if ( 0 != AES_set_encrypt_key(a_y, 256, &key_u) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { AES_encrypt(b_y, b_y, &key_u); } #endif - return u3_ci_bytes(16, b_y); + return u3i_bytes(16, b_y); } u3_noun @@ -55,11 +55,11 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqea_en(a, b); @@ -77,30 +77,30 @@ AES_KEY key_u; #endif - c3_assert(u3_cr_met(3, a) <= 32); - c3_assert(u3_cr_met(3, b) <= 16); + c3_assert(u3r_met(3, a) <= 32); + c3_assert(u3r_met(3, b) <= 16); - u3_cr_bytes(0, 32, a_y, a); - u3_cr_bytes(0, 16, b_y, b); + u3r_bytes(0, 32, a_y, a); + u3r_bytes(0, 16, b_y, b); #if defined(U3_OS_osx) if ( kCCSuccess != CCCrypt(kCCDecrypt, kCCAlgorithmAES128, kCCOptionECBMode, a_y, kCCKeySizeAES256, 0, b_y, 16, b_y, 16, &siz_i) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else c3_assert(16 == siz_i); #else if ( 0 != AES_set_decrypt_key(a_y, 256, &key_u) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { AES_decrypt(b_y, b_y, &key_u); } #endif - return u3_ci_bytes(16, b_y); + return u3i_bytes(16, b_y); } u3_noun @@ -108,11 +108,11 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqea_de(a, b); diff --git a/j/5/cue.c b/j/5/cue.c index 2c0be6309c..be3a06f0b3 100644 --- a/j/5/cue.c +++ b/j/5/cue.c @@ -6,7 +6,7 @@ static u3_noun - _cue_in(u3p(u3_ch_root) har_p, + _cue_in(u3p(u3h_root) har_p, u3_atom a, u3_atom b) { @@ -19,7 +19,7 @@ p = u3_cqa_inc(u3k(u3h(c))); q = u3k(u3t(c)); - u3_ch_put(har_p, u3k(b), u3k(q)); + u3h_put(har_p, u3k(b), u3k(q)); u3z(c); u3z(x); @@ -41,17 +41,17 @@ p = u3_cqa_add(2, y); q = w; - u3_ch_put(har_p, u3k(b), u3k(q)); + u3h_put(har_p, u3k(b), u3k(q)); u3z(u); u3z(v); u3z(x); u3z(y); } else { u3_noun d = u3_cqe_rub(c, a); - u3_noun x = u3_ch_get(har_p, u3k(u3t(d))); + u3_noun x = u3h_get(har_p, u3k(u3t(d))); p = u3_cqa_add(2, u3h(d)); if ( u3_none == x ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } q = x; u3z(d); @@ -65,12 +65,12 @@ u3_noun u3_cqe_cue(u3_atom a) { - u3p(u3_ch_root) har_p = u3_ch_new(); + u3p(u3h_root) har_p = u3h_new(); u3_noun x = _cue_in(har_p, a, 0); u3_noun y = u3k(u3h(u3t(x))); - u3_ch_free(har_p); + u3h_free(har_p); u3z(x); return y; @@ -80,8 +80,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { - return u3_cm_bail(c3__fail); + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { + return u3m_bail(c3__fail); } else { return u3_cqe_cue(a); } diff --git a/j/5/ed_puck.c b/j/5/ed_puck.c index 9414cdea9b..ff7d9d1a7e 100644 --- a/j/5/ed_puck.c +++ b/j/5/ed_puck.c @@ -16,19 +16,19 @@ c3_y sec_y[64]; c3_y sed_y[32]; c3_w met_w; - u3_noun a = u3_cr_at(u3_cv_sam, cor); + u3_noun a = u3r_at(u3v_sam, cor); if ( (u3_none == a) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } - met_w = u3_cr_met(3, a); + met_w = u3r_met(3, a); if ( met_w > 32 ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } memset(sed_y, 0, 32); - u3_cr_bytes(0, met_w, sed_y, a); + u3r_bytes(0, met_w, sed_y, a); ed25519_create_keypair(pub_y, sec_y, sed_y); - return u3_ci_bytes(32, pub_y); + return u3i_bytes(32, pub_y); } diff --git a/j/5/ed_sign.c b/j/5/ed_sign.c index 69210568bb..dda3159051 100644 --- a/j/5/ed_sign.c +++ b/j/5/ed_sign.c @@ -17,8 +17,8 @@ c3_y pub_y[64]; c3_y sec_y[64]; - c3_w mesm_w = u3_cr_met(3, a); - c3_w mess_w = u3_cr_met(3, b); + c3_w mesm_w = u3r_met(3, a); + c3_w mess_w = u3r_met(3, b); c3_y* mes_y = 0; @@ -29,22 +29,22 @@ mes_y = malloc(mesm_w); - u3_cr_bytes(0, mesm_w, mes_y, a); - u3_cr_bytes(0, mess_w, sed_y, b); + u3r_bytes(0, mesm_w, mes_y, a); + u3r_bytes(0, mess_w, sed_y, b); ed25519_create_keypair(pub_y, sec_y, sed_y); ed25519_sign(sig_y, mes_y, mesm_w, pub_y, sec_y); free(mes_y); - return u3_ci_bytes(64, sig_y); + return u3i_bytes(64, sig_y); } u3_noun u3_cwee_sign(u3_noun cor) { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, - u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, + u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { + return u3m_bail(c3__fail); } else { return _cqee_sign(a, b); } diff --git a/j/5/ed_veri.c b/j/5/ed_veri.c index d886dc08e9..500dc790f2 100644 --- a/j/5/ed_veri.c +++ b/j/5/ed_veri.c @@ -17,16 +17,16 @@ c3_w ret; c3_y* mes_y; - c3_w mesm_w = u3_cr_met(3, m); + c3_w mesm_w = u3r_met(3, m); memset(sig_y, 0, 64); memset(pub_y, 0, 32); mes_y = c3_malloc(mesm_w); - u3_cr_bytes(0, 64, sig_y, s); - u3_cr_bytes(0, 32, pub_y, pk); - u3_cr_bytes(0, mesm_w, mes_y, m); + u3r_bytes(0, 64, sig_y, s); + u3r_bytes(0, 32, pub_y, pk); + u3r_bytes(0, mesm_w, mes_y, m); ret = ed25519_verify(sig_y, mes_y, mesm_w, pub_y) == 1 ? c3y : c3n; free(mes_y); @@ -37,10 +37,10 @@ u3_cwee_veri(u3_noun cor) { u3_noun a, b, c; - if ( c3n == u3_cr_mean(cor, - u3_cv_sam_2, &a, u3_cv_sam_6, &b, - u3_cv_sam_7, &c, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, + u3v_sam_2, &a, u3v_sam_6, &b, + u3v_sam_7, &c, 0) ) { + return u3m_bail(c3__fail); } else { return _cqee_veri(a, b, c); } diff --git a/j/5/jam.c b/j/5/jam.c index cfe55bc6bf..0050d7579c 100644 --- a/j/5/jam.c +++ b/j/5/jam.c @@ -8,10 +8,10 @@ /* functions */ static u3_noun - _jam_in(u3p(u3_ch_root) har_p, u3_atom, u3_atom, u3_noun); + _jam_in(u3p(u3h_root) har_p, u3_atom, u3_atom, u3_noun); static u3_noun - _jam_in_pair(u3p(u3_ch_root) har_p, + _jam_in_pair(u3p(u3h_root) har_p, u3_atom h_a, u3_atom t_a, u3_atom b, @@ -23,13 +23,13 @@ u3_noun p_d, q_d, r_d; u3_noun r; - u3_cr_trel(d, &p_d, &q_d, &r_d); + u3r_trel(d, &p_d, &q_d, &r_d); { u3_noun y = u3_cqa_add(x, p_d); u3_noun e = _jam_in(har_p, t_a, y, q_d); u3_noun p_e, q_e, r_e; - u3_cr_trel(e, &p_e, &q_e, &r_e); + u3r_trel(e, &p_e, &q_e, &r_e); { u3_noun z = u3_cqa_add(p_d, p_e); @@ -48,7 +48,7 @@ } static u3_noun - _jam_in_flat(u3p(u3_ch_root) har_p, + _jam_in_flat(u3p(u3h_root) har_p, u3_atom a, u3_noun l) { @@ -63,7 +63,7 @@ } static u3_noun - _jam_in_ptr(u3p(u3_ch_root) har_p, + _jam_in_ptr(u3p(u3h_root) har_p, u3_atom u_c, u3_noun l) { @@ -80,16 +80,16 @@ } static u3_noun - _jam_in(u3p(u3_ch_root) har_p, + _jam_in(u3p(u3h_root) har_p, u3_noun a, u3_atom b, u3_noun l) { - u3_noun c = u3_ch_get(har_p, a); + u3_noun c = u3h_get(har_p, a); u3_noun x; if ( u3_none == c ) { - u3_ch_put(har_p, a, u3k(b)); + u3h_put(har_p, a, u3k(b)); if ( c3y == u3ud(a) ) { x = _jam_in_flat(har_p, a, l); @@ -98,7 +98,7 @@ } } else { - if ( c3y == u3ud(a) && u3_cr_met(0, a) <= u3_cr_met(0, c) ) { + if ( c3y == u3ud(a) && u3r_met(0, a) <= u3r_met(0, c) ) { x = _jam_in_flat(har_p, a, l); } else { @@ -111,7 +111,7 @@ u3_noun u3_cqe_jam(u3_atom a) { - u3p(u3_ch_root) har_p = u3_ch_new(); + u3p(u3h_root) har_p = u3h_new(); u3_noun x = _jam_in(har_p, a, 0, u3_nul); u3_noun q = u3_cqb_flop(u3h(u3t(x))); @@ -119,7 +119,7 @@ u3z(x); u3z(q); - u3_ch_free(har_p); + u3h_free(har_p); return r; } u3_noun @@ -127,8 +127,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { - return u3_cm_bail(c3__fail); + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { + return u3m_bail(c3__fail); } else { return u3_cqe_jam(a); } diff --git a/j/5/lore.c b/j/5/lore.c index 4bed2335f7..fc8b78f6e6 100644 --- a/j/5/lore.c +++ b/j/5/lore.c @@ -8,7 +8,7 @@ u3_noun u3_cqe_lore(u3_atom lub) { - c3_w len_w = u3_cr_met(3, lub); + c3_w len_w = u3r_met(3, lub); c3_w pos_w = 0; u3_noun tez = u3_nul; @@ -22,7 +22,7 @@ c3_y byt_y; while ( 1 ) { - byt_y = u3_cr_byte(pos_w + meg_w, lub); + byt_y = u3r_byte(pos_w + meg_w, lub); if ( (10 == byt_y) || (0 == byt_y) ) { break; @@ -30,14 +30,14 @@ } if ((byt_y == 0) && ((pos_w + meg_w + 1) < len_w)) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } { c3_y* byts_y = alloca(meg_w); - u3_cr_bytes(pos_w, meg_w, byts_y, lub); - tez = u3nc(u3_ci_bytes(meg_w, byts_y), tez); + u3r_bytes(pos_w, meg_w, byts_y, lub); + tez = u3nc(u3i_bytes(meg_w, byts_y), tez); pos_w += (meg_w + 1); } } @@ -49,10 +49,10 @@ { u3_noun lub; - if ( (u3_none == (lub = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (lub = u3r_at(u3v_sam, cor))) || (c3n == u3ud(lub)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqe_lore(lub); } diff --git a/j/5/loss.c b/j/5/loss.c index 4d029a942a..fee65bc58f 100644 --- a/j/5/loss.c +++ b/j/5/loss.c @@ -42,7 +42,7 @@ if ( u3_nul == kad ) { return u3_nul; } else { - return u3nc(u3k(loc_u->hev[u3_cr_word(0, u3h(kad))]), + return u3nc(u3k(loc_u->hev[u3r_word(0, u3h(kad))]), _lext(loc_u, u3t(kad))); } } @@ -96,7 +96,7 @@ u3_noun teg; hav = u3_ckdb_get(u3k(loc_u->sev), u3k(how)); - teg = u3nc(u3_ci_words(1, &i_w), + teg = u3nc(u3i_words(1, &i_w), (hav == u3_none) ? u3_nul : hav); loc_u->sev = u3_ckdb_put(loc_u->sev, u3k(how), teg); } @@ -112,7 +112,7 @@ { u3_noun kad; - kad = u3nc(u3_ci_words(1, &goy_w), + kad = u3nc(u3i_words(1, &goy_w), (inx_w == 0) ? u3_nul : u3k(loc_u->kad[inx_w - 1])); if ( loc_u->kct_w == inx_w ) { @@ -133,7 +133,7 @@ { return __ ( (loc_u->kct_w == inx_w) || - (u3_cr_word(0, u3h(loc_u->kad[inx_w])) > goy_w) ); + (u3r_word(0, u3h(loc_u->kad[inx_w])) > goy_w) ); } // extend fits bottom @@ -145,7 +145,7 @@ { return __ ( (0 == inx_w) || - (u3_cr_word(0, u3h(loc_u->kad[inx_w - 1])) < goy_w) ); + (u3r_word(0, u3h(loc_u->kad[inx_w - 1])) < goy_w) ); } #if 0 @@ -220,7 +220,7 @@ } else { u3_noun i_gay = u3h(gay); - c3_w goy_w = u3_cr_word(0, i_gay); + c3_w goy_w = u3r_word(0, i_gay); u3_noun bik; bik = _bink(loc_u, &inx_w, loc_u->kct_w, goy_w); @@ -286,12 +286,12 @@ { u3_noun hel, hev; - if ( (u3_none == (hel = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (hev = u3_cr_at(u3_cv_sam_3, cor))) || + if ( (u3_none == (hel = u3r_at(u3v_sam_2, cor))) || + (u3_none == (hev = u3r_at(u3v_sam_3, cor))) || (c3n == _listp(hel)) || (c3n == _listp(hev)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqe_loss(hel, hev); } diff --git a/j/5/mat.c b/j/5/mat.c index 2666d90c47..68494e03ff 100644 --- a/j/5/mat.c +++ b/j/5/mat.c @@ -45,8 +45,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { - return u3_cm_bail(c3__fail); + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { + return u3m_bail(c3__fail); } else { return u3_cqe_mat(a); } diff --git a/j/5/mink.c b/j/5/mink.c index aaf5636e64..2e99af1c8d 100644 --- a/j/5/mink.c +++ b/j/5/mink.c @@ -10,14 +10,14 @@ { u3_noun bus, fol, fly; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_4, &bus, - u3_cv_sam_5, &fol, - u3_cv_sam_3, &fly, + if ( c3n == u3r_mean(cor, u3v_sam_4, &bus, + u3v_sam_5, &fol, + u3v_sam_3, &fly, 0) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { - return u3_cn_nock_in(u3k(fly), u3k(bus), u3k(fol)); + return u3n_nock_in(u3k(fly), u3k(bus), u3k(fol)); } } diff --git a/j/5/mule.c b/j/5/mule.c index a882bac631..2aaecf3801 100644 --- a/j/5/mule.c +++ b/j/5/mule.c @@ -9,16 +9,16 @@ { u3_noun tap; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &tap, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &tap, 0) ) { + return u3m_bail(c3__exit); } else { - u3_noun hok = u3_cj_hook(u3k(cor), "mute"); + u3_noun hok = u3j_hook(u3k(cor), "mute"); /* this takes advantage of the fact that mute's result, at the typeless * C/Nock level, is identical to what a typed mule would produce, * without running the formula twice. */ - return u3_cn_slam_on(hok, u3k(tap)); + return u3n_slam_on(hok, u3k(tap)); } } diff --git a/j/5/parse.c b/j/5/parse.c index 627cca878d..99e299191d 100644 --- a/j/5/parse.c +++ b/j/5/parse.c @@ -12,15 +12,15 @@ { u3_noun p_naz, q_naz; - u3_cx_cell(naz, &p_naz, &q_naz); + u3x_cell(naz, &p_naz, &q_naz); if ( 10 == weq ) { - return u3nc(u3_cx_good( - u3_ci_vint(u3k(p_naz))), + return u3nc(u3x_good( + u3i_vint(u3k(p_naz))), 1); } else { return u3nc(u3k(p_naz), - u3_cx_good( - u3_ci_vint(u3k(q_naz)))); + u3x_good( + u3i_vint(u3k(q_naz)))); } } @@ -30,7 +30,7 @@ { u3_noun p_tub, q_tub; - u3_cx_cell(tub, &p_tub, &q_tub); + u3x_cell(tub, &p_tub, &q_tub); return u3nc(u3k(p_tub), u3_nul); } @@ -41,13 +41,13 @@ { u3_noun p_zyc, q_zyc, p_naz, q_naz; - u3_cx_cell(zyc, &p_zyc, &q_zyc); - u3_cx_cell(naz, &p_naz, &q_naz); + u3x_cell(zyc, &p_zyc, &q_zyc); + u3x_cell(naz, &p_naz, &q_naz); - if ( !_(u3_ca_is_cat(p_zyc)) || !_(u3_ca_is_cat(q_zyc)) || - !_(u3_ca_is_cat(p_naz)) || !_(u3_ca_is_cat(q_naz)) ) + if ( !_(u3a_is_cat(p_zyc)) || !_(u3a_is_cat(q_zyc)) || + !_(u3a_is_cat(p_naz)) || !_(u3a_is_cat(q_naz)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { if ( p_zyc == p_naz ) { return (q_zyc > q_naz) ? u3k(zyc) : u3k(naz); @@ -65,7 +65,7 @@ u3_noun p_tub, q_tub; u3_noun zac; - u3_cx_cell(tub, &p_tub, &q_tub); + u3x_cell(tub, &p_tub, &q_tub); if ( c3n == u3du(q_tub) ) { return _fail(tub); } @@ -93,7 +93,7 @@ { u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return u3k(vex); } else { @@ -103,10 +103,10 @@ u3_noun p_yit, q_yit; u3_noun ret; - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); - yit = u3_cx_good(u3_cn_slam_on(u3k(sab), u3k(quq_vex))); + u3x_cell(uq_vex, &puq_vex, &quq_vex); + yit = u3x_good(u3n_slam_on(u3k(sab), u3k(quq_vex))); - u3_cx_cell(yit, &p_yit, &q_yit); + u3x_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); if ( c3n == u3du(q_yit) ) { @@ -117,10 +117,10 @@ u3_noun puq_yit, quq_yit; u3_noun vux; - u3_cx_cell(uq_yit, &puq_yit, &quq_yit); + u3x_cell(uq_yit, &puq_yit, &quq_yit); - vux = u3_cx_good - (u3_cn_slam_on + vux = u3x_good + (u3n_slam_on (u3k(raq), u3nc(u3k(puq_vex), u3k(puq_yit)))); @@ -145,12 +145,12 @@ { u3_noun van, raq, vex, sab; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, - u3_cv_sam_3, &sab, - u3_cv_con, &van, 0)) || - (u3_none == (raq = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam_2, &vex, + u3v_sam_3, &sab, + u3v_con, &van, 0)) || + (u3_none == (raq = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_bend_fun(raq, vex, sab); } @@ -164,10 +164,10 @@ u3_noun sef, u3_noun tub) { - u3_noun vex = u3_cx_good(u3_cn_slam_on(u3k(sef), u3k(tub))); + u3_noun vex = u3x_good(u3n_slam_on(u3k(sef), u3k(tub))); u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return vex; @@ -177,7 +177,7 @@ u3_noun quq_vex; u3_noun ret; - u3_cx_cell(uq_vex, 0, &quq_vex); + u3x_cell(uq_vex, 0, &quq_vex); ret = u3nq(u3k(p_vex), u3_nul, u3k(cus), @@ -194,10 +194,10 @@ { u3_noun van, cus, sef, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (c3n == u3_cr_mean(van, u3_cv_sam_2, &cus, u3_cv_sam_3, &sef, 0)) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &van, 0)) || + (c3n == u3r_mean(van, u3v_sam_2, &cus, u3v_sam_3, &sef, 0)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_cold_fun(cus, sef, tub); } @@ -211,10 +211,10 @@ u3_noun sef, u3_noun tub) { - u3_noun vex = u3_cx_good(u3_cn_slam_on(u3k(sef), u3k(tub))); + u3_noun vex = u3x_good(u3n_slam_on(u3k(sef), u3k(tub))); u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return vex; @@ -225,8 +225,8 @@ u3_noun wag; u3_noun ret; - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); - wag = u3_cx_good(u3_cn_slam_on(u3k(poq), u3k(puq_vex))); + u3x_cell(uq_vex, &puq_vex, &quq_vex); + wag = u3x_good(u3n_slam_on(u3k(poq), u3k(puq_vex))); ret = u3nq(u3k(p_vex), u3_nul, wag, @@ -243,10 +243,10 @@ { u3_noun van, poq, sef, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (c3n == u3_cr_mean(van, u3_cv_sam_2, &poq, u3_cv_sam_3, &sef, 0)) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &van, 0)) || + (c3n == u3r_mean(van, u3v_sam_2, &poq, u3v_sam_3, &sef, 0)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_cook_fun(poq, sef, tub); } @@ -262,7 +262,7 @@ { u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return u3k(vex); } else { @@ -272,10 +272,10 @@ u3_noun p_yit, q_yit; u3_noun ret; - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); - yit = u3_cx_good(u3_cn_slam_on(u3k(sab), u3k(quq_vex))); + u3x_cell(uq_vex, &puq_vex, &quq_vex); + yit = u3x_good(u3n_slam_on(u3k(sab), u3k(quq_vex))); - u3_cx_cell(yit, &p_yit, &q_yit); + u3x_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); if ( c3n == u3du(q_yit) ) { @@ -285,12 +285,12 @@ u3_noun uq_yit = u3t(q_yit); u3_noun puq_yit, quq_yit; - u3_cx_cell(uq_yit, &puq_yit, &quq_yit); + u3x_cell(uq_yit, &puq_yit, &quq_yit); ret = u3nq(yur, u3_nul, - u3_cx_good + u3x_good ( - u3_cn_slam_on + u3n_slam_on (u3k(raq), u3nc(u3k(puq_vex), u3k(puq_yit)))), @@ -307,12 +307,12 @@ { u3_noun van, raq, vex, sab; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, - u3_cv_sam_3, &sab, - u3_cv_con, &van, 0)) || - (u3_none == (raq = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam_2, &vex, + u3v_sam_3, &sab, + u3v_con, &van, 0)) || + (u3_none == (raq = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_comp_fun(raq, vex, sab); } @@ -327,7 +327,7 @@ { u3_noun p_tub, q_tub; - u3_cx_cell(tub, &p_tub, &q_tub); + u3x_cell(tub, &p_tub, &q_tub); return u3nq(u3k(p_tub), u3_nul, u3k(huf), @@ -339,10 +339,10 @@ { u3_noun van, huf, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_none == (huf = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &van, 0)) || + (u3_none == (huf = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_easy_fun(huf, tub); } @@ -358,7 +358,7 @@ { u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return u3k(vex); } @@ -369,10 +369,10 @@ u3_noun p_yit, q_yit; u3_noun ret; - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); - yit = u3_cx_good(u3_cn_slam_on(u3k(bus), u3k(quq_vex))); + u3x_cell(uq_vex, &puq_vex, &quq_vex); + yit = u3x_good(u3n_slam_on(u3k(bus), u3k(quq_vex))); - u3_cx_cell(yit, &p_yit, &q_yit); + u3x_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); if ( c3n == u3du(q_yit) ) { @@ -383,10 +383,10 @@ u3_noun puq_yit, quq_yit; u3_noun wam, p_wam, q_wam, goy; - u3_cx_cell(uq_yit, &puq_yit, &quq_yit); - wam = u3_cx_good(u3_cn_slam_on(u3k(sab), u3k(quq_yit))); + u3x_cell(uq_yit, &puq_yit, &quq_yit); + wam = u3x_good(u3n_slam_on(u3k(sab), u3k(quq_yit))); - u3_cx_cell(wam, &p_wam, &q_wam); + u3x_cell(wam, &p_wam, &q_wam); goy = _last(yur, p_wam); u3z(yur); @@ -396,7 +396,7 @@ u3_noun uq_wam = u3t(q_wam); u3_noun puq_wam, quq_wam; - u3_cx_cell(uq_wam, &puq_wam, &quq_wam); + u3x_cell(uq_wam, &puq_wam, &quq_wam); ret = u3nq(goy, u3_nul, u3nc(u3k(puq_vex), @@ -416,12 +416,12 @@ { u3_noun van, bus, vex, sab; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, - u3_cv_sam_3, &sab, - u3_cv_con, &van, 0)) || - (u3_none == (bus = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam_2, &vex, + u3v_sam_3, &sab, + u3v_con, &van, 0)) || + (u3_none == (bus = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_glue_fun(bus, vex, sab); } @@ -435,10 +435,10 @@ u3_noun sef, u3_noun tub) { - u3_noun vex = u3_cx_good(u3_cn_slam_on(u3k(sef), u3k(tub))); + u3_noun vex = u3x_good(u3n_slam_on(u3k(sef), u3k(tub))); u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return vex; @@ -450,15 +450,15 @@ u3_noun gud, wag; u3_noun ret; - u3_cx_cell(tub, &p_tub, &q_tub); - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); - u3_cx_cell(quq_vex, &pquq_vex, 0); + u3x_cell(tub, &p_tub, &q_tub); + u3x_cell(uq_vex, &puq_vex, &quq_vex); + u3x_cell(quq_vex, &pquq_vex, 0); gud = u3nc( u3nc(u3k(p_tub), u3k(pquq_vex)), u3k(puq_vex)); - wag = u3_cx_good(u3_cn_slam_on(u3k(hez), gud)); + wag = u3x_good(u3n_slam_on(u3k(hez), gud)); ret = u3nq(u3k(p_vex), u3_nul, wag, @@ -475,10 +475,10 @@ { u3_noun van, hez, sef, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (c3n == u3_cr_mean(van, u3_cv_sam_2, &hez, u3_cv_sam_3, &sef, 0)) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &van, 0)) || + (c3n == u3r_mean(van, u3v_sam_2, &hez, u3v_sam_3, &sef, 0)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_here_fun(hez, sef, tub); @@ -494,7 +494,7 @@ { u3_noun p_tub, q_tub; - u3_cx_cell(tub, &p_tub, &q_tub); + u3x_cell(tub, &p_tub, &q_tub); if ( c3n == u3du(q_tub) ) { return _fail(tub); @@ -502,7 +502,7 @@ else { u3_noun iq_tub = u3h(q_tub); - if ( c3y == u3_cr_sing(daf, iq_tub) ) { + if ( c3y == u3r_sing(daf, iq_tub) ) { return _next(tub); } else return _fail(tub); @@ -514,10 +514,10 @@ { u3_noun van, daf, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_none == (daf = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &van, 0)) || + (u3_none == (daf = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_just_fun(daf, tub); } @@ -532,7 +532,7 @@ { u3_noun p_tub, q_tub; - u3_cx_cell(tub, &p_tub, &q_tub); + u3x_cell(tub, &p_tub, &q_tub); if ( c3n == u3du(q_tub) ) { return _fail(tub); @@ -541,7 +541,7 @@ u3_noun iq_tub = u3h(q_tub); while ( c3y == u3du(bud) ) { - if ( c3y == u3_cr_sing(u3h(bud), iq_tub) ) { + if ( c3y == u3r_sing(u3h(bud), iq_tub) ) { return _next(tub); } bud = u3t(bud); @@ -555,10 +555,10 @@ { u3_noun van, bud, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_none == (bud = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &van, 0)) || + (u3_none == (bud = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_mask_fun(bud, tub); } @@ -572,7 +572,7 @@ { u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return u3k(vex); } @@ -582,10 +582,10 @@ u3_noun yit, p_yit, q_yit; u3_noun ret; - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); - yit = u3_cx_good(u3_cn_slam_on(u3k(sab), u3k(quq_vex))); + u3x_cell(uq_vex, &puq_vex, &quq_vex); + yit = u3x_good(u3n_slam_on(u3k(sab), u3k(quq_vex))); - u3_cx_cell(yit, &p_yit, &q_yit); + u3x_cell(yit, &p_yit, &q_yit); ret = u3nc ( _last(p_vex, p_yit), @@ -601,8 +601,8 @@ { u3_noun vex, sab; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_mean(cor, u3v_sam_2, &vex, u3v_sam_3, &sab, 0)) ) { + return u3m_bail(c3__exit); } else { return _cqe_pfix(vex, sab); } @@ -617,7 +617,7 @@ { u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return u3k(vex); } @@ -628,10 +628,10 @@ u3_noun p_yit, q_yit; u3_noun ret; - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); - yit = u3_cx_good(u3_cn_slam_on(u3k(sab), u3k(quq_vex))); + u3x_cell(uq_vex, &puq_vex, &quq_vex); + yit = u3x_good(u3n_slam_on(u3k(sab), u3k(quq_vex))); - u3_cx_cell(yit, &p_yit, &q_yit); + u3x_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); if ( c3n == u3du(q_yit) ) { @@ -641,7 +641,7 @@ u3_noun uq_yit = u3t(q_yit); u3_noun puq_yit, quq_yit; - u3_cx_cell(uq_yit, &puq_yit, &quq_yit); + u3x_cell(uq_yit, &puq_yit, &quq_yit); ret = u3nq(yur, u3_nul, u3nc(u3k(puq_vex), @@ -658,8 +658,8 @@ { u3_noun vex, sab; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_mean(cor, u3v_sam_2, &vex, u3v_sam_3, &sab, 0)) ) { + return u3m_bail(c3__exit); } else { return _cqe_plug(vex, sab); } @@ -673,15 +673,15 @@ { u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3y == u3du(q_vex) ) { return u3k(vex); } else { - u3_noun roq = u3_cx_good(u3_cn_kick_on(u3k(sab))); + u3_noun roq = u3x_good(u3n_kick_on(u3k(sab))); u3_noun p_roq, q_roq; u3_noun ret; - u3_cx_cell(roq, &p_roq, &q_roq); + u3x_cell(roq, &p_roq, &q_roq); ret = u3nc ( _last(p_vex, p_roq), @@ -697,8 +697,8 @@ { u3_noun vex, sab; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_mean(cor, u3v_sam_2, &vex, u3v_sam_3, &sab, 0)) ) { + return u3m_bail(c3__exit); } else { return u3_cqe_pose(vex, sab); } @@ -711,7 +711,7 @@ { u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return u3k(vex); } @@ -721,10 +721,10 @@ u3_noun yit, p_yit, q_yit, yur; u3_noun ret; - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); - yit = u3_cx_good(u3_cn_slam_on(u3k(sab), u3k(quq_vex))); + u3x_cell(uq_vex, &puq_vex, &quq_vex); + yit = u3x_good(u3n_slam_on(u3k(sab), u3k(quq_vex))); - u3_cx_cell(yit, &p_yit, &q_yit); + u3x_cell(yit, &p_yit, &q_yit); yur = _last(p_vex, p_yit); if ( c3n == u3du(q_yit) ) { @@ -734,7 +734,7 @@ u3_noun uq_yit = u3t(q_yit); u3_noun puq_yit, quq_yit; - u3_cx_cell(uq_yit, &puq_yit, &quq_yit); + u3x_cell(uq_yit, &puq_yit, &quq_yit); ret = u3nq(yur, u3_nul, @@ -750,8 +750,8 @@ { u3_noun vex, sab; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { - return u3_cm_bail(c3__exit); + if ( (c3n == u3r_mean(cor, u3v_sam_2, &vex, u3v_sam_3, &sab, 0)) ) { + return u3m_bail(c3__exit); } else { return _cqe_sfix(vex, sab); } @@ -765,7 +765,7 @@ { u3_noun p_tub, q_tub; - u3_cx_cell(tub, &p_tub, &q_tub); + u3x_cell(tub, &p_tub, &q_tub); if ( c3n == u3du(q_tub) ) { return _fail(tub); @@ -774,10 +774,10 @@ u3_noun p_zep, q_zep; u3_noun iq_tub = u3h(q_tub); - u3_cx_cell(zep, &p_zep, &q_zep); - if ( _(u3_ca_is_cat(p_zep)) && - _(u3_ca_is_cat(q_zep)) && - _(u3_ca_is_cat(iq_tub)) ) + u3x_cell(zep, &p_zep, &q_zep); + if ( _(u3a_is_cat(p_zep)) && + _(u3a_is_cat(q_zep)) && + _(u3a_is_cat(iq_tub)) ) { if ( (iq_tub >= p_zep) && (iq_tub <= q_zep) ) { return _next(tub); @@ -785,7 +785,7 @@ else return _fail(tub); } else { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } } } @@ -795,10 +795,10 @@ { u3_noun van, zep, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (u3_none == (zep = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &van, 0)) || + (u3_none == (zep = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_shim_fun(zep, tub); } @@ -812,10 +812,10 @@ u3_noun sef, u3_noun tub) { - u3_noun vex = u3_cx_good(u3_cn_slam_on(u3k(sef), u3k(tub))); + u3_noun vex = u3x_good(u3n_slam_on(u3k(sef), u3k(tub))); u3_noun p_vex, q_vex; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { return vex; @@ -826,7 +826,7 @@ u3_noun wag; u3_noun ret; - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); + u3x_cell(uq_vex, &puq_vex, &quq_vex); wag = u3nc(u3k(gob), u3k(puq_vex)); ret = u3nq(u3k(p_vex), u3_nul, @@ -844,10 +844,10 @@ { u3_noun van, gob, sef, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (c3n == u3_cr_mean(van, u3_cv_sam_2, &gob, u3_cv_sam_3, &sef, 0)) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &van, 0)) || + (c3n == u3r_mean(van, u3v_sam_2, &gob, u3v_sam_3, &sef, 0)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_stag_fun(gob, sef, tub); } @@ -860,21 +860,21 @@ u3_noun ort, u3_noun wan) { - if ( !_(u3_ca_is_cat(ort)) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(ort)) ) { + return u3m_bail(c3__fail); } else { if ( c3n == u3du(wan) ) { - if ( !_(u3_ca_is_cat(wan)) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(wan)) ) { + return u3m_bail(c3__fail); } else return (ort < wan) ? c3y : c3n; } else { u3_noun h_wan = u3h(wan); - if ( !_(u3_ca_is_cat(h_wan)) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(h_wan)) ) { + return u3m_bail(c3__fail); } else return (ort < h_wan) ? c3y : c3n; } @@ -888,15 +888,15 @@ { u3_noun p_tub, q_tub; - u3_cx_cell(tub, &p_tub, &q_tub); + u3x_cell(tub, &p_tub, &q_tub); if ( c3n == u3du(q_tub) ) { return _fail(tub); } else { u3_noun iq_tub = u3h(q_tub); - if ( !_(u3_ca_is_cat(iq_tub)) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(iq_tub)) ) { + return u3m_bail(c3__fail); } else while ( 1 ) { if ( c3n == u3du(hel) ) { @@ -907,8 +907,8 @@ u3_noun pn_hel, qn_hel; c3_o bit_o; - u3_cx_trel(hel, &n_hel, &l_hel, &r_hel); - u3_cx_cell(n_hel, &pn_hel, &qn_hel); + u3x_trel(hel, &n_hel, &l_hel, &r_hel); + u3x_cell(n_hel, &pn_hel, &qn_hel); if ( (c3n == u3du(pn_hel)) ) { bit_o = __((iq_tub == pn_hel)); @@ -917,16 +917,16 @@ u3_noun hpn_hel = u3h(pn_hel); u3_noun tpn_hel = u3t(pn_hel); - if ( !_(u3_ca_is_cat(hpn_hel)) || - !_(u3_ca_is_cat(tpn_hel)) ) { + if ( !_(u3a_is_cat(hpn_hel)) || + !_(u3a_is_cat(tpn_hel)) ) { return _fail(tub); } else bit_o = __((iq_tub >= hpn_hel) && (iq_tub <= tpn_hel)); } if ( c3y == bit_o ) { - return u3_cx_good - (u3_cn_slam_on(u3k(qn_hel), u3k(tub))); + return u3x_good + (u3n_slam_on(u3k(qn_hel), u3k(tub))); } else { if ( c3y == _stew_wor(iq_tub, pn_hel) ) { hel = l_hel; @@ -943,10 +943,10 @@ { u3_noun con, hel, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &con, 0)) || - (u3_none == (hel = u3_cr_at(2, con))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &con, 0)) || + (u3_none == (hel = u3r_at(2, con))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_stew_fun(hel, tub); } @@ -960,11 +960,11 @@ u3_noun fel, u3_noun tub) { - u3_noun vex = u3_cx_good(u3_cn_slam_on(u3k(fel), u3k(tub))); + u3_noun vex = u3x_good(u3n_slam_on(u3k(fel), u3k(tub))); u3_noun p_vex, q_vex; u3_noun ret; - u3_cx_cell(vex, &p_vex, &q_vex); + u3x_cell(vex, &p_vex, &q_vex); if ( c3n == u3du(q_vex) ) { ret = u3nq(u3k(p_vex), u3_nul, @@ -976,20 +976,20 @@ u3_noun puq_vex, quq_vex; u3_noun wag, p_wag, q_wag, uq_wag, puq_wag, quq_wag; - u3_cx_cell(uq_vex, &puq_vex, &quq_vex); + u3x_cell(uq_vex, &puq_vex, &quq_vex); wag = _cqe_stir_fun(rud, raq, fel, quq_vex); - u3_cx_cell(wag, &p_wag, &q_wag); + u3x_cell(wag, &p_wag, &q_wag); if ( c3n == u3du(q_wag) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } uq_wag = u3t(q_wag); - u3_cx_cell(uq_wag, &puq_wag, &quq_wag); + u3x_cell(uq_wag, &puq_wag, &quq_wag); ret = u3nq (_last(p_vex, p_wag), u3_nul, - u3_cx_good(u3_cn_slam_on + u3x_good(u3n_slam_on (u3k(raq), u3nc(u3k(puq_vex), u3k(puq_wag)))), @@ -1005,13 +1005,13 @@ { u3_noun van, rud, raq, fel, tub; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || - (c3n == u3_cr_mean(van, u3_cv_sam_2, &rud, - u3_cv_sam_6, &raq, - u3_cv_sam_7, &fel, + if ( (c3n == u3r_mean(cor, u3v_sam, &tub, u3v_con, &van, 0)) || + (c3n == u3r_mean(van, u3v_sam_2, &rud, + u3v_sam_6, &raq, + u3v_sam_7, &fel, 0)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqe_stir_fun(rud, raq, fel, tub); } diff --git a/j/5/rd.c b/j/5/rd.c index 2630b22063..c85b9559d4 100644 --- a/j/5/rd.c +++ b/j/5/rd.c @@ -19,9 +19,9 @@ union doub { u3_cqer_sun(u3_atom a) { union doub b; - b.d = (double) u3_cr_chub(0, a); + b.d = (double) u3r_chub(0, a); - return u3_ci_chubs(1, &b.c); + return u3i_chubs(1, &b.c); } u3_noun @@ -29,9 +29,9 @@ union doub { { u3_noun a; - if (c3n == u3_cr_mean(cor, u3_cv_sam, &a, 0) + if (c3n == u3r_mean(cor, u3v_sam, &a, 0) || c3n == u3ud(a)) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqer_sun(a); @@ -44,11 +44,11 @@ union doub { u3_cqer_mul(u3_atom a, u3_atom b) { union doub c, d, e; - c.c = u3_cr_chub(0, a); - d.c = u3_cr_chub(0, b); + c.c = u3r_chub(0, a); + d.c = u3r_chub(0, b); e.d = c.d * d.d; - return u3_ci_chubs(1, &e.c); + return u3i_chubs(1, &e.c); } u3_noun @@ -56,11 +56,11 @@ union doub { { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqer_mul(a, b); @@ -73,11 +73,11 @@ union doub { u3_cqer_div(u3_atom a, u3_atom b) { union doub c, d, e; - c.c = u3_cr_chub(0, a); - d.c = u3_cr_chub(0, b); + c.c = u3r_chub(0, a); + d.c = u3r_chub(0, b); e.d = c.d / d.d; - return u3_ci_chubs(1, &e.c); + return u3i_chubs(1, &e.c); } u3_noun @@ -85,11 +85,11 @@ union doub { { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqer_div(a, b); @@ -102,11 +102,11 @@ union doub { u3_cqer_add(u3_atom a, u3_atom b) { union doub c, d, e; - c.c = u3_cr_chub(0, a); - d.c = u3_cr_chub(0, b); + c.c = u3r_chub(0, a); + d.c = u3r_chub(0, b); e.d = c.d + d.d; - return u3_ci_chubs(1, &e.c); + return u3i_chubs(1, &e.c); } u3_noun @@ -114,11 +114,11 @@ union doub { { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqer_add(a, b); @@ -131,11 +131,11 @@ union doub { u3_cqer_sub(u3_atom a, u3_atom b) { union doub c, d, e; - c.c = u3_cr_chub(0, a); - d.c = u3_cr_chub(0, b); + c.c = u3r_chub(0, a); + d.c = u3r_chub(0, b); e.d = c.d - d.d; - return u3_ci_chubs(1, &e.c); + return u3i_chubs(1, &e.c); } u3_noun @@ -143,11 +143,11 @@ union doub { { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqer_sub(a, b); @@ -160,8 +160,8 @@ union doub { u3_cqer_lte(u3_atom a, u3_atom b) { union doub c, d; - c.c = u3_cr_chub(0, a); - d.c = u3_cr_chub(0, b); + c.c = u3r_chub(0, a); + d.c = u3r_chub(0, b); return __(c.d <= d.d); } @@ -171,11 +171,11 @@ union doub { { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqer_lte(a, b); @@ -188,8 +188,8 @@ union doub { u3_cqer_lth(u3_atom a, u3_atom b) { union doub c, d; - c.c = u3_cr_chub(0, a); - d.c = u3_cr_chub(0, b); + c.c = u3r_chub(0, a); + d.c = u3r_chub(0, b); return __(c.d < d.d); } @@ -199,11 +199,11 @@ union doub { { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqer_lth(a, b); @@ -216,8 +216,8 @@ union doub { u3_cqer_gte(u3_atom a, u3_atom b) { union doub c, d; - c.c = u3_cr_chub(0, a); - d.c = u3_cr_chub(0, b); + c.c = u3r_chub(0, a); + d.c = u3r_chub(0, b); return __(c.d >= d.d); } @@ -227,11 +227,11 @@ union doub { { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqer_gte(a, b); @@ -244,8 +244,8 @@ union doub { u3_cqer_gth(u3_atom a, u3_atom b) { union doub c, d; - c.c = u3_cr_chub(0, a); - d.c = u3_cr_chub(0, b); + c.c = u3r_chub(0, a); + d.c = u3r_chub(0, b); return __(c.d > d.d); } @@ -255,11 +255,11 @@ union doub { { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || + if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) || c3n == u3ud(a) || c3n == u3ud(b) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqer_gth(a, b); diff --git a/j/5/repg.c b/j/5/repg.c index 54f7819445..dd500ad7c1 100644 --- a/j/5/repg.c +++ b/j/5/repg.c @@ -10,9 +10,9 @@ u3_noun u3_cqe_repg(u3_noun lub, u3_noun rad, u3_noun rep) { - c3_y* lub_y = u3_cr_tape(lub); - c3_y* rad_y = u3_cr_tape(rad); - c3_y* rep_y = u3_cr_tape(rep); + c3_y* lub_y = u3r_tape(lub); + c3_y* rad_y = u3r_tape(rad); + c3_y* rep_y = u3r_tape(rep); char* rec = (char*)lub_y; @@ -72,17 +72,17 @@ if (!match) { if(rad_y[ic]) - ret = u3_ci_cell((c3_y)rad_y[ic], ret); + ret = u3i_cell((c3_y)rad_y[ic], ret); ic++; } else { int mlen = matches[0].length; if (mlen == 0) { - ret = u3_ckb_weld(u3_ckb_flop(u3_ci_tape((char *) rad_y+ic)), u3_ckb_flop(u3_ci_tape((char *)rep_y))); + ret = u3_ckb_weld(u3_ckb_flop(u3i_tape((char *) rad_y+ic)), u3_ckb_flop(u3i_tape((char *)rep_y))); ic = text_len + 1; } else { - ret = u3_ckb_weld(u3_ckb_flop(u3_ci_tape((char *)rep_y)), ret); + ret = u3_ckb_weld(u3_ckb_flop(u3i_tape((char *)rep_y)), ret); ic += mlen; } } @@ -92,7 +92,7 @@ free(lub_y); free(rad_y); free(rep_y); - return u3_ci_cell(u3_nul, u3_ckb_flop(ret)); + return u3i_cell(u3_nul, u3_ckb_flop(ret)); } else { // Compiling the regular expression failed @@ -110,14 +110,14 @@ cre2_opt_delete(opt); free(lub_y); free(rad_y); - u3_cm_bail(c3__exit); + u3m_bail(c3__exit); } cre2_opt_delete(opt); } // opt Allocation Error free(lub_y); free(rad_y); - u3_cm_bail(c3__exit); + u3m_bail(c3__exit); return u3_nul; } @@ -128,11 +128,11 @@ u3_noun rad; u3_noun rep; - if ( (u3_none == (lub = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (rad = u3_cr_at(u3_cv_sam_6, cor))) || - (u3_none == (rep = u3_cr_at(u3_cv_sam_7, cor))) ) + if ( (u3_none == (lub = u3r_at(u3v_sam_2, cor))) || + (u3_none == (rad = u3r_at(u3v_sam_6, cor))) || + (u3_none == (rep = u3r_at(u3v_sam_7, cor))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqe_repg(lub, rad, rep); } diff --git a/j/5/rexp.c b/j/5/rexp.c index 7bbd08b175..b1e929bd8d 100644 --- a/j/5/rexp.c +++ b/j/5/rexp.c @@ -10,8 +10,8 @@ u3_noun u3_cqe_rexp(u3_noun lub, u3_noun rad) { - c3_y* lub_y = u3_cr_tape(lub); - c3_y* rad_y = u3_cr_tape(rad); + c3_y* lub_y = u3r_tape(lub); + c3_y* rad_y = u3r_tape(rad); u3k(lub); int lub_l = u3_ckb_lent(lub); @@ -84,7 +84,7 @@ cre2_delete(rex); free(lub_y); free(rad_y); - return u3_ci_cell(u3_nul, u3_nul); + return u3i_cell(u3_nul, u3_nul); } u3_noun map = u3_nul; @@ -94,7 +94,7 @@ char * buf = malloc(matches[i].length + 1); memcpy(buf, matches[i].data, matches[i].length); buf[matches[i].length] = 0; - map = u3_ckdb_put(map, i, u3_ci_tape(buf)); + map = u3_ckdb_put(map, i, u3i_tape(buf)); free(buf); } @@ -102,7 +102,7 @@ cre2_delete(rex); free(lub_y); free(rad_y); - return u3_ci_cell(u3_nul, u3_ci_cell(u3_nul, map)); + return u3i_cell(u3_nul, u3i_cell(u3_nul, map)); } else { @@ -119,7 +119,7 @@ } free(lub_y); free(rad_y); - u3_cm_bail(c3__exit); + u3m_bail(c3__exit); return u3_nul; } @@ -129,10 +129,10 @@ u3_noun lub; u3_noun rad; - if ( (u3_none == (lub = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (rad = u3_cr_at(u3_cv_sam_3, cor))) ) + if ( (u3_none == (lub = u3r_at(u3v_sam_2, cor))) || + (u3_none == (rad = u3r_at(u3v_sam_3, cor))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqe_rexp(lub, rad); } diff --git a/j/5/rub.c b/j/5/rub.c index c81c228c66..3aeebe2a8b 100644 --- a/j/5/rub.c +++ b/j/5/rub.c @@ -16,7 +16,7 @@ u3_atom w, x, y, z; u3_atom p, q; - u3_atom m = u3_cqa_add(a, u3_cr_met(0, b)); + u3_atom m = u3_cqa_add(a, u3r_met(0, b)); // Compute c and d. { @@ -28,13 +28,13 @@ // Sanity check: crash if decoding more bits than available if ( c3y == u3_cqa_gth(x, m)) { // fprintf(stderr, "[%%rub-hard %d %d %d]\r\n", a, x, m); - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } u3z(x); x = y; } - if ( c3y == u3_cr_sing(x, a) ) { + if ( c3y == u3r_sing(x, a) ) { u3z(x); return u3nc(1, 0); } @@ -71,11 +71,11 @@ { u3_noun a, b; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) || (c3n == u3ud(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqe_rub(a, b); } diff --git a/j/5/shax.c b/j/5/shax.c index b268db1767..13a78e8606 100644 --- a/j/5/shax.c +++ b/j/5/shax.c @@ -17,10 +17,10 @@ u3_cqe_shax( u3_atom a) { - c3_w met_w = u3_cr_met(3, a); + c3_w met_w = u3r_met(3, a); c3_y* fat_y = c3_malloc(met_w + 1); - u3_cr_bytes(0, met_w, fat_y, a); + u3r_bytes(0, met_w, fat_y, a); { c3_y dig_y[32]; #if defined(U3_OS_osx) @@ -37,7 +37,7 @@ SHA256_Final(dig_y, &ctx_h); #endif free(fat_y); - return u3_ci_bytes(32, dig_y); + return u3i_bytes(32, dig_y); } } @@ -45,10 +45,10 @@ u3_cqe_shal(u3_atom a, u3_atom b) { - c3_assert(_(u3_ca_is_cat(a))); + c3_assert(_(u3a_is_cat(a))); c3_y* fat_y = c3_malloc(a + 1); - u3_cr_bytes(0, a, fat_y, b); + u3r_bytes(0, a, fat_y, b); { c3_y dig_y[64]; #if defined(U3_OS_osx) @@ -65,7 +65,7 @@ SHA512_Final(dig_y, &ctx_h); #endif free(fat_y); - return u3_ci_bytes(64, dig_y); + return u3i_bytes(64, dig_y); } } @@ -87,10 +87,10 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) || (c3n == u3ud(a)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqe_shax(a); } @@ -101,13 +101,13 @@ { u3_noun a, b; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (b = u3_cr_at(u3_cv_sam_3, cor))) || + if ( (u3_none == (a = u3r_at(u3v_sam_2, cor))) || + (u3_none == (b = u3r_at(u3v_sam_3, cor))) || (c3n == u3ud(a)) || - (c3n == u3_ca_is_cat(a)) || + (c3n == u3a_is_cat(a)) || (c3n == u3ud(b)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqe_shal(a, b); } @@ -118,12 +118,12 @@ { u3_noun sal, ruz; - if ( (u3_none == (sal = u3_cr_at(u3_cv_sam_2, cor))) || - (u3_none == (ruz = u3_cr_at(u3_cv_sam_3, cor))) || + if ( (u3_none == (sal = u3r_at(u3v_sam_2, cor))) || + (u3_none == (ruz = u3r_at(u3v_sam_3, cor))) || (c3n == u3ud(sal)) || (c3n == u3ud(ruz)) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return u3_cqe_shas(sal, ruz); } @@ -137,8 +137,8 @@ { u3_noun l = u3_nul; - if ( !_(u3_ca_is_cat(b)) ) { - return u3_cm_bail(c3__fail); + if ( !_(u3a_is_cat(b)) ) { + return u3m_bail(c3__fail); } while ( 0 != b ) { u3_noun x = u3_cqc_mix(a, c); @@ -185,8 +185,8 @@ { u3_noun a, b; - if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { - return u3_cm_bail(c3__exit); + if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { + return u3m_bail(c3__exit); } else { return u3_cqeo_raw(a, b); } diff --git a/j/5/tape.c b/j/5/tape.c index f2562998ff..70916a5d5c 100644 --- a/j/5/tape.c +++ b/j/5/tape.c @@ -48,8 +48,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { - return u3_cm_bail(c3__fail); + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { + return u3m_bail(c3__fail); } else { return u3_cqe_tape(a); } diff --git a/j/5/trip.c b/j/5/trip.c index e79eb14e4f..f7ac286844 100644 --- a/j/5/trip.c +++ b/j/5/trip.c @@ -11,7 +11,7 @@ u3_cqe_trip(u3_atom a) { if ( c3n == u3ud(a) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } return u3_cqc_rip(3, a); } @@ -20,8 +20,8 @@ { u3_noun a; - if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { - return u3_cm_bail(c3__fail); + if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { + return u3m_bail(c3__fail); } else { return u3_cqe_trip(a); } diff --git a/j/6/al.c b/j/6/al.c index cf2e3616f2..153dcafb0a 100644 --- a/j/6/al.c +++ b/j/6/al.c @@ -11,10 +11,10 @@ static u3_noun _al_core(u3_noun van, u3_noun gen) { - u3_noun ter = u3_cr_at(u3_cv_con_3, van); - u3_noun gat = u3_cj_hook(u3k(ter), "al"); + u3_noun ter = u3r_at(u3v_con_3, van); + u3_noun gat = u3j_hook(u3k(ter), "al"); - return u3_ci_molt(gat, u3_cv_sam, u3k(gen), 0); + return u3i_molt(gat, u3v_sam, u3k(gen), 0); } /* ~(bunt al gen) @@ -24,7 +24,7 @@ u3_cqfl_bunt(u3_noun van, u3_noun gen) { u3_noun cor = _al_core(van, gen); - return u3_cj_hook(cor, "bunt"); + return u3j_hook(cor, "bunt"); } /* ~(whip al gen) @@ -35,7 +35,7 @@ u3_cqfl_whip(u3_noun van, u3_noun axe) // { u3_noun cor = _al_core(van, gen); - u3_noun gat = u3_cj_hook(u3k(cor), "whip"); + u3_noun gat = u3j_hook(u3k(cor), "whip"); - return u3_cn_slam_on(gat, u3k(axe)); + return u3n_slam_on(gat, u3k(axe)); } diff --git a/j/6/ap.c b/j/6/ap.c index 926f20f6d6..0da5ff56f5 100644 --- a/j/6/ap.c +++ b/j/6/ap.c @@ -28,9 +28,9 @@ static u3_noun _al_core(u3_noun ter, u3_noun gen) { - u3_noun gat = u3_cj_hook(u3k(ter), "al"); + u3_noun gat = u3j_hook(u3k(ter), "al"); - return u3_ci_molt(gat, u3_cv_sam, u3k(gen), 0); + return u3i_molt(gat, u3v_sam, u3k(gen), 0); } /* van is transferred, gen is retained @@ -598,7 +598,7 @@ u3_noun tr_gen = u3t(r_gen); u3_noun pir_gen, qir_gen; - u3_cx_cell(ir_gen, &pir_gen, &qir_gen); + u3x_cell(ir_gen, &pir_gen, &qir_gen); return u3nc (u3nc @@ -747,7 +747,7 @@ if ( c3y == u3ud(gen) ) { // printf("studly\n"); // u3_err("stud m", gen); - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); return u3nt (c3__cnts, @@ -770,22 +770,22 @@ # define _open_pq(stem) \ case c3__##stem: \ - if ( c3n == u3_cr_cell(u3t(gen), &p_gen, &q_gen) ) { \ - return u3_cm_bail(c3__fail); \ + if ( c3n == u3r_cell(u3t(gen), &p_gen, &q_gen) ) { \ + return u3m_bail(c3__fail); \ } else return _open_in_##stem(ter, p_gen, q_gen); # define _open_pqr(stem) \ case c3__##stem: \ - if ( c3n == u3_cr_trel(u3t(gen), &p_gen, &q_gen, &r_gen) ) { \ - return u3_cm_bail(c3__fail); \ + if ( c3n == u3r_trel(u3t(gen), &p_gen, &q_gen, &r_gen) ) { \ + return u3m_bail(c3__fail); \ } else return _open_in_##stem(ter, p_gen, q_gen, r_gen); # define _open_pqrs(stem) \ case c3__##stem: \ - if ( c3n == u3_cr_qual\ + if ( c3n == u3r_qual\ (u3t(gen), &p_gen, &q_gen, &r_gen, &s_gen) )\ { \ - return u3_cm_bail(c3__fail); \ + return u3m_bail(c3__fail); \ } else return _open_in_##stem(ter, p_gen, q_gen, r_gen, s_gen); _open_p (bccb); @@ -873,7 +873,7 @@ return u3nc(u3k(gen), u3_nul); } else switch ( u3h(gen) ) { - default: return u3_cm_error("rake-twig"); + default: return u3m_error("rake-twig"); case u3_nul: return u3nc(u3k(gen), u3_nul); @@ -884,12 +884,12 @@ return u3k(u3t(gen)); } case c3__cnts: { - if ( c3n == u3_cr_cell(u3t(gen), &p_gen, &q_gen) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_cell(u3t(gen), &p_gen, &q_gen) ) { + return u3m_bail(c3__fail); } else { if ( u3_nul != q_gen ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3k(p_gen); @@ -897,8 +897,8 @@ } } case c3__zpcb: { - if ( c3n == u3_cr_cell(u3t(gen), &p_gen, &q_gen) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_cell(u3t(gen), &p_gen, &q_gen) ) { + return u3m_bail(c3__fail); } else return u3_cqfp_rake(q_gen); } @@ -910,8 +910,8 @@ { u3_noun gen; - if ( u3_none == (gen = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__fail); + if ( u3_none == (gen = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__fail); } else { return u3_cqfp_rake(gen); } @@ -933,7 +933,7 @@ u3k(u3t(gen))); } else switch ( u3h(gen) ) { - case c3__tsgr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__tsgr: u3x_cell(u3t(gen), &p_gen, &q_gen); { if ( (c3n == u3du(p_gen)) || (u3_nul != u3h(p_gen)) ) { return u3nc(c3n, u3k(gen)); @@ -962,7 +962,7 @@ return ret; } } - case c3__zpcb: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen); { u3_noun pyr = u3_cqfp_hack(ter, q_gen); @@ -995,7 +995,7 @@ if ( u3_none == voq ) { return u3nc(c3n, u3k(gen)); } - else if ( c3y == u3_cr_sing(voq, gen) ) { + else if ( c3y == u3r_sing(voq, gen) ) { return u3nc(c3n, voq); } else { @@ -1013,10 +1013,10 @@ { u3_noun gen; - if ( u3_none == (gen = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__fail); + if ( u3_none == (gen = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__fail); } else { - u3_noun ter = u3_cr_at(u3_cv_con, cor); + u3_noun ter = u3r_at(u3v_con, cor); return u3_cqfp_hack(ter, gen); } @@ -1027,9 +1027,9 @@ u3_noun _ap_core(u3_noun ter, u3_noun gen) { - u3_noun gat = u3_cj_hook(u3k(ter), "ap"); + u3_noun gat = u3j_hook(u3k(ter), "ap"); - return u3_ci_molt(gat, u3_cv_sam, u3k(gen), 0); + return u3i_molt(gat, u3v_sam, u3k(gen), 0); } /* open @@ -1040,7 +1040,7 @@ { u3_noun cor = _ap_core(ter, gen); - return u3_cj_soft(cor, "open"); + return u3j_soft(cor, "open"); } static u3_noun _ap_open_l(u3_noun ter, u3_noun gen) @@ -1065,10 +1065,10 @@ { u3_noun gen; - if ( u3_none == (gen = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__fail); + if ( u3_none == (gen = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__fail); } else { - u3_noun ter = u3_cr_at(u3_cv_con, cor); + u3_noun ter = u3r_at(u3v_con, cor); return u3_cqfp_open(ter, gen); } diff --git a/j/6/bull.c b/j/6/bull.c index bad6ab1743..9307d35cf4 100644 --- a/j/6/bull.c +++ b/j/6/bull.c @@ -26,8 +26,8 @@ { u3_noun bid, der; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &bid, u3_cv_sam_3, &der, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &bid, u3v_sam_3, &der, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_bull(bid, der); } diff --git a/j/6/cell.c b/j/6/cell.c index 14859c03d0..098852be2a 100644 --- a/j/6/cell.c +++ b/j/6/cell.c @@ -22,8 +22,8 @@ { u3_noun hed, tal; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &hed, u3_cv_sam_3, &tal, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &hed, u3v_sam_3, &tal, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_cell(hed, tal); } diff --git a/j/6/comb.c b/j/6/comb.c index e118673f10..81e921b0f9 100644 --- a/j/6/comb.c +++ b/j/6/comb.c @@ -18,15 +18,15 @@ else { u3_noun p_mal, q_mal, p_buz, q_buz, pp_buz, pq_buz; - if ( (c3y == u3_cr_p(mal, 0, &p_mal)) && (0 != p_mal) ) { - if ( (c3y == u3_cr_p(buz, 0, &p_buz)) && (0 != p_buz) ) { + if ( (c3y == u3r_p(mal, 0, &p_mal)) && (0 != p_mal) ) { + if ( (c3y == u3r_p(buz, 0, &p_buz)) && (0 != p_buz) ) { return u3nc( 0, u3_cqc_peg(p_mal, p_buz)); } - else if ( c3y == u3_cr_pq(buz, 2, &p_buz, &q_buz) && - c3y == u3_cr_p(p_buz, 0, &pp_buz) && - c3y == u3_cr_p(q_buz, 0, &pq_buz) ) + else if ( c3y == u3r_pq(buz, 2, &p_buz, &q_buz) && + c3y == u3r_p(p_buz, 0, &pp_buz) && + c3y == u3r_p(q_buz, 0, &pq_buz) ) { return u3nt (2, @@ -39,7 +39,7 @@ u3k(buz)); } #if 1 - else if ( (c3y == u3_cr_bush(mal, &p_mal, &q_mal)) && + else if ( (c3y == u3r_bush(mal, &p_mal, &q_mal)) && (c3y == u3du(p_mal)) && (c3y == u3du(q_mal)) && (0 == u3h(q_mal)) && @@ -49,8 +49,8 @@ u3k(buz)); } #endif - else if ( (c3y == u3_cr_p(buz, 0, &p_buz)) && - (c3y == u3_cr_sing(1, p_buz)) ) + else if ( (c3y == u3r_p(buz, 0, &p_buz)) && + (c3y == u3r_sing(1, p_buz)) ) { return u3k(mal); } @@ -64,7 +64,7 @@ { u3_noun mal, buz; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &mal, u3_cv_sam_3, &buz, 0) ) { + if ( c3n == u3r_mean(cor, u3v_sam_2, &mal, u3v_sam_3, &buz, 0) ) { return u3_none; } else { return u3_cqf_comb(mal, buz); diff --git a/j/6/cons.c b/j/6/cons.c index c6f2ebe577..a2b77ebcac 100644 --- a/j/6/cons.c +++ b/j/6/cons.c @@ -14,22 +14,22 @@ { u3_noun p_vur, p_sed; - if ( c3y == u3_cr_p(vur, 1, &p_vur) && - c3y == u3_cr_p(sed, 1, &p_sed) ) { + if ( c3y == u3r_p(vur, 1, &p_vur) && + c3y == u3r_p(sed, 1, &p_sed) ) { return u3nt(1, u3k(p_vur), u3k(p_sed)); } - else if ( c3y == u3_cr_p(vur, 0, &p_vur) && - c3y == u3_cr_p(sed, 0, &p_sed) && - !(c3y == u3_cr_sing(1, p_vur)) && - !(c3y == u3_cr_sing(p_vur, p_sed)) && - (0 == u3_cr_nord(p_vur, p_sed)) ) + else if ( c3y == u3r_p(vur, 0, &p_vur) && + c3y == u3r_p(sed, 0, &p_sed) && + !(c3y == u3r_sing(1, p_vur)) && + !(c3y == u3r_sing(p_vur, p_sed)) && + (0 == u3r_nord(p_vur, p_sed)) ) { u3_atom fub = u3_cqa_div(p_vur, 2); u3_atom nof = u3_cqa_div(p_sed, 2); - if ( c3y == u3_cr_sing(fub, nof) ) { + if ( c3y == u3r_sing(fub, nof) ) { u3z(nof); return u3nc(0, fub); @@ -47,8 +47,8 @@ { u3_noun vur, sed; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &vur, u3_cv_sam_3, &sed, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &vur, u3v_sam_3, &sed, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_cons(vur, sed); } diff --git a/j/6/core.c b/j/6/core.c index 0f696a788b..cb167c9407 100644 --- a/j/6/core.c +++ b/j/6/core.c @@ -24,8 +24,8 @@ { u3_noun pac, con; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &pac, u3_cv_sam_3, &con, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &pac, u3v_sam_3, &con, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_core(pac, con); } diff --git a/j/6/cube.c b/j/6/cube.c index 843aadc255..ddd74a2ed6 100644 --- a/j/6/cube.c +++ b/j/6/cube.c @@ -24,8 +24,8 @@ { u3_noun dil, goq; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &dil, u3_cv_sam_3, &goq, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &dil, u3v_sam_3, &goq, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_cube(dil, goq); } diff --git a/j/6/face.c b/j/6/face.c index 9753bb5621..fd3c273b57 100644 --- a/j/6/face.c +++ b/j/6/face.c @@ -24,8 +24,8 @@ { u3_noun cog, tip; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &cog, u3_cv_sam_3, &tip, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &cog, u3v_sam_3, &tip, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_face(cog, tip); } diff --git a/j/6/fine.c b/j/6/fine.c index eb5e589e0e..b999191b7e 100644 --- a/j/6/fine.c +++ b/j/6/fine.c @@ -27,10 +27,10 @@ { u3_noun fuv, lup, mar; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &fuv, - u3_cv_sam_6, &lup, - u3_cv_sam_7, &mar, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &fuv, + u3v_sam_6, &lup, + u3v_sam_7, &mar, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_fine(fuv, lup, mar); } diff --git a/j/6/fitz.c b/j/6/fitz.c index 40da480b20..affa9e514d 100644 --- a/j/6/fitz.c +++ b/j/6/fitz.c @@ -12,14 +12,14 @@ u3_noun yaz, u3_noun wix) { - c3_w yaz_w = u3_cr_met(3, yaz); - c3_w wix_w = u3_cr_met(3, wix); + c3_w yaz_w = u3r_met(3, yaz); + c3_w wix_w = u3r_met(3, wix); c3_y yaz_y, wix_y; - yaz_y = (0 == yaz_w) ? 0 : u3_cr_byte((yaz_w - 1), yaz); + yaz_y = (0 == yaz_w) ? 0 : u3r_byte((yaz_w - 1), yaz); if ( (yaz_y < 'A') || (yaz_y > 'Z') ) yaz_y = 0; - wix_y = (0 == wix_w) ? 0 : u3_cr_byte((wix_w - 1), wix); + wix_y = (0 == wix_w) ? 0 : u3r_byte((wix_w - 1), wix); if ( (wix_y < 'A') || (wix_y > 'Z') ) wix_y = 0; if ( yaz_y && wix_y ) { @@ -35,14 +35,14 @@ u3_noun yaz, u3_noun wix) { - c3_w i_w, met_w = c3_min(u3_cr_met(3, yaz), u3_cr_met(3, wix)); + c3_w i_w, met_w = c3_min(u3r_met(3, yaz), u3r_met(3, wix)); if ( c3n == _fitz_fiz(yaz, wix) ) { return c3n; } for ( i_w = 0; i_w < met_w; i_w++ ) { - c3_y yaz_y = u3_cr_byte(i_w, yaz); - c3_y wix_y = u3_cr_byte(i_w, wix); + c3_y yaz_y = u3r_byte(i_w, yaz); + c3_y wix_y = u3r_byte(i_w, wix); if ( (yaz_y >= 'A') && (yaz_y <= 'Z') ) yaz_y = 0; if ( (wix_y >= 'A') && (wix_y <= 'Z') ) wix_y = 0; @@ -60,11 +60,11 @@ { u3_noun yaz, wix; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &yaz, u3_cv_sam_3, &wix, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &yaz, u3v_sam_3, &wix, 0)) || (c3n == u3ud(yaz)) || (c3n == u3ud(wix)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqf_fitz(yaz, wix); } diff --git a/j/6/flan.c b/j/6/flan.c index 26a335d6d0..53af2c9702 100644 --- a/j/6/flan.c +++ b/j/6/flan.c @@ -12,14 +12,14 @@ u3_noun bos, u3_noun nif) { - if ( c3y == u3_cr_sing(1, u3h(bos)) ) { + if ( c3y == u3r_sing(1, u3h(bos)) ) { if ( (u3_nul == u3t(bos)) ) { return u3k(nif); } else return u3k(bos); } else { - if ( c3y == u3_cr_sing(1, u3h(nif)) ) { + if ( c3y == u3r_sing(1, u3h(nif)) ) { if ( (u3_nul == u3t(nif)) ) { return u3k(bos); } @@ -40,8 +40,8 @@ { u3_noun bos, nif; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &bos, u3_cv_sam_3, &nif, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &bos, u3v_sam_3, &nif, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_flan(bos, nif); } diff --git a/j/6/flay.c b/j/6/flay.c index a01845c599..3be00d3971 100644 --- a/j/6/flay.c +++ b/j/6/flay.c @@ -31,7 +31,7 @@ u3_noun typ; switch ( u3h(q_pok) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3y: typ = u3k(u3t(q_pok)); break; @@ -47,9 +47,9 @@ { u3_noun pok; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &pok, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam, &pok, 0)) || (c3n == u3du(pok)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqf_flay(pok); } diff --git a/j/6/flip.c b/j/6/flip.c index b18739bc79..822621db65 100644 --- a/j/6/flip.c +++ b/j/6/flip.c @@ -11,7 +11,7 @@ u3_cqf_flip( u3_noun hel) { - if ( c3y == u3_cr_sing(1, u3h(hel)) ) { + if ( c3y == u3r_sing(1, u3h(hel)) ) { if ( (c3y == u3t(hel)) ) { return u3nc(1, c3n); } @@ -35,8 +35,8 @@ { u3_noun hel; - if ( u3_none == (hel = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__fail); + if ( u3_none == (hel = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_flip(hel); } diff --git a/j/6/flor.c b/j/6/flor.c index 4aefab2383..351fbd28f7 100644 --- a/j/6/flor.c +++ b/j/6/flor.c @@ -12,14 +12,14 @@ u3_noun bos, u3_noun nif) { - if ( c3y == u3_cr_sing(1, u3h(bos)) ) { + if ( c3y == u3r_sing(1, u3h(bos)) ) { if ( (u3_nul == u3t(bos)) ) { return u3k(bos); } else return u3k(nif); } else { - if ( c3y == u3_cr_sing(1, u3h(nif)) ) { + if ( c3y == u3r_sing(1, u3h(nif)) ) { if ( (u3_nul == u3t(nif)) ) { return u3k(nif); } @@ -40,8 +40,8 @@ { u3_noun bos, nif; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &bos, u3_cv_sam_3, &nif, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &bos, u3v_sam_3, &nif, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_flor(bos, nif); } diff --git a/j/6/fork.c b/j/6/fork.c index 7dd4729eec..e844fbd5bc 100644 --- a/j/6/fork.c +++ b/j/6/fork.c @@ -12,7 +12,7 @@ u3_noun hoz, u3_noun bur) { - if ( c3y == u3_cr_sing(hoz, bur) ) { + if ( c3y == u3r_sing(hoz, bur) ) { return u3k(hoz); } else if ( c3__void == bur ) { @@ -30,8 +30,8 @@ { u3_noun hoz, bur; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &hoz, u3_cv_sam_3, &bur, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &hoz, u3v_sam_3, &bur, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_fork(hoz, bur); } diff --git a/j/6/hike.c b/j/6/hike.c index 9ede557f8e..b419624f67 100644 --- a/j/6/hike.c +++ b/j/6/hike.c @@ -21,7 +21,7 @@ u3_noun tool = u3t(u3h(pac)); u3_noun list_tool = _lily_hike_belt_root(u3t(pac)); - if ( c3y == u3_cr_sing(1, axis) ) { + if ( c3y == u3r_sing(1, axis) ) { return u3nc(u3k(tool), list_tool); } @@ -45,7 +45,7 @@ { if ( (1 != axis) && - (c3y == u3_cr_sing(2, u3_cqc_cap(axis))) ) + (c3y == u3r_sing(2, u3_cqc_cap(axis))) ) { u3_atom axis_tap = u3_cqc_mas(axis); @@ -76,7 +76,7 @@ { if ( (1 != axis) && - (c3y == u3_cr_sing(3, u3_cqc_cap(axis))) ) + (c3y == u3r_sing(3, u3_cqc_cap(axis))) ) { u3_atom axis_tap = u3_cqc_mas(axis); @@ -135,10 +135,10 @@ { u3_noun axe, pac; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &axe, u3_cv_sam_3, &pac, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &axe, u3v_sam_3, &pac, 0)) || (c3n == u3ud(axe)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqf_hike(axe, pac); } diff --git a/j/6/look.c b/j/6/look.c index 58041823ed..3c361fadf8 100644 --- a/j/6/look.c +++ b/j/6/look.c @@ -19,9 +19,9 @@ else { u3_noun n_dab, l_dab, r_dab; - u3_cr_trel(dab, &n_dab, &l_dab, &r_dab); + u3r_trel(dab, &n_dab, &l_dab, &r_dab); if ( c3n == u3du(n_dab) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { u3_noun pn_dab = u3h(n_dab); @@ -29,7 +29,7 @@ if ( (u3_nul == l_dab) && (u3_nul == r_dab) ) { if ( (c3y == u3du(qn_dab)) && - (c3y == u3_cr_sing(cog, pn_dab)) ) { + (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, u3k(axe), u3k(qn_dab)); @@ -40,7 +40,7 @@ } else if ( (u3_nul == l_dab) ) { if ( (c3y == u3du(qn_dab)) && - (c3y == u3_cr_sing(cog, pn_dab)) ) { + (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, u3_cqc_peg(axe, 2), u3k(qn_dab)); @@ -61,7 +61,7 @@ } else if ( (u3_nul == r_dab) ) { if ( (c3y == u3du(qn_dab)) && - (c3y == u3_cr_sing(cog, pn_dab)) ) { + (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, u3_cqc_peg(axe, 2), u3k(qn_dab)); @@ -82,7 +82,7 @@ } else { if ( (c3y == u3du(qn_dab)) && - (c3y == u3_cr_sing(cog, pn_dab)) ) { + (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, u3_cqc_peg(axe, 2), u3k(qn_dab)); @@ -126,8 +126,8 @@ { u3_noun cog, dab; - if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &cog, u3_cv_sam_3, &dab, 0) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_mean(cor, u3v_sam_2, &cog, u3v_sam_3, &dab, 0) ) { + return u3m_bail(c3__fail); } else { return u3_cqf_look(cog, dab); } diff --git a/j/6/slot.c b/j/6/slot.c index a028f60d3f..0ce7911f6a 100644 --- a/j/6/slot.c +++ b/j/6/slot.c @@ -10,24 +10,24 @@ u3_noun u3_cqf_slot(u3_atom axe, u3_noun vax) { - u3_noun fag = u3_cr_at(axe, u3t(vax)); + u3_noun fag = u3r_at(axe, u3t(vax)); fprintf(stderr, "slot axe %d\r\n", axe); if ( u3_none == fag ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun typ = u3_cqfu_peek( } - c3_w i_w, met_w = c3_min(u3_cr_met(3, axe), u3_cr_met(3, vax)); + c3_w i_w, met_w = c3_min(u3r_met(3, axe), u3r_met(3, vax)); if ( c3n == _slot_fiz(axe, vax) ) { return c3n; } for ( i_w = 0; i_w < met_w; i_w++ ) { - c3_y axe_y = u3_cr_byte(i_w, axe); - c3_y vax_y = u3_cr_byte(i_w, vax); + c3_y axe_y = u3r_byte(i_w, axe); + c3_y vax_y = u3r_byte(i_w, vax); if ( (axe_y >= 'A') && (axe_y <= 'Z') ) axe_y = 0; if ( (vax_y >= 'A') && (vax_y <= 'Z') ) vax_y = 0; @@ -44,11 +44,11 @@ { u3_noun axe, vax; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &axe, u3_cv_sam_3, &vax, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &axe, u3v_sam_3, &vax, 0)) || (c3n == u3ud(axe)) || (c3n == u3du(vax)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqf_slot(axe, vax); } diff --git a/j/6/type.c b/j/6/type.c index 3f8624b5b2..d779d4cfa9 100644 --- a/j/6/type.c +++ b/j/6/type.c @@ -9,7 +9,7 @@ u3_noun p_sut, q_sut, r_sut; if ( c3n == u3du(sut) ) switch ( sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: { @@ -19,24 +19,24 @@ } } else switch ( u3h(sut) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__atom: p_sut = u3t(sut); { } - case c3__cell: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { } - case c3__core: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut); { } - case c3__cube: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cube: u3x_cell(u3t(sut), &p_sut, &q_sut); { } - case c3__face: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { } - case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { } case c3__hold: p_sut = u3t(sut); diff --git a/j/6/ut.c b/j/6/ut.c index 20bbad1f6a..8a9cd8be07 100644 --- a/j/6/ut.c +++ b/j/6/ut.c @@ -12,8 +12,8 @@ u3_noun van, u3_noun typ) { - u3_noun von = u3_ci_molt(u3k(van), u3_cv_sam, u3k(typ), 0); - u3_noun ret = u3_cj_hook(u3k(von), "dune"); + u3_noun von = u3i_molt(u3k(van), u3v_sam, u3k(typ), 0); + u3_noun ret = u3j_hook(u3k(von), "dune"); u3z(von); return ret; @@ -27,9 +27,9 @@ u3_noun paz, u3_noun typ) { - u3_noun von = u3_ci_molt(u3k(van), u3_cv_sam, u3k(typ), 0); - u3_noun duq = u3_cj_hook(u3k(von), "dunk"); - u3_noun ret = u3_ci_molt(u3k(duq), u3_cv_sam, u3k(paz), 0); + u3_noun von = u3i_molt(u3k(van), u3v_sam, u3k(typ), 0); + u3_noun duq = u3j_hook(u3k(von), "dunk"); + u3_noun ret = u3i_molt(u3k(duq), u3v_sam, u3k(paz), 0); u3z(duq); u3z(von); @@ -44,10 +44,10 @@ const c3_c* paz_c, u3_noun typ) { - u3_noun von = u3_ci_molt(u3k(van), u3_cv_sam, u3k(typ), 0); - u3_noun duq = u3_cj_hook(u3k(von), "dunk"); - u3_noun paz = u3_ci_string(paz_c); - u3_noun ret = u3_ci_molt(u3k(duq), u3_cv_sam, u3k(paz), 0); + u3_noun von = u3i_molt(u3k(van), u3v_sam, u3k(typ), 0); + u3_noun duq = u3j_hook(u3k(von), "dunk"); + u3_noun paz = u3i_string(paz_c); + u3_noun ret = u3i_molt(u3k(duq), u3v_sam, u3k(paz), 0); u3z(paz); u3z(duq); @@ -60,8 +60,8 @@ u3_noun u3_cqfu_shew(u3_noun van, u3_noun mol) { - u3_noun sho = u3_cj_hook(u3k(van), "show"); - u3_noun ret = u3_ci_molt(u3k(sho), u3_cv_sam, u3k(mol), 0); + u3_noun sho = u3j_hook(u3k(van), "show"); + u3_noun ret = u3i_molt(u3k(sho), u3v_sam, u3k(mol), 0); u3z(sho); u3z(mol); @@ -80,7 +80,7 @@ return u3_cqfu_shew (van, u3nc - (u3nc('c', u3_ci_string(paz_c)), + (u3nc('c', u3i_string(paz_c)), u3nc(u3k(sty), mol))); } diff --git a/j/6/ut_burn.c b/j/6/ut_burn.c index cb10c61e9d..53c545fca5 100644 --- a/j/6/ut_burn.c +++ b/j/6/ut_burn.c @@ -16,44 +16,44 @@ u3_noun p_sut, q_sut, pq_sut, qq_sut, rq_sut, prq_sut, qrq_sut; if ( c3n == u3du(sut) ) switch ( sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: return 0; case c3__void: { - return u3_cm_error("burn-void"); + return u3m_error("burn-void"); } } else switch ( u3h(sut) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__atom: return 0; - case c3__bull: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { return _burn_in(van, q_sut, gil); } - case c3__cell: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { return u3nc (_burn_in(van, p_sut, gil), _burn_in(van, q_sut, gil)); } - case c3__core: u3_cx_cell(u3t(sut), &p_sut, &q_sut); - u3_cx_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); - u3_cx_cell(rq_sut, &prq_sut, &qrq_sut); + case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut); + u3x_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); + u3x_cell(rq_sut, &prq_sut, &qrq_sut); { return u3nc (u3k(prq_sut), _burn_in(van, p_sut, gil)); } - case c3__cube: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cube: u3x_cell(u3t(sut), &p_sut, &q_sut); { return u3k(p_sut); } - case c3__face: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { return _burn_in(van, q_sut, gil); } - case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { return _burn_in(van, p_sut, gil); } @@ -62,8 +62,8 @@ if ( (c3y == u3_cqdi_has(gil, sut)) ) { u3_noun sux = u3_cqfu_dunq(van, "type", sut); - u3_ct_push(u3nc(c3__mean, sux)); - return u3_cm_error("burn-loop"); + u3t_push(u3nc(c3__mean, sux)); + return u3m_error("burn-loop"); } else { u3_noun zoc = u3_cqdi_put(gil, sut); @@ -93,7 +93,7 @@ u3_noun sut) { c3_m fun_m = c3__burn; - u3_noun pro = u3_cz_find(fun_m, sut); + u3_noun pro = u3z_find(fun_m, sut); if ( u3_none != pro ) { return pro; @@ -101,7 +101,7 @@ else { pro = _cqfu_burn(van, sut); - return u3_cz_save(fun_m, sut, pro); + return u3z_save(fun_m, sut, pro); } } @@ -111,8 +111,8 @@ { u3_noun sut; - if ( u3_none == (sut = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__fail); + if ( u3_none == (sut = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__fail); } else { return u3_cqfu_burn(cor, sut); } diff --git a/j/6/ut_busk.c b/j/6/ut_busk.c index 5b31c53feb..c3b75ed4a1 100644 --- a/j/6/ut_busk.c +++ b/j/6/ut_busk.c @@ -30,14 +30,14 @@ { u3_noun sut, cog, hyp, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &cog, - u3_cv_sam_3, &hyp, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &cog, + u3v_sam_3, &hyp, + u3v_con, &van, 0)) || (c3n == u3ud(cog)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_busk(van, sut, cog, hyp); } diff --git a/j/6/ut_bust.c b/j/6/ut_bust.c index 5a0e3f8790..4df32d887e 100644 --- a/j/6/ut_bust.c +++ b/j/6/ut_bust.c @@ -21,10 +21,10 @@ u3k(u3t(yam))); u3_noun woo = u3nc(c3__cnzy, u3_blip); u3_noun wox = u3_cqfu_mint(van, sut, c3__noun, woo); - u3_noun ret = u3_cn_nock_on(yib, u3k(u3t(wox))); + u3_noun ret = u3n_nock_on(yib, u3k(u3t(wox))); if ( u3_none == ret ) { - return u3_cm_error("bust-nock"); + return u3m_error("bust-nock"); } u3z(wox); u3z(woo); @@ -40,10 +40,10 @@ { u3_noun sut, dib, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &dib, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &dib, u3v_con, &van, 0)) || + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_bust(van, sut, dib); } @@ -58,7 +58,7 @@ return _cqfu_bust(van, sut, dib); #else c3_m fun_m = c3__bust; - u3_noun pro = u3_cz_find_2(fun_m, sut, dib); + u3_noun pro = u3z_find_2(fun_m, sut, dib); if ( u3_none != pro ) { return pro; @@ -66,7 +66,7 @@ else { pro = _cqfu_bust(van, sut, dib); - return u3_cz_save_2(fun_m, sut, dib, pro); + return u3z_save_2(fun_m, sut, dib, pro); } #endif } diff --git a/j/6/ut_conk.c b/j/6/ut_conk.c index 18878ba32f..37e56376bd 100644 --- a/j/6/ut_conk.c +++ b/j/6/ut_conk.c @@ -14,7 +14,7 @@ return u3_cqf_face(got, sut); } else switch ( u3h(got) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case 0: { return u3k(sut); @@ -27,14 +27,14 @@ return ret; } case 2: { - u3_bean vet = u3_cr_at(u3_cqfu_van_vet, van); + u3_bean vet = u3r_at(u3_cqfu_van_vet, van); u3_noun hed, tal, deh, lat, ret; if ( c3y == vet ) { u3_noun cel = u3nt(c3__cell, c3__noun, c3__noun); if ( c3n == u3_cqfu_nest(van, cel, c3y, sut) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } u3z(cel); } @@ -62,12 +62,12 @@ { u3_noun sut, got, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &got, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam, &got, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_conk(van, sut, got); } diff --git a/j/6/ut_crop.c b/j/6/ut_crop.c index d0aae8afaf..5dc38095dc 100644 --- a/j/6/ut_crop.c +++ b/j/6/ut_crop.c @@ -22,7 +22,7 @@ u3_noun rep = u3_cqfu_repo(van, sut); u3_noun ret = _crop_dext(van, rep, ref, bix); - if ( c3y == u3_cr_sing(ret, rep) ) { + if ( c3y == u3r_sing(ret, rep) ) { if ( c3__void == rep ) { return c3__void; } else { @@ -49,20 +49,20 @@ switch ( ref ) { case c3__void: return u3k(sut); case c3__noun: return c3__void; - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); } } - if ( c3y == u3_cr_sing(sut, ref) ) { + if ( c3y == u3r_sing(sut, ref) ) { return c3__void; } if ( c3n == u3du(sut) ) switch ( sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: return _crop_repo(van, sut, ref, bix); case c3__void: return c3__void; } else switch ( u3h(sut) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__atom: { @@ -74,7 +74,7 @@ } else return _crop_sint(van, sut, ref, bix); } - case c3__bull: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun foz = _crop_dext(van, q_sut, ref, bix); u3_noun ret = u3_cqf_bull(p_sut, foz); @@ -82,13 +82,13 @@ u3z(foz); return ret; } - case c3__cell: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { if ( c3__atom == u3h(ref) ) { return u3k(sut); } else if ( c3__cell == u3h(ref) ) { - u3_cx_cell(u3t(ref), &p_ref, &q_ref); + u3x_cell(u3t(ref), &p_ref, &q_ref); if ( c3y == u3_cqfu_nest (van, p_ref, c3n, p_sut) ) @@ -110,10 +110,10 @@ } else return _crop_sint(van, sut, ref, bix); } - case c3__cube: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cube: u3x_cell(u3t(sut), &p_sut, &q_sut); { if ( (c3__cube == u3h(ref)) && - (c3y == u3_cr_sing(p_sut, u3h(u3t(ref)))) ) + (c3y == u3r_sing(p_sut, u3h(u3t(ref)))) ) { return c3__void; } @@ -131,7 +131,7 @@ } else return _crop_sint(van, sut, ref, bix); } - case c3__face: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun foz = _crop_dext(van, q_sut, ref, bix); u3_noun ret = u3_cqf_face(p_sut, foz); @@ -139,7 +139,7 @@ u3z(foz); return ret; } - case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun dis = _crop_dext(van, p_sut, ref, bix); u3_noun dat = _crop_dext(van, q_sut, ref, bix); @@ -158,11 +158,11 @@ u3_noun dun = u3_cqfu_dunq(van, "type", sut); u3_noun niz = u3_cqfu_dunq(van, "over", ref); - u3_ct_push(u3nc(c3__mean, dun)); - u3_ct_push(u3nc(c3__mean, niz)); + u3t_push(u3nc(c3__mean, dun)); + u3t_push(u3nc(c3__mean, niz)); # endif - return u3_cm_error("crop-loop"); + return u3m_error("crop-loop"); } else { u3_noun bux = u3_cqdi_put(bix, hud); u3_noun ret = _crop_repo(van, sut, ref, bux); @@ -185,9 +185,9 @@ u3_noun p_ref, q_ref; switch ( u3h(ref) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); - case c3__bull: u3_cx_cell(u3t(ref), &p_ref, &q_ref); + case c3__bull: u3x_cell(u3t(ref), &p_ref, &q_ref); { return _crop_dext(van, sut, q_ref, bix); } @@ -195,11 +195,11 @@ case c3__cube: { return u3k(sut); } - case c3__face: u3_cx_cell(u3t(ref), &p_ref, &q_ref); + case c3__face: u3x_cell(u3t(ref), &p_ref, &q_ref); { return _crop_dext(van, sut, q_ref, bix); } - case c3__fork: u3_cx_cell(u3t(ref), &p_ref, &q_ref); + case c3__fork: u3x_cell(u3t(ref), &p_ref, &q_ref); { u3_noun hin = _crop_dext(van, sut, p_ref, bix); u3_noun ret = _crop_dext(van, hin, q_ref, bix); @@ -235,10 +235,10 @@ { u3_noun sut, ref, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &ref, u3v_con, &van, 0)) || + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_crop(van, sut, ref); } @@ -250,7 +250,7 @@ u3_noun ref) { c3_m fun_m = c3__crop; - u3_noun pro = u3_cz_find_2(fun_m, sut, ref); + u3_noun pro = u3z_find_2(fun_m, sut, ref); if ( u3_none != pro ) { return pro; @@ -258,6 +258,6 @@ else { pro = _cqfu_crop(van, sut, ref); - return u3_cz_save_2(fun_m, sut, ref, pro); + return u3z_save_2(fun_m, sut, ref, pro); } } diff --git a/j/6/ut_cull.c b/j/6/ut_cull.c index 3bff522bef..744eaa8463 100644 --- a/j/6/ut_cull.c +++ b/j/6/ut_cull.c @@ -24,13 +24,13 @@ u3_noun ret, p_sut, q_sut; if ( c3n == u3du(sut) ) switch ( sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: { u3_noun pyr = u3_cqfu_repo(van, sut); u3_noun yot = _cqfu_cull(van, pyr, pol, axe, ref); - if ( c3y == u3_cr_sing(pyr, yot) ) { + if ( c3y == u3r_sing(pyr, yot) ) { ret = u3k(sut); } else { ret = u3k(yot); @@ -44,18 +44,18 @@ } } else switch ( u3h(sut) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__atom: { ret = c3__void; break; } - case c3__bull: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun hic = _cqfu_cull (van, q_sut, pol, axe, ref); - if ( c3y == u3_cr_sing(hic, q_sut) ) { + if ( c3y == u3r_sing(hic, q_sut) ) { ret = u3k(sut); } else { ret = u3_cqf_bull(p_sut, hic); @@ -64,7 +64,7 @@ break; } - case c3__cell: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun hub; @@ -78,7 +78,7 @@ u3z(hub); break; } - case c3__core: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut); { if ( 3 != now ) { ret = u3k(sut); @@ -92,12 +92,12 @@ } break; } - case c3__face: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun hic = _cqfu_cull (van, q_sut, pol, axe, ref); - if ( c3y == u3_cr_sing(hic, q_sut) ) { + if ( c3y == u3r_sing(hic, q_sut) ) { ret = u3k(sut); } else { ret = u3_cqf_face(p_sut, hic); @@ -106,7 +106,7 @@ break; } - case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { if ( c3y == u3_cqdi_has(vil, sut) ) { return c3__void; @@ -131,7 +131,7 @@ u3_noun pyr = u3_cqfu_repo(van, sut); u3_noun yot = _cull_in(van, pyr, pol, axe, ref, now, lat, vil); - if ( c3y == u3_cr_sing(pyr, yot) ) { + if ( c3y == u3r_sing(pyr, yot) ) { if ( c3__void == pyr ) { ret = c3__void; } @@ -177,14 +177,14 @@ { u3_noun sut, axe, pol, ref, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &pol, - u3_cv_sam_6, &axe, - u3_cv_sam_7, &ref, - u3_cv_con, &van, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam_2, &pol, + u3v_sam_6, &axe, + u3v_sam_7, &ref, + u3v_con, &van, 0)) || (c3n == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_cull(van, sut, pol, axe, ref); } @@ -198,7 +198,7 @@ u3_noun ref) { c3_m fun_m = c3__cull; - u3_noun pro = u3_cz_find_4(fun_m, sut, pol, axe, ref); + u3_noun pro = u3z_find_4(fun_m, sut, pol, axe, ref); if ( u3_none != pro ) { return pro; @@ -206,6 +206,6 @@ else { pro = _cqfu_cull(van, sut, pol, axe, ref); - return u3_cz_save_4(fun_m, sut, pol, axe, ref, pro); + return u3z_save_4(fun_m, sut, pol, axe, ref, pro); } } diff --git a/j/6/ut_find.c b/j/6/ut_find.c index 0bbc8dec8e..1ea55fd018 100644 --- a/j/6/ut_find.c +++ b/j/6/ut_find.c @@ -25,11 +25,11 @@ default: return u3nc(u3k(dep), u3_nul); case c3__bull: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { - if ( c3n == u3_cr_sing(cog, u3h(p_sut)) ) { + if ( c3n == u3r_sing(cog, u3h(p_sut)) ) { return _fino_in (van, q_sut, dep, way, cog, gil); } @@ -51,8 +51,8 @@ } } case c3__cell: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { u3_noun taf = _fino_in(van, p_sut, dep, way, cog, gil); u3_noun p_taf = u3h(taf); @@ -70,7 +70,7 @@ else { u3_noun puq_bov, quq_bov; - u3_cr_mean(q_bov, 6, &puq_bov, 7, &quq_bov, 0); + u3r_mean(q_bov, 6, &puq_bov, 7, &quq_bov, 0); ret = u3nq (u3k(p_bov), u3_nul, @@ -82,7 +82,7 @@ else { u3_noun puq_taf, quq_taf; - u3_cr_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); + u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); ret = u3nq (u3k(p_taf), u3_nul, @@ -97,11 +97,11 @@ u3_noun pq_sut, qq_sut, rq_sut; u3_noun prq_sut, qrq_sut; - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || - (c3n == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || - (c3n == u3_cr_cell(rq_sut, &prq_sut, &qrq_sut)) ) + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) || + (c3n == u3r_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || + (c3n == u3r_cell(rq_sut, &prq_sut, &qrq_sut)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { u3_noun zem = u3_cqf_look(cog, qrq_sut); @@ -128,7 +128,7 @@ u3_noun puq_taf, quq_taf; u3_noun pro; - u3_cr_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); + u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); if ( c3n == u3_cqfu_park (van, sut, way, puq_taf) ) @@ -138,9 +138,9 @@ u3_noun waz = u3_cqfu_shep (van, "axis", 'd', u3k(puq_taf)); - u3_ct_push(u3nc(c3__mean, weh)); - u3_ct_push(u3nc(c3__mean, waz)); - return u3_cm_error("find-park"); + u3t_push(u3nc(c3__mean, weh)); + u3t_push(u3nc(c3__mean, waz)); + return u3m_error("find-park"); } else { pro = u3nq @@ -185,10 +185,10 @@ } } case c3__face: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { - if ( c3n == u3_cr_sing(cog, p_sut) ) { + if ( c3n == u3r_sing(cog, p_sut) ) { return u3nc(u3k(dep), u3_nul); } else { if ( 0 == dep ) { @@ -210,8 +210,8 @@ return pro; } case c3__fork: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } if ( (c3y == u3_cqdi_has(gil, q_sut)) ) { @@ -232,22 +232,22 @@ u3_noun ret; if ( u3_nul != q_hax ) { - u3_cr_mean(q_hax, 6, &puq_hax, 7, &quq_hax, 0); + u3r_mean(q_hax, 6, &puq_hax, 7, &quq_hax, 0); } if ( u3_nul != q_yor ) { - u3_cr_mean(q_yor, 6, &puq_yor, 7, &quq_yor, 0); + u3r_mean(q_yor, 6, &puq_yor, 7, &quq_yor, 0); } - if ( c3y == u3_cr_sing(hax, yor) ) { + if ( c3y == u3r_sing(hax, yor) ) { ret = u3k(hax); } else { - if ( (c3n == u3_cr_sing(p_hax, p_yor)) || + if ( (c3n == u3r_sing(p_hax, p_yor)) || ((u3_nul == q_hax) || (u3_nul == q_yor)) || - (c3n == u3_cr_sing(puq_hax, puq_yor)) || - (c3n == u3_cr_sing(u3h(quq_hax), u3h(quq_yor))) ) + (c3n == u3r_sing(puq_hax, puq_yor)) || + (c3n == u3r_sing(u3h(quq_hax), u3h(quq_yor))) ) { - return u3_cm_error("find-fork"); + return u3m_error("find-fork"); } switch ( u3h(quq_hax) ) { case 0: { @@ -268,11 +268,11 @@ case 1: { u3_noun pquq_hax, qquq_hax, pquq_yor, qquq_yor; - u3_cx_cell(u3t(quq_hax), &pquq_hax, &qquq_hax); - u3_cx_cell(u3t(quq_yor), &pquq_yor, &qquq_yor); + u3x_cell(u3t(quq_hax), &pquq_hax, &qquq_hax); + u3x_cell(u3t(quq_yor), &pquq_yor, &qquq_yor); - if ( c3n == u3_cr_sing(pquq_hax, pquq_yor) ) { - return u3_cm_error("find-fork"); + if ( c3n == u3r_sing(pquq_hax, pquq_yor) ) { + return u3m_error("find-fork"); } else { ret = u3nc ( @@ -293,20 +293,20 @@ u3_noun ppquq_hax, qpquq_hax, rpquq_hax, spquq_hax; u3_noun ppquq_yor, qpquq_yor, rpquq_yor, spquq_yor; - u3_cx_cell(u3t(quq_hax), &pquq_hax, &qquq_hax); - u3_cx_cell(u3t(quq_yor), &pquq_yor, &qquq_yor); - u3_cx_qual( + u3x_cell(u3t(quq_hax), &pquq_hax, &qquq_hax); + u3x_cell(u3t(quq_yor), &pquq_yor, &qquq_yor); + u3x_qual( pquq_hax, &ppquq_hax, &qpquq_hax, &rpquq_hax, &spquq_hax); - u3_cx_qual( + u3x_qual( pquq_yor, &ppquq_yor, &qpquq_yor, &rpquq_yor, &spquq_yor); - if ( (c3n == u3_cr_sing(ppquq_hax, ppquq_yor)) || - (c3n == u3_cr_sing(qpquq_hax, qpquq_yor)) || - (c3n == u3_cr_sing(rpquq_hax, rpquq_yor)) ) + if ( (c3n == u3r_sing(ppquq_hax, ppquq_yor)) || + (c3n == u3r_sing(qpquq_hax, qpquq_yor)) || + (c3n == u3r_sing(rpquq_hax, rpquq_yor)) ) { - return u3_cm_error("find-fork"); + return u3m_error("find-fork"); } else { ret = u3nc @@ -374,13 +374,13 @@ default: return u3nc(u3k(dep), u3_nul); case c3__bull: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || - (c3n == u3_cr_qual(p_sut, &pp_sut, &qp_sut, &rp_sut, &sp_sut)) ) + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) || + (c3n == u3r_qual(p_sut, &pp_sut, &qp_sut, &rp_sut, &sp_sut)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { - if ( c3n == u3_cr_sing(cog, pp_sut) ) { + if ( c3n == u3r_sing(cog, pp_sut) ) { return _find_in (van, q_sut, dep, way, cog, gil); } @@ -404,8 +404,8 @@ } } case c3__cell: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { u3_noun taf = _find_in(van, p_sut, dep, way, cog, gil); u3_noun p_taf = u3h(taf); @@ -423,7 +423,7 @@ else { u3_noun puq_bov, quq_bov; - u3_cr_mean(q_bov, 6, &puq_bov, 7, &quq_bov, 0); + u3r_mean(q_bov, 6, &puq_bov, 7, &quq_bov, 0); ret = u3nq (u3k(p_bov), u3_nul, @@ -435,7 +435,7 @@ else { u3_noun puq_taf, quq_taf; - u3_cr_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); + u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); ret = u3nq (u3k(p_taf), u3_nul, @@ -450,11 +450,11 @@ u3_noun pq_sut, qq_sut, rq_sut; u3_noun prq_sut, qrq_sut; - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || - (c3n == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || - (c3n == u3_cr_cell(rq_sut, &prq_sut, &qrq_sut)) ) + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) || + (c3n == u3r_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || + (c3n == u3r_cell(rq_sut, &prq_sut, &qrq_sut)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { u3_noun zem = u3_cqf_look(cog, qrq_sut); @@ -481,7 +481,7 @@ u3_noun puq_taf, quq_taf; u3_noun pro; - u3_cr_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); + u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); if ( c3n == u3_cqfu_park (van, sut, way, puq_taf) ) @@ -491,9 +491,9 @@ u3_noun waz = u3_cqfu_shep (van, "axis", 'd', u3k(puq_taf)); - u3_ct_push(u3nc(c3__mean, weh)); - u3_ct_push(u3nc(c3__mean, waz)); - return u3_cm_error("find-park"); + u3t_push(u3nc(c3__mean, weh)); + u3t_push(u3nc(c3__mean, waz)); + return u3m_error("find-park"); } else { pro = u3nq @@ -538,10 +538,10 @@ } } case c3__face: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { - if ( c3n == u3_cr_sing(cog, p_sut) ) { + if ( c3n == u3r_sing(cog, p_sut) ) { return u3nc(u3k(dep), u3_nul); } else { if ( 0 == dep ) { @@ -563,8 +563,8 @@ return pro; } case c3__fork: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } if ( (c3y == u3_cqdi_has(gil, q_sut)) ) { @@ -585,22 +585,22 @@ u3_noun ret; if ( u3_nul != q_hax ) { - u3_cr_mean(q_hax, 6, &puq_hax, 7, &quq_hax, 0); + u3r_mean(q_hax, 6, &puq_hax, 7, &quq_hax, 0); } if ( u3_nul != q_yor ) { - u3_cr_mean(q_yor, 6, &puq_yor, 7, &quq_yor, 0); + u3r_mean(q_yor, 6, &puq_yor, 7, &quq_yor, 0); } - if ( c3y == u3_cr_sing(hax, yor) ) { + if ( c3y == u3r_sing(hax, yor) ) { ret = u3k(hax); } else { - if ( (c3n == u3_cr_sing(p_hax, p_yor)) || + if ( (c3n == u3r_sing(p_hax, p_yor)) || ((u3_nul == q_hax) || (u3_nul == q_yor)) || - (c3n == u3_cr_sing(puq_hax, puq_yor)) || - (c3n == u3_cr_sing(u3h(quq_hax), u3h(quq_yor))) ) + (c3n == u3r_sing(puq_hax, puq_yor)) || + (c3n == u3r_sing(u3h(quq_hax), u3h(quq_yor))) ) { - return u3_cm_error("find-fork"); + return u3m_error("find-fork"); } switch ( u3h(quq_hax) ) { case c3y: { @@ -621,11 +621,11 @@ case c3n: { u3_noun pquq_hax, qquq_hax, pquq_yor, qquq_yor; - u3_cx_cell(u3t(quq_hax), &pquq_hax, &qquq_hax); - u3_cx_cell(u3t(quq_yor), &pquq_yor, &qquq_yor); + u3x_cell(u3t(quq_hax), &pquq_hax, &qquq_hax); + u3x_cell(u3t(quq_yor), &pquq_yor, &qquq_yor); - if ( c3n == u3_cr_sing(pquq_hax, pquq_yor) ) { - return u3_cm_error("find-fork"); + if ( c3n == u3r_sing(pquq_hax, pquq_yor) ) { + return u3m_error("find-fork"); } else { ret = u3nc ( @@ -698,14 +698,14 @@ { u3_noun sut, dep, way, cog, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &dep, - u3_cv_sam_6, &way, - u3_cv_sam_7, &cog, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &dep, + u3v_sam_6, &way, + u3v_sam_7, &cog, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_fino(van, sut, dep, way, cog); } @@ -720,7 +720,7 @@ u3_noun cog) { c3_m fun_m = c3__fino; - u3_noun pro = u3_cz_find_4(fun_m, sut, dep, way, cog); + u3_noun pro = u3z_find_4(fun_m, sut, dep, way, cog); if ( u3_none != pro ) { return pro; @@ -728,7 +728,7 @@ else { pro = _cqfu_fino(van, sut, dep, way, cog); - return u3_cz_save_4(fun_m, sut, dep, way, cog, pro); + return u3z_save_4(fun_m, sut, dep, way, cog, pro); } } @@ -741,14 +741,14 @@ { u3_noun sut, dep, way, cog, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &dep, - u3_cv_sam_6, &way, - u3_cv_sam_7, &cog, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &dep, + u3v_sam_6, &way, + u3v_sam_7, &cog, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_find(van, sut, dep, way, cog); } @@ -763,7 +763,7 @@ u3_noun cog) { c3_m fun_m = c3__find; - u3_noun pro = u3_cz_find_4(fun_m, sut, dep, way, cog); + u3_noun pro = u3z_find_4(fun_m, sut, dep, way, cog); if ( u3_none != pro ) { return pro; @@ -771,6 +771,6 @@ else { pro = _cqfu_find(van, sut, dep, way, cog); - return u3_cz_save_4(fun_m, sut, dep, way, cog, pro); + return u3z_save_4(fun_m, sut, dep, way, cog, pro); } } diff --git a/j/6/ut_fink.c b/j/6/ut_fink.c index 70ebfacbcd..9194552447 100644 --- a/j/6/ut_fink.c +++ b/j/6/ut_fink.c @@ -20,29 +20,29 @@ ? u3_cqfu_shew (van, u3nc - (u3nc('c', u3_ci_string("find-limb")), + (u3nc('c', u3i_string("find-limb")), '$')) : u3_cqfu_shep (van, "find-limb", 'a', u3k(cog)); u3_noun pro; - u3_ct_push(u3nc(c3__mean, dun)); - u3_ct_push(u3nc(c3__mean, nuc)); + u3t_push(u3nc(c3__mean, dun)); + u3t_push(u3nc(c3__mean, nuc)); { u3_noun hoq = u3_cqfu_find(van, sut, dep, way, cog); u3_noun fin = u3t(hoq); if ( u3_nul == fin ) { - u3_cm_p("cog", cog); - return u3_cm_error("find-none"); + u3m_p("cog", cog); + return u3m_error("find-none"); } else { pro = u3k(u3t(fin)); u3z(hoq); } } - u3_ct_drop(); - u3_ct_drop(); + u3t_drop(); + u3t_drop(); return pro; } @@ -54,14 +54,14 @@ { u3_noun sut, dep, way, cog, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &dep, - u3_cv_sam_6, &way, - u3_cv_sam_7, &cog, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &dep, + u3v_sam_6, &way, + u3v_sam_7, &cog, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_fink(van, sut, dep, way, cog); } diff --git a/j/6/ut_fire.c b/j/6/ut_fire.c index fa88947460..a461bb0b96 100644 --- a/j/6/ut_fire.c +++ b/j/6/ut_fire.c @@ -13,7 +13,7 @@ u3_noun dox, u3_noun gen) { - u3_noun rib = u3_cr_at(u3_cqfu_van_rib, van); + u3_noun rib = u3r_at(u3_cqfu_van_rib, van); u3_noun key = u3nt(u3k(sut), u3k(dox), u3k(gen)); @@ -24,7 +24,7 @@ } else { u3_noun rob = u3_cqdi_put(rib, key); - u3_noun von = u3_ci_molt(u3k(van), + u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_rib, u3k(rob), 0); ret = u3_cqfu_mull(von, sut, c3__noun, dox, gen); @@ -46,13 +46,13 @@ u3_noun h_gat, t_gat; if ( (c3n == u3du(typ)) || (c3__core != u3h(typ)) ) { - return u3_cm_error("fire-core"); + return u3m_error("fire-core"); } else if - ( (c3n == u3_cr_cell(u3t(typ), &p_typ, &q_typ)) || - (c3n == u3_cr_trel(q_typ, &pq_typ, &qq_typ, &rq_typ)) || - (c3n == u3_cr_cell(gat, &h_gat, &t_gat)) ) + ( (c3n == u3r_cell(u3t(typ), &p_typ, &q_typ)) || + (c3n == u3r_trel(q_typ, &pq_typ, &qq_typ, &rq_typ)) || + (c3n == u3r_cell(gat, &h_gat, &t_gat)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { u3_noun dox = u3nt (c3__core, u3k(qq_typ), u3k(q_typ)); @@ -66,10 +66,10 @@ u3_noun dun = u3_cqfu_dunq(van, "need", qq_typ); u3_noun niz = u3_cqfu_dunq(van, "have", p_typ); - u3_ct_push(u3nc(c3__mean, niz)); - u3_ct_push(u3nc(c3__mean, dun)); + u3t_push(u3nc(c3__mean, niz)); + u3t_push(u3nc(c3__mean, dun)); #endif - return u3_cm_error("fire-dry"); + return u3m_error("fire-dry"); } else { return u3nc(dox, u3k(t_gat)); @@ -79,17 +79,17 @@ c3_assert(c3__elm == u3h(gat)); if ( (c3y == vet) && - // (c3n == u3_cr_sing(p_typ, qq_typ)) && + // (c3n == u3r_sing(p_typ, qq_typ)) && (c3n == _fire_mull(van, typ, dox, t_gat)) ) { #if 0 u3_noun dun = u3_cqfu_dunq(van, "wild", typ); u3_noun niz = u3_cqfu_dunq(van, "tame", dox); - u3_ct_push(u3nc(c3__mean, dun)); - u3_ct_push(u3nc(c3__mean, niz)); + u3t_push(u3nc(c3__mean, dun)); + u3t_push(u3nc(c3__mean, niz)); #endif - return u3_cm_error("fire-wet"); + return u3m_error("fire-wet"); } else { u3z(dox); @@ -113,7 +113,7 @@ u3_noun t_hag = u3t(hag); if ( c3n == u3du(i_hag) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3nc (_fire_each(van, vet, u3h(i_hag), u3t(i_hag)), @@ -127,7 +127,7 @@ u3_noun sut, u3_noun hag) { - u3_bean vet = u3_cr_at(u3_cqfu_van_vet, van); + u3_bean vet = u3r_at(u3_cqfu_van_vet, van); { if ( (c3y == u3du(hag)) && (u3_nul == u3t(hag)) ) { @@ -158,10 +158,10 @@ { u3_noun sut, hag, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &hag, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &hag, u3v_con, &van, 0)) || + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_fire(van, sut, hag); } diff --git a/j/6/ut_firm.c b/j/6/ut_firm.c index 4b3e5094e5..b2f0e204f1 100644 --- a/j/6/ut_firm.c +++ b/j/6/ut_firm.c @@ -16,7 +16,7 @@ u3_noun p_sut, q_sut; if ( c3n == u3du(sut) ) switch ( sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: { @@ -28,15 +28,15 @@ } } else switch ( u3h(sut) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__atom: p_sut = u3t(sut); { return u3ud(dib); } - case c3__bull: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { - u3_noun nun = u3_cr_at(u3h(u3t(u3t(p_sut))), dib); + u3_noun nun = u3r_at(u3h(u3t(u3t(p_sut))), dib); if ( u3_none == nun ) { return c3n; @@ -46,36 +46,36 @@ nun)); } } - case c3__cell: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { return c3a (u3du(dib), c3a(_cqfu_firm(van, p_sut, u3h(dib)), _cqfu_firm(van, q_sut, u3t(dib)))); } - case c3__core: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun pq_sut, qq_sut, rq_sut, prq_sut, qrq_sut; - u3_cx_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); - u3_cx_cell(rq_sut, &prq_sut, &qrq_sut); + u3x_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); + u3x_cell(rq_sut, &prq_sut, &qrq_sut); return c3a (u3du(dib), c3a (_cqfu_firm(van, p_sut, u3h(dib)), - ((u3_nul == prq_sut) ? u3_cm_error("firm-core") - : u3_cr_sing(prq_sut, u3t(dib))))); + ((u3_nul == prq_sut) ? u3m_error("firm-core") + : u3r_sing(prq_sut, u3t(dib))))); } - case c3__cube: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cube: u3x_cell(u3t(sut), &p_sut, &q_sut); { - return u3_cr_sing(dib, p_sut); + return u3r_sing(dib, p_sut); } - case c3__face: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { return _cqfu_firm(van, q_sut, dib); } - case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { return c3o(_cqfu_firm(van, p_sut, dib), _cqfu_firm(van, q_sut, dib)); @@ -99,10 +99,10 @@ { u3_noun sut, dib, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &dib, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &dib, u3v_con, &van, 0)) || + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_firm(van, sut, dib); } diff --git a/j/6/ut_fish.c b/j/6/ut_fish.c index 6f1d048fd1..846f436bc5 100644 --- a/j/6/ut_fish.c +++ b/j/6/ut_fish.c @@ -17,7 +17,7 @@ u3_noun p_sut, q_sut; if ( c3y == u3ud(sut) ) switch ( sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: { return u3nc(1, 0); @@ -27,7 +27,7 @@ } } else switch ( u3h(sut) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__atom: { u3_noun ton = u3nt(3, 0, u3k(axe)); @@ -37,11 +37,11 @@ return pro; } case c3__bull: { - return u3_cm_error("bull-fish"); + return u3m_error("bull-fish"); } case c3__cell: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { u3_noun hut = u3nt(3, 0, u3k(axe)); u3_noun lef = u3_cqc_peg(axe, 2); @@ -65,8 +65,8 @@ return u3nc(0, 0); } case c3__cube: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { return u3nt (5, @@ -75,15 +75,15 @@ } } case c3__face: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { return _fish_in(van, q_sut, axe, vit); } } case c3__fork: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { u3_noun hed = _fish_in(van, p_sut, axe, vit); @@ -104,10 +104,10 @@ u3_noun niz = u3_cqfu_shep (van, "axis", 'd', u3k(axe)); - // u3_ct_push(u3nc(c3__mean, dun)); - u3_ct_push(u3nc(c3__mean, niz)); + // u3t_push(u3nc(c3__mean, dun)); + u3t_push(u3nc(c3__mean, niz)); - return u3_cm_error("fish-loop"); + return u3m_error("fish-loop"); } else { u3_noun zoc = u3_cqdi_put(vit, sut); u3_noun fop = u3_cqfu_rest(van, sut, p_sut); @@ -140,11 +140,11 @@ { u3_noun sut, axe, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &axe, u3_cv_con, &van, 0)) || + if ( (c3n == u3r_mean(cor, u3v_sam, &axe, u3v_con, &van, 0)) || (c3n == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_fish(van, sut, axe); } @@ -156,7 +156,7 @@ u3_noun axe) { c3_m fun_m = c3__fish; - u3_noun pro = u3_cz_find_2(fun_m, sut, axe); + u3_noun pro = u3z_find_2(fun_m, sut, axe); if ( u3_none != pro ) { return pro; @@ -164,6 +164,6 @@ else { pro = _cqfu_fish(van, sut, axe); - return u3_cz_save_2(fun_m, sut, axe, pro); + return u3z_save_2(fun_m, sut, axe, pro); } } diff --git a/j/6/ut_fuse.c b/j/6/ut_fuse.c index 816bc4c9a3..46c078e608 100644 --- a/j/6/ut_fuse.c +++ b/j/6/ut_fuse.c @@ -20,7 +20,7 @@ u3_noun rep = u3_cqfu_repo(van, sut); u3_noun ret = _fuse_in(van, rep, ref, bix); - if ( c3y == u3_cr_sing(ret, rep) ) { + if ( c3y == u3r_sing(ret, rep) ) { if ( c3__void == rep ) { return c3__void; } else { @@ -43,11 +43,11 @@ { u3_noun p_sut, q_sut; - if ( c3y == u3_cr_sing(sut, ref) || (c3__noun == ref) ) { + if ( c3y == u3r_sing(sut, ref) || (c3__noun == ref) ) { return u3k(sut); } if ( c3n == u3du(sut) ) switch ( sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: { @@ -59,7 +59,7 @@ } } else switch ( u3h(sut) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__atom: { @@ -75,7 +75,7 @@ } return _fuse_in(van, ref, sut, bix); } - case c3__bull: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun vot = _fuse_in(van, q_sut, ref, bix); u3_noun ret = u3_cqf_bull(p_sut, vot); @@ -83,11 +83,11 @@ u3z(vot); return ret; } - case c3__cell: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun p_ref, q_ref; - if ( c3y == u3_cr_pq(ref, c3__cell, &p_ref, &q_ref) ) { + if ( c3y == u3r_pq(ref, c3__cell, &p_ref, &q_ref) ) { u3_noun hed = _fuse_in(van, p_sut, p_ref, bix); u3_noun tal = _fuse_in(van, q_sut, q_ref, bix); u3_noun ret = u3_cqf_cell(hed, tal); @@ -102,7 +102,7 @@ { return _fuse_repo(van, sut, ref, bix); } - case c3__cube: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cube: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun foz = _fuse_in(van, q_sut, ref, bix); u3_noun ret; @@ -115,7 +115,7 @@ u3z(foz); return ret; } - case c3__face: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun vot = _fuse_in(van, q_sut, ref, bix); u3_noun ret = u3_cqf_face(p_sut, vot); @@ -123,7 +123,7 @@ u3z(vot); return ret; } - case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun dis = _fuse_in(van, p_sut, ref, bix); u3_noun dat = _fuse_in(van, q_sut, ref, bix); @@ -141,10 +141,10 @@ // u3_noun dun = u3_cqfu_dunq(van, "type", sut); // u3_noun niz = u3_cqfu_dunq(van, "over", ref); - // u3_ct_push(u3nc(c3__mean, dun)); - // u3_ct_push(u3nc(c3__mean, niz)); + // u3t_push(u3nc(c3__mean, dun)); + // u3t_push(u3nc(c3__mean, niz)); - return u3_cm_error("fuse-loop"); + return u3m_error("fuse-loop"); } else { u3_noun bux = u3_cqdi_put(bix, hud); u3_noun ret = _fuse_repo(van, sut, ref, bux); @@ -174,10 +174,10 @@ { u3_noun sut, ref, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &ref, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &ref, u3v_con, &van, 0)) || + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_fuse(van, sut, ref); } @@ -189,7 +189,7 @@ u3_noun ref) { c3_m fun_m = c3__fuse; - u3_noun pro = u3_cz_find_2(fun_m, sut, ref); + u3_noun pro = u3z_find_2(fun_m, sut, ref); if ( u3_none != pro ) { return pro; @@ -197,6 +197,6 @@ else { pro = _cqfu_fuse(van, sut, ref); - return u3_cz_save_2(fun_m, sut, ref, pro); + return u3z_save_2(fun_m, sut, ref, pro); } } diff --git a/j/6/ut_gain.c b/j/6/ut_gain.c index 8a02a0901f..3ae2cd4622 100644 --- a/j/6/ut_gain.c +++ b/j/6/ut_gain.c @@ -8,8 +8,8 @@ u3_noun u3_cqfu_gain(u3_noun van, u3_noun sut, u3_noun gen) { - u3_noun von = u3_ci_molt(u3k(van), u3_cv_sam, u3k(sut), 0); - u3_noun gat = u3_cj_hook(von, "gain"); + u3_noun von = u3i_molt(u3k(van), u3v_sam, u3k(sut), 0); + u3_noun gat = u3j_hook(von, "gain"); - return u3_cn_kick_on(u3_ci_molt(gat, u3_cv_sam, u3k(gen), 0)); + return u3n_kick_on(u3i_molt(gat, u3v_sam, u3k(gen), 0)); } diff --git a/j/6/ut_heal.c b/j/6/ut_heal.c index 38190593b4..402f73d64b 100644 --- a/j/6/ut_heal.c +++ b/j/6/ut_heal.c @@ -21,18 +21,18 @@ u3_noun p_sut, q_sut; if ( c3n == u3du(sut) ) { - return u3_cm_error("heal-name"); + return u3m_error("heal-name"); } else switch ( u3h(sut) ) { - default: return u3_cm_error("heal-name"); + default: return u3m_error("heal-name"); case c3__core: { return u3k(ref); } - case c3__bull: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { - if ( c3y == u3_cr_sing(u3h(p_sut), u3t(qog)) ) { + if ( c3y == u3r_sing(u3h(p_sut), u3t(qog)) ) { return u3k(ref); } else { @@ -46,12 +46,12 @@ return ret; } } - case c3__face: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { - if ( c3y == u3_cr_sing(p_sut, u3t(qog)) ) { + if ( c3y == u3r_sing(p_sut, u3t(qog)) ) { return u3_cqf_face(p_sut, ref); } - else return u3_cm_error("heal-name"); + else return u3m_error("heal-name"); } case c3__hold: { u3_noun rep = u3_cqfu_repo(van, sut); @@ -60,7 +60,7 @@ u3z(rep); return ret; } - case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun dis = _heal_by(van, p_sut, qog, ref); u3_noun dat = _heal_by(van, q_sut, qog, ref); @@ -93,7 +93,7 @@ case c3__atom: return c3__void; - case c3__bull: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun sub = _heal_to(van, q_sut, gil, qog, ref, now, lat); u3_noun ret; @@ -104,7 +104,7 @@ u3z(sub); return ret; } - case c3__cell: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun ter, ret; @@ -119,10 +119,10 @@ return ret; } - case c3__core: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut); { if ( 3 != now ) { - return u3_cm_error("heal-core"); + return u3m_error("heal-core"); } else { u3_noun ter = _heal_as(van, p_sut, qog, lat, ref); u3_noun ret = u3_cqf_core(ter, q_sut); @@ -131,7 +131,7 @@ return ret; } } - case c3__face: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun dun = _heal_to(van, q_sut, gil, qog, ref, now, lat); u3_noun ret = u3_cqf_face(p_sut, dun); @@ -139,7 +139,7 @@ u3z(dun); return ret; } - case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun dis = _heal_to(van, p_sut, gil, qog, ref, now, lat); u3_noun dat = _heal_to(van, q_sut, gil, qog, ref, now, lat); @@ -220,15 +220,15 @@ { u3_noun van, sut, qog, axe, ref; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &qog, - u3_cv_sam_6, &axe, - u3_cv_sam_7, &ref, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &qog, + u3v_sam_6, &axe, + u3v_sam_7, &ref, + u3v_con, &van, 0)) || (c3n == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_heal(van, sut, qog, axe, ref); } diff --git a/j/6/ut_lose.c b/j/6/ut_lose.c index 782e659f39..2e117471cf 100644 --- a/j/6/ut_lose.c +++ b/j/6/ut_lose.c @@ -10,8 +10,8 @@ u3_noun sut, u3_noun gen) { - u3_noun von = u3_ci_molt(u3k(van), u3_cv_sam, u3k(sut), 0); - u3_noun gat = u3_cj_hook(von, "lose"); + u3_noun von = u3i_molt(u3k(van), u3v_sam, u3k(sut), 0); + u3_noun gat = u3j_hook(von, "lose"); - return u3_cn_kick_on(u3_ci_molt(gat, u3_cv_sam, u3k(gen), 0)); + return u3n_kick_on(u3i_molt(gat, u3v_sam, u3k(gen), 0)); } diff --git a/j/6/ut_mint.c b/j/6/ut_mint.c index cfd05e27e8..c62db6c91b 100644 --- a/j/6/ut_mint.c +++ b/j/6/ut_mint.c @@ -24,13 +24,13 @@ int FOO; _mint_vet( u3_noun van) { - // u3_bean vet = u3_cj_hook(u3k(van), "vet"); - u3_bean vet = u3_cr_at(u3_cqfu_van_vet, van); + // u3_bean vet = u3j_hook(u3k(van), "vet"); + u3_bean vet = u3r_at(u3_cqfu_van_vet, van); switch ( vet ) { case c3n: case c3y: return vet; - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); } } @@ -126,10 +126,10 @@ int FOO; // u3_noun dun = u3_cqfu_dunq(van, "need", gol); // u3_noun niz = u3_cqfu_dunq(van, "have", typ); - // u3_ct_push(u3nc(c3__mean, dun)); - // u3_ct_push(u3nc(c3__mean, niz)); + // u3t_push(u3nc(c3__mean, dun)); + // u3t_push(u3nc(c3__mean, niz)); - return u3_cm_error("mint-nice"); + return u3m_error("mint-nice"); } else return typ; } @@ -148,7 +148,7 @@ int FOO; axe = _mint_coke(xin); } else { - return u3_cm_error("mint-coke"); + return u3m_error("mint-coke"); } u3z(nug); return axe; @@ -208,11 +208,11 @@ int FOO; u3_noun von; switch ( tov ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3y: von = u3k(van); break; case c3n: - von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); break; + von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); break; } { u3_noun mil = u3_cqfu_mint(von, sut, c3__noun, gen); @@ -236,16 +236,16 @@ int FOO; else { u3_noun n_dab, l_dab, r_dab; - u3_cr_trel(dab, &n_dab, &l_dab, &r_dab); + u3r_trel(dab, &n_dab, &l_dab, &r_dab); if ( c3n == u3du(n_dab) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { u3_noun qn_dab = u3t(n_dab); u3_noun vad; switch ( u3h(qn_dab) ) { - default: return u3_cm_bail(c3__exit); + default: return u3m_bail(c3__exit); case c3__ash: { vad = _mint_brew(van, sut, c3y, u3t(qn_dab)); break; @@ -320,8 +320,8 @@ int FOO; u3_noun loc) { u3_noun mol = u3nc('o', u3k(loc)); - u3_noun sho = u3_cj_hook(u3k(van), "show"); - u3_noun ret = u3_ci_molt(u3k(sho), u3_cv_sam, u3k(mol), 0); + u3_noun sho = u3j_hook(u3k(van), "show"); + u3_noun ret = u3i_molt(u3k(sho), u3v_sam, u3k(mol), 0); u3z(mol); u3z(sho); @@ -350,12 +350,12 @@ int FOO; return u3nt(c3__void, 0, 0); } else { - return u3_cm_error("mint-vain"); + return u3m_error("mint-vain"); } } if ( c3n == u3du(gen) ) { - u3_noun ter = u3_cr_at(u3_cv_con_3, van); + u3_noun ter = u3r_at(u3v_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); ret = _mint_in(van, sut, gol, rex); @@ -382,18 +382,18 @@ int FOO; } } else switch ( u3h(gen) ) { default: { - u3_noun ter = u3_cr_at(u3_cv_con_3, van); + u3_noun ter = u3r_at(u3v_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); - if ( c3y == u3_cr_sing(rex, gen) ) { + if ( c3y == u3r_sing(rex, gen) ) { #if 1 u3_noun zix = u3_cqfu_shep(van, "gene", 'q', u3k(gen)); - u3_ct_push(u3nc(c3__mean, zix)); - return u3_cm_error("mint-open"); + u3t_push(u3nc(c3__mean, zix)); + return u3m_error("mint-open"); #else u3_err("h", u3h(gen)); - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); #endif } ret = _mint_in(van, sut, gol, rex); @@ -402,7 +402,7 @@ int FOO; return ret; } - case c3__bcpt: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__bcpt: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun sep = u3_cqfu_seep(van, sut, c3__read, p_gen); @@ -416,7 +416,7 @@ int FOO; return ret; } - case c3__wtts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__wtts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun nob = u3_cqfl_bunt(van, p_gen); @@ -438,7 +438,7 @@ int FOO; return ret; } - case c3__wtcl: u3_cx_trel(u3t(gen), &p_gen, &q_gen, &r_gen); + case c3__wtcl: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _mint_used(); { u3_noun bol = _mint_bean(); @@ -470,7 +470,7 @@ int FOO; return ret; } - case c3__clhp: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__clhp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun hed = _mint_in(van, sut, c3__noun, p_gen); @@ -487,7 +487,7 @@ int FOO; return ret; } - case c3__dtts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dtts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun typ = _mint_nice(van, gol, _mint_bean()); @@ -534,7 +534,7 @@ int FOO; u3z(sam); return ret; } - case c3__dtzz: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dtzz: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun boc = (c3n == u3ud(q_gen)) @@ -549,7 +549,7 @@ int FOO; u3z(boc); return ret; } - case c3__dttr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dttr: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun one = _mint_corn(van, sut, p_gen); @@ -560,7 +560,7 @@ int FOO; _mint_nice(van, gol, c3__noun), u3nt(2, one, two)); } - case c3__dtzy: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dtzy: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun typ = u3_cqfu_play(van, sut, gen); @@ -601,7 +601,7 @@ int FOO; u3z(ryd); return pro; } - case c3__ktts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__ktts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun vat = _mint_in(van, sut, gol, q_gen); @@ -614,7 +614,7 @@ int FOO; u3z(vat); return ret; } - case c3__ktzp: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__ktzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun vat = _mint_in(van, sut, gol, q_gen); @@ -637,7 +637,7 @@ int FOO; { u3_noun cag = u3_cqfu_burn(van, sut); - u3_noun wim = u3_cn_nock_an(cag, u3k(q_nef)); + u3_noun wim = u3n_nock_an(cag, u3k(q_nef)); if ( 0 == u3h(wim) ) { fom = u3nc(1, u3k(u3t(wim))); @@ -651,7 +651,7 @@ int FOO; u3z(nef); return ret; } - case c3__ktls: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__ktls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun huz = u3_cqfu_play(van, sut, p_gen); @@ -662,7 +662,7 @@ int FOO; u3z(zel); return ret; } - case c3__kthx: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__kthx: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun huz = u3_cqfu_play(van, sut, p_gen); @@ -685,7 +685,7 @@ int FOO; u3z(zel); return ret; } - case c3__tsgr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__tsgr: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun fid = _mint_in(van, sut, c3__noun, p_gen); @@ -703,7 +703,7 @@ int FOO; u3z(dov); return ret; } - case c3__tstr: u3_cx_trel(u3t(gen), &p_gen, &q_gen, &r_gen); + case c3__tstr: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _mint_used(); { u3_noun sep = u3_cqfu_seep(van, sut, c3__both, q_gen); @@ -716,7 +716,7 @@ int FOO; return ret; } - case c3__cnts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__cnts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun sec = u3_cqfu_seek(van, sut, c3__read, p_gen); @@ -741,7 +741,7 @@ int FOO; return ret; } - case c3__pmcl: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__pmcl: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun ruf = u3nt @@ -773,7 +773,7 @@ int FOO; return ret; } - case c3__pmls: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__pmls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun ruf = u3nt @@ -785,22 +785,22 @@ int FOO; u3z(ruf); return ret; } - case c3__sgzp: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun typ = u3_cqfu_play(van, sut, p_gen); u3_noun dug = u3_cqfu_duck(van, typ); - u3_ct_push(u3nc(c3__mean, dug)); + u3t_push(u3nc(c3__mean, dug)); { ret = _mint_in(van, sut, gol, q_gen); } - u3_ct_drop(); + u3t_drop(); u3z(typ); return ret; } - case c3__sggr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__sggr: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun hum = _mint_in(van, sut, gol, q_gen); @@ -822,13 +822,13 @@ int FOO; case c3__zpts: p_gen = u3t(gen); _mint_used(); { - u3_noun von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); u3_noun sev = _mint_corn(von, sut, p_gen); u3z(von); return u3nc(c3__noun, u3nc(1, sev)); } - case c3__zpcm: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpcm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { return u3nc @@ -838,9 +838,9 @@ int FOO; u3_cqfu_play(van, sut, p_gen)), u3nc(1, u3k(q_gen))); } - case c3__zpcb: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen); { - u3_ct_push(u3nc(c3__mean, _mint_loc(van, p_gen))); + u3t_push(u3nc(c3__mean, _mint_loc(van, p_gen))); { u3_noun hum = _mint_in(van, sut, gol, q_gen); u3_noun bez = u3nt(c3__spot, 1, u3k(p_gen)); @@ -848,13 +848,13 @@ int FOO; ret = u3nc(u3k(u3h(hum)), u3nt(10, bez, u3k(u3t(hum)))); u3z(hum); } - u3_ct_drop(); + u3t_drop(); return ret; } case c3__zpcn: _mint_used(); { - u3_noun pet = u3_cj_hook(u3k(van), "seed"); + u3_noun pet = u3j_hook(u3k(van), "seed"); u3_noun p_pet = u3h(pet); u3_noun q_pet = u3t(pet); u3_noun ret; @@ -865,7 +865,7 @@ int FOO; u3z(pet); return ret; } - case c3__zpsm: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpsm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun vos = _mint_in(van, sut, c3__noun, q_gen); @@ -895,8 +895,8 @@ int FOO; u3_noun zur = u3_cqfu_play(van, sut, p_gen); u3_noun dun = u3_cqfu_dunq(van, "lost", zur); - u3_ct_push(u3nc(c3__mean, dun)); - return u3_cm_error("mint-lost"); + u3t_push(u3nc(c3__mean, dun)); + return u3m_error("mint-lost"); } else { return u3nt(c3__void, 0, 0); @@ -927,13 +927,13 @@ int FOO; { u3_noun sut, gol, gen, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &gol, - u3_cv_sam_3, &gen, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &gol, + u3v_sam_3, &gen, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_mint(van, sut, gol, gen); } @@ -946,8 +946,8 @@ int FOO; u3_noun gen) { c3_m fun_m = c3__mint; - u3_noun vrf = u3_cr_at(u3_cqfu_van_vrf, van); - u3_noun pro = u3_cz_find_4(fun_m, vrf, sut, gol, gen); + u3_noun vrf = u3r_at(u3_cqfu_van_vrf, van); + u3_noun pro = u3z_find_4(fun_m, vrf, sut, gol, gen); if ( u3_none != pro ) { return pro; @@ -955,6 +955,6 @@ int FOO; else { pro = _cqfu_mint(van, sut, gol, gen); - return u3_cz_save_4(fun_m, vrf, sut, gol, gen, pro); + return u3z_save_4(fun_m, vrf, sut, gol, gen, pro); } } diff --git a/j/6/ut_mull.c b/j/6/ut_mull.c index f21099250d..68fd0b82c8 100644 --- a/j/6/ut_mull.c +++ b/j/6/ut_mull.c @@ -14,13 +14,13 @@ _mull_vet( u3_noun van) { - // u3_bean vet = u3_cj_hook(u3k(van), "vet"); - u3_bean vet = u3_cr_at(u3_cqfu_van_vet, van); + // u3_bean vet = u3j_hook(u3k(van), "vet"); + u3_bean vet = u3r_at(u3_cqfu_van_vet, van); switch ( vet ) { case c3n: case c3y: return vet; - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); } } @@ -50,8 +50,8 @@ u3_noun loc) { u3_noun mol = u3nc('o', u3k(loc)); - u3_noun sho = u3_cj_hook(u3k(van), "show"); - u3_noun ret = u3_ci_molt(u3k(sho), u3_cv_sam, u3k(mol), 0); + u3_noun sho = u3j_hook(u3k(van), "show"); + u3_noun ret = u3i_molt(u3k(sho), u3v_sam, u3k(mol), 0); u3z(mol); u3z(sho); @@ -105,7 +105,7 @@ axe = _mull_coke(xin); } else { - return u3_cm_error("mint-coke"); + return u3m_error("mint-coke"); } u3z(nug); return axe; @@ -134,10 +134,10 @@ // u3_noun dun = u3_cqfu_dunq(van, "need", gol); // u3_noun niz = u3_cqfu_dunq(van, "have", typ); - // u3_ct_push(u3nc(c3__mean, dun)); - // u3_ct_push(u3nc(c3__mean, niz)); + // u3t_push(u3nc(c3__mean, dun)); + // u3t_push(u3nc(c3__mean, niz)); - return u3_cm_error("mull-nice"); + return u3m_error("mull-nice"); } else return typ; } @@ -152,16 +152,16 @@ if ( u3_nul != dab ) { u3_noun n_dab, l_dab, r_dab; - u3_cr_trel(dab, &n_dab, &l_dab, &r_dab); + u3r_trel(dab, &n_dab, &l_dab, &r_dab); if ( c3n == u3du(n_dab) ) { - u3_cm_bail(c3__fail); + u3m_bail(c3__fail); } else { u3_noun qn_dab = u3t(n_dab); u3_noun vad; switch ( u3h(qn_dab) ) { - default: u3_cm_bail(c3__exit); + default: u3m_bail(c3__exit); case c3__ash: { vad = _mull_in(van, sut, c3__noun, dox, u3t(qn_dab)); break; @@ -271,8 +271,8 @@ u3_noun dof = u3_cqfu_tock (van, sut, pi_mew, q_zil, q_yom); - if ( u3_cr_sing(u3h(cuf), u3h(dof)) ) { - u3_cm_error("mull-bonk-a"); + if ( u3r_sing(u3h(cuf), u3h(dof)) ) { + u3m_error("mull-bonk-a"); } u3z(p_yom); @@ -304,7 +304,7 @@ u3_noun ret; if ( c3n == u3du(gen) ) { - u3_noun ter = u3_cr_at(u3_cv_con_3, van); + u3_noun ter = u3r_at(u3v_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); ret = _mull_in(van, sut, gol, dox, rex); @@ -329,19 +329,19 @@ } else switch ( u3h(gen) ) { default: { - u3_noun ter = u3_cr_at(u3_cv_con_3, van); + u3_noun ter = u3r_at(u3v_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); - if ( c3y == u3_cr_sing(rex, gen) ) { + if ( c3y == u3r_sing(rex, gen) ) { #if 1 u3_noun zix = u3_cqfu_shep (van, "gene", 'q', u3k(gen)); - u3_ct_push(u3nc(c3__mean, zix)); - return u3_cm_error("mull-open"); + u3t_push(u3nc(c3__mean, zix)); + return u3m_error("mull-open"); #else u3_err("h", u3h(gen)); - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); #endif } ret = _mull_in(van, sut, gol, dox, rex); @@ -350,7 +350,7 @@ return ret; } - case c3__bcpt: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__bcpt: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun sep = u3_cqfu_seep(van, sut, c3__read, p_gen); @@ -358,7 +358,7 @@ u3_noun axe = u3h(sep); if ( axe != u3h(pox) ) { - return u3_cm_error("mull-bonk-wing"); + return u3m_error("mull-bonk-wing"); } else { u3_noun rex = u3_cqfl_whip(van, q_gen, axe); @@ -372,7 +372,7 @@ } } - case c3__wtts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__wtts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun nob = u3_cqfl_bunt(van, p_gen); @@ -384,10 +384,10 @@ u3_noun p_pov = u3_cqfu_fish(van, p_waz, p_syx); u3_noun q_pov = u3_cqfu_fish(van, q_waz, q_syx); - if ( (c3n == u3_cr_sing(p_syx, q_syx)) || - (c3n == u3_cr_sing(p_pov, q_pov)) ) + if ( (c3n == u3r_sing(p_syx, q_syx)) || + (c3n == u3r_sing(p_pov, q_pov)) ) { - return u3_cm_error("mull-bonk-b"); + return u3m_error("mull-bonk-b"); } u3z(p_waz); u3z(q_waz); u3z(p_syx); u3z(q_syx); @@ -398,7 +398,7 @@ return _mull_both(van, gol, _mull_bean()); } - case c3__wtcl: u3_cx_trel(u3t(gen), &p_gen, &q_gen, &r_gen); + case c3__wtcl: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _mull_used(); { u3_noun bol = _mull_bean(); @@ -418,7 +418,7 @@ ? c3__void : u3_cqfu_play(van, q_fex, q_gen)); } else if ( c3__void == q_fex ) { - hiq = u3_cm_error("mull-bonk-c"); + hiq = u3m_error("mull-bonk-c"); } else hiq = _mull_in(van, p_fex, gol, q_fex, q_gen); @@ -429,7 +429,7 @@ ? c3__void : u3_cqfu_play(van, q_wux, r_gen)); } else if ( c3__void == q_wux ) { - ran = u3_cm_error("mull-bonk-d"); + ran = u3m_error("mull-bonk-d"); } else ran = _mull_in(van, p_wux, gol, q_wux, r_gen); @@ -449,7 +449,7 @@ return ret; } - case c3__clhp: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__clhp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun hed = _mull_in(van, sut, c3__noun, dox, p_gen); @@ -463,7 +463,7 @@ return ret; } - case c3__dtts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dtts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun hed = _mull_in(van, sut, c3__noun, dox, p_gen); @@ -500,7 +500,7 @@ u3z(vay); return _mull_both(van, gol, wuq); } - case c3__dtzz: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dtzz: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun tof = u3nt @@ -512,7 +512,7 @@ return _mull_both(van, gol, tof); } - case c3__dttr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dttr: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun hed = _mull_in(van, sut, c3__noun, dox, p_gen); @@ -523,7 +523,7 @@ return _mull_both(van, gol, c3__noun); } - case c3__dtzy: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dtzy: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun typ = u3_cqfu_play(van, sut, gen); @@ -562,7 +562,7 @@ u3z(vat); return pro; } - case c3__ktts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__ktts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, q_gen); @@ -574,7 +574,7 @@ u3z(vat); return ret; } - case c3__ktzp: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__ktzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, q_gen); @@ -591,7 +591,7 @@ { return _mull_in(van, sut, gol, dox, p_gen); } - case c3__ktls: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__ktls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun p_hif = _mull_nice @@ -604,7 +604,7 @@ u3z(zel); return ret; } - case c3__kthx: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__kthx: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun p_hif = _mull_nice @@ -617,7 +617,7 @@ u3z(zel); return ret; } - case c3__tsgr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__tsgr: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun lem = _mull_in(van, sut, c3__noun, dox, p_gen); @@ -628,7 +628,7 @@ u3z(lem); return ret; } - case c3__tstr: u3_cx_trel(u3t(gen), &p_gen, &q_gen, &r_gen); + case c3__tstr: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _mull_used(); { u3_noun sep = u3_cqfu_seep(van, sut, c3__both, q_gen); @@ -646,7 +646,7 @@ return ret; } - case c3__cnts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__cnts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun sec = u3_cqfu_seek(van, sut, c3__read, p_gen); @@ -662,15 +662,15 @@ u3_noun pq_vug = u3h(q_vug); u3_noun qq_vug = u3t(q_vug); - if ( c3a(u3_cr_sing(p_lar, p_vug), u3_cr_sing(pq_lar, pq_vug)) ) { - u3_cm_error("mull-bonk-e"); + if ( c3a(u3r_sing(p_lar, p_vug), u3r_sing(pq_lar, pq_vug)) ) { + u3m_error("mull-bonk-e"); } { u3_noun mew = u3_cqfu_snub(van, sut, q_gen); u3_noun yom = _mull_edit (van, sut, dox, mew, u3k(qq_lar), u3k(qq_vug)); - u3_noun von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); u3_noun p_ret = u3_cqfu_fire(van, sut, u3h(yom)); u3_noun q_ret = u3_cqfu_fire(von, sut, u3t(yom)); @@ -683,7 +683,7 @@ return u3nc(_mull_nice(van, gol, p_ret), q_ret); } } - case c3__pmcl: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__pmcl: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun ruf = u3nt @@ -716,7 +716,7 @@ return ret; } - case c3__pmls: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__pmls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun ruf = u3nt @@ -729,28 +729,28 @@ u3z(ruf); return ret; } - case c3__sgzp: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun typ = u3_cqfu_play(van, sut, p_gen); u3_noun dug = u3_cqfu_duck(van, typ); u3_noun ret; - u3_ct_push(u3nc(c3__mean, dug)); + u3t_push(u3nc(c3__mean, dug)); { ret = _mull_in(van, sut, gol, dox, q_gen); } - u3_ct_drop(); + u3t_drop(); u3z(typ); return ret; } - case c3__sggr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__sggr: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { return _mull_in(van, sut, gol, dox, q_gen); } - case c3__zpcm: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpcm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun p_ret = u3_cqfu_play(van, sut, p_gen); @@ -760,15 +760,15 @@ (_mull_nice(van, gol, p_ret), q_ret); } - case c3__zpcb: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen); { u3_noun ret; - u3_ct_push(u3nc(c3__mean, _mull_loc(van, p_gen))); + u3t_push(u3nc(c3__mean, _mull_loc(van, p_gen))); { ret = _mull_in(van, sut, gol, dox, q_gen); } - u3_ct_drop(); + u3t_drop(); return ret; } case c3__zpts: p_gen = u3t(gen); @@ -779,13 +779,13 @@ case c3__zpcn: _mull_used(); { - u3_noun pet = u3_cj_hook(u3k(van), "seed"); + u3_noun pet = u3j_hook(u3k(van), "seed"); u3_noun peq = u3k(u3h(pet)); u3z(pet); return _mull_both(van, gol, peq); } - case c3__zpsm: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpsm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun p_zur = u3_cqfu_play(van, sut, p_gen); @@ -835,14 +835,14 @@ { u3_noun sut, gol, dox, gen, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &gol, - u3_cv_sam_6, &dox, - u3_cv_sam_7, &gen, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &gol, + u3v_sam_6, &dox, + u3v_sam_7, &gen, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_mull(van, sut, gol, dox, gen); } @@ -856,7 +856,7 @@ u3_noun gen) { c3_m fun_m = c3__mull; - u3_noun pro = u3_cz_find_4(fun_m, sut, gol, dox, gen); + u3_noun pro = u3z_find_4(fun_m, sut, gol, dox, gen); if ( u3_none != pro ) { return pro; @@ -864,7 +864,7 @@ else { pro = _cqfu_mull(van, sut, gol, dox, gen); - return u3_cz_save_4(fun_m, sut, gol, dox, gen, pro); + return u3z_save_4(fun_m, sut, gol, dox, gen, pro); } } diff --git a/j/6/ut_nest.c b/j/6/ut_nest.c index 92b7fb3775..acc6079c53 100644 --- a/j/6/ut_nest.c +++ b/j/6/ut_nest.c @@ -25,7 +25,7 @@ u3_noun gil) { if ( u3_nul == dab ) { - return u3_cr_sing(u3_nul, hem); + return u3r_sing(u3_nul, hem); } else if ( u3_nul == hem ) { return c3n; } else { @@ -33,8 +33,8 @@ u3_noun n_hem, l_hem, r_hem; u3_noun pn_hem, qn_hem, pn_dab, qn_dab; - u3_cx_trel(dab, &n_dab, &l_dab, &r_dab); - u3_cx_trel(hem, &n_hem, &l_hem, &r_hem); + u3x_trel(dab, &n_dab, &l_dab, &r_dab); + u3x_trel(hem, &n_hem, &l_hem, &r_hem); if ( (c3n == _nest_cram (van, sut, tel, ref, l_dab, l_hem, gil)) || @@ -42,17 +42,17 @@ (van, sut, tel, ref, r_dab, r_hem, gil)) ) { return c3n; } - u3_cx_cell(n_dab, &pn_dab, &qn_dab); - u3_cx_cell(n_hem, &pn_hem, &qn_hem); + u3x_cell(n_dab, &pn_dab, &qn_dab); + u3x_cell(n_hem, &pn_hem, &qn_hem); - if ( c3n == u3_cr_sing(pn_dab, pn_hem) ) { + if ( c3n == u3r_sing(pn_dab, pn_hem) ) { return c3n; } else { if ( (c3n == u3du(qn_dab)) || (c3n == u3du(qn_hem)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else switch ( u3h(qn_dab) ) { - default: return u3_cm_bail(c3__exit); + default: return u3m_bail(c3__exit); case c3__ash: { if ( c3__ash != u3h(qn_hem) ) { return c3n; @@ -69,7 +69,7 @@ } } case c3__elm: { - return u3_cr_sing(qn_dab, qn_hem); + return u3r_sing(qn_dab, qn_hem); } } } @@ -89,16 +89,16 @@ u3_noun prq_sut, qrq_sut, prq_ref, qrq_ref; u3_bean ret; - u3_cx_trel(sut, 0, &p_sut, &q_sut); - u3_cx_trel(ref, 0, &p_ref, &q_ref); + u3x_trel(sut, 0, &p_sut, &q_sut); + u3x_trel(ref, 0, &p_ref, &q_ref); - u3_cx_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); - u3_cx_trel(q_ref, &pq_ref, &qq_ref, &rq_ref); + u3x_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); + u3x_trel(q_ref, &pq_ref, &qq_ref, &rq_ref); - u3_cx_cell(rq_sut, &prq_sut, &qrq_sut); - u3_cx_cell(rq_ref, &prq_ref, &qrq_ref); + u3x_cell(rq_sut, &prq_sut, &qrq_sut); + u3x_cell(rq_ref, &prq_ref, &qrq_ref); - if ( c3y == u3_cr_sing(q_sut, q_ref) ) { + if ( c3y == u3r_sing(q_sut, q_ref) ) { return _nest_dext(van, p_sut, tel, p_ref, gil); } else if ( (c3n == _nest_dext(van, qq_sut, tel, p_sut, gil)) || @@ -139,7 +139,7 @@ } else { switch ( pq_sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__gold: { return @@ -190,7 +190,7 @@ u3_noun p_sut, q_sut, p_ref, q_ref; if ( (c3n == u3du(sut)) ) switch ( sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: { return c3y; @@ -200,7 +200,7 @@ } } else switch ( u3h(sut) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__atom: { if ( (c3y == u3du(ref)) && (c3__atom == u3h(ref)) ) { @@ -214,17 +214,17 @@ else return _nest_sint(van, sut, tel, ref, gil); } case c3__bull: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { return _nest_dext(van, q_sut, tel, ref, gil); } } case c3__cell: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { - if ( c3y == u3_cr_pq(ref, c3__cell, &p_ref, &q_ref) ) { + if ( c3y == u3r_pq(ref, c3__cell, &p_ref, &q_ref) ) { return c3a(_nest_dext(van, p_sut, tel, p_ref, gil), _nest_dext(van, q_sut, tel, q_ref, gil)); } @@ -232,35 +232,35 @@ } } case c3__core: { - if ( c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_trel(sut, 0, &p_sut, &q_sut) ) { + return u3m_bail(c3__fail); } else { - if ( (c3y == u3_cr_pq(ref, c3__core, &p_ref, &q_ref)) ) { + if ( (c3y == u3r_pq(ref, c3__core, &p_ref, &q_ref)) ) { return _nest_cong(van, sut, tel, ref, gil); } else return _nest_sint(van, sut, tel, ref, gil); } } case c3__cube: { - if ( c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_trel(sut, 0, &p_sut, &q_sut) ) { + return u3m_bail(c3__fail); } else { - if ( c3y == u3_cr_pq(ref, c3__cube, &p_ref, &q_ref) ) { - return u3_cr_sing(p_sut, p_ref); + if ( c3y == u3r_pq(ref, c3__cube, &p_ref, &q_ref) ) { + return u3r_sing(p_sut, p_ref); } else return _nest_sint(van, sut, tel, ref, gil); } } case c3__face: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { return _nest_dext(van, q_sut, tel, ref, gil); } } case c3__fork: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { if ( c3n == u3du(ref) ) switch ( ref ) { @@ -322,10 +322,10 @@ // u3_noun dun = u3_cqfu_dunq(van, "need", sut); // u3_noun niz = u3_cqfu_dunq(van, "have", ref); - // u3_ct_push(u3nc(c3__mean, dun)); - // u3_ct_push(u3nc(c3__mean, niz)); + // u3t_push(u3nc(c3__mean, dun)); + // u3t_push(u3nc(c3__mean, niz)); - return u3_cm_error("type-fail"); + return u3m_error("type-fail"); } } @@ -338,13 +338,13 @@ u3_noun gil) { - if ( (c3y == u3_cr_sing(sut, ref)) ) { + if ( (c3y == u3r_sing(sut, ref)) ) { return c3y; } { c3_m fun_m = c3__nest; - u3_noun pro = u3_cz_find_2(fun_m, sut, ref); + u3_noun pro = u3z_find_2(fun_m, sut, ref); if ( u3_none != pro ) { return pro; @@ -352,7 +352,7 @@ else { pro = _nest_dext_to(van, sut, tel, ref, gil); - return u3_cz_save_2(fun_m, sut, ref, pro); + return u3z_save_2(fun_m, sut, ref, pro); } } } @@ -369,7 +369,7 @@ if ( (c3n == u3du(ref)) ) { switch ( ref ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: return c3n; case c3__void: return c3y; @@ -378,12 +378,12 @@ else { switch ( u3h(ref) ) { default: { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } case c3__atom: return c3n; case c3__bull: { - if ( c3n == u3_cr_trel(ref, 0, &p_ref, &q_ref) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_trel(ref, 0, &p_ref, &q_ref) ) { + return u3m_bail(c3__fail); } else { return _nest_dext(van, sut, tel, q_ref, gil); } @@ -397,25 +397,25 @@ return hiv; } case c3__cube: { - if ( c3n == u3_cr_trel(ref, 0, &p_ref, &q_ref) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_trel(ref, 0, &p_ref, &q_ref) ) { + return u3m_bail(c3__fail); } else { return _nest_dext(van, sut, tel, q_ref, gil); } } case c3__face: { - if ( c3n == u3_cr_trel(ref, 0, &p_ref, &q_ref) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_trel(ref, 0, &p_ref, &q_ref) ) { + return u3m_bail(c3__fail); } else { return _nest_dext(van, sut, tel, q_ref, gil); } } case c3__fork: { - if ( (c3y == u3_cr_mean(ref, 6, &p_ref, 7, &q_ref, 0)) ) { + if ( (c3y == u3r_mean(ref, 6, &p_ref, 7, &q_ref, 0)) ) { return c3a(_nest_dext(van, sut, c3n, p_ref, gil), _nest_dext(van, sut, c3n, q_ref, gil)); } - else return u3_cm_bail(c3__fail); + else return u3m_bail(c3__fail); } case c3__hold: { p_ref = u3t(ref); @@ -464,14 +464,14 @@ { u3_noun sut, tel, ref, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &tel, - u3_cv_sam_3, &ref, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &tel, + u3v_sam_3, &ref, + u3v_con, &van, 0)) || (c3n == u3ud(tel)) || (tel > 1) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_nest(van, sut, tel, ref); } diff --git a/j/6/ut_park.c b/j/6/ut_park.c index 62b77aae49..ba7fec9349 100644 --- a/j/6/ut_park.c +++ b/j/6/ut_park.c @@ -15,17 +15,17 @@ u3_atom axe) { if ( c3n == u3du(sut) || c3__core != u3h(sut) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } - // else if ( c3n == u3_cj_hook(u3k(van), "vet") ) { - else if ( c3n == u3_cr_at(u3_cqfu_van_vet, van) ) { + // else if ( c3n == u3j_hook(u3k(van), "vet") ) { + else if ( c3n == u3r_at(u3_cqfu_van_vet, van) ) { return c3y; } else { u3_noun p_sut, q_sut, pq_sut; - u3_cx_cell(u3t(sut), &p_sut, &q_sut); - u3_cx_cell(q_sut, &pq_sut, 0); + u3x_cell(u3t(sut), &p_sut, &q_sut); + u3x_cell(q_sut, &pq_sut, 0); if ( c3__both == way ) { if ( c3__gold == pq_sut ) { @@ -34,30 +34,30 @@ } if ( c3__read == way ) { switch ( pq_sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__gold: return c3y; case c3__lead: return c3n; case c3__iron: return c3n; case c3__zinc: return - c3a(!(u3_cr_sing(1, axe)), - u3_cr_sing(2, u3_cqc_cap(axe))); + c3a(!(u3r_sing(1, axe)), + u3r_sing(2, u3_cqc_cap(axe))); } } else if ( c3__rite == way ) { switch ( pq_sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__gold: return c3y; case c3__lead: return c3n; case c3__iron: return - c3a(!(u3_cr_sing(1, axe)), - u3_cr_sing(2, u3_cqc_cap(axe))); + c3a(!(u3r_sing(1, axe)), + u3r_sing(2, u3_cqc_cap(axe))); case c3__zinc: return c3n; } } else if ( c3__free == way ) { return c3y; } - else return u3_cm_bail(c3__fail); + else return u3m_bail(c3__fail); } } @@ -69,14 +69,14 @@ { u3_noun sut, way, axe, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &way, - u3_cv_sam_3, &axe, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &way, + u3v_sam_3, &axe, + u3v_con, &van, 0)) || (c3n == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_park(van, sut, way, axe); } diff --git a/j/6/ut_peek.c b/j/6/ut_peek.c index 0e1e0b9199..39fd4c3c58 100644 --- a/j/6/ut_peek.c +++ b/j/6/ut_peek.c @@ -22,7 +22,7 @@ u3_noun pro; if ( (c3n == u3du(sut)) ) switch ( sut ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__noun: { return c3__noun; @@ -32,21 +32,21 @@ } } else switch ( u3h(sut) ) { - default: return u3_cm_bail(c3__fail); + default: return u3m_bail(c3__fail); case c3__atom: { return c3__void; } case c3__bull: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { return _peek_in(van, q_sut, way, axe, gil); } } case c3__cell: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { u3_atom tip = u3_cqc_cap(axe); u3_atom tap = u3_cqc_mas(axe); @@ -67,11 +67,11 @@ u3_noun pq_sut, qq_sut, rq_sut; u3_noun prq_sut, qrq_sut; - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) || - (c3n == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || - (c3n == u3_cr_cell(rq_sut, &prq_sut, &qrq_sut)) ) + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) || + (c3n == u3r_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || + (c3n == u3r_cell(rq_sut, &prq_sut, &qrq_sut)) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { u3_atom tip = u3_cqc_cap(axe); u3_atom tap = u3_cqc_mas(axe); @@ -83,10 +83,10 @@ u3_noun waz = u3_cqfu_shep (van, "axis", 'd', u3k(axe)); - // u3_ct_push(u3nc(c3__mean, dun)); - u3_ct_push(u3nc(c3__mean, waz)); + // u3t_push(u3nc(c3__mean, dun)); + u3t_push(u3nc(c3__mean, waz)); - return u3_cm_error("peek-park"); + return u3m_error("peek-park"); } else pro = _cqfu_peek(van, p_sut, way, tap); } @@ -100,22 +100,22 @@ } } case c3__cube: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { return _peek_in(van, q_sut, way, axe, gil); } } case c3__face: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { return _peek_in(van, q_sut, way, axe, gil); } } case c3__fork: { - if ( (c3n == u3_cr_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3_cm_bail(c3__fail); + if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { + return u3m_bail(c3__fail); } else { u3_noun hed = _peek_in(van, p_sut, way, axe, gil); u3_noun tal = _peek_in(van, q_sut, way, axe, gil); @@ -168,14 +168,14 @@ { u3_noun sut, way, axe, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &way, - u3_cv_sam_3, &axe, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &way, + u3v_sam_3, &axe, + u3v_con, &van, 0)) || (c3n == u3ud(axe)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_peek(van, sut, way, axe); } @@ -188,7 +188,7 @@ u3_noun axe) { c3_m fun_m = c3__peek; - u3_noun pro = u3_cz_find_3(fun_m, sut, way, axe); + u3_noun pro = u3z_find_3(fun_m, sut, way, axe); if ( u3_none != pro ) { return pro; @@ -196,6 +196,6 @@ else { pro = _cqfu_peek(van, sut, way, axe); - return u3_cz_save_3(fun_m, sut, way, axe, pro); + return u3z_save_3(fun_m, sut, way, axe, pro); } } diff --git a/j/6/ut_play.c b/j/6/ut_play.c index 8f35f03d2c..0151e95cfe 100644 --- a/j/6/ut_play.c +++ b/j/6/ut_play.c @@ -40,8 +40,8 @@ u3_noun loc) { u3_noun mol = u3nc('o', u3k(loc)); - u3_noun sho = u3_cj_hook(u3k(van), "show"); - u3_noun ret = u3_ci_molt(u3k(sho), u3_cv_sam, u3k(mol), 0); + u3_noun sho = u3j_hook(u3k(van), "show"); + u3_noun ret = u3i_molt(u3k(sho), u3v_sam, u3k(mol), 0); u3z(mol); u3z(sho); @@ -146,11 +146,11 @@ (van, "gene", 'q', u3k(gen)); u3_noun ret; - u3_ct_push(u3nc(c3__mean, zix)); + u3t_push(u3nc(c3__mean, zix)); ret = _play_in(van, sut, gen); - u3_ct_drop(); + u3t_drop(); return ret; #endif } @@ -165,16 +165,16 @@ if ( c3n == u3du(gen) ) { open: { - u3_noun ter = u3_cr_at(u3_cv_con_3, van); + u3_noun ter = u3r_at(u3v_con_3, van); u3_noun rex = u3_cqfp_open(ter, gen); u3_noun ret; - if ( c3y == u3_cr_sing(rex, gen) ) { + if ( c3y == u3r_sing(rex, gen) ) { u3_noun zix = u3_cqfu_shep (van, "gene", 'q', u3k(gen)); - u3_ct_push(u3nc(c3__mean, zix)); - return u3_cm_error("play-open"); + u3t_push(u3nc(c3__mean, zix)); + return u3m_error("play-open"); } ret = _play_x(van, sut, rex); u3z(rex); @@ -197,7 +197,7 @@ else switch ( u3h(gen) ) { default: goto open; - case c3__bcpt: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__bcpt: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun sep = u3_cqfu_seep(van, sut, c3__read, p_gen); @@ -210,12 +210,12 @@ return ret; } - case c3__wtts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__wtts: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { return _play_bean(); } - case c3__wtcl: u3_cx_trel(u3t(gen), &p_gen, &q_gen, &r_gen); + case c3__wtcl: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _play_used(); { u3_noun fex = u3_cqfu_gain(van, sut, p_gen); @@ -230,7 +230,7 @@ u3z(fex); u3z(wux); return ret; } - case c3__clhp: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__clhp: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun dis = _play_x(van, sut, p_gen); @@ -251,7 +251,7 @@ { return _play_bean(); } - case c3__dtts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dtts: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { return _play_bean(); @@ -261,7 +261,7 @@ { return u3nc(c3__atom, u3_blip); } - case c3__dtzz: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dtzz: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun boc = (c3n == u3ud(q_gen)) @@ -272,17 +272,17 @@ u3z(boc); return ret; } - case c3__dttr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dttr: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { return c3__noun; } - case c3__dtzy: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__dtzy: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { if ( 'f' == p_gen ) { if ( (q_gen > 1) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { return _play_bean(); } @@ -316,7 +316,7 @@ u3z(boc); return pro; } - case c3__ktts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__ktts: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun boc = _play_x(van, sut, q_gen); @@ -325,7 +325,7 @@ u3z(boc); return ret; } - case c3__ktzp: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__ktzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun boc = _play_x(van, sut, q_gen); @@ -339,17 +339,17 @@ { return _play_x(van, sut, p_gen); } - case c3__kthx: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__kthx: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { return _play_x(van, sut, p_gen); } - case c3__ktls: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__ktls: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { return _play_x(van, sut, p_gen); } - case c3__tsgr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__tsgr: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun boc = _play_x(van, sut, p_gen); @@ -358,7 +358,7 @@ u3z(boc); return ret; } - case c3__tstr: u3_cx_trel(u3t(gen), &p_gen, &q_gen, &r_gen); + case c3__tstr: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _play_used(); { u3_noun sep = u3_cqfu_seep(van, sut, c3__both, q_gen); @@ -371,7 +371,7 @@ return ret; } - case c3__cnts: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__cnts: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun sec = u3_cqfu_seek(van, sut, c3__read, p_gen); @@ -388,7 +388,7 @@ return ret; } - case c3__pmcl: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__pmcl: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun ruf = u3nt @@ -418,7 +418,7 @@ u3z(ruf); return ret; } - case c3__pmls: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__pmls: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun ruf = u3nt @@ -430,23 +430,23 @@ u3z(ruf); return ret; } - case c3__sgzp: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun typ = u3_cqfu_play(van, sut, p_gen); u3_noun dug = u3_cqfu_duck(van, typ); u3_noun ret; - u3_ct_push(u3nc(c3__mean, dug)); + u3t_push(u3nc(c3__mean, dug)); { ret = _play_x(van, sut, q_gen); } - u3_ct_drop(); + u3t_drop(); u3z(typ); return ret; } - case c3__sggr: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__sggr: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { return _play_x(van, sut, q_gen); @@ -456,32 +456,32 @@ { return c3__noun; } - case c3__zpcm: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpcm: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { return _play_x(van, sut, p_gen); } - case c3__zpcb: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen); { u3_noun ret; - u3_ct_push(u3nc(c3__mean, _play_loc(van, p_gen))); + u3t_push(u3nc(c3__mean, _play_loc(van, p_gen))); { ret = _play_x(van, sut, q_gen); } - u3_ct_drop(); + u3t_drop(); return ret; } case c3__zpcn: _play_used(); { - u3_noun pet = u3_cj_hook(u3k(van), "seed"); + u3_noun pet = u3j_hook(u3k(van), "seed"); u3_noun ret = u3k(u3h(pet)); u3z(pet); return ret; } - case c3__zpsm: u3_cx_cell(u3t(gen), &p_gen, &q_gen); + case c3__zpsm: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun zur = _play_x(van, sut, p_gen); @@ -508,7 +508,7 @@ u3_noun sut, u3_noun gen) { - u3_noun von = u3_ci_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); u3_noun ret = _play_x(von, sut, gen); u3z(von); @@ -523,10 +523,10 @@ { u3_noun sut, gen, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &gen, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &gen, u3v_con, &van, 0)) || + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_play(van, sut, gen); } diff --git a/j/6/ut_repo.c b/j/6/ut_repo.c index c96298da30..c2942be900 100644 --- a/j/6/ut_repo.c +++ b/j/6/ut_repo.c @@ -24,33 +24,33 @@ } else switch ( u3h(sut) ) { default: { - return u3_cm_error("repo-flat"); + return u3m_error("repo-flat"); } case c3__bull: { - if ( c3n == u3_cr_cell(u3t(sut), &p_sut, &q_sut)) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_cell(u3t(sut), &p_sut, &q_sut)) { + return u3m_bail(c3__fail); } else { return u3k(q_sut); } } case c3__core: { - if ( c3n == u3_cr_cell(u3t(sut), &p_sut, &q_sut) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_cell(u3t(sut), &p_sut, &q_sut) ) { + return u3m_bail(c3__fail); } else { return u3nt(c3__cell, c3__noun, u3k(p_sut)); } } case c3__cube: { - if ( c3n == u3_cr_cell(u3t(sut), &p_sut, &q_sut)) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_cell(u3t(sut), &p_sut, &q_sut)) { + return u3m_bail(c3__fail); } else { return u3k(q_sut); } } case c3__face: { - if ( c3n == u3_cr_cell(u3t(sut), &p_sut, &q_sut)) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_cell(u3t(sut), &p_sut, &q_sut)) { + return u3m_bail(c3__fail); } else { return u3k(q_sut); } @@ -68,8 +68,8 @@ { u3_noun sut; - if ( u3_none == (sut = u3_cr_at(u3_cv_sam, cor)) ) { - return u3_cm_bail(c3__fail); + if ( u3_none == (sut = u3r_at(u3v_sam, cor)) ) { + return u3m_bail(c3__fail); } else { return u3_cqfu_repo(cor, sut); } diff --git a/j/6/ut_rest.c b/j/6/ut_rest.c index 4c4aee66d2..ab261d8e67 100644 --- a/j/6/ut_rest.c +++ b/j/6/ut_rest.c @@ -84,14 +84,14 @@ u3_noun _cqfu_rest(u3_noun van, u3_noun sut, u3_noun leg) { - u3_noun fan = u3_cr_at(u3_cqfu_van_fan, van); + u3_noun fan = u3r_at(u3_cqfu_van_fan, van); if ( c3y == _rest_hit_fan(fan, leg) ) { - return u3_cm_error("rest-loop"); + return u3m_error("rest-loop"); } else { u3_noun naf = u3_cqdi_gas(fan, leg); - u3_noun nav = u3_ci_molt(u3k(van), u3_cqfu_van_fan, u3k(naf), 0); + u3_noun nav = u3i_molt(u3k(van), u3_cqfu_van_fan, u3k(naf), 0); u3_noun mez = _rest_in(nav, leg); u3z(naf); @@ -108,10 +108,10 @@ { u3_noun sut, leg, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &leg, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &leg, u3v_con, &van, 0)) || + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_rest(van, sut, leg); } @@ -123,7 +123,7 @@ u3_noun leg) { c3_m fun_m = c3__rest; - u3_noun pro = u3_cz_find_2(fun_m, sut, leg); + u3_noun pro = u3z_find_2(fun_m, sut, leg); if ( u3_none != pro ) { return pro; @@ -131,6 +131,6 @@ else { pro = _cqfu_rest(van, sut, leg); - return u3_cz_save_2(fun_m, sut, leg, pro); + return u3z_save_2(fun_m, sut, leg, pro); } } diff --git a/j/6/ut_seek.c b/j/6/ut_seek.c index 8561f7f441..ab98c7c722 100644 --- a/j/6/ut_seek.c +++ b/j/6/ut_seek.c @@ -45,7 +45,7 @@ u3_noun nuy = u3_cqf_look(syx, u3t(qiqq_tor)); if ( u3_nul == nuy ) { - return u3_cm_error("silk"); + return u3m_error("silk"); } else { yon = u3nc(u3k(u3t(nuy)), yon); @@ -65,7 +65,7 @@ if ( axe == 0 ) { axe = u3h(u3h(hey)); } else if ( axe != u3h(u3h(hey)) ) { - return u3_cm_error("silk"); + return u3m_error("silk"); } hey = u3t(hey); } @@ -95,11 +95,11 @@ u3_noun p_tor, q_tor, pq_tor, qq_tor; u3_noun hey, ret; - u3_cr_cell(tor, &p_tor, &q_tor); + u3r_cell(tor, &p_tor, &q_tor); if ( c3y == u3h(q_tor) ) { return u3_nul; } - u3_cr_cell(u3t(q_tor), &pq_tor, &qq_tor); + u3r_cell(u3t(q_tor), &pq_tor, &qq_tor); hey = _seek_silk_yew(van, syx, qq_tor); if ( u3_nul == hey ) { @@ -108,7 +108,7 @@ if ( u3_ckb_lent(u3k(hey)) != u3_ckb_lent(u3k(qq_tor)) ) { - return u3_cm_error("silk"); + return u3m_error("silk"); } ret = u3nq @@ -134,7 +134,7 @@ (1, c3y, u3k(sut)); } else if ( c3n == u3du(hyp) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { u3_noun i_hyp = u3h(hyp); @@ -150,7 +150,7 @@ } zar = _cqfu_seek(van, sut, way, t_hyp); - u3_cr_cell(zar, &p_zar, &q_zar); + u3r_cell(zar, &p_zar, &q_zar); #if 0 if ( c3y == u3h(yip) ) { @@ -173,7 +173,7 @@ u3_noun pq_zar, qq_zar; u3_noun wip; - u3_cr_cell(u3t(q_zar), &pq_zar, &qq_zar); + u3r_cell(u3t(q_zar), &pq_zar, &qq_zar); wip = _seek_flat(qq_zar); syp = u3_cqfu_fire(van, sut, wip); @@ -183,14 +183,14 @@ if ( c3n == u3h(yip) ) { u3_noun p_yip, q_yip, hud; - if ( c3n == u3_cr_cell(u3t(yip), &p_yip, &q_yip) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_cell(u3t(yip), &p_yip, &q_yip) ) { + return u3m_bail(c3__fail); } hud = u3_cqfu_fink(van, syp, p_yip, way, q_yip); { u3_noun p_hud, q_hud; - u3_cr_cell(hud, &p_hud, &q_hud); + u3r_cell(hud, &p_hud, &q_hud); ret = u3nc(u3_cqc_peg(p_zar, p_hud), u3k(q_hud)); @@ -201,7 +201,7 @@ u3_noun p_yip = u3t(yip); if ( c3n == u3ud(p_yip) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { ret = u3nt @@ -224,13 +224,13 @@ { u3_noun sut, way, hyp, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &way, - u3_cv_sam_3, &hyp, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &way, + u3v_sam_3, &hyp, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_seek(van, sut, way, hyp); } @@ -243,7 +243,7 @@ u3_noun hyp) { c3_m fun_m = c3__seek; - u3_noun pro = u3_cz_find_3(fun_m, sut, way, hyp); + u3_noun pro = u3z_find_3(fun_m, sut, way, hyp); if ( u3_none != pro ) { return pro; @@ -251,7 +251,7 @@ else { pro = _cqfu_seek(van, sut, way, hyp); - return u3_cz_save_3(fun_m, sut, way, hyp, pro); + return u3z_save_3(fun_m, sut, way, hyp, pro); } } @@ -266,7 +266,7 @@ u3_noun q_zar = u3t(zar); if ( c3y != u3h(q_zar) ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun ret = u3nc(u3k(p_zar), u3k(u3t(q_zar))); @@ -281,13 +281,13 @@ { u3_noun sut, way, hyp, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &way, - u3_cv_sam_3, &hyp, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &way, + u3v_sam_3, &hyp, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqfu_seep(van, sut, way, hyp); } diff --git a/j/6/ut_sift.c b/j/6/ut_sift.c index b760d6cbf6..cb83d12018 100644 --- a/j/6/ut_sift.c +++ b/j/6/ut_sift.c @@ -13,12 +13,12 @@ { u3_noun sut, ref, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &ref, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam, &ref, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return u3_cqfu_sift(van, sut, ref); } diff --git a/j/6/ut_swab.c b/j/6/ut_swab.c index bdf3f183ae..b44d32d243 100644 --- a/j/6/ut_swab.c +++ b/j/6/ut_swab.c @@ -39,12 +39,12 @@ { u3_noun van, sut, har; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &har, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam, &har, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_snub(van, sut, har); } diff --git a/j/6/ut_tack.c b/j/6/ut_tack.c index 72adf3ae43..ca273e1e4a 100644 --- a/j/6/ut_tack.c +++ b/j/6/ut_tack.c @@ -11,9 +11,9 @@ u3_noun peh, u3_noun mur) { - u3_noun von = u3_ci_molt(u3k(van), u3_cv_sam, u3k(sut), 0); - u3_noun gat = u3_cj_hook(von, "tack"); + u3_noun von = u3i_molt(u3k(van), u3v_sam, u3k(sut), 0); + u3_noun gat = u3j_hook(von, "tack"); - return u3_cn_kick_on - (u3_ci_molt(gat, u3_cv_sam_2, u3k(peh), u3_cv_sam_3, u3k(mur), 0)); + return u3n_kick_on + (u3i_molt(gat, u3v_sam_2, u3k(peh), u3v_sam_3, u3k(mur), 0)); } diff --git a/j/6/ut_tock.c b/j/6/ut_tock.c index 6725ce4683..0a30750890 100644 --- a/j/6/ut_tock.c +++ b/j/6/ut_tock.c @@ -34,8 +34,8 @@ ret = u3nc( ( (u3_nul == p_mox) ? u3nc(u3_nul, u3k(p_geq)) - : (c3n == u3_cr_sing(p_geq, u3t(p_mox))) - ? u3_cm_bail(c3__exit) + : (c3n == u3r_sing(p_geq, u3t(p_mox))) + ? u3m_bail(c3__exit) : u3k(p_mox) ), u3nc(u3nc(u3k(q_geq), u3k(qi_men)), u3k(q_mox))); @@ -59,7 +59,7 @@ u3_noun q_wib = u3t(wib); if ( u3_nul == p_wib ) { - return u3_cm_bail(c3__exit); + return u3m_bail(c3__exit); } else { u3_noun ret = u3nc(u3k(u3t(p_wib)), u3k(q_wib)); @@ -75,14 +75,14 @@ { u3_noun van, sut, peh, mur, men; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &peh, - u3_cv_sam_6, &mur, - u3_cv_sam_7, &men, - u3_cv_con, &van, + if ( (c3n == u3r_mean(cor, u3v_sam_2, &peh, + u3v_sam_6, &mur, + u3v_sam_7, &men, + u3v_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_tock(van, sut, peh, mur, men); } diff --git a/j/6/ut_wrap.c b/j/6/ut_wrap.c index 2cac45efdf..7a6a14a636 100644 --- a/j/6/ut_wrap.c +++ b/j/6/ut_wrap.c @@ -14,20 +14,20 @@ u3_noun p_sut, q_sut; if ( c3n == u3du(sut) ) { - return u3_cm_error("wrap-type"); + return u3m_error("wrap-type"); } else switch ( u3h(sut) ) { - default: return u3_cm_error("wrap-type"); + default: return u3m_error("wrap-type"); - case c3__core: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun pq_sut, qq_sut, rq_sut; - if ( c3n == u3_cr_trel(q_sut, &pq_sut, &qq_sut, &rq_sut) ) { - return u3_cm_bail(c3__fail); + if ( c3n == u3r_trel(q_sut, &pq_sut, &qq_sut, &rq_sut) ) { + return u3m_bail(c3__fail); } else if ( c3__gold != pq_sut ) { - return u3_cm_error("wrap-gold"); + return u3m_error("wrap-gold"); } else { return u3nt(c3__core, @@ -37,7 +37,7 @@ u3k(rq_sut))); } } - case c3__fork: u3_cx_cell(u3t(sut), &p_sut, &q_sut); + case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { return u3_cqf_fork (_cqfu_wrap(van, p_sut, yoz), @@ -62,10 +62,10 @@ { u3_noun sut, yoz, van; - if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &yoz, u3_cv_con, &van, 0)) || - (u3_none == (sut = u3_cr_at(u3_cv_sam, van))) ) + if ( (c3n == u3r_mean(cor, u3v_sam, &yoz, u3v_con, &van, 0)) || + (u3_none == (sut = u3r_at(u3v_sam, van))) ) { - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { return _cqfu_wrap(van, sut, yoz); } diff --git a/j/dash.c b/j/dash.c index ca34ea7b3a..22dd856005 100644 --- a/j/dash.c +++ b/j/dash.c @@ -4,63 +4,63 @@ */ #include "all.h" -static u3_ce_harm _mood__hoon_add_a[] = {{".2", u3_cwa_add, c3y}, {}}; -static u3_ce_harm _mood__hoon_dec_a[] = {{".2", u3_cwa_dec, c3y}, {}}; -static u3_ce_harm _mood__hoon_div_a[] = {{".2", u3_cwa_div, c3y}, {}}; -static u3_ce_harm _mood__hoon_gte_a[] = {{".2", u3_cwa_gte, c3y}, {}}; -static u3_ce_harm _mood__hoon_gth_a[] = {{".2", u3_cwa_gth, c3y}, {}}; -static u3_ce_harm _mood__hoon_lte_a[] = {{".2", u3_cwa_lte, c3y}, {}}; -static u3_ce_harm _mood__hoon_lth_a[] = {{".2", u3_cwa_lth, c3y}, {}}; -static u3_ce_harm _mood__hoon_mod_a[] = {{".2", u3_cwa_mod, c3y}, {}}; -static u3_ce_harm _mood__hoon_mul_a[] = {{".2", u3_cwa_mul, c3y}, {}}; -static u3_ce_harm _mood__hoon_sub_a[] = {{".2", u3_cwa_sub, c3y}, {}}; +static u3e_harm _mood__hoon_add_a[] = {{".2", u3_cwa_add, c3y}, {}}; +static u3e_harm _mood__hoon_dec_a[] = {{".2", u3_cwa_dec, c3y}, {}}; +static u3e_harm _mood__hoon_div_a[] = {{".2", u3_cwa_div, c3y}, {}}; +static u3e_harm _mood__hoon_gte_a[] = {{".2", u3_cwa_gte, c3y}, {}}; +static u3e_harm _mood__hoon_gth_a[] = {{".2", u3_cwa_gth, c3y}, {}}; +static u3e_harm _mood__hoon_lte_a[] = {{".2", u3_cwa_lte, c3y}, {}}; +static u3e_harm _mood__hoon_lth_a[] = {{".2", u3_cwa_lth, c3y}, {}}; +static u3e_harm _mood__hoon_mod_a[] = {{".2", u3_cwa_mod, c3y}, {}}; +static u3e_harm _mood__hoon_mul_a[] = {{".2", u3_cwa_mul, c3y}, {}}; +static u3e_harm _mood__hoon_sub_a[] = {{".2", u3_cwa_sub, c3y}, {}}; -static u3_ce_harm _mood__hoon_bind_a[] = {{".2", u3_cwb_bind, c3y}, {}}; -static u3_ce_harm _mood__hoon_clap_a[] = {{".2", u3_cwb_clap, c3y}, {}}; -static u3_ce_harm _mood__hoon_drop_a[] = {{".2", u3_cwb_drop, c3y}, {}}; -static u3_ce_harm _mood__hoon_flop_a[] = {{".2", u3_cwb_flop, c3y}, {}}; -static u3_ce_harm _mood__hoon_lent_a[] = {{".2", u3_cwb_lent, c3y}, {}}; -static u3_ce_harm _mood__hoon_levy_a[] = {{".2", u3_cwb_levy, c3y}, {}}; -static u3_ce_harm _mood__hoon_lien_a[] = {{".2", u3_cwb_lien, c3y}, {}}; -static u3_ce_harm _mood__hoon_need_a[] = {{".2", u3_cwb_need, c3y}, {}}; -static u3_ce_harm _mood__hoon_reel_a[] = {{".2", u3_cwb_reel, c3y}, {}}; -static u3_ce_harm _mood__hoon_roll_a[] = {{".2", u3_cwb_roll, c3y}, {}}; -static u3_ce_harm _mood__hoon_skim_a[] = {{".2", u3_cwb_skim, c3y}, {}}; -static u3_ce_harm _mood__hoon_skip_a[] = {{".2", u3_cwb_skip, c3y}, {}}; -// static u3_ce_harm _mood__hoon_scag_a[] = {{".2", u3_cwb_scag, c3y}, {}}; -static u3_ce_harm _mood__hoon_slag_a[] = {{".2", u3_cwb_slag, c3y}, {}}; -static u3_ce_harm _mood__hoon_snag_a[] = {{".2", u3_cwb_snag, c3y}, {}}; -// static u3_ce_harm _mood__hoon_sort_a[] = {{".2", u3_cwb_sort, c3y}, {}}; -static u3_ce_harm _mood__hoon_turn_a[] = {{".2", u3_cwb_turn, c3y}, {}}; -static u3_ce_harm _mood__hoon_weld_a[] = {{".2", u3_cwb_weld, c3y}, {}}; +static u3e_harm _mood__hoon_bind_a[] = {{".2", u3_cwb_bind, c3y}, {}}; +static u3e_harm _mood__hoon_clap_a[] = {{".2", u3_cwb_clap, c3y}, {}}; +static u3e_harm _mood__hoon_drop_a[] = {{".2", u3_cwb_drop, c3y}, {}}; +static u3e_harm _mood__hoon_flop_a[] = {{".2", u3_cwb_flop, c3y}, {}}; +static u3e_harm _mood__hoon_lent_a[] = {{".2", u3_cwb_lent, c3y}, {}}; +static u3e_harm _mood__hoon_levy_a[] = {{".2", u3_cwb_levy, c3y}, {}}; +static u3e_harm _mood__hoon_lien_a[] = {{".2", u3_cwb_lien, c3y}, {}}; +static u3e_harm _mood__hoon_need_a[] = {{".2", u3_cwb_need, c3y}, {}}; +static u3e_harm _mood__hoon_reel_a[] = {{".2", u3_cwb_reel, c3y}, {}}; +static u3e_harm _mood__hoon_roll_a[] = {{".2", u3_cwb_roll, c3y}, {}}; +static u3e_harm _mood__hoon_skim_a[] = {{".2", u3_cwb_skim, c3y}, {}}; +static u3e_harm _mood__hoon_skip_a[] = {{".2", u3_cwb_skip, c3y}, {}}; +// static u3e_harm _mood__hoon_scag_a[] = {{".2", u3_cwb_scag, c3y}, {}}; +static u3e_harm _mood__hoon_slag_a[] = {{".2", u3_cwb_slag, c3y}, {}}; +static u3e_harm _mood__hoon_snag_a[] = {{".2", u3_cwb_snag, c3y}, {}}; +// static u3e_harm _mood__hoon_sort_a[] = {{".2", u3_cwb_sort, c3y}, {}}; +static u3e_harm _mood__hoon_turn_a[] = {{".2", u3_cwb_turn, c3y}, {}}; +static u3e_harm _mood__hoon_weld_a[] = {{".2", u3_cwb_weld, c3y}, {}}; -static u3_ce_harm _mood__hoon_bex_a[] = {{".2", u3_cwc_bex, c3y}, {}}; -static u3_ce_harm _mood__hoon_can_a[] = {{".2", u3_cwc_can, c3y}, {}}; -static u3_ce_harm _mood__hoon_cap_a[] = {{".2", u3_cwc_cap, c3y}, {}}; -static u3_ce_harm _mood__hoon_cat_a[] = {{".2", u3_cwc_cat, c3y}, {}}; -static u3_ce_harm _mood__hoon_con_a[] = {{".2", u3_cwc_con, c3y}, {}}; -static u3_ce_harm _mood__hoon_cut_a[] = {{".2", u3_cwc_cut, c3y}, {}}; -static u3_ce_harm _mood__hoon_dis_a[] = {{".2", u3_cwc_dis, c3y}, {}}; -static u3_ce_harm _mood__hoon_dor_a[] = {{".2", u3_cwc_dor, c3y}, {}}; -static u3_ce_harm _mood__hoon_end_a[] = {{".2", u3_cwc_end, c3y}, {}}; -static u3_ce_harm _mood__hoon_gor_a[] = {{".2", u3_cwc_gor, c3y}, {}}; -static u3_ce_harm _mood__hoon_hor_a[] = {{".2", u3_cwc_hor, c3y}, {}}; -static u3_ce_harm _mood__hoon_lsh_a[] = {{".2", u3_cwc_lsh, c3y}, {}}; -static u3_ce_harm _mood__hoon_mas_a[] = {{".2", u3_cwc_mas, c3y}, {}}; -static u3_ce_harm _mood__hoon_met_a[] = {{".2", u3_cwc_met, c3y}, {}}; -static u3_ce_harm _mood__hoon_mix_a[] = {{".2", u3_cwc_mix, c3y}, {}}; -static u3_ce_harm _mood__hoon_mug_a[] = {{".2", u3_cwc_mug, c3y}, {}}; -static u3_ce_harm _mood__hoon_peg_a[] = {{".2", u3_cwc_peg, c3y}, {}}; -static u3_ce_harm _mood__hoon_rap_a[] = {{".2", u3_cwc_rap, c3y}, {}}; -static u3_ce_harm _mood__hoon_rip_a[] = {{".2", u3_cwc_rip, c3y}, {}}; -static u3_ce_harm _mood__hoon_rsh_a[] = {{".2", u3_cwc_rsh, c3y}, {}}; -static u3_ce_harm _mood__hoon_vor_a[] = {{".2", u3_cwc_vor, c3y}, {}}; +static u3e_harm _mood__hoon_bex_a[] = {{".2", u3_cwc_bex, c3y}, {}}; +static u3e_harm _mood__hoon_can_a[] = {{".2", u3_cwc_can, c3y}, {}}; +static u3e_harm _mood__hoon_cap_a[] = {{".2", u3_cwc_cap, c3y}, {}}; +static u3e_harm _mood__hoon_cat_a[] = {{".2", u3_cwc_cat, c3y}, {}}; +static u3e_harm _mood__hoon_con_a[] = {{".2", u3_cwc_con, c3y}, {}}; +static u3e_harm _mood__hoon_cut_a[] = {{".2", u3_cwc_cut, c3y}, {}}; +static u3e_harm _mood__hoon_dis_a[] = {{".2", u3_cwc_dis, c3y}, {}}; +static u3e_harm _mood__hoon_dor_a[] = {{".2", u3_cwc_dor, c3y}, {}}; +static u3e_harm _mood__hoon_end_a[] = {{".2", u3_cwc_end, c3y}, {}}; +static u3e_harm _mood__hoon_gor_a[] = {{".2", u3_cwc_gor, c3y}, {}}; +static u3e_harm _mood__hoon_hor_a[] = {{".2", u3_cwc_hor, c3y}, {}}; +static u3e_harm _mood__hoon_lsh_a[] = {{".2", u3_cwc_lsh, c3y}, {}}; +static u3e_harm _mood__hoon_mas_a[] = {{".2", u3_cwc_mas, c3y}, {}}; +static u3e_harm _mood__hoon_met_a[] = {{".2", u3_cwc_met, c3y}, {}}; +static u3e_harm _mood__hoon_mix_a[] = {{".2", u3_cwc_mix, c3y}, {}}; +static u3e_harm _mood__hoon_mug_a[] = {{".2", u3_cwc_mug, c3y}, {}}; +static u3e_harm _mood__hoon_peg_a[] = {{".2", u3_cwc_peg, c3y}, {}}; +static u3e_harm _mood__hoon_rap_a[] = {{".2", u3_cwc_rap, c3y}, {}}; +static u3e_harm _mood__hoon_rip_a[] = {{".2", u3_cwc_rip, c3y}, {}}; +static u3e_harm _mood__hoon_rsh_a[] = {{".2", u3_cwc_rsh, c3y}, {}}; +static u3e_harm _mood__hoon_vor_a[] = {{".2", u3_cwc_vor, c3y}, {}}; -static u3_ce_harm _mood__hoon__po_ind_a[] = {{".2", u3_cwcp_ind}, {}}; -static u3_ce_harm _mood__hoon__po_ins_a[] = {{".2", u3_cwcp_ins}, {}}; -static u3_ce_harm _mood__hoon__po_tod_a[] = {{".2", u3_cwcp_tod}, {}}; -static u3_ce_harm _mood__hoon__po_tos_a[] = {{".2", u3_cwcp_tos}, {}}; -static u3_ce_core _mood__hoon__po_d[] = +static u3e_harm _mood__hoon__po_ind_a[] = {{".2", u3_cwcp_ind}, {}}; +static u3e_harm _mood__hoon__po_ins_a[] = {{".2", u3_cwcp_ins}, {}}; +static u3e_harm _mood__hoon__po_tod_a[] = {{".2", u3_cwcp_tod}, {}}; +static u3e_harm _mood__hoon__po_tos_a[] = {{".2", u3_cwcp_tos}, {}}; +static u3e_core _mood__hoon__po_d[] = { { "ind", _mood__hoon__po_ind_a }, { "ins", _mood__hoon__po_ins_a }, { "tod", _mood__hoon__po_tod_a }, @@ -68,14 +68,14 @@ static u3_ce_core _mood__hoon__po_d[] = {} }; -static u3_ce_harm _mood__hoon__by_gas_a[] = {{".2", u3_cwdb_gas, c3y}, {}}; -static u3_ce_harm _mood__hoon__by_get_a[] = {{".2", u3_cwdb_get, c3y}, {}}; -static u3_ce_harm _mood__hoon__by_has_a[] = {{".2", u3_cwdb_has, c3y}, {}}; -static u3_ce_harm _mood__hoon__by_int_a[] = {{".2", u3_cwdb_int, c3y}, {}}; -static u3_ce_harm _mood__hoon__by_put_a[] = {{".2", u3_cwdb_put, c3y}, {}}; -static u3_ce_harm _mood__hoon__by_tap_a[] = {{".2", u3_cwdb_tap, c3y}, {}}; -static u3_ce_harm _mood__hoon__by_uni_a[] = {{".2", u3_cwdb_uni, c3y}, {}}; -static u3_ce_core _mood__hoon__by_d[] = +static u3e_harm _mood__hoon__by_gas_a[] = {{".2", u3_cwdb_gas, c3y}, {}}; +static u3e_harm _mood__hoon__by_get_a[] = {{".2", u3_cwdb_get, c3y}, {}}; +static u3e_harm _mood__hoon__by_has_a[] = {{".2", u3_cwdb_has, c3y}, {}}; +static u3e_harm _mood__hoon__by_int_a[] = {{".2", u3_cwdb_int, c3y}, {}}; +static u3e_harm _mood__hoon__by_put_a[] = {{".2", u3_cwdb_put, c3y}, {}}; +static u3e_harm _mood__hoon__by_tap_a[] = {{".2", u3_cwdb_tap, c3y}, {}}; +static u3e_harm _mood__hoon__by_uni_a[] = {{".2", u3_cwdb_uni, c3y}, {}}; +static u3e_core _mood__hoon__by_d[] = { { "gas", _mood__hoon__by_gas_a }, { "get", _mood__hoon__by_get_a }, { "has", _mood__hoon__by_has_a }, @@ -86,14 +86,14 @@ static u3_ce_core _mood__hoon__by_d[] = {} }; -static u3_ce_harm _mood__hoon__in_gas_a[] = {{".2", u3_cwdi_gas}, {}}; -static u3_ce_harm _mood__hoon__in_has_a[] = {{".2", u3_cwdi_has}, {}}; -static u3_ce_harm _mood__hoon__in_mer_a[] = {{".2", u3_cwdi_mer}, {}}; -static u3_ce_harm _mood__hoon__in_int_a[] = {{".2", u3_cwdi_int}, {}}; -static u3_ce_harm _mood__hoon__in_put_a[] = {{".2", u3_cwdi_put}, {}}; -static u3_ce_harm _mood__hoon__in_tap_a[] = {{".2", u3_cwdi_tap}, {}}; -static u3_ce_harm _mood__hoon__in_uni_a[] = {{".2", u3_cwdi_uni}, {}}; -static u3_ce_core _mood__hoon__in_d[] = +static u3e_harm _mood__hoon__in_gas_a[] = {{".2", u3_cwdi_gas}, {}}; +static u3e_harm _mood__hoon__in_has_a[] = {{".2", u3_cwdi_has}, {}}; +static u3e_harm _mood__hoon__in_mer_a[] = {{".2", u3_cwdi_mer}, {}}; +static u3e_harm _mood__hoon__in_int_a[] = {{".2", u3_cwdi_int}, {}}; +static u3e_harm _mood__hoon__in_put_a[] = {{".2", u3_cwdi_put}, {}}; +static u3e_harm _mood__hoon__in_tap_a[] = {{".2", u3_cwdi_tap}, {}}; +static u3e_harm _mood__hoon__in_uni_a[] = {{".2", u3_cwdi_uni}, {}}; +static u3e_core _mood__hoon__in_d[] = { { "gas", _mood__hoon__in_gas_a }, { "has", _mood__hoon__in_has_a }, { "mer", _mood__hoon__in_mer_a }, @@ -104,108 +104,108 @@ static u3_ce_core _mood__hoon__in_d[] = {} }; -static u3_ce_harm _mood__hoon_cue_a[] = {{".2", u3_cwe_cue}, {}}; -static u3_ce_harm _mood__hoon_jam_a[] = {{".2", u3_cwe_jam}, {}}; -static u3_ce_harm _mood__hoon_mat_a[] = {{".2", u3_cwe_mat}, {}}; -static u3_ce_harm _mood__hoon_rub_a[] = {{".2", u3_cwe_rub}, {}}; -static u3_ce_harm _mood__hoon_lore_a[] = {{".2", u3_cwe_lore}, {}}; -static u3_ce_harm _mood__hoon_loss_a[] = {{".2", u3_cwe_loss}, {}}; -static u3_ce_harm _mood__hoon_mink_a[] = {{".2", u3_cwe_mink}, {}}; -static u3_ce_harm _mood__hoon_mule_a[] = {{".2", u3_cwe_mule}, {}}; -static u3_ce_harm _mood__hoon_repg_a[] = {{".2", u3_cwe_repg}, {}}; -static u3_ce_harm _mood__hoon_rexp_a[] = {{".2", u3_cwe_rexp}, {}}; -static u3_ce_harm _mood__hoon_trip_a[] = {{".2", u3_cwe_trip}, {}}; +static u3e_harm _mood__hoon_cue_a[] = {{".2", u3_cwe_cue}, {}}; +static u3e_harm _mood__hoon_jam_a[] = {{".2", u3_cwe_jam}, {}}; +static u3e_harm _mood__hoon_mat_a[] = {{".2", u3_cwe_mat}, {}}; +static u3e_harm _mood__hoon_rub_a[] = {{".2", u3_cwe_rub}, {}}; +static u3e_harm _mood__hoon_lore_a[] = {{".2", u3_cwe_lore}, {}}; +static u3e_harm _mood__hoon_loss_a[] = {{".2", u3_cwe_loss}, {}}; +static u3e_harm _mood__hoon_mink_a[] = {{".2", u3_cwe_mink}, {}}; +static u3e_harm _mood__hoon_mule_a[] = {{".2", u3_cwe_mule}, {}}; +static u3e_harm _mood__hoon_repg_a[] = {{".2", u3_cwe_repg}, {}}; +static u3e_harm _mood__hoon_rexp_a[] = {{".2", u3_cwe_rexp}, {}}; +static u3e_harm _mood__hoon_trip_a[] = {{".2", u3_cwe_trip}, {}}; -static u3_ce_harm _mood__hoon__aesc_en_a[] = {{".2", u3_cwea_en}, {}}; -static u3_ce_harm _mood__hoon__aesc_de_a[] = {{".2", u3_cwea_en}, {}}; -static u3_ce_core _mood__hoon__aesc_d[] = +static u3e_harm _mood__hoon__aesc_en_a[] = {{".2", u3_cwea_en}, {}}; +static u3e_harm _mood__hoon__aesc_de_a[] = {{".2", u3_cwea_en}, {}}; +static u3e_core _mood__hoon__aesc_d[] = { { "en", _mood__hoon__aesc_en_a }, { "de", _mood__hoon__aesc_de_a }, {} }; -static u3_ce_harm _mood__hoon__bend_fun_a[] = {{".2", u3_cwe_bend_fun}, {}}; -static u3_ce_core _mood__hoon__bend_d[] = +static u3e_harm _mood__hoon__bend_fun_a[] = {{".2", u3_cwe_bend_fun}, {}}; +static u3e_core _mood__hoon__bend_d[] = { { "fun", _mood__hoon__bend_fun_a }, {} }; -static u3_ce_harm _mood__hoon__cold_fun_a[] = {{".2", u3_cwe_cold_fun}, {}}; -static u3_ce_core _mood__hoon__cold_d[] = +static u3e_harm _mood__hoon__cold_fun_a[] = {{".2", u3_cwe_cold_fun}, {}}; +static u3e_core _mood__hoon__cold_d[] = { { "fun", _mood__hoon__cold_fun_a }, {} }; -static u3_ce_harm _mood__hoon__cook_fun_a[] = {{".2", u3_cwe_cook_fun}, {}}; -static u3_ce_core _mood__hoon__cook_d[] = +static u3e_harm _mood__hoon__cook_fun_a[] = {{".2", u3_cwe_cook_fun}, {}}; +static u3e_core _mood__hoon__cook_d[] = { { "fun", _mood__hoon__cook_fun_a }, {} }; -static u3_ce_harm _mood__hoon__comp_fun_a[] = {{".2", u3_cwe_comp_fun}, {}}; -static u3_ce_core _mood__hoon__comp_d[] = +static u3e_harm _mood__hoon__comp_fun_a[] = {{".2", u3_cwe_comp_fun}, {}}; +static u3e_core _mood__hoon__comp_d[] = { { "fun", _mood__hoon__comp_fun_a }, {} }; -static u3_ce_harm _mood__hoon__easy_fun_a[] = {{".2", u3_cwe_easy_fun}, {}}; -static u3_ce_core _mood__hoon__easy_d[] = +static u3e_harm _mood__hoon__easy_fun_a[] = {{".2", u3_cwe_easy_fun}, {}}; +static u3e_core _mood__hoon__easy_d[] = { { "fun", _mood__hoon__easy_fun_a }, {} }; -static u3_ce_harm _mood__hoon__glue_fun_a[] = {{".2", u3_cwe_glue_fun}, {}}; -static u3_ce_core _mood__hoon__glue_d[] = +static u3e_harm _mood__hoon__glue_fun_a[] = {{".2", u3_cwe_glue_fun}, {}}; +static u3e_core _mood__hoon__glue_d[] = { { "fun", _mood__hoon__glue_fun_a }, {} }; -static u3_ce_harm _mood__hoon__here_fun_a[] = {{".2", u3_cwe_here_fun}, {}}; -static u3_ce_core _mood__hoon__here_d[] = +static u3e_harm _mood__hoon__here_fun_a[] = {{".2", u3_cwe_here_fun}, {}}; +static u3e_core _mood__hoon__here_d[] = { { "fun", _mood__hoon__here_fun_a }, {} }; -static u3_ce_harm _mood__hoon__just_fun_a[] = {{".2", u3_cwe_just_fun}, {}}; -static u3_ce_core _mood__hoon__just_d[] = +static u3e_harm _mood__hoon__just_fun_a[] = {{".2", u3_cwe_just_fun}, {}}; +static u3e_core _mood__hoon__just_d[] = { { "fun", _mood__hoon__just_fun_a }, {} }; -static u3_ce_harm _mood__hoon__mask_fun_a[] = {{".2", u3_cwe_mask_fun}, {}}; -static u3_ce_core _mood__hoon__mask_d[] = +static u3e_harm _mood__hoon__mask_fun_a[] = {{".2", u3_cwe_mask_fun}, {}}; +static u3e_core _mood__hoon__mask_d[] = { { "fun", _mood__hoon__mask_fun_a }, {} }; -static u3_ce_harm _mood__hoon__shim_fun_a[] = {{".2", u3_cwe_shim_fun}, {}}; -static u3_ce_core _mood__hoon__shim_d[] = +static u3e_harm _mood__hoon__shim_fun_a[] = {{".2", u3_cwe_shim_fun}, {}}; +static u3e_core _mood__hoon__shim_d[] = { { "fun", _mood__hoon__shim_fun_a }, {} }; -static u3_ce_harm _mood__hoon__stag_fun_a[] = {{".2", u3_cwe_stag_fun}, {}}; -static u3_ce_core _mood__hoon__stag_d[] = +static u3e_harm _mood__hoon__stag_fun_a[] = {{".2", u3_cwe_stag_fun}, {}}; +static u3e_core _mood__hoon__stag_d[] = { { "fun", _mood__hoon__stag_fun_a }, {} }; -static u3_ce_harm _mood__hoon__stew_fun_a[] = {{".2", u3_cwe_stew_fun}, {}}; -static u3_ce_core _mood__hoon__stew_d[] = +static u3e_harm _mood__hoon__stew_fun_a[] = {{".2", u3_cwe_stew_fun}, {}}; +static u3e_core _mood__hoon__stew_d[] = { { "fun", _mood__hoon__stew_fun_a }, {} }; -static u3_ce_harm _mood__hoon__stir_fun_a[] = {{".2", u3_cwe_stir_fun}, {}}; -static u3_ce_core _mood__hoon__stir_d[] = +static u3e_harm _mood__hoon__stir_fun_a[] = {{".2", u3_cwe_stir_fun}, {}}; +static u3e_core _mood__hoon__stir_d[] = { { "fun", _mood__hoon__stir_fun_a }, {} }; -static u3_ce_harm _mood__hoon__og_raw_a[] = {{".2", u3_cweo_raw}, {}}; -static u3_ce_core _mood__hoon__og_d[] = +static u3e_harm _mood__hoon__og_raw_a[] = {{".2", u3_cweo_raw}, {}}; +static u3e_core _mood__hoon__og_d[] = { { "raw", _mood__hoon__og_raw_a }, {} }; -static u3_ce_harm _mood__hoon__rd_sun_a[] = {{".2", u3_cwer_sun}, {}}; -static u3_ce_harm _mood__hoon__rd_mul_a[] = {{".2", u3_cwer_mul}, {}}; -static u3_ce_harm _mood__hoon__rd_div_a[] = {{".2", u3_cwer_div}, {}}; -static u3_ce_harm _mood__hoon__rd_add_a[] = {{".2", u3_cwer_add}, {}}; -static u3_ce_harm _mood__hoon__rd_sub_a[] = {{".2", u3_cwer_sub}, {}}; -static u3_ce_harm _mood__hoon__rd_lte_a[] = {{".2", u3_cwer_lte}, {}}; -static u3_ce_harm _mood__hoon__rd_lth_a[] = {{".2", u3_cwer_lth}, {}}; -static u3_ce_harm _mood__hoon__rd_gte_a[] = {{".2", u3_cwer_gte}, {}}; -static u3_ce_harm _mood__hoon__rd_gth_a[] = {{".2", u3_cwer_gth}, {}}; -static u3_ce_core _mood__hoon__rd_d[] = +static u3e_harm _mood__hoon__rd_sun_a[] = {{".2", u3_cwer_sun}, {}}; +static u3e_harm _mood__hoon__rd_mul_a[] = {{".2", u3_cwer_mul}, {}}; +static u3e_harm _mood__hoon__rd_div_a[] = {{".2", u3_cwer_div}, {}}; +static u3e_harm _mood__hoon__rd_add_a[] = {{".2", u3_cwer_add}, {}}; +static u3e_harm _mood__hoon__rd_sub_a[] = {{".2", u3_cwer_sub}, {}}; +static u3e_harm _mood__hoon__rd_lte_a[] = {{".2", u3_cwer_lte}, {}}; +static u3e_harm _mood__hoon__rd_lth_a[] = {{".2", u3_cwer_lth}, {}}; +static u3e_harm _mood__hoon__rd_gte_a[] = {{".2", u3_cwer_gte}, {}}; +static u3e_harm _mood__hoon__rd_gth_a[] = {{".2", u3_cwer_gth}, {}}; +static u3e_core _mood__hoon__rd_d[] = { { "sun", _mood__hoon__rd_sun_a }, { "mul", _mood__hoon__rd_mul_a }, { "div", _mood__hoon__rd_div_a }, @@ -218,71 +218,71 @@ static u3_ce_core _mood__hoon__rd_d[] = {} }; -static u3_ce_harm _mood__hoon__coed__ed_puck_a[] = {{".2", u3_cwee_puck}, {}}; -static u3_ce_harm _mood__hoon__coed__ed_sign_a[] = {{".2", u3_cwee_sign}, {}}; -static u3_ce_harm _mood__hoon__coed__ed_veri_a[] = {{".2", u3_cwee_veri}, {}}; -static u3_ce_core _mood__hoon__coed__ed_d[] = +static u3e_harm _mood__hoon__coed__ed_puck_a[] = {{".2", u3_cwee_puck}, {}}; +static u3e_harm _mood__hoon__coed__ed_sign_a[] = {{".2", u3_cwee_sign}, {}}; +static u3e_harm _mood__hoon__coed__ed_veri_a[] = {{".2", u3_cwee_veri}, {}}; +static u3e_core _mood__hoon__coed__ed_d[] = { { "sign", _mood__hoon__coed__ed_sign_a }, { "puck", _mood__hoon__coed__ed_puck_a }, { "veri", _mood__hoon__coed__ed_veri_a }, {} }; -static u3_ce_core _mood__hoon__coed_d[] = +static u3e_core _mood__hoon__coed_d[] = { { "ed", 0, _mood__hoon__coed__ed_d }, {} }; -static u3_ce_harm _mood__hoon_pfix_a[] = {{".2", u3_cwe_pfix}, {}}; -static u3_ce_harm _mood__hoon_plug_a[] = {{".2", u3_cwe_plug}, {}}; -static u3_ce_harm _mood__hoon_pose_a[] = {{".2", u3_cwe_pose}, {}}; -static u3_ce_harm _mood__hoon_sfix_a[] = {{".2", u3_cwe_sfix}, {}}; -static u3_ce_harm _mood__hoon_shax_a[] = {{".2", u3_cwe_shax}, {}}; -static u3_ce_harm _mood__hoon_shas_a[] = {{".2", u3_cwe_shas}, {}}; -static u3_ce_harm _mood__hoon_shal_a[] = {{".2", u3_cwe_shal}, {}}; +static u3e_harm _mood__hoon_pfix_a[] = {{".2", u3_cwe_pfix}, {}}; +static u3e_harm _mood__hoon_plug_a[] = {{".2", u3_cwe_plug}, {}}; +static u3e_harm _mood__hoon_pose_a[] = {{".2", u3_cwe_pose}, {}}; +static u3e_harm _mood__hoon_sfix_a[] = {{".2", u3_cwe_sfix}, {}}; +static u3e_harm _mood__hoon_shax_a[] = {{".2", u3_cwe_shax}, {}}; +static u3e_harm _mood__hoon_shas_a[] = {{".2", u3_cwe_shas}, {}}; +static u3e_harm _mood__hoon_shal_a[] = {{".2", u3_cwe_shal}, {}}; -static u3_ce_harm _mood__hoon_bull_a[] = {{".2", u3_cwf_bull}, {}}; -static u3_ce_harm _mood__hoon_cell_a[] = {{".2", u3_cwf_cell}, {}}; -static u3_ce_harm _mood__hoon_comb_a[] = {{".2", u3_cwf_comb}, {}}; -static u3_ce_harm _mood__hoon_cons_a[] = {{".2", u3_cwf_cons}, {}}; -static u3_ce_harm _mood__hoon_core_a[] = {{".2", u3_cwf_core}, {}}; -static u3_ce_harm _mood__hoon_cube_a[] = {{".2", u3_cwf_cube}, {}}; -static u3_ce_harm _mood__hoon_face_a[] = {{".2", u3_cwf_face}, {}}; -static u3_ce_harm _mood__hoon_fitz_a[] = {{".2", u3_cwf_fitz}, {}}; -static u3_ce_harm _mood__hoon_flan_a[] = {{".2", u3_cwf_flan}, {}}; -static u3_ce_harm _mood__hoon_flay_a[] = {{".2", u3_cwf_flay}, {}}; -static u3_ce_harm _mood__hoon_flip_a[] = {{".2", u3_cwf_flip}, {}}; -static u3_ce_harm _mood__hoon_flor_a[] = {{".2", u3_cwf_flor}, {}}; -static u3_ce_harm _mood__hoon_fork_a[] = {{".2", u3_cwf_fork}, {}}; -static u3_ce_harm _mood__hoon_hike_a[] = {{".2", u3_cwf_hike}, {}}; -static u3_ce_harm _mood__hoon_look_a[] = {{".2", u3_cwf_look}, {}}; +static u3e_harm _mood__hoon_bull_a[] = {{".2", u3_cwf_bull}, {}}; +static u3e_harm _mood__hoon_cell_a[] = {{".2", u3_cwf_cell}, {}}; +static u3e_harm _mood__hoon_comb_a[] = {{".2", u3_cwf_comb}, {}}; +static u3e_harm _mood__hoon_cons_a[] = {{".2", u3_cwf_cons}, {}}; +static u3e_harm _mood__hoon_core_a[] = {{".2", u3_cwf_core}, {}}; +static u3e_harm _mood__hoon_cube_a[] = {{".2", u3_cwf_cube}, {}}; +static u3e_harm _mood__hoon_face_a[] = {{".2", u3_cwf_face}, {}}; +static u3e_harm _mood__hoon_fitz_a[] = {{".2", u3_cwf_fitz}, {}}; +static u3e_harm _mood__hoon_flan_a[] = {{".2", u3_cwf_flan}, {}}; +static u3e_harm _mood__hoon_flay_a[] = {{".2", u3_cwf_flay}, {}}; +static u3e_harm _mood__hoon_flip_a[] = {{".2", u3_cwf_flip}, {}}; +static u3e_harm _mood__hoon_flor_a[] = {{".2", u3_cwf_flor}, {}}; +static u3e_harm _mood__hoon_fork_a[] = {{".2", u3_cwf_fork}, {}}; +static u3e_harm _mood__hoon_hike_a[] = {{".2", u3_cwf_hike}, {}}; +static u3e_harm _mood__hoon_look_a[] = {{".2", u3_cwf_look}, {}}; -static u3_ce_harm _mood__hoon__ut_busk_a[] = {{".2", u3_cwfu_busk}, {}}; -static u3_ce_harm _mood__hoon__ut_bust_a[] = {{".2", u3_cwfu_bust}, {}}; -static u3_ce_harm _mood__hoon__ut_conk_a[] = {{".2", u3_cwfu_conk}, {}}; -static u3_ce_harm _mood__hoon__ut_crop_a[] = {{".2", u3_cwfu_crop}, {}}; -static u3_ce_harm _mood__hoon__ut_cull_a[] = {{".2", u3_cwfu_cull}, {}}; -static u3_ce_harm _mood__hoon__ut_find_a[] = {{".2", u3_cwfu_find}, {}}; -static u3_ce_harm _mood__hoon__ut_fino_a[] = {{".2", u3_cwfu_fino}, {}}; -static u3_ce_harm _mood__hoon__ut_fink_a[] = {{".2", u3_cwfu_fink}, {}}; -static u3_ce_harm _mood__hoon__ut_fire_a[] = {{".2", u3_cwfu_fire}, {}}; -static u3_ce_harm _mood__hoon__ut_firm_a[] = {{".2", u3_cwfu_firm}, {}}; -static u3_ce_harm _mood__hoon__ut_fish_a[] = {{".2", u3_cwfu_fish}, {}}; -static u3_ce_harm _mood__hoon__ut_fuse_a[] = {{".2", u3_cwfu_fuse}, {}}; -static u3_ce_harm _mood__hoon__ut_heal_a[] = {{".2", u3_cwfu_heal}, {}}; -static u3_ce_harm _mood__hoon__ut_mint_a[] = {{".2", u3_cwfu_mint}, {}}; -static u3_ce_harm _mood__hoon__ut_mull_a[] = {{".2", u3_cwfu_mull}, {}}; -static u3_ce_harm _mood__hoon__ut_nest_a[] = {{".2", u3_cwfu_nest}, {}}; -static u3_ce_harm _mood__hoon__ut_park_a[] = {{".2", u3_cwfu_park}, {}}; -static u3_ce_harm _mood__hoon__ut_peek_a[] = {{".2", u3_cwfu_peek}, {}}; -static u3_ce_harm _mood__hoon__ut_play_a[] = {{".2", u3_cwfu_play}, {}}; -static u3_ce_harm _mood__hoon__ut_rest_a[] = {{".2", u3_cwfu_rest}, {}}; -static u3_ce_harm _mood__hoon__ut_seek_a[] = {{".2", u3_cwfu_seek}, {}}; -static u3_ce_harm _mood__hoon__ut_seep_a[] = {{".2", u3_cwfu_seep}, {}}; -static u3_ce_harm _mood__hoon__ut_snub_a[] = {{".2", u3_cwfu_snub}, {}}; -static u3_ce_harm _mood__hoon__ut_tock_a[] = {{".2", u3_cwfu_tock}, {}}; -static u3_ce_harm _mood__hoon__ut_wrap_a[] = {{".2", u3_cwfu_wrap}, {}}; +static u3e_harm _mood__hoon__ut_busk_a[] = {{".2", u3_cwfu_busk}, {}}; +static u3e_harm _mood__hoon__ut_bust_a[] = {{".2", u3_cwfu_bust}, {}}; +static u3e_harm _mood__hoon__ut_conk_a[] = {{".2", u3_cwfu_conk}, {}}; +static u3e_harm _mood__hoon__ut_crop_a[] = {{".2", u3_cwfu_crop}, {}}; +static u3e_harm _mood__hoon__ut_cull_a[] = {{".2", u3_cwfu_cull}, {}}; +static u3e_harm _mood__hoon__ut_find_a[] = {{".2", u3_cwfu_find}, {}}; +static u3e_harm _mood__hoon__ut_fino_a[] = {{".2", u3_cwfu_fino}, {}}; +static u3e_harm _mood__hoon__ut_fink_a[] = {{".2", u3_cwfu_fink}, {}}; +static u3e_harm _mood__hoon__ut_fire_a[] = {{".2", u3_cwfu_fire}, {}}; +static u3e_harm _mood__hoon__ut_firm_a[] = {{".2", u3_cwfu_firm}, {}}; +static u3e_harm _mood__hoon__ut_fish_a[] = {{".2", u3_cwfu_fish}, {}}; +static u3e_harm _mood__hoon__ut_fuse_a[] = {{".2", u3_cwfu_fuse}, {}}; +static u3e_harm _mood__hoon__ut_heal_a[] = {{".2", u3_cwfu_heal}, {}}; +static u3e_harm _mood__hoon__ut_mint_a[] = {{".2", u3_cwfu_mint}, {}}; +static u3e_harm _mood__hoon__ut_mull_a[] = {{".2", u3_cwfu_mull}, {}}; +static u3e_harm _mood__hoon__ut_nest_a[] = {{".2", u3_cwfu_nest}, {}}; +static u3e_harm _mood__hoon__ut_park_a[] = {{".2", u3_cwfu_park}, {}}; +static u3e_harm _mood__hoon__ut_peek_a[] = {{".2", u3_cwfu_peek}, {}}; +static u3e_harm _mood__hoon__ut_play_a[] = {{".2", u3_cwfu_play}, {}}; +static u3e_harm _mood__hoon__ut_rest_a[] = {{".2", u3_cwfu_rest}, {}}; +static u3e_harm _mood__hoon__ut_seek_a[] = {{".2", u3_cwfu_seek}, {}}; +static u3e_harm _mood__hoon__ut_seep_a[] = {{".2", u3_cwfu_seep}, {}}; +static u3e_harm _mood__hoon__ut_snub_a[] = {{".2", u3_cwfu_snub}, {}}; +static u3e_harm _mood__hoon__ut_tock_a[] = {{".2", u3_cwfu_tock}, {}}; +static u3e_harm _mood__hoon__ut_wrap_a[] = {{".2", u3_cwfu_wrap}, {}}; -static u3_ce_core _mood__hoon__ut_d[] = +static u3e_core _mood__hoon__ut_d[] = { { "busk", _mood__hoon__ut_busk_a }, { "bust", _mood__hoon__ut_bust_a }, @@ -311,13 +311,13 @@ static u3_ce_core _mood__hoon__ut_d[] = { "wrap", _mood__hoon__ut_wrap_a }, {} }; -static u3_ce_harm _mood__hoon__ut_a[] = +static u3e_harm _mood__hoon__ut_a[] = { {"burn", u3_cwfu_burn}, {"repo", u3_cwfu_repo}, {} }; -static u3_ce_harm _mood__hoon__ap_a[] = +static u3e_harm _mood__hoon__ap_a[] = { // {"hack", u3_cwfp_open}, // {"late", u3_cwfp_open}, {"open", u3_cwfp_open}, @@ -326,14 +326,14 @@ static u3_ce_harm _mood__hoon__ap_a[] = }; #if 0 -static u3_ce_harm _mood__hoon__al_a[] = +static u3e_harm _mood__hoon__al_a[] = { {"bunt", u3_cwfl_bunt}, {"whip", u3_cwfl_whip}, {} }; #endif -static u3_ce_core _mood__hoon_d[] = +static u3e_core _mood__hoon_d[] = { { "add", _mood__hoon_add_a }, { "dec", _mood__hoon_dec_a }, { "div", _mood__hoon_div_a }, @@ -455,22 +455,22 @@ static u3_ce_core _mood__hoon_d[] = {} }; -static u3_ce_core _mood_d[] = +static u3e_core _mood_d[] = { { "hoon", 0, _mood__hoon_d }, {} }; -static u3_ce_core _k164_d[] = +static u3e_core _k164_d[] = { { "mood", 0, _mood_d }, {} }; -static u3_ce_core _d[] = { +static u3e_core _d[] = { { "k164", 0, _k164_d}, {} }; -u3_ce_dash +u3e_dash u3_Dash = { _d, 0, diff --git a/v/ames.c b/v/ames.c index 21845999e9..066f89dd1c 100644 --- a/v/ames.c +++ b/v/ames.c @@ -63,7 +63,7 @@ _ames_czar(c3_y imp_y, c3_s* por_s) } else if ( 0 == sam_u->imp_w[imp_y] ) { u3_noun nam = u3_dc("scot", 'p', imp_y); - c3_c* nam_c = u3_cr_string(nam); + c3_c* nam_c = u3r_string(nam); c3_c dns_c[64]; snprintf(dns_c, 64, "%s.urbit.org", nam_c + 1); @@ -95,9 +95,9 @@ _ames_czar(c3_y imp_y, c3_s* por_s) sam_u->imp_w[imp_y] = ntohl(add_u->sin_addr.s_addr); #if 1 { - u3_noun wad = u3_ci_words(1, &sam_u->imp_w[imp_y]); + u3_noun wad = u3i_words(1, &sam_u->imp_w[imp_y]); u3_noun nam = u3_dc("scot", c3__if, wad); - c3_c* nam_c = u3_cr_string(nam); + c3_c* nam_c = u3r_string(nam); uL(fprintf(uH, "ames: czar %s: ip %s\n", dns_c, nam_c)); @@ -124,7 +124,7 @@ _ames_lane_ip(u3_noun lan, c3_s* por_s, c3_w* pip_w) switch ( u3h(lan) ) { case c3__if: { *por_s= (c3_s) u3h(u3t(u3t(lan))); - *pip_w = u3_cr_word(0, u3t(u3t(u3t(lan)))); + *pip_w = u3r_word(0, u3t(u3t(u3t(lan)))); return c3y; } break; @@ -136,7 +136,7 @@ _ames_lane_ip(u3_noun lan, c3_s* por_s, c3_w* pip_w) } break; case c3__ix: { *por_s = (c3_s) u3h(u3t(u3t(lan))); - *pip_w = u3_cr_word(0, u3t(u3t(u3t(lan)))); + *pip_w = u3r_word(0, u3t(u3t(u3t(lan)))); return c3y; } break; @@ -173,7 +173,7 @@ u3_ames_ef_bake(void) { u3_noun pax = u3nq(u3_blip, c3__newt, u3k(u3A->sen), u3_nul); - u3_cv_plan(pax, u3nc(c3__barn, u3_nul)); + u3v_plan(pax, u3nc(c3__barn, u3_nul)); } /* u3_ames_ef_send(): send packet to network (v4). @@ -191,10 +191,10 @@ u3_ames_ef_send(u3_noun lan, u3_noun pac) } if ( c3y == _ames_lane_ip(lan, &por_s, &pip_w) ) { - c3_w len_w = u3_cr_met(3, pac); + c3_w len_w = u3r_met(3, pac); c3_y* buf_y = c3_malloc(len_w); - u3_cr_bytes(0, len_w, buf_y, pac); + u3r_bytes(0, len_w, buf_y, pac); if ( 0 == pip_w ) { pip_w = 0x7f000001; @@ -245,7 +245,7 @@ _ames_time_cb(uv_timer_t* tim_uo) sam_u->law_w = time(0); { - u3_cv_plan + u3v_plan (u3nt(u3_blip, c3__ames, u3_nul), u3nc(c3__wake, u3_nul)); } @@ -270,15 +270,15 @@ _ames_recv_cb(uv_udp_t* wax_u, u3_lo_open(); { struct sockaddr_in* add_u = (struct sockaddr_in *)adr_u; - u3_noun msg = u3_ci_bytes((c3_w)nrd_i, (c3_y*)buf_u->base); + u3_noun msg = u3i_bytes((c3_w)nrd_i, (c3_y*)buf_u->base); c3_s por_s = ntohs(add_u->sin_port); c3_w pip_w = ntohl(add_u->sin_addr.s_addr); // fprintf(stderr, "ames: plan\r\n"); - u3_cv_plan + u3v_plan (u3nt(u3_blip, c3__ames, u3_nul), u3nt(c3__hear, - u3nq(c3__if, u3k(u3A->now), por_s, u3_ci_words(1, &pip_w)), + u3nq(c3__if, u3k(u3A->now), por_s, u3i_words(1, &pip_w)), msg)); } _ames_free(buf_u->base); @@ -296,7 +296,7 @@ u3_ames_io_init() por_s = u3_Host.ops_u.por_s; if ( 0 != u3_Host.ops_u.imp_c ) { - u3_noun imp = u3_ci_string(u3_Host.ops_u.imp_c); + u3_noun imp = u3i_string(u3_Host.ops_u.imp_c); u3_noun num = u3_dc("slaw", 'p', imp); c3_y num_y; @@ -304,7 +304,7 @@ u3_ames_io_init() uL(fprintf(uH, "malformed emperor: %s\n", u3_Host.ops_u.imp_c)); exit(1); } - num_y = u3_cr_byte(0, u3t(num)); + num_y = u3r_byte(0, u3t(num)); _ames_czar(num_y, &por_s); uL(fprintf(uH, "ames: czar: %s on %d\n", u3_Host.ops_u.imp_c, por_s)); @@ -377,7 +377,7 @@ void u3_ames_io_poll() { u3_ames* sam_u = &u3_Host.sam_u; - u3_noun wen = u3_cv_keep(u3nt(u3_blip, c3__ames, u3_nul)); + u3_noun wen = u3v_keep(u3nt(u3_blip, c3__ames, u3_nul)); if ( (u3_nul != wen) && (c3y == u3du(wen)) && diff --git a/v/batz.c b/v/batz.c index be93c51b46..ef5c90bc64 100644 --- a/v/batz.c +++ b/v/batz.c @@ -51,7 +51,7 @@ _batz_time_cb(uv_timer_t* tim_u) u3_lo_open(); { - u3_cv_plan + u3v_plan (u3nt(u3_blip, c3__batz, u3_nul), u3nc(c3__wake, u3_nul)); } @@ -64,7 +64,7 @@ void u3_batz_io_poll(void) { u3_batz* beh_u = &u3_Host.beh_u; - u3_noun wen = u3_cv_keep(u3nt(u3_blip, c3__batz, u3_nul)); + u3_noun wen = u3v_keep(u3nt(u3_blip, c3__batz, u3_nul)); if ( (u3_nul != wen) && (c3y == u3du(wen)) && diff --git a/v/cttp.c b/v/cttp.c index 85952e9f26..0bc2b68dc2 100644 --- a/v/cttp.c +++ b/v/cttp.c @@ -97,8 +97,8 @@ _cttp_heds_to_list(u3_hhed* hed_u) if ( 0 == hed_u ) { return u3_nul; } else { - return u3nc(u3nc(u3_ci_string(hed_u->nam_c), - hed_u->val_c ? u3_ci_string(hed_u->val_c) : u3_nul), + return u3nc(u3nc(u3i_string(hed_u->nam_c), + hed_u->val_c ? u3i_string(hed_u->val_c) : u3_nul), _cttp_heds_to_list(hed_u->nex_u)); } } @@ -160,7 +160,7 @@ _cttp_bods_to_octs(u3_hbod* bod_u) bod_u = bod_u->nex_u; } } - cos = u3_ci_bytes(len_w, buf_y); + cos = u3i_bytes(len_w, buf_y); free(buf_y); return u3nc(len_w, cos); } @@ -176,8 +176,8 @@ _cttp_heds_list(u3_hhed* hed_u, u3_noun nam, u3_noun vaz) u3_hhed* deh_u; deh_u = c3_malloc(sizeof(*deh_u)); - deh_u->nam_c = u3_cr_string(nam); - deh_u->val_c = u3_cr_string(u3h(viz)); + deh_u->nam_c = u3r_string(nam); + deh_u->val_c = u3r_string(u3h(viz)); deh_u->nex_u = hed_u; hed_u = deh_u; @@ -220,8 +220,8 @@ _cttp_octs_to_bod(u3_noun oct) { c3_w len_w; - if ( !_(u3_ca_is_cat(u3h(oct))) ) { // 2GB max - u3_cm_bail(c3__fail); return 0; + if ( !_(u3a_is_cat(u3h(oct))) ) { // 2GB max + u3m_bail(c3__fail); return 0; } len_w = u3h(oct); @@ -229,7 +229,7 @@ _cttp_octs_to_bod(u3_noun oct) u3_hbod* bod_u = c3_malloc(len_w + sizeof(*bod_u)); bod_u->len_w = len_w; - u3_cr_bytes(0, len_w, bod_u->hun_y, u3t(oct)); + u3r_bytes(0, len_w, bod_u->hun_y, u3t(oct)); bod_u->nex_u = 0; @@ -267,10 +267,10 @@ _cttp_mcut_str(c3_c* buf_c, c3_w len_w, const c3_c* str_c) static c3_w _cttp_mcut_span(c3_c* buf_c, c3_w len_w, u3_noun san) { - c3_w ten_w = u3_cr_met(3, san); + c3_w ten_w = u3r_met(3, san); if ( buf_c ) { - u3_cr_bytes(0, ten_w, (c3_y *)(buf_c + len_w), san); + u3r_bytes(0, ten_w, (c3_y *)(buf_c + len_w), san); } u3z(san); return (len_w + ten_w); @@ -306,7 +306,7 @@ _cttp_mcut_host(c3_c* buf_c, c3_w len_w, u3_noun hot) len_w = _cttp_mcut_path(buf_c, len_w, '.', u3_ckb_flop(u3k(u3t(hot)))); } else { - c3_w ipf_w = u3_cr_word(0, u3t(hot)); + c3_w ipf_w = u3r_word(0, u3t(hot)); c3_c ipf_c[17]; snprintf(ipf_c, 16, "%d.%d.%d.%d", (ipf_w >> 24), @@ -337,7 +337,7 @@ _cttp_mcut_pfix(c3_c* buf_c, c3_w len_w, u3_noun hat) len_w = _cttp_mcut_host(buf_c, len_w, u3k(r_hat)); if ( u3_nul != q_hat ) { - c3_w por_w = 0xffff & u3_cr_word(0, u3t(q_hat)); + c3_w por_w = 0xffff & u3r_word(0, u3t(q_hat)); c3_c por_c[8]; snprintf(por_c, 7, ":%d", por_w); @@ -446,7 +446,7 @@ _cttp_httr(c3_l num_l, c3_w sas_w, u3_noun mes, u3_noun uct) u3_noun htr = u3nt(sas_w, mes, uct); u3_noun pox = u3nt(u3_blip, c3__http, u3_nul); - u3_cv_plan(pox, u3nt(c3__they, num_l, htr)); + u3v_plan(pox, u3nt(c3__they, num_l, htr)); } /* _cttp_httr_cres(): deliver valid response. diff --git a/v/http.c b/v/http.c index 6afe0bf451..7b05f3ef44 100644 --- a/v/http.c +++ b/v/http.c @@ -710,8 +710,8 @@ _http_heds_to_list(u3_hhed* hed_u) if ( 0 == hed_u ) { return u3_nul; } else { - return u3nc(u3nc(u3_ci_string(hed_u->nam_c), - hed_u->val_c ? u3_ci_string(hed_u->val_c) : u3_nul), + return u3nc(u3nc(u3i_string(hed_u->nam_c), + hed_u->val_c ? u3i_string(hed_u->val_c) : u3_nul), _http_heds_to_list(hed_u->nex_u)); } } @@ -735,8 +735,8 @@ _http_list_to_heds(u3_noun lix) u3_noun t_lix = u3t(lix); u3_hhed* nex_u = c3_malloc(sizeof(u3_hhed)); - nex_u->nam_c = u3_cr_string(pi_lix); - nex_u->val_c = u3_cr_string(qi_lix); + nex_u->nam_c = u3r_string(pi_lix); + nex_u->val_c = u3r_string(qi_lix); nex_u->nex_u = hed_u; hed_u = nex_u; @@ -775,7 +775,7 @@ _http_bods_to_octs(u3_hbod* bod_u) bod_u = bod_u->nex_u; } } - cos = u3_ci_bytes(len_w, buf_y); + cos = u3i_bytes(len_w, buf_y); free(buf_y); return u3nc(len_w, cos); } @@ -787,9 +787,9 @@ _http_octs_to_bod(u3_noun oct) { c3_w len_w; - if ( !_(u3_ca_is_cat(u3h(oct))) ) { + if ( !_(u3a_is_cat(u3h(oct))) ) { // 2GB max - u3_cm_bail(c3__fail); return 0; + u3m_bail(c3__fail); return 0; } len_w = u3h(oct); @@ -797,7 +797,7 @@ _http_octs_to_bod(u3_noun oct) u3_hbod* bod_u = c3_malloc(len_w + sizeof(*bod_u)); bod_u->len_w = len_w; - u3_cr_bytes(0, len_w, bod_u->hun_y, u3t(oct)); + u3r_bytes(0, len_w, bod_u->hun_y, u3t(oct)); bod_u->nex_u = 0; @@ -834,7 +834,7 @@ _http_request_to_noun(u3_hreq* req_u) case u3_hmet_get: { med = c3__get; break; } case u3_hmet_post: { med = c3__post; break; } } - url = u3_ci_string(req_u->url_c); + url = u3i_string(req_u->url_c); hed = _http_heds_to_list(req_u->hed_u); bod = req_u->bod_u ? u3nc(u3_nul, _http_bods_to_octs(req_u->bod_u)) : u3_nul; @@ -848,7 +848,7 @@ _http_new_response(c3_l sev_l, c3_l coq_l, c3_l seq_l, u3_noun rep) { u3_noun p_rep, q_rep, r_rep; - if ( c3n == u3_cr_trel(rep, &p_rep, &q_rep, &r_rep) ) { + if ( c3n == u3r_trel(rep, &p_rep, &q_rep, &r_rep) ) { uL(fprintf(uH, "strange response\n")); return 0; } @@ -879,10 +879,10 @@ _http_request(u3_hreq* req_u) req_u->hon_u->coq_l, req_u->seq_l); - u3_cv_plan(pox, + u3v_plan(pox, u3nq(c3__this, req_u->hon_u->htp_u->sec, - u3nc(c3y, u3_ci_words(1, &req_u->ipf_w)), + u3nc(c3y, u3i_words(1, &req_u->ipf_w)), req)); } } @@ -896,7 +896,7 @@ _http_request_dead(u3_hreq* req_u) req_u->hon_u->coq_l, req_u->seq_l); - u3_cv_plan(pox, u3nc(c3__thud, u3_nul)); + u3v_plan(pox, u3nc(c3__thud, u3_nul)); } /* _http_flush(): transmit any ready data. @@ -981,7 +981,7 @@ u3_http_ef_bake(void) { u3_noun pax = u3nq(u3_blip, c3__http, u3k(u3A->sen), u3_nul); - u3_cv_plan(pax, u3nc(c3__born, u3_nul)); + u3v_plan(pax, u3nc(c3__born, u3_nul)); } /* u3_http_ef_thou(): send %thou effect (incoming response) to http. diff --git a/v/loop.c b/v/loop.c index 551f87bf54..32d20b9a44 100644 --- a/v/loop.c +++ b/v/loop.c @@ -308,7 +308,7 @@ u3_lo_punt(c3_l tab_l, u3_noun tac) // We are calling nock here, but hopefully need no protection. // - while ( c3y == u3_cr_du(cat) ) { + while ( c3y == u3r_du(cat) ) { u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); _lo_wall(wol); @@ -337,7 +337,7 @@ _lo_time(void) struct timeval tim_tv; gettimeofday(&tim_tv, 0); - u3_cv_time(u3_time_in_tv(&tim_tv)); + u3v_time(u3_time_in_tv(&tim_tv)); } /* u3_lo_open(): begin callback processing. @@ -345,10 +345,10 @@ _lo_time(void) void u3_lo_open(void) { - if ( (u3H->rod_u.how.fag_w & u3_ca_flag_gc) || - (u3H->rod_u.how.fag_w & u3_ca_flag_debug) ) + if ( (u3H->rod_u.how.fag_w & u3a_flag_gc) || + (u3H->rod_u.how.fag_w & u3a_flag_debug) ) { - u3_ce_grab("lo_open", u3_none); + u3e_grab("lo_open", u3_none); } _lo_time(); } @@ -358,7 +358,7 @@ u3_lo_open(void) void u3_lo_shut(u3_bean inn) { - // u3_ce_grab("lo_shut a", u3_none); + // u3e_grab("lo_shut a", u3_none); // process actions // @@ -389,7 +389,7 @@ u3_lo_shut(u3_bean inn) // u3_lo_grab("lo_exit", u3_none); // u3_loom_save(u3A->ent_d); // u3_loom_exit(); - u3_ct_boff(); + u3t_boff(); u3_lo_exit(); exit(u3_Host.xit_i); @@ -524,7 +524,7 @@ void u3_lo_show(c3_c* cap_c, u3_noun nun) { u3_noun pav = u3_dc("pave", c3__noun, nun); - c3_c* txt_c = (c3_c*)u3_cr_tape(pav); + c3_c* txt_c = (c3_c*)u3r_tape(pav); fprintf(stderr, "%s: %s\r\n", cap_c, txt_c); u3z(pav); @@ -557,7 +557,7 @@ u3_lo_loop() _lo_init(); u3_raft_init(); - u3_ct_boot(); // activate profiling + u3t_boot(); // activate profiling if ( c3n == u3_Host.ops_u.bat ) { uv_run(u3L, UV_RUN_DEFAULT); @@ -578,7 +578,7 @@ u3_lo_lead(void) _lo_talk(); { u3_unix_ef_look(); - u3_cv_plan(u3nt(u3_blip, c3__ames, u3_nul), + u3v_plan(u3nt(u3_blip, c3__ames, u3_nul), u3nc(c3__kick, u3k(u3A->now))); } _lo_poll(); @@ -607,23 +607,23 @@ _lo_mark_reck(u3_reck* rec_u) c3_w siz_w = 0; c3_w egg_w; - siz_w += u3_cm_mark_noun(rec_u->ken); - siz_w += u3_cm_mark_noun(rec_u->roc); + siz_w += u3m_mark_noun(rec_u->ken); + siz_w += u3m_mark_noun(rec_u->roc); - siz_w += u3_cm_mark_noun(rec_u->yot); - siz_w += u3_cm_mark_noun(rec_u->now); - siz_w += u3_cm_mark_noun(rec_u->wen); - siz_w += u3_cm_mark_noun(rec_u->sen); - siz_w += u3_cm_mark_noun(rec_u->own); - siz_w += u3_cm_mark_noun(rec_u->roe); - siz_w += u3_cm_mark_noun(rec_u->key); + siz_w += u3m_mark_noun(rec_u->yot); + siz_w += u3m_mark_noun(rec_u->now); + siz_w += u3m_mark_noun(rec_u->wen); + siz_w += u3m_mark_noun(rec_u->sen); + siz_w += u3m_mark_noun(rec_u->own); + siz_w += u3m_mark_noun(rec_u->roe); + siz_w += u3m_mark_noun(rec_u->key); { u3_cart* egg_u; egg_w = 0; for ( egg_u = rec_u->ova.egg_u; egg_u; egg_u = egg_u->nex_u ) { - egg_w += u3_cm_mark_noun(egg_u->vir); + egg_w += u3m_mark_noun(egg_u->vir); } siz_w += egg_w; } @@ -641,7 +641,7 @@ _lo_mark() { c3_w siz_w; - siz_w = u3_cm_mark_internal(); + siz_w = u3m_mark_internal(); siz_w += _lo_mark_reck(u3_Host.arv_u); return siz_w; @@ -690,15 +690,15 @@ u3_lo_grab(c3_c* cap_c, u3_noun som, ...) va_start(vap, som); if ( som != u3_none ) { - siz_w += u3_cm_mark_noun(som); + siz_w += u3m_mark_noun(som); while ( u3_none != (tur = va_arg(vap, u3_noun)) ) { - siz_w += u3_cm_mark_noun(tur); + siz_w += u3m_mark_noun(tur); } } va_end(vap); } - lec_w = u3_cm_sweep(siz_w); + lec_w = u3m_sweep(siz_w); // if ( lec_w || (c3y == u3_Flag_Verbose) ) if ( lec_w || !strcmp("init", cap_c) ) { diff --git a/v/main.c b/v/main.c index b188be2d17..469a2dfa46 100644 --- a/v/main.c +++ b/v/main.c @@ -307,7 +307,7 @@ main(c3_i argc, { /* Boot the image and checkpoint. */ - u3_ce_boot(u3_Host.ops_u.nuu, u3_Host.ops_u.gab, u3_Host.cpu_c); + u3e_boot(u3_Host.ops_u.nuu, u3_Host.ops_u.gab, u3_Host.cpu_c); /* Start Arvo. */ @@ -319,7 +319,7 @@ main(c3_i argc, gettimeofday(&tim_tv, 0); now = u3_time_in_tv(&tim_tv); - u3_cv_start(now); + u3v_start(now); } #endif #if 0 @@ -327,13 +327,13 @@ main(c3_i argc, */ if ( _(u3_Host.ops_u.nuu) ) { printf("about to save.\r\n"); - u3_ce_save(); + u3e_save(); printf("saved.\r\n"); } #endif } - // u3_ce_grab("main", u3_none); + // u3e_grab("main", u3_none); u3_lo_loop(); return 0; diff --git a/v/raft.c b/v/raft.c index 3864da6f1c..5954bb4fc9 100644 --- a/v/raft.c +++ b/v/raft.c @@ -443,9 +443,9 @@ _raft_rmsg_read(const u3_rbuf* buf_u, u3_rmsg* msg_u) } memcpy(&msg_u->ver_w, buf_u->buf_y + red_i, sizeof(c3_w)); red_i += sizeof(c3_w); - if ( msg_u->ver_w != u3_cr_mug('a') ) { + if ( msg_u->ver_w != u3r_mug('a') ) { uL(fprintf(uH, "raft: versions don't match: %x %x\n", - msg_u->ver_w, u3_cr_mug('a'))); + msg_u->ver_w, u3r_mug('a'))); return -1; } @@ -1133,7 +1133,7 @@ _raft_write_base(u3_rcon* ron_u, u3_rmsg* msg_u) { u3_raft* raf_u = ron_u->raf_u; - msg_u->ver_w = u3_cr_mug('a'); + msg_u->ver_w = u3r_mug('a'); msg_u->tem_w = raf_u->tem_w; msg_u->len_d = 5; } @@ -1452,10 +1452,10 @@ _raft_sure(u3_noun ovo, u3_noun vir, u3_noun cor) // Whatever worked, save it. (XX - should be concurrent with execute.) // We'd like more events that don't change the state but need work here. { - u3_cr_mug(cor); - u3_cr_mug(u3A->roc); + u3r_mug(cor); + u3r_mug(u3A->roc); - if ( c3n == u3_cr_sing(cor, u3A->roc) ) { + if ( c3n == u3r_sing(cor, u3A->roc) ) { u3A->roe = u3nc(u3nc(vir, ovo), u3A->roe); u3z(u3A->roc); @@ -1481,7 +1481,7 @@ _raft_lame(u3_noun ovo, u3_noun why, u3_noun tan) #if 0 { - c3_c* oik_c = u3_cr_string(u3h(u3t(ovo))); + c3_c* oik_c = u3r_string(u3h(u3t(ovo))); // uL(fprintf(uH, "lame: %s\n", oik_c)); free(oik_c); @@ -1508,7 +1508,7 @@ _raft_lame(u3_noun ovo, u3_noun why, u3_noun tan) u3z(ovo); - gon = u3_cm_soft(0, u3_cv_poke, u3k(bov)); + gon = u3m_soft(0, u3v_poke, u3k(bov)); if ( u3_blip == u3h(gon) ) { _raft_sure(bov, u3k(u3h(u3t(gon))), u3k(u3t(u3t(gon)))); @@ -1518,8 +1518,8 @@ _raft_lame(u3_noun ovo, u3_noun why, u3_noun tan) u3z(gon); { u3_noun vab = u3nc(u3k(u3h(bov)), - u3nc(c3__warn, u3_ci_tape("crude crash!"))); - u3_noun nog = u3_cm_soft(0, u3_cv_poke, u3k(vab)); + u3nc(c3__warn, u3i_tape("crude crash!"))); + u3_noun nog = u3m_soft(0, u3v_poke, u3k(vab)); if ( u3_blip == u3h(nog) ) { _raft_sure(vab, u3k(u3h(u3t(nog))), u3k(u3t(u3t(nog)))); @@ -1543,13 +1543,13 @@ static void _raft_punk(u3_noun ovo) { #ifdef GHETTO - c3_c* txt_c = u3_cr_string(u3h(u3t(ovo))); + c3_c* txt_c = u3r_string(u3h(u3t(ovo))); #endif c3_w sec_w; // static c3_w num_w; u3_noun gon; - // uL(fprintf(uH, "punk: %s: %d\n", u3_cr_string(u3h(u3t(ovo))), num_w++)); + // uL(fprintf(uH, "punk: %s: %d\n", u3r_string(u3h(u3t(ovo))), num_w++)); // XX this is wrong - the timer should be on the original hose. // @@ -1571,7 +1571,7 @@ _raft_punk(u3_noun ovo) uL(fprintf(uH, "%%soft %s\n", txt_c)); #endif - gon = u3_cm_soft(sec_w, u3_cv_poke, u3k(ovo)); + gon = u3m_soft(sec_w, u3v_poke, u3k(ovo)); #ifdef GHETTO c3_w ms_w; @@ -1596,7 +1596,7 @@ _raft_punk(u3_noun ovo) u3_noun nug; u3z(gon); - nug = u3_cv_nick(vir, cor); + nug = u3v_nick(vir, cor); if ( u3_blip != u3h(nug) ) { u3_noun why = u3k(u3h(nug)); @@ -1621,13 +1621,13 @@ _raft_punk(u3_noun ovo) static void _raft_comm(c3_d bid_d) { - u3p(u3_cv_cart) egg_p; + u3p(u3v_cart) egg_p; u3_lo_open(); egg_p = u3A->ova.egg_p; while ( egg_p ) { - u3_cv_cart* egg_u = u3to(u3_cv_cart, egg_p); + u3v_cart* egg_u = u3to(u3v_cart, egg_p); if ( egg_u->ent_d <= bid_d ) { egg_u->cit = c3y; @@ -1707,8 +1707,8 @@ u3_raft_work(void) // Delete finished events. // while ( u3A->ova.egg_p ) { - u3p(u3_cv_cart) egg_p = u3A->ova.egg_p; - u3_cv_cart* egg_u = u3to(u3_cv_cart, u3A->ova.egg_p); + u3p(u3v_cart) egg_p = u3A->ova.egg_p; + u3v_cart* egg_u = u3to(u3v_cart, u3A->ova.egg_p); if ( c3y == egg_u->did ) { vir = egg_u->vir; @@ -1722,7 +1722,7 @@ u3_raft_work(void) u3A->ova.egg_p = egg_u->nex_p; } egg_u->cit = c3y; - u3_ca_free(egg_u); + u3a_free(egg_u); } else break; } @@ -1764,8 +1764,8 @@ u3_raft_work(void) u3z(ova); ova = nex; if ( u3_nul != ovo ) { - u3_cv_cart* egg_u = u3_ca_malloc(sizeof(*egg_u)); - u3p(u3_cv_cart) egg_p = u3of(u3_cv_cart, egg_u); + u3v_cart* egg_u = u3a_malloc(sizeof(*egg_u)); + u3p(u3v_cart) egg_p = u3of(u3v_cart, egg_u); egg_u->nex_p = 0; egg_u->cit = c3n; @@ -1776,9 +1776,9 @@ u3_raft_work(void) c3_assert(u3A->key); ron = u3_dc("en:crua", u3k(u3A->key), ron); - len_w = u3_cr_met(5, ron); + len_w = u3r_met(5, ron); bob_w = c3_malloc(len_w * 4L); - u3_cr_words(0, len_w, bob_w, ron); + u3r_words(0, len_w, bob_w, ron); u3z(ron); bid_d = _raft_push(u3Z, bob_w, len_w); @@ -1789,8 +1789,8 @@ u3_raft_work(void) u3A->ova.geg_p = u3A->ova.egg_p = egg_p; } else { - c3_assert(0 == u3to(u3_cv_cart, u3A->ova.geg_p)->nex_p); - u3to(u3_cv_cart, u3A->ova.geg_p)->nex_p = egg_p; + c3_assert(0 == u3to(u3v_cart, u3A->ova.geg_p)->nex_p); + u3to(u3v_cart, u3A->ova.geg_p)->nex_p = egg_p; u3A->ova.geg_p = egg_p; } _raft_kick_all(vir); diff --git a/v/reck.c b/v/reck.c index 664d5b95b7..dd58f58484 100644 --- a/v/reck.c +++ b/v/reck.c @@ -30,17 +30,17 @@ _reck_mole(u3_noun fot, u3_noun uco = u3_do("slay", san); u3_noun p_uco, q_uco, r_uco, s_uco; - if ( (c3n == u3_cr_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || + if ( (c3n == u3r_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || (0 != p_uco) || (0 != q_uco) || - (c3n == u3_cr_sing(fot, r_uco)) ) + (c3n == u3r_sing(fot, r_uco)) ) { - uL(fprintf(uH, "strange mole %s\n", u3_cr_string(san))); + uL(fprintf(uH, "strange mole %s\n", u3r_string(san))); u3z(fot); u3z(uco); return c3n; } else { - *ato_d = u3_cr_chub(0, s_uco); + *ato_d = u3r_chub(0, s_uco); u3z(fot); u3z(uco); return c3y; } @@ -130,7 +130,7 @@ _reck_kick_http(u3_noun pox, case c3__thus: p_fav = u3h(u3t(fav)); q_fav = u3t(u3t(fav)); { - u3_cttp_ef_thus(u3_cr_word(0, p_fav), u3k(q_fav)); + u3_cttp_ef_thus(u3r_word(0, p_fav), u3k(q_fav)); u3z(pox); u3z(fav); return c3y; @@ -213,7 +213,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) { u3_noun i_pox, t_pox; - if ( (c3n == u3_cr_cell(pox, &i_pox, &t_pox)) || + if ( (c3n == u3r_cell(pox, &i_pox, &t_pox)) || ((i_pox != u3_blip) && (i_pox != c3__gold) && (i_pox != c3__iron) && @@ -223,7 +223,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) } else { u3_noun it_pox, tt_pox; - if ( (c3n == u3_cr_cell(t_pox, &it_pox, &tt_pox)) ) { + if ( (c3n == u3r_cell(t_pox, &it_pox, &tt_pox)) ) { u3z(pox); u3z(fav); return c3n; } else switch ( it_pox ) { @@ -234,7 +234,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) u3_noun p_pud, t_pud, tt_pud, q_pud, r_pud, s_pud; c3_l sev_l, coq_l, seq_l; - if ( (c3n == u3_cr_cell(pud, &p_pud, &t_pud)) || + if ( (c3n == u3r_cell(pud, &p_pud, &t_pud)) || (c3n == _reck_lily(c3__uv, u3k(p_pud), &sev_l)) ) { u3z(pox); u3z(fav); return c3n; @@ -244,7 +244,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) coq_l = seq_l = 0; } else { - if ( (c3n == u3_cr_cell(t_pud, &q_pud, &tt_pud)) || + if ( (c3n == u3r_cell(t_pud, &q_pud, &tt_pud)) || (c3n == _reck_lily(c3__ud, u3k(q_pud), &coq_l)) ) { u3z(pox); u3z(fav); return c3n; @@ -253,7 +253,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) if ( u3_nul == tt_pud ) { seq_l = 0; } else { - if ( (c3n == u3_cr_cell(tt_pud, &r_pud, &s_pud)) || + if ( (c3n == u3r_cell(tt_pud, &r_pud, &s_pud)) || (u3_nul != s_pud) || (c3n == _reck_lily(c3__ud, u3k(r_pud), &seq_l)) ) { @@ -287,7 +287,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) u3_noun p_pud, q_pud; c3_l tid_l; - if ( (c3n == u3_cr_cell(pud, &p_pud, &q_pud)) || + if ( (c3n == u3r_cell(pud, &p_pud, &q_pud)) || (u3_nul != q_pud) || (c3n == _reck_lily(c3__ud, u3k(p_pud), &tid_l)) ) { @@ -358,13 +358,13 @@ u3_reck_kick(u3_noun ovo) (c3__init == u3h(u3t(ovo))) ) #endif { - u3_cv_plan(u3nt(u3_blip, c3__term, u3_nul), + u3v_plan(u3nt(u3_blip, c3__term, u3_nul), u3nc(c3__flog, u3k(u3t(ovo)))); } else { uL(fprintf(uH, "kick: lost %%%s on %s\n", - u3_cr_string(u3h(u3t(ovo))), - u3_cr_string(tox))); + u3r_string(u3h(u3t(ovo))), + u3r_string(tox))); #if 0 if ( c3__hear == u3h(u3t(ovo)) ) { c3_assert(0); diff --git a/v/save.c b/v/save.c index ba03977dd8..6e9ecef2c3 100644 --- a/v/save.c +++ b/v/save.c @@ -32,9 +32,9 @@ _save_time_cb(uv_timer_t* tim_u) if ( u3A->ent_d > sav_u->ent_d ) { // uL(fprintf(uH, "autosaving... ent_d %llu\n", u3A->ent_d)); - // u3_ce_grab("save", u3_none); + // u3e_grab("save", u3_none); - u3_ce_save(); + u3e_save(); sav_u->ent_d = u3A->ent_d; } } diff --git a/v/sist.c b/v/sist.c index f592ed88fc..429fd2f4f2 100644 --- a/v/sist.c +++ b/v/sist.c @@ -35,10 +35,10 @@ u3_sist_pack(c3_w tem_w, c3_w typ_w, c3_w* bob_w, c3_w len_w) lar_u.tem_w = tem_w; lar_u.typ_w = typ_w; - lar_u.syn_w = u3_cr_mug((c3_w)tar_d); - lar_u.mug_w = u3_cr_mug_both(u3_cr_mug_words(bob_w, len_w), - u3_cr_mug_both(u3_cr_mug(lar_u.tem_w), - u3_cr_mug(lar_u.typ_w))); + lar_u.syn_w = u3r_mug((c3_w)tar_d); + lar_u.mug_w = u3r_mug_both(u3r_mug_words(bob_w, len_w), + u3r_mug_both(u3r_mug(lar_u.tem_w), + u3r_mug(lar_u.typ_w))); lar_u.ent_d = u3A->ent_d; u3A->ent_d++; lar_u.len_w = len_w; @@ -215,7 +215,7 @@ _sist_suck(u3_noun ovo, u3_noun gon) { uL(fprintf(uH, "sing: ovum failed!\n")); { - c3_c* hed_c = u3_cr_string(u3h(u3t(ovo))); + c3_c* hed_c = u3r_string(u3h(u3t(ovo))); uL(fprintf(uH, "fail %s\n", hed_c)); free(hed_c); @@ -233,7 +233,7 @@ _sist_suck(u3_noun ovo, u3_noun gon) static void _sist_sing(u3_noun ovo) { - u3_noun gon = u3_cm_soft(0, u3_cv_poke, u3k(ovo)); + u3_noun gon = u3m_soft(0, u3v_poke, u3k(ovo)); if ( u3_blip != u3h(gon) ) { _sist_suck(ovo, gon); @@ -244,7 +244,7 @@ _sist_sing(u3_noun ovo) u3_noun nug; u3z(gon); - nug = u3_cv_nick(vir, cor); + nug = u3v_nick(vir, cor); if ( u3_blip != u3h(nug) ) { _sist_suck(ovo, nug); @@ -364,7 +364,7 @@ _sist_cask(c3_c* dir_c, u3_bean nun) say_c[1] = 0; strncat(say_c, paw_c, strlen(paw_c) - 1); - say = u3_do("slay", u3_ci_string(say_c)); + say = u3_do("slay", u3i_string(say_c)); if ( (u3_nul == say) || (u3_blip != u3h(u3t(say))) || ('p' != u3h(u3t(u3t(say)))) ) @@ -407,7 +407,7 @@ _sist_text(c3_c* pom_c) if ( paw_c[len_w - 1] == '\n' ) { paw_c[len_w-1] = 0; } - say = u3_ci_string(paw_c); + say = u3i_string(paw_c); break; } } @@ -466,9 +466,9 @@ _sist_fast(u3_noun pas, c3_l key_l) c3_c ful_c[2048]; c3_c* hom_c = u3_Host.cpu_c; u3_noun gum = u3_dc("scot", 'p', key_l); - c3_c* gum_c = u3_cr_string(gum); + c3_c* gum_c = u3r_string(gum); u3_noun yek = u3_dc("scot", 'p', pas); - c3_c* yek_c = u3_cr_string(yek); + c3_c* yek_c = u3r_string(yek); printf("saving passcode in %s/.urb/code.%s\r\n", hom_c, gum_c); printf("(for real security, write it down and delete the file...)\r\n"); @@ -498,7 +498,7 @@ _sist_staf(c3_l key_l) c3_c ful_c[2048]; c3_c* hom_c = u3_Host.cpu_c; u3_noun gum = u3_dc("scot", 'p', key_l); - c3_c* gum_c = u3_cr_string(gum); + c3_c* gum_c = u3r_string(gum); u3_noun txt; snprintf(ful_c, 2048, "%s/.urb/code.%s", hom_c, gum_c); @@ -511,7 +511,7 @@ _sist_staf(c3_l key_l) return 0; } else { - // c3_c* txt_c = u3_cr_string(txt); + // c3_c* txt_c = u3r_string(txt); u3_noun say = u3_do("slay", txt); u3_noun pas; @@ -601,23 +601,23 @@ _sist_zest() u3_noun pas; _sist_rand(rad_w); - pas = u3_ci_words(2, rad_w); + pas = u3i_words(2, rad_w); u3A->key = _sist_fatt(sal_l, u3k(pas)); - _sist_fast(pas, u3_cr_mug(u3A->key)); + _sist_fast(pas, u3r_mug(u3A->key)); } // Write the header. { u3_uled led_u; - led_u.mag_l = u3_cr_mug('g'); + led_u.mag_l = u3r_mug('g'); led_u.kno_w = 164; if ( 0 == u3A->key ) { led_u.key_l = 0; } else { - led_u.key_l = u3_cr_mug(u3A->key); + led_u.key_l = u3r_mug(u3A->key); c3_assert(!(led_u.key_l >> 31)); } @@ -668,7 +668,7 @@ _sist_rest_nuu(u3_ulog* lug_u, u3_uled led_u, c3_c* old_c) uL(fprintf(uH, "rest: converting log from prior format\n")); - c3_assert(led_u.mag_l == u3_cr_mug('f')); + c3_assert(led_u.mag_l == u3r_mug('f')); if ( -1 == lseek64(fid_i, 4ULL * end_d, SEEK_SET) ) { uL(fprintf(uH, "rest_nuu failed (a)\n")); @@ -695,7 +695,7 @@ _sist_rest_nuu(u3_ulog* lug_u, u3_uled led_u, c3_c* old_c) u3_lo_bail(); } - if ( lar_u.syn_w != u3_cr_mug((c3_w)tar_d) ) { + if ( lar_u.syn_w != u3r_mug((c3_w)tar_d) ) { uL(fprintf(uH, "rest_nuu failed (d)\n")); u3_lo_bail(); } @@ -714,10 +714,10 @@ _sist_rest_nuu(u3_ulog* lug_u, u3_uled led_u, c3_c* old_c) u3_lo_bail(); } - ron = u3_ci_words(lar_u.len_w, img_w); + ron = u3i_words(lar_u.len_w, img_w); free(img_w); - if ( lar_u.mug_w != u3_cr_mug(ron) ) { + if ( lar_u.mug_w != u3r_mug(ron) ) { uL(fprintf(uH, "rest_nuu failed (g)\n")); u3_lo_bail(); } @@ -740,7 +740,7 @@ _sist_rest_nuu(u3_ulog* lug_u, u3_uled led_u, c3_c* old_c) u3_lo_bail(); } - led_u.mag_l = u3_cr_mug('g'); + led_u.mag_l = u3r_mug('g'); if ( (sizeof(led_u) != write(fud_i, &led_u, sizeof(led_u))) ) { uL(fprintf(uH, "rest: can't write header\n")); perror("write"); @@ -758,18 +758,18 @@ _sist_rest_nuu(u3_ulog* lug_u, u3_uled led_u, c3_c* old_c) c3_w* img_w; c3_d tar_d; - lar_u.len_w = u3_cr_met(5, ovo); + lar_u.len_w = u3r_met(5, ovo); tar_d = end_d + lar_u.len_w; - lar_u.syn_w = u3_cr_mug(tar_d); + lar_u.syn_w = u3r_mug(tar_d); lar_u.ent_d = ent_d; lar_u.tem_w = 0; lar_u.typ_w = c3__ov; - lar_u.mug_w = u3_cr_mug_both(u3_cr_mug(ovo), - u3_cr_mug_both(u3_cr_mug(0), - u3_cr_mug(c3__ov))); + lar_u.mug_w = u3r_mug_both(u3r_mug(ovo), + u3r_mug_both(u3r_mug(0), + u3r_mug(c3__ov))); img_w = c3_malloc(lar_u.len_w << 2); - u3_cr_words(0, lar_u.len_w, img_w, ovo); + u3r_words(0, lar_u.len_w, img_w, ovo); u3z(ovo); if ( (lar_u.len_w << 2) != write(fud_i, img_w, lar_u.len_w << 2) ) { @@ -820,9 +820,9 @@ _sist_rest() u3_noun ent; c3_c* ent_c; - ent = u3_ci_chubs(1, &u3A->ent_d); + ent = u3i_chubs(1, &u3A->ent_d); ent = u3_dc("scot", c3__ud, ent); - ent_c = u3_cr_string(ent); + ent_c = u3r_string(ent); uL(fprintf(uH, "rest: checkpoint to event %s\n", ent_c)); free(ent_c); u3z(ent); @@ -862,11 +862,11 @@ _sist_rest() u3_lo_bail(); } - if ( u3_cr_mug('f') == led_u.mag_l ) { + if ( u3r_mug('f') == led_u.mag_l ) { _sist_rest_nuu(&u3Z->lug_u, led_u, ful_c); fid_i = u3Z->lug_u.fid_i; } - else if (u3_cr_mug('g') != led_u.mag_l ) { + else if (u3r_mug('g') != led_u.mag_l ) { uL(fprintf(uH, "record (%s) is obsolete (or corrupt)\n", ful_c)); u3_lo_bail(); } @@ -886,8 +886,8 @@ _sist_rest() { u3_noun old = u3_dc("scot", c3__uv, sev_l); u3_noun nuu = u3_dc("scot", c3__uv, u3A->sev_l); - c3_c* old_c = u3_cr_string(old); - c3_c* nuu_c = u3_cr_string(nuu); + c3_c* old_c = u3r_string(old); + c3_c* nuu_c = u3r_string(nuu); uL(fprintf(uH, "rest: old %s, new %s\n", old_c, nuu_c)); free(old_c); free(nuu_c); @@ -908,7 +908,7 @@ _sist_rest() key = _sist_fatt(sal_l, pas); - if ( u3_cr_mug(key) != key_l ) { + if ( u3r_mug(key) != key_l ) { uL(fprintf(uH, "incorrect passcode\n")); u3z(key); pas = 0; @@ -955,12 +955,12 @@ _sist_rest() u3_lo_bail(); } - if ( lar_u.syn_w != u3_cr_mug((c3_w)tar_d) ) { + if ( lar_u.syn_w != u3r_mug((c3_w)tar_d) ) { if ( c3n == rup ) { uL(fprintf(uH, "corruption detected; attempting to fix\n")); rup = c3y; } - uL(fprintf(uH, "lar:%x mug:%x\n", lar_u.syn_w, u3_cr_mug((c3_w)tar_d))); + uL(fprintf(uH, "lar:%x mug:%x\n", lar_u.syn_w, u3r_mug((c3_w)tar_d))); end_d--; u3Z->lug_u.len_d--; continue; } @@ -1011,13 +1011,13 @@ _sist_rest() u3_lo_bail(); } - ron = u3_ci_words(lar_u.len_w, img_w); + ron = u3i_words(lar_u.len_w, img_w); free(img_w); if ( lar_u.mug_w != - u3_cr_mug_both(u3_cr_mug(ron), - u3_cr_mug_both(u3_cr_mug(lar_u.tem_w), - u3_cr_mug(lar_u.typ_w))) ) + u3r_mug_both(u3r_mug(ron), + u3r_mug_both(u3r_mug(lar_u.tem_w), + u3r_mug(lar_u.typ_w))) ) { uL(fprintf(uH, "record (%s) is corrupt (j)\n", ful_c)); u3_lo_bail(); @@ -1075,7 +1075,7 @@ _sist_rest() u3_noun now = u3h(i_roe); u3_noun ovo = u3t(i_roe); - u3_cv_time(u3k(now)); + u3v_time(u3k(now)); if ( (c3y == u3_Host.ops_u.vno) && ( (c3__veer == u3h(u3t(ovo)) || (c3__vega == u3h(u3t(ovo)))) ) ) @@ -1128,7 +1128,7 @@ _sist_rest() } else fil_c = u3_Host.cpu_c; who = u3_dc("scot", 'p', u3k(u3A->our))); - who_c = u3_cr_string(who); + who_c = u3r_string(who); u3z(who); if ( strncmp(fil_c, who_c + 1, strlen(fil_c)) ) { @@ -1175,10 +1175,10 @@ _sist_rest() { u3_uled led_u; - led_u.mag_l = u3_cr_mug('g'); + led_u.mag_l = u3r_mug('g'); led_u.sal_l = sal_l; led_u.sev_l = u3A->sev_l; - led_u.key_l = u3A->key ? u3_cr_mug(u3A->key) : 0; + led_u.key_l = u3A->key ? u3r_mug(u3A->key) : 0; led_u.kno_w = 164; // may need actual translation! led_u.tno_l = 1; @@ -1204,7 +1204,7 @@ _sist_zen() c3_w rad_w[8]; _sist_rand(rad_w); - return u3_ci_words(8, rad_w); + return u3i_words(8, rad_w); } /* u3_sist_boot(): restore or create. @@ -1230,7 +1230,7 @@ u3_sist_boot(void) pig = u3nq(c3__make, u3_nul, 11, u3nc(ten, u3_Host.ops_u.fak)); } else { - u3_noun imp = u3_ci_string(u3_Host.ops_u.imp_c); + u3_noun imp = u3i_string(u3_Host.ops_u.imp_c); u3_noun whu = u3_dc("slaw", 'p', u3k(imp)); if ( (u3_nul == whu) ) { diff --git a/v/temp.c b/v/temp.c index c3b1dc3f88..6d8a3e31c2 100644 --- a/v/temp.c +++ b/v/temp.c @@ -51,7 +51,7 @@ _temp_time_cb(uv_timer_t* tim_u) u3_lo_open(); { - u3_cv_plan + u3v_plan (u3nt(u3_blip, c3__temp, u3_nul), u3nc(c3__wake, u3_nul)); } @@ -64,7 +64,7 @@ void u3_temp_io_poll(void) { u3_temp* teh_u = &u3_Host.teh_u; - u3_noun wen = u3_cv_keep(u3nt(u3_blip, c3__temp, u3_nul)); + u3_noun wen = u3v_keep(u3nt(u3_blip, c3__temp, u3_nul)); if ( (u3_nul != wen) && (c3y == u3du(wen)) && diff --git a/v/term.c b/v/term.c index ebbcc5795a..793deac28d 100644 --- a/v/term.c +++ b/v/term.c @@ -72,7 +72,7 @@ _term_close_cb(uv_handle_t* han_t) { u3_noun tid = u3_dc("scot", c3__ud, tty_u->tid_l); u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul); - u3_cv_plan(u3k(pax), u3nc(c3__hook, u3_nul)); + u3v_plan(u3k(pax), u3nc(c3__hook, u3_nul)); u3z(pax); } free(tty_u); @@ -304,8 +304,8 @@ _term_listen_cb(uv_stream_t *wax_u, int sas_i) { u3_noun tid = u3_dc("scot", c3__ud, tty_u->tid_l); u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul); - u3_cv_plan(u3k(pax), u3nc(c3__blew, u3nc(80, 25))); - u3_cv_plan(u3k(pax), u3nc(c3__hail, u3_nul)); + u3v_plan(u3k(pax), u3nc(c3__blew, u3nc(80, 25))); + u3v_plan(u3k(pax), u3nc(c3__hail, u3_nul)); u3z(pax); } @@ -497,9 +497,9 @@ _term_it_write_str(u3_utty* uty_u, static void _term_it_show_wide(u3_utty* uty_u, c3_w len_w, c3_w* txt_w) { - u3_noun wad = u3_ci_words(len_w, txt_w); + u3_noun wad = u3i_words(len_w, txt_w); u3_noun txt = u3_do("tuft", wad); - c3_c* txt_c = u3_cr_string(txt); + c3_c* txt_c = u3r_string(txt); _term_it_write_str(uty_u, txt_c); free(txt_c); @@ -622,7 +622,7 @@ _term_it_path(u3_bean fyl, u3_noun pax) u3_noun wiz = pax; while ( u3_nul != wiz ) { - len_w += (1 + u3_cr_met(3, u3h(wiz))); + len_w += (1 + u3r_met(3, u3h(wiz))); wiz = u3t(wiz); } } @@ -637,13 +637,13 @@ _term_it_path(u3_bean fyl, u3_noun pax) c3_c* waq_c = (pas_c + strlen(pas_c)); while ( u3_nul != wiz ) { - c3_w tis_w = u3_cr_met(3, u3h(wiz)); + c3_w tis_w = u3r_met(3, u3h(wiz)); if ( (c3y == fyl) && (u3_nul == u3t(wiz)) ) { *waq_c++ = '.'; } else *waq_c++ = '/'; - u3_cr_bytes(0, tis_w, (c3_y*)waq_c, u3h(wiz)); + u3r_bytes(0, tis_w, (c3_y*)waq_c, u3h(wiz)); waq_c += tis_w; wiz = u3t(wiz); @@ -676,7 +676,7 @@ _term_io_belt(u3_utty* uty_u, u3_noun blb) u3_noun tid = u3_dc("scot", c3__ud, uty_u->tid_l); u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul); - u3_cv_plan(pax, u3nc(c3__belt, blb)); + u3v_plan(pax, u3nc(c3__belt, blb)); } /* _tel_event(): telnet sucker @@ -748,7 +748,7 @@ _tel_opt(_te_nvt* nvt, telnet_byte opt, _to_evt* evt) tid = u3_dc("scot", c3__ud, tel_u->uty_t.tid_l); pax = u3nq(u3_blip, c3__term, tid, u3_nul); blu = u3nc(col_s, row_s); - u3_cv_plan(pax, u3nc(c3__blew, blu)); + u3v_plan(pax, u3nc(c3__blew, blu)); break; } } @@ -793,7 +793,7 @@ _term_io_suck_char(u3_utty* uty_u, c3_y cay_y) tat_u->fut.syb_y[tat_u->fut.len_w++] = cay_y; if ( tat_u->fut.len_w == tat_u->fut.wid_w ) { - u3_noun huv = u3_ci_bytes(tat_u->fut.wid_w, tat_u->fut.syb_y); + u3_noun huv = u3i_bytes(tat_u->fut.wid_w, tat_u->fut.syb_y); u3_noun wug; // uL(fprintf(uH, "muck-utf8 len %d\n", tat_u->fut.len_w)); @@ -977,7 +977,7 @@ u3_term_ef_winc(void) { u3_noun pax = u3nq(u3_blip, c3__term, '1', u3_nul); - u3_cv_plan(pax, u3nc(c3__blew, u3_term_get_blew(1))); + u3v_plan(pax, u3nc(c3__blew, u3_term_get_blew(1))); } /* u3_term_ef_ctlc(): send ^C on console. @@ -987,7 +987,7 @@ u3_term_ef_ctlc(void) { u3_noun pax = u3nq(u3_blip, c3__term, '1', u3_nul); - u3_cv_plan(pax, u3nt(c3__belt, c3__ctl, 'c')); + u3v_plan(pax, u3nt(c3__belt, c3__ctl, 'c')); } /* u3_term_ef_boil(): initial effects for loaded servers. @@ -998,10 +998,10 @@ u3_term_ef_boil(void) { u3_noun pax = u3nq(u3_blip, c3__term, '1', u3_nul); - // u3_cv_plan(u3k(pax), u3nc(c3__init, u3k(u3h(u3A->own)))); - u3_cv_plan(u3k(pax), u3nc(c3__harm, u3_nul)); - u3_cv_plan(u3k(pax), u3nc(c3__blew, u3_term_get_blew(1))); - u3_cv_plan(u3k(pax), u3nc(c3__hail, u3_nul)); + // u3v_plan(u3k(pax), u3nc(c3__init, u3k(u3h(u3A->own)))); + u3v_plan(u3k(pax), u3nc(c3__harm, u3_nul)); + u3v_plan(u3k(pax), u3nc(c3__blew, u3_term_get_blew(1))); + u3v_plan(u3k(pax), u3nc(c3__hail, u3_nul)); u3z(pax); } @@ -1014,9 +1014,9 @@ u3_term_ef_bake(u3_noun fav) { u3_noun pax = u3nq(u3_blip, c3__term, '1', u3_nul); - u3_cv_plan(u3k(pax), u3nc(c3__boot, fav)); - u3_cv_plan(u3k(pax), u3nc(c3__blew, u3_term_get_blew(1))); - u3_cv_plan(u3k(pax), u3nc(c3__hail, u3_nul)); + u3v_plan(u3k(pax), u3nc(c3__boot, fav)); + u3v_plan(u3k(pax), u3nc(c3__blew, u3_term_get_blew(1))); + u3v_plan(u3k(pax), u3nc(c3__hail, u3_nul)); u3z(pax); } @@ -1057,7 +1057,7 @@ _term_ef_blit(u3_utty* uty_u, c3_w i_w; for ( i_w = 0; u3_nul != lin; i_w++, lin = u3t(lin) ) { - lin_w[i_w] = u3_cr_word(0, u3h(lin)); + lin_w[i_w] = u3r_word(0, u3h(lin)); } } diff --git a/v/time.c b/v/time.c index 695f7afe77..69d69705ec 100644 --- a/v/time.c +++ b/v/time.c @@ -84,7 +84,7 @@ u3_time_in_tv(struct timeval* tim_tv) cub_d[0] = u3_time_fsc_in(usc_w); cub_d[1] = u3_time_sec_in(unx_w); - return u3_ci_chubs(2, cub_d); + return u3i_chubs(2, cub_d); } /* u3_time_out_tv(): struct timeval from urbit time. @@ -92,8 +92,8 @@ u3_time_in_tv(struct timeval* tim_tv) void u3_time_out_tv(struct timeval* tim_tv, u3_noun now) { - c3_d ufc_d = u3_cr_chub(0, now); - c3_d urs_d = u3_cr_chub(1, now); + c3_d ufc_d = u3r_chub(0, now); + c3_d urs_d = u3r_chub(1, now); tim_tv->tv_sec = u3_time_sec_out(urs_d); tim_tv->tv_usec = u3_time_fsc_out(ufc_d); @@ -153,8 +153,8 @@ u3_time_gap_ms(u3_noun now, u3_noun wen) } else { u3_noun dif = u3_cka_sub(wen, now); - c3_d fsc_d = u3_cr_chub(0, dif); - c3_d sec_d = u3_cr_chub(1, dif); + c3_d fsc_d = u3r_chub(0, dif); + c3_d sec_d = u3r_chub(1, dif); u3z(dif); return (sec_d * 1000ULL) + u3_time_msc_out(fsc_d); @@ -170,8 +170,8 @@ u3_time_gap_double(u3_noun now, u3_noun wen) double sec_g = (((double)(1ULL << 32ULL)) * ((double)(1ULL << 32ULL))); double gap_g, dif_g; - u3_cr_mp(now_mp, now); - u3_cr_mp(wen_mp, wen); + u3r_mp(now_mp, now); + u3r_mp(wen_mp, wen); mpz_init(dif_mp); mpz_sub(dif_mp, wen_mp, now_mp); diff --git a/v/unix.c b/v/unix.c index db46fd4578..5529bd425f 100644 --- a/v/unix.c +++ b/v/unix.c @@ -268,8 +268,8 @@ _unix_file_form(u3_udir* dir_u, u3_bean ket, u3_noun ext) { - c3_c* pre_c = u3_cr_string(pre); - c3_c* ext_c = u3_cr_string(ext); + c3_c* pre_c = u3r_string(pre); + c3_c* ext_c = u3r_string(ext); c3_w pax_w = strlen(dir_u->pax_c); c3_w pre_w = strlen(pre_c); c3_w ext_w = strlen(ext_c); @@ -334,7 +334,7 @@ _unix_dir_watch(u3_udir* dir_u, u3_udir* par_u, c3_c* pax_c) static void _unix_dir_forge(u3_udir* dir_u, u3_udir* par_u, u3_noun tet) { - c3_c* tet_c = u3_cr_string(tet); + c3_c* tet_c = u3r_string(tet); c3_w pax_w = strlen(par_u->pax_c); c3_w tet_w = strlen(tet_c); c3_c* pax_c = c3_malloc(pax_w + 1 + tet_w + 1); @@ -549,7 +549,7 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u) { u3_noun mod = c3_stat_mtime(&buf_u); - u3_cr_mp(mod_mp, mod); + u3r_mp(mod_mp, mod); u3z(mod); } for ( fil_u = dir_u->fil_u; fil_u; fil_u = fil_u->nex_u ) { @@ -627,7 +627,7 @@ _unix_load(c3_c* pax_c) return 0; } else { - u3_noun pad = u3_ci_bytes(fln_w, (c3_y *)pad_y); + u3_noun pad = u3i_bytes(fln_w, (c3_y *)pad_y); free(pad_y); return pad; @@ -645,12 +645,12 @@ _unix_save(c3_c* pax_c, u3_atom oat) if ( fid_i < 0 ) { uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno))); - u3_cm_bail(c3__fail); + u3m_bail(c3__fail); } - fln_w = u3_cr_met(3, oat); + fln_w = u3r_met(3, oat); oat_y = c3_malloc(fln_w); - u3_cr_bytes(0, fln_w, oat_y, oat); + u3r_bytes(0, fln_w, oat_y, oat); u3z(oat); rit_w = write(fid_i, oat_y, fln_w); @@ -686,8 +686,8 @@ _unix_dir_name(u3_udir* dir_u) c3_c* pax_c = dir_u->pax_c + pel_w + 1; c3_c* fas_c = strchr(pax_c, '/'); - return fas_c ? u3_ci_bytes((fas_c - pax_c), (c3_y*) pax_c) - : u3_ci_string(pax_c); + return fas_c ? u3i_bytes((fas_c - pax_c), (c3_y*) pax_c) + : u3i_string(pax_c); } /* _unix_file_tame(): file name/extension for toplevel. @@ -705,8 +705,8 @@ _unix_file_tame(u3_ufil* fil_u) c3_c* ext_c = fil_u->dot_c + 1; c3_w nam_w = fil_u->dot_c - pax_c; - return u3nc(u3_ci_bytes(nam_w, (c3_y*)pax_c), - u3_ci_string(ext_c)); + return u3nc(u3i_bytes(nam_w, (c3_y*)pax_c), + u3i_string(ext_c)); } } @@ -719,14 +719,14 @@ _unix_file_name(u3_ufil* fil_u) c3_c* pax_c = fil_u->pax_c + pel_w + 1; if ( !fil_u->dot_c ) { - return u3_ci_string(pax_c); + return u3i_string(pax_c); } else { c3_c* ext_c = fil_u->dot_c + 1; ext_c = (*ext_c == '^') ? (ext_c + 1) : ext_c; - return u3nc(u3_ci_bytes((fil_u->dot_c - pax_c), (c3_y*)pax_c), - u3_ci_string(ext_c)); + return u3nc(u3i_bytes((fil_u->dot_c - pax_c), (c3_y*)pax_c), + u3i_string(ext_c)); } } @@ -803,7 +803,7 @@ _unix_dir_ankh(u3_udir* dir_u) u3_noun pre = _unix_dir_name(dis_u); u3_noun ank = _unix_dir_ankh(dis_u); - // uL(fprintf(uH, "dir %s\n", u3_cr_string(pre))); + // uL(fprintf(uH, "dir %s\n", u3r_string(pre))); if ( 0 != u3h(ank) ) { pam = u3_ckdb_put(pam, pre, ank); } @@ -815,7 +815,7 @@ _unix_dir_ankh(u3_udir* dir_u) u3_noun wib = _unix_file_tame(fil_u); if ( u3_none == wib ) continue; u3_noun dur = _unix_dir_name(dir_u); - if ( c3n == u3_cr_sing(dur, u3h(wib)) ) { // wrong desk + if ( c3n == u3r_sing(dur, u3h(wib)) ) { // wrong desk u3z(wib); u3z(dur); continue; } @@ -842,7 +842,7 @@ _unix_dir_ankh(u3_udir* dir_u) static u3_weak _find_mug(u3_noun som, c3_l mug_l) { - if ( mug_l == u3_cr_mug(som) ) { + if ( mug_l == u3r_mug(som) ) { return som; } else { @@ -870,7 +870,7 @@ _unix_desk_peek(u3_noun hox, u3_noun cay; arg = u3nc(c3_s2('c','z'), u3nq(hox, syd, lok, u3_nul)); - cay = u3_cv_peek(arg); + cay = u3v_peek(arg); if ( u3_nul == cay ) { return u3nt(0, u3_nul, u3_nul); @@ -896,10 +896,10 @@ _unix_ankh_sing_map(u3_noun mun, u3_noun mur) // retain if ( (u3_nul == mun) && (u3_nul == mur) ) { return c3y; } if ( (u3_nul == mun) || (u3_nul == mur) ) { return c3n; } - u3_cx_trel(mun, &n_mun, &l_mun, &r_mun); - u3_cx_trel(mur, &n_mur, &l_mur, &r_mur); + u3x_trel(mun, &n_mun, &l_mun, &r_mun); + u3x_trel(mur, &n_mur, &l_mur, &r_mur); - if ( (c3n == (u3_cr_sing(u3h(n_mun), u3h(n_mur)))) || + if ( (c3n == (u3r_sing(u3h(n_mun), u3h(n_mur)))) || (c3n == _unix_ankh_sing_in(u3t(n_mun), u3t(n_mur))) || (c3n == _unix_ankh_sing_map(l_mun, l_mur)) || (c3n == _unix_ankh_sing_map(r_mun, r_mur)) ) @@ -916,7 +916,7 @@ _unix_node_sing(u3_noun xud, u3_noun bud) if ( (u3_nul == xud) && (u3_nul == bud) ) { return c3y; } if ( (u3_nul == xud) || (u3_nul == bud) ) { return c3n; } - return u3_cr_sing(u3t(u3t(xud)), u3t(u3t(bud))); + return u3r_sing(u3t(u3t(xud)), u3t(u3t(bud))); } /* _unix_ankh_sing_in(): stupid ankh test which ignores broken hash. @@ -927,8 +927,8 @@ _unix_ankh_sing_in(u3_noun xun, u3_noun bur) // retain u3_noun p_xun, q_xun, r_xun; u3_noun p_bur, q_bur, r_bur; - u3_cx_trel(xun, &p_xun, &q_xun, &r_xun); - u3_cx_trel(bur, &p_bur, &q_bur, &r_bur); + u3x_trel(xun, &p_xun, &q_xun, &r_xun); + u3x_trel(bur, &p_bur, &q_bur, &r_bur); if ( c3n == _unix_node_sing(q_xun, q_bur) ) { return c3n; @@ -941,7 +941,7 @@ _unix_ankh_sing_in(u3_noun xun, u3_noun bur) // retain static u3_bean _unix_ankh_sing(u3_noun xun, u3_noun bur) // retain { - if ( c3y == u3_cr_sing(xun, bur) ) { + if ( c3y == u3r_sing(xun, bur) ) { return c3y; } else { if ( c3n == _unix_ankh_sing_in(xun, bur) ) { @@ -969,14 +969,14 @@ _unix_desk_sync_into(u3_noun who, xun = _unix_dir_ankh(dir_u); bur = _unix_desk_peek(hox, u3k(syd), u3k(u3A->wen)); - if ( (c3n == u3_cr_sing(u3h(xun), u3h(bur)))) + if ( (c3n == u3r_sing(u3h(xun), u3h(bur)))) { doz = u3_dc("cost", xun, bur); pax = u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul); fav = u3nq(c3__into, who, syd, u3nc(c3y, doz)); - u3_cv_plan(pax, fav); + u3v_plan(pax, fav); } else { u3z(who); u3z(syd); u3z(xun); u3z(bur); @@ -1001,14 +1001,14 @@ _unix_ship_update(u3_uhot* hot_u) mpz_t who_mp; mpz_init_set(who_mp, hot_u->who_mp); - who = u3_ci_mp(who_mp); + who = u3i_mp(who_mp); hox = u3_dc("scot", 'p', u3k(who)); } for ( dis_u = dir_u->dis_u; dis_u; dis_u = dis_u->nex_u ) { u3_noun syd = _unix_dir_name(dis_u); - // uL(fprintf(uH, "sync %s %s\n", u3_cr_string(hox), u3_cr_string(syd))); + // uL(fprintf(uH, "sync %s %s\n", u3r_string(hox), u3r_string(syd))); _unix_desk_sync_into(u3k(who), u3k(hox), syd, dis_u); } u3z(hox); @@ -1025,7 +1025,7 @@ static void _unix_hot_gain(u3_noun who, u3_bean mek) { u3_noun hox = u3_dc("scot", 'p', u3k(who)); - c3_c* hox_c = u3_cr_string(hox); + c3_c* hox_c = u3r_string(hox); c3_c* pax_c = _unix_down(u3_Host.cpu_c, hox_c + 1); DIR* rid_u = opendir(pax_c); @@ -1049,7 +1049,7 @@ _unix_hot_gain(u3_noun who, u3_bean mek) _unix_dir_watch(&hot_u->dir_u, 0, pax_c); - u3_cr_mp(hot_u->who_mp, who); + u3r_mp(hot_u->who_mp, who); u3z(who); hot_u->nex_u = u3_Host.unx_u.hot_u; @@ -1071,7 +1071,7 @@ _unix_hot_lose(u3_uhot* hot_u) static u3_udir** _unix_pdir(u3_udir* par_u, u3_noun tet) { - c3_c* tet_c = u3_cr_string(tet); + c3_c* tet_c = u3r_string(tet); c3_w pax_w = strlen(par_u->pax_c); u3_udir** dir_u; @@ -1093,7 +1093,7 @@ _unix_home(u3_noun who) u3_uhot* hot_u; mpz_t who_mp; - u3_cr_mp(who_mp, who); + u3r_mp(who_mp, who); for ( hot_u = unx_u->hot_u; hot_u && (0 != mpz_cmp(who_mp, hot_u->who_mp)); hot_u = hot_u->nex_u ) @@ -1124,7 +1124,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u, c3_c* pux_c = _unix_file_form(dir_u, u3k(pre), c3y, u3k(ext)); u3_ufil** fil_u; - // uL(fprintf(uH, "tofu pox_c %s op %s\n", pox_c, u3_cr_string(u3h(mis)))); + // uL(fprintf(uH, "tofu pox_c %s op %s\n", pox_c, u3r_string(u3h(mis)))); #ifdef SYNCLOG c3_w slot = u3_Host.unx_u.lot_w++ % 1024; @@ -1199,12 +1199,12 @@ _unix_desk_sync_tofu(u3_udir* dir_u, (*fil_u)->pax_c = pax_c; mpz_clear((*fil_u)->mod_mp); - u3_cr_mp((*fil_u)->mod_mp, u3A->now); + u3r_mp((*fil_u)->mod_mp, u3A->now); } else { mpz_t mod_mp; - u3_cr_mp(mod_mp, u3A->now); + u3r_mp(mod_mp, u3A->now); *fil_u = c3_malloc(sizeof(u3_ufil)); _unix_file_watch(*fil_u, dir_u, pax_c, mod_mp); @@ -1226,7 +1226,7 @@ _unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mis) u3_noun i_pax = u3h(pax); u3_noun t_pax = u3t(pax); c3_c* par_u = strrchr(dir_u->pax_c, '/') + 1; - u3_noun pem = u3_ci_string(par_u); + u3_noun pem = u3i_string(par_u); c3_assert( u3_nul == t_pax ); // XX ugly, wrong _unix_desk_sync_tofu(dir_u->par_u, pem, u3k(i_pax), mis); @@ -1280,9 +1280,9 @@ _unix_desk_sync_ergo(u3_noun hox, u3_noun xun; #if 0 - uL(fprintf(uH, "ergo %s %s %s\n", u3_cr_string(hox), - u3_cr_string(syd), - u3_cr_string(lok))); + uL(fprintf(uH, "ergo %s %s %s\n", u3r_string(hox), + u3r_string(syd), + u3r_string(lok))); #endif if ( !*dir_u ) { @@ -1297,7 +1297,7 @@ _unix_desk_sync_ergo(u3_noun hox, { u3_noun bur = _unix_desk_peek(hox, syd, lok); - if ( c3n == u3_cr_sing(xun, bur) ) { + if ( c3n == u3r_sing(xun, bur) ) { u3_noun doz = u3_dc("cost", bur, xun); _unix_desk_sync_soba(*dir_u, doz); @@ -1315,7 +1315,7 @@ u3_unix_ef_init(u3_noun who) { _unix_hot_gain(u3k(who), c3y); - u3_cv_plan(u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul), + u3v_plan(u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul), u3nq(c3__into, who, u3_blip, u3nt(c3y, u3nc(0, 0), u3_nul))); @@ -1363,7 +1363,7 @@ u3_unix_ef_look(void) u3_noun who = u3h(won); mpz_t who_mp; - u3_cr_mp(who_mp, who); + u3r_mp(who_mp, who); for ( hot_u = unx_u->hot_u; hot_u && (0 != mpz_cmp(who_mp, hot_u->who_mp)); hot_u = hot_u->nex_u ); @@ -1385,7 +1385,7 @@ u3_unix_ef_look(void) mpz_t who_mp; c3_w cmp_w; - u3_cr_mp(who_mp, who); + u3r_mp(who_mp, who); cmp_w = mpz_cmp(who_mp, hot_u->who_mp); mpz_clear(who_mp); if ( 0 == cmp_w ) { diff --git a/v/walk.c b/v/walk.c index f54630d8f1..c767a38a19 100644 --- a/v/walk.c +++ b/v/walk.c @@ -33,7 +33,7 @@ static u3_noun _walk_ok(u3_noun nod) { - u3_noun don = u3_cn_mung(u3k(u2A->toy.arch), u3k(nod)); + u3_noun don = u3n_mung(u3k(u2A->toy.arch), u3k(nod)); if ( c3n == u3_sing(nod, don) ) { c3_assert(0); @@ -68,7 +68,7 @@ u3_walk_safe(c3_c* pas_c) return 0; } else { - u3_noun pad = u3_ci_bytes(fln_w, (c3_y *)pad_y); + u3_noun pad = u3i_bytes(fln_w, (c3_y *)pad_y); free(pad_y); return pad; @@ -87,7 +87,7 @@ u3_walk_load(c3_c* pas_c) if ( (fid_i < 0) || (fstat(fid_i, &buf_b) < 0) ) { uL(fprintf(uH, "%s: %s\n", pas_c, strerror(errno))); - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } fln_w = buf_b.st_size; pad_y = c3_malloc(buf_b.st_size); @@ -97,10 +97,10 @@ u3_walk_load(c3_c* pas_c) if ( fln_w != red_w ) { free(pad_y); - return u3_cm_bail(c3__fail); + return u3m_bail(c3__fail); } else { - u3_noun pad = u3_ci_bytes(fln_w, (c3_y *)pad_y); + u3_noun pad = u3i_bytes(fln_w, (c3_y *)pad_y); free(pad_y); return pad; @@ -118,12 +118,12 @@ u3_walk_save(c3_c* pas_c, u3_noun tim, u3_atom pad) if ( fid_i < 0 ) { uL(fprintf(uH, "%s: %s\n", pas_c, strerror(errno))); - u3_cm_bail(c3__fail); + u3m_bail(c3__fail); } - fln_w = u3_cr_met(3, pad); + fln_w = u3r_met(3, pad); pad_y = c3_malloc(fln_w); - u3_cr_bytes(0, fln_w, pad_y, pad); + u3r_bytes(0, fln_w, pad_y, pad); u3z(pad); rit_w = write(fid_i, pad_y, fln_w); @@ -132,7 +132,7 @@ u3_walk_save(c3_c* pas_c, u3_noun tim, u3_atom pad) if ( rit_w != fln_w ) { uL(fprintf(uH, "%s: %s\n", pas_c, strerror(errno))); - u3_cm_bail(c3__fail); + u3m_bail(c3__fail); } if ( 0 != tim ) { @@ -197,8 +197,8 @@ _walk_in(const c3_c* dir_c, c3_w len_w) nam_c[dot_c - fil_c] = 0; { - u3_noun nam = u3_ci_string(nam_c); - u3_noun ext = u3_ci_string(ext_c); + u3_noun nam = u3i_string(nam_c); + u3_noun ext = u3i_string(ext_c); u3_noun get = u3_ckdb_get(u3k(map), u3k(nam)); u3_noun dat = u3_walk_load(pat_c); u3_noun hax; @@ -220,7 +220,7 @@ _walk_in(const c3_c* dir_c, c3_w len_w) if ( u3_nul != dir ) { map = u3_ckdb_put - (map, u3_ci_string(fil_c), u3nc(c3n, dir)); + (map, u3i_string(fil_c), u3nc(c3n, dir)); } else u3z(tim); } @@ -244,7 +244,7 @@ u3_walk(const c3_c* dir_c, u3_noun old) if ( 0 != stat(dir_c, &buf_b) ) { uL(fprintf(uH, "can't stat %s\n", dir_c)); - // return u3_cm_bail(c3__fail); + // return u3m_bail(c3__fail); c3_assert(0); } else { @@ -269,7 +269,7 @@ u3_path(u3_bean fyl, u3_noun pax) u3_noun wiz = pax; while ( u3_nul != wiz ) { - len_w += (1 + u3_cr_met(3, u3h(wiz))); + len_w += (1 + u3r_met(3, u3h(wiz))); wiz = u3t(wiz); } } @@ -284,13 +284,13 @@ u3_path(u3_bean fyl, u3_noun pax) c3_c* waq_c = (pas_c + strlen(pas_c)); while ( u3_nul != wiz ) { - c3_w tis_w = u3_cr_met(3, u3h(wiz)); + c3_w tis_w = u3r_met(3, u3h(wiz)); if ( (c3y == fyl) && (u3_nul == u3t(wiz)) ) { *waq_c++ = '.'; } else *waq_c++ = '/'; - u3_cr_bytes(0, tis_w, (c3_y*)waq_c, u3h(wiz)); + u3r_bytes(0, tis_w, (c3_y*)waq_c, u3h(wiz)); waq_c += tis_w; wiz = u3t(wiz); From 5d6d7afb15c0f38aab97f9cc07db6c1f353a7342 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 5 Nov 2014 17:32:33 -0800 Subject: [PATCH 09/14] Moar renaming. --- g/m.c | 2 +- g/r.c | 54 +++++++------- g/t.c | 6 +- g/v.c | 16 ++--- g/z.c | 16 ++--- i/all.h | 196 ++++++++++++++++++++++++++++++++------------------ i/g/a.h | 33 --------- i/g/j.h | 2 +- i/g/r.h | 50 ++++++------- i/g/v.h | 6 +- i/g/z.h | 16 ++--- i/j/k.h | 6 +- i/j/q.h | 10 +-- i/j/w.h | 6 +- i/v/vere.h | 80 ++++++++++----------- j/1/gte.c | 2 +- j/1/gth.c | 2 +- j/1/lte.c | 5 +- j/1/lth.c | 2 +- j/4/by_has.c | 13 ++-- j/4/in_has.c | 6 +- j/5/loss.c | 10 +-- j/5/parse.c | 2 +- j/5/tape.c | 2 +- j/6/fitz.c | 2 +- j/6/ut_conk.c | 4 +- j/6/ut_cull.c | 8 +-- j/6/ut_fire.c | 6 +- j/6/ut_mint.c | 8 +-- j/6/ut_mull.c | 8 +-- j/6/ut_nest.c | 58 +++++++-------- j/6/ut_park.c | 2 +- j/6/ut_rest.c | 2 +- v/ames.c | 8 +-- v/cttp.c | 12 ++-- v/http.c | 6 +- v/loop.c | 22 +++--- v/main.c | 4 +- v/raft.c | 10 +-- v/reck.c | 22 +++--- v/sist.c | 40 +++++------ v/term.c | 14 ++-- v/unix.c | 50 ++++++------- v/walk.c | 4 +- 44 files changed, 429 insertions(+), 404 deletions(-) diff --git a/g/m.c b/g/m.c index 7d528eea0a..fab87979ee 100644 --- a/g/m.c +++ b/g/m.c @@ -979,7 +979,7 @@ u3m_soft(c3_w sec_w, cod = u3k(u3h(u3t(why))); tax = u3k(u3t(u3t(why))); } - mok = u3_dc("mook", 2, tax); + mok = u3dc("mook", 2, tax); pro = u3nc(cod, u3k(u3t(mok))); u3z(mok); diff --git a/g/r.c b/g/r.c index 018fe0797c..160148acba 100644 --- a/g/r.c +++ b/g/r.c @@ -123,7 +123,7 @@ u3r_at(u3_atom a, return cut_t ? cut_w : i_w; } - static u3_bean + static c3_o _mean_extract(u3_noun som, c3_w len_w, struct _mean_pair* prs_m) @@ -148,7 +148,7 @@ u3r_at(u3_atom a, } } -u3_bean +c3_o u3r_mean(u3_noun som, ...) { @@ -533,7 +533,7 @@ _sung_one(u3_noun* a, u3_noun* b) /* _sung_x(): yes if a and b are the same noun, unifying. */ -static u3_bean +static c3_o _sung_x(u3_noun a, u3_noun b) { if ( a == b ) { @@ -618,7 +618,7 @@ _sung_x(u3_noun a, u3_noun b) ** ** Yes iff (a) and (b) are the same noun. */ -static u3_bean +static c3_o _sing_x(u3_noun a, u3_noun b) { @@ -699,7 +699,7 @@ _sing_x(u3_noun a, ** ** Yes iff (a) and (b) are the same noun. */ -u3_bean +c3_o u3r_sing(u3_noun a, u3_noun b) { @@ -708,14 +708,14 @@ u3r_sing(u3_noun a, /* u3r_sung(): yes iff (a) and (b) are the same noun, unifying equals. */ -u3_bean +c3_o u3r_sung(u3_noun a, u3_noun b) { return _sung_x(a, b); } -u3_bean +c3_o u3r_fing(u3_noun a, u3_noun b) { @@ -726,7 +726,7 @@ u3r_fing(u3_noun a, ** ** Yes iff `[p q]` and `b` are the same noun. */ -u3_bean +c3_o u3r_sing_cell(u3_noun p, u3_noun q, u3_noun b) @@ -735,7 +735,7 @@ u3r_sing_cell(u3_noun p, c3a(u3r_sing(p, u3a_h(b)), u3r_sing(q, u3a_t(b)))); } -u3_bean +c3_o u3r_fing_cell(u3_noun p, u3_noun q, u3_noun b) @@ -749,7 +749,7 @@ u3r_fing_cell(u3_noun p, ** ** Yes iff `[p q]` and `b` are the same noun. */ -u3_bean +c3_o u3r_sing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) @@ -758,7 +758,7 @@ u3r_sing_mixt(const c3_c* p_c, c3a(u3r_sing_c(p_c, u3a_h(b)), u3r_sing(q, u3a_t(b)))); } -u3_bean +c3_o u3r_fing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) @@ -772,7 +772,7 @@ u3r_fing_mixt(const c3_c* p_c, ** ** Yes iff `[p q r]` and `b` are the same noun. */ -u3_bean +c3_o u3r_sing_trel(u3_noun p, u3_noun q, u3_noun r, @@ -782,7 +782,7 @@ u3r_sing_trel(u3_noun p, c3a(u3r_sing(p, u3a_h(b)), u3r_sing_cell(q, r, u3a_t(b)))); } -u3_bean +c3_o u3r_fing_trel(u3_noun p, u3_noun q, u3_noun r, @@ -797,7 +797,7 @@ u3r_fing_trel(u3_noun p, ** ** Yes iff `[p q r]` and `b` are the same noun. */ -u3_bean +c3_o u3r_sing_qual(u3_noun p, u3_noun q, u3_noun r, @@ -808,7 +808,7 @@ u3r_sing_qual(u3_noun p, c3a(u3r_sing(p, u3a_h(b)), u3r_sing_trel(q, r, s, u3a_t(b)))); } -u3_bean +c3_o u3r_fing_qual(u3_noun p, u3_noun q, u3_noun r, @@ -893,7 +893,7 @@ u3r_nord(u3_noun a, ** ** Yes iff (b) is the same noun as the C string a_c. */ -u3_bean +c3_o u3r_sing_c(const c3_c* a_c, u3_noun b) { @@ -922,7 +922,7 @@ u3r_sing_c(const c3_c* a_c, ** ** Factor [a] as a bush [b.[p q] c]. */ -u3_bean +c3_o u3r_bush(u3_noun a, u3_noun* b, u3_noun* c) @@ -948,7 +948,7 @@ u3r_bush(u3_noun a, ** ** Factor (a) as a cell (b c). */ -u3_bean +c3_o u3r_cell(u3_noun a, u3_noun* b, u3_noun* c) @@ -969,7 +969,7 @@ u3r_cell(u3_noun a, ** ** & [0] if [a] is of the form [b *c]. */ -u3_bean +c3_o u3r_p(u3_noun a, u3_noun b, u3_noun* c) @@ -989,7 +989,7 @@ u3r_p(u3_noun a, ** ** & [0] if [a] is of the form [b *c d]. */ -u3_bean +c3_o u3r_pq(u3_noun a, u3_noun b, u3_noun* c, @@ -1009,7 +1009,7 @@ u3r_pq(u3_noun a, ** ** & [0] if [a] is of the form [b *c *d *e]. */ -u3_bean +c3_o u3r_pqr(u3_noun a, u3_noun b, u3_noun* c, @@ -1030,7 +1030,7 @@ u3r_pqr(u3_noun a, ** ** & [0] if [a] is of the form [b *c *d *e *f]. */ -u3_bean +c3_o u3r_pqrs(u3_noun a, u3_noun b, u3_noun* c, @@ -1052,7 +1052,7 @@ u3r_pqrs(u3_noun a, ** ** Factor (a) as a trel (b c d). */ -u3_bean +c3_o u3r_trel(u3_noun a, u3_noun *b, u3_noun *c, @@ -1073,7 +1073,7 @@ u3r_trel(u3_noun a, ** ** Factor (a) as a qual (b c d e). */ -u3_bean +c3_o u3r_qual(u3_noun a, u3_noun* b, u3_noun* c, @@ -1093,7 +1093,7 @@ u3r_qual(u3_noun a, ** ** Factor (a) as a quil (b c d e f). */ -u3_bean +c3_o u3r_quil(u3_noun a, u3_noun* b, u3_noun* c, @@ -1114,7 +1114,7 @@ u3r_quil(u3_noun a, ** ** Factor (a) as a hext (b c d e f g) */ -u3_bean +c3_o u3r_hext(u3_noun a, u3_noun* b, u3_noun* c, @@ -1580,7 +1580,7 @@ u3_mur(u3_noun veb) return mur_w; } - if ( u3_dog_is_pom(veb) ) { + if ( u3dog_is_pom(veb) ) { mur_w = u3_mur_both(u3_mur(u3h(veb)), u3_mur(u3t(veb))); } else { diff --git a/g/t.c b/g/t.c index 2237a7c011..8b31479d64 100644 --- a/g/t.c +++ b/g/t.c @@ -64,7 +64,7 @@ u3t_heck(u3_atom cog) if ( 0 == u3R->pro.day ) { u3R->pro.day = u3v_do("doss", 0); } - u3R->pro.day = u3_dc("pi-heck", cog, u3R->pro.day); + u3R->pro.day = u3dc("pi-heck", cog, u3R->pro.day); } /* u3t_samp(): sample. @@ -74,7 +74,7 @@ u3t_samp(void) { if ( 0 == u3R->pro.day ) { u3R->pro.day = u3v_do("doss", 0); } - u3R->pro.day = u3_dc("pi-noon", u3k(u3R->pro.don), u3R->pro.day); + u3R->pro.day = u3dc("pi-noon", u3k(u3R->pro.don), u3R->pro.day); } /* u3t_come(): push on profile stack. @@ -107,7 +107,7 @@ void u3t_damp(void) { if ( 0 != u3R->pro.day ) { - u3_noun wol = u3_do("pi-tell", u3R->pro.day); + u3_noun wol = u3do("pi-tell", u3R->pro.day); u3m_wall(wol); u3R->pro.day = u3v_do("doss", 0); diff --git a/g/v.c b/g/v.c index a0c7e5a61e..bf05b239a0 100644 --- a/g/v.c +++ b/g/v.c @@ -218,7 +218,7 @@ _cv_nock_poke(u3_noun ovo) #if 0 { c3_c* ovi_c = u3r_string(u3h(u3t(ovo))); - u3_noun tox = u3_do("spat", u3k(u3h(ovo))); + u3_noun tox = u3do("spat", u3k(u3h(ovo))); c3_c* tox_c = u3r_string(tox); printf("poke: %%%s (%x) on %s\r\n", ovi_c, u3r_mug(ovo), tox_c); @@ -292,7 +292,7 @@ u3v_do(const c3_c* txt_c, u3_noun sam) static u3_noun _cv_scot(u3_noun dim) { - return u3_do("scot", dim); + return u3do("scot", dim); } /* u3v_time(): set the reck time. @@ -348,12 +348,12 @@ u3v_keep(u3_noun hap) #if 0 /* _cv_mole(): parse simple atomic mole. */ -static u3_bean +static c3_o _cv_mole(u3_noun fot, u3_noun san, c3_d* ato_d) { - u3_noun uco = u3_do("slay", san); + u3_noun uco = u3do("slay", san); u3_noun p_uco, q_uco, r_uco, s_uco; if ( (c3n == u3r_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || @@ -374,7 +374,7 @@ _cv_mole(u3_noun fot, /* _cv_lily(): parse little atom. */ -static u3_bean +static c3_o _cv_lily(u3_noun fot, u3_noun txt, c3_l* tid_l) { c3_d ato_d; @@ -404,7 +404,7 @@ u3v_poke(u3_noun ovo) /* u3v_http_request(): hear http request on channel (unprotected). */ void -u3v_http_request(u3_bean sec, u3_noun pox, u3_noun req) +u3v_http_request(c3_o sec, u3_noun pox, u3_noun req) { // uL(fprintf(uH, "http: request\n")); u3v_plan(pox, u3nq(c3__this, sec, 0, req)); @@ -432,7 +432,7 @@ u3v_punt(u3_noun blu, c3_l tab_l, u3_noun tac) // We are calling nock here, but hopefully need no protection. // while ( c3y == u3r_du(cat) ) { - u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); + u3_noun wol = u3dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); u3m_wall(wol); cat = u3t(cat); @@ -446,7 +446,7 @@ u3v_punt(u3_noun blu, c3_l tab_l, u3_noun tac) void u3v_sway(u3_noun blu, c3_l tab_l, u3_noun tax) { - u3_noun mok = u3_dc("mook", 2, tax); + u3_noun mok = u3dc("mook", 2, tax); u3v_punt(blu, tab_l, u3k(u3t(mok))); u3z(mok); diff --git a/g/z.c b/g/z.c index 004773d7f1..7d56d2d71b 100644 --- a/g/z.c +++ b/g/z.c @@ -7,7 +7,7 @@ /* u3z_find(): find in memo cache. Arguments retained. */ u3_weak -u3z_find(u3_mote fun, u3_noun one) +u3z_find(c3_m fun, u3_noun one) { u3_noun key = u3nc(fun, u3k(one)); u3_noun val; @@ -17,7 +17,7 @@ u3z_find(u3_mote fun, u3_noun one) return val; } u3_weak -u3z_find_2(u3_mote fun, u3_noun one, u3_noun two) +u3z_find_2(c3_m fun, u3_noun one, u3_noun two) { u3_noun key = u3nt(fun, u3k(one), u3k(two)); u3_noun val; @@ -27,7 +27,7 @@ u3z_find_2(u3_mote fun, u3_noun one, u3_noun two) return val; } u3_weak -u3z_find_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri) +u3z_find_3(c3_m fun, u3_noun one, u3_noun two, u3_noun tri) { u3_noun key = u3nq(fun, u3k(one), u3k(two), u3k(tri)); u3_noun val; @@ -37,7 +37,7 @@ u3z_find_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri) return val; } u3_weak -u3z_find_4(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun qua) +u3z_find_4(c3_m fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun qua) { u3_noun key = u3nc(fun, u3nq(u3k(one), u3k(two), u3k(tri), u3k(qua))); u3_noun val; @@ -50,7 +50,7 @@ u3z_find_4(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun qua) /* u3z_save*(): save in memo cache. */ u3_noun -u3z_save(u3_mote fun, u3_noun one, u3_noun val) +u3z_save(c3_m fun, u3_noun one, u3_noun val) { u3_noun key = u3nc(fun, u3k(one)); @@ -59,7 +59,7 @@ u3z_save(u3_mote fun, u3_noun one, u3_noun val) return val; } u3_noun -u3z_save_2(u3_mote fun, u3_noun one, u3_noun two, u3_noun val) +u3z_save_2(c3_m fun, u3_noun one, u3_noun two, u3_noun val) { u3_noun key = u3nt(fun, u3k(one), u3k(two)); @@ -68,7 +68,7 @@ u3z_save_2(u3_mote fun, u3_noun one, u3_noun two, u3_noun val) return val; } u3_noun -u3z_save_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun val) +u3z_save_3(c3_m fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun val) { u3_noun key = u3nq(fun, u3k(one), u3k(two), u3k(tri)); @@ -77,7 +77,7 @@ u3z_save_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun val) return val; } u3_noun -u3z_save_4(u3_mote fun, +u3z_save_4(c3_m fun, u3_noun one, u3_noun two, u3_noun tri, diff --git a/i/all.h b/i/all.h index 640d7aef36..98a00f9966 100644 --- a/i/all.h +++ b/i/all.h @@ -4,24 +4,24 @@ */ /** Prefix definitions: *** - *** u3_ca_: fundamental allocators. - *** u3_cc_: constants. - *** u3_ce_: checkpointing. - *** u3_ch_: HAMT hash tables. - *** u3_ci_: noun constructors - *** u3_cj_: jets. - *** u3_ck*: direct jet calls (modern C convention) - *** u3_cm_: system management etc. - *** u3_cn_: nock interpreter. - *** u3_co_: fundamental macros. - *** u3_cq*: direct jet calls (archaic C convention) - *** u3_cr_: read functions which never bail out. - *** u3_cs_: structures and definitions. - *** u3_ct_: tracing. - *** u3_cw_: direct jet calls (core noun convention) - *** u3_cx_: read functions which do bail out. - *** u3_cv_: arvo specific structures. - *** u3_cz_: memoization. + *** u3a_: fundamental allocators. + *** u3c_: constants. + *** u3e_: checkpointing. + *** u3h_: HAMT hash tables. + *** u3i_: noun constructors + *** u3j_: jets. + *** u3k*: direct jet calls (modern C convention) + *** u3m_: system management etc. + *** u3n_: nock interpreter. + *** u3o_: fundamental macros. + *** u3q*: direct jet calls (archaic C convention) + *** u3r_: read functions which never bail out. + *** u3s_: structures and definitions. + *** u3t_: tracing. + *** u3w_: direct jet calls (core noun convention) + *** u3x_: read functions which do bail out. + *** u3v_: arvo specific structures. + *** u3z_: memoization. *** *** u3_cr_, u3_cx_, u3_cz_ functions use retain conventions; the caller *** retains ownership of passed-in nouns, the callee preserves @@ -35,60 +35,120 @@ *** when we're using a noun as a key. **/ - /** c: the c3 layer, C portability and definitions. - **/ -# include "c/portable.h" -# include "c/types.h" -# include "c/defs.h" -# include "c/motes.h" - - /** miscellaneous definitions and data structures. - **/ - /* u3_yes, u3_no, u3_nul; - ** - ** Our Martian booleans and list terminator; empty string; not a noun. - */ -# define u3_nul 0 -# define u3_blip 0 - - /* Tools for Martian booleans. - */ -# define u3_assure(x) if ( !_(x) ) { u3m_bail(c3__fail); } -# define u3_assent(x) if ( !_(x) ) { u3m_bail(c3__exit); } - - - /** Aliases - selective and syntactically unique. + /** c3: C portability and definitions. **/ -# define u3h(som) u3x_h(som) -# define u3t(som) u3x_t(som) -# define u3at(axe, som) u3x_at(axe, som) +# include "c/portable.h" +# include "c/types.h" +# include "c/defs.h" +# include "c/motes.h" -# define u3nc(a, b) u3i_cell(a, b) -# define u3nt(a, b, c) u3i_trel(a, b, c) -# define u3nq(a, b, c, d) u3i_qual(a, b, c, d) - -# define u3du(som) (u3r_du(som)) -# define u3ud(som) (u3r_ud(som)) - -# define u3k(som) u3a_gain(som) -# define u3z(som) u3a_lose(som) - - /** Arvo macros. + /** u3: general definitions and irregular forms.. **/ -# define u3_do(txt_c, arg) u3v_do(txt_c, arg) -# define u3_dc(txt_c, a, b) u3v_do(txt_c, u3nc(a, b)) -# define u3_dt(txt_c, a, b, c) u3v_do(txt_c, u3nt(a, b, c)) -# define u3_dq(txt_c, a, b, c, d) u3v_do(txt_c, u3nt(a, b, c, d)) - - /** g: the u3 layer, functions. + /** Typedefs. **/ -# include "g/a.h" -# include "g/e.h" -# include "g/h.h" -# include "g/i.h" -# include "g/j.h" -# include "g/m.h" -# include "g/n.h" + /* u3_post: pointer offset into u3_Loom; _p suffix; declare as u3p(). + */ + typedef c3_w u3_post; +# define u3p(type) u3_post + + /* u3_noun: tagged noun pointer. + ** + ** If bit 31 is 0, a u3_noun is a direct 31-bit atom ("cat"). + ** If bit 31 is 1 and bit 30 0, an indirect atom ("pug"). + ** If bit 31 is 1 and bit 30 1, an indirect cell ("pom"). + ** + ** Bits 0-29 are a word offset against u3_Loom (u3_post). + */ + typedef c3_w u3_noun; + + /* u3_weak: u3_noun which may be u3_none (not a noun). + */ + typedef u3_noun u3_weak; + + /* u3_atom: u3_noun which must be an atom. + */ + typedef u3_noun u3_atom; + + /* u3_term: u3_noun which must be a term (@tas). + */ + typedef u3_noun u3_term; // @tas + + /* u3_cell, u3_trel, u3_qual, u3_quin: cell, triple, quad, quint + */ + typedef u3_noun u3_cell; // must be cell + typedef u3_noun u3_trel; // must be triple + typedef u3_noun u3_qual; // must be quadruple + typedef u3_noun u3_quin; // must be quintuple + + /* u3_funk, u3_funq: unary and binary noun functions. + */ + typedef u3_noun (*u3_funk)(u3_noun); + typedef u3_noun (*u3_funq)(u3_noun, u3_noun); + + /** Constants. + **/ + /* u3_none - u3_noun which is not a noun. + */ +# define u3_none (u3_noun)0xffffffff + + /* u3_nul: 0, hoon ~. + */ +# define u3_nul 0 + + /* u3_blip: 0, hoon %$. + */ +# define u3_blip 0 + + /** Macros. + **/ + /* u3_assure(): loobean assert, bailing with %fail. + */ +# define u3_assure(x) if ( !_(x) ) { u3m_bail(c3__fail); } + + /* u3_assert(): loobean assert, bailing with %exit. + */ +# define u3_assent(x) if ( !_(x) ) { u3m_bail(c3__exit); } + + /** Aliases. + **/ + /* u3h(), u3t(), u3at(): noun fragments. + */ +# define u3h(som) u3x_h(som) +# define u3t(som) u3x_t(som) +# define u3at(axe, som) u3x_at(axe, som) + + /* u3nc(), u3nt(), u3nq(): tuple composition. + */ +# define u3nc(a, b) u3i_cell(a, b) +# define u3nt(a, b, c) u3i_trel(a, b, c) +# define u3nq(a, b, c, d) u3i_qual(a, b, c, d) + + /* u3du(), u3ud(): noun/cell test. + */ +# define u3du(som) (u3r_du(som)) +# define u3ud(som) (u3r_ud(som)) + + /* u3k(), u3z(): reference counts. + */ +# define u3k(som) u3a_gain(som) +# define u3z(som) u3a_lose(som) + + /* u3do(), u3dc(), u3dt(), u3dq(): arvo calls. + */ +# define u3do(txt_c, arg) u3v_do(txt_c, arg) +# define u3dc(txt_c, a, b) u3v_do(txt_c, u3nc(a, b)) +# define u3dt(txt_c, a, b, c) u3v_do(txt_c, u3nt(a, b, c)) +# define u3dq(txt_c, a, b, c, d) u3v_do(txt_c, u3nt(a, b, c, d)) + + /** Includes. + **/ +# include "g/a.h" // allocation +# include "g/e.h" // persistence +# include "g/h.h" // hashtables +# include "g/i.h" // noun construction +# include "g/j.h" // jet control +# include "g/m.h" // master state +# include "g/n.h" // nock computation # include "g/r.h" # include "g/t.h" # include "g/x.h" diff --git a/i/g/a.h b/i/g/a.h index 8892b512cc..2b3d1b906f 100644 --- a/i/g/a.h +++ b/i/g/a.h @@ -19,39 +19,6 @@ /** Data structures. **/ - /* u3_post: pointer offset into u3_Loom; _p suffix; declare as u3p(). - */ - typedef c3_w u3_post; -# define u3p(type) u3_post - - /* u3_noun: tagged pointer. - ** - ** If bit 31 is 0, a u3_noun is a direct 31-bit atom ("cat"). - ** If bit 31 is 1 and bit 30 0, an indirect atom ("pug"). - ** If bit 31 is 1 and bit 30 1, an indirect cell ("pom"). - ** - ** Bits 0-29 are a word offset against u3_Loom (u3_post). - */ - typedef c3_w u3_noun; - - /* u3_none - out-of-band noun. - */ -# define u3_none (u3_noun)0xffffffff - - /* Informative typedefs. Use if you like. - */ - typedef u3_noun u3_atom; // must be atom - typedef u3_noun u3_term; // @tas - typedef u3_noun u3_mote; // @tas - typedef u3_noun u3_cell; // must be cell - typedef u3_noun u3_trel; // must be triple - typedef u3_noun u3_qual; // must be quadruple - typedef u3_noun u3_quin; // must be quintuple - typedef u3_noun u3_bean; // loobean: 0 == c3y, 1 == c3n - typedef u3_noun u3_weak; // may be u3_none - typedef u3_noun (*u3_funk)(u3_noun); - typedef u3_noun (*u3_funq)(u3_noun, u3_noun); - /** Typedefs. **/ /* u3_atom, u3_cell: logical atom and cell structures. diff --git a/i/g/j.h b/i/g/j.h index 60ea0099d9..8db977c109 100644 --- a/i/g/j.h +++ b/i/g/j.h @@ -67,7 +67,7 @@ typedef struct _u3e_harm { c3_c* fcs_c; // `.axe` or name u3_noun (*fun_f)(u3_noun); // compute or 0 / semitransfer - // u3_bean (*val_f)(u3_noun); // validate or 0 / retain + // c3_o (*val_f)(u3_noun); // validate or 0 / retain c3_o ice; // perfect (don't test) c3_o tot; // total (never punts) c3_o liv; // live (enabled) diff --git a/i/g/r.h b/i/g/r.h index a089031f18..2f327858f1 100644 --- a/i/g/r.h +++ b/i/g/r.h @@ -10,12 +10,12 @@ #else /* u3r_du(): c3y iff `a` is cell. */ - u3_bean + c3_o u3r_du(u3_noun a); /* u3r_ud(): c3n iff `a` is cell. */ - u3_bean + c3_o u3r_ud(u3_noun a); #endif @@ -30,7 +30,7 @@ ** Attempt to deconstruct `a` by axis, noun pairs; 0 terminates. ** Axes must be sorted in tree order. */ - u3_bean + c3_o u3r_mean(u3_noun a, ...); @@ -96,7 +96,7 @@ ** Yes iff (a) and (b) are the same copy of the same noun. ** (Ie, by pointer equality - u3r_sing with false negatives.) */ - u3_bean + c3_o u3r_fing(u3_noun a, u3_noun b); @@ -104,7 +104,7 @@ ** ** Yes iff `[p q]` and `b` are the same copy of the same noun. */ - u3_bean + c3_o u3r_fing_cell(u3_noun p, u3_noun q, u3_noun b); @@ -113,7 +113,7 @@ ** ** Yes iff `[p q]` and `b` are the same copy of the same noun. */ - u3_bean + c3_o u3r_fing_mixt(const c3_c* p_c, u3_noun q, u3_noun b); @@ -122,7 +122,7 @@ ** ** Yes iff `[p q r]` and `b` are the same copy of the same noun. */ - u3_bean + c3_o u3r_fing_trel(u3_noun p, u3_noun q, u3_noun r, @@ -132,7 +132,7 @@ ** ** Yes iff `[p q r s]` and `b` are the same copy of the same noun. */ - u3_bean + c3_o u3r_fing_qual(u3_noun p, u3_noun q, u3_noun r, @@ -143,7 +143,7 @@ ** ** Yes iff (a) and (b) are the same noun. */ - u3_bean + c3_o u3r_sing(u3_noun a, u3_noun b); @@ -152,7 +152,7 @@ ** Make sure you have no live, uncounted pointers to any noun ** within (a) or (b)! */ - u3_bean + c3_o u3r_sung(u3_noun a, u3_noun b); @@ -160,7 +160,7 @@ ** ** Yes iff (b) is the same noun as the C string [a]. */ - u3_bean + c3_o u3r_sing_c(const c3_c* a_c, u3_noun b); @@ -168,7 +168,7 @@ ** ** Yes iff `[p q]` and `b` are the same noun. */ - u3_bean + c3_o u3r_sing_cell(u3_noun p, u3_noun q, u3_noun b); @@ -177,7 +177,7 @@ ** ** Yes iff `[p q]` and `b` are the same noun. */ - u3_bean + c3_o u3r_sing_mixt(const c3_c* p_c, u3_noun q, u3_noun b); @@ -186,7 +186,7 @@ ** ** Yes iff `[p q r]` and `b` are the same noun. */ - u3_bean + c3_o u3r_sing_trel(u3_noun p, u3_noun q, u3_noun r, @@ -196,7 +196,7 @@ ** ** Yes iff `[p q r s]` and `b` are the same noun. */ - u3_bean + c3_o u3r_sing_qual(u3_noun p, u3_noun q, u3_noun r, @@ -215,7 +215,7 @@ ** ** Divide `a` as a mold `[b.[p q] c]`. */ - u3_bean + c3_o u3r_mold(u3_noun a, u3_noun* b, u3_noun* c); @@ -224,7 +224,7 @@ ** ** Divide `a` as a cell `[b c]`. */ - u3_bean + c3_o u3r_cell(u3_noun a, u3_noun* b, u3_noun* c); @@ -233,7 +233,7 @@ ** ** Divide `a` as a trel `[b c]`. */ - u3_bean + c3_o u3r_trel(u3_noun a, u3_noun* b, u3_noun* c, @@ -243,7 +243,7 @@ ** ** Divide (a) as a qual [b c d e f]. */ - u3_bean + c3_o u3r_qual(u3_noun a, u3_noun* b, u3_noun* c, @@ -254,7 +254,7 @@ ** ** Divide (a) as a quil [b c d e f]. */ - u3_bean + c3_o u3r_quil(u3_noun a, u3_noun* b, u3_noun* c, @@ -266,7 +266,7 @@ ** ** & [0] if [a] is of the form [b *c]. */ - u3_bean + c3_o u3r_p(u3_noun a, u3_noun b, u3_noun* c); @@ -275,7 +275,7 @@ ** ** Factor [a] as a bush [b.[p q] c]. */ - u3_bean + c3_o u3r_bush(u3_noun a, u3_noun* b, u3_noun* c); @@ -284,7 +284,7 @@ ** ** & [0] if [a] is of the form [b *c d]. */ - u3_bean + c3_o u3r_pq(u3_noun a, u3_noun b, u3_noun* c, @@ -294,7 +294,7 @@ ** ** & [0] if [a] is of the form [b *c *d *e]. */ - u3_bean + c3_o u3r_pqr(u3_noun a, u3_noun b, u3_noun* c, @@ -305,7 +305,7 @@ ** ** & [0] if [a] is of the form [b *c *d *e *f]. */ - u3_bean + c3_o u3r_pqrs(u3_noun a, u3_noun b, u3_noun* c, diff --git a/i/g/v.h b/i/g/v.h index 5d04728313..ead6a36765 100644 --- a/i/g/v.h +++ b/i/g/v.h @@ -10,8 +10,8 @@ typedef struct _u3v_cart { u3_noun vir; // effects of ovum - u3_bean did; // cart considered for commit? - u3_bean cit; // cart committed? + c3_o did; // cart considered for commit? + c3_o cit; // cart committed? c3_d ent_d; // entry in raft queue? u3p(struct _u3v_cart) nex_p; } u3v_cart; @@ -130,7 +130,7 @@ /* u3v_http_request(): hear http request on channel (unprotected). */ void - u3v_http_request(u3_bean sec, u3_noun pox, u3_noun req); + u3v_http_request(c3_o sec, u3_noun pox, u3_noun req); /* u3v_tank(): dump single tank. */ diff --git a/i/g/z.h b/i/g/z.h index e645d71f1c..fca7f6297e 100644 --- a/i/g/z.h +++ b/i/g/z.h @@ -14,18 +14,18 @@ **/ /* u3z_find*(): find in memo cache. */ - u3_weak u3z_find(u3_mote, u3_noun); - u3_weak u3z_find_2(u3_mote, u3_noun, u3_noun); - u3_weak u3z_find_3(u3_mote, u3_noun, u3_noun, u3_noun); - u3_weak u3z_find_4(u3_mote, u3_noun, u3_noun, u3_noun, u3_noun); + u3_weak u3z_find(c3_m, u3_noun); + u3_weak u3z_find_2(c3_m, u3_noun, u3_noun); + u3_weak u3z_find_3(c3_m, u3_noun, u3_noun, u3_noun); + u3_weak u3z_find_4(c3_m, u3_noun, u3_noun, u3_noun, u3_noun); /* u3z_save*(): save in memo cache. */ - u3_noun u3z_save(u3_mote, u3_noun, u3_noun); - u3_noun u3z_save_2(u3_mote, u3_noun, u3_noun, u3_noun); - u3_noun u3z_save_3(u3_mote, u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3z_save(c3_m, u3_noun, u3_noun); + u3_noun u3z_save_2(c3_m, u3_noun, u3_noun, u3_noun); + u3_noun u3z_save_3(c3_m, u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3z_save_4 - (u3_mote, u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); + (c3_m, u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); /* u3z_uniq(): uniquify with memo cache. */ diff --git a/i/j/k.h b/i/j/k.h index a943a18ebb..c7a5fcae87 100644 --- a/i/j/k.h +++ b/i/j/k.h @@ -8,7 +8,7 @@ u3_noun u3_cka_sub(u3_noun a, u3_noun b); u3_noun u3_cka_mul(u3_noun a, u3_noun b); u3_noun u3_cka_gth(u3_noun a, u3_noun b); - u3_bean u3_cka_lte(u3_noun a, u3_noun b); + c3_o u3_cka_lte(u3_noun a, u3_noun b); /** Tier 2. **/ @@ -47,7 +47,7 @@ /* u3_ckdb_has(): test for get. */ - u3_bean + c3_o u3_ckdb_has(u3_noun a, u3_noun b); /* u3_ckdb_gas(): list to map. @@ -62,7 +62,7 @@ /* u3_ckdi_has(): test for presence. */ - u3_bean + c3_o u3_ckdi_has(u3_noun a, u3_noun b); /* u3_ckdi_tap(): map/set convert to list. (solves by_tap also.) diff --git a/i/j/q.h b/i/j/q.h index badff07f3e..5003ad22e3 100644 --- a/i/j/q.h +++ b/i/j/q.h @@ -64,14 +64,14 @@ **/ u3_noun u3_cqdb_gas(u3_noun, u3_noun); u3_noun u3_cqdb_get(u3_noun, u3_noun); - u3_bean u3_cqdb_has(u3_noun, u3_noun); + c3_o u3_cqdb_has(u3_noun, u3_noun); u3_noun u3_cqdb_int(u3_noun, u3_noun); u3_noun u3_cqdb_put(u3_noun, u3_noun, u3_noun); # define u3_cqdb_tap u3_cqdi_tap u3_noun u3_cqdb_uni(u3_noun, u3_noun); u3_noun u3_cqdi_gas(u3_noun, u3_noun); - u3_bean u3_cqdi_has(u3_noun, u3_noun); + c3_o u3_cqdi_has(u3_noun, u3_noun); u3_noun u3_cqdi_int(u3_noun, u3_noun); u3_noun u3_cqdi_mer(u3_noun, u3_noun); u3_noun u3_cqdi_put(u3_noun, u3_noun); @@ -150,7 +150,7 @@ u3_noun u3_cqfu_bust(u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_conk(u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_crop(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_cull(u3_noun, u3_noun, u3_bean, u3_atom, u3_noun); + u3_noun u3_cqfu_cull(u3_noun, u3_noun, c3_o, u3_atom, u3_noun); u3_noun u3_cqfu_duck(u3_noun, u3_noun); u3_noun u3_cqfu_dung(u3_noun, u3_noun cap, u3_noun); u3_noun u3_cqfu_dunq(u3_noun, const c3_c*, u3_noun); @@ -166,8 +166,8 @@ u3_noun u3_cqfu_lose(u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_mint(u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_mull(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_bean u3_cqfu_nest(u3_noun, u3_noun, u3_bean, u3_noun); - u3_bean u3_cqfu_orth(u3_noun, u3_noun, u3_noun); + c3_o u3_cqfu_nest(u3_noun, u3_noun, c3_o, u3_noun); + c3_o u3_cqfu_orth(u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_park(u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_peek(u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_play(u3_noun, u3_noun, u3_noun); diff --git a/i/j/w.h b/i/j/w.h index 1b5bf7e712..95e05a2b3e 100644 --- a/i/j/w.h +++ b/i/j/w.h @@ -69,14 +69,14 @@ **/ u3_noun u3_cwdb_gas(u3_noun); u3_noun u3_cwdb_get(u3_noun); - u3_bean u3_cwdb_has(u3_noun); + c3_o u3_cwdb_has(u3_noun); u3_noun u3_cwdb_int(u3_noun); u3_noun u3_cwdb_put(u3_noun); # define u3_cwdb_tap u3_cwdi_tap u3_noun u3_cwdb_uni(u3_noun); u3_noun u3_cwdi_gas(u3_noun); - u3_bean u3_cwdi_has(u3_noun); + c3_o u3_cwdi_has(u3_noun); u3_noun u3_cwdi_int(u3_noun); u3_noun u3_cwdi_mer(u3_noun); u3_noun u3_cwdi_put(u3_noun); @@ -184,7 +184,7 @@ u3_noun u3_cwfu_heal(u3_noun); u3_noun u3_cwfu_mint(u3_noun); u3_noun u3_cwfu_mull(u3_noun); - u3_bean u3_cwfu_nest(u3_noun); + c3_o u3_cwfu_nest(u3_noun); u3_noun u3_cwfu_park(u3_noun); u3_noun u3_cwfu_peek(u3_noun); u3_noun u3_cwfu_play(u3_noun); diff --git a/i/v/vere.h b/i/v/vere.h index 23a44d29b2..7ef0c401e0 100644 --- a/i/v/vere.h +++ b/i/v/vere.h @@ -72,8 +72,8 @@ void* par_u; // struct http_parser * c3_c* url_c; // url c3_w ipf_w; // ipv4 - u3_bean liv; // keepalive - u3_bean end; // all responses added + c3_o liv; // keepalive + c3_o end; // all responses added u3_hhed* hed_u; // headers u3_hbod* bod_u; // body parts (exit) u3_hbod* dob_u; // body parts (entry) @@ -113,7 +113,7 @@ c3_w sev_l; // server number c3_w coq_l; // next connection number c3_w por_w; // running port - u3_bean sec; // logically secure + c3_o sec; // logically secure struct _u3_hcon* hon_u; // connection list struct _u3_http* nex_u; // next in list } u3_http; @@ -136,7 +136,7 @@ c3_c* hot_c; // host c3_s por_s; // port c3_c* url_c; // url - u3_bean sec; // yes == https + c3_o sec; // yes == https u3_hmet met_e; // method u3_hhed* hed_u; // headers u3_hbod* bod_u; // body @@ -164,7 +164,7 @@ c3_c* hot_c; // hostname c3_s por_s; // port c3_w ipf_w; // IP - u3_bean sec; // yes == https + c3_o sec; // yes == https u3_hbod* rub_u; // exit of send queue u3_hbod* bur_u; // entry of send queue u3_creq* ceq_u; // exit of request queue @@ -203,7 +203,7 @@ typedef struct _u3_ames { // packet network state uv_udp_t wax_u; // socket state uv_timer_t tim_u; // network timer - u3_bean alm; // alarm on + c3_o alm; // alarm on c3_w law_w; // last wakeup, unix time c3_s por_s; // public IPv4 port c3_w imp_w[256]; // imperial IPs @@ -241,8 +241,8 @@ } mir; struct { // escape code control - u3_bean ape; // escape received - u3_bean bra; // bracket or O received + c3_o ape; // escape received + c3_o bra; // bracket or O received } esc; struct { @@ -298,8 +298,8 @@ */ typedef struct _u3_unod { uv_fs_event_t was_u; // stat watcher - u3_bean dir; // always - u3_bean dry; // ie, unmodified + c3_o dir; // always + c3_o dry; // ie, unmodified c3_c* pax_c; // absolute path struct _u3_udir* par_u; // in directory } u3_unod; @@ -308,8 +308,8 @@ */ typedef struct _u3_ufil { uv_fs_event_t was_u; // stat watcher - u3_bean non; // always u3_no - u3_bean dry; // ie, unmodified + c3_o non; // always u3_no + c3_o dry; // ie, unmodified c3_c* pax_c; // absolute path struct _u3_udir* par_u; // in directory c3_c* dot_c; // extension point or 0 @@ -321,8 +321,8 @@ */ typedef struct _u3_udir { uv_fs_event_t was_u; // stat watcher - u3_bean yes; // always u3_yes - u3_bean dry; // ie, unmodified + c3_o yes; // always u3_yes + c3_o dry; // ie, unmodified c3_c* pax_c; // absolute path struct _u3_udir* par_u; // parent directory struct _u3_udir* dis_u; // subdirectories @@ -355,7 +355,7 @@ #ifdef SYNCLOG c3_w lot_w; // sync-slot struct _u3_sylo { - u3_bean unx; // from unix + c3_o unx; // from unix c3_m wer_m; // mote saying where c3_m wot_m; // mote saying what c3_c* pax_c; // path @@ -368,7 +368,7 @@ typedef struct _u3_batz { uv_timer_t tim_u; // batz timer c3_w run_w; // run of consecutive alarms - u3_bean alm; // alarm + c3_o alm; // alarm } u3_batz; /* u3_temp: just a timer for ever @@ -376,7 +376,7 @@ typedef struct _u3_temp { uv_timer_t tim_u; // temp timer c3_w run_w; // run of consecutive alarms - u3_bean alm; // alarm + c3_o alm; // alarm } u3_temp; /* u2_utfo: unix terminfo strings. @@ -497,13 +497,13 @@ uv_tcp_t wax_u; // TCP handle struct _u3_rnam* nam_u; // peer we're connected to u3_rbuf* red_u; // read buffer - u3_bean red; // u3_yes on new data + c3_o red; // u3_yes on new data u3_rbuf* wri_u; // write buffer u3_raft* raf_u; // back-reference to server u3_rreq* out_u; // exit of request queue u3_rreq* tou_u; // entry of request queue struct _u3_rcon* nex_u; // pointer to next con - u3_bean liv; // are we live? + c3_o liv; // are we live? } u3_rcon; /* u3_rnam: raft peer name. @@ -514,7 +514,7 @@ c3_c* por_c; // port u3_rcon* ron_u; // connection struct _u3_rnam* nex_u; // pointer to next peer - u3_bean vog; // did they vote for us? + c3_o vog; // did they vote for us? } u3_rnam; /* u3_opts: command line configuration. @@ -527,18 +527,18 @@ c3_w fuz_w; // -f, fuzz testing c3_s por_s; // -p, ames port c3_s rop_s; // -l, raft port - u3_bean abo; // -a - u3_bean bat; // -b, batch create - u3_bean gab; // -g - u3_bean dem; // -d, dem - u3_bean fog; // -Xwtf, skip last event - u3_bean fak; // -F, fake carrier - u3_bean loh; // -L, local-only networking - u3_bean pro; // , profile - u3_bean veb; // -v, verbose (inverse of -q) - u3_bean nuu; // -c, new pier - u3_bean vno; // -V - u3_bean mem; // -M, memory madness + c3_o abo; // -a + c3_o bat; // -b, batch create + c3_o gab; // -g + c3_o dem; // -d, dem + c3_o fog; // -Xwtf, skip last event + c3_o fak; // -F, fake carrier + c3_o loh; // -L, local-only networking + c3_o pro; // , profile + c3_o veb; // -v, verbose (inverse of -q) + c3_o nuu; // -c, new pier + c3_o vno; // -V + c3_o mem; // -M, memory madness } u3_opts; /* u3_host: entire host. @@ -559,7 +559,7 @@ u3_unix unx_u; // sync and clay u3_batz beh_u; // batz timer u3_temp teh_u; // temp timer - u3_bean liv; // if u3_no, shut down + c3_o liv; // if u3_no, shut down c3_i xit_i; // exit code for shutdown void* ssl_u; // struct SSL_CTX* } u3_host; // host == computer == process @@ -575,10 +575,10 @@ c3_global c3_c* u3_Local; c3_global c3_c* u3_System; - c3_global u3_bean u3_Flag_Abort; - c3_global u3_bean u3_Flag_Garbage; - c3_global u3_bean u3_Flag_Profile; - c3_global u3_bean u3_Flag_Verbose; + c3_global c3_o u3_Flag_Abort; + c3_global c3_o u3_Flag_Garbage; + c3_global c3_o u3_Flag_Profile; + c3_global c3_o u3_Flag_Verbose; /** Functions. **/ @@ -684,7 +684,7 @@ /* u3_path(): C unix path in computer for file or directory. */ c3_c* - u3_path(u3_bean fyl, u3_noun pax); + u3_path(c3_o fyl, u3_noun pax); /** Filesystem (old api). **/ @@ -707,7 +707,7 @@ /* u3_ve_save(): save internal file as atom. */ - u3_bean + c3_o u3_ve_save(c3_c* ext_c, u3_noun tah, u3_noun dat); /* u3_ve_zeus(): prayer to internal file path. Return unit. @@ -784,7 +784,7 @@ /* u3_lo_shut(): end callback processing. */ void - u3_lo_shut(u3_bean); + u3_lo_shut(c3_o); /** Terminal, new style. diff --git a/j/1/gte.c b/j/1/gte.c index eb755e10e8..96515e5b12 100644 --- a/j/1/gte.c +++ b/j/1/gte.c @@ -15,7 +15,7 @@ } else { mpz_t a_mp, b_mp; - u3_bean cmp; + c3_o cmp; u3r_mp(a_mp, a); u3r_mp(b_mp, b); diff --git a/j/1/gth.c b/j/1/gth.c index 80cfe83be0..bdc3b6986f 100644 --- a/j/1/gth.c +++ b/j/1/gth.c @@ -16,7 +16,7 @@ } else { mpz_t a_mp, b_mp; - u3_bean cmp; + c3_o cmp; u3r_mp(a_mp, a); u3r_mp(b_mp, b); diff --git a/j/1/lte.c b/j/1/lte.c index 1f77c51be3..443e518d98 100644 --- a/j/1/lte.c +++ b/j/1/lte.c @@ -15,7 +15,7 @@ } else { mpz_t a_mp, b_mp; - u3_bean cmp; + c3_o cmp; u3r_mp(a_mp, a); u3r_mp(b_mp, b); @@ -42,7 +42,8 @@ return u3_cqa_lte(a, b); } } - u3_noun + + c3_o u3_cka_lte(u3_noun a, u3_noun b) { u3_noun c = u3_cqa_lte(a, b); diff --git a/j/1/lth.c b/j/1/lth.c index 20042cf8b1..10911bbbc0 100644 --- a/j/1/lth.c +++ b/j/1/lth.c @@ -16,7 +16,7 @@ } else { mpz_t a_mp, b_mp; - u3_bean cmp; + c3_o cmp; u3r_mp(a_mp, a); u3r_mp(b_mp, b); diff --git a/j/4/by_has.c b/j/4/by_has.c index 5374564614..3c8307b87d 100644 --- a/j/4/by_has.c +++ b/j/4/by_has.c @@ -7,10 +7,8 @@ /* functions */ - u3_bean - u3_cqdb_has( - u3_noun a, - u3_noun b) + c3_o + u3_cqdb_has(u3_noun a, u3_noun b) { if ( u3_nul == a ) { return c3n; @@ -37,9 +35,8 @@ } } } - u3_noun - u3_cwdb_has( - u3_noun cor) + c3_o + u3_cwdb_has(u3_noun cor) { u3_noun a, b; @@ -49,7 +46,7 @@ return u3_cqdb_has(a, b); } } - u3_bean + c3_o u3_ckdb_has(u3_noun a, u3_noun b) { u3_weak c = u3_cqdb_has(a, b); diff --git a/j/4/in_has.c b/j/4/in_has.c index 21a8c636eb..d831789df5 100644 --- a/j/4/in_has.c +++ b/j/4/in_has.c @@ -7,7 +7,7 @@ /* functions */ - u3_bean + c3_o u3_cqdi_has(u3_noun a, u3_noun b) { if ( u3_nul == a ) { @@ -32,7 +32,7 @@ } } } - u3_noun + c3_o u3_cwdi_has(u3_noun cor) { u3_noun a, b; @@ -43,7 +43,7 @@ return u3_cqdi_has(a, b); } } - u3_bean + c3_o u3_ckdi_has(u3_noun a, u3_noun b) { u3_weak c = u3_cqdi_has(a, b); diff --git a/j/5/loss.c b/j/5/loss.c index fee65bc58f..ac1d9d6b81 100644 --- a/j/5/loss.c +++ b/j/5/loss.c @@ -126,7 +126,7 @@ // extend fits top // - static u3_bean + static c3_o _hink(u3_loss* loc_u, c3_w inx_w, c3_w goy_w) @@ -138,7 +138,7 @@ // extend fits bottom // - static u3_bean + static c3_o _lonk(u3_loss* loc_u, c3_w inx_w, c3_w goy_w) @@ -152,7 +152,7 @@ // search for first index >= inx_w and <= max_w that fits // the hink and lonk criteria. // - static u3_bean + static c3_o _binka(u3_loss* loc_u, c3_w* inx_w, c3_w max_w, @@ -175,7 +175,7 @@ // both hink(inx_w) and lonk(inx_w) are true. lonk is false // if inx_w is too high, hink is false if it is too low. // - static u3_bean + static c3_o _bink(u3_loss* loc_u, c3_w* inx_w, c3_w max_w, @@ -271,7 +271,7 @@ return lcs; } - static u3_bean + static c3_o _listp(u3_noun lix) { while ( 1 ) { diff --git a/j/5/parse.c b/j/5/parse.c index 99e299191d..d2aa318b3d 100644 --- a/j/5/parse.c +++ b/j/5/parse.c @@ -855,7 +855,7 @@ /* stew */ - static u3_bean + static c3_o _stew_wor( u3_noun ort, u3_noun wan) diff --git a/j/5/tape.c b/j/5/tape.c index 70916a5d5c..e3e926b6cd 100644 --- a/j/5/tape.c +++ b/j/5/tape.c @@ -19,7 +19,7 @@ } } - static u3_bean + static c3_o _good( u3_noun a) { diff --git a/j/6/fitz.c b/j/6/fitz.c index affa9e514d..824b9adf37 100644 --- a/j/6/fitz.c +++ b/j/6/fitz.c @@ -7,7 +7,7 @@ /* functions */ - static u3_bean + static c3_o _fitz_fiz( u3_noun yaz, u3_noun wix) diff --git a/j/6/ut_conk.c b/j/6/ut_conk.c index 37e56376bd..f44379586c 100644 --- a/j/6/ut_conk.c +++ b/j/6/ut_conk.c @@ -7,7 +7,7 @@ /* logic */ - u3_bean + c3_o _cqfu_conk(u3_noun van, u3_noun sut, u3_noun got) { if ( c3y == u3ud(got) ) { @@ -27,7 +27,7 @@ return ret; } case 2: { - u3_bean vet = u3r_at(u3_cqfu_van_vet, van); + c3_o vet = u3r_at(u3_cqfu_van_vet, van); u3_noun hed, tal, deh, lat, ret; if ( c3y == vet ) { diff --git a/j/6/ut_cull.c b/j/6/ut_cull.c index 744eaa8463..98cf6a97dd 100644 --- a/j/6/ut_cull.c +++ b/j/6/ut_cull.c @@ -8,13 +8,13 @@ /* logic */ u3_noun - _cqfu_cull(u3_noun, u3_noun, u3_bean, u3_atom, u3_noun); + _cqfu_cull(u3_noun, u3_noun, c3_o, u3_atom, u3_noun); static u3_noun _cull_in( u3_noun van, u3_noun sut, - u3_bean pol, + c3_o pol, u3_atom axe, u3_noun ref, u3_noun now, @@ -152,7 +152,7 @@ _cqfu_cull( u3_noun van, u3_noun sut, - u3_bean pol, + c3_o pol, u3_atom axe, u3_noun ref) { @@ -193,7 +193,7 @@ u3_noun u3_cqfu_cull(u3_noun van, u3_noun sut, - u3_bean pol, + c3_o pol, u3_noun axe, u3_noun ref) { diff --git a/j/6/ut_fire.c b/j/6/ut_fire.c index a461bb0b96..0bdd494fb1 100644 --- a/j/6/ut_fire.c +++ b/j/6/ut_fire.c @@ -7,7 +7,7 @@ /* logic */ - static u3_bean + static c3_o _fire_mull(u3_noun van, u3_noun sut, u3_noun dox, @@ -17,7 +17,7 @@ u3_noun key = u3nt(u3k(sut), u3k(dox), u3k(gen)); - u3_bean ret; + c3_o ret; if ( c3y == u3_cqdi_has(rib, key) ) { ret = c3y; @@ -127,7 +127,7 @@ u3_noun sut, u3_noun hag) { - u3_bean vet = u3r_at(u3_cqfu_van_vet, van); + c3_o vet = u3r_at(u3_cqfu_van_vet, van); { if ( (c3y == u3du(hag)) && (u3_nul == u3t(hag)) ) { diff --git a/j/6/ut_mint.c b/j/6/ut_mint.c index c62db6c91b..405434efdd 100644 --- a/j/6/ut_mint.c +++ b/j/6/ut_mint.c @@ -20,12 +20,12 @@ int FOO; u3nq(c3__cube, 1, c3__atom, 'f')); } - static u3_bean + static c3_o _mint_vet( u3_noun van) { - // u3_bean vet = u3j_hook(u3k(van), "vet"); - u3_bean vet = u3r_at(u3_cqfu_van_vet, van); + // c3_o vet = u3j_hook(u3k(van), "vet"); + c3_o vet = u3r_at(u3_cqfu_van_vet, van); switch ( vet ) { case c3n: @@ -202,7 +202,7 @@ int FOO; _mint_brew( u3_noun van, u3_noun sut, - u3_bean tov, + c3_o tov, u3_noun gen) { u3_noun von; diff --git a/j/6/ut_mull.c b/j/6/ut_mull.c index 68fd0b82c8..61b806008c 100644 --- a/j/6/ut_mull.c +++ b/j/6/ut_mull.c @@ -10,12 +10,12 @@ static u3_noun _mull_in(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - static u3_bean + static c3_o _mull_vet( u3_noun van) { - // u3_bean vet = u3j_hook(u3k(van), "vet"); - u3_bean vet = u3r_at(u3_cqfu_van_vet, van); + // c3_o vet = u3j_hook(u3k(van), "vet"); + c3_o vet = u3r_at(u3_cqfu_van_vet, van); switch ( vet ) { case c3n: @@ -810,7 +810,7 @@ } } - u3_bean + c3_o _cqfu_mull( u3_noun van, u3_noun sut, diff --git a/j/6/ut_nest.c b/j/6/ut_nest.c index acc6079c53..473e3ebd56 100644 --- a/j/6/ut_nest.c +++ b/j/6/ut_nest.c @@ -9,16 +9,16 @@ */ /* forward */ - static u3_bean - _nest_sint(u3_noun, u3_noun, u3_bean, u3_noun, u3_noun); - static u3_bean - _nest_dext(u3_noun, u3_noun, u3_bean, u3_noun, u3_noun); + static c3_o + _nest_sint(u3_noun, u3_noun, c3_o, u3_noun, u3_noun); + static c3_o + _nest_dext(u3_noun, u3_noun, c3_o, u3_noun, u3_noun); - static u3_bean + static c3_o _nest_cram( u3_noun van, u3_noun sut, - u3_bean tel, + c3_o tel, u3_noun ref, u3_noun dab, u3_noun hem, @@ -61,7 +61,7 @@ u3_noun pqn_hem = u3t(qn_hem); u3_noun vis = u3_cqfu_play(van, sut, pqn_dab); u3_noun lon = u3_cqfu_play(van, ref, pqn_hem); - u3_bean ret = _nest_dext(van, vis, tel, lon, gil); + c3_o ret = _nest_dext(van, vis, tel, lon, gil); u3z(vis); u3z(lon); @@ -76,10 +76,10 @@ } } - static u3_bean + static c3_o _nest_cong(u3_noun van, u3_noun sut, - u3_bean tel, + c3_o tel, u3_noun ref, u3_noun gil) { @@ -87,7 +87,7 @@ u3_noun pq_sut, qq_sut, rq_sut; u3_noun pq_ref, qq_ref, rq_ref; u3_noun prq_sut, qrq_sut, prq_ref, qrq_ref; - u3_bean ret; + c3_o ret; u3x_trel(sut, 0, &p_sut, &q_sut); u3x_trel(ref, 0, &p_ref, &q_ref); @@ -151,7 +151,7 @@ (van, qq_sut, c3__rite, 2); u3_noun r_sam = u3_cqfu_peek (van, qq_ref, c3__rite, 2); - u3_bean ret = _nest_dext(van, r_sam, tel, s_sam, gil); + c3_o ret = _nest_dext(van, r_sam, tel, s_sam, gil); u3z(r_sam); u3z(s_sam); @@ -165,7 +165,7 @@ (van, qq_sut, c3__read, 2); u3_noun r_pal = u3_cqfu_peek (van, qq_ref, c3__read, 2); - u3_bean ret = _nest_dext(van, s_pal, tel, r_pal, gil); + c3_o ret = _nest_dext(van, s_pal, tel, r_pal, gil); u3z(r_pal); u3z(s_pal); @@ -179,11 +179,11 @@ } } - static u3_bean + static c3_o _nest_dext_in( u3_noun van, u3_noun sut, - u3_bean tel, + c3_o tel, u3_noun ref, u3_noun gil) { @@ -294,7 +294,7 @@ } else { u3_noun zoc = u3_cqdi_put(gil, hud); u3_noun fop = u3_cqfu_rest(van, sut, p_sut); - u3_bean hiv = _nest_dext(van, fop, tel, ref, zoc); + c3_o hiv = _nest_dext(van, fop, tel, ref, zoc); u3z(hud); u3z(fop); @@ -306,15 +306,15 @@ } } - static u3_bean + static c3_o _nest_dext_to( u3_noun van, u3_noun sut, - u3_bean tel, + c3_o tel, u3_noun ref, u3_noun gil) { - u3_bean tyn = _nest_dext_in(van, sut, tel, ref, gil); + c3_o tyn = _nest_dext_in(van, sut, tel, ref, gil); if ( (c3y == tyn) || (c3n == tel) ) { return tyn; @@ -329,11 +329,11 @@ } } - static u3_bean + static c3_o _nest_dext( u3_noun van, u3_noun sut, - u3_bean tel, + c3_o tel, u3_noun ref, u3_noun gil) { @@ -357,11 +357,11 @@ } } - static u3_bean + static c3_o _nest_sint( u3_noun van, u3_noun sut, - u3_bean tel, + c3_o tel, u3_noun ref, u3_noun gil) { @@ -391,7 +391,7 @@ case c3__cell: return c3n; case c3__core: { u3_noun gam = u3_cqfu_repo(van, ref); - u3_bean hiv = _nest_dext(van, sut, tel, gam, gil); + c3_o hiv = _nest_dext(van, sut, tel, gam, gil); u3z(gam); return hiv; @@ -432,7 +432,7 @@ u3_noun gam = u3_cqfu_repo(van, ref); { - u3_bean hiv = _nest_dext(van, sut, tel, gam, zoc); + c3_o hiv = _nest_dext(van, sut, tel, gam, zoc); u3z(hud); u3z(gam); @@ -447,11 +447,11 @@ } } - u3_bean + c3_o _cqfu_nest( u3_noun van, u3_noun sut, - u3_bean tel, + c3_o tel, u3_noun ref) { return _nest_dext(van, sut, tel, ref, u3_nul); @@ -459,7 +459,7 @@ /* boilerplate */ - u3_noun + c3_o u3_cwfu_nest(u3_noun cor) { u3_noun sut, tel, ref, van; @@ -477,10 +477,10 @@ } } - u3_noun + c3_o u3_cqfu_nest(u3_noun van, u3_noun sut, - u3_bean tel, + c3_o tel, u3_noun ref) { return _cqfu_nest(van, sut, tel, ref); diff --git a/j/6/ut_park.c b/j/6/ut_park.c index ba7fec9349..52e6cf42ab 100644 --- a/j/6/ut_park.c +++ b/j/6/ut_park.c @@ -7,7 +7,7 @@ /* logic */ - u3_bean + c3_o _cqfu_park( u3_noun van, u3_noun sut, diff --git a/j/6/ut_rest.c b/j/6/ut_rest.c index ab261d8e67..1930df0ce9 100644 --- a/j/6/ut_rest.c +++ b/j/6/ut_rest.c @@ -68,7 +68,7 @@ return fub; } - static u3_bean + static c3_o _rest_hit_fan( u3_noun fan, u3_noun leg) diff --git a/v/ames.c b/v/ames.c index 066f89dd1c..35a55a8541 100644 --- a/v/ames.c +++ b/v/ames.c @@ -62,7 +62,7 @@ _ames_czar(c3_y imp_y, c3_s* por_s) return 0; } else if ( 0 == sam_u->imp_w[imp_y] ) { - u3_noun nam = u3_dc("scot", 'p', imp_y); + u3_noun nam = u3dc("scot", 'p', imp_y); c3_c* nam_c = u3r_string(nam); c3_c dns_c[64]; @@ -96,7 +96,7 @@ _ames_czar(c3_y imp_y, c3_s* por_s) #if 1 { u3_noun wad = u3i_words(1, &sam_u->imp_w[imp_y]); - u3_noun nam = u3_dc("scot", c3__if, wad); + u3_noun nam = u3dc("scot", c3__if, wad); c3_c* nam_c = u3r_string(nam); uL(fprintf(uH, "ames: czar %s: ip %s\n", dns_c, nam_c)); @@ -118,7 +118,7 @@ _ames_czar(c3_y imp_y, c3_s* por_s) /* _ames_lane_ipv4(): IPv4 address/ from lane. */ -u3_bean +c3_o _ames_lane_ip(u3_noun lan, c3_s* por_s, c3_w* pip_w) { switch ( u3h(lan) ) { @@ -297,7 +297,7 @@ u3_ames_io_init() por_s = u3_Host.ops_u.por_s; if ( 0 != u3_Host.ops_u.imp_c ) { u3_noun imp = u3i_string(u3_Host.ops_u.imp_c); - u3_noun num = u3_dc("slaw", 'p', imp); + u3_noun num = u3dc("slaw", 'p', imp); c3_y num_y; if ( c3n == u3du(num) ) { diff --git a/v/cttp.c b/v/cttp.c index 0bc2b68dc2..40fd8e90b9 100644 --- a/v/cttp.c +++ b/v/cttp.c @@ -832,7 +832,7 @@ _cttp_ccon_fail_cb(uv_handle_t* wax_u) /* _cttp_ccon_fail(): report failure and reset connection. */ static void -_cttp_ccon_fail(u3_ccon* coc_u, u3_bean say) +_cttp_ccon_fail(u3_ccon* coc_u, c3_o say) { if ( c3y == say ) { uL(fprintf(uH, "cttp: ERROR\n")); @@ -1329,7 +1329,7 @@ _cttp_ccon_kick(u3_ccon* coc_u) /* _cttp_ccon_new(): create client connection. Return 0 if url invalid. */ static u3_ccon* -_cttp_ccon_new(u3_bean sec, c3_s por_s, c3_c* hot_c) +_cttp_ccon_new(c3_o sec, c3_s por_s, c3_c* hot_c) { u3_ccon* coc_u = c3_malloc(sizeof(u3_ccon)); @@ -1355,7 +1355,7 @@ _cttp_ccon_new(u3_bean sec, c3_s por_s, c3_c* hot_c) /* _cttp_ccon_find(): find existing connection for remote server. */ static u3_ccon* -_cttp_ccon_find(u3_bean sec, c3_s por_s, c3_c* hot_c) +_cttp_ccon_find(c3_o sec, c3_s por_s, c3_c* hot_c) { u3_ccon* coc_u; @@ -1373,7 +1373,7 @@ _cttp_ccon_find(u3_bean sec, c3_s por_s, c3_c* hot_c) /* _cttp_ccon(): create or find persistent client connection. */ static u3_ccon* -_cttp_ccon(u3_bean sec, c3_s por_s, c3_c* hot_c) +_cttp_ccon(c3_o sec, c3_s por_s, c3_c* hot_c) { #ifndef CTTP_NO_PIPELINE u3_ccon* coc_c = _cttp_ccon_find(sec, por_s, hot_c); @@ -1516,7 +1516,7 @@ static void _cttp_ccon_fill(u3_ccon* coc_u) { u3_creq* ceq_u = coc_u->ceq_u; - u3_bean fir_t = c3y; + c3_o fir_t = c3y; while ( ceq_u ) { // @@ -1553,7 +1553,7 @@ _cttp_ccon_fill(u3_ccon* coc_u) static void _cttp_ccon_send(u3_ccon* coc_u, u3_creq* ceq_u) { - u3_bean nou = ((0 == coc_u->ceq_u) ? c3y : c3n); + c3_o nou = ((0 == coc_u->ceq_u) ? c3y : c3n); if ( c3y == nou ) { c3_assert(0 == coc_u->qec_u); diff --git a/v/http.c b/v/http.c index 7b05f3ef44..0ecfea3b88 100644 --- a/v/http.c +++ b/v/http.c @@ -815,9 +815,9 @@ _http_pox_to_noun(c3_w sev_l, c3_w coq_l, c3_w seq_l) u3nt( u3_blip, c3__http, - u3nq(u3_dc("scot", c3_s2('u','v'), sev_l), - u3_dc("scot", c3_s2('u','d'), coq_l), - u3_dc("scot", c3_s2('u','d'), seq_l), + u3nq(u3dc("scot", c3_s2('u','v'), sev_l), + u3dc("scot", c3_s2('u','d'), coq_l), + u3dc("scot", c3_s2('u','d'), seq_l), u3_nul)); } diff --git a/v/loop.c b/v/loop.c index 32d20b9a44..196323f074 100644 --- a/v/loop.c +++ b/v/loop.c @@ -309,7 +309,7 @@ u3_lo_punt(c3_l tab_l, u3_noun tac) // We are calling nock here, but hopefully need no protection. // while ( c3y == u3r_du(cat) ) { - u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); + u3_noun wol = u3dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); _lo_wall(wol); cat = u3t(cat); @@ -323,7 +323,7 @@ u3_lo_punt(c3_l tab_l, u3_noun tac) void u3_lo_sway(c3_l tab_l, u3_noun tax) { - u3_noun mok = u3_dc("mook", 2, tax); + u3_noun mok = u3dc("mook", 2, tax); u3_lo_punt(tab_l, u3k(u3t(mok))); u3z(mok); @@ -356,7 +356,7 @@ u3_lo_open(void) /* u3_lo_shut(): end callback processing. */ void -u3_lo_shut(u3_bean inn) +u3_lo_shut(c3_o inn) { // u3e_grab("lo_shut a", u3_none); @@ -425,7 +425,7 @@ _lo_bench_scot_p(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_dc("scot", 'p', u3k(u3A->now)); + u3_noun soc = u3dc("scot", 'p', u3k(u3A->now)); u3z(soc); } @@ -439,8 +439,8 @@ _lo_bench_slay_p(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_dc("scot", 'p', u3k(u3A->now)); - u3_noun dub = u3_do("slay", soc); + u3_noun soc = u3dc("scot", 'p', u3k(u3A->now)); + u3_noun dub = u3do("slay", soc); u3z(dub); } @@ -454,7 +454,7 @@ _lo_bench_scot_da(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_dc("scot", c3__da, u3k(u3A->now)); + u3_noun soc = u3dc("scot", c3__da, u3k(u3A->now)); u3z(soc); } @@ -468,7 +468,7 @@ _lo_bench_dec(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_do("dec", u3k(u3A->now)); + u3_noun soc = u3do("dec", u3k(u3A->now)); u3z(soc); } @@ -482,7 +482,7 @@ _lo_bench_scot_ud(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_dc("scot", c3__ud, u3k(u3A->now)); + u3_noun soc = u3dc("scot", c3__ud, u3k(u3A->now)); u3z(soc); } @@ -523,7 +523,7 @@ _lo_bench(const c3_c* lab_c, void (*fun)(c3_w), c3_w num_w) void u3_lo_show(c3_c* cap_c, u3_noun nun) { - u3_noun pav = u3_dc("pave", c3__noun, nun); + u3_noun pav = u3dc("pave", c3__noun, nun); c3_c* txt_c = (c3_c*)u3r_tape(pav); fprintf(stderr, "%s: %s\r\n", cap_c, txt_c); @@ -654,7 +654,7 @@ _lo_mark() static void _lo_word(FILE* fil_u, c3_w wod_w) { - u3_bean top = c3y; + c3_o top = c3y; if ( wod_w / (1000 * 1000 * 1000) ) { fprintf(fil_u, "%u.", wod_w / (1000 * 1000 * 1000)); diff --git a/v/main.c b/v/main.c index 469a2dfa46..26c108d31b 100644 --- a/v/main.c +++ b/v/main.c @@ -26,7 +26,7 @@ /* _main_readw(): parse a word from a string. */ -static u3_bean +static c3_o _main_readw(const c3_c* str_c, c3_w max_w, c3_w* out_w) { c3_c* end_c; @@ -41,7 +41,7 @@ _main_readw(const c3_c* str_c, c3_w max_w, c3_w* out_w) /* _main_getopt(): extract option map from command line. */ -static u3_bean +static c3_o _main_getopt(c3_i argc, c3_c** argv) { c3_i ch_i; diff --git a/v/raft.c b/v/raft.c index 5954bb4fc9..2f6d786435 100644 --- a/v/raft.c +++ b/v/raft.c @@ -53,7 +53,7 @@ static ssize_t _raft_rmsg_read(const u3_rbuf* buf_u, u3_rmsg* msg_u); static void _raft_rmsg_send(u3_rcon* ron_u, const u3_rmsg* msg_u); static void _raft_rmsg_free(u3_rmsg* msg_u); static void _raft_conn_dead(u3_rcon* ron_u); -static u3_bean _raft_remove_run(u3_rcon* ron_u); +static c3_o _raft_remove_run(u3_rcon* ron_u); static void _raft_send_rasp(u3_rcon* ron_u, c3_t suc_t); static void _raft_rreq_free(u3_rreq* req_u); static void _raft_time_cb(uv_timer_t* tim_u); @@ -834,11 +834,11 @@ _raft_conn_new(u3_raft* raf_u) /* _raft_remove_run(): remove a connection from the list of unknowns. */ -static u3_bean +static c3_o _raft_remove_run(u3_rcon* ron_u) { u3_raft* raf_u = ron_u->raf_u; - u3_bean suc = c3n; + c3_o suc = c3n; if ( raf_u->run_u == ron_u ) { raf_u->run_u = ron_u->nex_u; @@ -906,7 +906,7 @@ _raft_conn_free(uv_handle_t* had_u) } } else { - u3_bean suc = _raft_remove_run(ron_u); + c3_o suc = _raft_remove_run(ron_u); c3_assert(c3y == suc); // Slow, expensive debug assert. { @@ -1774,7 +1774,7 @@ u3_raft_work(void) ron = u3_cke_jam(u3nc(u3k(u3A->now), ovo)); c3_assert(u3A->key); - ron = u3_dc("en:crua", u3k(u3A->key), ron); + ron = u3dc("en:crua", u3k(u3A->key), ron); len_w = u3r_met(5, ron); bob_w = c3_malloc(len_w * 4L); diff --git a/v/reck.c b/v/reck.c index dd58f58484..efe31ae7e5 100644 --- a/v/reck.c +++ b/v/reck.c @@ -22,12 +22,12 @@ /* _reck_mole(): parse simple atomic mole. */ -static u3_bean +static c3_o _reck_mole(u3_noun fot, u3_noun san, c3_d* ato_d) { - u3_noun uco = u3_do("slay", san); + u3_noun uco = u3do("slay", san); u3_noun p_uco, q_uco, r_uco, s_uco; if ( (c3n == u3r_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || @@ -48,7 +48,7 @@ _reck_mole(u3_noun fot, /* _reck_lily(): parse little atom. */ -static u3_bean +static c3_o _reck_lily(u3_noun fot, u3_noun txt, c3_l* tid_l) { c3_d ato_d; @@ -68,7 +68,7 @@ _reck_lily(u3_noun fot, u3_noun txt, c3_l* tid_l) /* _reck_kick_term(): apply terminal outputs. */ -static u3_bean +static c3_o _reck_kick_term(u3_noun pox, c3_l tid_l, u3_noun fav) { u3_noun p_fav; @@ -113,7 +113,7 @@ _reck_kick_term(u3_noun pox, c3_l tid_l, u3_noun fav) /* _reck_kick_http(): apply http effects. */ -static u3_bean +static c3_o _reck_kick_http(u3_noun pox, c3_l sev_l, c3_l coq_l, @@ -148,7 +148,7 @@ _reck_kick_http(u3_noun pox, /* _reck_kick_sync(): apply sync outputs. */ -static u3_bean +static c3_o _reck_kick_sync(u3_noun pox, u3_noun fav) { switch ( u3h(fav) ) { @@ -168,7 +168,7 @@ _reck_kick_sync(u3_noun pox, u3_noun fav) u3z(pox); u3z(fav); return c3n; } -static u3_bean +static c3_o _reck_kick_newt(u3_noun pox, u3_noun fav) { switch ( u3h(fav) ) { @@ -186,7 +186,7 @@ _reck_kick_newt(u3_noun pox, u3_noun fav) /* _reck_kick_ames(): apply packet network outputs. */ -static u3_bean +static c3_o _reck_kick_ames(u3_noun pox, u3_noun fav) { u3_noun p_fav; @@ -208,7 +208,7 @@ _reck_kick_ames(u3_noun pox, u3_noun fav) /* _reck_kick_spec(): apply an effect, by path. */ -static u3_bean +static c3_o _reck_kick_spec(u3_noun pox, u3_noun fav) { u3_noun i_pox, t_pox; @@ -305,7 +305,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) /* _reck_kick_norm(): non path-specific effect handling. */ -static u3_bean +static c3_o _reck_kick_norm(u3_noun pox, u3_noun fav) { if ( c3n == u3du(fav) ) { @@ -343,7 +343,7 @@ u3_reck_kick(u3_noun ovo) if ( (c3n == _reck_kick_spec(u3k(u3h(ovo)), u3k(u3t(ovo)))) && (c3n == _reck_kick_norm(u3k(u3h(ovo)), u3k(u3t(ovo)))) ) { - u3_noun tox = u3_do("spat", u3k(u3h(ovo))); + u3_noun tox = u3do("spat", u3k(u3h(ovo))); #if 0 if ( (c3__warn != u3h(u3t(ovo))) && diff --git a/v/sist.c b/v/sist.c index 429fd2f4f2..6e3a34946f 100644 --- a/v/sist.c +++ b/v/sist.c @@ -335,7 +335,7 @@ _sist_home() /* _sist_cask(): ask for a passcode. */ static u3_noun -_sist_cask(c3_c* dir_c, u3_bean nun) +_sist_cask(c3_c* dir_c, c3_o nun) { c3_c paw_c[60]; u3_noun key; @@ -364,7 +364,7 @@ _sist_cask(c3_c* dir_c, u3_bean nun) say_c[1] = 0; strncat(say_c, paw_c, strlen(paw_c) - 1); - say = u3_do("slay", u3i_string(say_c)); + say = u3do("slay", u3i_string(say_c)); if ( (u3_nul == say) || (u3_blip != u3h(u3t(say))) || ('p' != u3h(u3t(u3t(say)))) ) @@ -418,10 +418,10 @@ _sist_text(c3_c* pom_c) #if 0 /* _sist_bask(): ask a yes or no question. */ -static u3_bean -_sist_bask(c3_c* pop_c, u3_bean may) +static c3_o +_sist_bask(c3_c* pop_c, c3_o may) { - u3_bean yam; + c3_o yam; uH; while ( 1 ) { @@ -465,9 +465,9 @@ _sist_fast(u3_noun pas, c3_l key_l) { c3_c ful_c[2048]; c3_c* hom_c = u3_Host.cpu_c; - u3_noun gum = u3_dc("scot", 'p', key_l); + u3_noun gum = u3dc("scot", 'p', key_l); c3_c* gum_c = u3r_string(gum); - u3_noun yek = u3_dc("scot", 'p', pas); + u3_noun yek = u3dc("scot", 'p', pas); c3_c* yek_c = u3r_string(yek); printf("saving passcode in %s/.urb/code.%s\r\n", hom_c, gum_c); @@ -497,7 +497,7 @@ _sist_staf(c3_l key_l) { c3_c ful_c[2048]; c3_c* hom_c = u3_Host.cpu_c; - u3_noun gum = u3_dc("scot", 'p', key_l); + u3_noun gum = u3dc("scot", 'p', key_l); c3_c* gum_c = u3r_string(gum); u3_noun txt; @@ -512,7 +512,7 @@ _sist_staf(c3_l key_l) } else { // c3_c* txt_c = u3r_string(txt); - u3_noun say = u3_do("slay", txt); + u3_noun say = u3do("slay", txt); u3_noun pas; @@ -543,7 +543,7 @@ _sist_fatt(c3_l sal_l, u3_noun pas) // XX use scrypt() - this is a stupid iterated hash // for ( i_w = 0; i_w < 32768; i_w++ ) { - key = u3_dc("shaf", sal_l, key); + key = u3dc("shaf", sal_l, key); } return key; } @@ -814,14 +814,14 @@ _sist_rest() c3_d las_d = 0; u3_noun roe = u3_nul; u3_noun sev_l, tno_l, key_l, sal_l; - u3_bean ohh = c3n; + c3_o ohh = c3n; if ( 0 != u3A->ent_d ) { u3_noun ent; c3_c* ent_c; ent = u3i_chubs(1, &u3A->ent_d); - ent = u3_dc("scot", c3__ud, ent); + ent = u3dc("scot", c3__ud, ent); ent_c = u3r_string(ent); uL(fprintf(uH, "rest: checkpoint to event %s\n", ent_c)); free(ent_c); @@ -884,8 +884,8 @@ _sist_rest() tno_l = led_u.tno_l; { - u3_noun old = u3_dc("scot", c3__uv, sev_l); - u3_noun nuu = u3_dc("scot", c3__uv, u3A->sev_l); + u3_noun old = u3dc("scot", c3__uv, sev_l); + u3_noun nuu = u3dc("scot", c3__uv, u3A->sev_l); c3_c* old_c = u3r_string(old); c3_c* nuu_c = u3r_string(nuu); @@ -926,7 +926,7 @@ _sist_rest() { c3_d ent_d; c3_d end_d; - u3_bean rup = c3n; + c3_o rup = c3n; end_d = u3Z->lug_u.len_d; ent_d = 0; @@ -1031,7 +1031,7 @@ _sist_rest() if ( u3A->key ) { u3_noun dep; - dep = u3_dc("de:crua", u3k(u3A->key), ron); + dep = u3dc("de:crua", u3k(u3A->key), ron); if ( c3n == u3du(dep) ) { uL(fprintf(uH, "record (%s) is corrupt (k)\n", ful_c)); u3_lo_bail(); @@ -1114,7 +1114,7 @@ _sist_rest() u3_lo_bail(); } u3A->our = u3k(u3h(u3A->own)); - u3A->pod = u3_dc("scot", 'p', u3k(u3A->our))); + u3A->pod = u3dc("scot", 'p', u3k(u3A->our))); } // Now, who the fsck are you? No, really. @@ -1127,7 +1127,7 @@ _sist_rest() fil_c++; } else fil_c = u3_Host.cpu_c; - who = u3_dc("scot", 'p', u3k(u3A->our))); + who = u3dc("scot", 'p', u3k(u3A->our))); who_c = u3r_string(who); u3z(who); @@ -1231,7 +1231,7 @@ u3_sist_boot(void) } else { u3_noun imp = u3i_string(u3_Host.ops_u.imp_c); - u3_noun whu = u3_dc("slaw", 'p', u3k(imp)); + u3_noun whu = u3dc("slaw", 'p', u3k(imp)); if ( (u3_nul == whu) ) { fprintf(stderr, "czar: incorrect format\r\n"); @@ -1242,7 +1242,7 @@ u3_sist_boot(void) u3_noun gun = u3_nul; if (c3n == u3_Host.ops_u.fak) { gen = _sist_text("generator"); - gun = u3_dc("slaw", c3__uw, gen); + gun = u3dc("slaw", c3__uw, gen); if ( u3_nul == gun ) { fprintf(stderr, "czar: incorrect format\r\n"); diff --git a/v/term.c b/v/term.c index 793deac28d..74311b62a9 100644 --- a/v/term.c +++ b/v/term.c @@ -70,7 +70,7 @@ _term_close_cb(uv_handle_t* han_t) } { - u3_noun tid = u3_dc("scot", c3__ud, tty_u->tid_l); + u3_noun tid = u3dc("scot", c3__ud, tty_u->tid_l); u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul); u3v_plan(u3k(pax), u3nc(c3__hook, u3_nul)); u3z(pax); @@ -302,7 +302,7 @@ _term_listen_cb(uv_stream_t *wax_u, int sas_i) pty_u->tel_u = telnet_nvt_new(tty_u, _tel_event, _tel_opt, NULL); { - u3_noun tid = u3_dc("scot", c3__ud, tty_u->tid_l); + u3_noun tid = u3dc("scot", c3__ud, tty_u->tid_l); u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul); u3v_plan(u3k(pax), u3nc(c3__blew, u3nc(80, 25))); u3v_plan(u3k(pax), u3nc(c3__hail, u3_nul)); @@ -498,7 +498,7 @@ static void _term_it_show_wide(u3_utty* uty_u, c3_w len_w, c3_w* txt_w) { u3_noun wad = u3i_words(len_w, txt_w); - u3_noun txt = u3_do("tuft", wad); + u3_noun txt = u3do("tuft", wad); c3_c* txt_c = u3r_string(txt); _term_it_write_str(uty_u, txt_c); @@ -610,7 +610,7 @@ _term_it_show_more(u3_utty* uty_u) /* _term_it_path(): path for console file. */ static c3_c* -_term_it_path(u3_bean fyl, u3_noun pax) +_term_it_path(c3_o fyl, u3_noun pax) { c3_w len_w; c3_c *pas_c; @@ -673,7 +673,7 @@ _term_it_save(u3_noun pax, u3_noun pad) static void _term_io_belt(u3_utty* uty_u, u3_noun blb) { - u3_noun tid = u3_dc("scot", c3__ud, uty_u->tid_l); + u3_noun tid = u3dc("scot", c3__ud, uty_u->tid_l); u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul); u3v_plan(pax, u3nc(c3__belt, blb)); @@ -745,7 +745,7 @@ _tel_opt(_te_nvt* nvt, telnet_byte opt, _to_evt* evt) tel_u->uty_t.tat_u.siz.col_l = col_s; tel_u->uty_t.tat_u.siz.row_l = row_s; - tid = u3_dc("scot", c3__ud, tel_u->uty_t.tid_l); + tid = u3dc("scot", c3__ud, tel_u->uty_t.tid_l); pax = u3nq(u3_blip, c3__term, tid, u3_nul); blu = u3nc(col_s, row_s); u3v_plan(pax, u3nc(c3__blew, blu)); @@ -798,7 +798,7 @@ _term_io_suck_char(u3_utty* uty_u, c3_y cay_y) // uL(fprintf(uH, "muck-utf8 len %d\n", tat_u->fut.len_w)); // uL(fprintf(uH, "muck-utf8 %x\n", huv)); - wug = u3_do("turf", huv); + wug = u3do("turf", huv); // uL(fprintf(uH, "muck-utf32 %x\n", tat_u->fut.len_w)); tat_u->fut.len_w = tat_u->fut.wid_w = 0; diff --git a/v/unix.c b/v/unix.c index 5529bd425f..de40008d7b 100644 --- a/v/unix.c +++ b/v/unix.c @@ -265,7 +265,7 @@ _unix_file_watch(u3_ufil* fil_u, static c3_c* _unix_file_form(u3_udir* dir_u, u3_noun pre, - u3_bean ket, + c3_o ket, u3_noun ext) { c3_c* pre_c = u3r_string(pre); @@ -431,7 +431,7 @@ _unix_dir_free(u3_udir* dir_u) #if 0 /* _unix_file_update(): update file, true if plausibly changed. */ -static u3_bean +static c3_o _unix_file_update(u3_ufil* fil_u, mpz_t mod_mp) { if ( 0 == mpz_cmp(mod_mp, fil_u->mod_mp) ) { @@ -740,11 +740,11 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) ole = u3_ckdb_get(u3k(pam), u3k(wib)); if ( u3_none == ole ) { - ole = u3_do("cosh", u3nt(0, woz, u3_nul)); + ole = u3do("cosh", u3nt(0, woz, u3_nul)); } else { u3_noun elo; - elo = u3_do("cosh", u3nt(0, woz, u3k(u3t(u3t(ole))))); + elo = u3do("cosh", u3nt(0, woz, u3k(u3t(u3t(ole))))); u3z(ole); ole = elo; @@ -761,8 +761,8 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) ole = u3nt (0, u3_nul, u3_ckdb_put(u3_nul, u3k(har), - u3_do("cosh", u3nt(0, woz, u3_nul)))); - ole = u3_do("cosh", ole); + u3do("cosh", u3nt(0, woz, u3_nul)))); + ole = u3do("cosh", ole); } else { u3_noun roo = u3t(u3t(ole)); @@ -770,17 +770,17 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) u3_noun oor, elo; if ( u3_none == tup ) { - tup = u3_do("cosh", u3nt(0, woz, u3_nul)); + tup = u3do("cosh", u3nt(0, woz, u3_nul)); } else { u3_noun upt; - upt = u3_do("cosh", u3nt(0, woz, u3k(u3t(u3t(tup))))); + upt = u3do("cosh", u3nt(0, woz, u3k(u3t(u3t(tup))))); u3z(tup); tup = upt; } oor = u3_ckdb_put(u3k(roo), u3k(har), tup); - elo = u3_do("cosh", u3nt(0, u3k(u3h(u3t(ole))), oor)); + elo = u3do("cosh", u3nt(0, u3k(u3h(u3t(ole))), oor)); u3z(ole); ole = elo; } @@ -820,7 +820,7 @@ _unix_dir_ankh(u3_udir* dir_u) continue; } u3_noun baw = _unix_file_load(fil_u); - u3_noun woz = u3nt(u3_nul, u3_do("sham", u3k(baw)), baw); + u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(baw)), baw); u3z(dur); pam = _unix_dir_ankh_file(pam, u3k(u3t(wib)), baw, woz); u3z(wib); @@ -830,10 +830,10 @@ _unix_dir_ankh(u3_udir* dir_u) for ( fil_u = dir_u->fil_u; fil_u; fil_u = fil_u->nex_u ) { u3_noun wib = _unix_file_name(fil_u); u3_noun baw = _unix_file_load(fil_u); - u3_noun woz = u3nt(u3_nul, u3_do("sham", u3k(baw)), baw); + u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(baw)), baw); pam = _unix_dir_ankh_file(pam, wib, baw, woz); } - return u3_do("cosh", u3nt(0, u3_nul, pam)); + return u3do("cosh", u3nt(0, u3_nul, pam)); } /* _find_mug(): find a noun with a given mug. retain. DELETEME @@ -885,9 +885,9 @@ _unix_desk_peek(u3_noun hox, #if 0 /* _unix_ankh_sing_map(): compare ankh maps for u3_ankh_sing(). */ -static u3_bean _unix_ankh_sing_in(u3_noun, u3_noun); +static c3_o _unix_ankh_sing_in(u3_noun, u3_noun); -static u3_bean +static c3_o _unix_ankh_sing_map(u3_noun mun, u3_noun mur) // retain { u3_noun n_mun, l_mun, r_mun; @@ -910,7 +910,7 @@ _unix_ankh_sing_map(u3_noun mun, u3_noun mur) // retain /* _unix_node_sing(): test node equality. */ -static u3_bean +static c3_o _unix_node_sing(u3_noun xud, u3_noun bud) { if ( (u3_nul == xud) && (u3_nul == bud) ) { return c3y; } @@ -921,7 +921,7 @@ _unix_node_sing(u3_noun xud, u3_noun bud) /* _unix_ankh_sing_in(): stupid ankh test which ignores broken hash. */ -static u3_bean +static c3_o _unix_ankh_sing_in(u3_noun xun, u3_noun bur) // retain { u3_noun p_xun, q_xun, r_xun; @@ -938,7 +938,7 @@ _unix_ankh_sing_in(u3_noun xun, u3_noun bur) // retain /* _unix_ankh_sing(): full ankh compare. */ -static u3_bean +static c3_o _unix_ankh_sing(u3_noun xun, u3_noun bur) // retain { if ( c3y == u3r_sing(xun, bur) ) { @@ -971,7 +971,7 @@ _unix_desk_sync_into(u3_noun who, if ( (c3n == u3r_sing(u3h(xun), u3h(bur)))) { - doz = u3_dc("cost", xun, bur); + doz = u3dc("cost", xun, bur); pax = u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul); fav = u3nq(c3__into, who, syd, u3nc(c3y, doz)); @@ -1002,7 +1002,7 @@ _unix_ship_update(u3_uhot* hot_u) mpz_init_set(who_mp, hot_u->who_mp); who = u3i_mp(who_mp); - hox = u3_dc("scot", 'p', u3k(who)); + hox = u3dc("scot", 'p', u3k(who)); } for ( dis_u = dir_u->dis_u; dis_u; dis_u = dis_u->nex_u ) { @@ -1022,9 +1022,9 @@ _unix_ship_update(u3_uhot* hot_u) /* _unix_hot_gain(): gain ship. */ static void -_unix_hot_gain(u3_noun who, u3_bean mek) +_unix_hot_gain(u3_noun who, c3_o mek) { - u3_noun hox = u3_dc("scot", 'p', u3k(who)); + u3_noun hox = u3dc("scot", 'p', u3k(who)); c3_c* hox_c = u3r_string(hox); c3_c* pax_c = _unix_down(u3_Host.cpu_c, hox_c + 1); DIR* rid_u = opendir(pax_c); @@ -1109,7 +1109,7 @@ _unix_home(u3_noun who) static u3_noun _unix_desk_sync_udon(u3_noun don, u3_noun old) { - return u3_dc("lump", don, old); + return u3dc("lump", don, old); } /* _unix_desk_sync_tofu(): sync out file install. @@ -1298,7 +1298,7 @@ _unix_desk_sync_ergo(u3_noun hox, u3_noun bur = _unix_desk_peek(hox, syd, lok); if ( c3n == u3r_sing(xun, bur) ) { - u3_noun doz = u3_dc("cost", bur, xun); + u3_noun doz = u3dc("cost", bur, xun); _unix_desk_sync_soba(*dir_u, doz); } @@ -1328,8 +1328,8 @@ u3_unix_ef_ergo(u3_noun who, u3_noun syd, u3_noun rel) { - u3_noun hox = u3_dc("scot", 'p', u3k(who)); - u3_noun lok = u3_dc("scot", c3__ud, rel); + u3_noun hox = u3dc("scot", 'p', u3k(who)); + u3_noun lok = u3dc("scot", c3__ud, rel); u3_uhot* hot_u; hot_u = _unix_home(who); diff --git a/v/walk.c b/v/walk.c index c767a38a19..5a3413f391 100644 --- a/v/walk.c +++ b/v/walk.c @@ -206,7 +206,7 @@ _walk_in(const c3_c* dir_c, c3_w len_w) if ( !strcmp("noun", ext_c) ) { dat = u3_cke_cue(dat); } - hax = u3_do("sham", u3k(dat)); + hax = u3do("sham", u3k(dat)); if ( u3_none == get ) { get = u3_nul; } get = u3_ckdb_put(get, ext, u3nt(c3y, hax, dat)); @@ -257,7 +257,7 @@ u3_walk(const c3_c* dir_c, u3_noun old) /* u3_path(): C unix path in computer for file or directory. */ c3_c* -u3_path(u3_bean fyl, u3_noun pax) +u3_path(c3_o fyl, u3_noun pax) { c3_w len_w; c3_c *pas_c; From a2ba265d99e4c4f2425cc6c01e79dd8b023ff5eb Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 5 Nov 2014 19:10:22 -0800 Subject: [PATCH 10/14] Renaming, renaming. --- g/m.c | 2 +- g/r.c | 54 ++++++++++++------------ g/t.c | 6 +-- g/v.c | 16 +++---- g/z.c | 16 +++---- i/all.h | 115 ++++++++++---------------------------------------- i/g/a.h | 35 --------------- i/g/j.h | 2 +- i/g/r.h | 50 +++++++++++----------- i/g/u.h | 102 ++++++++++++++++++++++++++++++++++++++++++++ i/g/v.h | 6 +-- i/g/z.h | 16 +++---- i/j/k.h | 6 +-- i/j/q.h | 10 ++--- i/j/w.h | 6 +-- i/v/vere.h | 80 +++++++++++++++++------------------ j/1/gte.c | 2 +- j/1/gth.c | 2 +- j/1/lte.c | 2 +- j/1/lth.c | 2 +- j/4/by_has.c | 4 +- j/4/in_has.c | 4 +- j/5/loss.c | 10 ++--- j/5/parse.c | 2 +- j/5/tape.c | 2 +- j/6/fitz.c | 2 +- j/6/ut_conk.c | 4 +- j/6/ut_cull.c | 8 ++-- j/6/ut_fire.c | 6 +-- j/6/ut_mint.c | 8 ++-- j/6/ut_mull.c | 8 ++-- j/6/ut_nest.c | 54 ++++++++++++------------ j/6/ut_park.c | 2 +- j/6/ut_rest.c | 2 +- v/ames.c | 8 ++-- v/cttp.c | 12 +++--- v/http.c | 6 +-- v/loop.c | 22 +++++----- v/main.c | 4 +- v/raft.c | 10 ++--- v/reck.c | 22 +++++----- v/sist.c | 40 +++++++++--------- v/term.c | 14 +++--- v/unix.c | 50 +++++++++++----------- v/walk.c | 4 +- 45 files changed, 417 insertions(+), 421 deletions(-) create mode 100644 i/g/u.h diff --git a/g/m.c b/g/m.c index 7d528eea0a..fab87979ee 100644 --- a/g/m.c +++ b/g/m.c @@ -979,7 +979,7 @@ u3m_soft(c3_w sec_w, cod = u3k(u3h(u3t(why))); tax = u3k(u3t(u3t(why))); } - mok = u3_dc("mook", 2, tax); + mok = u3dc("mook", 2, tax); pro = u3nc(cod, u3k(u3t(mok))); u3z(mok); diff --git a/g/r.c b/g/r.c index 018fe0797c..160148acba 100644 --- a/g/r.c +++ b/g/r.c @@ -123,7 +123,7 @@ u3r_at(u3_atom a, return cut_t ? cut_w : i_w; } - static u3_bean + static c3_o _mean_extract(u3_noun som, c3_w len_w, struct _mean_pair* prs_m) @@ -148,7 +148,7 @@ u3r_at(u3_atom a, } } -u3_bean +c3_o u3r_mean(u3_noun som, ...) { @@ -533,7 +533,7 @@ _sung_one(u3_noun* a, u3_noun* b) /* _sung_x(): yes if a and b are the same noun, unifying. */ -static u3_bean +static c3_o _sung_x(u3_noun a, u3_noun b) { if ( a == b ) { @@ -618,7 +618,7 @@ _sung_x(u3_noun a, u3_noun b) ** ** Yes iff (a) and (b) are the same noun. */ -static u3_bean +static c3_o _sing_x(u3_noun a, u3_noun b) { @@ -699,7 +699,7 @@ _sing_x(u3_noun a, ** ** Yes iff (a) and (b) are the same noun. */ -u3_bean +c3_o u3r_sing(u3_noun a, u3_noun b) { @@ -708,14 +708,14 @@ u3r_sing(u3_noun a, /* u3r_sung(): yes iff (a) and (b) are the same noun, unifying equals. */ -u3_bean +c3_o u3r_sung(u3_noun a, u3_noun b) { return _sung_x(a, b); } -u3_bean +c3_o u3r_fing(u3_noun a, u3_noun b) { @@ -726,7 +726,7 @@ u3r_fing(u3_noun a, ** ** Yes iff `[p q]` and `b` are the same noun. */ -u3_bean +c3_o u3r_sing_cell(u3_noun p, u3_noun q, u3_noun b) @@ -735,7 +735,7 @@ u3r_sing_cell(u3_noun p, c3a(u3r_sing(p, u3a_h(b)), u3r_sing(q, u3a_t(b)))); } -u3_bean +c3_o u3r_fing_cell(u3_noun p, u3_noun q, u3_noun b) @@ -749,7 +749,7 @@ u3r_fing_cell(u3_noun p, ** ** Yes iff `[p q]` and `b` are the same noun. */ -u3_bean +c3_o u3r_sing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) @@ -758,7 +758,7 @@ u3r_sing_mixt(const c3_c* p_c, c3a(u3r_sing_c(p_c, u3a_h(b)), u3r_sing(q, u3a_t(b)))); } -u3_bean +c3_o u3r_fing_mixt(const c3_c* p_c, u3_noun q, u3_noun b) @@ -772,7 +772,7 @@ u3r_fing_mixt(const c3_c* p_c, ** ** Yes iff `[p q r]` and `b` are the same noun. */ -u3_bean +c3_o u3r_sing_trel(u3_noun p, u3_noun q, u3_noun r, @@ -782,7 +782,7 @@ u3r_sing_trel(u3_noun p, c3a(u3r_sing(p, u3a_h(b)), u3r_sing_cell(q, r, u3a_t(b)))); } -u3_bean +c3_o u3r_fing_trel(u3_noun p, u3_noun q, u3_noun r, @@ -797,7 +797,7 @@ u3r_fing_trel(u3_noun p, ** ** Yes iff `[p q r]` and `b` are the same noun. */ -u3_bean +c3_o u3r_sing_qual(u3_noun p, u3_noun q, u3_noun r, @@ -808,7 +808,7 @@ u3r_sing_qual(u3_noun p, c3a(u3r_sing(p, u3a_h(b)), u3r_sing_trel(q, r, s, u3a_t(b)))); } -u3_bean +c3_o u3r_fing_qual(u3_noun p, u3_noun q, u3_noun r, @@ -893,7 +893,7 @@ u3r_nord(u3_noun a, ** ** Yes iff (b) is the same noun as the C string a_c. */ -u3_bean +c3_o u3r_sing_c(const c3_c* a_c, u3_noun b) { @@ -922,7 +922,7 @@ u3r_sing_c(const c3_c* a_c, ** ** Factor [a] as a bush [b.[p q] c]. */ -u3_bean +c3_o u3r_bush(u3_noun a, u3_noun* b, u3_noun* c) @@ -948,7 +948,7 @@ u3r_bush(u3_noun a, ** ** Factor (a) as a cell (b c). */ -u3_bean +c3_o u3r_cell(u3_noun a, u3_noun* b, u3_noun* c) @@ -969,7 +969,7 @@ u3r_cell(u3_noun a, ** ** & [0] if [a] is of the form [b *c]. */ -u3_bean +c3_o u3r_p(u3_noun a, u3_noun b, u3_noun* c) @@ -989,7 +989,7 @@ u3r_p(u3_noun a, ** ** & [0] if [a] is of the form [b *c d]. */ -u3_bean +c3_o u3r_pq(u3_noun a, u3_noun b, u3_noun* c, @@ -1009,7 +1009,7 @@ u3r_pq(u3_noun a, ** ** & [0] if [a] is of the form [b *c *d *e]. */ -u3_bean +c3_o u3r_pqr(u3_noun a, u3_noun b, u3_noun* c, @@ -1030,7 +1030,7 @@ u3r_pqr(u3_noun a, ** ** & [0] if [a] is of the form [b *c *d *e *f]. */ -u3_bean +c3_o u3r_pqrs(u3_noun a, u3_noun b, u3_noun* c, @@ -1052,7 +1052,7 @@ u3r_pqrs(u3_noun a, ** ** Factor (a) as a trel (b c d). */ -u3_bean +c3_o u3r_trel(u3_noun a, u3_noun *b, u3_noun *c, @@ -1073,7 +1073,7 @@ u3r_trel(u3_noun a, ** ** Factor (a) as a qual (b c d e). */ -u3_bean +c3_o u3r_qual(u3_noun a, u3_noun* b, u3_noun* c, @@ -1093,7 +1093,7 @@ u3r_qual(u3_noun a, ** ** Factor (a) as a quil (b c d e f). */ -u3_bean +c3_o u3r_quil(u3_noun a, u3_noun* b, u3_noun* c, @@ -1114,7 +1114,7 @@ u3r_quil(u3_noun a, ** ** Factor (a) as a hext (b c d e f g) */ -u3_bean +c3_o u3r_hext(u3_noun a, u3_noun* b, u3_noun* c, @@ -1580,7 +1580,7 @@ u3_mur(u3_noun veb) return mur_w; } - if ( u3_dog_is_pom(veb) ) { + if ( u3dog_is_pom(veb) ) { mur_w = u3_mur_both(u3_mur(u3h(veb)), u3_mur(u3t(veb))); } else { diff --git a/g/t.c b/g/t.c index 2237a7c011..8b31479d64 100644 --- a/g/t.c +++ b/g/t.c @@ -64,7 +64,7 @@ u3t_heck(u3_atom cog) if ( 0 == u3R->pro.day ) { u3R->pro.day = u3v_do("doss", 0); } - u3R->pro.day = u3_dc("pi-heck", cog, u3R->pro.day); + u3R->pro.day = u3dc("pi-heck", cog, u3R->pro.day); } /* u3t_samp(): sample. @@ -74,7 +74,7 @@ u3t_samp(void) { if ( 0 == u3R->pro.day ) { u3R->pro.day = u3v_do("doss", 0); } - u3R->pro.day = u3_dc("pi-noon", u3k(u3R->pro.don), u3R->pro.day); + u3R->pro.day = u3dc("pi-noon", u3k(u3R->pro.don), u3R->pro.day); } /* u3t_come(): push on profile stack. @@ -107,7 +107,7 @@ void u3t_damp(void) { if ( 0 != u3R->pro.day ) { - u3_noun wol = u3_do("pi-tell", u3R->pro.day); + u3_noun wol = u3do("pi-tell", u3R->pro.day); u3m_wall(wol); u3R->pro.day = u3v_do("doss", 0); diff --git a/g/v.c b/g/v.c index a0c7e5a61e..bf05b239a0 100644 --- a/g/v.c +++ b/g/v.c @@ -218,7 +218,7 @@ _cv_nock_poke(u3_noun ovo) #if 0 { c3_c* ovi_c = u3r_string(u3h(u3t(ovo))); - u3_noun tox = u3_do("spat", u3k(u3h(ovo))); + u3_noun tox = u3do("spat", u3k(u3h(ovo))); c3_c* tox_c = u3r_string(tox); printf("poke: %%%s (%x) on %s\r\n", ovi_c, u3r_mug(ovo), tox_c); @@ -292,7 +292,7 @@ u3v_do(const c3_c* txt_c, u3_noun sam) static u3_noun _cv_scot(u3_noun dim) { - return u3_do("scot", dim); + return u3do("scot", dim); } /* u3v_time(): set the reck time. @@ -348,12 +348,12 @@ u3v_keep(u3_noun hap) #if 0 /* _cv_mole(): parse simple atomic mole. */ -static u3_bean +static c3_o _cv_mole(u3_noun fot, u3_noun san, c3_d* ato_d) { - u3_noun uco = u3_do("slay", san); + u3_noun uco = u3do("slay", san); u3_noun p_uco, q_uco, r_uco, s_uco; if ( (c3n == u3r_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || @@ -374,7 +374,7 @@ _cv_mole(u3_noun fot, /* _cv_lily(): parse little atom. */ -static u3_bean +static c3_o _cv_lily(u3_noun fot, u3_noun txt, c3_l* tid_l) { c3_d ato_d; @@ -404,7 +404,7 @@ u3v_poke(u3_noun ovo) /* u3v_http_request(): hear http request on channel (unprotected). */ void -u3v_http_request(u3_bean sec, u3_noun pox, u3_noun req) +u3v_http_request(c3_o sec, u3_noun pox, u3_noun req) { // uL(fprintf(uH, "http: request\n")); u3v_plan(pox, u3nq(c3__this, sec, 0, req)); @@ -432,7 +432,7 @@ u3v_punt(u3_noun blu, c3_l tab_l, u3_noun tac) // We are calling nock here, but hopefully need no protection. // while ( c3y == u3r_du(cat) ) { - u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); + u3_noun wol = u3dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); u3m_wall(wol); cat = u3t(cat); @@ -446,7 +446,7 @@ u3v_punt(u3_noun blu, c3_l tab_l, u3_noun tac) void u3v_sway(u3_noun blu, c3_l tab_l, u3_noun tax) { - u3_noun mok = u3_dc("mook", 2, tax); + u3_noun mok = u3dc("mook", 2, tax); u3v_punt(blu, tab_l, u3k(u3t(mok))); u3z(mok); diff --git a/g/z.c b/g/z.c index 004773d7f1..7d56d2d71b 100644 --- a/g/z.c +++ b/g/z.c @@ -7,7 +7,7 @@ /* u3z_find(): find in memo cache. Arguments retained. */ u3_weak -u3z_find(u3_mote fun, u3_noun one) +u3z_find(c3_m fun, u3_noun one) { u3_noun key = u3nc(fun, u3k(one)); u3_noun val; @@ -17,7 +17,7 @@ u3z_find(u3_mote fun, u3_noun one) return val; } u3_weak -u3z_find_2(u3_mote fun, u3_noun one, u3_noun two) +u3z_find_2(c3_m fun, u3_noun one, u3_noun two) { u3_noun key = u3nt(fun, u3k(one), u3k(two)); u3_noun val; @@ -27,7 +27,7 @@ u3z_find_2(u3_mote fun, u3_noun one, u3_noun two) return val; } u3_weak -u3z_find_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri) +u3z_find_3(c3_m fun, u3_noun one, u3_noun two, u3_noun tri) { u3_noun key = u3nq(fun, u3k(one), u3k(two), u3k(tri)); u3_noun val; @@ -37,7 +37,7 @@ u3z_find_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri) return val; } u3_weak -u3z_find_4(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun qua) +u3z_find_4(c3_m fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun qua) { u3_noun key = u3nc(fun, u3nq(u3k(one), u3k(two), u3k(tri), u3k(qua))); u3_noun val; @@ -50,7 +50,7 @@ u3z_find_4(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun qua) /* u3z_save*(): save in memo cache. */ u3_noun -u3z_save(u3_mote fun, u3_noun one, u3_noun val) +u3z_save(c3_m fun, u3_noun one, u3_noun val) { u3_noun key = u3nc(fun, u3k(one)); @@ -59,7 +59,7 @@ u3z_save(u3_mote fun, u3_noun one, u3_noun val) return val; } u3_noun -u3z_save_2(u3_mote fun, u3_noun one, u3_noun two, u3_noun val) +u3z_save_2(c3_m fun, u3_noun one, u3_noun two, u3_noun val) { u3_noun key = u3nt(fun, u3k(one), u3k(two)); @@ -68,7 +68,7 @@ u3z_save_2(u3_mote fun, u3_noun one, u3_noun two, u3_noun val) return val; } u3_noun -u3z_save_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun val) +u3z_save_3(c3_m fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun val) { u3_noun key = u3nq(fun, u3k(one), u3k(two), u3k(tri)); @@ -77,7 +77,7 @@ u3z_save_3(u3_mote fun, u3_noun one, u3_noun two, u3_noun tri, u3_noun val) return val; } u3_noun -u3z_save_4(u3_mote fun, +u3z_save_4(c3_m fun, u3_noun one, u3_noun two, u3_noun tri, diff --git a/i/all.h b/i/all.h index 640d7aef36..38dc466f11 100644 --- a/i/all.h +++ b/i/all.h @@ -2,101 +2,30 @@ ** ** This file is in the public domain. */ - /** Prefix definitions: - *** - *** u3_ca_: fundamental allocators. - *** u3_cc_: constants. - *** u3_ce_: checkpointing. - *** u3_ch_: HAMT hash tables. - *** u3_ci_: noun constructors - *** u3_cj_: jets. - *** u3_ck*: direct jet calls (modern C convention) - *** u3_cm_: system management etc. - *** u3_cn_: nock interpreter. - *** u3_co_: fundamental macros. - *** u3_cq*: direct jet calls (archaic C convention) - *** u3_cr_: read functions which never bail out. - *** u3_cs_: structures and definitions. - *** u3_ct_: tracing. - *** u3_cw_: direct jet calls (core noun convention) - *** u3_cx_: read functions which do bail out. - *** u3_cv_: arvo specific structures. - *** u3_cz_: memoization. - *** - *** u3_cr_, u3_cx_, u3_cz_ functions use retain conventions; the caller - *** retains ownership of passed-in nouns, the callee preserves - *** ownership of returned nouns. - *** - *** Unless documented otherwise, all other functions use transfer - *** conventions; the caller logically releases passed-in nouns, - *** the callee logically releases returned nouns. - *** - *** In general, exceptions to the transfer convention all occur - *** when we're using a noun as a key. + /** c3: C environment. **/ +# include "c/portable.h" // C and OS portability +# include "c/types.h" // c3 types +# include "c/defs.h" // c3 macros +# include "c/motes.h" // c3 constants - /** c: the c3 layer, C portability and definitions. - **/ -# include "c/portable.h" -# include "c/types.h" -# include "c/defs.h" -# include "c/motes.h" - - /** miscellaneous definitions and data structures. - **/ - /* u3_yes, u3_no, u3_nul; - ** - ** Our Martian booleans and list terminator; empty string; not a noun. - */ -# define u3_nul 0 -# define u3_blip 0 - - /* Tools for Martian booleans. - */ -# define u3_assure(x) if ( !_(x) ) { u3m_bail(c3__fail); } -# define u3_assent(x) if ( !_(x) ) { u3m_bail(c3__exit); } - - - /** Aliases - selective and syntactically unique. + /** u3: noun environment. **/ -# define u3h(som) u3x_h(som) -# define u3t(som) u3x_t(som) -# define u3at(axe, som) u3x_at(axe, som) +# include "g/u.h" // general u3 -# define u3nc(a, b) u3i_cell(a, b) -# define u3nt(a, b, c) u3i_trel(a, b, c) -# define u3nq(a, b, c, d) u3i_qual(a, b, c, d) +# include "g/a.h" // u3a: allocation +# include "g/e.h" // u3e: persistence +# include "g/h.h" // u3h: hashtables +# include "g/i.h" // u3i: noun construction +# include "g/j.h" // u3j: jet control +# include "g/m.h" // u3m: master state +# include "g/n.h" // u3n: nock execution +# include "g/r.h" // u3r: noun access (error returns) +# include "g/t.h" // u3t: profiling / tracing +# include "g/x.h" // u3x: noun access (error crashes) +# include "g/v.h" // u3v: arvo kernel +# include "g/z.h" // u3z: memoization -# define u3du(som) (u3r_du(som)) -# define u3ud(som) (u3r_ud(som)) - -# define u3k(som) u3a_gain(som) -# define u3z(som) u3a_lose(som) - - /** Arvo macros. - **/ -# define u3_do(txt_c, arg) u3v_do(txt_c, arg) -# define u3_dc(txt_c, a, b) u3v_do(txt_c, u3nc(a, b)) -# define u3_dt(txt_c, a, b, c) u3v_do(txt_c, u3nt(a, b, c)) -# define u3_dq(txt_c, a, b, c, d) u3v_do(txt_c, u3nt(a, b, c, d)) - - /** g: the u3 layer, functions. - **/ -# include "g/a.h" -# include "g/e.h" -# include "g/h.h" -# include "g/i.h" -# include "g/j.h" -# include "g/m.h" -# include "g/n.h" -# include "g/r.h" -# include "g/t.h" -# include "g/x.h" -# include "g/v.h" -# include "g/z.h" - - /** j: the u3 layer, jets. - **/ -# include "j/k.h" -# include "j/w.h" -# include "j/q.h" +# include "j/k.h" // u3k: jets (transfer, args) +# include "j/q.h" // u3q: jets (retain, args) +# include "j/w.h" // u3w: jets (retain, core) diff --git a/i/g/a.h b/i/g/a.h index 8892b512cc..06c82f4c0c 100644 --- a/i/g/a.h +++ b/i/g/a.h @@ -18,41 +18,6 @@ /** Data structures. - **/ - /* u3_post: pointer offset into u3_Loom; _p suffix; declare as u3p(). - */ - typedef c3_w u3_post; -# define u3p(type) u3_post - - /* u3_noun: tagged pointer. - ** - ** If bit 31 is 0, a u3_noun is a direct 31-bit atom ("cat"). - ** If bit 31 is 1 and bit 30 0, an indirect atom ("pug"). - ** If bit 31 is 1 and bit 30 1, an indirect cell ("pom"). - ** - ** Bits 0-29 are a word offset against u3_Loom (u3_post). - */ - typedef c3_w u3_noun; - - /* u3_none - out-of-band noun. - */ -# define u3_none (u3_noun)0xffffffff - - /* Informative typedefs. Use if you like. - */ - typedef u3_noun u3_atom; // must be atom - typedef u3_noun u3_term; // @tas - typedef u3_noun u3_mote; // @tas - typedef u3_noun u3_cell; // must be cell - typedef u3_noun u3_trel; // must be triple - typedef u3_noun u3_qual; // must be quadruple - typedef u3_noun u3_quin; // must be quintuple - typedef u3_noun u3_bean; // loobean: 0 == c3y, 1 == c3n - typedef u3_noun u3_weak; // may be u3_none - typedef u3_noun (*u3_funk)(u3_noun); - typedef u3_noun (*u3_funq)(u3_noun, u3_noun); - - /** Typedefs. **/ /* u3_atom, u3_cell: logical atom and cell structures. */ diff --git a/i/g/j.h b/i/g/j.h index 60ea0099d9..8db977c109 100644 --- a/i/g/j.h +++ b/i/g/j.h @@ -67,7 +67,7 @@ typedef struct _u3e_harm { c3_c* fcs_c; // `.axe` or name u3_noun (*fun_f)(u3_noun); // compute or 0 / semitransfer - // u3_bean (*val_f)(u3_noun); // validate or 0 / retain + // c3_o (*val_f)(u3_noun); // validate or 0 / retain c3_o ice; // perfect (don't test) c3_o tot; // total (never punts) c3_o liv; // live (enabled) diff --git a/i/g/r.h b/i/g/r.h index a089031f18..2f327858f1 100644 --- a/i/g/r.h +++ b/i/g/r.h @@ -10,12 +10,12 @@ #else /* u3r_du(): c3y iff `a` is cell. */ - u3_bean + c3_o u3r_du(u3_noun a); /* u3r_ud(): c3n iff `a` is cell. */ - u3_bean + c3_o u3r_ud(u3_noun a); #endif @@ -30,7 +30,7 @@ ** Attempt to deconstruct `a` by axis, noun pairs; 0 terminates. ** Axes must be sorted in tree order. */ - u3_bean + c3_o u3r_mean(u3_noun a, ...); @@ -96,7 +96,7 @@ ** Yes iff (a) and (b) are the same copy of the same noun. ** (Ie, by pointer equality - u3r_sing with false negatives.) */ - u3_bean + c3_o u3r_fing(u3_noun a, u3_noun b); @@ -104,7 +104,7 @@ ** ** Yes iff `[p q]` and `b` are the same copy of the same noun. */ - u3_bean + c3_o u3r_fing_cell(u3_noun p, u3_noun q, u3_noun b); @@ -113,7 +113,7 @@ ** ** Yes iff `[p q]` and `b` are the same copy of the same noun. */ - u3_bean + c3_o u3r_fing_mixt(const c3_c* p_c, u3_noun q, u3_noun b); @@ -122,7 +122,7 @@ ** ** Yes iff `[p q r]` and `b` are the same copy of the same noun. */ - u3_bean + c3_o u3r_fing_trel(u3_noun p, u3_noun q, u3_noun r, @@ -132,7 +132,7 @@ ** ** Yes iff `[p q r s]` and `b` are the same copy of the same noun. */ - u3_bean + c3_o u3r_fing_qual(u3_noun p, u3_noun q, u3_noun r, @@ -143,7 +143,7 @@ ** ** Yes iff (a) and (b) are the same noun. */ - u3_bean + c3_o u3r_sing(u3_noun a, u3_noun b); @@ -152,7 +152,7 @@ ** Make sure you have no live, uncounted pointers to any noun ** within (a) or (b)! */ - u3_bean + c3_o u3r_sung(u3_noun a, u3_noun b); @@ -160,7 +160,7 @@ ** ** Yes iff (b) is the same noun as the C string [a]. */ - u3_bean + c3_o u3r_sing_c(const c3_c* a_c, u3_noun b); @@ -168,7 +168,7 @@ ** ** Yes iff `[p q]` and `b` are the same noun. */ - u3_bean + c3_o u3r_sing_cell(u3_noun p, u3_noun q, u3_noun b); @@ -177,7 +177,7 @@ ** ** Yes iff `[p q]` and `b` are the same noun. */ - u3_bean + c3_o u3r_sing_mixt(const c3_c* p_c, u3_noun q, u3_noun b); @@ -186,7 +186,7 @@ ** ** Yes iff `[p q r]` and `b` are the same noun. */ - u3_bean + c3_o u3r_sing_trel(u3_noun p, u3_noun q, u3_noun r, @@ -196,7 +196,7 @@ ** ** Yes iff `[p q r s]` and `b` are the same noun. */ - u3_bean + c3_o u3r_sing_qual(u3_noun p, u3_noun q, u3_noun r, @@ -215,7 +215,7 @@ ** ** Divide `a` as a mold `[b.[p q] c]`. */ - u3_bean + c3_o u3r_mold(u3_noun a, u3_noun* b, u3_noun* c); @@ -224,7 +224,7 @@ ** ** Divide `a` as a cell `[b c]`. */ - u3_bean + c3_o u3r_cell(u3_noun a, u3_noun* b, u3_noun* c); @@ -233,7 +233,7 @@ ** ** Divide `a` as a trel `[b c]`. */ - u3_bean + c3_o u3r_trel(u3_noun a, u3_noun* b, u3_noun* c, @@ -243,7 +243,7 @@ ** ** Divide (a) as a qual [b c d e f]. */ - u3_bean + c3_o u3r_qual(u3_noun a, u3_noun* b, u3_noun* c, @@ -254,7 +254,7 @@ ** ** Divide (a) as a quil [b c d e f]. */ - u3_bean + c3_o u3r_quil(u3_noun a, u3_noun* b, u3_noun* c, @@ -266,7 +266,7 @@ ** ** & [0] if [a] is of the form [b *c]. */ - u3_bean + c3_o u3r_p(u3_noun a, u3_noun b, u3_noun* c); @@ -275,7 +275,7 @@ ** ** Factor [a] as a bush [b.[p q] c]. */ - u3_bean + c3_o u3r_bush(u3_noun a, u3_noun* b, u3_noun* c); @@ -284,7 +284,7 @@ ** ** & [0] if [a] is of the form [b *c d]. */ - u3_bean + c3_o u3r_pq(u3_noun a, u3_noun b, u3_noun* c, @@ -294,7 +294,7 @@ ** ** & [0] if [a] is of the form [b *c *d *e]. */ - u3_bean + c3_o u3r_pqr(u3_noun a, u3_noun b, u3_noun* c, @@ -305,7 +305,7 @@ ** ** & [0] if [a] is of the form [b *c *d *e *f]. */ - u3_bean + c3_o u3r_pqrs(u3_noun a, u3_noun b, u3_noun* c, diff --git a/i/g/u.h b/i/g/u.h new file mode 100644 index 0000000000..c9abb0f701 --- /dev/null +++ b/i/g/u.h @@ -0,0 +1,102 @@ +/* include/all.h +** +** This file is in the public domain. +*/ + /** Typedefs. + **/ + /* u3_post: pointer offset into u3_Loom; _p suffix; declare as u3p(). + */ + typedef c3_w u3_post; +# define u3p(type) u3_post + + /* u3_noun: tagged noun pointer. + ** + ** If bit 31 is 0, a u3_noun is a direct 31-bit atom ("cat"). + ** If bit 31 is 1 and bit 30 0, an indirect atom ("pug"). + ** If bit 31 is 1 and bit 30 1, an indirect cell ("pom"). + ** + ** Bits 0-29 are a word offset against u3_Loom (u3_post). + */ + typedef c3_w u3_noun; + + /* u3_weak: u3_noun which may be u3_none (not a noun). + */ + typedef u3_noun u3_weak; + + /* u3_atom: u3_noun which must be an atom. + */ + typedef u3_noun u3_atom; + + /* u3_term: u3_noun which must be a term (@tas). + */ + typedef u3_noun u3_term; + + /* u3_cell, u3_trel, u3_qual, u3_quin: cell, triple, quadruple, quintuple. + */ + typedef u3_noun u3_cell; + typedef u3_noun u3_trel; + typedef u3_noun u3_qual; + typedef u3_noun u3_quin; + + /* u3_funk, u3_funq: unary and binary noun functions. + */ + typedef u3_noun (*u3_funk)(u3_noun); + typedef u3_noun (*u3_funq)(u3_noun, u3_noun); + + + /** Constants. + **/ + /* u3_none - u3_noun which is not a noun. + */ +# define u3_none (u3_noun)0xffffffff + + /* u3_nul: 0, hoon ~. + */ +# define u3_nul 0 + + /* u3_blip: 0, hoon %$. + */ +# define u3_blip 0 + + + /** Macros. + **/ + /* u3_assure(): loobean assert, bailing with %fail. + */ +# define u3_assure(x) if ( !_(x) ) { u3m_bail(c3__fail); } + + /* u3_assert(): loobean assert, bailing with %exit. + */ +# define u3_assent(x) if ( !_(x) ) { u3m_bail(c3__exit); } + + + /** Aliases. + **/ + /* u3h(), u3t(), u3at(): noun fragments. + */ +# define u3h(som) u3x_h(som) +# define u3t(som) u3x_t(som) +# define u3at(axe, som) u3x_at(axe, som) + + /* u3nc(), u3nt(), u3nq(): tuple composition. + */ +# define u3nc(a, b) u3i_cell(a, b) +# define u3nt(a, b, c) u3i_trel(a, b, c) +# define u3nq(a, b, c, d) u3i_qual(a, b, c, d) + + /* u3du(), u3ud(): noun/cell test. + */ +# define u3du(som) (u3r_du(som)) +# define u3ud(som) (u3r_ud(som)) + + /* u3k(), u3z(): reference counts. + */ +# define u3k(som) u3a_gain(som) +# define u3z(som) u3a_lose(som) + + /* u3do(), u3dc(), u3dt(), u3dq(): arvo calls. + */ +# define u3do(txt_c, arg) u3v_do(txt_c, arg) +# define u3dc(txt_c, a, b) u3v_do(txt_c, u3nc(a, b)) +# define u3dt(txt_c, a, b, c) u3v_do(txt_c, u3nt(a, b, c)) +# define u3dq(txt_c, a, b, c, d) u3v_do(txt_c, u3nt(a, b, c, d)) diff --git a/i/g/v.h b/i/g/v.h index 5d04728313..ead6a36765 100644 --- a/i/g/v.h +++ b/i/g/v.h @@ -10,8 +10,8 @@ typedef struct _u3v_cart { u3_noun vir; // effects of ovum - u3_bean did; // cart considered for commit? - u3_bean cit; // cart committed? + c3_o did; // cart considered for commit? + c3_o cit; // cart committed? c3_d ent_d; // entry in raft queue? u3p(struct _u3v_cart) nex_p; } u3v_cart; @@ -130,7 +130,7 @@ /* u3v_http_request(): hear http request on channel (unprotected). */ void - u3v_http_request(u3_bean sec, u3_noun pox, u3_noun req); + u3v_http_request(c3_o sec, u3_noun pox, u3_noun req); /* u3v_tank(): dump single tank. */ diff --git a/i/g/z.h b/i/g/z.h index e645d71f1c..fca7f6297e 100644 --- a/i/g/z.h +++ b/i/g/z.h @@ -14,18 +14,18 @@ **/ /* u3z_find*(): find in memo cache. */ - u3_weak u3z_find(u3_mote, u3_noun); - u3_weak u3z_find_2(u3_mote, u3_noun, u3_noun); - u3_weak u3z_find_3(u3_mote, u3_noun, u3_noun, u3_noun); - u3_weak u3z_find_4(u3_mote, u3_noun, u3_noun, u3_noun, u3_noun); + u3_weak u3z_find(c3_m, u3_noun); + u3_weak u3z_find_2(c3_m, u3_noun, u3_noun); + u3_weak u3z_find_3(c3_m, u3_noun, u3_noun, u3_noun); + u3_weak u3z_find_4(c3_m, u3_noun, u3_noun, u3_noun, u3_noun); /* u3z_save*(): save in memo cache. */ - u3_noun u3z_save(u3_mote, u3_noun, u3_noun); - u3_noun u3z_save_2(u3_mote, u3_noun, u3_noun, u3_noun); - u3_noun u3z_save_3(u3_mote, u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3z_save(c3_m, u3_noun, u3_noun); + u3_noun u3z_save_2(c3_m, u3_noun, u3_noun, u3_noun); + u3_noun u3z_save_3(c3_m, u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3z_save_4 - (u3_mote, u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); + (c3_m, u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); /* u3z_uniq(): uniquify with memo cache. */ diff --git a/i/j/k.h b/i/j/k.h index a943a18ebb..be6d0b19a2 100644 --- a/i/j/k.h +++ b/i/j/k.h @@ -8,7 +8,7 @@ u3_noun u3_cka_sub(u3_noun a, u3_noun b); u3_noun u3_cka_mul(u3_noun a, u3_noun b); u3_noun u3_cka_gth(u3_noun a, u3_noun b); - u3_bean u3_cka_lte(u3_noun a, u3_noun b); + u3_noun u3_cka_lte(u3_noun a, u3_noun b); /** Tier 2. **/ @@ -47,7 +47,7 @@ /* u3_ckdb_has(): test for get. */ - u3_bean + u3_noun u3_ckdb_has(u3_noun a, u3_noun b); /* u3_ckdb_gas(): list to map. @@ -62,7 +62,7 @@ /* u3_ckdi_has(): test for presence. */ - u3_bean + u3_noun u3_ckdi_has(u3_noun a, u3_noun b); /* u3_ckdi_tap(): map/set convert to list. (solves by_tap also.) diff --git a/i/j/q.h b/i/j/q.h index badff07f3e..b9d15ea2b1 100644 --- a/i/j/q.h +++ b/i/j/q.h @@ -64,14 +64,14 @@ **/ u3_noun u3_cqdb_gas(u3_noun, u3_noun); u3_noun u3_cqdb_get(u3_noun, u3_noun); - u3_bean u3_cqdb_has(u3_noun, u3_noun); + u3_noun u3_cqdb_has(u3_noun, u3_noun); u3_noun u3_cqdb_int(u3_noun, u3_noun); u3_noun u3_cqdb_put(u3_noun, u3_noun, u3_noun); # define u3_cqdb_tap u3_cqdi_tap u3_noun u3_cqdb_uni(u3_noun, u3_noun); u3_noun u3_cqdi_gas(u3_noun, u3_noun); - u3_bean u3_cqdi_has(u3_noun, u3_noun); + u3_noun u3_cqdi_has(u3_noun, u3_noun); u3_noun u3_cqdi_int(u3_noun, u3_noun); u3_noun u3_cqdi_mer(u3_noun, u3_noun); u3_noun u3_cqdi_put(u3_noun, u3_noun); @@ -150,7 +150,7 @@ u3_noun u3_cqfu_bust(u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_conk(u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_crop(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_cull(u3_noun, u3_noun, u3_bean, u3_atom, u3_noun); + u3_noun u3_cqfu_cull(u3_noun, u3_noun, u3_noun, u3_atom, u3_noun); u3_noun u3_cqfu_duck(u3_noun, u3_noun); u3_noun u3_cqfu_dung(u3_noun, u3_noun cap, u3_noun); u3_noun u3_cqfu_dunq(u3_noun, const c3_c*, u3_noun); @@ -166,8 +166,8 @@ u3_noun u3_cqfu_lose(u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_mint(u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_mull(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_bean u3_cqfu_nest(u3_noun, u3_noun, u3_bean, u3_noun); - u3_bean u3_cqfu_orth(u3_noun, u3_noun, u3_noun); + u3_noun u3_cqfu_nest(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3_cqfu_orth(u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_park(u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_peek(u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3_cqfu_play(u3_noun, u3_noun, u3_noun); diff --git a/i/j/w.h b/i/j/w.h index 1b5bf7e712..bb4d30a1cd 100644 --- a/i/j/w.h +++ b/i/j/w.h @@ -69,14 +69,14 @@ **/ u3_noun u3_cwdb_gas(u3_noun); u3_noun u3_cwdb_get(u3_noun); - u3_bean u3_cwdb_has(u3_noun); + u3_noun u3_cwdb_has(u3_noun); u3_noun u3_cwdb_int(u3_noun); u3_noun u3_cwdb_put(u3_noun); # define u3_cwdb_tap u3_cwdi_tap u3_noun u3_cwdb_uni(u3_noun); u3_noun u3_cwdi_gas(u3_noun); - u3_bean u3_cwdi_has(u3_noun); + u3_noun u3_cwdi_has(u3_noun); u3_noun u3_cwdi_int(u3_noun); u3_noun u3_cwdi_mer(u3_noun); u3_noun u3_cwdi_put(u3_noun); @@ -184,7 +184,7 @@ u3_noun u3_cwfu_heal(u3_noun); u3_noun u3_cwfu_mint(u3_noun); u3_noun u3_cwfu_mull(u3_noun); - u3_bean u3_cwfu_nest(u3_noun); + u3_noun u3_cwfu_nest(u3_noun); u3_noun u3_cwfu_park(u3_noun); u3_noun u3_cwfu_peek(u3_noun); u3_noun u3_cwfu_play(u3_noun); diff --git a/i/v/vere.h b/i/v/vere.h index 23a44d29b2..7ef0c401e0 100644 --- a/i/v/vere.h +++ b/i/v/vere.h @@ -72,8 +72,8 @@ void* par_u; // struct http_parser * c3_c* url_c; // url c3_w ipf_w; // ipv4 - u3_bean liv; // keepalive - u3_bean end; // all responses added + c3_o liv; // keepalive + c3_o end; // all responses added u3_hhed* hed_u; // headers u3_hbod* bod_u; // body parts (exit) u3_hbod* dob_u; // body parts (entry) @@ -113,7 +113,7 @@ c3_w sev_l; // server number c3_w coq_l; // next connection number c3_w por_w; // running port - u3_bean sec; // logically secure + c3_o sec; // logically secure struct _u3_hcon* hon_u; // connection list struct _u3_http* nex_u; // next in list } u3_http; @@ -136,7 +136,7 @@ c3_c* hot_c; // host c3_s por_s; // port c3_c* url_c; // url - u3_bean sec; // yes == https + c3_o sec; // yes == https u3_hmet met_e; // method u3_hhed* hed_u; // headers u3_hbod* bod_u; // body @@ -164,7 +164,7 @@ c3_c* hot_c; // hostname c3_s por_s; // port c3_w ipf_w; // IP - u3_bean sec; // yes == https + c3_o sec; // yes == https u3_hbod* rub_u; // exit of send queue u3_hbod* bur_u; // entry of send queue u3_creq* ceq_u; // exit of request queue @@ -203,7 +203,7 @@ typedef struct _u3_ames { // packet network state uv_udp_t wax_u; // socket state uv_timer_t tim_u; // network timer - u3_bean alm; // alarm on + c3_o alm; // alarm on c3_w law_w; // last wakeup, unix time c3_s por_s; // public IPv4 port c3_w imp_w[256]; // imperial IPs @@ -241,8 +241,8 @@ } mir; struct { // escape code control - u3_bean ape; // escape received - u3_bean bra; // bracket or O received + c3_o ape; // escape received + c3_o bra; // bracket or O received } esc; struct { @@ -298,8 +298,8 @@ */ typedef struct _u3_unod { uv_fs_event_t was_u; // stat watcher - u3_bean dir; // always - u3_bean dry; // ie, unmodified + c3_o dir; // always + c3_o dry; // ie, unmodified c3_c* pax_c; // absolute path struct _u3_udir* par_u; // in directory } u3_unod; @@ -308,8 +308,8 @@ */ typedef struct _u3_ufil { uv_fs_event_t was_u; // stat watcher - u3_bean non; // always u3_no - u3_bean dry; // ie, unmodified + c3_o non; // always u3_no + c3_o dry; // ie, unmodified c3_c* pax_c; // absolute path struct _u3_udir* par_u; // in directory c3_c* dot_c; // extension point or 0 @@ -321,8 +321,8 @@ */ typedef struct _u3_udir { uv_fs_event_t was_u; // stat watcher - u3_bean yes; // always u3_yes - u3_bean dry; // ie, unmodified + c3_o yes; // always u3_yes + c3_o dry; // ie, unmodified c3_c* pax_c; // absolute path struct _u3_udir* par_u; // parent directory struct _u3_udir* dis_u; // subdirectories @@ -355,7 +355,7 @@ #ifdef SYNCLOG c3_w lot_w; // sync-slot struct _u3_sylo { - u3_bean unx; // from unix + c3_o unx; // from unix c3_m wer_m; // mote saying where c3_m wot_m; // mote saying what c3_c* pax_c; // path @@ -368,7 +368,7 @@ typedef struct _u3_batz { uv_timer_t tim_u; // batz timer c3_w run_w; // run of consecutive alarms - u3_bean alm; // alarm + c3_o alm; // alarm } u3_batz; /* u3_temp: just a timer for ever @@ -376,7 +376,7 @@ typedef struct _u3_temp { uv_timer_t tim_u; // temp timer c3_w run_w; // run of consecutive alarms - u3_bean alm; // alarm + c3_o alm; // alarm } u3_temp; /* u2_utfo: unix terminfo strings. @@ -497,13 +497,13 @@ uv_tcp_t wax_u; // TCP handle struct _u3_rnam* nam_u; // peer we're connected to u3_rbuf* red_u; // read buffer - u3_bean red; // u3_yes on new data + c3_o red; // u3_yes on new data u3_rbuf* wri_u; // write buffer u3_raft* raf_u; // back-reference to server u3_rreq* out_u; // exit of request queue u3_rreq* tou_u; // entry of request queue struct _u3_rcon* nex_u; // pointer to next con - u3_bean liv; // are we live? + c3_o liv; // are we live? } u3_rcon; /* u3_rnam: raft peer name. @@ -514,7 +514,7 @@ c3_c* por_c; // port u3_rcon* ron_u; // connection struct _u3_rnam* nex_u; // pointer to next peer - u3_bean vog; // did they vote for us? + c3_o vog; // did they vote for us? } u3_rnam; /* u3_opts: command line configuration. @@ -527,18 +527,18 @@ c3_w fuz_w; // -f, fuzz testing c3_s por_s; // -p, ames port c3_s rop_s; // -l, raft port - u3_bean abo; // -a - u3_bean bat; // -b, batch create - u3_bean gab; // -g - u3_bean dem; // -d, dem - u3_bean fog; // -Xwtf, skip last event - u3_bean fak; // -F, fake carrier - u3_bean loh; // -L, local-only networking - u3_bean pro; // , profile - u3_bean veb; // -v, verbose (inverse of -q) - u3_bean nuu; // -c, new pier - u3_bean vno; // -V - u3_bean mem; // -M, memory madness + c3_o abo; // -a + c3_o bat; // -b, batch create + c3_o gab; // -g + c3_o dem; // -d, dem + c3_o fog; // -Xwtf, skip last event + c3_o fak; // -F, fake carrier + c3_o loh; // -L, local-only networking + c3_o pro; // , profile + c3_o veb; // -v, verbose (inverse of -q) + c3_o nuu; // -c, new pier + c3_o vno; // -V + c3_o mem; // -M, memory madness } u3_opts; /* u3_host: entire host. @@ -559,7 +559,7 @@ u3_unix unx_u; // sync and clay u3_batz beh_u; // batz timer u3_temp teh_u; // temp timer - u3_bean liv; // if u3_no, shut down + c3_o liv; // if u3_no, shut down c3_i xit_i; // exit code for shutdown void* ssl_u; // struct SSL_CTX* } u3_host; // host == computer == process @@ -575,10 +575,10 @@ c3_global c3_c* u3_Local; c3_global c3_c* u3_System; - c3_global u3_bean u3_Flag_Abort; - c3_global u3_bean u3_Flag_Garbage; - c3_global u3_bean u3_Flag_Profile; - c3_global u3_bean u3_Flag_Verbose; + c3_global c3_o u3_Flag_Abort; + c3_global c3_o u3_Flag_Garbage; + c3_global c3_o u3_Flag_Profile; + c3_global c3_o u3_Flag_Verbose; /** Functions. **/ @@ -684,7 +684,7 @@ /* u3_path(): C unix path in computer for file or directory. */ c3_c* - u3_path(u3_bean fyl, u3_noun pax); + u3_path(c3_o fyl, u3_noun pax); /** Filesystem (old api). **/ @@ -707,7 +707,7 @@ /* u3_ve_save(): save internal file as atom. */ - u3_bean + c3_o u3_ve_save(c3_c* ext_c, u3_noun tah, u3_noun dat); /* u3_ve_zeus(): prayer to internal file path. Return unit. @@ -784,7 +784,7 @@ /* u3_lo_shut(): end callback processing. */ void - u3_lo_shut(u3_bean); + u3_lo_shut(c3_o); /** Terminal, new style. diff --git a/j/1/gte.c b/j/1/gte.c index eb755e10e8..954775e2c1 100644 --- a/j/1/gte.c +++ b/j/1/gte.c @@ -15,7 +15,7 @@ } else { mpz_t a_mp, b_mp; - u3_bean cmp; + u3_noun cmp; u3r_mp(a_mp, a); u3r_mp(b_mp, b); diff --git a/j/1/gth.c b/j/1/gth.c index 80cfe83be0..504501eaa2 100644 --- a/j/1/gth.c +++ b/j/1/gth.c @@ -16,7 +16,7 @@ } else { mpz_t a_mp, b_mp; - u3_bean cmp; + u3_noun cmp; u3r_mp(a_mp, a); u3r_mp(b_mp, b); diff --git a/j/1/lte.c b/j/1/lte.c index 1f77c51be3..ec94a4ab0f 100644 --- a/j/1/lte.c +++ b/j/1/lte.c @@ -15,7 +15,7 @@ } else { mpz_t a_mp, b_mp; - u3_bean cmp; + u3_noun cmp; u3r_mp(a_mp, a); u3r_mp(b_mp, b); diff --git a/j/1/lth.c b/j/1/lth.c index 20042cf8b1..0ea8724b53 100644 --- a/j/1/lth.c +++ b/j/1/lth.c @@ -16,7 +16,7 @@ } else { mpz_t a_mp, b_mp; - u3_bean cmp; + u3_noun cmp; u3r_mp(a_mp, a); u3r_mp(b_mp, b); diff --git a/j/4/by_has.c b/j/4/by_has.c index 5374564614..8de579ee00 100644 --- a/j/4/by_has.c +++ b/j/4/by_has.c @@ -7,7 +7,7 @@ /* functions */ - u3_bean + u3_noun u3_cqdb_has( u3_noun a, u3_noun b) @@ -49,7 +49,7 @@ return u3_cqdb_has(a, b); } } - u3_bean + u3_noun u3_ckdb_has(u3_noun a, u3_noun b) { u3_weak c = u3_cqdb_has(a, b); diff --git a/j/4/in_has.c b/j/4/in_has.c index 21a8c636eb..5e2fcf4735 100644 --- a/j/4/in_has.c +++ b/j/4/in_has.c @@ -7,7 +7,7 @@ /* functions */ - u3_bean + u3_noun u3_cqdi_has(u3_noun a, u3_noun b) { if ( u3_nul == a ) { @@ -43,7 +43,7 @@ return u3_cqdi_has(a, b); } } - u3_bean + u3_noun u3_ckdi_has(u3_noun a, u3_noun b) { u3_weak c = u3_cqdi_has(a, b); diff --git a/j/5/loss.c b/j/5/loss.c index fee65bc58f..e870c3454e 100644 --- a/j/5/loss.c +++ b/j/5/loss.c @@ -126,7 +126,7 @@ // extend fits top // - static u3_bean + static u3_noun _hink(u3_loss* loc_u, c3_w inx_w, c3_w goy_w) @@ -138,7 +138,7 @@ // extend fits bottom // - static u3_bean + static u3_noun _lonk(u3_loss* loc_u, c3_w inx_w, c3_w goy_w) @@ -152,7 +152,7 @@ // search for first index >= inx_w and <= max_w that fits // the hink and lonk criteria. // - static u3_bean + static u3_noun _binka(u3_loss* loc_u, c3_w* inx_w, c3_w max_w, @@ -175,7 +175,7 @@ // both hink(inx_w) and lonk(inx_w) are true. lonk is false // if inx_w is too high, hink is false if it is too low. // - static u3_bean + static u3_noun _bink(u3_loss* loc_u, c3_w* inx_w, c3_w max_w, @@ -271,7 +271,7 @@ return lcs; } - static u3_bean + static u3_noun _listp(u3_noun lix) { while ( 1 ) { diff --git a/j/5/parse.c b/j/5/parse.c index 99e299191d..06907814c8 100644 --- a/j/5/parse.c +++ b/j/5/parse.c @@ -855,7 +855,7 @@ /* stew */ - static u3_bean + static u3_noun _stew_wor( u3_noun ort, u3_noun wan) diff --git a/j/5/tape.c b/j/5/tape.c index 70916a5d5c..3039b34fa0 100644 --- a/j/5/tape.c +++ b/j/5/tape.c @@ -19,7 +19,7 @@ } } - static u3_bean + static u3_noun _good( u3_noun a) { diff --git a/j/6/fitz.c b/j/6/fitz.c index affa9e514d..6c7a55de13 100644 --- a/j/6/fitz.c +++ b/j/6/fitz.c @@ -7,7 +7,7 @@ /* functions */ - static u3_bean + static u3_noun _fitz_fiz( u3_noun yaz, u3_noun wix) diff --git a/j/6/ut_conk.c b/j/6/ut_conk.c index 37e56376bd..c0151eed10 100644 --- a/j/6/ut_conk.c +++ b/j/6/ut_conk.c @@ -7,7 +7,7 @@ /* logic */ - u3_bean + u3_noun _cqfu_conk(u3_noun van, u3_noun sut, u3_noun got) { if ( c3y == u3ud(got) ) { @@ -27,7 +27,7 @@ return ret; } case 2: { - u3_bean vet = u3r_at(u3_cqfu_van_vet, van); + u3_noun vet = u3r_at(u3_cqfu_van_vet, van); u3_noun hed, tal, deh, lat, ret; if ( c3y == vet ) { diff --git a/j/6/ut_cull.c b/j/6/ut_cull.c index 744eaa8463..4544757ea8 100644 --- a/j/6/ut_cull.c +++ b/j/6/ut_cull.c @@ -8,13 +8,13 @@ /* logic */ u3_noun - _cqfu_cull(u3_noun, u3_noun, u3_bean, u3_atom, u3_noun); + _cqfu_cull(u3_noun, u3_noun, u3_noun, u3_atom, u3_noun); static u3_noun _cull_in( u3_noun van, u3_noun sut, - u3_bean pol, + u3_noun pol, u3_atom axe, u3_noun ref, u3_noun now, @@ -152,7 +152,7 @@ _cqfu_cull( u3_noun van, u3_noun sut, - u3_bean pol, + u3_noun pol, u3_atom axe, u3_noun ref) { @@ -193,7 +193,7 @@ u3_noun u3_cqfu_cull(u3_noun van, u3_noun sut, - u3_bean pol, + u3_noun pol, u3_noun axe, u3_noun ref) { diff --git a/j/6/ut_fire.c b/j/6/ut_fire.c index a461bb0b96..d552d715b9 100644 --- a/j/6/ut_fire.c +++ b/j/6/ut_fire.c @@ -7,7 +7,7 @@ /* logic */ - static u3_bean + static u3_noun _fire_mull(u3_noun van, u3_noun sut, u3_noun dox, @@ -17,7 +17,7 @@ u3_noun key = u3nt(u3k(sut), u3k(dox), u3k(gen)); - u3_bean ret; + u3_noun ret; if ( c3y == u3_cqdi_has(rib, key) ) { ret = c3y; @@ -127,7 +127,7 @@ u3_noun sut, u3_noun hag) { - u3_bean vet = u3r_at(u3_cqfu_van_vet, van); + u3_noun vet = u3r_at(u3_cqfu_van_vet, van); { if ( (c3y == u3du(hag)) && (u3_nul == u3t(hag)) ) { diff --git a/j/6/ut_mint.c b/j/6/ut_mint.c index c62db6c91b..3d46fe80c3 100644 --- a/j/6/ut_mint.c +++ b/j/6/ut_mint.c @@ -20,12 +20,12 @@ int FOO; u3nq(c3__cube, 1, c3__atom, 'f')); } - static u3_bean + static u3_noun _mint_vet( u3_noun van) { - // u3_bean vet = u3j_hook(u3k(van), "vet"); - u3_bean vet = u3r_at(u3_cqfu_van_vet, van); + // u3_noun vet = u3j_hook(u3k(van), "vet"); + u3_noun vet = u3r_at(u3_cqfu_van_vet, van); switch ( vet ) { case c3n: @@ -202,7 +202,7 @@ int FOO; _mint_brew( u3_noun van, u3_noun sut, - u3_bean tov, + u3_noun tov, u3_noun gen) { u3_noun von; diff --git a/j/6/ut_mull.c b/j/6/ut_mull.c index 68fd0b82c8..5d6a552626 100644 --- a/j/6/ut_mull.c +++ b/j/6/ut_mull.c @@ -10,12 +10,12 @@ static u3_noun _mull_in(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - static u3_bean + static u3_noun _mull_vet( u3_noun van) { - // u3_bean vet = u3j_hook(u3k(van), "vet"); - u3_bean vet = u3r_at(u3_cqfu_van_vet, van); + // u3_noun vet = u3j_hook(u3k(van), "vet"); + u3_noun vet = u3r_at(u3_cqfu_van_vet, van); switch ( vet ) { case c3n: @@ -810,7 +810,7 @@ } } - u3_bean + u3_noun _cqfu_mull( u3_noun van, u3_noun sut, diff --git a/j/6/ut_nest.c b/j/6/ut_nest.c index acc6079c53..3fbbc1d2f2 100644 --- a/j/6/ut_nest.c +++ b/j/6/ut_nest.c @@ -9,16 +9,16 @@ */ /* forward */ - static u3_bean - _nest_sint(u3_noun, u3_noun, u3_bean, u3_noun, u3_noun); - static u3_bean - _nest_dext(u3_noun, u3_noun, u3_bean, u3_noun, u3_noun); + static u3_noun + _nest_sint(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); + static u3_noun + _nest_dext(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - static u3_bean + static u3_noun _nest_cram( u3_noun van, u3_noun sut, - u3_bean tel, + u3_noun tel, u3_noun ref, u3_noun dab, u3_noun hem, @@ -61,7 +61,7 @@ u3_noun pqn_hem = u3t(qn_hem); u3_noun vis = u3_cqfu_play(van, sut, pqn_dab); u3_noun lon = u3_cqfu_play(van, ref, pqn_hem); - u3_bean ret = _nest_dext(van, vis, tel, lon, gil); + u3_noun ret = _nest_dext(van, vis, tel, lon, gil); u3z(vis); u3z(lon); @@ -76,10 +76,10 @@ } } - static u3_bean + static u3_noun _nest_cong(u3_noun van, u3_noun sut, - u3_bean tel, + u3_noun tel, u3_noun ref, u3_noun gil) { @@ -87,7 +87,7 @@ u3_noun pq_sut, qq_sut, rq_sut; u3_noun pq_ref, qq_ref, rq_ref; u3_noun prq_sut, qrq_sut, prq_ref, qrq_ref; - u3_bean ret; + u3_noun ret; u3x_trel(sut, 0, &p_sut, &q_sut); u3x_trel(ref, 0, &p_ref, &q_ref); @@ -151,7 +151,7 @@ (van, qq_sut, c3__rite, 2); u3_noun r_sam = u3_cqfu_peek (van, qq_ref, c3__rite, 2); - u3_bean ret = _nest_dext(van, r_sam, tel, s_sam, gil); + u3_noun ret = _nest_dext(van, r_sam, tel, s_sam, gil); u3z(r_sam); u3z(s_sam); @@ -165,7 +165,7 @@ (van, qq_sut, c3__read, 2); u3_noun r_pal = u3_cqfu_peek (van, qq_ref, c3__read, 2); - u3_bean ret = _nest_dext(van, s_pal, tel, r_pal, gil); + u3_noun ret = _nest_dext(van, s_pal, tel, r_pal, gil); u3z(r_pal); u3z(s_pal); @@ -179,11 +179,11 @@ } } - static u3_bean + static u3_noun _nest_dext_in( u3_noun van, u3_noun sut, - u3_bean tel, + u3_noun tel, u3_noun ref, u3_noun gil) { @@ -294,7 +294,7 @@ } else { u3_noun zoc = u3_cqdi_put(gil, hud); u3_noun fop = u3_cqfu_rest(van, sut, p_sut); - u3_bean hiv = _nest_dext(van, fop, tel, ref, zoc); + u3_noun hiv = _nest_dext(van, fop, tel, ref, zoc); u3z(hud); u3z(fop); @@ -306,15 +306,15 @@ } } - static u3_bean + static u3_noun _nest_dext_to( u3_noun van, u3_noun sut, - u3_bean tel, + u3_noun tel, u3_noun ref, u3_noun gil) { - u3_bean tyn = _nest_dext_in(van, sut, tel, ref, gil); + u3_noun tyn = _nest_dext_in(van, sut, tel, ref, gil); if ( (c3y == tyn) || (c3n == tel) ) { return tyn; @@ -329,11 +329,11 @@ } } - static u3_bean + static u3_noun _nest_dext( u3_noun van, u3_noun sut, - u3_bean tel, + u3_noun tel, u3_noun ref, u3_noun gil) { @@ -357,11 +357,11 @@ } } - static u3_bean + static u3_noun _nest_sint( u3_noun van, u3_noun sut, - u3_bean tel, + u3_noun tel, u3_noun ref, u3_noun gil) { @@ -391,7 +391,7 @@ case c3__cell: return c3n; case c3__core: { u3_noun gam = u3_cqfu_repo(van, ref); - u3_bean hiv = _nest_dext(van, sut, tel, gam, gil); + u3_noun hiv = _nest_dext(van, sut, tel, gam, gil); u3z(gam); return hiv; @@ -432,7 +432,7 @@ u3_noun gam = u3_cqfu_repo(van, ref); { - u3_bean hiv = _nest_dext(van, sut, tel, gam, zoc); + u3_noun hiv = _nest_dext(van, sut, tel, gam, zoc); u3z(hud); u3z(gam); @@ -447,11 +447,11 @@ } } - u3_bean + u3_noun _cqfu_nest( u3_noun van, u3_noun sut, - u3_bean tel, + u3_noun tel, u3_noun ref) { return _nest_dext(van, sut, tel, ref, u3_nul); @@ -480,7 +480,7 @@ u3_noun u3_cqfu_nest(u3_noun van, u3_noun sut, - u3_bean tel, + u3_noun tel, u3_noun ref) { return _cqfu_nest(van, sut, tel, ref); diff --git a/j/6/ut_park.c b/j/6/ut_park.c index ba7fec9349..54c49e331f 100644 --- a/j/6/ut_park.c +++ b/j/6/ut_park.c @@ -7,7 +7,7 @@ /* logic */ - u3_bean + u3_noun _cqfu_park( u3_noun van, u3_noun sut, diff --git a/j/6/ut_rest.c b/j/6/ut_rest.c index ab261d8e67..f541787b59 100644 --- a/j/6/ut_rest.c +++ b/j/6/ut_rest.c @@ -68,7 +68,7 @@ return fub; } - static u3_bean + static u3_noun _rest_hit_fan( u3_noun fan, u3_noun leg) diff --git a/v/ames.c b/v/ames.c index 066f89dd1c..78b31a8527 100644 --- a/v/ames.c +++ b/v/ames.c @@ -62,7 +62,7 @@ _ames_czar(c3_y imp_y, c3_s* por_s) return 0; } else if ( 0 == sam_u->imp_w[imp_y] ) { - u3_noun nam = u3_dc("scot", 'p', imp_y); + u3_noun nam = u3dc("scot", 'p', imp_y); c3_c* nam_c = u3r_string(nam); c3_c dns_c[64]; @@ -96,7 +96,7 @@ _ames_czar(c3_y imp_y, c3_s* por_s) #if 1 { u3_noun wad = u3i_words(1, &sam_u->imp_w[imp_y]); - u3_noun nam = u3_dc("scot", c3__if, wad); + u3_noun nam = u3dc("scot", c3__if, wad); c3_c* nam_c = u3r_string(nam); uL(fprintf(uH, "ames: czar %s: ip %s\n", dns_c, nam_c)); @@ -118,7 +118,7 @@ _ames_czar(c3_y imp_y, c3_s* por_s) /* _ames_lane_ipv4(): IPv4 address/ from lane. */ -u3_bean +u3_noun _ames_lane_ip(u3_noun lan, c3_s* por_s, c3_w* pip_w) { switch ( u3h(lan) ) { @@ -297,7 +297,7 @@ u3_ames_io_init() por_s = u3_Host.ops_u.por_s; if ( 0 != u3_Host.ops_u.imp_c ) { u3_noun imp = u3i_string(u3_Host.ops_u.imp_c); - u3_noun num = u3_dc("slaw", 'p', imp); + u3_noun num = u3dc("slaw", 'p', imp); c3_y num_y; if ( c3n == u3du(num) ) { diff --git a/v/cttp.c b/v/cttp.c index 0bc2b68dc2..72df4c4dc7 100644 --- a/v/cttp.c +++ b/v/cttp.c @@ -832,7 +832,7 @@ _cttp_ccon_fail_cb(uv_handle_t* wax_u) /* _cttp_ccon_fail(): report failure and reset connection. */ static void -_cttp_ccon_fail(u3_ccon* coc_u, u3_bean say) +_cttp_ccon_fail(u3_ccon* coc_u, u3_noun say) { if ( c3y == say ) { uL(fprintf(uH, "cttp: ERROR\n")); @@ -1329,7 +1329,7 @@ _cttp_ccon_kick(u3_ccon* coc_u) /* _cttp_ccon_new(): create client connection. Return 0 if url invalid. */ static u3_ccon* -_cttp_ccon_new(u3_bean sec, c3_s por_s, c3_c* hot_c) +_cttp_ccon_new(u3_noun sec, c3_s por_s, c3_c* hot_c) { u3_ccon* coc_u = c3_malloc(sizeof(u3_ccon)); @@ -1355,7 +1355,7 @@ _cttp_ccon_new(u3_bean sec, c3_s por_s, c3_c* hot_c) /* _cttp_ccon_find(): find existing connection for remote server. */ static u3_ccon* -_cttp_ccon_find(u3_bean sec, c3_s por_s, c3_c* hot_c) +_cttp_ccon_find(u3_noun sec, c3_s por_s, c3_c* hot_c) { u3_ccon* coc_u; @@ -1373,7 +1373,7 @@ _cttp_ccon_find(u3_bean sec, c3_s por_s, c3_c* hot_c) /* _cttp_ccon(): create or find persistent client connection. */ static u3_ccon* -_cttp_ccon(u3_bean sec, c3_s por_s, c3_c* hot_c) +_cttp_ccon(u3_noun sec, c3_s por_s, c3_c* hot_c) { #ifndef CTTP_NO_PIPELINE u3_ccon* coc_c = _cttp_ccon_find(sec, por_s, hot_c); @@ -1516,7 +1516,7 @@ static void _cttp_ccon_fill(u3_ccon* coc_u) { u3_creq* ceq_u = coc_u->ceq_u; - u3_bean fir_t = c3y; + u3_noun fir_t = c3y; while ( ceq_u ) { // @@ -1553,7 +1553,7 @@ _cttp_ccon_fill(u3_ccon* coc_u) static void _cttp_ccon_send(u3_ccon* coc_u, u3_creq* ceq_u) { - u3_bean nou = ((0 == coc_u->ceq_u) ? c3y : c3n); + u3_noun nou = ((0 == coc_u->ceq_u) ? c3y : c3n); if ( c3y == nou ) { c3_assert(0 == coc_u->qec_u); diff --git a/v/http.c b/v/http.c index 7b05f3ef44..0ecfea3b88 100644 --- a/v/http.c +++ b/v/http.c @@ -815,9 +815,9 @@ _http_pox_to_noun(c3_w sev_l, c3_w coq_l, c3_w seq_l) u3nt( u3_blip, c3__http, - u3nq(u3_dc("scot", c3_s2('u','v'), sev_l), - u3_dc("scot", c3_s2('u','d'), coq_l), - u3_dc("scot", c3_s2('u','d'), seq_l), + u3nq(u3dc("scot", c3_s2('u','v'), sev_l), + u3dc("scot", c3_s2('u','d'), coq_l), + u3dc("scot", c3_s2('u','d'), seq_l), u3_nul)); } diff --git a/v/loop.c b/v/loop.c index 32d20b9a44..e1784d2e3f 100644 --- a/v/loop.c +++ b/v/loop.c @@ -309,7 +309,7 @@ u3_lo_punt(c3_l tab_l, u3_noun tac) // We are calling nock here, but hopefully need no protection. // while ( c3y == u3r_du(cat) ) { - u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); + u3_noun wol = u3dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); _lo_wall(wol); cat = u3t(cat); @@ -323,7 +323,7 @@ u3_lo_punt(c3_l tab_l, u3_noun tac) void u3_lo_sway(c3_l tab_l, u3_noun tax) { - u3_noun mok = u3_dc("mook", 2, tax); + u3_noun mok = u3dc("mook", 2, tax); u3_lo_punt(tab_l, u3k(u3t(mok))); u3z(mok); @@ -356,7 +356,7 @@ u3_lo_open(void) /* u3_lo_shut(): end callback processing. */ void -u3_lo_shut(u3_bean inn) +u3_lo_shut(c3_o inn) { // u3e_grab("lo_shut a", u3_none); @@ -425,7 +425,7 @@ _lo_bench_scot_p(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_dc("scot", 'p', u3k(u3A->now)); + u3_noun soc = u3dc("scot", 'p', u3k(u3A->now)); u3z(soc); } @@ -439,8 +439,8 @@ _lo_bench_slay_p(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_dc("scot", 'p', u3k(u3A->now)); - u3_noun dub = u3_do("slay", soc); + u3_noun soc = u3dc("scot", 'p', u3k(u3A->now)); + u3_noun dub = u3do("slay", soc); u3z(dub); } @@ -454,7 +454,7 @@ _lo_bench_scot_da(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_dc("scot", c3__da, u3k(u3A->now)); + u3_noun soc = u3dc("scot", c3__da, u3k(u3A->now)); u3z(soc); } @@ -468,7 +468,7 @@ _lo_bench_dec(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_do("dec", u3k(u3A->now)); + u3_noun soc = u3do("dec", u3k(u3A->now)); u3z(soc); } @@ -482,7 +482,7 @@ _lo_bench_scot_ud(c3_w num_w) c3_w i_w; for ( i_w = 0; i_w < num_w; i_w++ ) { - u3_noun soc = u3_dc("scot", c3__ud, u3k(u3A->now)); + u3_noun soc = u3dc("scot", c3__ud, u3k(u3A->now)); u3z(soc); } @@ -523,7 +523,7 @@ _lo_bench(const c3_c* lab_c, void (*fun)(c3_w), c3_w num_w) void u3_lo_show(c3_c* cap_c, u3_noun nun) { - u3_noun pav = u3_dc("pave", c3__noun, nun); + u3_noun pav = u3dc("pave", c3__noun, nun); c3_c* txt_c = (c3_c*)u3r_tape(pav); fprintf(stderr, "%s: %s\r\n", cap_c, txt_c); @@ -654,7 +654,7 @@ _lo_mark() static void _lo_word(FILE* fil_u, c3_w wod_w) { - u3_bean top = c3y; + u3_noun top = c3y; if ( wod_w / (1000 * 1000 * 1000) ) { fprintf(fil_u, "%u.", wod_w / (1000 * 1000 * 1000)); diff --git a/v/main.c b/v/main.c index 469a2dfa46..fb9fd2675d 100644 --- a/v/main.c +++ b/v/main.c @@ -26,7 +26,7 @@ /* _main_readw(): parse a word from a string. */ -static u3_bean +static u3_noun _main_readw(const c3_c* str_c, c3_w max_w, c3_w* out_w) { c3_c* end_c; @@ -41,7 +41,7 @@ _main_readw(const c3_c* str_c, c3_w max_w, c3_w* out_w) /* _main_getopt(): extract option map from command line. */ -static u3_bean +static u3_noun _main_getopt(c3_i argc, c3_c** argv) { c3_i ch_i; diff --git a/v/raft.c b/v/raft.c index 5954bb4fc9..7d7ad68e57 100644 --- a/v/raft.c +++ b/v/raft.c @@ -53,7 +53,7 @@ static ssize_t _raft_rmsg_read(const u3_rbuf* buf_u, u3_rmsg* msg_u); static void _raft_rmsg_send(u3_rcon* ron_u, const u3_rmsg* msg_u); static void _raft_rmsg_free(u3_rmsg* msg_u); static void _raft_conn_dead(u3_rcon* ron_u); -static u3_bean _raft_remove_run(u3_rcon* ron_u); +static u3_noun _raft_remove_run(u3_rcon* ron_u); static void _raft_send_rasp(u3_rcon* ron_u, c3_t suc_t); static void _raft_rreq_free(u3_rreq* req_u); static void _raft_time_cb(uv_timer_t* tim_u); @@ -834,11 +834,11 @@ _raft_conn_new(u3_raft* raf_u) /* _raft_remove_run(): remove a connection from the list of unknowns. */ -static u3_bean +static u3_noun _raft_remove_run(u3_rcon* ron_u) { u3_raft* raf_u = ron_u->raf_u; - u3_bean suc = c3n; + u3_noun suc = c3n; if ( raf_u->run_u == ron_u ) { raf_u->run_u = ron_u->nex_u; @@ -906,7 +906,7 @@ _raft_conn_free(uv_handle_t* had_u) } } else { - u3_bean suc = _raft_remove_run(ron_u); + u3_noun suc = _raft_remove_run(ron_u); c3_assert(c3y == suc); // Slow, expensive debug assert. { @@ -1774,7 +1774,7 @@ u3_raft_work(void) ron = u3_cke_jam(u3nc(u3k(u3A->now), ovo)); c3_assert(u3A->key); - ron = u3_dc("en:crua", u3k(u3A->key), ron); + ron = u3dc("en:crua", u3k(u3A->key), ron); len_w = u3r_met(5, ron); bob_w = c3_malloc(len_w * 4L); diff --git a/v/reck.c b/v/reck.c index dd58f58484..87bb60ce74 100644 --- a/v/reck.c +++ b/v/reck.c @@ -22,12 +22,12 @@ /* _reck_mole(): parse simple atomic mole. */ -static u3_bean +static u3_noun _reck_mole(u3_noun fot, u3_noun san, c3_d* ato_d) { - u3_noun uco = u3_do("slay", san); + u3_noun uco = u3do("slay", san); u3_noun p_uco, q_uco, r_uco, s_uco; if ( (c3n == u3r_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || @@ -48,7 +48,7 @@ _reck_mole(u3_noun fot, /* _reck_lily(): parse little atom. */ -static u3_bean +static u3_noun _reck_lily(u3_noun fot, u3_noun txt, c3_l* tid_l) { c3_d ato_d; @@ -68,7 +68,7 @@ _reck_lily(u3_noun fot, u3_noun txt, c3_l* tid_l) /* _reck_kick_term(): apply terminal outputs. */ -static u3_bean +static u3_noun _reck_kick_term(u3_noun pox, c3_l tid_l, u3_noun fav) { u3_noun p_fav; @@ -113,7 +113,7 @@ _reck_kick_term(u3_noun pox, c3_l tid_l, u3_noun fav) /* _reck_kick_http(): apply http effects. */ -static u3_bean +static u3_noun _reck_kick_http(u3_noun pox, c3_l sev_l, c3_l coq_l, @@ -148,7 +148,7 @@ _reck_kick_http(u3_noun pox, /* _reck_kick_sync(): apply sync outputs. */ -static u3_bean +static u3_noun _reck_kick_sync(u3_noun pox, u3_noun fav) { switch ( u3h(fav) ) { @@ -168,7 +168,7 @@ _reck_kick_sync(u3_noun pox, u3_noun fav) u3z(pox); u3z(fav); return c3n; } -static u3_bean +static u3_noun _reck_kick_newt(u3_noun pox, u3_noun fav) { switch ( u3h(fav) ) { @@ -186,7 +186,7 @@ _reck_kick_newt(u3_noun pox, u3_noun fav) /* _reck_kick_ames(): apply packet network outputs. */ -static u3_bean +static u3_noun _reck_kick_ames(u3_noun pox, u3_noun fav) { u3_noun p_fav; @@ -208,7 +208,7 @@ _reck_kick_ames(u3_noun pox, u3_noun fav) /* _reck_kick_spec(): apply an effect, by path. */ -static u3_bean +static u3_noun _reck_kick_spec(u3_noun pox, u3_noun fav) { u3_noun i_pox, t_pox; @@ -305,7 +305,7 @@ _reck_kick_spec(u3_noun pox, u3_noun fav) /* _reck_kick_norm(): non path-specific effect handling. */ -static u3_bean +static u3_noun _reck_kick_norm(u3_noun pox, u3_noun fav) { if ( c3n == u3du(fav) ) { @@ -343,7 +343,7 @@ u3_reck_kick(u3_noun ovo) if ( (c3n == _reck_kick_spec(u3k(u3h(ovo)), u3k(u3t(ovo)))) && (c3n == _reck_kick_norm(u3k(u3h(ovo)), u3k(u3t(ovo)))) ) { - u3_noun tox = u3_do("spat", u3k(u3h(ovo))); + u3_noun tox = u3do("spat", u3k(u3h(ovo))); #if 0 if ( (c3__warn != u3h(u3t(ovo))) && diff --git a/v/sist.c b/v/sist.c index 429fd2f4f2..c65aacbc45 100644 --- a/v/sist.c +++ b/v/sist.c @@ -335,7 +335,7 @@ _sist_home() /* _sist_cask(): ask for a passcode. */ static u3_noun -_sist_cask(c3_c* dir_c, u3_bean nun) +_sist_cask(c3_c* dir_c, u3_noun nun) { c3_c paw_c[60]; u3_noun key; @@ -364,7 +364,7 @@ _sist_cask(c3_c* dir_c, u3_bean nun) say_c[1] = 0; strncat(say_c, paw_c, strlen(paw_c) - 1); - say = u3_do("slay", u3i_string(say_c)); + say = u3do("slay", u3i_string(say_c)); if ( (u3_nul == say) || (u3_blip != u3h(u3t(say))) || ('p' != u3h(u3t(u3t(say)))) ) @@ -418,10 +418,10 @@ _sist_text(c3_c* pom_c) #if 0 /* _sist_bask(): ask a yes or no question. */ -static u3_bean -_sist_bask(c3_c* pop_c, u3_bean may) +static u3_noun +_sist_bask(c3_c* pop_c, u3_noun may) { - u3_bean yam; + u3_noun yam; uH; while ( 1 ) { @@ -465,9 +465,9 @@ _sist_fast(u3_noun pas, c3_l key_l) { c3_c ful_c[2048]; c3_c* hom_c = u3_Host.cpu_c; - u3_noun gum = u3_dc("scot", 'p', key_l); + u3_noun gum = u3dc("scot", 'p', key_l); c3_c* gum_c = u3r_string(gum); - u3_noun yek = u3_dc("scot", 'p', pas); + u3_noun yek = u3dc("scot", 'p', pas); c3_c* yek_c = u3r_string(yek); printf("saving passcode in %s/.urb/code.%s\r\n", hom_c, gum_c); @@ -497,7 +497,7 @@ _sist_staf(c3_l key_l) { c3_c ful_c[2048]; c3_c* hom_c = u3_Host.cpu_c; - u3_noun gum = u3_dc("scot", 'p', key_l); + u3_noun gum = u3dc("scot", 'p', key_l); c3_c* gum_c = u3r_string(gum); u3_noun txt; @@ -512,7 +512,7 @@ _sist_staf(c3_l key_l) } else { // c3_c* txt_c = u3r_string(txt); - u3_noun say = u3_do("slay", txt); + u3_noun say = u3do("slay", txt); u3_noun pas; @@ -543,7 +543,7 @@ _sist_fatt(c3_l sal_l, u3_noun pas) // XX use scrypt() - this is a stupid iterated hash // for ( i_w = 0; i_w < 32768; i_w++ ) { - key = u3_dc("shaf", sal_l, key); + key = u3dc("shaf", sal_l, key); } return key; } @@ -814,14 +814,14 @@ _sist_rest() c3_d las_d = 0; u3_noun roe = u3_nul; u3_noun sev_l, tno_l, key_l, sal_l; - u3_bean ohh = c3n; + u3_noun ohh = c3n; if ( 0 != u3A->ent_d ) { u3_noun ent; c3_c* ent_c; ent = u3i_chubs(1, &u3A->ent_d); - ent = u3_dc("scot", c3__ud, ent); + ent = u3dc("scot", c3__ud, ent); ent_c = u3r_string(ent); uL(fprintf(uH, "rest: checkpoint to event %s\n", ent_c)); free(ent_c); @@ -884,8 +884,8 @@ _sist_rest() tno_l = led_u.tno_l; { - u3_noun old = u3_dc("scot", c3__uv, sev_l); - u3_noun nuu = u3_dc("scot", c3__uv, u3A->sev_l); + u3_noun old = u3dc("scot", c3__uv, sev_l); + u3_noun nuu = u3dc("scot", c3__uv, u3A->sev_l); c3_c* old_c = u3r_string(old); c3_c* nuu_c = u3r_string(nuu); @@ -926,7 +926,7 @@ _sist_rest() { c3_d ent_d; c3_d end_d; - u3_bean rup = c3n; + u3_noun rup = c3n; end_d = u3Z->lug_u.len_d; ent_d = 0; @@ -1031,7 +1031,7 @@ _sist_rest() if ( u3A->key ) { u3_noun dep; - dep = u3_dc("de:crua", u3k(u3A->key), ron); + dep = u3dc("de:crua", u3k(u3A->key), ron); if ( c3n == u3du(dep) ) { uL(fprintf(uH, "record (%s) is corrupt (k)\n", ful_c)); u3_lo_bail(); @@ -1114,7 +1114,7 @@ _sist_rest() u3_lo_bail(); } u3A->our = u3k(u3h(u3A->own)); - u3A->pod = u3_dc("scot", 'p', u3k(u3A->our))); + u3A->pod = u3dc("scot", 'p', u3k(u3A->our))); } // Now, who the fsck are you? No, really. @@ -1127,7 +1127,7 @@ _sist_rest() fil_c++; } else fil_c = u3_Host.cpu_c; - who = u3_dc("scot", 'p', u3k(u3A->our))); + who = u3dc("scot", 'p', u3k(u3A->our))); who_c = u3r_string(who); u3z(who); @@ -1231,7 +1231,7 @@ u3_sist_boot(void) } else { u3_noun imp = u3i_string(u3_Host.ops_u.imp_c); - u3_noun whu = u3_dc("slaw", 'p', u3k(imp)); + u3_noun whu = u3dc("slaw", 'p', u3k(imp)); if ( (u3_nul == whu) ) { fprintf(stderr, "czar: incorrect format\r\n"); @@ -1242,7 +1242,7 @@ u3_sist_boot(void) u3_noun gun = u3_nul; if (c3n == u3_Host.ops_u.fak) { gen = _sist_text("generator"); - gun = u3_dc("slaw", c3__uw, gen); + gun = u3dc("slaw", c3__uw, gen); if ( u3_nul == gun ) { fprintf(stderr, "czar: incorrect format\r\n"); diff --git a/v/term.c b/v/term.c index 793deac28d..55a40fb610 100644 --- a/v/term.c +++ b/v/term.c @@ -70,7 +70,7 @@ _term_close_cb(uv_handle_t* han_t) } { - u3_noun tid = u3_dc("scot", c3__ud, tty_u->tid_l); + u3_noun tid = u3dc("scot", c3__ud, tty_u->tid_l); u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul); u3v_plan(u3k(pax), u3nc(c3__hook, u3_nul)); u3z(pax); @@ -302,7 +302,7 @@ _term_listen_cb(uv_stream_t *wax_u, int sas_i) pty_u->tel_u = telnet_nvt_new(tty_u, _tel_event, _tel_opt, NULL); { - u3_noun tid = u3_dc("scot", c3__ud, tty_u->tid_l); + u3_noun tid = u3dc("scot", c3__ud, tty_u->tid_l); u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul); u3v_plan(u3k(pax), u3nc(c3__blew, u3nc(80, 25))); u3v_plan(u3k(pax), u3nc(c3__hail, u3_nul)); @@ -498,7 +498,7 @@ static void _term_it_show_wide(u3_utty* uty_u, c3_w len_w, c3_w* txt_w) { u3_noun wad = u3i_words(len_w, txt_w); - u3_noun txt = u3_do("tuft", wad); + u3_noun txt = u3do("tuft", wad); c3_c* txt_c = u3r_string(txt); _term_it_write_str(uty_u, txt_c); @@ -610,7 +610,7 @@ _term_it_show_more(u3_utty* uty_u) /* _term_it_path(): path for console file. */ static c3_c* -_term_it_path(u3_bean fyl, u3_noun pax) +_term_it_path(u3_noun fyl, u3_noun pax) { c3_w len_w; c3_c *pas_c; @@ -673,7 +673,7 @@ _term_it_save(u3_noun pax, u3_noun pad) static void _term_io_belt(u3_utty* uty_u, u3_noun blb) { - u3_noun tid = u3_dc("scot", c3__ud, uty_u->tid_l); + u3_noun tid = u3dc("scot", c3__ud, uty_u->tid_l); u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul); u3v_plan(pax, u3nc(c3__belt, blb)); @@ -745,7 +745,7 @@ _tel_opt(_te_nvt* nvt, telnet_byte opt, _to_evt* evt) tel_u->uty_t.tat_u.siz.col_l = col_s; tel_u->uty_t.tat_u.siz.row_l = row_s; - tid = u3_dc("scot", c3__ud, tel_u->uty_t.tid_l); + tid = u3dc("scot", c3__ud, tel_u->uty_t.tid_l); pax = u3nq(u3_blip, c3__term, tid, u3_nul); blu = u3nc(col_s, row_s); u3v_plan(pax, u3nc(c3__blew, blu)); @@ -798,7 +798,7 @@ _term_io_suck_char(u3_utty* uty_u, c3_y cay_y) // uL(fprintf(uH, "muck-utf8 len %d\n", tat_u->fut.len_w)); // uL(fprintf(uH, "muck-utf8 %x\n", huv)); - wug = u3_do("turf", huv); + wug = u3do("turf", huv); // uL(fprintf(uH, "muck-utf32 %x\n", tat_u->fut.len_w)); tat_u->fut.len_w = tat_u->fut.wid_w = 0; diff --git a/v/unix.c b/v/unix.c index 5529bd425f..21d67fb002 100644 --- a/v/unix.c +++ b/v/unix.c @@ -265,7 +265,7 @@ _unix_file_watch(u3_ufil* fil_u, static c3_c* _unix_file_form(u3_udir* dir_u, u3_noun pre, - u3_bean ket, + u3_noun ket, u3_noun ext) { c3_c* pre_c = u3r_string(pre); @@ -431,7 +431,7 @@ _unix_dir_free(u3_udir* dir_u) #if 0 /* _unix_file_update(): update file, true if plausibly changed. */ -static u3_bean +static u3_noun _unix_file_update(u3_ufil* fil_u, mpz_t mod_mp) { if ( 0 == mpz_cmp(mod_mp, fil_u->mod_mp) ) { @@ -740,11 +740,11 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) ole = u3_ckdb_get(u3k(pam), u3k(wib)); if ( u3_none == ole ) { - ole = u3_do("cosh", u3nt(0, woz, u3_nul)); + ole = u3do("cosh", u3nt(0, woz, u3_nul)); } else { u3_noun elo; - elo = u3_do("cosh", u3nt(0, woz, u3k(u3t(u3t(ole))))); + elo = u3do("cosh", u3nt(0, woz, u3k(u3t(u3t(ole))))); u3z(ole); ole = elo; @@ -761,8 +761,8 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) ole = u3nt (0, u3_nul, u3_ckdb_put(u3_nul, u3k(har), - u3_do("cosh", u3nt(0, woz, u3_nul)))); - ole = u3_do("cosh", ole); + u3do("cosh", u3nt(0, woz, u3_nul)))); + ole = u3do("cosh", ole); } else { u3_noun roo = u3t(u3t(ole)); @@ -770,17 +770,17 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) u3_noun oor, elo; if ( u3_none == tup ) { - tup = u3_do("cosh", u3nt(0, woz, u3_nul)); + tup = u3do("cosh", u3nt(0, woz, u3_nul)); } else { u3_noun upt; - upt = u3_do("cosh", u3nt(0, woz, u3k(u3t(u3t(tup))))); + upt = u3do("cosh", u3nt(0, woz, u3k(u3t(u3t(tup))))); u3z(tup); tup = upt; } oor = u3_ckdb_put(u3k(roo), u3k(har), tup); - elo = u3_do("cosh", u3nt(0, u3k(u3h(u3t(ole))), oor)); + elo = u3do("cosh", u3nt(0, u3k(u3h(u3t(ole))), oor)); u3z(ole); ole = elo; } @@ -820,7 +820,7 @@ _unix_dir_ankh(u3_udir* dir_u) continue; } u3_noun baw = _unix_file_load(fil_u); - u3_noun woz = u3nt(u3_nul, u3_do("sham", u3k(baw)), baw); + u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(baw)), baw); u3z(dur); pam = _unix_dir_ankh_file(pam, u3k(u3t(wib)), baw, woz); u3z(wib); @@ -830,10 +830,10 @@ _unix_dir_ankh(u3_udir* dir_u) for ( fil_u = dir_u->fil_u; fil_u; fil_u = fil_u->nex_u ) { u3_noun wib = _unix_file_name(fil_u); u3_noun baw = _unix_file_load(fil_u); - u3_noun woz = u3nt(u3_nul, u3_do("sham", u3k(baw)), baw); + u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(baw)), baw); pam = _unix_dir_ankh_file(pam, wib, baw, woz); } - return u3_do("cosh", u3nt(0, u3_nul, pam)); + return u3do("cosh", u3nt(0, u3_nul, pam)); } /* _find_mug(): find a noun with a given mug. retain. DELETEME @@ -885,9 +885,9 @@ _unix_desk_peek(u3_noun hox, #if 0 /* _unix_ankh_sing_map(): compare ankh maps for u3_ankh_sing(). */ -static u3_bean _unix_ankh_sing_in(u3_noun, u3_noun); +static u3_noun _unix_ankh_sing_in(u3_noun, u3_noun); -static u3_bean +static u3_noun _unix_ankh_sing_map(u3_noun mun, u3_noun mur) // retain { u3_noun n_mun, l_mun, r_mun; @@ -910,7 +910,7 @@ _unix_ankh_sing_map(u3_noun mun, u3_noun mur) // retain /* _unix_node_sing(): test node equality. */ -static u3_bean +static u3_noun _unix_node_sing(u3_noun xud, u3_noun bud) { if ( (u3_nul == xud) && (u3_nul == bud) ) { return c3y; } @@ -921,7 +921,7 @@ _unix_node_sing(u3_noun xud, u3_noun bud) /* _unix_ankh_sing_in(): stupid ankh test which ignores broken hash. */ -static u3_bean +static u3_noun _unix_ankh_sing_in(u3_noun xun, u3_noun bur) // retain { u3_noun p_xun, q_xun, r_xun; @@ -938,7 +938,7 @@ _unix_ankh_sing_in(u3_noun xun, u3_noun bur) // retain /* _unix_ankh_sing(): full ankh compare. */ -static u3_bean +static u3_noun _unix_ankh_sing(u3_noun xun, u3_noun bur) // retain { if ( c3y == u3r_sing(xun, bur) ) { @@ -971,7 +971,7 @@ _unix_desk_sync_into(u3_noun who, if ( (c3n == u3r_sing(u3h(xun), u3h(bur)))) { - doz = u3_dc("cost", xun, bur); + doz = u3dc("cost", xun, bur); pax = u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul); fav = u3nq(c3__into, who, syd, u3nc(c3y, doz)); @@ -1002,7 +1002,7 @@ _unix_ship_update(u3_uhot* hot_u) mpz_init_set(who_mp, hot_u->who_mp); who = u3i_mp(who_mp); - hox = u3_dc("scot", 'p', u3k(who)); + hox = u3dc("scot", 'p', u3k(who)); } for ( dis_u = dir_u->dis_u; dis_u; dis_u = dis_u->nex_u ) { @@ -1022,9 +1022,9 @@ _unix_ship_update(u3_uhot* hot_u) /* _unix_hot_gain(): gain ship. */ static void -_unix_hot_gain(u3_noun who, u3_bean mek) +_unix_hot_gain(u3_noun who, u3_noun mek) { - u3_noun hox = u3_dc("scot", 'p', u3k(who)); + u3_noun hox = u3dc("scot", 'p', u3k(who)); c3_c* hox_c = u3r_string(hox); c3_c* pax_c = _unix_down(u3_Host.cpu_c, hox_c + 1); DIR* rid_u = opendir(pax_c); @@ -1109,7 +1109,7 @@ _unix_home(u3_noun who) static u3_noun _unix_desk_sync_udon(u3_noun don, u3_noun old) { - return u3_dc("lump", don, old); + return u3dc("lump", don, old); } /* _unix_desk_sync_tofu(): sync out file install. @@ -1298,7 +1298,7 @@ _unix_desk_sync_ergo(u3_noun hox, u3_noun bur = _unix_desk_peek(hox, syd, lok); if ( c3n == u3r_sing(xun, bur) ) { - u3_noun doz = u3_dc("cost", bur, xun); + u3_noun doz = u3dc("cost", bur, xun); _unix_desk_sync_soba(*dir_u, doz); } @@ -1328,8 +1328,8 @@ u3_unix_ef_ergo(u3_noun who, u3_noun syd, u3_noun rel) { - u3_noun hox = u3_dc("scot", 'p', u3k(who)); - u3_noun lok = u3_dc("scot", c3__ud, rel); + u3_noun hox = u3dc("scot", 'p', u3k(who)); + u3_noun lok = u3dc("scot", c3__ud, rel); u3_uhot* hot_u; hot_u = _unix_home(who); diff --git a/v/walk.c b/v/walk.c index c767a38a19..5a3413f391 100644 --- a/v/walk.c +++ b/v/walk.c @@ -206,7 +206,7 @@ _walk_in(const c3_c* dir_c, c3_w len_w) if ( !strcmp("noun", ext_c) ) { dat = u3_cke_cue(dat); } - hax = u3_do("sham", u3k(dat)); + hax = u3do("sham", u3k(dat)); if ( u3_none == get ) { get = u3_nul; } get = u3_ckdb_put(get, ext, u3nt(c3y, hax, dat)); @@ -257,7 +257,7 @@ u3_walk(const c3_c* dir_c, u3_noun old) /* u3_path(): C unix path in computer for file or directory. */ c3_c* -u3_path(u3_bean fyl, u3_noun pax) +u3_path(c3_o fyl, u3_noun pax) { c3_w len_w; c3_c *pas_c; From 7b05fc96d18cc0b9f943f4a74250807a53e99cb5 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 5 Nov 2014 19:12:47 -0800 Subject: [PATCH 11/14] Moar doc. --- Spec/u3.md | 129 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 84 insertions(+), 45 deletions(-) diff --git a/Spec/u3.md b/Spec/u3.md index 12fe9c385b..b6fa4428ae 100644 --- a/Spec/u3.md +++ b/Spec/u3.md @@ -26,53 +26,15 @@ kernel, and use it as an event-processing function. But you don't need to use this feature if you don't want, and your kernel can be anything you want. +## c3: C in Urbit -## u3: files and directory +Below `u3` is the simple `c3` layer, which is just how we write C +in Urbit. -The best way to introduce `u3` is with a simple map of the Urbit -build directory - folding things we don't care about right now: - - g/ u3 implementation - g/a.c allocation - g/e.c persistence - g/h.c hashtables - g/i.c noun construction - g/j.c jet control - g/m.c master state - g/n.c nock execution - g/r.c noun access, error returns - g/t.c tracing/profiling - g/v.c arvo kernel - g/x.c noun access, error crashes - g/z.c memoization/caching - i/ all includes - i/v vere systems headers - i/g u3 headers (matching g/ names) - i/c c3 headers - i/c/defs.h miscellaneous c3 macros - i/c/motes.h symbolic constants - i/c/portable.h portability definitions - i/c/types.h c3 types - j/ jets - j/dash.c jet structures - j/1 tier 1 jets: basic math - j/2 tier 2 jets: lists - j/3 tier 3 jets: bit twiddling - j/4 tier 4 jets: containers - j/5 tier 5 jets: misc - j/6 tier 6 jets: hoon - v/ vere systems code - outside/ all external bundled code - -(The `v/` code is part of `vere`, which uses `u3` to run Urbit.) - - -## c3: C in the Urbit environment - -When writing C code in u3, please of course follow the -conventions of the code around you as regards indentation, etc. -It's especially important that every function have a header -comment, even if it says nothing interesting. +When writing C in u3, please of course follow the conventions of +the code around you as regards indentation, etc. It's especially +important that every function have a header comment, even if it +says nothing interesting. But some of our idiosyncrasies go beyond convention. Yes, we've done awful things to C. Here's what we did and why we did. @@ -170,6 +132,83 @@ the other way. Use `!` as usual, `c3y` for yes and `c3n` for no, ## u3: introduction to the noun world +u3 is the + + /** Prefix definitions: + *** + *** u3a_: fundamental allocators. + *** u3c_: constants. + *** u3e_: checkpointing. + *** u3h_: HAMT hash tables. + *** u3i_: noun constructors + *** u3j_: jets. + *** u3k*: direct jet calls (modern C convention) + *** u3m_: system management etc. + *** u3n_: nock interpreter. + *** u3o_: fundamental macros. + *** u3q*: direct jet calls (archaic C convention) + *** u3r_: read functions which never bail out. + *** u3s_: structures and definitions. + *** u3t_: tracing. + *** u3w_: direct jet calls (core noun convention) + *** u3x_: read functions which do bail out. + *** u3v_: arvo specific structures. + *** u3z_: memoization. + *** + *** u3_cr_, u3_cx_, u3_cz_ functions use retain conventions; the caller + *** retains ownership of passed-in nouns, the callee preserves + *** ownership of returned nouns. + *** + *** Unless documented otherwise, all other functions use transfer + *** conventions; the caller logically releases passed-in nouns, + *** the callee logically releases returned nouns. + *** + *** In general, exceptions to the transfer convention all occur + *** when we're using a noun as a key. + **/ + + + + +The best way to introduce `u3` is with a simple map of the Urbit +build directory: + + g/ u3 implementation + g/a.c allocation + g/e.c persistence + g/h.c hashtables + g/i.c noun construction + g/j.c jet control + g/m.c master state + g/n.c nock execution + g/r.c noun access, error returns + g/t.c tracing/profiling + g/v.c arvo kernel + g/x.c noun access, error crashes + g/z.c memoization/caching + i/ all includes + i/v vere systems headers + i/g u3 headers (matching g/ names) + i/c c3 headers + i/c/defs.h miscellaneous c3 macros + i/c/motes.h symbolic constants + i/c/portable.h portability definitions + i/c/types.h c3 types + i/j jet headers + i/j/k.h jet interfaces (transfer, args) + i/j/q.h jet interfaces (retain, args) + i/j/w.h jet interfaces (retain, core) + j/ jet code + j/dash.c jet structures + j/1 tier 1 jets: basic math + j/2 tier 2 jets: lists + j/3 tier 3 jets: bit twiddling + j/4 tier 4 jets: containers + j/5 tier 5 jets: misc + j/6 tier 6 jets: hoon + v/ vere systems code + outside/ all external bundled code + From 8c8fa11104a1715ebbcbf75dfe11a5931ab41654 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 6 Nov 2014 11:13:57 -0800 Subject: [PATCH 12/14] Rename. --- Spec/u3.md | 39 +++++- g/j.c | 36 +++--- g/m.c | 4 +- g/v.c | 10 +- i/j/k.h | 80 ++++++------- i/j/q.h | 306 +++++++++++++++++++++++----------------------- i/j/w.h | 326 +++++++++++++++++++++++++------------------------- j/1/add.c | 10 +- j/1/dec.c | 8 +- j/1/div.c | 6 +- j/1/gte.c | 6 +- j/1/gth.c | 10 +- j/1/lte.c | 10 +- j/1/lth.c | 6 +- j/1/mod.c | 6 +- j/1/mul.c | 10 +- j/1/sub.c | 10 +- j/2/bind.c | 6 +- j/2/clap.c | 6 +- j/2/drop.c | 6 +- j/2/flop.c | 10 +- j/2/lent.c | 10 +- j/2/levy.c | 8 +- j/2/lien.c | 8 +- j/2/need.c | 6 +- j/2/reel.c | 8 +- j/2/roll.c | 8 +- j/2/scag.c | 8 +- j/2/skim.c | 8 +- j/2/skip.c | 8 +- j/2/slag.c | 6 +- j/2/snag.c | 6 +- j/2/sort.c | 6 +- j/2/turn.c | 8 +- j/2/weld.c | 12 +- j/3/bex.c | 6 +- j/3/can.c | 6 +- j/3/cap.c | 6 +- j/3/cat.c | 6 +- j/3/con.c | 6 +- j/3/cut.c | 6 +- j/3/dis.c | 6 +- j/3/dor.c | 12 +- j/3/end.c | 6 +- j/3/gor.c | 8 +- j/3/hor.c | 12 +- j/3/lsh.c | 10 +- j/3/mas.c | 14 +-- j/3/met.c | 6 +- j/3/mix.c | 6 +- j/3/mug.c | 2 +- j/3/peg.c | 16 +-- j/3/po.c | 8 +- j/3/rap.c | 6 +- j/3/rip.c | 6 +- j/3/rsh.c | 10 +- j/3/vor.c | 8 +- j/4/by_gas.c | 14 +-- j/4/by_get.c | 20 ++-- j/4/by_has.c | 16 +-- j/4/by_int.c | 44 +++---- j/4/by_put.c | 20 ++-- j/4/by_uni.c | 36 +++--- j/4/in_gas.c | 14 +-- j/4/in_has.c | 16 +-- j/4/in_int.c | 26 ++-- j/4/in_mer.c | 22 ++-- j/4/in_put.c | 20 ++-- j/4/in_tap.c | 10 +- j/4/in_uni.c | 36 +++--- j/5/aesc.c | 12 +- j/5/cue.c | 34 +++--- j/5/ed_puck.c | 2 +- j/5/ed_sign.c | 2 +- j/5/ed_veri.c | 2 +- j/5/jam.c | 36 +++--- j/5/lore.c | 8 +- j/5/loss.c | 20 ++-- j/5/mat.c | 26 ++-- j/5/mink.c | 2 +- j/5/mule.c | 2 +- j/5/parse.c | 38 +++--- j/5/rd.c | 54 ++++----- j/5/repg.c | 12 +- j/5/rexp.c | 10 +- j/5/rub.c | 36 +++--- j/5/shax.c | 46 +++---- j/5/tape.c | 6 +- j/5/trip.c | 12 +- j/6/al.c | 4 +- j/6/ap.c | 38 +++--- j/6/bull.c | 6 +- j/6/cell.c | 6 +- j/6/comb.c | 12 +- j/6/cons.c | 10 +- j/6/core.c | 6 +- j/6/cube.c | 6 +- j/6/face.c | 6 +- j/6/fine.c | 6 +- j/6/fitz.c | 6 +- j/6/flan.c | 6 +- j/6/flay.c | 8 +- j/6/flip.c | 6 +- j/6/flor.c | 6 +- j/6/fork.c | 6 +- j/6/hike.c | 24 ++-- j/6/look.c | 26 ++-- j/6/slot.c | 8 +- j/6/ut.c | 12 +- j/6/ut_burn.c | 14 +-- j/6/ut_busk.c | 8 +- j/6/ut_bust.c | 8 +- j/6/ut_conk.c | 18 +-- j/6/ut_crop.c | 30 ++--- j/6/ut_cull.c | 32 ++--- j/6/ut_find.c | 90 +++++++------- j/6/ut_fink.c | 12 +- j/6/ut_fire.c | 26 ++-- j/6/ut_firm.c | 6 +- j/6/ut_fish.c | 26 ++-- j/6/ut_fuse.c | 28 ++--- j/6/ut_gain.c | 2 +- j/6/ut_heal.c | 36 +++--- j/6/ut_lose.c | 2 +- j/6/ut_mint.c | 110 ++++++++--------- j/6/ut_mull.c | 130 ++++++++++---------- j/6/ut_nest.c | 40 +++---- j/6/ut_park.c | 10 +- j/6/ut_peek.c | 26 ++-- j/6/ut_play.c | 56 ++++----- j/6/ut_repo.c | 8 +- j/6/ut_rest.c | 20 ++-- j/6/ut_seek.c | 30 ++--- j/6/ut_sift.c | 6 +- j/6/ut_swab.c | 6 +- j/6/ut_tack.c | 2 +- j/6/ut_tock.c | 6 +- j/6/ut_wrap.c | 8 +- j/dash.c | 322 ++++++++++++++++++++++++------------------------- v/cttp.c | 2 +- v/raft.c | 10 +- v/sist.c | 4 +- v/term.c | 4 +- v/time.c | 4 +- v/unix.c | 20 ++-- v/walk.c | 10 +- 146 files changed, 1628 insertions(+), 1599 deletions(-) diff --git a/Spec/u3.md b/Spec/u3.md index b6fa4428ae..44c54cea9d 100644 --- a/Spec/u3.md +++ b/Spec/u3.md @@ -18,17 +18,17 @@ to compute both efficiently and correctly. Two: `u3` is designed to support "permanent computing," ie, a single-level store which is transparently checkpointed. This -implies a specialized memory-management model. +implies a specialized memory-management model, etc, etc. -Does `u3` depend on the higher levels of Urbit, Arvo and Hoon? +(Does `u3` depend on the higher levels of Urbit, Arvo and Hoon? Yes and no. It expects you to load something shaped like an Arvo kernel, and use it as an event-processing function. But you don't need to use this feature if you don't want, and your kernel -can be anything you want. +can be anything you want.) ## c3: C in Urbit -Below `u3` is the simple `c3` layer, which is just how we write C +Under `u3` is the simple `c3` layer, which is just how we write C in Urbit. When writing C in u3, please of course follow the conventions of @@ -132,7 +132,36 @@ the other way. Use `!` as usual, `c3y` for yes and `c3n` for no, ## u3: introduction to the noun world -u3 is the +The division between `c3` and `u3` is that you could theoretically +imagine using `c3` as just a generic C environment. Anything to do +with nouns is in `u3`. + +### u3: a map of the system + +There are two kinds of symbols in `u3`: regular and irregular. +They all start with `u3`, but the regular names follow this +pattern: + + prefix purpose header + --------------------------------------------------- + u3a_ allocation + u3e_ persistence + u3h_ hashtables + u3i_ noun construction + u3j_ jet control + u3m_ system management + u3n_ nock computation + u3r_ noun access (error returns) + u3t_ profiling + u3v_ arvo + u3x_ noun access (error crashes) + u3z_ memoization + + +u3 deals with reference-counted, immutable, acyclic nouns. 90% +of what you need to know to program in u3 is just how to get your +refcounts right. + /** Prefix definitions: *** diff --git a/g/j.c b/g/j.c index 4b15b94636..acfc23bca8 100644 --- a/g/j.c +++ b/g/j.c @@ -93,7 +93,7 @@ _cj_by_gut(u3_noun a, u3_noun b) return qn_a; } else { - if ( c3y == u3_cqc_gor(b, pn_a) ) { + if ( c3y == u3qc_gor(b, pn_a) ) { return _cj_by_gut(l_a, b); } else return _cj_by_gut(r_a, b); @@ -173,7 +173,7 @@ _cj_je_fsck(u3_noun clu) { u3z(huk); u3z(clu); free(nam_c); return u3_none; } - huk = u3_ckdb_put(huk, u3k(pir_clu), u3k(qir_clu)); + huk = u3kdb_put(huk, u3k(pir_clu), u3k(qir_clu)); r_clu = tr_clu; } } @@ -186,9 +186,9 @@ _cj_je_fsck(u3_noun clu) static u3_atom _cj_sham(u3_noun som) // XX wrong, does not match ++sham { - u3_atom jam = u3_cke_jam(som); - u3_noun sha = u3_cqe_shax(jam); - u3_noun haf = u3_cqc_end(7, 1, sha); + u3_atom jam = u3ke_jam(som); + u3_noun sha = u3qe_shax(jam); + u3_noun haf = u3qc_end(7, 1, sha); u3z(jam); u3z(sha); return haf; @@ -258,21 +258,21 @@ _cj_cold_mine(u3_noun cey, u3_noun cor) // { u3_noun soh = _cj_sham(u3k(mop)); - u3_noun hoe = u3_ckdb_get(u3k(u3t(u3R->jed.das)), u3k(soh)); + u3_noun hoe = u3kdb_get(u3k(u3t(u3R->jed.das)), u3k(soh)); u3_noun sab; if ( u3_none == hoe ) { sab = u3nt(u3nc(u3k(bat), u3k(r_cey)), u3_nul, u3_nul); } else { - sab = u3_ckdb_put(u3k(u3t(hoe)), u3k(bat), u3k(r_cey)); + sab = u3kdb_put(u3k(u3t(hoe)), u3k(bat), u3k(r_cey)); u3z(hoe); } { u3_noun sad, h_sad, t_sad; - h_sad = u3_ckdb_put(u3k(u3h(u3R->jed.das)), u3k(bat), u3k(soh)); - t_sad = u3_ckdb_put(u3k(u3t(u3R->jed.das)), soh, + h_sad = u3kdb_put(u3k(u3h(u3R->jed.das)), u3k(bat), u3k(soh)); + t_sad = u3kdb_put(u3k(u3t(u3R->jed.das)), soh, u3nc(u3k(mop), sab)); sad = u3nc(h_sad, t_sad); @@ -337,7 +337,7 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc) } else { u3_noun nam = u3i_string(jet_u->fcs_c); - u3_noun fol = u3_ckdb_get(u3k(huc), nam); + u3_noun fol = u3kdb_get(u3k(huc), nam); if ( u3_none == fol ) { fprintf(stderr, "jets: activate: bad fcs %s\r\n", jet_u->fcs_c); @@ -348,7 +348,7 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc) } } if ( 0 != axe_l ) { - hap = u3_ckdb_put(hap, axe_l, i_l); + hap = u3kdb_put(hap, axe_l, i_l); } } } @@ -463,7 +463,7 @@ _cj_warm_ream_is(c3_l jax_l, static c3_l _cj_warm_ream_un(u3_noun soh) { - u3_noun cag = u3_ckdb_got(u3k(u3t(u3R->jed.das)), u3k(soh)); + u3_noun cag = u3kdb_got(u3k(u3t(u3R->jed.das)), u3k(soh)); u3_noun sab = u3t(cag); u3_noun cax; c3_l jax_l; @@ -733,7 +733,7 @@ _cj_hook_in(u3_noun cor, { c3_l jax_l = jax; u3e_core* cop_u = &u3D.ray_u[jax_l]; - u3_noun fol = u3_ckdb_get(u3k(huc), u3i_string(tam_c)); + u3_noun fol = u3kdb_get(u3k(huc), u3i_string(tam_c)); if ( u3_none == fol ) { // The caller wants a deeper core. @@ -753,7 +753,7 @@ _cj_hook_in(u3_noun cor, if ( (0 == axe_l) || (c3n == jet_o) || - (u3_none == (inx_l = u3_ckdb_get(u3k(hap), axe_l))) || + (u3_none == (inx_l = u3kdb_get(u3k(hap), axe_l))) || (u3_none == (pro = _cj_kick_z(cor, cop_u, &cop_u->arm_u[inx_l], @@ -820,7 +820,7 @@ u3j_kick(u3_noun cor, u3_noun axe) if ( u3_none == cax ) { return u3_none; } { u3_noun hap = u3h(u3t(u3t(cax))); - u3_noun inx = u3_ckdb_get(u3k(hap), u3k(axe)); + u3_noun inx = u3kdb_get(u3k(hap), u3k(axe)); if ( u3_none == inx ) { u3z(cax); return u3_none; @@ -880,7 +880,7 @@ _cj_cold_reap_un(u3_noun soh, u3_noun sab, u3_noun sys) { sys = _cj_cold_reap_un(soh, l_sab, sys); sys = _cj_cold_reap_un(soh, r_sab, sys); - sys = u3_ckdb_put(sys, u3a_take(pn_sab), u3k(soh)); + sys = u3kdb_put(sys, u3a_take(pn_sab), u3k(soh)); return sys; } @@ -910,7 +910,7 @@ _cj_cold_reap_to(u3_noun sab, u3_noun bas) if ( _(u3a_left(pn_sab)) ) { u3_noun bat = u3a_take(pn_sab); - bas = u3_ckdb_put(bas, bat, u3a_take(qn_sab)); + bas = u3kdb_put(bas, bat, u3a_take(qn_sab)); } return bas; } @@ -931,7 +931,7 @@ _cj_cold_reap_at(u3_noun soh, u3_noun cag) cag = u3nc(u3a_take(u3h(cag)), sab); sys = _cj_cold_reap_un(soh, sab, u3k(u3h(u3R->jed.das))); - haw = u3_ckdb_put(u3k(u3t(u3R->jed.das)), soh, cag); + haw = u3kdb_put(u3k(u3t(u3R->jed.das)), soh, cag); das = u3nc(sys, haw); u3z(u3R->jed.das); diff --git a/g/m.c b/g/m.c index fab87979ee..f5767e2011 100644 --- a/g/m.c +++ b/g/m.c @@ -171,7 +171,7 @@ _cm_signal_recover(c3_l sig_l, u3_noun arg) rod_u = u3R; while ( rod_u->kid_u ) { - tax = u3_ckb_weld(u3a_take(rod_u->kid_u->bug.tax), tax); + tax = u3kb_weld(u3a_take(rod_u->kid_u->bug.tax), tax); rod_u = rod_u->kid_u; } } @@ -875,7 +875,7 @@ u3m_soft_run(u3_noun fly, u3m_bail (u3nt(3, u3a_take(u3h(yod)), - u3_ckb_weld(u3t(yod), u3k(u3R->bug.tax)))); + u3kb_weld(u3t(yod), u3k(u3R->bug.tax)))); } break; case 4: { // meta-bail diff --git a/g/v.c b/g/v.c index bf05b239a0..4d496f12b8 100644 --- a/g/v.c +++ b/g/v.c @@ -26,7 +26,7 @@ _cv_nock_wish(u3_noun txt) void u3v_make(c3_c* pas_c) { - u3_noun sys = u3_cke_cue(u3m_file(pas_c)); + u3_noun sys = u3ke_cue(u3m_file(pas_c)); printf("cv_make: loaded pill %s, as %x\n", pas_c, u3r_mug(sys)); @@ -103,11 +103,11 @@ u3v_wish(const c3_c* str_c) if ( u3R == &u3H->rod_u ) { u3_noun txt = u3i_string(str_c); - exp = u3_ckdb_get(u3k(u3A->yot), u3k(txt)); + exp = u3kdb_get(u3k(u3A->yot), u3k(txt)); if ( u3_none == exp ) { exp = _cv_nock_wish(u3k(txt)); - u3A->yot = u3_ckdb_put(u3A->yot, u3k(txt), u3k(exp)); + u3A->yot = u3kdb_put(u3A->yot, u3k(txt), u3k(exp)); } u3z(txt); return exp; @@ -179,7 +179,7 @@ u3v_nick(u3_noun vir, u3_noun cor) cor = u3k(u3t(u3t(gon))); u3z(gon); - viz = u3_ckb_weld(vix, u3k(u3t(vir))); + viz = u3kb_weld(vix, u3k(u3t(vir))); u3z(vir); return u3v_nick(viz, cor); @@ -325,7 +325,7 @@ _cv_time_bump(u3_reck* rec_u) { c3_d bum_d = (1ULL << 48ULL); - u3A->now = u3_cka_add(u3A->now, u3i_chubs(1, &bum_d)); + u3A->now = u3ka_add(u3A->now, u3i_chubs(1, &bum_d)); } #endif diff --git a/i/j/k.h b/i/j/k.h index be6d0b19a2..96b31e14a5 100644 --- a/i/j/k.h +++ b/i/j/k.h @@ -4,93 +4,93 @@ */ /** Tier 1. **/ - u3_noun u3_cka_add(u3_noun a, u3_noun b); - u3_noun u3_cka_sub(u3_noun a, u3_noun b); - u3_noun u3_cka_mul(u3_noun a, u3_noun b); - u3_noun u3_cka_gth(u3_noun a, u3_noun b); - u3_noun u3_cka_lte(u3_noun a, u3_noun b); + u3_noun u3ka_add(u3_noun a, u3_noun b); + u3_noun u3ka_sub(u3_noun a, u3_noun b); + u3_noun u3ka_mul(u3_noun a, u3_noun b); + u3_noun u3ka_gth(u3_noun a, u3_noun b); + u3_noun u3ka_lte(u3_noun a, u3_noun b); /** Tier 2. **/ - u3_noun u3_ckb_lent(u3_noun a); - u3_noun u3_ckb_weld(u3_noun a, u3_noun b); - u3_noun u3_ckb_flop(u3_noun a); + u3_noun u3kb_lent(u3_noun a); + u3_noun u3kb_weld(u3_noun a, u3_noun b); + u3_noun u3kb_flop(u3_noun a); -/* u3_ckc: tier 3 functions +/* u3kc: tier 3 functions */ - /* u3_ckc_lsh(): left shift. + /* u3kc_lsh(): left shift. */ u3_noun - u3_ckc_lsh(u3_noun a, u3_noun b, u3_noun c); + u3kc_lsh(u3_noun a, u3_noun b, u3_noun c); - /* u3_ckc_rsh(): right shift. + /* u3kc_rsh(): right shift. */ u3_noun - u3_ckc_rsh(u3_noun a, u3_noun b, u3_noun c); + u3kc_rsh(u3_noun a, u3_noun b, u3_noun c); -/* u3_ckd: tier 4 functions +/* u3kd: tier 4 functions */ - /* u3_ckdb_get(): map get for key `b` in map `a` with u3_none. + /* u3kdb_get(): map get for key `b` in map `a` with u3_none. */ u3_weak - u3_ckdb_get(u3_noun a, u3_noun b); + u3kdb_get(u3_noun a, u3_noun b); - /* u3_ckdb_got(): map get for key `b` in map `a` with bail. + /* u3kdb_got(): map get for key `b` in map `a` with bail. */ u3_noun - u3_ckdb_got(u3_noun a, u3_noun b); + u3kdb_got(u3_noun a, u3_noun b); - /* u3_ckdb_put(): map put for key `b`, value `c` in map `a`. + /* u3kdb_put(): map put for key `b`, value `c` in map `a`. */ u3_weak - u3_ckdb_put(u3_noun a, u3_noun b, u3_noun c); + u3kdb_put(u3_noun a, u3_noun b, u3_noun c); - /* u3_ckdb_has(): test for get. + /* u3kdb_has(): test for get. */ u3_noun - u3_ckdb_has(u3_noun a, u3_noun b); + u3kdb_has(u3_noun a, u3_noun b); - /* u3_ckdb_gas(): list to map. + /* u3kdb_gas(): list to map. */ u3_noun - u3_ckdb_gas(u3_noun a, u3_noun b); + u3kdb_gas(u3_noun a, u3_noun b); - /* u3_ckdi_gas(): list to map. + /* u3kdi_gas(): list to map. */ u3_noun - u3_ckdi_gas(u3_noun a, u3_noun b); + u3kdi_gas(u3_noun a, u3_noun b); - /* u3_ckdi_has(): test for presence. + /* u3kdi_has(): test for presence. */ u3_noun - u3_ckdi_has(u3_noun a, u3_noun b); + u3kdi_has(u3_noun a, u3_noun b); - /* u3_ckdi_tap(): map/set convert to list. (solves by_tap also.) + /* u3kdi_tap(): map/set convert to list. (solves by_tap also.) */ u3_noun - u3_ckdi_tap(u3_noun a, u3_noun b); + u3kdi_tap(u3_noun a, u3_noun b); - /* u3_ckdi_put(): put in set. + /* u3kdi_put(): put in set. */ u3_weak - u3_ckdi_put(u3_noun a, u3_noun b); + u3kdi_put(u3_noun a, u3_noun b); -# define u3_ckdb_tap(a, b) u3_ckdi_tap(a, b) +# define u3kdb_tap(a, b) u3kdi_tap(a, b) -/* u3_cke: tier 5 functions +/* u3ke: tier 5 functions */ - /* u3_cke_cue(): expand saved pill. + /* u3ke_cue(): expand saved pill. */ u3_noun - u3_cke_cue(u3_atom a); + u3ke_cue(u3_atom a); - /* u3_cke_jam(): pack noun as atom. + /* u3ke_jam(): pack noun as atom. */ u3_atom - u3_cke_jam(u3_noun a); + u3ke_jam(u3_noun a); - /* u3_cke_trip: atom to tape. + /* u3ke_trip: atom to tape. */ u3_noun - u3_cke_trip(u3_noun a); + u3ke_trip(u3_noun a); diff --git a/i/j/q.h b/i/j/q.h index b9d15ea2b1..5134f6dd0a 100644 --- a/i/j/q.h +++ b/i/j/q.h @@ -4,181 +4,181 @@ */ /** Tier 1. **/ - u3_noun u3_cqa_add(u3_atom, u3_atom); - u3_noun u3_cqa_dec(u3_atom); - u3_noun u3_cqa_div(u3_atom, u3_atom); - u3_noun u3_cqa_gte(u3_atom, u3_atom); - u3_noun u3_cqa_gth(u3_atom, u3_atom); - u3_noun u3_cqa_inc(u3_atom); - u3_noun u3_cqa_lte(u3_atom, u3_atom); - u3_noun u3_cqa_lth(u3_atom, u3_atom); - u3_noun u3_cqa_mod(u3_atom, u3_atom); - u3_noun u3_cqa_mul(u3_atom, u3_atom); - u3_noun u3_cqa_sub(u3_atom, u3_atom); + u3_noun u3qa_add(u3_atom, u3_atom); + u3_noun u3qa_dec(u3_atom); + u3_noun u3qa_div(u3_atom, u3_atom); + u3_noun u3qa_gte(u3_atom, u3_atom); + u3_noun u3qa_gth(u3_atom, u3_atom); + u3_noun u3qa_inc(u3_atom); + u3_noun u3qa_lte(u3_atom, u3_atom); + u3_noun u3qa_lth(u3_atom, u3_atom); + u3_noun u3qa_mod(u3_atom, u3_atom); + u3_noun u3qa_mul(u3_atom, u3_atom); + u3_noun u3qa_sub(u3_atom, u3_atom); /** Tier 2. **/ - u3_noun u3_cqb_bind(u3_noun, u3_noun); - u3_noun u3_cqb_clap(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqb_drop(u3_noun); - u3_noun u3_cqb_flop(u3_noun); - u3_noun u3_cqb_lent(u3_noun); - u3_noun u3_cqb_levy(u3_noun, u3_noun); - u3_noun u3_cqb_lien(u3_noun, u3_noun); - u3_noun u3_cqb_need(u3_noun); - u3_noun u3_cqb_reel(u3_noun, u3_noun); - u3_noun u3_cqb_roll(u3_noun, u3_noun); - u3_noun u3_cqb_skim(u3_noun, u3_noun); - u3_noun u3_cqb_skip(u3_noun, u3_noun); - u3_noun u3_cqb_scag(u3_atom, u3_noun); - u3_noun u3_cqb_slag(u3_atom, u3_noun); - u3_noun u3_cqb_snag(u3_atom, u3_noun); - u3_noun u3_cqb_sort(u3_noun, u3_noun); - u3_noun u3_cqb_turn(u3_noun, u3_noun); - u3_noun u3_cqb_weld(u3_noun, u3_noun); + u3_noun u3qb_bind(u3_noun, u3_noun); + u3_noun u3qb_clap(u3_noun, u3_noun, u3_noun); + u3_noun u3qb_drop(u3_noun); + u3_noun u3qb_flop(u3_noun); + u3_noun u3qb_lent(u3_noun); + u3_noun u3qb_levy(u3_noun, u3_noun); + u3_noun u3qb_lien(u3_noun, u3_noun); + u3_noun u3qb_need(u3_noun); + u3_noun u3qb_reel(u3_noun, u3_noun); + u3_noun u3qb_roll(u3_noun, u3_noun); + u3_noun u3qb_skim(u3_noun, u3_noun); + u3_noun u3qb_skip(u3_noun, u3_noun); + u3_noun u3qb_scag(u3_atom, u3_noun); + u3_noun u3qb_slag(u3_atom, u3_noun); + u3_noun u3qb_snag(u3_atom, u3_noun); + u3_noun u3qb_sort(u3_noun, u3_noun); + u3_noun u3qb_turn(u3_noun, u3_noun); + u3_noun u3qb_weld(u3_noun, u3_noun); /** Tier 3. **/ - u3_noun u3_cqc_bex(u3_atom); - u3_noun u3_cqc_can(u3_atom, u3_noun); - u3_noun u3_cqc_cap(u3_atom); - u3_noun u3_cqc_cat(u3_atom, u3_atom, u3_atom); - u3_noun u3_cqc_con(u3_atom, u3_atom); - u3_noun u3_cqc_cut(u3_atom, u3_atom, u3_atom, u3_atom); - u3_noun u3_cqc_dis(u3_atom, u3_atom); - u3_noun u3_cqc_dor(u3_atom, u3_atom); - u3_noun u3_cqc_end(u3_atom, u3_atom, u3_atom); - u3_noun u3_cqc_gor(u3_atom, u3_atom); - u3_noun u3_cqc_hor(u3_atom, u3_atom); - u3_noun u3_cqc_lsh(u3_atom, u3_atom, u3_atom); - u3_noun u3_cqc_mas(u3_atom); - u3_noun u3_cqc_met(u3_atom, u3_atom); - u3_noun u3_cqc_mix(u3_atom, u3_atom); - u3_noun u3_cqc_peg(u3_atom, u3_atom); - u3_noun u3_cqc_rap(u3_atom, u3_noun); - u3_noun u3_cqc_rip(u3_atom, u3_atom); - u3_noun u3_cqc_rsh(u3_atom, u3_atom, u3_atom); - u3_noun u3_cqc_vor(u3_atom, u3_atom); + u3_noun u3qc_bex(u3_atom); + u3_noun u3qc_can(u3_atom, u3_noun); + u3_noun u3qc_cap(u3_atom); + u3_noun u3qc_cat(u3_atom, u3_atom, u3_atom); + u3_noun u3qc_con(u3_atom, u3_atom); + u3_noun u3qc_cut(u3_atom, u3_atom, u3_atom, u3_atom); + u3_noun u3qc_dis(u3_atom, u3_atom); + u3_noun u3qc_dor(u3_atom, u3_atom); + u3_noun u3qc_end(u3_atom, u3_atom, u3_atom); + u3_noun u3qc_gor(u3_atom, u3_atom); + u3_noun u3qc_hor(u3_atom, u3_atom); + u3_noun u3qc_lsh(u3_atom, u3_atom, u3_atom); + u3_noun u3qc_mas(u3_atom); + u3_noun u3qc_met(u3_atom, u3_atom); + u3_noun u3qc_mix(u3_atom, u3_atom); + u3_noun u3qc_peg(u3_atom, u3_atom); + u3_noun u3qc_rap(u3_atom, u3_noun); + u3_noun u3qc_rip(u3_atom, u3_atom); + u3_noun u3qc_rsh(u3_atom, u3_atom, u3_atom); + u3_noun u3qc_vor(u3_atom, u3_atom); /** Tier 4. **/ - u3_noun u3_cqdb_gas(u3_noun, u3_noun); - u3_noun u3_cqdb_get(u3_noun, u3_noun); - u3_noun u3_cqdb_has(u3_noun, u3_noun); - u3_noun u3_cqdb_int(u3_noun, u3_noun); - u3_noun u3_cqdb_put(u3_noun, u3_noun, u3_noun); -# define u3_cqdb_tap u3_cqdi_tap - u3_noun u3_cqdb_uni(u3_noun, u3_noun); + u3_noun u3qdb_gas(u3_noun, u3_noun); + u3_noun u3qdb_get(u3_noun, u3_noun); + u3_noun u3qdb_has(u3_noun, u3_noun); + u3_noun u3qdb_int(u3_noun, u3_noun); + u3_noun u3qdb_put(u3_noun, u3_noun, u3_noun); +# define u3qdb_tap u3qdi_tap + u3_noun u3qdb_uni(u3_noun, u3_noun); - u3_noun u3_cqdi_gas(u3_noun, u3_noun); - u3_noun u3_cqdi_has(u3_noun, u3_noun); - u3_noun u3_cqdi_int(u3_noun, u3_noun); - u3_noun u3_cqdi_mer(u3_noun, u3_noun); - u3_noun u3_cqdi_put(u3_noun, u3_noun); - u3_noun u3_cqdi_tap(u3_noun, u3_noun); - u3_noun u3_cqdi_uni(u3_noun, u3_noun); + u3_noun u3qdi_gas(u3_noun, u3_noun); + u3_noun u3qdi_has(u3_noun, u3_noun); + u3_noun u3qdi_int(u3_noun, u3_noun); + u3_noun u3qdi_mer(u3_noun, u3_noun); + u3_noun u3qdi_put(u3_noun, u3_noun); + u3_noun u3qdi_tap(u3_noun, u3_noun); + u3_noun u3qdi_uni(u3_noun, u3_noun); /** Tier 5. **/ - u3_noun u3_cqe_cue(u3_atom); - u3_noun u3_cqe_jam(u3_atom); - u3_noun u3_cqe_mat(u3_atom); - u3_noun u3_cqe_rub(u3_atom, u3_atom); - u3_noun u3_cqe_lore(u3_atom); - u3_noun u3_cqe_loss(u3_noun, u3_noun); - u3_noun u3_cqe_repg(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqe_rexp(u3_noun, u3_noun); - u3_noun u3_cqe_trip(u3_atom); + u3_noun u3qe_cue(u3_atom); + u3_noun u3qe_jam(u3_atom); + u3_noun u3qe_mat(u3_atom); + u3_noun u3qe_rub(u3_atom, u3_atom); + u3_noun u3qe_lore(u3_atom); + u3_noun u3qe_loss(u3_noun, u3_noun); + u3_noun u3qe_repg(u3_noun, u3_noun, u3_noun); + u3_noun u3qe_rexp(u3_noun, u3_noun); + u3_noun u3qe_trip(u3_atom); - u3_noun u3_cqea_de(u3_atom, u3_atom); - u3_noun u3_cqea_en(u3_atom, u3_atom); + u3_noun u3qea_de(u3_atom, u3_atom); + u3_noun u3qea_en(u3_atom, u3_atom); - u3_noun u3_cqe_shax(u3_atom); - u3_noun u3_cqe_shas(u3_atom, u3_atom); - u3_noun u3_cqe_shal(u3_atom, u3_atom); + u3_noun u3qe_shax(u3_atom); + u3_noun u3qe_shas(u3_atom, u3_atom); + u3_noun u3qe_shal(u3_atom, u3_atom); - u3_noun u3_cqeo_raw(u3_atom, u3_atom); + u3_noun u3qeo_raw(u3_atom, u3_atom); - u3_noun u3_cqer_sun(u3_atom); - u3_noun u3_cqer_mul(u3_atom, u3_atom); - u3_noun u3_cqer_div(u3_atom, u3_atom); - u3_noun u3_cqer_add(u3_atom, u3_atom); - u3_noun u3_cqer_sub(u3_atom, u3_atom); - u3_noun u3_cqer_lte(u3_atom, u3_atom); - u3_noun u3_cqer_lth(u3_atom, u3_atom); - u3_noun u3_cqer_gte(u3_atom, u3_atom); - u3_noun u3_cqer_gth(u3_atom, u3_atom); + u3_noun u3qer_sun(u3_atom); + u3_noun u3qer_mul(u3_atom, u3_atom); + u3_noun u3qer_div(u3_atom, u3_atom); + u3_noun u3qer_add(u3_atom, u3_atom); + u3_noun u3qer_sub(u3_atom, u3_atom); + u3_noun u3qer_lte(u3_atom, u3_atom); + u3_noun u3qer_lth(u3_atom, u3_atom); + u3_noun u3qer_gte(u3_atom, u3_atom); + u3_noun u3qer_gth(u3_atom, u3_atom); /** Tier 6. **/ - u3_noun u3_cqf_bull(u3_noun, u3_noun); - u3_noun u3_cqf_cell(u3_noun, u3_noun); - u3_noun u3_cqf_comb(u3_noun, u3_noun); - u3_noun u3_cqf_cons(u3_noun, u3_noun); - u3_noun u3_cqf_core(u3_noun, u3_noun); - u3_noun u3_cqf_cube(u3_noun, u3_noun); - u3_noun u3_cqf_face(u3_noun, u3_noun); - u3_noun u3_cqf_fine(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqf_fitz(u3_noun, u3_noun); - u3_noun u3_cqf_flan(u3_noun, u3_noun); - u3_noun u3_cqf_flay(u3_noun); - u3_noun u3_cqf_flip(u3_noun); - u3_noun u3_cqf_flor(u3_noun, u3_noun); - u3_noun u3_cqf_fork(u3_noun, u3_noun); - u3_noun u3_cqf_hike(u3_noun, u3_noun); - u3_noun u3_cqf_look(u3_noun, u3_noun); - u3_noun u3_cqf_slot(u3_atom, u3_noun); - u3_noun u3_cqf_type(u3_noun); + u3_noun u3qf_bull(u3_noun, u3_noun); + u3_noun u3qf_cell(u3_noun, u3_noun); + u3_noun u3qf_comb(u3_noun, u3_noun); + u3_noun u3qf_cons(u3_noun, u3_noun); + u3_noun u3qf_core(u3_noun, u3_noun); + u3_noun u3qf_cube(u3_noun, u3_noun); + u3_noun u3qf_face(u3_noun, u3_noun); + u3_noun u3qf_fine(u3_noun, u3_noun, u3_noun); + u3_noun u3qf_fitz(u3_noun, u3_noun); + u3_noun u3qf_flan(u3_noun, u3_noun); + u3_noun u3qf_flay(u3_noun); + u3_noun u3qf_flip(u3_noun); + u3_noun u3qf_flor(u3_noun, u3_noun); + u3_noun u3qf_fork(u3_noun, u3_noun); + u3_noun u3qf_hike(u3_noun, u3_noun); + u3_noun u3qf_look(u3_noun, u3_noun); + u3_noun u3qf_slot(u3_atom, u3_noun); + u3_noun u3qf_type(u3_noun); - u3_noun u3_cqfl_bunt(u3_noun, u3_noun); - u3_noun u3_cqfl_whip(u3_noun, u3_noun, u3_noun); + u3_noun u3qfl_bunt(u3_noun, u3_noun); + u3_noun u3qfl_whip(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfp_hack(u3_noun, u3_noun); - u3_noun u3_cqfp_late(u3_noun); - u3_noun u3_cqfp_open(u3_noun, u3_noun); - u3_noun u3_cqfp_rake(u3_noun); + u3_noun u3qfp_hack(u3_noun, u3_noun); + u3_noun u3qfp_late(u3_noun); + u3_noun u3qfp_open(u3_noun, u3_noun); + u3_noun u3qfp_rake(u3_noun); -# define u3_cqfu_van_fan 28 -# define u3_cqfu_van_rib 58 -# define u3_cqfu_van_vrf 59 -# define u3_cqfu_van_vet 118 -# define u3_cqfu_van_fab 119 +# define u3qfu_van_fan 28 +# define u3qfu_van_rib 58 +# define u3qfu_van_vrf 59 +# define u3qfu_van_vet 118 +# define u3qfu_van_fab 119 - u3_noun u3_cqfu_burn(u3_noun, u3_noun); - u3_noun u3_cqfu_busk(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_bust(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_conk(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_crop(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_cull(u3_noun, u3_noun, u3_noun, u3_atom, u3_noun); - u3_noun u3_cqfu_duck(u3_noun, u3_noun); - u3_noun u3_cqfu_dung(u3_noun, u3_noun cap, u3_noun); - u3_noun u3_cqfu_dunq(u3_noun, const c3_c*, u3_noun); - u3_noun u3_cqfu_find(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_fino(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_fink(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_fire(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_firm(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_fish(u3_noun, u3_noun, u3_atom); - u3_noun u3_cqfu_fuse(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_gain(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_heal(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_lose(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_mint(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_mull(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_nest(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_orth(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_park(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_peek(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_play(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_repo(u3_noun, u3_noun); - u3_noun u3_cqfu_rest(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_seek(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_seep(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_shep(u3_noun, const c3_c*, u3_noun, u3_noun); - u3_noun u3_cqfu_shew(u3_noun, u3_noun); - u3_noun u3_cqfu_sift(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_snub(u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_tack(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_tock(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3_cqfu_wrap(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_burn(u3_noun, u3_noun); + u3_noun u3qfu_busk(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_bust(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_conk(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_crop(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_cull(u3_noun, u3_noun, u3_noun, u3_atom, u3_noun); + u3_noun u3qfu_duck(u3_noun, u3_noun); + u3_noun u3qfu_dung(u3_noun, u3_noun cap, u3_noun); + u3_noun u3qfu_dunq(u3_noun, const c3_c*, u3_noun); + u3_noun u3qfu_find(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_fino(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_fink(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_fire(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_firm(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_fish(u3_noun, u3_noun, u3_atom); + u3_noun u3qfu_fuse(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_gain(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_heal(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_lose(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_mint(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_mull(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_nest(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_orth(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_park(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_peek(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_play(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_repo(u3_noun, u3_noun); + u3_noun u3qfu_rest(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_seek(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_seep(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_shep(u3_noun, const c3_c*, u3_noun, u3_noun); + u3_noun u3qfu_shew(u3_noun, u3_noun); + u3_noun u3qfu_sift(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_snub(u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_tack(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_tock(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_wrap(u3_noun, u3_noun, u3_noun); diff --git a/i/j/w.h b/i/j/w.h index bb4d30a1cd..f9a7ea2fc1 100644 --- a/i/j/w.h +++ b/i/j/w.h @@ -4,194 +4,194 @@ */ /** Tier 1. **/ - u3_noun u3_cwa_add(u3_noun); - u3_noun u3_cwa_dec(u3_noun); - u3_noun u3_cwa_div(u3_noun); - u3_noun u3_cwa_gte(u3_noun); - u3_noun u3_cwa_gth(u3_noun); - u3_noun u3_cwa_lte(u3_noun); - u3_noun u3_cwa_lth(u3_noun); - u3_noun u3_cwa_mod(u3_noun); - u3_noun u3_cwa_mul(u3_noun); - u3_noun u3_cwa_sub(u3_noun); + u3_noun u3wa_add(u3_noun); + u3_noun u3wa_dec(u3_noun); + u3_noun u3wa_div(u3_noun); + u3_noun u3wa_gte(u3_noun); + u3_noun u3wa_gth(u3_noun); + u3_noun u3wa_lte(u3_noun); + u3_noun u3wa_lth(u3_noun); + u3_noun u3wa_mod(u3_noun); + u3_noun u3wa_mul(u3_noun); + u3_noun u3wa_sub(u3_noun); /** Tier 2. **/ - u3_noun u3_cwb_bind(u3_noun); - u3_noun u3_cwb_clap(u3_noun); - u3_noun u3_cwb_drop(u3_noun); - u3_noun u3_cwb_flop(u3_noun); - u3_noun u3_cwb_lent(u3_noun); - u3_noun u3_cwb_levy(u3_noun); - u3_noun u3_cwb_lien(u3_noun); - u3_noun u3_cwb_need(u3_noun); - u3_noun u3_cwb_reel(u3_noun); - u3_noun u3_cwb_roll(u3_noun); - u3_noun u3_cwb_skim(u3_noun); - u3_noun u3_cwb_skip(u3_noun); - u3_noun u3_cwb_scag(u3_noun); - u3_noun u3_cwb_slag(u3_noun); - u3_noun u3_cwb_snag(u3_noun); - u3_noun u3_cwb_sort(u3_noun); - u3_noun u3_cwb_turn(u3_noun); - u3_noun u3_cwb_weld(u3_noun); + u3_noun u3wb_bind(u3_noun); + u3_noun u3wb_clap(u3_noun); + u3_noun u3wb_drop(u3_noun); + u3_noun u3wb_flop(u3_noun); + u3_noun u3wb_lent(u3_noun); + u3_noun u3wb_levy(u3_noun); + u3_noun u3wb_lien(u3_noun); + u3_noun u3wb_need(u3_noun); + u3_noun u3wb_reel(u3_noun); + u3_noun u3wb_roll(u3_noun); + u3_noun u3wb_skim(u3_noun); + u3_noun u3wb_skip(u3_noun); + u3_noun u3wb_scag(u3_noun); + u3_noun u3wb_slag(u3_noun); + u3_noun u3wb_snag(u3_noun); + u3_noun u3wb_sort(u3_noun); + u3_noun u3wb_turn(u3_noun); + u3_noun u3wb_weld(u3_noun); /** Tier 3. **/ - u3_noun u3_cwc_bex(u3_noun); - u3_noun u3_cwc_can(u3_noun); - u3_noun u3_cwc_cap(u3_noun); - u3_noun u3_cwc_cat(u3_noun); - u3_noun u3_cwc_con(u3_noun); - u3_noun u3_cwc_cut(u3_noun); - u3_noun u3_cwc_dis(u3_noun); - u3_noun u3_cwc_dor(u3_noun); - u3_noun u3_cwc_end(u3_noun); - u3_noun u3_cwc_gor(u3_noun); - u3_noun u3_cwc_hor(u3_noun); - u3_noun u3_cwc_lsh(u3_noun); - u3_noun u3_cwc_mas(u3_noun); - u3_noun u3_cwc_met(u3_noun); - u3_noun u3_cwc_mix(u3_noun); - u3_noun u3_cwc_mug(u3_noun); - u3_noun u3_cwc_peg(u3_noun); - u3_noun u3_cwc_rap(u3_noun); - u3_noun u3_cwc_rip(u3_noun); - u3_noun u3_cwc_rsh(u3_noun); - u3_noun u3_cwc_vor(u3_noun); + u3_noun u3wc_bex(u3_noun); + u3_noun u3wc_can(u3_noun); + u3_noun u3wc_cap(u3_noun); + u3_noun u3wc_cat(u3_noun); + u3_noun u3wc_con(u3_noun); + u3_noun u3wc_cut(u3_noun); + u3_noun u3wc_dis(u3_noun); + u3_noun u3wc_dor(u3_noun); + u3_noun u3wc_end(u3_noun); + u3_noun u3wc_gor(u3_noun); + u3_noun u3wc_hor(u3_noun); + u3_noun u3wc_lsh(u3_noun); + u3_noun u3wc_mas(u3_noun); + u3_noun u3wc_met(u3_noun); + u3_noun u3wc_mix(u3_noun); + u3_noun u3wc_mug(u3_noun); + u3_noun u3wc_peg(u3_noun); + u3_noun u3wc_rap(u3_noun); + u3_noun u3wc_rip(u3_noun); + u3_noun u3wc_rsh(u3_noun); + u3_noun u3wc_vor(u3_noun); - u3_noun u3_cwcp_ins(u3_noun); - u3_noun u3_cwcp_ind(u3_noun); - u3_noun u3_cwcp_tos(u3_noun); - u3_noun u3_cwcp_tod(u3_noun); + u3_noun u3wcp_ins(u3_noun); + u3_noun u3wcp_ind(u3_noun); + u3_noun u3wcp_tos(u3_noun); + u3_noun u3wcp_tod(u3_noun); /** Tier 4. **/ - u3_noun u3_cwdb_gas(u3_noun); - u3_noun u3_cwdb_get(u3_noun); - u3_noun u3_cwdb_has(u3_noun); - u3_noun u3_cwdb_int(u3_noun); - u3_noun u3_cwdb_put(u3_noun); -# define u3_cwdb_tap u3_cwdi_tap - u3_noun u3_cwdb_uni(u3_noun); + u3_noun u3wdb_gas(u3_noun); + u3_noun u3wdb_get(u3_noun); + u3_noun u3wdb_has(u3_noun); + u3_noun u3wdb_int(u3_noun); + u3_noun u3wdb_put(u3_noun); +# define u3wdb_tap u3wdi_tap + u3_noun u3wdb_uni(u3_noun); - u3_noun u3_cwdi_gas(u3_noun); - u3_noun u3_cwdi_has(u3_noun); - u3_noun u3_cwdi_int(u3_noun); - u3_noun u3_cwdi_mer(u3_noun); - u3_noun u3_cwdi_put(u3_noun); - u3_noun u3_cwdi_tap(u3_noun); - u3_noun u3_cwdi_uni(u3_noun); + u3_noun u3wdi_gas(u3_noun); + u3_noun u3wdi_has(u3_noun); + u3_noun u3wdi_int(u3_noun); + u3_noun u3wdi_mer(u3_noun); + u3_noun u3wdi_put(u3_noun); + u3_noun u3wdi_tap(u3_noun); + u3_noun u3wdi_uni(u3_noun); /** Tier 5. **/ - u3_noun u3_cwe_cue(u3_noun); - u3_noun u3_cwe_jam(u3_noun); - u3_noun u3_cwe_mat(u3_noun); - u3_noun u3_cwe_rub(u3_noun); - u3_noun u3_cwe_lore(u3_noun); - u3_noun u3_cwe_loss(u3_noun); - u3_noun u3_cwe_mink(u3_noun); - u3_noun u3_cwe_mule(u3_noun); - u3_noun u3_cwe_repg(u3_noun); - u3_noun u3_cwe_rexp(u3_noun); - u3_noun u3_cwe_trip(u3_noun); + u3_noun u3we_cue(u3_noun); + u3_noun u3we_jam(u3_noun); + u3_noun u3we_mat(u3_noun); + u3_noun u3we_rub(u3_noun); + u3_noun u3we_lore(u3_noun); + u3_noun u3we_loss(u3_noun); + u3_noun u3we_mink(u3_noun); + u3_noun u3we_mule(u3_noun); + u3_noun u3we_repg(u3_noun); + u3_noun u3we_rexp(u3_noun); + u3_noun u3we_trip(u3_noun); - u3_noun u3_cwe_pfix(u3_noun); - u3_noun u3_cwe_plug(u3_noun); - u3_noun u3_cwe_pose(u3_noun); - u3_noun u3_cwe_sfix(u3_noun); + u3_noun u3we_pfix(u3_noun); + u3_noun u3we_plug(u3_noun); + u3_noun u3we_pose(u3_noun); + u3_noun u3we_sfix(u3_noun); - u3_noun u3_cwea_de(u3_noun); - u3_noun u3_cwea_en(u3_noun); + u3_noun u3wea_de(u3_noun); + u3_noun u3wea_en(u3_noun); - u3_noun u3_cwe_shax(u3_noun); - u3_noun u3_cwe_shas(u3_noun); - u3_noun u3_cwe_shal(u3_noun); + u3_noun u3we_shax(u3_noun); + u3_noun u3we_shas(u3_noun); + u3_noun u3we_shal(u3_noun); - u3_noun u3_cweo_raw(u3_noun); + u3_noun u3weo_raw(u3_noun); - u3_noun u3_cwee_puck(u3_noun); - u3_noun u3_cwee_sign(u3_noun); - u3_noun u3_cwee_veri(u3_noun); + u3_noun u3wee_puck(u3_noun); + u3_noun u3wee_sign(u3_noun); + u3_noun u3wee_veri(u3_noun); - u3_noun u3_cwe_bend_fun(u3_noun); - u3_noun u3_cwe_cold_fun(u3_noun); - u3_noun u3_cwe_cook_fun(u3_noun); - u3_noun u3_cwe_comp_fun(u3_noun); - u3_noun u3_cwe_easy_fun(u3_noun); - u3_noun u3_cwe_glue_fun(u3_noun); - u3_noun u3_cwe_here_fun(u3_noun); - u3_noun u3_cwe_just_fun(u3_noun); - u3_noun u3_cwe_mask_fun(u3_noun); - u3_noun u3_cwe_shim_fun(u3_noun); - u3_noun u3_cwe_stag_fun(u3_noun); - u3_noun u3_cwe_stew_fun(u3_noun); - u3_noun u3_cwe_stir_fun(u3_noun); + u3_noun u3we_bend_fun(u3_noun); + u3_noun u3we_cold_fun(u3_noun); + u3_noun u3we_cook_fun(u3_noun); + u3_noun u3we_comp_fun(u3_noun); + u3_noun u3we_easy_fun(u3_noun); + u3_noun u3we_glue_fun(u3_noun); + u3_noun u3we_here_fun(u3_noun); + u3_noun u3we_just_fun(u3_noun); + u3_noun u3we_mask_fun(u3_noun); + u3_noun u3we_shim_fun(u3_noun); + u3_noun u3we_stag_fun(u3_noun); + u3_noun u3we_stew_fun(u3_noun); + u3_noun u3we_stir_fun(u3_noun); - u3_noun u3_cwer_sun(u3_noun); - u3_noun u3_cwer_mul(u3_noun); - u3_noun u3_cwer_div(u3_noun); - u3_noun u3_cwer_add(u3_noun); - u3_noun u3_cwer_sub(u3_noun); - u3_noun u3_cwer_lte(u3_noun); - u3_noun u3_cwer_lth(u3_noun); - u3_noun u3_cwer_gte(u3_noun); - u3_noun u3_cwer_gth(u3_noun); + u3_noun u3wer_sun(u3_noun); + u3_noun u3wer_mul(u3_noun); + u3_noun u3wer_div(u3_noun); + u3_noun u3wer_add(u3_noun); + u3_noun u3wer_sub(u3_noun); + u3_noun u3wer_lte(u3_noun); + u3_noun u3wer_lth(u3_noun); + u3_noun u3wer_gte(u3_noun); + u3_noun u3wer_gth(u3_noun); /** Tier 6. **/ - u3_noun u3_cwf_bull(u3_noun); - u3_noun u3_cwf_cell(u3_noun); - u3_noun u3_cwf_comb(u3_noun); - u3_noun u3_cwf_cons(u3_noun); - u3_noun u3_cwf_core(u3_noun); - u3_noun u3_cwf_cube(u3_noun); - u3_noun u3_cwf_face(u3_noun); - u3_noun u3_cwf_fine(u3_noun); - u3_noun u3_cwf_fitz(u3_noun); - u3_noun u3_cwf_flan(u3_noun); - u3_noun u3_cwf_flay(u3_noun); - u3_noun u3_cwf_flip(u3_noun); - u3_noun u3_cwf_flor(u3_noun); - u3_noun u3_cwf_fork(u3_noun); - u3_noun u3_cwf_hike(u3_noun); - u3_noun u3_cwf_look(u3_noun); + u3_noun u3wf_bull(u3_noun); + u3_noun u3wf_cell(u3_noun); + u3_noun u3wf_comb(u3_noun); + u3_noun u3wf_cons(u3_noun); + u3_noun u3wf_core(u3_noun); + u3_noun u3wf_cube(u3_noun); + u3_noun u3wf_face(u3_noun); + u3_noun u3wf_fine(u3_noun); + u3_noun u3wf_fitz(u3_noun); + u3_noun u3wf_flan(u3_noun); + u3_noun u3wf_flay(u3_noun); + u3_noun u3wf_flip(u3_noun); + u3_noun u3wf_flor(u3_noun); + u3_noun u3wf_fork(u3_noun); + u3_noun u3wf_hike(u3_noun); + u3_noun u3wf_look(u3_noun); - u3_noun u3_cwfl_bunt(u3_noun); - u3_noun u3_cwfl_whip(u3_noun); + u3_noun u3wfl_bunt(u3_noun); + u3_noun u3wfl_whip(u3_noun); - u3_noun u3_cwfp_hack(u3_noun); - u3_noun u3_cwfp_late(u3_noun); - u3_noun u3_cwfp_open(u3_noun); - u3_noun u3_cwfp_rake(u3_noun); + u3_noun u3wfp_hack(u3_noun); + u3_noun u3wfp_late(u3_noun); + u3_noun u3wfp_open(u3_noun); + u3_noun u3wfp_rake(u3_noun); - u3_noun u3_cwfu_burn(u3_noun); - u3_noun u3_cwfu_busk(u3_noun); - u3_noun u3_cwfu_bust(u3_noun); - u3_noun u3_cwfu_conk(u3_noun); - u3_noun u3_cwfu_crop(u3_noun); - u3_noun u3_cwfu_cull(u3_noun); - u3_noun u3_cwfu_duck(u3_noun); - u3_noun u3_cwfu_find(u3_noun); - u3_noun u3_cwfu_fino(u3_noun); - u3_noun u3_cwfu_fink(u3_noun); - u3_noun u3_cwfu_fire(u3_noun); - u3_noun u3_cwfu_firm(u3_noun); - u3_noun u3_cwfu_fish(u3_noun); - u3_noun u3_cwfu_fuse(u3_noun); - u3_noun u3_cwfu_heal(u3_noun); - u3_noun u3_cwfu_mint(u3_noun); - u3_noun u3_cwfu_mull(u3_noun); - u3_noun u3_cwfu_nest(u3_noun); - u3_noun u3_cwfu_park(u3_noun); - u3_noun u3_cwfu_peek(u3_noun); - u3_noun u3_cwfu_play(u3_noun); - u3_noun u3_cwfu_repo(u3_noun); - u3_noun u3_cwfu_rest(u3_noun); - u3_noun u3_cwfu_seek(u3_noun); - u3_noun u3_cwfu_seep(u3_noun); - u3_noun u3_cwfu_snub(u3_noun); - u3_noun u3_cwfu_tock(u3_noun); - u3_noun u3_cwfu_wrap(u3_noun); + u3_noun u3wfu_burn(u3_noun); + u3_noun u3wfu_busk(u3_noun); + u3_noun u3wfu_bust(u3_noun); + u3_noun u3wfu_conk(u3_noun); + u3_noun u3wfu_crop(u3_noun); + u3_noun u3wfu_cull(u3_noun); + u3_noun u3wfu_duck(u3_noun); + u3_noun u3wfu_find(u3_noun); + u3_noun u3wfu_fino(u3_noun); + u3_noun u3wfu_fink(u3_noun); + u3_noun u3wfu_fire(u3_noun); + u3_noun u3wfu_firm(u3_noun); + u3_noun u3wfu_fish(u3_noun); + u3_noun u3wfu_fuse(u3_noun); + u3_noun u3wfu_heal(u3_noun); + u3_noun u3wfu_mint(u3_noun); + u3_noun u3wfu_mull(u3_noun); + u3_noun u3wfu_nest(u3_noun); + u3_noun u3wfu_park(u3_noun); + u3_noun u3wfu_peek(u3_noun); + u3_noun u3wfu_play(u3_noun); + u3_noun u3wfu_repo(u3_noun); + u3_noun u3wfu_rest(u3_noun); + u3_noun u3wfu_seek(u3_noun); + u3_noun u3wfu_seep(u3_noun); + u3_noun u3wfu_snub(u3_noun); + u3_noun u3wfu_tock(u3_noun); + u3_noun u3wfu_wrap(u3_noun); diff --git a/j/1/add.c b/j/1/add.c index 378716e6a5..b4ac434a41 100644 --- a/j/1/add.c +++ b/j/1/add.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqa_add(u3_atom a, + u3qa_add(u3_atom a, u3_atom b) { if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { @@ -29,7 +29,7 @@ } } u3_noun - u3_cwa_add(u3_noun cor) + u3wa_add(u3_noun cor) { u3_noun a, b; @@ -39,14 +39,14 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_add(a, b); + return u3qa_add(a, b); } } u3_noun - u3_cka_add(u3_noun a, u3_noun b) + u3ka_add(u3_noun a, u3_noun b) { - u3_noun c = u3_cqa_add(a, b); + u3_noun c = u3qa_add(a, b); u3z(a); u3z(b); return c; diff --git a/j/1/dec.c b/j/1/dec.c index 718b92b501..98b0fd2122 100644 --- a/j/1/dec.c +++ b/j/1/dec.c @@ -8,13 +8,13 @@ /* functions */ u3_noun - u3_cqa_inc(u3_atom a) + u3qa_inc(u3_atom a) { return u3i_vint(u3k(a)); } u3_noun - u3_cqa_dec(u3_atom a) + u3qa_dec(u3_atom a) { if ( 0 == a ) { return u3m_error("decrement-underflow"); @@ -34,7 +34,7 @@ } } u3_noun - u3_cwa_dec(u3_noun cor) + u3wa_dec(u3_noun cor) { u3_noun a; @@ -43,6 +43,6 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_dec(a); + return u3qa_dec(a); } } diff --git a/j/1/div.c b/j/1/div.c index 1aede7c179..dab2c6b773 100644 --- a/j/1/div.c +++ b/j/1/div.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqa_div(u3_atom a, + u3qa_div(u3_atom a, u3_atom b) { if ( 0 == b ) { @@ -32,7 +32,7 @@ } } u3_noun - u3_cwa_div(u3_noun cor) + u3wa_div(u3_noun cor) { u3_noun a, b; @@ -42,6 +42,6 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_div(a, b); + return u3qa_div(a, b); } } diff --git a/j/1/gte.c b/j/1/gte.c index 954775e2c1..7a1d73ee97 100644 --- a/j/1/gte.c +++ b/j/1/gte.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqa_gte(u3_atom a, u3_atom b) + u3qa_gte(u3_atom a, u3_atom b) { if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { return __(a >= b); @@ -29,7 +29,7 @@ } } u3_noun - u3_cwa_gte( + u3wa_gte( u3_noun cor) { u3_noun a, b; @@ -40,6 +40,6 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_gte(a, b); + return u3qa_gte(a, b); } } diff --git a/j/1/gth.c b/j/1/gth.c index 504501eaa2..b650974728 100644 --- a/j/1/gth.c +++ b/j/1/gth.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqa_gth(u3_atom a, + u3qa_gth(u3_atom a, u3_atom b) { if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { @@ -30,7 +30,7 @@ } } u3_noun - u3_cwa_gth(u3_noun cor) + u3wa_gth(u3_noun cor) { u3_noun a, b; @@ -40,14 +40,14 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_gth(a, b); + return u3qa_gth(a, b); } } u3_noun - u3_cka_gth(u3_noun a, u3_noun b) + u3ka_gth(u3_noun a, u3_noun b) { - u3_noun c = u3_cqa_gth(a, b); + u3_noun c = u3qa_gth(a, b); u3z(a); u3z(b); return c; diff --git a/j/1/lte.c b/j/1/lte.c index ec94a4ab0f..af98f88da7 100644 --- a/j/1/lte.c +++ b/j/1/lte.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqa_lte(u3_atom a, u3_atom b) + u3qa_lte(u3_atom a, u3_atom b) { if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { return __(a <= b); @@ -29,7 +29,7 @@ } } u3_noun - u3_cwa_lte(u3_noun cor) + u3wa_lte(u3_noun cor) { u3_noun a, b; @@ -39,13 +39,13 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_lte(a, b); + return u3qa_lte(a, b); } } u3_noun - u3_cka_lte(u3_noun a, u3_noun b) + u3ka_lte(u3_noun a, u3_noun b) { - u3_noun c = u3_cqa_lte(a, b); + u3_noun c = u3qa_lte(a, b); u3z(a); u3z(b); return c; diff --git a/j/1/lth.c b/j/1/lth.c index 0ea8724b53..838965443e 100644 --- a/j/1/lth.c +++ b/j/1/lth.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqa_lth(u3_atom a, + u3qa_lth(u3_atom a, u3_atom b) { if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { @@ -30,7 +30,7 @@ } } u3_noun - u3_cwa_lth(u3_noun cor) + u3wa_lth(u3_noun cor) { u3_noun a, b; @@ -40,6 +40,6 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_lth(a, b); + return u3qa_lth(a, b); } } diff --git a/j/1/mod.c b/j/1/mod.c index f1574a48c8..a643a59bae 100644 --- a/j/1/mod.c +++ b/j/1/mod.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqa_mod( + u3qa_mod( u3_atom a, u3_atom b) { @@ -28,7 +28,7 @@ } u3_noun - u3_cwa_mod(u3_noun cor) + u3wa_mod(u3_noun cor) { u3_noun a, b; @@ -38,6 +38,6 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_mod(a, b); + return u3qa_mod(a, b); } } diff --git a/j/1/mul.c b/j/1/mul.c index a174d722d3..8822d4ab48 100644 --- a/j/1/mul.c +++ b/j/1/mul.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqa_mul(u3_atom a, + u3qa_mul(u3_atom a, u3_atom b) { if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { @@ -29,7 +29,7 @@ } } u3_noun - u3_cwa_mul(u3_noun cor) + u3wa_mul(u3_noun cor) { u3_noun a, b; @@ -39,13 +39,13 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_mul(a, b); + return u3qa_mul(a, b); } } u3_noun - u3_cka_mul(u3_noun a, u3_noun b) + u3ka_mul(u3_noun a, u3_noun b) { - u3_noun c = u3_cqa_mul(a, b); + u3_noun c = u3qa_mul(a, b); u3z(a); u3z(b); return c; diff --git a/j/1/sub.c b/j/1/sub.c index 88994bb94f..07e428655a 100644 --- a/j/1/sub.c +++ b/j/1/sub.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqa_sub(u3_atom a, u3_atom b) + u3qa_sub(u3_atom a, u3_atom b) { if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) { if ( a < b ) { @@ -36,7 +36,7 @@ } u3_noun - u3_cwa_sub(u3_noun cor) + u3wa_sub(u3_noun cor) { u3_noun a, b; @@ -46,14 +46,14 @@ { return u3m_bail(c3__exit); } else { - return u3_cqa_sub(a, b); + return u3qa_sub(a, b); } } u3_noun - u3_cka_sub(u3_noun a, u3_noun b) + u3ka_sub(u3_noun a, u3_noun b) { - u3_noun c = u3_cqa_sub(a, b); + u3_noun c = u3qa_sub(a, b); u3z(a); u3z(b); return c; diff --git a/j/2/bind.c b/j/2/bind.c index c912467e63..add0417c5c 100644 --- a/j/2/bind.c +++ b/j/2/bind.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_bind( + u3qb_bind( u3_noun a, u3_noun b) { @@ -19,7 +19,7 @@ } } u3_noun - u3_cwb_bind( + u3wb_bind( u3_noun cor) { u3_noun a, b; @@ -27,7 +27,7 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_bind(a, b); + return u3qb_bind(a, b); } } diff --git a/j/2/clap.c b/j/2/clap.c index 594fb4747d..742150547b 100644 --- a/j/2/clap.c +++ b/j/2/clap.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_clap(u3_noun a, + u3qb_clap(u3_noun a, u3_noun b, u3_noun c) { @@ -23,7 +23,7 @@ } } u3_noun - u3_cwb_clap(u3_noun cor) + u3wb_clap(u3_noun cor) { u3_noun a, b, c; @@ -32,6 +32,6 @@ u3v_sam_7, &c, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_clap(a, b, c); + return u3qb_clap(a, b, c); } } diff --git a/j/2/drop.c b/j/2/drop.c index 9a1ccc7aa8..2bdaae0bd4 100644 --- a/j/2/drop.c +++ b/j/2/drop.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_drop(u3_noun a) + u3qb_drop(u3_noun a) { if ( 0 == a ) { return u3_nul; @@ -18,14 +18,14 @@ } } u3_noun - u3_cwb_drop(u3_noun cor) + u3wb_drop(u3_noun cor) { u3_noun a; if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) { return u3_none; } else { - return u3_cqb_drop(a); + return u3qb_drop(a); } } diff --git a/j/2/flop.c b/j/2/flop.c index 22e8c808fa..4975141e49 100644 --- a/j/2/flop.c +++ b/j/2/flop.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_flop(u3_noun a) + u3qb_flop(u3_noun a) { u3_noun b = 0; @@ -28,20 +28,20 @@ } } u3_noun - u3_cwb_flop(u3_noun cor) + u3wb_flop(u3_noun cor) { u3_noun a; if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_flop(a); + return u3qb_flop(a); } } u3_noun - u3_ckb_flop(u3_noun a) + u3kb_flop(u3_noun a) { - u3_noun b = u3_cqb_flop(a); + u3_noun b = u3qb_flop(a); u3z(a); return b; diff --git a/j/2/lent.c b/j/2/lent.c index d01dee868a..b84c7d897d 100644 --- a/j/2/lent.c +++ b/j/2/lent.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_lent(u3_noun a) + u3qb_lent(u3_noun a) { u3_noun len = 0; @@ -27,20 +27,20 @@ } } u3_noun - u3_cwb_lent(u3_noun cor) + u3wb_lent(u3_noun cor) { u3_noun a; if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_lent(a); + return u3qb_lent(a); } } u3_noun - u3_ckb_lent(u3_noun a) + u3kb_lent(u3_noun a) { - u3_noun b = u3_cqb_lent(a); + u3_noun b = u3qb_lent(a); u3z(a); return b; diff --git a/j/2/levy.c b/j/2/levy.c index 45ce843e45..2b2978fe73 100644 --- a/j/2/levy.c +++ b/j/2/levy.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_levy( + u3qb_levy( u3_noun a, u3_noun b) { @@ -21,7 +21,7 @@ return u3m_bail(c3__exit); } else switch ( (loz = u3n_slam_on(u3k(b), u3k(u3h(a)))) ) { - case c3y: return u3_cqb_levy(u3t(a), b); + case c3y: return u3qb_levy(u3t(a), b); case c3n: return c3n; default: u3z(loz); return u3m_bail(c3__exit); @@ -29,7 +29,7 @@ } } u3_noun - u3_cwb_levy( + u3wb_levy( u3_noun cor) { u3_noun a, b; @@ -37,6 +37,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_levy(a, b); + return u3qb_levy(a, b); } } diff --git a/j/2/lien.c b/j/2/lien.c index 37b7f6bf3d..3aa4ffca08 100644 --- a/j/2/lien.c +++ b/j/2/lien.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_lien(u3_noun a, + u3qb_lien(u3_noun a, u3_noun b) { if ( 0 == a ) { @@ -21,20 +21,20 @@ } else switch ( (loz = u3n_slam_on(u3k(b), u3k(u3h(a)))) ) { case c3y: return c3y; - case c3n: return u3_cqb_lien(u3t(a), b); + case c3n: return u3qb_lien(u3t(a), b); default: u3z(loz); return u3m_bail(c3__exit); } } } u3_noun - u3_cwb_lien(u3_noun cor) + u3wb_lien(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_lien(a, b); + return u3qb_lien(a, b); } } diff --git a/j/2/need.c b/j/2/need.c index 26b9e6e146..7549dcc20c 100644 --- a/j/2/need.c +++ b/j/2/need.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_need( + u3qb_need( u3_noun a) { if ( 0 == a ) { @@ -19,7 +19,7 @@ } } u3_noun - u3_cwb_need( + u3wb_need( u3_noun cor) { u3_noun a; @@ -27,7 +27,7 @@ if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_need(a); + return u3qb_need(a); } } diff --git a/j/2/reel.c b/j/2/reel.c index 6793d681d7..77d20f25ee 100644 --- a/j/2/reel.c +++ b/j/2/reel.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_reel( + u3qb_reel( u3_noun a, u3_noun b) { @@ -20,13 +20,13 @@ } else { u3_noun gim = u3k(u3h(a)); - u3_noun hur = u3_cqb_reel(u3t(a), b); + u3_noun hur = u3qb_reel(u3t(a), b); return u3n_slam_on(u3k(b), u3nc(gim, hur)); } } u3_noun - u3_cwb_reel( + u3wb_reel( u3_noun cor) { u3_noun a, b; @@ -34,6 +34,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_reel(a, b); + return u3qb_reel(a, b); } } diff --git a/j/2/roll.c b/j/2/roll.c index 6f33d20942..4263fd74c6 100644 --- a/j/2/roll.c +++ b/j/2/roll.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_roll(u3_noun a, + u3qb_roll(u3_noun a, u3_noun b) { if ( 0 == a ) { @@ -26,7 +26,7 @@ if ( u3_none == vel ) { return u3m_bail(c3__exit); } else { - u3_noun hox = u3_cqb_roll(u3t(a), vel); + u3_noun hox = u3qb_roll(u3t(a), vel); u3z(vel); return hox; @@ -34,14 +34,14 @@ } } u3_noun - u3_cwb_roll(u3_noun cor) + u3wb_roll(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_roll(a, b); + return u3qb_roll(a, b); } } diff --git a/j/2/scag.c b/j/2/scag.c index 48af81c621..7b41a94d37 100644 --- a/j/2/scag.c +++ b/j/2/scag.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_scag( + u3qb_scag( u3_atom a, u3_noun b) { @@ -31,12 +31,12 @@ i_w--; } - return u3_ckb_flop(acc); + return u3kb_flop(acc); } } u3_noun - u3_cwb_scag( + u3wb_scag( u3_noun cor) { u3_noun a, b; @@ -46,7 +46,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqb_scag(a, b); + return u3qb_scag(a, b); } } diff --git a/j/2/skim.c b/j/2/skim.c index dcdbf7aaea..f111a21414 100644 --- a/j/2/skim.c +++ b/j/2/skim.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_skim( + u3qb_skim( u3_noun a, u3_noun b) { @@ -19,7 +19,7 @@ return u3m_bail(c3__exit); } else { u3_noun hoz = u3n_slam_on(u3k(b), u3k(u3h(a))); - u3_noun vyr = u3_cqb_skim(u3t(a), b); + u3_noun vyr = u3qb_skim(u3t(a), b); switch ( hoz ) { case c3y: return u3nc(u3k(u3h(a)), vyr); @@ -31,7 +31,7 @@ } } u3_noun - u3_cwb_skim( + u3wb_skim( u3_noun cor) { u3_noun a, b; @@ -39,7 +39,7 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_skim(a, b); + return u3qb_skim(a, b); } } diff --git a/j/2/skip.c b/j/2/skip.c index ab31f91ae7..4ff705fa5f 100644 --- a/j/2/skip.c +++ b/j/2/skip.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_skip( + u3qb_skip( u3_noun a, u3_noun b) { @@ -19,7 +19,7 @@ return u3_none; } else { u3_noun hoz = u3n_slam_on(u3k(b), u3k(u3h(a))); - u3_noun vyr = u3_cqb_skip(u3t(a), b); + u3_noun vyr = u3qb_skip(u3t(a), b); switch ( hoz ) { case c3y: return vyr; @@ -31,7 +31,7 @@ } } u3_noun - u3_cwb_skip( + u3wb_skip( u3_noun cor) { u3_noun a, b; @@ -39,7 +39,7 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3_none; } else { - return u3_cqb_skip(a, b); + return u3qb_skip(a, b); } } diff --git a/j/2/slag.c b/j/2/slag.c index 841e905d43..f8cf92aa80 100644 --- a/j/2/slag.c +++ b/j/2/slag.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_slag(u3_atom a, u3_noun b) + u3qb_slag(u3_atom a, u3_noun b) { if ( !_(u3a_is_cat(a)) ) { return u3m_bail(c3__fail); @@ -27,7 +27,7 @@ } } u3_noun - u3_cwb_slag(u3_noun cor) + u3wb_slag(u3_noun cor) { u3_noun a, b; @@ -36,6 +36,6 @@ { return u3m_bail(c3__exit); } else { - return u3_cqb_slag(a, b); + return u3qb_slag(a, b); } } diff --git a/j/2/snag.c b/j/2/snag.c index 174c904e60..0ae0485506 100644 --- a/j/2/snag.c +++ b/j/2/snag.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_snag(u3_atom a, + u3qb_snag(u3_atom a, u3_noun b) { if ( !_(u3a_is_cat(a)) ) { @@ -31,7 +31,7 @@ } } u3_noun - u3_cwb_snag(u3_noun cor) + u3wb_snag(u3_noun cor) { u3_noun a, b; @@ -40,6 +40,6 @@ { return u3m_bail(c3__exit); } else { - return u3_cqb_snag(a, b); + return u3qb_snag(a, b); } } diff --git a/j/2/sort.c b/j/2/sort.c index a65d118a0a..cd2a8148c1 100644 --- a/j/2/sort.c +++ b/j/2/sort.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_sort( + u3qb_sort( u3_noun a, u3_noun b) { @@ -17,7 +17,7 @@ return u3m_bail(c3__fail); } u3_noun - u3_cwb_sort( + u3wb_sort( u3_noun cor) { u3_noun a, b; @@ -25,7 +25,7 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_sort(a, b); + return u3qb_sort(a, b); } } diff --git a/j/2/turn.c b/j/2/turn.c index a2693974d2..dfc0638ef2 100644 --- a/j/2/turn.c +++ b/j/2/turn.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_turn(u3_noun a, u3_noun b) + u3qb_turn(u3_noun a, u3_noun b) { if ( 0 == a ) { return a; @@ -18,20 +18,20 @@ } else { u3_noun one = u3n_slam_on(u3k(b), u3k(u3h(a))); - u3_noun two = u3_cqb_turn(u3t(a), b); + u3_noun two = u3qb_turn(u3t(a), b); return u3nc(one, two); } } u3_noun - u3_cwb_turn(u3_noun cor) + u3wb_turn(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_turn(a, b); + return u3qb_turn(a, b); } } diff --git a/j/2/weld.c b/j/2/weld.c index d1fba3047a..d414d06c21 100644 --- a/j/2/weld.c +++ b/j/2/weld.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqb_weld(u3_noun a, + u3qb_weld(u3_noun a, u3_noun b) { if ( 0 == a ) { @@ -18,24 +18,24 @@ return u3m_bail(c3__exit); } else { - return u3nc(u3k(u3h(a)), u3_cqb_weld(u3t(a), b)); + return u3nc(u3k(u3h(a)), u3qb_weld(u3t(a), b)); } } u3_noun - u3_cwb_weld(u3_noun cor) + u3wb_weld(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqb_weld(a, b); + return u3qb_weld(a, b); } } u3_noun - u3_ckb_weld(u3_noun a, u3_noun b) + u3kb_weld(u3_noun a, u3_noun b) { - u3_noun c = u3_cqb_weld(a, b); + u3_noun c = u3qb_weld(a, b); u3z(a); u3z(b); return c; diff --git a/j/3/bex.c b/j/3/bex.c index de93a6c3cc..be7c9e7892 100644 --- a/j/3/bex.c +++ b/j/3/bex.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_bex(u3_atom a) + u3qc_bex(u3_atom a) { mpz_t a_mp; @@ -23,7 +23,7 @@ } } u3_noun - u3_cwc_bex( + u3wc_bex( u3_noun cor) { u3_noun a; @@ -33,7 +33,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_bex(a); + return u3qc_bex(a); } } diff --git a/j/3/can.c b/j/3/can.c index 0156770cf6..4047431839 100644 --- a/j/3/can.c +++ b/j/3/can.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_can(u3_atom a, + u3qc_can(u3_atom a, u3_noun b) { if ( !_(u3a_is_cat(a)) || (a >= 32) ) { @@ -70,7 +70,7 @@ } } u3_noun - u3_cwc_can(u3_noun cor) + u3wc_can(u3_noun cor) { u3_noun a, b; @@ -79,7 +79,7 @@ { return u3m_bail(c3__fail); } else { - return u3_cqc_can(a, b); + return u3qc_can(a, b); } } diff --git a/j/3/cap.c b/j/3/cap.c index 97519667a1..77def90e03 100644 --- a/j/3/cap.c +++ b/j/3/cap.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_cap( + u3qc_cap( u3_atom a) { c3_w met_w = u3r_met(0, a); @@ -23,7 +23,7 @@ } } u3_noun - u3_cwc_cap( + u3wc_cap( u3_noun cor) { u3_noun a; @@ -33,7 +33,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_cap(a); + return u3qc_cap(a); } } diff --git a/j/3/cat.c b/j/3/cat.c index 9bca4a0ae7..2087d2fd6f 100644 --- a/j/3/cat.c +++ b/j/3/cat.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_cat(u3_atom a, + u3qc_cat(u3_atom a, u3_atom b, u3_atom c) { @@ -40,7 +40,7 @@ } u3_noun - u3_cwc_cat(u3_noun cor) + u3wc_cat(u3_noun cor) { u3_noun a, b, c; @@ -53,7 +53,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_cat(a, b, c); + return u3qc_cat(a, b, c); } } diff --git a/j/3/con.c b/j/3/con.c index 5fce4da7f6..c533cc0a9d 100644 --- a/j/3/con.c +++ b/j/3/con.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_con(u3_atom a, + u3qc_con(u3_atom a, u3_atom b) { c3_w lna_w = u3r_met(5, a); @@ -37,7 +37,7 @@ } } u3_noun - u3_cwc_con(u3_noun cor) + u3wc_con(u3_noun cor) { u3_noun a, b; @@ -47,6 +47,6 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_con(a, b); + return u3qc_con(a, b); } } diff --git a/j/3/cut.c b/j/3/cut.c index 1e61e7ac84..f869704a3f 100644 --- a/j/3/cut.c +++ b/j/3/cut.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_cut( + u3qc_cut( u3_atom a, u3_atom b, u3_atom c, @@ -52,7 +52,7 @@ } } u3_noun - u3_cwc_cut( + u3wc_cut( u3_noun cor) { u3_noun a, b, c, d; @@ -68,7 +68,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_cut(a, b, c, d); + return u3qc_cut(a, b, c, d); } } diff --git a/j/3/dis.c b/j/3/dis.c index 2dcad10618..c58bcbd10f 100644 --- a/j/3/dis.c +++ b/j/3/dis.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_dis(u3_atom a, + u3qc_dis(u3_atom a, u3_atom b) { c3_w lna_w = u3r_met(5, a); @@ -36,7 +36,7 @@ } } u3_noun - u3_cwc_dis(u3_noun cor) + u3wc_dis(u3_noun cor) { u3_noun a, b; @@ -46,7 +46,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_dis(a, b); + return u3qc_dis(a, b); } } diff --git a/j/3/dor.c b/j/3/dor.c index f71083bbf5..0d7b872813 100644 --- a/j/3/dor.c +++ b/j/3/dor.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_dor( + u3qc_dor( u3_atom a, u3_atom b) { @@ -18,7 +18,7 @@ else { if ( c3y == u3ud(a) ) { if ( c3y == u3ud(b) ) { - return u3_cqa_lth(a, b); + return u3qa_lth(a, b); } else { return c3y; @@ -30,15 +30,15 @@ } else { if ( c3y == u3r_sing(u3h(a), u3h(b)) ) { - return u3_cqc_dor(u3t(a), u3t(b)); + return u3qc_dor(u3t(a), u3t(b)); } - else return u3_cqc_dor(u3h(a), u3h(b)); + else return u3qc_dor(u3h(a), u3h(b)); } } } } u3_noun - u3_cwc_dor( + u3wc_dor( u3_noun cor) { u3_noun a, b; @@ -46,7 +46,7 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqc_dor(a, b); + return u3qc_dor(a, b); } } diff --git a/j/3/end.c b/j/3/end.c index a49d2a9ec5..043fe98857 100644 --- a/j/3/end.c +++ b/j/3/end.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_end( + u3qc_end( u3_atom a, u3_atom b, u3_atom c) @@ -43,7 +43,7 @@ } } u3_noun - u3_cwc_end( + u3wc_end( u3_noun cor) { u3_noun a, b, c; @@ -57,7 +57,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_end(a, b, c); + return u3qc_end(a, b, c); } } diff --git a/j/3/gor.c b/j/3/gor.c index 19367da2d0..5a12a75cdc 100644 --- a/j/3/gor.c +++ b/j/3/gor.c @@ -8,26 +8,26 @@ /* functions */ u3_noun - u3_cqc_gor(u3_noun a, + u3qc_gor(u3_noun a, u3_noun b) { c3_w c_w = u3r_mug(a); c3_w d_w = u3r_mug(b); if ( c_w == d_w ) { - return u3_cqc_dor(a, b); + return u3qc_dor(a, b); } else return (c_w < d_w) ? c3y : c3n; } u3_noun - u3_cwc_gor(u3_noun cor) + u3wc_gor(u3_noun cor) { u3_noun a, b; if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) ) { return u3m_bail(c3__exit); } else { - return u3_cqc_gor(a, b); + return u3qc_gor(a, b); } } diff --git a/j/3/hor.c b/j/3/hor.c index 19faa48403..6f40b864e5 100644 --- a/j/3/hor.c +++ b/j/3/hor.c @@ -8,12 +8,12 @@ /* functions */ u3_noun - u3_cqc_hor(u3_noun a, + u3qc_hor(u3_noun a, u3_noun b) { if ( c3y == u3ud(a) ) { if ( c3y == u3ud(b) ) { - return u3_cqc_gor(a, b); + return u3qc_gor(a, b); } else { return c3y; } @@ -26,22 +26,22 @@ u3_noun h_b = u3h(b); if ( c3y == u3r_sing(h_a, h_b) ) { - return u3_cqc_gor(u3t(a), u3t(b)); + return u3qc_gor(u3t(a), u3t(b)); } else { - return u3_cqc_gor(h_a, h_b); + return u3qc_gor(h_a, h_b); } } } } u3_noun - u3_cwc_hor(u3_noun cor) + u3wc_hor(u3_noun cor) { u3_noun a, b; if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) ) { return u3m_bail(c3__exit); } else { - return u3_cqc_hor(a, b); + return u3qc_hor(a, b); } } diff --git a/j/3/lsh.c b/j/3/lsh.c index 7aa47a8788..cd03306daa 100644 --- a/j/3/lsh.c +++ b/j/3/lsh.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_lsh(u3_atom a, u3_atom b, u3_atom c) + u3qc_lsh(u3_atom a, u3_atom b, u3_atom c) { if ( !_(u3a_is_cat(a)) || (a >= 32) ) { return u3m_bail(c3__fail); @@ -41,7 +41,7 @@ } } u3_noun - u3_cwc_lsh(u3_noun cor) + u3wc_lsh(u3_noun cor) { u3_noun a, b, c; @@ -54,13 +54,13 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_lsh(a, b, c); + return u3qc_lsh(a, b, c); } } u3_noun - u3_ckc_lsh(u3_noun a, u3_noun b, u3_noun c) + u3kc_lsh(u3_noun a, u3_noun b, u3_noun c) { - u3_noun d = u3_cqc_lsh(a, b, c); + u3_noun d = u3qc_lsh(a, b, c); u3z(a); u3z(b); u3z(c); return d; diff --git a/j/3/mas.c b/j/3/mas.c index bee8483df3..7577c705ff 100644 --- a/j/3/mas.c +++ b/j/3/mas.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_mas(u3_atom a) + u3qc_mas(u3_atom a) { c3_w b_w; u3_atom c, d, e, f; @@ -18,10 +18,10 @@ return u3m_bail(c3__exit); } else { - c = u3_cqc_bex((b_w - 1)); - d = u3_cqc_bex((b_w - 2)); - e = u3_cqa_sub(a, c); - f = u3_cqc_con(e, d); + c = u3qc_bex((b_w - 1)); + d = u3qc_bex((b_w - 2)); + e = u3qa_sub(a, c); + f = u3qc_con(e, d); u3z(c); u3z(d); @@ -31,7 +31,7 @@ } } u3_noun - u3_cwc_mas(u3_noun cor) + u3wc_mas(u3_noun cor) { u3_noun a; @@ -40,7 +40,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_mas(a); + return u3qc_mas(a); } } diff --git a/j/3/met.c b/j/3/met.c index 8bc332bf74..da423e4259 100644 --- a/j/3/met.c +++ b/j/3/met.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_met( + u3qc_met( u3_atom a, u3_atom b) { @@ -27,7 +27,7 @@ } } u3_noun - u3_cwc_met( + u3wc_met( u3_noun cor) { u3_noun a, b; @@ -38,7 +38,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_met(a, b); + return u3qc_met(a, b); } } diff --git a/j/3/mix.c b/j/3/mix.c index b03f44a2d9..f7dce1984d 100644 --- a/j/3/mix.c +++ b/j/3/mix.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_mix(u3_atom a, + u3qc_mix(u3_atom a, u3_atom b) { c3_w lna_w = u3r_met(5, a); @@ -36,7 +36,7 @@ } } u3_noun - u3_cwc_mix(u3_noun cor) + u3wc_mix(u3_noun cor) { u3_noun a, b; @@ -46,7 +46,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_mix(a, b); + return u3qc_mix(a, b); } } diff --git a/j/3/mug.c b/j/3/mug.c index 2d2b296683..2fa63e8dbf 100644 --- a/j/3/mug.c +++ b/j/3/mug.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cwc_mug(u3_noun cor) + u3wc_mug(u3_noun cor) { u3_noun sam; diff --git a/j/3/peg.c b/j/3/peg.c index fe551ba6e9..0117cba6ea 100644 --- a/j/3/peg.c +++ b/j/3/peg.c @@ -8,18 +8,18 @@ /* functions */ u3_noun - u3_cqc_peg( + u3qc_peg( u3_atom a, u3_atom b) { u3_atom c, d, e, f, g, h; c = u3r_met(0, b); - d = u3_cqa_dec(c); - e = u3_cqc_lsh(0, d, 1); - f = u3_cqa_sub(b, e); - g = u3_cqc_lsh(0, d, a); - h = u3_cqa_add(f, g); + d = u3qa_dec(c); + e = u3qc_lsh(0, d, 1); + f = u3qa_sub(b, e); + g = u3qc_lsh(0, d, a); + h = u3qa_add(f, g); u3z(c); u3z(d); @@ -30,7 +30,7 @@ return h; } u3_noun - u3_cwc_peg( + u3wc_peg( u3_noun cor) { u3_noun a, b; @@ -43,7 +43,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_peg(a, b); + return u3qc_peg(a, b); } } diff --git a/j/3/po.c b/j/3/po.c index 97c47db7bc..35a00ebc7a 100644 --- a/j/3/po.c +++ b/j/3/po.c @@ -33,7 +33,7 @@ } u3_noun - u3_cwcp_ins( + u3wcp_ins( u3_noun cor) { u3_noun x, a, buf; @@ -49,7 +49,7 @@ } } u3_noun - u3_cwcp_ind( + u3wcp_ind( u3_noun cor) { u3_noun x, a, buf; @@ -66,7 +66,7 @@ } u3_noun - u3_cwcp_tos( + u3wcp_tos( u3_noun cor) { u3_noun x, a, buf; @@ -87,7 +87,7 @@ } } u3_noun - u3_cwcp_tod( + u3wcp_tod( u3_noun cor) { u3_noun x, a, buf; diff --git a/j/3/rap.c b/j/3/rap.c index 4309322e76..b3f9d5ba5a 100644 --- a/j/3/rap.c +++ b/j/3/rap.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_rap(u3_atom a, + u3qc_rap(u3_atom a, u3_noun b) { if ( !_(u3a_is_cat(a)) || (a >= 32) ) { @@ -71,7 +71,7 @@ } } u3_noun - u3_cwc_rap(u3_noun cor) + u3wc_rap(u3_noun cor) { u3_noun a, b; @@ -82,7 +82,7 @@ } else { u3_noun pro; - pro = u3_cqc_rap(a, b); + pro = u3qc_rap(a, b); return pro; } } diff --git a/j/3/rip.c b/j/3/rip.c index 7a43f5b363..eb24339b8f 100644 --- a/j/3/rip.c +++ b/j/3/rip.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_rip(u3_atom a, + u3qc_rip(u3_atom a, u3_atom b) { if ( !_(u3a_is_cat(a)) || (a >= 32) ) { @@ -69,7 +69,7 @@ } } u3_noun - u3_cwc_rip(u3_noun cor) + u3wc_rip(u3_noun cor) { u3_noun a, b; @@ -79,6 +79,6 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_rip(a, b); + return u3qc_rip(a, b); } } diff --git a/j/3/rsh.c b/j/3/rsh.c index c650ddec10..65e60ee0f1 100644 --- a/j/3/rsh.c +++ b/j/3/rsh.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqc_rsh( + u3qc_rsh( u3_atom a, u3_atom b, u3_atom c) @@ -41,7 +41,7 @@ } } u3_noun - u3_cwc_rsh( + u3wc_rsh( u3_noun cor) { u3_noun a, b, c; @@ -55,13 +55,13 @@ { return u3m_bail(c3__exit); } else { - return u3_cqc_rsh(a, b, c); + return u3qc_rsh(a, b, c); } } u3_noun - u3_ckc_rsh(u3_noun a, u3_noun b, u3_noun c) + u3kc_rsh(u3_noun a, u3_noun b, u3_noun c) { - u3_noun d = u3_cqc_rsh(a, b, c); + u3_noun d = u3qc_rsh(a, b, c); u3z(a); u3z(b); u3z(c); return d; diff --git a/j/3/vor.c b/j/3/vor.c index 5b4cfdb49e..73a48a7ca7 100644 --- a/j/3/vor.c +++ b/j/3/vor.c @@ -8,25 +8,25 @@ /* functions */ u3_noun - u3_cqc_vor(u3_atom a, + u3qc_vor(u3_atom a, u3_atom b) { c3_w c_w = u3r_mug(u3r_mug(a)); c3_w d_w = u3r_mug(u3r_mug(b)); if ( c_w == d_w ) { - return u3_cqc_dor(a, b); + return u3qc_dor(a, b); } else return (c_w < d_w) ? c3y : c3n; } u3_noun - u3_cwc_vor(u3_noun cor) + u3wc_vor(u3_noun cor) { u3_noun a, b; if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) ) { return u3m_bail(c3__exit); } else { - return u3_cqc_vor(a, b); + return u3qc_vor(a, b); } } diff --git a/j/4/by_gas.c b/j/4/by_gas.c index c34a17420f..0b9fb5352e 100644 --- a/j/4/by_gas.c +++ b/j/4/by_gas.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdb_gas( + u3qdb_gas( u3_noun a, u3_noun b) { @@ -29,10 +29,10 @@ u3_noun qi_b = u3t(i_b); u3_noun c; - if ( u3_none == (c = u3_cqdb_put(a, pi_b, qi_b)) ) { + if ( u3_none == (c = u3qdb_put(a, pi_b, qi_b)) ) { return u3m_bail(c3__exit); } else { - u3_noun d = u3_cqdb_gas(c, t_b); + u3_noun d = u3qdb_gas(c, t_b); u3z(c); return d; @@ -42,7 +42,7 @@ } } u3_noun - u3_cwdb_gas( + u3wdb_gas( u3_noun cor) { u3_noun a, b; @@ -50,13 +50,13 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdb_gas(a, b); + return u3qdb_gas(a, b); } } u3_noun - u3_ckdb_gas(u3_noun a, u3_noun b) + u3kdb_gas(u3_noun a, u3_noun b) { - u3_weak c = u3_cqdb_gas(a, b); + u3_weak c = u3qdb_gas(a, b); u3z(a); u3z(b); if ( u3_none == c ) { diff --git a/j/4/by_get.c b/j/4/by_get.c index 323000e433..cd0adf06dd 100644 --- a/j/4/by_get.c +++ b/j/4/by_get.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdb_get(u3_noun a, u3_noun b) + u3qdb_get(u3_noun a, u3_noun b) { if ( u3_nul == a ) { return u3_nul; @@ -27,16 +27,16 @@ return u3nc(u3_nul, u3k(qn_a)); } else { - if ( c3y == u3_cqc_gor(b, pn_a) ) { - return u3_cqdb_get(l_a, b); + if ( c3y == u3qc_gor(b, pn_a) ) { + return u3qdb_get(l_a, b); } - else return u3_cqdb_get(r_a, b); + else return u3qdb_get(r_a, b); } } } } u3_noun - u3_cwdb_get( + u3wdb_get( u3_noun cor) { u3_noun a, b; @@ -44,13 +44,13 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdb_get(a, b); + return u3qdb_get(a, b); } } u3_weak - u3_ckdb_get(u3_noun a, u3_noun b) + u3kdb_get(u3_noun a, u3_noun b) { - u3_noun c = u3_cqdb_get(a, b); + u3_noun c = u3qdb_get(a, b); u3z(a); u3z(b); if ( c3n == u3r_du(c) ) { @@ -64,9 +64,9 @@ } } u3_noun - u3_ckdb_got(u3_noun a, u3_noun b) + u3kdb_got(u3_noun a, u3_noun b) { - u3_weak c = u3_ckdb_get(a, b); + u3_weak c = u3kdb_get(a, b); if ( u3_none == c ) { return u3m_bail(c3__exit); diff --git a/j/4/by_has.c b/j/4/by_has.c index 8de579ee00..0a77456a52 100644 --- a/j/4/by_has.c +++ b/j/4/by_has.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdb_has( + u3qdb_has( u3_noun a, u3_noun b) { @@ -29,16 +29,16 @@ return c3y; } else { - if ( c3y == u3_cqc_gor(b, pn_a) ) { - return u3_cqdb_has(l_a, b); + if ( c3y == u3qc_gor(b, pn_a) ) { + return u3qdb_has(l_a, b); } - else return u3_cqdb_has(r_a, b); + else return u3qdb_has(r_a, b); } } } } u3_noun - u3_cwdb_has( + u3wdb_has( u3_noun cor) { u3_noun a, b; @@ -46,13 +46,13 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdb_has(a, b); + return u3qdb_has(a, b); } } u3_noun - u3_ckdb_has(u3_noun a, u3_noun b) + u3kdb_has(u3_noun a, u3_noun b) { - u3_weak c = u3_cqdb_has(a, b); + u3_weak c = u3qdb_has(a, b); u3z(a); u3z(b); if ( u3_none == c ) { diff --git a/j/4/by_int.c b/j/4/by_int.c index af0adf8c2c..bc115dfc96 100644 --- a/j/4/by_int.c +++ b/j/4/by_int.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdb_int( + u3qdb_int( u3_noun a, u3_noun b) { @@ -40,37 +40,37 @@ else if ( c3n == u3r_cell(n_b, &p_n_b, &q_n_b) ) { return u3m_bail(c3__exit); } - else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) { + else if ( c3y == u3qc_vor(p_n_a, p_n_b) ) { if ( c3y == u3r_sing(p_n_a, p_n_b) ) { return u3nt( u3k(n_b), - u3_cqdb_int(u3k(l_a), u3k(l_b)), - u3_cqdb_int(u3k(r_a), u3k(r_b))); + u3qdb_int(u3k(l_a), u3k(l_b)), + u3qdb_int(u3k(r_a), u3k(r_b))); } - else if ( c3y == u3_cqc_hor(p_n_b, p_n_a) ) { - return u3_cqdb_uni( + else if ( c3y == u3qc_hor(p_n_b, p_n_a) ) { + return u3qdb_uni( - u3_cqdb_int( + u3qdb_int( u3k(l_a), u3nt( u3k(n_b), u3k(l_b), u3k(u3_nul))), - u3_cqdb_int( + u3qdb_int( u3k(a), u3k(r_b))); } else { - return u3_cqdb_uni( + return u3qdb_uni( - u3_cqdb_int( + u3qdb_int( u3k(r_a), u3nt( u3k(n_b), u3k(u3_nul), u3k(r_b))), - u3_cqdb_int( + u3qdb_int( u3k(a), u3k(l_b))); } @@ -79,39 +79,39 @@ return u3nt( u3k(n_b), - u3_cqdb_int(u3k(l_b), u3k(l_a)), - u3_cqdb_int(u3k(r_b), u3k(r_a))); + u3qdb_int(u3k(l_b), u3k(l_a)), + u3qdb_int(u3k(r_b), u3k(r_a))); } - else if ( c3y == u3_cqc_hor(p_n_a, p_n_b) ) { - return u3_cqdb_uni( + else if ( c3y == u3qc_hor(p_n_a, p_n_b) ) { + return u3qdb_uni( - u3_cqdb_int( + u3qdb_int( u3k(l_b), u3nt( u3k(n_a), u3k(l_a), u3k(u3_nul))), - u3_cqdb_int( + u3qdb_int( u3k(a), u3k(r_a))); } else { - return u3_cqdb_uni( + return u3qdb_uni( - u3_cqdb_int( + u3qdb_int( u3k(r_b), u3nt( u3k(n_a), u3k(u3_nul), u3k(r_a))), - u3_cqdb_int( + u3qdb_int( u3k(a), u3k(l_a))); } } } u3_noun - u3_cwdb_int( + u3wdb_int( u3_noun cor) { u3_noun a, b; @@ -119,6 +119,6 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdb_int(a, b); + return u3qdb_int(a, b); } } diff --git a/j/4/by_put.c b/j/4/by_put.c index e1804fa71a..1e918c500f 100644 --- a/j/4/by_put.c +++ b/j/4/by_put.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdb_put( + u3qdb_put( u3_noun a, u3_noun b, u3_noun c) @@ -40,10 +40,10 @@ } } else { - if ( c3y == u3_cqc_gor(b, pn_a) ) { - d = u3_cqdb_put(l_a, b, c); + if ( c3y == u3qc_gor(b, pn_a) ) { + d = u3qdb_put(l_a, b, c); - if ( c3y == u3_cqc_vor(pn_a, u3h(u3h(d))) ) { + if ( c3y == u3qc_vor(pn_a, u3h(u3h(d))) ) { return u3nt(u3k(n_a), d, u3k(r_a)); @@ -65,9 +65,9 @@ } } else { - d = u3_cqdb_put(r_a, b, c); + d = u3qdb_put(r_a, b, c); - if ( c3y == u3_cqc_vor(pn_a, u3h(u3h(d))) ) { + if ( c3y == u3qc_vor(pn_a, u3h(u3h(d))) ) { return u3nt(u3k(n_a), u3k(l_a), d); @@ -92,7 +92,7 @@ } } u3_noun - u3_cwdb_put( + u3wdb_put( u3_noun cor) { u3_noun a, b, c; @@ -102,17 +102,17 @@ u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdb_put(a, b, c); + return u3qdb_put(a, b, c); } } u3_weak - u3_ckdb_put(u3_noun a, u3_noun b, u3_noun c) + u3kdb_put(u3_noun a, u3_noun b, u3_noun c) { // Bizarre asymmetry in old jets. // // (Mysterious comment in old glue code.) // - u3_noun pro = u3_cqdb_put(a, b, c); + u3_noun pro = u3qdb_put(a, b, c); u3z(a); u3z(b); u3z(c); return pro; diff --git a/j/4/by_uni.c b/j/4/by_uni.c index c3755c4388..ee26d18c9f 100644 --- a/j/4/by_uni.c +++ b/j/4/by_uni.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdb_uni( + u3qdb_uni( u3_noun a, u3_noun b) { @@ -40,20 +40,20 @@ else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) { return u3m_bail(c3__exit); } - else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) { + else if ( c3y == u3qc_vor(p_n_a, p_n_b) ) { if ( c3y == u3r_sing(p_n_a, p_n_b) ) { return u3nt(u3k(n_b), - u3_cqdb_uni( + u3qdb_uni( u3k(l_a), u3k(l_b)), - u3_cqdb_uni( + u3qdb_uni( u3k(r_a), u3k(r_b))); } - else if ( c3y == u3_cqc_hor(p_n_b, p_n_a) ) { - return u3_cqdb_uni( + else if ( c3y == u3qc_hor(p_n_b, p_n_a) ) { + return u3qdb_uni( u3nt( u3k(n_a), - u3_cqdb_uni( + u3qdb_uni( u3k(l_a), u3nt( u3k(n_b), @@ -63,12 +63,12 @@ u3k(r_b)); } else { - return u3_cqdb_uni( + return u3qdb_uni( u3nt( u3k(n_a), u3k(l_a), - u3_cqdb_uni( + u3qdb_uni( u3k(r_a), u3nt( u3k(n_b), @@ -81,16 +81,16 @@ return u3nt( u3k(n_b), - u3_cqdb_uni(u3k(r_b), u3k(r_a)), - u3_cqdb_uni(u3k(l_b), u3k(l_a))); + u3qdb_uni(u3k(r_b), u3k(r_a)), + u3qdb_uni(u3k(l_b), u3k(l_a))); } - else if ( c3y == u3_cqc_hor(p_n_a, p_n_b) ) { - return u3_cqdb_uni( + else if ( c3y == u3qc_hor(p_n_a, p_n_b) ) { + return u3qdb_uni( u3k(r_a), u3nt( u3k(n_b), - u3_cqdb_uni( + u3qdb_uni( u3nt( u3k(n_a), u3k(l_a), @@ -99,13 +99,13 @@ u3k(r_b))); } else { - return u3_cqdb_uni( + return u3qdb_uni( u3k(l_a), u3nt( u3k(n_b), u3k(l_b), - u3_cqdb_uni( + u3qdb_uni( u3k(r_b), u3nt( u3k(n_a), @@ -115,7 +115,7 @@ } } u3_noun - u3_cwdb_uni( + u3wdb_uni( u3_noun cor) { u3_noun a, b; @@ -123,6 +123,6 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdb_uni(a, b); + return u3qdb_uni(a, b); } } diff --git a/j/4/in_gas.c b/j/4/in_gas.c index 61a8f42be8..e2f6ace386 100644 --- a/j/4/in_gas.c +++ b/j/4/in_gas.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdi_gas( + u3qdi_gas( u3_noun a, u3_noun b) { @@ -23,10 +23,10 @@ u3_noun t_b = u3t(b); u3_noun c; - if ( u3_none == (c = u3_cqdi_put(a, i_b)) ) { + if ( u3_none == (c = u3qdi_put(a, i_b)) ) { return u3m_bail(c3__exit); } else { - u3_noun d = u3_cqdi_gas(c, t_b); + u3_noun d = u3qdi_gas(c, t_b); u3z(c); return d; @@ -35,7 +35,7 @@ } } u3_noun - u3_cwdi_gas( + u3wdi_gas( u3_noun cor) { u3_noun a, b; @@ -43,13 +43,13 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdi_gas(a, b); + return u3qdi_gas(a, b); } } u3_noun - u3_ckdi_gas(u3_noun a, u3_noun b) + u3kdi_gas(u3_noun a, u3_noun b) { - u3_weak c = u3_cqdi_gas(a, b); + u3_weak c = u3qdi_gas(a, b); u3z(a); u3z(b); if ( u3_none == c ) { diff --git a/j/4/in_has.c b/j/4/in_has.c index 5e2fcf4735..f060461269 100644 --- a/j/4/in_has.c +++ b/j/4/in_has.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdi_has(u3_noun a, u3_noun b) + u3qdi_has(u3_noun a, u3_noun b) { if ( u3_nul == a ) { return c3n; @@ -24,29 +24,29 @@ return c3y; } else { - if ( c3y == u3_cqc_hor(b, n_a) ) { - return u3_cqdi_has(l_a, b); + if ( c3y == u3qc_hor(b, n_a) ) { + return u3qdi_has(l_a, b); } - else return u3_cqdi_has(r_a, b); + else return u3qdi_has(r_a, b); } } } } u3_noun - u3_cwdi_has(u3_noun cor) + u3wdi_has(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdi_has(a, b); + return u3qdi_has(a, b); } } u3_noun - u3_ckdi_has(u3_noun a, u3_noun b) + u3kdi_has(u3_noun a, u3_noun b) { - u3_weak c = u3_cqdi_has(a, b); + u3_weak c = u3qdi_has(a, b); u3z(a); u3z(b); if ( u3_none == c ) { diff --git a/j/4/in_int.c b/j/4/in_int.c index 379fdd1e68..ae20a95527 100644 --- a/j/4/in_int.c +++ b/j/4/in_int.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdi_int( + u3qdi_int( u3_noun a, u3_noun b) { @@ -30,7 +30,7 @@ return u3m_bail(c3__exit); } else { - if ( c3y == u3_cqc_vor(n_b, n_a) ) { + if ( c3y == u3qc_vor(n_b, n_a) ) { c = a; a = b; b = c; c = n_a; n_a = n_b; n_b = c; c = lr_a; lr_a = lr_b; lr_b = c; @@ -43,30 +43,30 @@ } else if ( c3y == u3r_sing(n_a, n_b) ) { return u3nt(u3k(n_a), - u3_cqdi_int(l_a, l_b), - u3_cqdi_int(r_a, r_b)); + u3qdi_int(l_a, l_b), + u3qdi_int(r_a, r_b)); } - else if ( c3y == u3_cqc_hor(n_b, n_a) ) { - return u3_cqdi_uni( - u3_cqdi_int( + else if ( c3y == u3qc_hor(n_b, n_a) ) { + return u3qdi_uni( + u3qdi_int( l_a, u3nt( n_b, l_b, u3_nul)), - u3_cqdi_int( + u3qdi_int( a, r_b)); } else { - return u3_cqdi_uni( - u3_cqdi_int( + return u3qdi_uni( + u3qdi_int( r_a, u3nt( n_b, u3_nul, r_b)), - u3_cqdi_int( + u3qdi_int( a, l_b)); } @@ -74,7 +74,7 @@ } } u3_noun - u3_cwdi_int( + u3wdi_int( u3_noun cor) { u3_noun a, b; @@ -82,6 +82,6 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdi_int(a, b); + return u3qdi_int(a, b); } } diff --git a/j/4/in_mer.c b/j/4/in_mer.c index 0ed32e150a..836d2ece33 100644 --- a/j/4/in_mer.c +++ b/j/4/in_mer.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdi_mer(u3_noun a, u3_noun b) + u3qdi_mer(u3_noun a, u3_noun b) { if ( u3_nul == a ) { return u3k(b); @@ -28,7 +28,7 @@ return u3m_bail(c3__exit); } else { - if ( c3y == u3_cqc_vor(n_b, n_a) ) { + if ( c3y == u3qc_vor(n_b, n_a) ) { c = a; a = b; b = c; c = n_a; n_a = n_b; n_b = c; c = lr_a; lr_a = lr_b; lr_b = c; @@ -41,14 +41,14 @@ } else if ( c3y == u3r_sing(n_a, n_b) ) { return u3nt(u3k(n_a), - u3_cqdi_mer(l_a, l_b), - u3_cqdi_mer(r_a, r_b)); + u3qdi_mer(l_a, l_b), + u3qdi_mer(r_a, r_b)); } - else if ( c3y == u3_cqc_hor(n_b, n_a) ) { - return u3_cqdi_mer( + else if ( c3y == u3qc_hor(n_b, n_a) ) { + return u3qdi_mer( u3nt( n_a, - u3_cqdi_mer( + u3qdi_mer( l_a, u3nt( n_b, @@ -58,11 +58,11 @@ r_b); } else { - return u3_cqdi_mer( + return u3qdi_mer( u3nt( n_a, l_a, - u3_cqdi_mer( + u3qdi_mer( r_a, u3nt( n_b, @@ -75,7 +75,7 @@ } u3_noun - u3_cwdi_mer(u3_noun cor) + u3wdi_mer(u3_noun cor) { u3_noun a, b; @@ -83,6 +83,6 @@ return u3m_bail(c3__exit); } else { - return u3_cqdi_mer(a, b); + return u3qdi_mer(a, b); } } diff --git a/j/4/in_put.c b/j/4/in_put.c index 1a3aab2e28..46bd4d04cb 100644 --- a/j/4/in_put.c +++ b/j/4/in_put.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdi_put( + u3qdi_put( u3_noun a, u3_noun b) { @@ -29,10 +29,10 @@ return u3m_bail(c3__exit); } else { - if ( c3y == u3_cqc_hor(b, n_a) ) { - c = u3_cqdi_put(l_a, b); + if ( c3y == u3qc_hor(b, n_a) ) { + c = u3qdi_put(l_a, b); - if ( c3y == u3_cqc_vor(n_a, u3h(c)) ) { + if ( c3y == u3qc_vor(n_a, u3h(c)) ) { return u3nt(u3k(n_a), c, u3k(r_a)); @@ -54,9 +54,9 @@ } } else { - c = u3_cqdi_put(r_a, b); + c = u3qdi_put(r_a, b); - if ( c3y == u3_cqc_vor(n_a, u3h(c)) ) { + if ( c3y == u3qc_vor(n_a, u3h(c)) ) { return u3nt(u3k(n_a), u3k(l_a), c); @@ -81,7 +81,7 @@ } } u3_noun - u3_cwdi_put( + u3wdi_put( u3_noun cor) { u3_noun a, b; @@ -89,17 +89,17 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdi_put(a, b); + return u3qdi_put(a, b); } } u3_weak - u3_ckdi_put(u3_noun a, u3_noun b) + u3kdi_put(u3_noun a, u3_noun b) { // Bizarre asymmetry in old jets. // // (Mysterious comment in old glue code.) // - u3_noun pro = u3_cqdi_put(a, b); + u3_noun pro = u3qdi_put(a, b); u3z(a); u3z(b); return pro; diff --git a/j/4/in_tap.c b/j/4/in_tap.c index c8fbe55b6b..dedb1f511f 100644 --- a/j/4/in_tap.c +++ b/j/4/in_tap.c @@ -30,14 +30,14 @@ } u3_noun - u3_cqdi_tap( + u3qdi_tap( u3_noun a, u3_noun b) { return _tap_in(a, u3k(b)); } u3_noun - u3_cwdi_tap( + u3wdi_tap( u3_noun cor) { u3_noun a, b; @@ -45,13 +45,13 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdi_tap(a, b); + return u3qdi_tap(a, b); } } u3_noun - u3_ckdi_tap(u3_noun a, u3_noun b) + u3kdi_tap(u3_noun a, u3_noun b) { - u3_weak c = u3_cqdi_tap(a, b); + u3_weak c = u3qdi_tap(a, b); u3z(a); u3z(b); if ( u3_none == c ) { diff --git a/j/4/in_uni.c b/j/4/in_uni.c index e8cf4ee8cf..1d09228c9d 100644 --- a/j/4/in_uni.c +++ b/j/4/in_uni.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqdi_uni( + u3qdi_uni( u3_noun a, u3_noun b) { @@ -29,7 +29,7 @@ return u3m_bail(c3__exit); } else { - if ( c3y == u3_cqc_vor(n_a, n_b) ) { + if ( c3y == u3qc_vor(n_a, n_b) ) { if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) { return u3m_bail(c3__exit); } @@ -40,15 +40,15 @@ return u3nt( u3k(n_b), - u3_cqdi_uni(u3k(l_a), u3k(l_b)), - u3_cqdi_uni(u3k(r_a), u3k(r_b))); + u3qdi_uni(u3k(l_a), u3k(l_b)), + u3qdi_uni(u3k(r_a), u3k(r_b))); } - else if ( c3y == u3_cqc_hor(n_b, n_a) ) { - return u3_cqdi_uni( + else if ( c3y == u3qc_hor(n_b, n_a) ) { + return u3qdi_uni( u3nt( u3k(n_a), - u3_cqdi_uni( + u3qdi_uni( u3k(l_a), u3nt( u3k(n_b), @@ -58,12 +58,12 @@ u3k(r_b)); } else { - return u3_cqdi_uni( + return u3qdi_uni( u3nt( u3k(n_a), u3k(l_a), - u3_cqdi_uni( + u3qdi_uni( u3k(r_a), u3nt( u3k(n_b), @@ -82,16 +82,16 @@ return u3nt( u3k(n_b), - u3_cqdi_uni(u3k(r_b), u3k(r_a)), - u3_cqdi_uni(u3k(l_b), u3k(l_a))); + u3qdi_uni(u3k(r_b), u3k(r_a)), + u3qdi_uni(u3k(l_b), u3k(l_a))); } - else if ( c3y == u3_cqc_hor(n_a, n_b) ) { - return u3_cqdi_uni( + else if ( c3y == u3qc_hor(n_a, n_b) ) { + return u3qdi_uni( u3k(r_a), u3nt( u3k(n_b), - u3_cqdi_uni( + u3qdi_uni( u3nt( u3k(n_a), u3k(l_a), @@ -100,13 +100,13 @@ u3k(r_b))); } else { - return u3_cqdi_uni( + return u3qdi_uni( u3k(l_a), u3nt( u3k(n_b), u3k(l_b), - u3_cqdi_uni( + u3qdi_uni( u3nt( u3k(n_a), u3k(u3_nul), @@ -117,7 +117,7 @@ } } u3_noun - u3_cwdi_uni( + u3wdi_uni( u3_noun cor) { u3_noun a, b; @@ -125,7 +125,7 @@ if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqdi_uni(a, b); + return u3qdi_uni(a, b); } } diff --git a/j/5/aesc.c b/j/5/aesc.c index 21eab792d5..e1cf819013 100644 --- a/j/5/aesc.c +++ b/j/5/aesc.c @@ -14,7 +14,7 @@ /* functions */ u3_noun - u3_cqea_en(u3_atom a, u3_atom b) + u3qea_en(u3_atom a, u3_atom b) { c3_y a_y[32]; c3_y b_y[16]; @@ -51,7 +51,7 @@ } u3_noun - u3_cwea_en(u3_noun cor) + u3wea_en(u3_noun cor) { u3_noun a, b; @@ -62,12 +62,12 @@ return u3m_bail(c3__exit); } else { - return u3_cqea_en(a, b); + return u3qea_en(a, b); } } u3_noun - u3_cqea_de(u3_atom a, u3_atom b) + u3qea_de(u3_atom a, u3_atom b) { c3_y a_y[32]; c3_y b_y[16]; @@ -104,7 +104,7 @@ } u3_noun - u3_cwea_de(u3_noun cor) + u3wea_de(u3_noun cor) { u3_noun a, b; @@ -115,6 +115,6 @@ return u3m_bail(c3__exit); } else { - return u3_cqea_de(a, b); + return u3qea_de(a, b); } } diff --git a/j/5/cue.c b/j/5/cue.c index be3a06f0b3..c4eb809f38 100644 --- a/j/5/cue.c +++ b/j/5/cue.c @@ -12,11 +12,11 @@ { u3_noun p, q; - if ( 0 == u3_cqc_cut(0, b, 1, a) ) { - u3_noun x = u3_cqa_inc(b); - u3_noun c = u3_cqe_rub(x, a); + if ( 0 == u3qc_cut(0, b, 1, a) ) { + u3_noun x = u3qa_inc(b); + u3_noun c = u3qe_rub(x, a); - p = u3_cqa_inc(u3k(u3h(c))); + p = u3qa_inc(u3k(u3h(c))); q = u3k(u3t(c)); u3h_put(har_p, u3k(b), u3k(q)); @@ -25,20 +25,20 @@ u3z(x); } else { - u3_noun c = u3_cqa_add(2, b); - u3_noun l = u3_cqa_inc(b); + u3_noun c = u3qa_add(2, b); + u3_noun l = u3qa_inc(b); - if ( 0 == u3_cqc_cut(0, l, 1, a) ) { + if ( 0 == u3qc_cut(0, l, 1, a) ) { u3_noun u, v, w; u3_noun x, y; u = _cue_in(har_p, a, c); - x = u3_cqa_add(u3h(u), c); + x = u3qa_add(u3h(u), c); v = _cue_in(har_p, a, x); w = u3nc(u3k(u3h(u3t(u))), u3k(u3h(u3t(v)))); - y = u3_cqa_add(u3h(u), u3h(v)); - p = u3_cqa_add(2, y); + y = u3qa_add(u3h(u), u3h(v)); + p = u3qa_add(2, y); q = w; u3h_put(har_p, u3k(b), u3k(q)); @@ -46,10 +46,10 @@ u3z(u); u3z(v); u3z(x); u3z(y); } else { - u3_noun d = u3_cqe_rub(c, a); + u3_noun d = u3qe_rub(c, a); u3_noun x = u3h_get(har_p, u3k(u3t(d))); - p = u3_cqa_add(2, u3h(d)); + p = u3qa_add(2, u3h(d)); if ( u3_none == x ) { return u3m_bail(c3__exit); } @@ -63,7 +63,7 @@ } u3_noun - u3_cqe_cue(u3_atom a) + u3qe_cue(u3_atom a) { u3p(u3h_root) har_p = u3h_new(); @@ -76,20 +76,20 @@ return y; } u3_noun - u3_cwe_cue(u3_noun cor) + u3we_cue(u3_noun cor) { u3_noun a; if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { return u3m_bail(c3__fail); } else { - return u3_cqe_cue(a); + return u3qe_cue(a); } } u3_noun - u3_cke_cue(u3_atom a) + u3ke_cue(u3_atom a) { - u3_noun b = u3_cqe_cue(a); + u3_noun b = u3qe_cue(a); u3z(a); return b; diff --git a/j/5/ed_puck.c b/j/5/ed_puck.c index ff7d9d1a7e..1b1ea672d4 100644 --- a/j/5/ed_puck.c +++ b/j/5/ed_puck.c @@ -10,7 +10,7 @@ /* functions */ u3_noun - u3_cwee_puck(u3_noun cor) + u3wee_puck(u3_noun cor) { c3_y pub_y[32]; c3_y sec_y[64]; diff --git a/j/5/ed_sign.c b/j/5/ed_sign.c index dda3159051..65bf104739 100644 --- a/j/5/ed_sign.c +++ b/j/5/ed_sign.c @@ -39,7 +39,7 @@ } u3_noun - u3_cwee_sign(u3_noun cor) + u3wee_sign(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, diff --git a/j/5/ed_veri.c b/j/5/ed_veri.c index 500dc790f2..ff0aee95bd 100644 --- a/j/5/ed_veri.c +++ b/j/5/ed_veri.c @@ -34,7 +34,7 @@ } u3_noun - u3_cwee_veri(u3_noun cor) + u3wee_veri(u3_noun cor) { u3_noun a, b, c; if ( c3n == u3r_mean(cor, diff --git a/j/5/jam.c b/j/5/jam.c index 0050d7579c..af2fa0f6d3 100644 --- a/j/5/jam.c +++ b/j/5/jam.c @@ -18,22 +18,22 @@ u3_noun l) { u3_noun w = u3nc(u3nc(2, 1), u3k(l)); - u3_noun x = u3_cqa_add(2, b); + u3_noun x = u3qa_add(2, b); u3_noun d = _jam_in(har_p, h_a, x, w); u3_noun p_d, q_d, r_d; u3_noun r; u3r_trel(d, &p_d, &q_d, &r_d); { - u3_noun y = u3_cqa_add(x, p_d); + u3_noun y = u3qa_add(x, p_d); u3_noun e = _jam_in(har_p, t_a, y, q_d); u3_noun p_e, q_e, r_e; u3r_trel(e, &p_e, &q_e, &r_e); { - u3_noun z = u3_cqa_add(p_d, p_e); + u3_noun z = u3qa_add(p_d, p_e); - r = u3nt(u3_cqa_add(2, z), u3k(q_e), 0); + r = u3nt(u3qa_add(2, z), u3k(q_e), 0); u3z(z); } @@ -52,10 +52,10 @@ u3_atom a, u3_noun l) { - u3_noun d = u3_cqe_mat(a); - u3_noun x = u3_cqa_add(1, u3h(d)); + u3_noun d = u3qe_mat(a); + u3_noun x = u3qa_add(1, u3h(d)); u3_noun y = u3nt - (u3k(x), u3nc(u3nc(x, u3_cqc_lsh(0, 1, u3t(d))), u3k(l)), 0); + (u3k(x), u3nc(u3nc(x, u3qc_lsh(0, 1, u3t(d))), u3k(l)), 0); u3z(d); @@ -67,11 +67,11 @@ u3_atom u_c, u3_noun l) { - u3_noun d = u3_cqe_mat(u_c); - u3_atom x = u3_cqc_lsh(0, 2, u3t(d)); - u3_atom y = u3_cqa_add(2, u3h(d)); + u3_noun d = u3qe_mat(u_c); + u3_atom x = u3qc_lsh(0, 2, u3t(d)); + u3_atom y = u3qa_add(2, u3h(d)); u3_noun z = u3nt - (u3k(y), u3nc(u3nc(y, u3_cqc_mix(3, x)), u3k(l)), 0); + (u3k(y), u3nc(u3nc(y, u3qc_mix(3, x)), u3k(l)), 0); u3z(d); u3z(x); @@ -109,13 +109,13 @@ } u3_noun - u3_cqe_jam(u3_atom a) + u3qe_jam(u3_atom a) { u3p(u3h_root) har_p = u3h_new(); u3_noun x = _jam_in(har_p, a, 0, u3_nul); - u3_noun q = u3_cqb_flop(u3h(u3t(x))); - u3_noun r = u3_cqc_can(0, q); + u3_noun q = u3qb_flop(u3h(u3t(x))); + u3_noun r = u3qc_can(0, q); u3z(x); u3z(q); @@ -123,20 +123,20 @@ return r; } u3_noun - u3_cwe_jam(u3_noun cor) + u3we_jam(u3_noun cor) { u3_noun a; if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { return u3m_bail(c3__fail); } else { - return u3_cqe_jam(a); + return u3qe_jam(a); } } u3_atom - u3_cke_jam(u3_noun a) + u3ke_jam(u3_noun a) { - u3_atom b = u3_cqe_jam(a); + u3_atom b = u3qe_jam(a); u3z(a); return b; diff --git a/j/5/lore.c b/j/5/lore.c index fc8b78f6e6..2b421379e0 100644 --- a/j/5/lore.c +++ b/j/5/lore.c @@ -6,7 +6,7 @@ u3_noun - u3_cqe_lore(u3_atom lub) + u3qe_lore(u3_atom lub) { c3_w len_w = u3r_met(3, lub); c3_w pos_w = 0; @@ -16,7 +16,7 @@ c3_w meg_w; if ( pos_w >= len_w ) { - return u3_ckb_flop(tez); + return u3kb_flop(tez); } else { meg_w = 0; @@ -45,7 +45,7 @@ } u3_noun - u3_cwe_lore(u3_noun cor) + u3we_lore(u3_noun cor) { u3_noun lub; @@ -54,6 +54,6 @@ { return u3m_bail(c3__fail); } else { - return u3_cqe_lore(lub); + return u3qe_lore(lub); } } diff --git a/j/5/loss.c b/j/5/loss.c index e870c3454e..7d18ecdbf5 100644 --- a/j/5/loss.c +++ b/j/5/loss.c @@ -54,7 +54,7 @@ { if ( 0 == loc_u->kct_w ) { return u3_nul; - } else return u3_ckb_flop(_lext(loc_u, loc_u->kad[loc_u->kct_w - 1])); + } else return u3kb_flop(_lext(loc_u, loc_u->kad[loc_u->kct_w - 1])); } // initialize loss object @@ -65,13 +65,13 @@ u3_noun hev) { loc_u->hel = hel; - loc_u->lel_w = u3_ckb_lent(u3k(hel)); + loc_u->lel_w = u3kb_lent(u3k(hel)); // Read hev into array. { c3_w i_w; - loc_u->hev = c3_malloc(u3_ckb_lent(u3k(hev)) * sizeof(u3_noun)); + loc_u->hev = c3_malloc(u3kb_lent(u3k(hev)) * sizeof(u3_noun)); for ( i_w = 0; u3_nul != hev; i_w++ ) { loc_u->hev[i_w] = u3h(hev); @@ -95,10 +95,10 @@ u3_noun hav; u3_noun teg; - hav = u3_ckdb_get(u3k(loc_u->sev), u3k(how)); + hav = u3kdb_get(u3k(loc_u->sev), u3k(how)); teg = u3nc(u3i_words(1, &i_w), (hav == u3_none) ? u3_nul : hav); - loc_u->sev = u3_ckdb_put(loc_u->sev, u3k(how), teg); + loc_u->sev = u3kdb_put(loc_u->sev, u3k(how), teg); } } } @@ -242,10 +242,10 @@ { while ( u3_nul != loc_u->hel ) { u3_noun i_hel = u3h(loc_u->hel); - u3_noun guy = u3_ckdb_get(u3k(loc_u->sev), u3k(i_hel)); + u3_noun guy = u3kdb_get(u3k(loc_u->sev), u3k(i_hel)); if ( u3_none != guy ) { - u3_noun gay = u3_ckb_flop(guy); + u3_noun gay = u3kb_flop(guy); _merg(loc_u, 0, gay); u3z(gay); @@ -256,7 +256,7 @@ } u3_noun - u3_cqe_loss( + u3qe_loss( u3_noun hel, u3_noun hev) { @@ -282,7 +282,7 @@ } u3_noun - u3_cwe_loss(u3_noun cor) + u3we_loss(u3_noun cor) { u3_noun hel, hev; @@ -293,6 +293,6 @@ { return u3m_bail(c3__fail); } else { - return u3_cqe_loss(hel, hev); + return u3qe_loss(hel, hev); } } diff --git a/j/5/mat.c b/j/5/mat.c index 68494e03ff..ca2aa4206a 100644 --- a/j/5/mat.c +++ b/j/5/mat.c @@ -8,26 +8,26 @@ /* functions */ u3_noun - u3_cqe_mat( + u3qe_mat( u3_atom a) { if ( 0 == a ) { return u3nc(1, 1); } else { - u3_atom b = u3_cqc_met(0, a); - u3_atom c = u3_cqc_met(0, b); + u3_atom b = u3qc_met(0, a); + u3_atom c = u3qc_met(0, b); u3_atom u, v, w, x, y, z; u3_atom p, q; - u = u3_cqa_dec(c); - v = u3_cqa_add(c, c); - w = u3_cqc_bex(c); - x = u3_cqc_end(0, u, b); - y = u3_cqc_lsh(0, u, a); - z = u3_cqc_mix(x, y); + u = u3qa_dec(c); + v = u3qa_add(c, c); + w = u3qc_bex(c); + x = u3qc_end(0, u, b); + y = u3qc_lsh(0, u, a); + z = u3qc_mix(x, y); - p = u3_cqa_add(v, b); - q = u3_cqc_cat(0, w, z); + p = u3qa_add(v, b); + q = u3qc_cat(0, w, z); u3z(u); u3z(v); @@ -40,7 +40,7 @@ } } u3_noun - u3_cwe_mat( + u3we_mat( u3_noun cor) { u3_noun a; @@ -48,6 +48,6 @@ if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { return u3m_bail(c3__fail); } else { - return u3_cqe_mat(a); + return u3qe_mat(a); } } diff --git a/j/5/mink.c b/j/5/mink.c index 2e99af1c8d..478de8f133 100644 --- a/j/5/mink.c +++ b/j/5/mink.c @@ -6,7 +6,7 @@ u3_noun - u3_cwe_mink(u3_noun cor) + u3we_mink(u3_noun cor) { u3_noun bus, fol, fly; diff --git a/j/5/mule.c b/j/5/mule.c index 2aaecf3801..51e46d93da 100644 --- a/j/5/mule.c +++ b/j/5/mule.c @@ -5,7 +5,7 @@ #include "all.h" u3_noun - u3_cwe_mule(u3_noun cor) + u3we_mule(u3_noun cor) { u3_noun tap; diff --git a/j/5/parse.c b/j/5/parse.c index 06907814c8..08712c213d 100644 --- a/j/5/parse.c +++ b/j/5/parse.c @@ -141,7 +141,7 @@ } u3_noun - u3_cwe_bend_fun(u3_noun cor) + u3we_bend_fun(u3_noun cor) { u3_noun van, raq, vex, sab; @@ -189,7 +189,7 @@ } u3_noun - u3_cwe_cold_fun( + u3we_cold_fun( u3_noun cor) { u3_noun van, cus, sef, tub; @@ -238,7 +238,7 @@ } u3_noun - u3_cwe_cook_fun( + u3we_cook_fun( u3_noun cor) { u3_noun van, poq, sef, tub; @@ -302,7 +302,7 @@ } u3_noun - u3_cwe_comp_fun( + u3we_comp_fun( u3_noun cor) { u3_noun van, raq, vex, sab; @@ -334,7 +334,7 @@ u3k(tub)); } u3_noun - u3_cwe_easy_fun( + u3we_easy_fun( u3_noun cor) { u3_noun van, huf, tub; @@ -411,7 +411,7 @@ } u3_noun - u3_cwe_glue_fun( + u3we_glue_fun( u3_noun cor) { u3_noun van, bus, vex, sab; @@ -470,7 +470,7 @@ } u3_noun - u3_cwe_here_fun( + u3we_here_fun( u3_noun cor) { u3_noun van, hez, sef, tub; @@ -509,7 +509,7 @@ } } u3_noun - u3_cwe_just_fun( + u3we_just_fun( u3_noun cor) { u3_noun van, daf, tub; @@ -550,7 +550,7 @@ } } u3_noun - u3_cwe_mask_fun( + u3we_mask_fun( u3_noun cor) { u3_noun van, bud, tub; @@ -596,7 +596,7 @@ } } u3_noun - u3_cwe_pfix( + u3we_pfix( u3_noun cor) { u3_noun vex, sab; @@ -653,7 +653,7 @@ } } u3_noun - u3_cwe_plug( + u3we_plug( u3_noun cor) { u3_noun vex, sab; @@ -668,7 +668,7 @@ /* pose */ u3_noun - u3_cqe_pose(u3_noun vex, + u3qe_pose(u3_noun vex, u3_noun sab) { u3_noun p_vex, q_vex; @@ -692,7 +692,7 @@ } } u3_noun - u3_cwe_pose( + u3we_pose( u3_noun cor) { u3_noun vex, sab; @@ -700,7 +700,7 @@ if ( (c3n == u3r_mean(cor, u3v_sam_2, &vex, u3v_sam_3, &sab, 0)) ) { return u3m_bail(c3__exit); } else { - return u3_cqe_pose(vex, sab); + return u3qe_pose(vex, sab); } } @@ -746,7 +746,7 @@ } } u3_noun - u3_cwe_sfix(u3_noun cor) + u3we_sfix(u3_noun cor) { u3_noun vex, sab; @@ -790,7 +790,7 @@ } } u3_noun - u3_cwe_shim_fun( + u3we_shim_fun( u3_noun cor) { u3_noun van, zep, tub; @@ -839,7 +839,7 @@ } u3_noun - u3_cwe_stag_fun( + u3we_stag_fun( u3_noun cor) { u3_noun van, gob, sef, tub; @@ -938,7 +938,7 @@ } } u3_noun - u3_cwe_stew_fun( + u3we_stew_fun( u3_noun cor) { u3_noun con, hel, tub; @@ -1001,7 +1001,7 @@ } u3_noun - u3_cwe_stir_fun(u3_noun cor) + u3we_stir_fun(u3_noun cor) { u3_noun van, rud, raq, fel, tub; diff --git a/j/5/rd.c b/j/5/rd.c index c85b9559d4..e4c93a8c29 100644 --- a/j/5/rd.c +++ b/j/5/rd.c @@ -16,7 +16,7 @@ union doub { /* sun */ u3_noun - u3_cqer_sun(u3_atom a) + u3qer_sun(u3_atom a) { union doub b; b.d = (double) u3r_chub(0, a); @@ -25,7 +25,7 @@ union doub { } u3_noun - u3_cwer_sun(u3_noun cor) + u3wer_sun(u3_noun cor) { u3_noun a; @@ -34,14 +34,14 @@ union doub { return u3m_bail(c3__exit); } else { - return u3_cqer_sun(a); + return u3qer_sun(a); } } /* mul */ u3_noun - u3_cqer_mul(u3_atom a, u3_atom b) + u3qer_mul(u3_atom a, u3_atom b) { union doub c, d, e; c.c = u3r_chub(0, a); @@ -52,7 +52,7 @@ union doub { } u3_noun - u3_cwer_mul(u3_noun cor) + u3wer_mul(u3_noun cor) { u3_noun a, b; @@ -63,14 +63,14 @@ union doub { return u3m_bail(c3__exit); } else { - return u3_cqer_mul(a, b); + return u3qer_mul(a, b); } } /* div */ u3_noun - u3_cqer_div(u3_atom a, u3_atom b) + u3qer_div(u3_atom a, u3_atom b) { union doub c, d, e; c.c = u3r_chub(0, a); @@ -81,7 +81,7 @@ union doub { } u3_noun - u3_cwer_div(u3_noun cor) + u3wer_div(u3_noun cor) { u3_noun a, b; @@ -92,14 +92,14 @@ union doub { return u3m_bail(c3__exit); } else { - return u3_cqer_div(a, b); + return u3qer_div(a, b); } } /* add */ u3_noun - u3_cqer_add(u3_atom a, u3_atom b) + u3qer_add(u3_atom a, u3_atom b) { union doub c, d, e; c.c = u3r_chub(0, a); @@ -110,7 +110,7 @@ union doub { } u3_noun - u3_cwer_add(u3_noun cor) + u3wer_add(u3_noun cor) { u3_noun a, b; @@ -121,14 +121,14 @@ union doub { return u3m_bail(c3__exit); } else { - return u3_cqer_add(a, b); + return u3qer_add(a, b); } } /* sub */ u3_noun - u3_cqer_sub(u3_atom a, u3_atom b) + u3qer_sub(u3_atom a, u3_atom b) { union doub c, d, e; c.c = u3r_chub(0, a); @@ -139,7 +139,7 @@ union doub { } u3_noun - u3_cwer_sub(u3_noun cor) + u3wer_sub(u3_noun cor) { u3_noun a, b; @@ -150,14 +150,14 @@ union doub { return u3m_bail(c3__exit); } else { - return u3_cqer_sub(a, b); + return u3qer_sub(a, b); } } /* lte */ u3_noun - u3_cqer_lte(u3_atom a, u3_atom b) + u3qer_lte(u3_atom a, u3_atom b) { union doub c, d; c.c = u3r_chub(0, a); @@ -167,7 +167,7 @@ union doub { } u3_noun - u3_cwer_lte(u3_noun cor) + u3wer_lte(u3_noun cor) { u3_noun a, b; @@ -178,14 +178,14 @@ union doub { return u3m_bail(c3__exit); } else { - return u3_cqer_lte(a, b); + return u3qer_lte(a, b); } } /* lth */ u3_noun - u3_cqer_lth(u3_atom a, u3_atom b) + u3qer_lth(u3_atom a, u3_atom b) { union doub c, d; c.c = u3r_chub(0, a); @@ -195,7 +195,7 @@ union doub { } u3_noun - u3_cwer_lth(u3_noun cor) + u3wer_lth(u3_noun cor) { u3_noun a, b; @@ -206,14 +206,14 @@ union doub { return u3m_bail(c3__exit); } else { - return u3_cqer_lth(a, b); + return u3qer_lth(a, b); } } /* gte */ u3_noun - u3_cqer_gte(u3_atom a, u3_atom b) + u3qer_gte(u3_atom a, u3_atom b) { union doub c, d; c.c = u3r_chub(0, a); @@ -223,7 +223,7 @@ union doub { } u3_noun - u3_cwer_gte(u3_noun cor) + u3wer_gte(u3_noun cor) { u3_noun a, b; @@ -234,14 +234,14 @@ union doub { return u3m_bail(c3__exit); } else { - return u3_cqer_gte(a, b); + return u3qer_gte(a, b); } } /* gth */ u3_noun - u3_cqer_gth(u3_atom a, u3_atom b) + u3qer_gth(u3_atom a, u3_atom b) { union doub c, d; c.c = u3r_chub(0, a); @@ -251,7 +251,7 @@ union doub { } u3_noun - u3_cwer_gth(u3_noun cor) + u3wer_gth(u3_noun cor) { u3_noun a, b; @@ -262,6 +262,6 @@ union doub { return u3m_bail(c3__exit); } else { - return u3_cqer_gth(a, b); + return u3qer_gth(a, b); } } diff --git a/j/5/repg.c b/j/5/repg.c index dd500ad7c1..f4443c69c1 100644 --- a/j/5/repg.c +++ b/j/5/repg.c @@ -8,7 +8,7 @@ #include u3_noun - u3_cqe_repg(u3_noun lub, u3_noun rad, u3_noun rep) + u3qe_repg(u3_noun lub, u3_noun rad, u3_noun rep) { c3_y* lub_y = u3r_tape(lub); c3_y* rad_y = u3r_tape(rad); @@ -78,11 +78,11 @@ else { int mlen = matches[0].length; if (mlen == 0) { - ret = u3_ckb_weld(u3_ckb_flop(u3i_tape((char *) rad_y+ic)), u3_ckb_flop(u3i_tape((char *)rep_y))); + ret = u3kb_weld(u3kb_flop(u3i_tape((char *) rad_y+ic)), u3kb_flop(u3i_tape((char *)rep_y))); ic = text_len + 1; } else { - ret = u3_ckb_weld(u3_ckb_flop(u3i_tape((char *)rep_y)), ret); + ret = u3kb_weld(u3kb_flop(u3i_tape((char *)rep_y)), ret); ic += mlen; } } @@ -92,7 +92,7 @@ free(lub_y); free(rad_y); free(rep_y); - return u3i_cell(u3_nul, u3_ckb_flop(ret)); + return u3i_cell(u3_nul, u3kb_flop(ret)); } else { // Compiling the regular expression failed @@ -122,7 +122,7 @@ } u3_noun - u3_cwe_repg(u3_noun cor) + u3we_repg(u3_noun cor) { u3_noun lub; u3_noun rad; @@ -134,6 +134,6 @@ { return u3m_bail(c3__fail); } else { - return u3_cqe_repg(lub, rad, rep); + return u3qe_repg(lub, rad, rep); } } diff --git a/j/5/rexp.c b/j/5/rexp.c index b1e929bd8d..91ef886a8a 100644 --- a/j/5/rexp.c +++ b/j/5/rexp.c @@ -8,13 +8,13 @@ #include u3_noun - u3_cqe_rexp(u3_noun lub, u3_noun rad) + u3qe_rexp(u3_noun lub, u3_noun rad) { c3_y* lub_y = u3r_tape(lub); c3_y* rad_y = u3r_tape(rad); u3k(lub); - int lub_l = u3_ckb_lent(lub); + int lub_l = u3kb_lent(lub); if (lub_l != strlen((char *)lub_y)) { free(lub_y); free(rad_y); @@ -94,7 +94,7 @@ char * buf = malloc(matches[i].length + 1); memcpy(buf, matches[i].data, matches[i].length); buf[matches[i].length] = 0; - map = u3_ckdb_put(map, i, u3i_tape(buf)); + map = u3kdb_put(map, i, u3i_tape(buf)); free(buf); } @@ -124,7 +124,7 @@ } u3_noun - u3_cwe_rexp(u3_noun cor) + u3we_rexp(u3_noun cor) { u3_noun lub; u3_noun rad; @@ -134,6 +134,6 @@ { return u3m_bail(c3__fail); } else { - return u3_cqe_rexp(lub, rad); + return u3qe_rexp(lub, rad); } } diff --git a/j/5/rub.c b/j/5/rub.c index 3aeebe2a8b..8cd1372d8a 100644 --- a/j/5/rub.c +++ b/j/5/rub.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqe_rub( + u3qe_rub( u3_atom a, u3_atom b) { @@ -16,17 +16,17 @@ u3_atom w, x, y, z; u3_atom p, q; - u3_atom m = u3_cqa_add(a, u3r_met(0, b)); + u3_atom m = u3qa_add(a, u3r_met(0, b)); // Compute c and d. { x = u3k(a); - while ( 0 == u3_cqc_cut(0, x, 1, b) ) { - u3_atom y = u3_cqa_inc(x); + while ( 0 == u3qc_cut(0, x, 1, b) ) { + u3_atom y = u3qa_inc(x); // Sanity check: crash if decoding more bits than available - if ( c3y == u3_cqa_gth(x, m)) { + if ( c3y == u3qa_gth(x, m)) { // fprintf(stderr, "[%%rub-hard %d %d %d]\r\n", a, x, m); return u3m_bail(c3__exit); } @@ -38,27 +38,27 @@ u3z(x); return u3nc(1, 0); } - c = u3_cqa_sub(x, a); - d = u3_cqa_inc(x); + c = u3qa_sub(x, a); + d = u3qa_inc(x); u3z(x); } // Compute e, p, q. { - x = u3_cqa_dec(c); - y = u3_cqc_bex(x); - z = u3_cqc_cut(0, d, x, b); + x = u3qa_dec(c); + y = u3qc_bex(x); + z = u3qc_cut(0, d, x, b); - e = u3_cqa_add(y, z); + e = u3qa_add(y, z); u3z(y); u3z(z); - w = u3_cqa_add(c, c); - y = u3_cqa_add(w, e); - z = u3_cqa_add(d, x); + w = u3qa_add(c, c); + y = u3qa_add(w, e); + z = u3qa_add(d, x); - p = u3_cqa_add(w, e); - q = u3_cqc_cut(0, z, e, b); + p = u3qa_add(w, e); + q = u3qc_cut(0, z, e, b); u3z(w); u3z(x); u3z(y); u3z(z); @@ -66,7 +66,7 @@ } } u3_noun - u3_cwe_rub( + u3we_rub( u3_noun cor) { u3_noun a, b; @@ -77,6 +77,6 @@ { return u3m_bail(c3__fail); } else { - return u3_cqe_rub(a, b); + return u3qe_rub(a, b); } } diff --git a/j/5/shax.c b/j/5/shax.c index 13a78e8606..f762956551 100644 --- a/j/5/shax.c +++ b/j/5/shax.c @@ -14,7 +14,7 @@ /* functions */ u3_noun - u3_cqe_shax( + u3qe_shax( u3_atom a) { c3_w met_w = u3r_met(3, a); @@ -42,7 +42,7 @@ } u3_noun - u3_cqe_shal(u3_atom a, + u3qe_shal(u3_atom a, u3_atom b) { c3_assert(_(u3a_is_cat(a))); @@ -70,19 +70,19 @@ } u3_noun - u3_cqe_shas( + u3qe_shas( u3_atom sal, u3_atom ruz) { - u3_noun one = u3_cqe_shax(ruz); - u3_noun two = u3_cqc_mix(sal, one); - u3_noun tri = u3_cqe_shax(two); + u3_noun one = u3qe_shax(ruz); + u3_noun two = u3qc_mix(sal, one); + u3_noun tri = u3qe_shax(two); u3z(one); u3z(two); return tri; } u3_noun - u3_cwe_shax( + u3we_shax( u3_noun cor) { u3_noun a; @@ -92,12 +92,12 @@ { return u3m_bail(c3__exit); } else { - return u3_cqe_shax(a); + return u3qe_shax(a); } } u3_noun - u3_cwe_shal(u3_noun cor) + u3we_shal(u3_noun cor) { u3_noun a, b; @@ -109,12 +109,12 @@ { return u3m_bail(c3__exit); } else { - return u3_cqe_shal(a, b); + return u3qe_shal(a, b); } } u3_noun - u3_cwe_shas(u3_noun cor) + u3we_shas(u3_noun cor) { u3_noun sal, ruz; @@ -125,7 +125,7 @@ { return u3m_bail(c3__exit); } else { - return u3_cqe_shas(sal, ruz); + return u3qe_shas(sal, ruz); } } @@ -141,15 +141,15 @@ return u3m_bail(c3__fail); } while ( 0 != b ) { - u3_noun x = u3_cqc_mix(a, c); - u3_noun y = u3_cqc_mix(b, x); - u3_noun d = u3_cqe_shas(c3_s4('o','g','-','b'), y); + u3_noun x = u3qc_mix(a, c); + u3_noun y = u3qc_mix(b, x); + u3_noun d = u3qe_shas(c3_s4('o','g','-','b'), y); u3_noun m; u3z(x); u3z(y); if ( b < 256 ) { - u3_noun e = u3_cqc_end(0, b, d); + u3_noun e = u3qc_end(0, b, d); u3z(d); m = u3nc(b, e); @@ -162,16 +162,16 @@ } l = u3nc(m, l); } - return u3_ckb_flop(l); + return u3kb_flop(l); } u3_noun - u3_cqeo_raw(u3_atom a, u3_atom b) + u3qeo_raw(u3_atom a, u3_atom b) { - u3_noun x = u3_cqc_mix(b, a); - u3_noun c = u3_cqe_shas(c3_s4('o','g','-','a'), x); + u3_noun x = u3qc_mix(b, a); + u3_noun c = u3qe_shas(c3_s4('o','g','-','a'), x); u3_noun l = _og_list(a, b, c); - u3_noun r = u3_cqc_can(0, l); + u3_noun r = u3qc_can(0, l); u3z(l); u3z(c); @@ -181,13 +181,13 @@ } u3_noun - u3_cweo_raw(u3_noun cor) + u3weo_raw(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3_cqeo_raw(a, b); + return u3qeo_raw(a, b); } } diff --git a/j/5/tape.c b/j/5/tape.c index 3039b34fa0..59d4bf8c4f 100644 --- a/j/5/tape.c +++ b/j/5/tape.c @@ -35,7 +35,7 @@ } u3_noun - u3_cqe_tape(u3_noun a) + u3qe_tape(u3_noun a) { if ( c3y == _good(a) ) { return u3k(a); @@ -44,13 +44,13 @@ } } u3_noun - u3_cwe_tape(u3_noun cor) + u3we_tape(u3_noun cor) { u3_noun a; if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { return u3m_bail(c3__fail); } else { - return u3_cqe_tape(a); + return u3qe_tape(a); } } diff --git a/j/5/trip.c b/j/5/trip.c index f7ac286844..0ad63b2624 100644 --- a/j/5/trip.c +++ b/j/5/trip.c @@ -8,28 +8,28 @@ /* functions */ u3_noun - u3_cqe_trip(u3_atom a) + u3qe_trip(u3_atom a) { if ( c3n == u3ud(a) ) { return u3m_bail(c3__exit); } - return u3_cqc_rip(3, a); + return u3qc_rip(3, a); } u3_noun - u3_cwe_trip(u3_noun cor) + u3we_trip(u3_noun cor) { u3_noun a; if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) { return u3m_bail(c3__fail); } else { - return u3_cqe_trip(a); + return u3qe_trip(a); } } u3_atom - u3_cke_trip(u3_noun a) + u3ke_trip(u3_noun a) { - u3_atom b = u3_cqe_trip(a); + u3_atom b = u3qe_trip(a); u3z(a); return b; diff --git a/j/6/al.c b/j/6/al.c index 153dcafb0a..aff4990ee9 100644 --- a/j/6/al.c +++ b/j/6/al.c @@ -20,7 +20,7 @@ _al_core(u3_noun van, /* ~(bunt al gen) */ u3_noun -u3_cqfl_bunt(u3_noun van, u3_noun gen) +u3qfl_bunt(u3_noun van, u3_noun gen) { u3_noun cor = _al_core(van, gen); @@ -30,7 +30,7 @@ u3_cqfl_bunt(u3_noun van, u3_noun gen) /* ~(whip al gen) */ u3_noun -u3_cqfl_whip(u3_noun van, +u3qfl_whip(u3_noun van, u3_noun gen, u3_noun axe) // { diff --git a/j/6/ap.c b/j/6/ap.c index 0da5ff56f5..06ab6ee74d 100644 --- a/j/6/ap.c +++ b/j/6/ap.c @@ -7,9 +7,9 @@ /** forward declares **/ - u3_noun u3_cwfp_rake(u3_noun); - u3_noun u3_cwfp_open(u3_noun); - u3_noun u3_cwfp_hack(u3_noun); + u3_noun u3wfp_rake(u3_noun); + u3_noun u3wfp_open(u3_noun); + u3_noun u3wfp_hack(u3_noun); static u3_noun _ap_open_l(u3_noun, u3_noun); @@ -38,7 +38,7 @@ static u3_noun _ap_bunt(u3_noun van, u3_noun gen) { - u3_noun pro = u3_cqfl_bunt(van, gen); + u3_noun pro = u3qfl_bunt(van, gen); u3z(van); return pro; @@ -271,7 +271,7 @@ u3nc(u3nc(c3__axil, c3__noun), u3k(q_gen)), u3_nul); - u3_noun zal = u3_cqb_weld(r_gen, tul); + u3_noun zal = u3qb_weld(r_gen, tul); u3_noun ret = u3nt(c3__wthp, u3k(p_gen), zal); u3z(tul); @@ -527,7 +527,7 @@ c3__tsgr, u3nc( c3__brcn, - u3_cqdb_put(q_gen, u3_blip, diz)), + u3qdb_put(q_gen, u3_blip, diz)), u3nc(c3__cnzy, u3_blip)); u3z(diz); @@ -864,7 +864,7 @@ /** rake **/ u3_noun - u3_cqfp_rake( + u3qfp_rake( u3_noun gen) { u3_noun p_gen, q_gen; @@ -900,12 +900,12 @@ if ( c3n == u3r_cell(u3t(gen), &p_gen, &q_gen) ) { return u3m_bail(c3__fail); } - else return u3_cqfp_rake(q_gen); + else return u3qfp_rake(q_gen); } } } u3_noun - u3_cwfp_rake( + u3wfp_rake( u3_noun cor) { u3_noun gen; @@ -913,14 +913,14 @@ if ( u3_none == (gen = u3r_at(u3v_sam, cor)) ) { return u3m_bail(c3__fail); } else { - return u3_cqfp_rake(gen); + return u3qfp_rake(gen); } } /** hack **/ u3_noun - u3_cqfp_hack( + u3qfp_hack( u3_noun ter, u3_noun gen) { @@ -939,7 +939,7 @@ return u3nc(c3n, u3k(gen)); } else { - u3_noun pyr = u3_cqfp_hack(ter, q_gen); + u3_noun pyr = u3qfp_hack(ter, q_gen); if ( c3y == u3h(pyr) ) { ret = u3nt @@ -964,7 +964,7 @@ } case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen); { - u3_noun pyr = u3_cqfp_hack(ter, q_gen); + u3_noun pyr = u3qfp_hack(ter, q_gen); if ( c3y == u3h(pyr) ) { ret = u3nt @@ -999,7 +999,7 @@ return u3nc(c3n, voq); } else { - ret = u3_cqfp_hack(ter, voq); + ret = u3qfp_hack(ter, voq); u3z(voq); return ret; @@ -1008,7 +1008,7 @@ } u3_noun - u3_cwfp_hack( + u3wfp_hack( u3_noun cor) { u3_noun gen; @@ -1018,7 +1018,7 @@ } else { u3_noun ter = u3r_at(u3v_con, cor); - return u3_cqfp_hack(ter, gen); + return u3qfp_hack(ter, gen); } } @@ -1055,13 +1055,13 @@ } u3_noun - u3_cqfp_open(u3_noun ter, u3_noun gen) + u3qfp_open(u3_noun ter, u3_noun gen) { return _ap_open_l(ter, gen); } u3_noun - u3_cwfp_open(u3_noun cor) + u3wfp_open(u3_noun cor) { u3_noun gen; @@ -1070,6 +1070,6 @@ } else { u3_noun ter = u3r_at(u3v_con, cor); - return u3_cqfp_open(ter, gen); + return u3qfp_open(ter, gen); } } diff --git a/j/6/bull.c b/j/6/bull.c index 9307d35cf4..396d187904 100644 --- a/j/6/bull.c +++ b/j/6/bull.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_bull( + u3qf_bull( u3_noun bid, u3_noun der) { @@ -21,7 +21,7 @@ (c3__bull, u3k(bid), u3k(der)); } u3_noun - u3_cwf_bull( + u3wf_bull( u3_noun cor) { u3_noun bid, der; @@ -29,6 +29,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &bid, u3v_sam_3, &der, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_bull(bid, der); + return u3qf_bull(bid, der); } } diff --git a/j/6/cell.c b/j/6/cell.c index 098852be2a..15ac75e8e9 100644 --- a/j/6/cell.c +++ b/j/6/cell.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_cell(u3_noun hed, u3_noun tal) + u3qf_cell(u3_noun hed, u3_noun tal) { if ( (c3__void == hed) || (c3__void == tal) ) { return c3__void; @@ -17,7 +17,7 @@ } } u3_noun - u3_cwf_cell( + u3wf_cell( u3_noun cor) { u3_noun hed, tal; @@ -25,6 +25,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &hed, u3v_sam_3, &tal, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_cell(hed, tal); + return u3qf_cell(hed, tal); } } diff --git a/j/6/comb.c b/j/6/comb.c index 81e921b0f9..1e6e77f8a3 100644 --- a/j/6/comb.c +++ b/j/6/comb.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_comb( + u3qf_comb( u3_noun mal, u3_noun buz) { @@ -22,7 +22,7 @@ if ( (c3y == u3r_p(buz, 0, &p_buz)) && (0 != p_buz) ) { return u3nc( 0, - u3_cqc_peg(p_mal, p_buz)); + u3qc_peg(p_mal, p_buz)); } else if ( c3y == u3r_pq(buz, 2, &p_buz, &q_buz) && c3y == u3r_p(p_buz, 0, &pp_buz) && @@ -31,9 +31,9 @@ return u3nt (2, u3nc(0, - u3_cqc_peg(p_mal, pp_buz)), + u3qc_peg(p_mal, pp_buz)), u3nc(0, - u3_cqc_peg(p_mal, pq_buz))); + u3qc_peg(p_mal, pq_buz))); } else return u3nt(7, u3k(mal), u3k(buz)); @@ -59,7 +59,7 @@ } } u3_noun - u3_cwf_comb( + u3wf_comb( u3_noun cor) { u3_noun mal, buz; @@ -67,6 +67,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &mal, u3v_sam_3, &buz, 0) ) { return u3_none; } else { - return u3_cqf_comb(mal, buz); + return u3qf_comb(mal, buz); } } diff --git a/j/6/cons.c b/j/6/cons.c index a2b77ebcac..2cbdf4f6ef 100644 --- a/j/6/cons.c +++ b/j/6/cons.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_cons( + u3qf_cons( u3_noun vur, u3_noun sed) { @@ -26,8 +26,8 @@ !(c3y == u3r_sing(p_vur, p_sed)) && (0 == u3r_nord(p_vur, p_sed)) ) { - u3_atom fub = u3_cqa_div(p_vur, 2); - u3_atom nof = u3_cqa_div(p_sed, 2); + u3_atom fub = u3qa_div(p_vur, 2); + u3_atom nof = u3qa_div(p_sed, 2); if ( c3y == u3r_sing(fub, nof) ) { u3z(nof); @@ -42,7 +42,7 @@ return u3nc(u3k(vur), u3k(sed)); } u3_noun - u3_cwf_cons( + u3wf_cons( u3_noun cor) { u3_noun vur, sed; @@ -50,6 +50,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &vur, u3v_sam_3, &sed, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_cons(vur, sed); + return u3qf_cons(vur, sed); } } diff --git a/j/6/core.c b/j/6/core.c index cb167c9407..d09d30710d 100644 --- a/j/6/core.c +++ b/j/6/core.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_core( + u3qf_core( u3_noun pac, u3_noun con) { @@ -19,7 +19,7 @@ } } u3_noun - u3_cwf_core( + u3wf_core( u3_noun cor) { u3_noun pac, con; @@ -27,6 +27,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &pac, u3v_sam_3, &con, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_core(pac, con); + return u3qf_core(pac, con); } } diff --git a/j/6/cube.c b/j/6/cube.c index ddd74a2ed6..739147f0b7 100644 --- a/j/6/cube.c +++ b/j/6/cube.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_cube( + u3qf_cube( u3_noun dil, u3_noun goq) { @@ -19,7 +19,7 @@ (c3__cube, u3k(dil), u3k(goq)); } u3_noun - u3_cwf_cube( + u3wf_cube( u3_noun cor) { u3_noun dil, goq; @@ -27,6 +27,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &dil, u3v_sam_3, &goq, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_cube(dil, goq); + return u3qf_cube(dil, goq); } } diff --git a/j/6/face.c b/j/6/face.c index fd3c273b57..b44458f203 100644 --- a/j/6/face.c +++ b/j/6/face.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_face( + u3qf_face( u3_noun cog, u3_noun tip) { @@ -19,7 +19,7 @@ (c3__face, u3k(cog), u3k(tip)); } u3_noun - u3_cwf_face( + u3wf_face( u3_noun cor) { u3_noun cog, tip; @@ -27,6 +27,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &cog, u3v_sam_3, &tip, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_face(cog, tip); + return u3qf_face(cog, tip); } } diff --git a/j/6/fine.c b/j/6/fine.c index b999191b7e..e8f4e16cb0 100644 --- a/j/6/fine.c +++ b/j/6/fine.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_fine( + u3qf_fine( u3_noun fuv, u3_noun lup, u3_noun mar) @@ -22,7 +22,7 @@ } } u3_noun - u3_cwf_fine( + u3wf_fine( u3_noun cor) { u3_noun fuv, lup, mar; @@ -32,6 +32,6 @@ u3v_sam_7, &mar, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_fine(fuv, lup, mar); + return u3qf_fine(fuv, lup, mar); } } diff --git a/j/6/fitz.c b/j/6/fitz.c index 6c7a55de13..9d4711109d 100644 --- a/j/6/fitz.c +++ b/j/6/fitz.c @@ -31,7 +31,7 @@ } u3_noun - u3_cqf_fitz( + u3qf_fitz( u3_noun yaz, u3_noun wix) { @@ -55,7 +55,7 @@ } u3_noun - u3_cwf_fitz( + u3wf_fitz( u3_noun cor) { u3_noun yaz, wix; @@ -66,6 +66,6 @@ { return u3m_bail(c3__fail); } else { - return u3_cqf_fitz(yaz, wix); + return u3qf_fitz(yaz, wix); } } diff --git a/j/6/flan.c b/j/6/flan.c index 53af2c9702..42608d05ca 100644 --- a/j/6/flan.c +++ b/j/6/flan.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_flan( + u3qf_flan( u3_noun bos, u3_noun nif) { @@ -35,7 +35,7 @@ } } u3_noun - u3_cwf_flan( + u3wf_flan( u3_noun cor) { u3_noun bos, nif; @@ -43,6 +43,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &bos, u3v_sam_3, &nif, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_flan(bos, nif); + return u3qf_flan(bos, nif); } } diff --git a/j/6/flay.c b/j/6/flay.c index 3be00d3971..7699dc40b0 100644 --- a/j/6/flay.c +++ b/j/6/flay.c @@ -15,7 +15,7 @@ return c3__void; } else { u3_noun voo = _flay_roll(u3t(quz)); - u3_noun oon = u3_cqf_fork(u3h(u3h(quz)), voo); + u3_noun oon = u3qf_fork(u3h(u3h(quz)), voo); u3z(voo); return oon; @@ -23,7 +23,7 @@ } u3_noun - u3_cqf_flay( + u3qf_flay( u3_noun pok) { u3_noun p_pok = u3h(pok); @@ -42,7 +42,7 @@ } u3_noun - u3_cwf_flay( + u3wf_flay( u3_noun cor) { u3_noun pok; @@ -51,6 +51,6 @@ (c3n == u3du(pok)) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_flay(pok); + return u3qf_flay(pok); } } diff --git a/j/6/flip.c b/j/6/flip.c index 822621db65..b322c9e668 100644 --- a/j/6/flip.c +++ b/j/6/flip.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_flip( + u3qf_flip( u3_noun hel) { if ( c3y == u3r_sing(1, u3h(hel)) ) { @@ -30,7 +30,7 @@ } } u3_noun - u3_cwf_flip( + u3wf_flip( u3_noun cor) { u3_noun hel; @@ -38,6 +38,6 @@ if ( u3_none == (hel = u3r_at(u3v_sam, cor)) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_flip(hel); + return u3qf_flip(hel); } } diff --git a/j/6/flor.c b/j/6/flor.c index 351fbd28f7..19b1fce8f8 100644 --- a/j/6/flor.c +++ b/j/6/flor.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_flor( + u3qf_flor( u3_noun bos, u3_noun nif) { @@ -35,7 +35,7 @@ } } u3_noun - u3_cwf_flor( + u3wf_flor( u3_noun cor) { u3_noun bos, nif; @@ -43,6 +43,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &bos, u3v_sam_3, &nif, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_flor(bos, nif); + return u3qf_flor(bos, nif); } } diff --git a/j/6/fork.c b/j/6/fork.c index e844fbd5bc..8b1a8c901b 100644 --- a/j/6/fork.c +++ b/j/6/fork.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_fork( + u3qf_fork( u3_noun hoz, u3_noun bur) { @@ -25,7 +25,7 @@ (c3__fork, u3k(hoz), u3k(bur)); } u3_noun - u3_cwf_fork( + u3wf_fork( u3_noun cor) { u3_noun hoz, bur; @@ -33,6 +33,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &hoz, u3v_sam_3, &bur, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_fork(hoz, bur); + return u3qf_fork(hoz, bur); } } diff --git a/j/6/hike.c b/j/6/hike.c index b419624f67..40fe7c0eb0 100644 --- a/j/6/hike.c +++ b/j/6/hike.c @@ -45,9 +45,9 @@ { if ( (1 != axis) && - (c3y == u3r_sing(2, u3_cqc_cap(axis))) ) + (c3y == u3r_sing(2, u3qc_cap(axis))) ) { - u3_atom axis_tap = u3_cqc_mas(axis); + u3_atom axis_tap = u3qc_mas(axis); return u3nc( u3nc( @@ -76,9 +76,9 @@ { if ( (1 != axis) && - (c3y == u3r_sing(3, u3_cqc_cap(axis))) ) + (c3y == u3r_sing(3, u3qc_cap(axis))) ) { - u3_atom axis_tap = u3_cqc_mas(axis); + u3_atom axis_tap = u3qc_mas(axis); return u3nc( u3nc(u3k(axis_tap), @@ -93,7 +93,7 @@ /* functions */ u3_noun - u3_cqf_hike( + u3qf_hike( u3_noun axe, u3_noun pac) { @@ -112,11 +112,11 @@ else { u3_noun tum = _lily_hike_belt_l(pac); u3_noun gam = _lily_hike_belt_r(pac); - u3_noun hax = u3_cqc_peg(axe, 2); - u3_noun moz = u3_cqc_peg(axe, 3); - u3_noun zip = u3_cqf_hike(hax, tum); - u3_noun dof = u3_cqf_hike(moz, gam); - u3_noun fol = u3_cqf_cons(zip, dof); + u3_noun hax = u3qc_peg(axe, 2); + u3_noun moz = u3qc_peg(axe, 3); + u3_noun zip = u3qf_hike(hax, tum); + u3_noun dof = u3qf_hike(moz, gam); + u3_noun fol = u3qf_cons(zip, dof); u3z(tum); u3z(gam); @@ -130,7 +130,7 @@ } } u3_noun - u3_cwf_hike( + u3wf_hike( u3_noun cor) { u3_noun axe, pac; @@ -140,6 +140,6 @@ { return u3m_bail(c3__fail); } else { - return u3_cqf_hike(axe, pac); + return u3qf_hike(axe, pac); } } diff --git a/j/6/look.c b/j/6/look.c index 3c361fadf8..8f5f650a5a 100644 --- a/j/6/look.c +++ b/j/6/look.c @@ -42,17 +42,17 @@ if ( (c3y == u3du(qn_dab)) && (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, - u3_cqc_peg(axe, 2), + u3qc_peg(axe, 2), u3k(qn_dab)); } else { - if ( c3y == u3_cqc_gor(cog, pn_dab) ) { + if ( c3y == u3qc_gor(cog, pn_dab) ) { return u3_nul; } else { u3_noun pro; - axe = u3_cqc_peg(axe, 3); + axe = u3qc_peg(axe, 3); pro = _look_in(cog, r_dab, axe); u3z(axe); return pro; @@ -63,14 +63,14 @@ if ( (c3y == u3du(qn_dab)) && (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, - u3_cqc_peg(axe, 2), + u3qc_peg(axe, 2), u3k(qn_dab)); } else { - if ( c3y == u3_cqc_gor(cog, pn_dab) ) { + if ( c3y == u3qc_gor(cog, pn_dab) ) { u3_noun pro; - axe = u3_cqc_peg(axe, 3); + axe = u3qc_peg(axe, 3); pro = _look_in(cog, l_dab, axe); u3z(axe); return pro; @@ -84,14 +84,14 @@ if ( (c3y == u3du(qn_dab)) && (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, - u3_cqc_peg(axe, 2), + u3qc_peg(axe, 2), u3k(qn_dab)); } else { - if ( c3y == u3_cqc_gor(cog, pn_dab) ) { + if ( c3y == u3qc_gor(cog, pn_dab) ) { u3_noun pro; - axe = u3_cqc_peg(axe, 6); + axe = u3qc_peg(axe, 6); pro = _look_in(cog, l_dab, axe); u3z(axe); return pro; @@ -99,7 +99,7 @@ else { u3_noun pro; - axe = u3_cqc_peg(axe, 7); + axe = u3qc_peg(axe, 7); pro = _look_in(cog, r_dab, axe); u3z(axe); return pro; @@ -114,14 +114,14 @@ /* functions */ u3_noun - u3_cqf_look( + u3qf_look( u3_noun cog, u3_noun dab) { return _look_in(cog, dab, 1); } u3_noun - u3_cwf_look( + u3wf_look( u3_noun cor) { u3_noun cog, dab; @@ -129,6 +129,6 @@ if ( c3n == u3r_mean(cor, u3v_sam_2, &cog, u3v_sam_3, &dab, 0) ) { return u3m_bail(c3__fail); } else { - return u3_cqf_look(cog, dab); + return u3qf_look(cog, dab); } } diff --git a/j/6/slot.c b/j/6/slot.c index 0ce7911f6a..7df51b67d7 100644 --- a/j/6/slot.c +++ b/j/6/slot.c @@ -8,7 +8,7 @@ /* functions */ u3_noun - u3_cqf_slot(u3_atom axe, u3_noun vax) + u3qf_slot(u3_atom axe, u3_noun vax) { u3_noun fag = u3r_at(axe, u3t(vax)); @@ -18,7 +18,7 @@ return u3m_bail(c3__exit); } else { - u3_noun typ = u3_cqfu_peek( + u3_noun typ = u3qfu_peek( } c3_w i_w, met_w = c3_min(u3r_met(3, axe), u3r_met(3, vax)); @@ -40,7 +40,7 @@ } u3_noun - u3_cwe_slot(u3_noun cor) + u3we_slot(u3_noun cor) { u3_noun axe, vax; @@ -50,6 +50,6 @@ { return u3m_bail(c3__fail); } else { - return u3_cqf_slot(axe, vax); + return u3qf_slot(axe, vax); } } diff --git a/j/6/ut.c b/j/6/ut.c index 8a9cd8be07..65c427730f 100644 --- a/j/6/ut.c +++ b/j/6/ut.c @@ -8,7 +8,7 @@ // duck: create a duck core for mean. // u3_noun - u3_cqfu_duck( + u3qfu_duck( u3_noun van, u3_noun typ) { @@ -22,7 +22,7 @@ // dung: create a dunk core for mean (noun caption) // u3_noun - u3_cqfu_dung( + u3qfu_dung( u3_noun van, u3_noun paz, u3_noun typ) @@ -39,7 +39,7 @@ // dunq: create a dunk core for mean // u3_noun - u3_cqfu_dunq( + u3qfu_dunq( u3_noun van, const c3_c* paz_c, u3_noun typ) @@ -58,7 +58,7 @@ // shew: create a show core for mean // u3_noun - u3_cqfu_shew(u3_noun van, u3_noun mol) + u3qfu_shew(u3_noun van, u3_noun mol) { u3_noun sho = u3j_hook(u3k(van), "show"); u3_noun ret = u3i_molt(u3k(sho), u3v_sam, u3k(mol), 0); @@ -71,13 +71,13 @@ // shep: show with caption and style // u3_noun - u3_cqfu_shep( + u3qfu_shep( u3_noun van, const c3_c* paz_c, u3_noun sty, u3_noun mol) { - return u3_cqfu_shew + return u3qfu_shew (van, u3nc (u3nc('c', u3i_string(paz_c)), diff --git a/j/6/ut_burn.c b/j/6/ut_burn.c index 53c545fca5..166c18dcd9 100644 --- a/j/6/ut_burn.c +++ b/j/6/ut_burn.c @@ -59,15 +59,15 @@ } case c3__hold: p_sut = u3t(sut); { - if ( (c3y == u3_cqdi_has(gil, sut)) ) { - u3_noun sux = u3_cqfu_dunq(van, "type", sut); + if ( (c3y == u3qdi_has(gil, sut)) ) { + u3_noun sux = u3qfu_dunq(van, "type", sut); u3t_push(u3nc(c3__mean, sux)); return u3m_error("burn-loop"); } else { - u3_noun zoc = u3_cqdi_put(gil, sut); - u3_noun fop = u3_cqfu_repo(van, sut); + u3_noun zoc = u3qdi_put(gil, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _burn_in(van, fop, zoc); u3z(fop); @@ -88,7 +88,7 @@ } u3_noun - u3_cqfu_burn( + u3qfu_burn( u3_noun van, u3_noun sut) { @@ -106,7 +106,7 @@ } u3_noun - u3_cwfu_burn( + u3wfu_burn( u3_noun cor) { u3_noun sut; @@ -114,6 +114,6 @@ if ( u3_none == (sut = u3r_at(u3v_sam, cor)) ) { return u3m_bail(c3__fail); } else { - return u3_cqfu_burn(cor, sut); + return u3qfu_burn(cor, sut); } } diff --git a/j/6/ut_busk.c b/j/6/ut_busk.c index c3b75ed4a1..b06e727cc4 100644 --- a/j/6/ut_busk.c +++ b/j/6/ut_busk.c @@ -14,9 +14,9 @@ u3_noun cog, u3_noun hyp) { - u3_noun sep = u3_cqfu_seep(van, sut, c3__both, hyp); + u3_noun sep = u3qfu_seep(van, sut, c3__both, hyp); u3_noun bid = u3nt(u3k(cog), u3k(hyp), sep); - u3_noun ret = u3_cqf_bull(bid, sut); + u3_noun ret = u3qf_bull(bid, sut); u3z(bid); @@ -26,7 +26,7 @@ /* boilerplate */ u3_noun - u3_cwfu_busk(u3_noun cor) + u3wfu_busk(u3_noun cor) { u3_noun sut, cog, hyp, van; @@ -44,7 +44,7 @@ } u3_noun - u3_cqfu_busk(u3_noun van, + u3qfu_busk(u3_noun van, u3_noun sut, u3_noun cog, u3_noun hyp) diff --git a/j/6/ut_bust.c b/j/6/ut_bust.c index 4df32d887e..dee9f9a7de 100644 --- a/j/6/ut_bust.c +++ b/j/6/ut_bust.c @@ -13,14 +13,14 @@ u3_noun sut, u3_noun dib) { - u3_noun yam = u3_cqfu_burn(van, sut); + u3_noun yam = u3qfu_burn(van, sut); u3_noun yib = u3nc ( u3nc(u3k(u3h(u3h(yam))), u3k(dib)), u3k(u3t(yam))); u3_noun woo = u3nc(c3__cnzy, u3_blip); - u3_noun wox = u3_cqfu_mint(van, sut, c3__noun, woo); + u3_noun wox = u3qfu_mint(van, sut, c3__noun, woo); u3_noun ret = u3n_nock_on(yib, u3k(u3t(wox))); if ( u3_none == ret ) { @@ -36,7 +36,7 @@ /* boilerplate */ u3_noun - u3_cwfu_bust(u3_noun cor) + u3wfu_bust(u3_noun cor) { u3_noun sut, dib, van; @@ -50,7 +50,7 @@ } u3_noun - u3_cqfu_bust(u3_noun van, + u3qfu_bust(u3_noun van, u3_noun sut, u3_noun dib) { diff --git a/j/6/ut_conk.c b/j/6/ut_conk.c index c0151eed10..be0fa8db5e 100644 --- a/j/6/ut_conk.c +++ b/j/6/ut_conk.c @@ -11,7 +11,7 @@ _cqfu_conk(u3_noun van, u3_noun sut, u3_noun got) { if ( c3y == u3ud(got) ) { - return u3_cqf_face(got, sut); + return u3qf_face(got, sut); } else switch ( u3h(got) ) { default: return u3m_bail(c3__fail); @@ -21,29 +21,29 @@ } case 1: { u3_noun cok = _cqfu_conk(van, sut, u3t(u3t(got))); - u3_noun ret = u3_cqf_face(u3h(u3t(got)), cok); + u3_noun ret = u3qf_face(u3h(u3t(got)), cok); u3z(cok); return ret; } case 2: { - u3_noun vet = u3r_at(u3_cqfu_van_vet, van); + u3_noun vet = u3r_at(u3qfu_van_vet, van); u3_noun hed, tal, deh, lat, ret; if ( c3y == vet ) { u3_noun cel = u3nt(c3__cell, c3__noun, c3__noun); - if ( c3n == u3_cqfu_nest(van, cel, c3y, sut) ) { + if ( c3n == u3qfu_nest(van, cel, c3y, sut) ) { return u3m_bail(c3__fail); } u3z(cel); } - hed = u3_cqfu_peek(van, sut, c3__both, 2); - tal = u3_cqfu_peek(van, sut, c3__both, 3); + hed = u3qfu_peek(van, sut, c3__both, 2); + tal = u3qfu_peek(van, sut, c3__both, 3); deh = _cqfu_conk(van, hed, u3h(u3t(got))); lat = _cqfu_conk(van, tal, u3t(u3t(got))); - ret = u3_cqf_cell(deh, lat); + ret = u3qf_cell(deh, lat); u3z(lat); u3z(deh); @@ -58,7 +58,7 @@ /* boilerplate */ u3_noun - u3_cwfu_conk(u3_noun cor) + u3wfu_conk(u3_noun cor) { u3_noun sut, got, van; @@ -74,7 +74,7 @@ } u3_noun - u3_cqfu_conk(u3_noun van, + u3qfu_conk(u3_noun van, u3_noun sut, u3_noun got) { diff --git a/j/6/ut_crop.c b/j/6/ut_crop.c index 5dc38095dc..8797a9c20f 100644 --- a/j/6/ut_crop.c +++ b/j/6/ut_crop.c @@ -19,7 +19,7 @@ u3_noun ref, u3_noun bix) { - u3_noun rep = u3_cqfu_repo(van, sut); + u3_noun rep = u3qfu_repo(van, sut); u3_noun ret = _crop_dext(van, rep, ref, bix); if ( c3y == u3r_sing(ret, rep) ) { @@ -77,7 +77,7 @@ case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun foz = _crop_dext(van, q_sut, ref, bix); - u3_noun ret = u3_cqf_bull(p_sut, foz); + u3_noun ret = u3qf_bull(p_sut, foz); u3z(foz); return ret; @@ -90,11 +90,11 @@ else if ( c3__cell == u3h(ref) ) { u3x_cell(u3t(ref), &p_ref, &q_ref); - if ( c3y == u3_cqfu_nest + if ( c3y == u3qfu_nest (van, p_ref, c3n, p_sut) ) { u3_noun foz = _crop_dext(van, q_sut, q_ref, bix); - u3_noun ret = u3_cqf_cell(p_sut, foz); + u3_noun ret = u3qf_cell(p_sut, foz); u3z(foz); return ret; @@ -121,8 +121,8 @@ u3_noun foz = _crop_dext(van, q_sut, ref, bix); u3_noun ret; - if ( c3y == u3_cqfu_firm(van, foz, p_sut) ) { - ret = u3_cqf_cube(p_sut, foz); + if ( c3y == u3qfu_firm(van, foz, p_sut) ) { + ret = u3qf_cube(p_sut, foz); } else ret = c3__void; @@ -134,7 +134,7 @@ case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun foz = _crop_dext(van, q_sut, ref, bix); - u3_noun ret = u3_cqf_face(p_sut, foz); + u3_noun ret = u3qf_face(p_sut, foz); u3z(foz); return ret; @@ -143,7 +143,7 @@ { u3_noun dis = _crop_dext(van, p_sut, ref, bix); u3_noun dat = _crop_dext(van, q_sut, ref, bix); - u3_noun ret = u3_cqf_fork(dis, dat); + u3_noun ret = u3qf_fork(dis, dat); u3z(dis); u3z(dat); @@ -153,10 +153,10 @@ { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( c3y == u3_cqdi_has(bix, hud) ) { + if ( c3y == u3qdi_has(bix, hud) ) { # if 0 - u3_noun dun = u3_cqfu_dunq(van, "type", sut); - u3_noun niz = u3_cqfu_dunq(van, "over", ref); + u3_noun dun = u3qfu_dunq(van, "type", sut); + u3_noun niz = u3qfu_dunq(van, "over", ref); u3t_push(u3nc(c3__mean, dun)); u3t_push(u3nc(c3__mean, niz)); @@ -164,7 +164,7 @@ return u3m_error("crop-loop"); } else { - u3_noun bux = u3_cqdi_put(bix, hud); + u3_noun bux = u3qdi_put(bix, hud); u3_noun ret = _crop_repo(van, sut, ref, bux); u3z(hud); @@ -209,7 +209,7 @@ } case c3__hold: p_ref = u3t(ref); { - u3_noun rep = u3_cqfu_repo(van, ref); + u3_noun rep = u3qfu_repo(van, ref); u3_noun ret = _crop_dext(van, sut, rep, bix); u3z(rep); @@ -230,7 +230,7 @@ /* boilerplate */ u3_noun - u3_cwfu_crop( + u3wfu_crop( u3_noun cor) { u3_noun sut, ref, van; @@ -245,7 +245,7 @@ } u3_noun - u3_cqfu_crop(u3_noun van, + u3qfu_crop(u3_noun van, u3_noun sut, u3_noun ref) { diff --git a/j/6/ut_cull.c b/j/6/ut_cull.c index 4544757ea8..c99732d636 100644 --- a/j/6/ut_cull.c +++ b/j/6/ut_cull.c @@ -27,7 +27,7 @@ default: return u3m_bail(c3__fail); case c3__noun: { - u3_noun pyr = u3_cqfu_repo(van, sut); + u3_noun pyr = u3qfu_repo(van, sut); u3_noun yot = _cqfu_cull(van, pyr, pol, axe, ref); if ( c3y == u3r_sing(pyr, yot) ) { @@ -58,7 +58,7 @@ if ( c3y == u3r_sing(hic, q_sut) ) { ret = u3k(sut); } else { - ret = u3_cqf_bull(p_sut, hic); + ret = u3qf_bull(p_sut, hic); } u3z(hic); @@ -70,10 +70,10 @@ if ( 2 == now ) { hub = _cqfu_cull(van, p_sut, pol, lat, ref); - ret = u3_cqf_cell(hub, q_sut); + ret = u3qf_cell(hub, q_sut); } else { hub = _cqfu_cull(van, q_sut, pol, lat, ref); - ret = u3_cqf_cell(p_sut, hub); + ret = u3qf_cell(p_sut, hub); } u3z(hub); break; @@ -86,7 +86,7 @@ u3_noun hub = _cqfu_cull (van, p_sut, pol, lat, ref); - ret = u3_cqf_core(hub, q_sut); + ret = u3qf_core(hub, q_sut); u3z(hub); } @@ -100,7 +100,7 @@ if ( c3y == u3r_sing(hic, q_sut) ) { ret = u3k(sut); } else { - ret = u3_cqf_face(p_sut, hic); + ret = u3qf_face(p_sut, hic); } u3z(hic); @@ -108,16 +108,16 @@ } case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { - if ( c3y == u3_cqdi_has(vil, sut) ) { + if ( c3y == u3qdi_has(vil, sut) ) { return c3__void; } else { - u3_noun zoc = u3_cqdi_put(vil, sut); + u3_noun zoc = u3qdi_put(vil, sut); u3_noun sin = _cull_in (van, p_sut, pol, axe, ref, now, lat, zoc); u3_noun dex = _cull_in (van, q_sut, pol, axe, ref, now, lat, zoc); - ret = u3_cqf_fork(sin, dex); + ret = u3qf_fork(sin, dex); u3z(sin); u3z(dex); u3z(zoc); @@ -128,7 +128,7 @@ case c3__cube: case c3__hold: { - u3_noun pyr = u3_cqfu_repo(van, sut); + u3_noun pyr = u3qfu_repo(van, sut); u3_noun yot = _cull_in(van, pyr, pol, axe, ref, now, lat, vil); if ( c3y == u3r_sing(pyr, yot) ) { @@ -158,13 +158,13 @@ { if ( 1 == axe ) { if ( c3y == pol ) { - return u3_cqfu_fuse(van, sut, ref); + return u3qfu_fuse(van, sut, ref); } else { - return u3_cqfu_crop(van, sut, ref); + return u3qfu_crop(van, sut, ref); } } else { - u3_atom now = u3_cqc_cap(axe); - u3_atom lat = u3_cqc_mas(axe); + u3_atom now = u3qc_cap(axe); + u3_atom lat = u3qc_mas(axe); return _cull_in(van, sut, pol, axe, ref, now, lat, u3_nul); } @@ -173,7 +173,7 @@ /* boilerplate */ u3_noun - u3_cwfu_cull(u3_noun cor) + u3wfu_cull(u3_noun cor) { u3_noun sut, axe, pol, ref, van; @@ -191,7 +191,7 @@ } u3_noun - u3_cqfu_cull(u3_noun van, + u3qfu_cull(u3_noun van, u3_noun sut, u3_noun pol, u3_noun axe, diff --git a/j/6/ut_find.c b/j/6/ut_find.c index 1ea55fd018..320bd2eee5 100644 --- a/j/6/ut_find.c +++ b/j/6/ut_find.c @@ -45,7 +45,7 @@ } else { return _fino_in ( - van, q_sut, u3_cqa_dec(dep), way, cog, gil); + van, q_sut, u3qa_dec(dep), way, cog, gil); } } } @@ -74,7 +74,7 @@ ret = u3nq (u3k(p_bov), u3_nul, - u3_cqc_peg(3, puq_bov), + u3qc_peg(3, puq_bov), u3k(quq_bov)); } u3z(bov); @@ -86,7 +86,7 @@ ret = u3nq (u3k(p_taf), u3_nul, - u3_cqc_peg(2, puq_taf), + u3qc_peg(2, puq_taf), u3k(quq_taf)); } u3z(taf); @@ -103,12 +103,12 @@ { return u3m_bail(c3__fail); } else { - u3_noun zem = u3_cqf_look(cog, qrq_sut); + u3_noun zem = u3qf_look(cog, qrq_sut); if ( (u3_nul != zem) && (0 != dep) ) { u3_noun ped; - ped = u3_cqa_dec(dep); + ped = u3qa_dec(dep); u3z(dep); dep = ped; u3z(zem); @@ -130,12 +130,12 @@ u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); - if ( c3n == u3_cqfu_park + if ( c3n == u3qfu_park (van, sut, way, puq_taf) ) { - u3_noun weh = u3_cqfu_shep + u3_noun weh = u3qfu_shep (van, "way", 'a', u3k(way)); - u3_noun waz = u3_cqfu_shep + u3_noun waz = u3qfu_shep (van, "axis", 'd', u3k(puq_taf)); u3t_push(u3nc(c3__mean, weh)); @@ -146,7 +146,7 @@ pro = u3nq (u3k(p_taf), u3_nul, - u3_cqc_peg(3, puq_taf), + u3qc_peg(3, puq_taf), u3k(quq_taf)); u3z(taf); @@ -175,7 +175,7 @@ 1, 1, u3nc - (u3_cqc_peg(2, pu_zem), + (u3qc_peg(2, pu_zem), u3nc( u3nc(mut, u3k(qu_zem)), u3_nul)))); @@ -197,13 +197,13 @@ u3nq(u3_nul, 1, 0, u3k(q_sut))); } else { return u3nc - (u3_cqa_dec(dep), u3_nul); + (u3qa_dec(dep), u3_nul); } } } } case c3__cube: { - u3_noun fop = u3_cqfu_repo(van, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _fino_in(van, fop, dep, way, cog, gil); u3z(fop); @@ -214,10 +214,10 @@ return u3m_bail(c3__fail); } - if ( (c3y == u3_cqdi_has(gil, q_sut)) ) { + if ( (c3y == u3qdi_has(gil, q_sut)) ) { return _fino_in(van, p_sut, dep, way, cog, gil); } - else if ( (c3y == u3_cqdi_has(gil, p_sut)) ) { + else if ( (c3y == u3qdi_has(gil, p_sut)) ) { return _fino_in(van, q_sut, dep, way, cog, gil); } else { @@ -262,7 +262,7 @@ u3_nul, u3k(puq_hax), 0, - u3_cqf_fork(pquq_hax, pquq_yor))); + u3qf_fork(pquq_hax, pquq_yor))); break; } case 1: { @@ -283,7 +283,7 @@ 1, u3nc (u3k(pquq_hax), - u3_cqb_weld + u3qb_weld (qquq_hax, qquq_yor)))); break; } @@ -322,10 +322,10 @@ u3k(ppquq_hax), u3k(qpquq_hax), u3k(rpquq_hax), - u3_cqf_fork( + u3qf_fork( spquq_hax, spquq_yor)), - u3_cqf_fork(qquq_hax, qquq_yor)))); + u3qf_fork(qquq_hax, qquq_yor)))); break; } } @@ -339,12 +339,12 @@ } case c3__hold: p_sut = u3t(sut); { - if ( (c3y == u3_cqdi_has(gil, sut)) ) { + if ( (c3y == u3qdi_has(gil, sut)) ) { return u3nc(u3k(dep), u3_nul); } else { - u3_noun zoc = u3_cqdi_put(gil, sut); - u3_noun fop = u3_cqfu_repo(van, sut); + u3_noun zoc = u3qdi_put(gil, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _fino_in(van, fop, dep, way, cog, zoc); u3z(fop); @@ -396,9 +396,9 @@ } else { return _find_in ( - van, q_sut, u3_cqa_dec(dep), way, cog, gil); + van, q_sut, u3qa_dec(dep), way, cog, gil); return u3nc - (u3_cqa_dec(dep), u3_nul); + (u3qa_dec(dep), u3_nul); } } } @@ -427,7 +427,7 @@ ret = u3nq (u3k(p_bov), u3_nul, - u3_cqc_peg(3, puq_bov), + u3qc_peg(3, puq_bov), u3k(quq_bov)); } u3z(bov); @@ -439,7 +439,7 @@ ret = u3nq (u3k(p_taf), u3_nul, - u3_cqc_peg(2, puq_taf), + u3qc_peg(2, puq_taf), u3k(quq_taf)); } u3z(taf); @@ -456,12 +456,12 @@ { return u3m_bail(c3__fail); } else { - u3_noun zem = u3_cqf_look(cog, qrq_sut); + u3_noun zem = u3qf_look(cog, qrq_sut); if ( (u3_nul != zem) && (0 != dep) ) { u3_noun ped; - ped = u3_cqa_dec(dep); + ped = u3qa_dec(dep); u3z(dep); dep = ped; u3z(zem); @@ -483,12 +483,12 @@ u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); - if ( c3n == u3_cqfu_park + if ( c3n == u3qfu_park (van, sut, way, puq_taf) ) { - u3_noun weh = u3_cqfu_shep + u3_noun weh = u3qfu_shep (van, "way", 'a', u3k(way)); - u3_noun waz = u3_cqfu_shep + u3_noun waz = u3qfu_shep (van, "axis", 'd', u3k(puq_taf)); u3t_push(u3nc(c3__mean, weh)); @@ -499,7 +499,7 @@ pro = u3nq (u3k(p_taf), u3_nul, - u3_cqc_peg(3, puq_taf), + u3qc_peg(3, puq_taf), u3k(quq_taf)); u3z(taf); @@ -528,7 +528,7 @@ 1, c3n, u3nc - (u3_cqc_peg(2, pu_zem), + (u3qc_peg(2, pu_zem), u3nc( u3nc(mut, u3k(qu_zem)), u3_nul)))); @@ -550,13 +550,13 @@ u3nq(u3_nul, 1, c3y, u3k(q_sut))); } else { return u3nc - (u3_cqa_dec(dep), u3_nul); + (u3qa_dec(dep), u3_nul); } } } } case c3__cube: { - u3_noun fop = u3_cqfu_repo(van, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _find_in(van, fop, dep, way, cog, gil); u3z(fop); @@ -567,10 +567,10 @@ return u3m_bail(c3__fail); } - if ( (c3y == u3_cqdi_has(gil, q_sut)) ) { + if ( (c3y == u3qdi_has(gil, q_sut)) ) { return _find_in(van, p_sut, dep, way, cog, gil); } - else if ( (c3y == u3_cqdi_has(gil, p_sut)) ) { + else if ( (c3y == u3qdi_has(gil, p_sut)) ) { return _find_in(van, q_sut, dep, way, cog, gil); } else { @@ -615,7 +615,7 @@ u3_nul, u3k(puq_hax), c3y, - u3_cqf_fork(pquq_hax, pquq_yor))); + u3qf_fork(pquq_hax, pquq_yor))); break; } case c3n: { @@ -636,7 +636,7 @@ c3n, u3nc (u3k(pquq_hax), - u3_cqb_weld + u3qb_weld (qquq_hax, qquq_yor)))); break; } @@ -651,12 +651,12 @@ } case c3__hold: p_sut = u3t(sut); { - if ( (c3y == u3_cqdi_has(gil, sut)) ) { + if ( (c3y == u3qdi_has(gil, sut)) ) { return u3nc(u3k(dep), u3_nul); } else { - u3_noun zoc = u3_cqdi_put(gil, sut); - u3_noun fop = u3_cqfu_repo(van, sut); + u3_noun zoc = u3qdi_put(gil, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _find_in(van, fop, dep, way, cog, zoc); u3z(fop); @@ -693,7 +693,7 @@ /* boilerplate */ u3_noun - u3_cwfu_fino( + u3wfu_fino( u3_noun cor) { u3_noun sut, dep, way, cog, van; @@ -712,7 +712,7 @@ } u3_noun - u3_cqfu_fino( + u3qfu_fino( u3_noun van, u3_noun sut, u3_noun dep, @@ -736,7 +736,7 @@ /* boilerplate */ u3_noun - u3_cwfu_find( + u3wfu_find( u3_noun cor) { u3_noun sut, dep, way, cog, van; @@ -755,7 +755,7 @@ } u3_noun - u3_cqfu_find( + u3qfu_find( u3_noun van, u3_noun sut, u3_noun dep, diff --git a/j/6/ut_fink.c b/j/6/ut_fink.c index 9194552447..63d69c283e 100644 --- a/j/6/ut_fink.c +++ b/j/6/ut_fink.c @@ -15,21 +15,21 @@ u3_noun way, u3_noun cog) { - u3_noun dun = u3_cqfu_dunq(van, "type", sut); + u3_noun dun = u3qfu_dunq(van, "type", sut); u3_noun nuc = (u3_blip == cog) - ? u3_cqfu_shew + ? u3qfu_shew (van, u3nc (u3nc('c', u3i_string("find-limb")), '$')) - : u3_cqfu_shep + : u3qfu_shep (van, "find-limb", 'a', u3k(cog)); u3_noun pro; u3t_push(u3nc(c3__mean, dun)); u3t_push(u3nc(c3__mean, nuc)); { - u3_noun hoq = u3_cqfu_find(van, sut, dep, way, cog); + u3_noun hoq = u3qfu_find(van, sut, dep, way, cog); u3_noun fin = u3t(hoq); if ( u3_nul == fin ) { @@ -50,7 +50,7 @@ /* boilerplate */ u3_noun - u3_cwfu_fink(u3_noun cor) + u3wfu_fink(u3_noun cor) { u3_noun sut, dep, way, cog, van; @@ -68,7 +68,7 @@ } u3_noun - u3_cqfu_fink( + u3qfu_fink( u3_noun van, u3_noun sut, u3_noun dep, diff --git a/j/6/ut_fire.c b/j/6/ut_fire.c index d552d715b9..ad7dbdb5ff 100644 --- a/j/6/ut_fire.c +++ b/j/6/ut_fire.c @@ -13,21 +13,21 @@ u3_noun dox, u3_noun gen) { - u3_noun rib = u3r_at(u3_cqfu_van_rib, van); + u3_noun rib = u3r_at(u3qfu_van_rib, van); u3_noun key = u3nt(u3k(sut), u3k(dox), u3k(gen)); u3_noun ret; - if ( c3y == u3_cqdi_has(rib, key) ) { + if ( c3y == u3qdi_has(rib, key) ) { ret = c3y; } else { - u3_noun rob = u3_cqdi_put(rib, key); + u3_noun rob = u3qdi_put(rib, key); u3_noun von = u3i_molt(u3k(van), - u3_cqfu_van_rib, u3k(rob), + u3qfu_van_rib, u3k(rob), 0); - ret = u3_cqfu_mull(von, sut, c3__noun, dox, gen); + ret = u3qfu_mull(von, sut, c3__noun, dox, gen); u3z(von); u3z(rob); @@ -59,12 +59,12 @@ if ( c3__ash == u3h(gat) ) { if ( (c3y == vet) && - (c3n == u3_cqfu_nest + (c3n == u3qfu_nest (van, qq_typ, c3y, p_typ)) ) { #if 0 - u3_noun dun = u3_cqfu_dunq(van, "need", qq_typ); - u3_noun niz = u3_cqfu_dunq(van, "have", p_typ); + u3_noun dun = u3qfu_dunq(van, "need", qq_typ); + u3_noun niz = u3qfu_dunq(van, "have", p_typ); u3t_push(u3nc(c3__mean, niz)); u3t_push(u3nc(c3__mean, dun)); @@ -83,8 +83,8 @@ (c3n == _fire_mull(van, typ, dox, t_gat)) ) { #if 0 - u3_noun dun = u3_cqfu_dunq(van, "wild", typ); - u3_noun niz = u3_cqfu_dunq(van, "tame", dox); + u3_noun dun = u3qfu_dunq(van, "wild", typ); + u3_noun niz = u3qfu_dunq(van, "tame", dox); u3t_push(u3nc(c3__mean, dun)); u3t_push(u3nc(c3__mean, niz)); @@ -127,7 +127,7 @@ u3_noun sut, u3_noun hag) { - u3_noun vet = u3r_at(u3_cqfu_van_vet, van); + u3_noun vet = u3r_at(u3qfu_van_vet, van); { if ( (c3y == u3du(hag)) && (u3_nul == u3t(hag)) ) { @@ -153,7 +153,7 @@ /* boilerplate */ u3_noun - u3_cwfu_fire( + u3wfu_fire( u3_noun cor) { u3_noun sut, hag, van; @@ -168,7 +168,7 @@ } u3_noun - u3_cqfu_fire(u3_noun van, + u3qfu_fire(u3_noun van, u3_noun sut, u3_noun hag) { diff --git a/j/6/ut_firm.c b/j/6/ut_firm.c index b2f0e204f1..f02bfb8421 100644 --- a/j/6/ut_firm.c +++ b/j/6/ut_firm.c @@ -82,7 +82,7 @@ } case c3__hold: { - u3_noun goy = u3_cqfu_repo(van, sut); + u3_noun goy = u3qfu_repo(van, sut); u3_noun ret = _cqfu_firm(van, goy, dib); u3z(goy); @@ -94,7 +94,7 @@ /* boilerplate */ u3_noun - u3_cwfu_firm( + u3wfu_firm( u3_noun cor) { u3_noun sut, dib, van; @@ -109,7 +109,7 @@ } u3_noun - u3_cqfu_firm(u3_noun van, + u3qfu_firm(u3_noun van, u3_noun sut, u3_noun dib) { diff --git a/j/6/ut_fish.c b/j/6/ut_fish.c index 846f436bc5..a3f04dc980 100644 --- a/j/6/ut_fish.c +++ b/j/6/ut_fish.c @@ -31,7 +31,7 @@ case c3__atom: { u3_noun ton = u3nt(3, 0, u3k(axe)); - u3_noun pro = u3_cqf_flip(ton); + u3_noun pro = u3qf_flip(ton); u3z(ton); return pro; @@ -44,12 +44,12 @@ return u3m_bail(c3__fail); } else { u3_noun hut = u3nt(3, 0, u3k(axe)); - u3_noun lef = u3_cqc_peg(axe, 2); - u3_noun rit = u3_cqc_peg(axe, 3); + u3_noun lef = u3qc_peg(axe, 2); + u3_noun rit = u3qc_peg(axe, 3); u3_noun hed = _fish_in(van, p_sut, lef, vit); u3_noun tal = _fish_in(van, q_sut, rit, vit); - u3_noun hob = u3_cqf_flan(hed, tal); - u3_noun vug = u3_cqf_flan(hut, hob); + u3_noun hob = u3qf_flan(hed, tal); + u3_noun vug = u3qf_flan(hut, hob); u3z(hob); u3z(tal); @@ -88,7 +88,7 @@ else { u3_noun hed = _fish_in(van, p_sut, axe, vit); u3_noun tal = _fish_in(van, q_sut, axe, vit); - u3_noun pro = u3_cqf_flor(hed, tal); + u3_noun pro = u3qf_flor(hed, tal); u3z(hed); u3z(tal); @@ -99,9 +99,9 @@ case c3__hold: { p_sut = u3t(sut); { - if ( (c3y == u3_cqdi_has(vit, sut)) ) { - // u3_noun dun = u3_cqfu_dunq(van, "type", sut); - u3_noun niz = u3_cqfu_shep + if ( (c3y == u3qdi_has(vit, sut)) ) { + // u3_noun dun = u3qfu_dunq(van, "type", sut); + u3_noun niz = u3qfu_shep (van, "axis", 'd', u3k(axe)); // u3t_push(u3nc(c3__mean, dun)); @@ -109,8 +109,8 @@ return u3m_error("fish-loop"); } else { - u3_noun zoc = u3_cqdi_put(vit, sut); - u3_noun fop = u3_cqfu_rest(van, sut, p_sut); + u3_noun zoc = u3qdi_put(vit, sut); + u3_noun fop = u3qfu_rest(van, sut, p_sut); u3_noun pro = _fish_in(van, fop, axe, zoc); u3z(fop); @@ -135,7 +135,7 @@ /* boilerplate */ u3_noun - u3_cwfu_fish( + u3wfu_fish( u3_noun cor) { u3_noun sut, axe, van; @@ -151,7 +151,7 @@ } u3_noun - u3_cqfu_fish(u3_noun van, + u3qfu_fish(u3_noun van, u3_noun sut, u3_noun axe) { diff --git a/j/6/ut_fuse.c b/j/6/ut_fuse.c index 46c078e608..8621c1bcca 100644 --- a/j/6/ut_fuse.c +++ b/j/6/ut_fuse.c @@ -17,7 +17,7 @@ u3_noun ref, u3_noun bix) { - u3_noun rep = u3_cqfu_repo(van, sut); + u3_noun rep = u3qfu_repo(van, sut); u3_noun ret = _fuse_in(van, rep, ref, bix); if ( c3y == u3r_sing(ret, rep) ) { @@ -65,7 +65,7 @@ { if ( c3y == u3du(ref) ) { if ( c3__atom == u3h(ref) ) { - if ( c3y == u3_cqf_fitz(u3t(ref), u3t(sut)) ) { + if ( c3y == u3qf_fitz(u3t(ref), u3t(sut)) ) { return u3k(sut); } else return u3k(ref); } @@ -78,7 +78,7 @@ case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun vot = _fuse_in(van, q_sut, ref, bix); - u3_noun ret = u3_cqf_bull(p_sut, vot); + u3_noun ret = u3qf_bull(p_sut, vot); u3z(vot); return ret; @@ -90,7 +90,7 @@ if ( c3y == u3r_pq(ref, c3__cell, &p_ref, &q_ref) ) { u3_noun hed = _fuse_in(van, p_sut, p_ref, bix); u3_noun tal = _fuse_in(van, q_sut, q_ref, bix); - u3_noun ret = u3_cqf_cell(hed, tal); + u3_noun ret = u3qf_cell(hed, tal); u3z(hed); u3z(tal); @@ -107,10 +107,10 @@ u3_noun foz = _fuse_in(van, q_sut, ref, bix); u3_noun ret; - if ( c3n == u3_cqfu_firm(van, foz, p_sut) ) { + if ( c3n == u3qfu_firm(van, foz, p_sut) ) { ret = c3__void; } else { - ret = u3_cqf_cube(p_sut, foz); + ret = u3qf_cube(p_sut, foz); } u3z(foz); return ret; @@ -118,7 +118,7 @@ case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun vot = _fuse_in(van, q_sut, ref, bix); - u3_noun ret = u3_cqf_face(p_sut, vot); + u3_noun ret = u3qf_face(p_sut, vot); u3z(vot); return ret; @@ -127,7 +127,7 @@ { u3_noun dis = _fuse_in(van, p_sut, ref, bix); u3_noun dat = _fuse_in(van, q_sut, ref, bix); - u3_noun ret = u3_cqf_fork(dis, dat); + u3_noun ret = u3qf_fork(dis, dat); u3z(dis); u3z(dat); @@ -137,16 +137,16 @@ { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( c3y == u3_cqdi_has(bix, hud) ) { - // u3_noun dun = u3_cqfu_dunq(van, "type", sut); - // u3_noun niz = u3_cqfu_dunq(van, "over", ref); + if ( c3y == u3qdi_has(bix, hud) ) { + // u3_noun dun = u3qfu_dunq(van, "type", sut); + // u3_noun niz = u3qfu_dunq(van, "over", ref); // u3t_push(u3nc(c3__mean, dun)); // u3t_push(u3nc(c3__mean, niz)); return u3m_error("fuse-loop"); } else { - u3_noun bux = u3_cqdi_put(bix, hud); + u3_noun bux = u3qdi_put(bix, hud); u3_noun ret = _fuse_repo(van, sut, ref, bux); u3z(hud); @@ -169,7 +169,7 @@ /* boilerplate */ u3_noun - u3_cwfu_fuse( + u3wfu_fuse( u3_noun cor) { u3_noun sut, ref, van; @@ -184,7 +184,7 @@ } u3_noun - u3_cqfu_fuse(u3_noun van, + u3qfu_fuse(u3_noun van, u3_noun sut, u3_noun ref) { diff --git a/j/6/ut_gain.c b/j/6/ut_gain.c index 3ae2cd4622..8525801069 100644 --- a/j/6/ut_gain.c +++ b/j/6/ut_gain.c @@ -6,7 +6,7 @@ u3_noun - u3_cqfu_gain(u3_noun van, u3_noun sut, u3_noun gen) + u3qfu_gain(u3_noun van, u3_noun sut, u3_noun gen) { u3_noun von = u3i_molt(u3k(van), u3v_sam, u3k(sut), 0); u3_noun gat = u3j_hook(von, "gain"); diff --git a/j/6/ut_heal.c b/j/6/ut_heal.c index 402f73d64b..903b4bb595 100644 --- a/j/6/ut_heal.c +++ b/j/6/ut_heal.c @@ -39,7 +39,7 @@ u3_noun sub = _heal_by(van, q_sut, qog, ref); u3_noun ret; - ret = u3_cqfu_busk + ret = u3qfu_busk (van, sub, u3h(p_sut), u3h(u3t(p_sut))); u3z(sub); @@ -49,12 +49,12 @@ case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { if ( c3y == u3r_sing(p_sut, u3t(qog)) ) { - return u3_cqf_face(p_sut, ref); + return u3qf_face(p_sut, ref); } else return u3m_error("heal-name"); } case c3__hold: { - u3_noun rep = u3_cqfu_repo(van, sut); + u3_noun rep = u3qfu_repo(van, sut); u3_noun ret = _heal_by(van, rep, qog, ref); u3z(rep); @@ -64,7 +64,7 @@ { u3_noun dis = _heal_by(van, p_sut, qog, ref); u3_noun dat = _heal_by(van, q_sut, qog, ref); - u3_noun ret = u3_cqf_fork(dis, dat); + u3_noun ret = u3qf_fork(dis, dat); u3z(dis); u3z(dat); @@ -98,7 +98,7 @@ u3_noun sub = _heal_to(van, q_sut, gil, qog, ref, now, lat); u3_noun ret; - ret = u3_cqfu_busk + ret = u3qfu_busk (van, sub, u3h(p_sut), u3h(u3t(p_sut))); u3z(sub); @@ -110,10 +110,10 @@ if ( 2 == now ) { ter = _heal_as(van, p_sut, qog, lat, ref); - ret = u3_cqf_cell(ter, q_sut); + ret = u3qf_cell(ter, q_sut); } else { ter = _heal_as(van, q_sut, qog, lat, ref); - ret = u3_cqf_cell(p_sut, ter); + ret = u3qf_cell(p_sut, ter); } u3z(ter); return ret; @@ -125,7 +125,7 @@ return u3m_error("heal-core"); } else { u3_noun ter = _heal_as(van, p_sut, qog, lat, ref); - u3_noun ret = u3_cqf_core(ter, q_sut); + u3_noun ret = u3qf_core(ter, q_sut); u3z(ter); return ret; @@ -134,7 +134,7 @@ case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun dun = _heal_to(van, q_sut, gil, qog, ref, now, lat); - u3_noun ret = u3_cqf_face(p_sut, dun); + u3_noun ret = u3qf_face(p_sut, dun); u3z(dun); return ret; @@ -143,7 +143,7 @@ { u3_noun dis = _heal_to(van, p_sut, gil, qog, ref, now, lat); u3_noun dat = _heal_to(van, q_sut, gil, qog, ref, now, lat); - u3_noun ret = u3_cqf_fork(dis, dat); + u3_noun ret = u3qf_fork(dis, dat); u3z(dis); u3z(dat); @@ -151,12 +151,12 @@ } case c3__hold: { - if ( (c3y == u3_cqdi_has(gil, sut)) ) { + if ( (c3y == u3qdi_has(gil, sut)) ) { return c3__void; } else { - u3_noun zoc = u3_cqdi_put(gil, sut); - u3_noun rep = u3_cqfu_repo(van, sut); + u3_noun zoc = u3qdi_put(gil, sut); + u3_noun rep = u3qfu_repo(van, sut); u3_noun ret = _heal_to(van, rep, zoc, qog, ref, now, lat); u3z(rep); @@ -168,7 +168,7 @@ } repo: { - u3_noun rep = u3_cqfu_repo(van, sut); + u3_noun rep = u3qfu_repo(van, sut); u3_noun ret = _heal_to(van, rep, gil, qog, ref, now, lat); u3z(rep); @@ -190,8 +190,8 @@ } else return _heal_by(van, sut, qog, ref); } else { - u3_atom now = u3_cqc_cap(axe); - u3_atom lat = u3_cqc_mas(axe); + u3_atom now = u3qc_cap(axe); + u3_atom lat = u3qc_mas(axe); u3_noun ret = _heal_to(van, sut, u3_nul, qog, ref, now, lat); u3z(lat); @@ -215,7 +215,7 @@ /* boilerplate */ u3_noun - u3_cwfu_heal( + u3wfu_heal( u3_noun cor) { u3_noun van, sut, qog, axe, ref; @@ -235,7 +235,7 @@ } u3_noun - u3_cqfu_heal(u3_noun van, + u3qfu_heal(u3_noun van, u3_noun sut, u3_noun qog, u3_noun axe, diff --git a/j/6/ut_lose.c b/j/6/ut_lose.c index 2e117471cf..8e8ef77951 100644 --- a/j/6/ut_lose.c +++ b/j/6/ut_lose.c @@ -6,7 +6,7 @@ u3_noun - u3_cqfu_lose(u3_noun van, + u3qfu_lose(u3_noun van, u3_noun sut, u3_noun gen) { diff --git a/j/6/ut_mint.c b/j/6/ut_mint.c index 3d46fe80c3..f05aba9e5f 100644 --- a/j/6/ut_mint.c +++ b/j/6/ut_mint.c @@ -25,7 +25,7 @@ int FOO; u3_noun van) { // u3_noun vet = u3j_hook(u3k(van), "vet"); - u3_noun vet = u3r_at(u3_cqfu_van_vet, van); + u3_noun vet = u3r_at(u3qfu_van_vet, van); switch ( vet ) { case c3n: @@ -121,10 +121,10 @@ int FOO; u3_noun typ) { if ( (c3y == _mint_vet(van)) && - (c3n == u3_cqfu_nest(van, gol, c3y, typ)) ) + (c3n == u3qfu_nest(van, gol, c3y, typ)) ) { - // u3_noun dun = u3_cqfu_dunq(van, "need", gol); - // u3_noun niz = u3_cqfu_dunq(van, "have", typ); + // u3_noun dun = u3qfu_dunq(van, "need", gol); + // u3_noun niz = u3qfu_dunq(van, "have", typ); // u3t_push(u3nc(c3__mean, dun)); // u3t_push(u3nc(c3__mean, niz)); @@ -165,8 +165,8 @@ int FOO; { while ( 1 ) { if ( c3n == u3du(mew) ) { - u3_noun gim = u3_cqfu_fire(van, sut, rag); - u3_noun fol = u3_cqf_hike(p_lar, hej); + u3_noun gim = u3qfu_fire(van, sut, rag); + u3_noun fol = u3qf_hike(p_lar, hej); u3z(rag); u3z(hej); @@ -177,10 +177,10 @@ int FOO; u3_noun t_mew = u3t(mew); u3_noun pi_mew = u3h(i_mew); u3_noun qi_mew = u3t(i_mew); - u3_noun zil = u3_cqfu_mint(van, sut, c3__noun, qi_mew); + u3_noun zil = u3qfu_mint(van, sut, c3__noun, qi_mew); u3_noun p_zil = u3h(zil); u3_noun q_zil = u3t(zil); - u3_noun wip = u3_cqfu_tock + u3_noun wip = u3qfu_tock (van, sut, pi_mew, p_zil, rag); u3z(rag); @@ -212,10 +212,10 @@ int FOO; case c3y: von = u3k(van); break; case c3n: - von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); break; + von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0); break; } { - u3_noun mil = u3_cqfu_mint(von, sut, c3__noun, gen); + u3_noun mil = u3qfu_mint(von, sut, c3__noun, gen); u3_noun fol = u3k(u3t(mil)); u3z(mil); @@ -305,7 +305,7 @@ int FOO; u3_noun ret = u3nc ( _mint_nice(van, gol, cot), - u3_cqf_cons(zod, q_dan)); + u3qf_cons(zod, q_dan)); u3z(zod); u3z(toc); @@ -356,7 +356,7 @@ int FOO; if ( c3n == u3du(gen) ) { u3_noun ter = u3r_at(u3v_con_3, van); - u3_noun rex = u3_cqfp_open(ter, gen); + u3_noun rex = u3qfp_open(ter, gen); ret = _mint_in(van, sut, gol, rex); u3z(rex); @@ -368,12 +368,12 @@ int FOO; { u3_noun hed = _mint_in(van, sut, c3__noun, u3h(gen)); u3_noun tal = _mint_in(van, sut, c3__noun, u3t(gen)); - u3_noun typ = u3_cqf_cell(u3h(hed), u3h(tal)); + u3_noun typ = u3qf_cell(u3h(hed), u3h(tal)); ret = u3nc ( _mint_nice(van, gol, typ), - u3_cqf_cons(u3t(hed), u3t(tal))); + u3qf_cons(u3t(hed), u3t(tal))); u3z(hed); u3z(tal); @@ -383,11 +383,11 @@ int FOO; } else switch ( u3h(gen) ) { default: { u3_noun ter = u3r_at(u3v_con_3, van); - u3_noun rex = u3_cqfp_open(ter, gen); + u3_noun rex = u3qfp_open(ter, gen); if ( c3y == u3r_sing(rex, gen) ) { #if 1 - u3_noun zix = u3_cqfu_shep(van, "gene", 'q', u3k(gen)); + u3_noun zix = u3qfu_shep(van, "gene", 'q', u3k(gen)); u3t_push(u3nc(c3__mean, zix)); return u3m_error("mint-open"); @@ -405,9 +405,9 @@ int FOO; case c3__bcpt: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun sep = u3_cqfu_seep(van, sut, c3__read, p_gen); + u3_noun sep = u3qfu_seep(van, sut, c3__read, p_gen); u3_noun axe = u3h(sep); - u3_noun rex = u3_cqfl_whip(van, q_gen, axe); + u3_noun rex = u3qfl_whip(van, q_gen, axe); u3_noun ret = _mint_in(van, sut, gol, rex); u3z(sep); @@ -419,16 +419,16 @@ int FOO; case c3__wtts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun nob = u3_cqfl_bunt(van, p_gen); + u3_noun nob = u3qfl_bunt(van, p_gen); u3_noun dok = u3nc(c3__cnzz, u3k(q_gen)); u3_noun vol = _mint_corn(van, sut, dok); u3_noun axe = _mint_coke(vol); - u3_noun wam = u3_cqfu_play(van, sut, nob); + u3_noun wam = u3qfu_play(van, sut, nob); ret = u3nc ( _mint_nice(van, gol, _mint_bean()), - u3_cqfu_fish(van, wam, axe)); + u3qfu_fish(van, wam, axe)); u3z(axe); u3z(wam); @@ -443,8 +443,8 @@ int FOO; { u3_noun bol = _mint_bean(); u3_noun nor = _mint_in(van, sut, bol, p_gen); - u3_noun fex = u3_cqfu_gain(van, sut, p_gen); - u3_noun wux = u3_cqfu_lose(van, sut, p_gen); + u3_noun fex = u3qfu_gain(van, sut, p_gen); + u3_noun wux = u3qfu_lose(van, sut, p_gen); u3_noun duy = (c3__void == fex) ? ( (c3__void == wux) ? u3nc(0, 0) @@ -456,7 +456,7 @@ int FOO; u3_noun ran = _mint_in(van, wux, gol, r_gen); ret = u3nc - (u3_cqf_fork(u3h(hiq), u3h(ran)), + (u3qf_fork(u3h(hiq), u3h(ran)), _mint_cond(duy, u3k(u3t(hiq)), u3k(u3t(ran)))); @@ -475,12 +475,12 @@ int FOO; { u3_noun hed = _mint_in(van, sut, c3__noun, p_gen); u3_noun tal = _mint_in(van, sut, c3__noun, q_gen); - u3_noun typ = u3_cqf_cell(u3h(hed), u3h(tal)); + u3_noun typ = u3qf_cell(u3h(hed), u3h(tal)); ret = u3nc ( _mint_nice(van, gol, typ), - u3_cqf_cons(u3t(hed), u3t(tal))); + u3qf_cons(u3t(hed), u3t(tal))); u3z(hed); u3z(tal); @@ -540,7 +540,7 @@ int FOO; u3_noun boc = (c3n == u3ud(q_gen)) ? c3__noun : u3nc(c3__atom, u3k(p_gen)); - u3_noun typ = u3_cqf_cube(q_gen, boc); + u3_noun typ = u3qf_cube(q_gen, boc); u3_noun ret = u3nc( _mint_nice(van, gol, typ), @@ -563,7 +563,7 @@ int FOO; case c3__dtzy: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun typ = u3_cqfu_play(van, sut, gen); + u3_noun typ = u3qfu_play(van, sut, gen); u3_noun ret = u3nc( _mint_nice(van, gol, typ), @@ -575,7 +575,7 @@ int FOO; _mint_used(); { u3_noun ryd = _mint_in(van, sut, gol, p_gen); - u3_noun tyf = u3_cqfu_wrap(van, u3h(ryd), c3__iron); + u3_noun tyf = u3qfu_wrap(van, u3h(ryd), c3__iron); u3_noun pro = u3nc(tyf, u3k(u3t(ryd))); u3z(ryd); @@ -585,7 +585,7 @@ int FOO; _mint_used(); { u3_noun ryd = _mint_in(van, sut, gol, p_gen); - u3_noun tyf = u3_cqfu_wrap(van, u3h(ryd), c3__zinc); + u3_noun tyf = u3qfu_wrap(van, u3h(ryd), c3__zinc); u3_noun pro = u3nc(tyf, u3k(u3t(ryd))); u3z(ryd); @@ -595,7 +595,7 @@ int FOO; _mint_used(); { u3_noun ryd = _mint_in(van, sut, gol, p_gen); - u3_noun tyf = u3_cqfu_wrap(van, u3h(ryd), c3__lead); + u3_noun tyf = u3qfu_wrap(van, u3h(ryd), c3__lead); u3_noun pro = u3nc(tyf, u3k(u3t(ryd))); u3z(ryd); @@ -608,7 +608,7 @@ int FOO; ret = u3nc ( - u3_cqfu_conk(van, u3h(vat), p_gen), + u3qfu_conk(van, u3h(vat), p_gen), u3k(u3t(vat))); u3z(vat); @@ -621,7 +621,7 @@ int FOO; ret = u3nc ( - u3_cqfu_conk(van, u3h(vat), p_gen), + u3qfu_conk(van, u3h(vat), p_gen), u3k(u3t(vat))); u3z(vat); @@ -636,7 +636,7 @@ int FOO; u3_noun fom; { - u3_noun cag = u3_cqfu_burn(van, sut); + u3_noun cag = u3qfu_burn(van, sut); u3_noun wim = u3n_nock_an(cag, u3k(q_nef)); if ( 0 == u3h(wim) ) { @@ -654,7 +654,7 @@ int FOO; case c3__ktls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun huz = u3_cqfu_play(van, sut, p_gen); + u3_noun huz = u3qfu_play(van, sut, p_gen); u3_noun hif = _mint_nice(van, gol, huz); u3_noun zel = _mint_in(van, sut, hif, q_gen); u3_noun ret = u3nc(hif, u3k(u3t(zel))); @@ -665,19 +665,19 @@ int FOO; case c3__kthx: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun huz = u3_cqfu_play(van, sut, p_gen); + u3_noun huz = u3qfu_play(van, sut, p_gen); u3_noun hif = _mint_nice(van, gol, huz); u3_noun zel = _mint_in(van, sut, hif, q_gen); u3_noun ret = u3nc(hif, u3k(u3t(zel))); #if 0 { - u3_noun goz = u3_cqfu_play(van, sut, q_gen); + u3_noun goz = u3qfu_play(van, sut, q_gen); u3_noun bar; FOO = 1; fprintf(stderr, "\r\n"); - bar = u3_cqfu_nest(van, huz, c3n, goz); + bar = u3qfu_nest(van, huz, c3n, goz); fprintf(stderr, "kthx: bar %d\r\n", bar); FOO = 0; } @@ -697,7 +697,7 @@ int FOO; ret = u3nc (u3k(p_dov), - u3_cqf_comb(q_fid, q_dov)); + u3qf_comb(q_fid, q_dov)); u3z(fid); u3z(dov); @@ -706,9 +706,9 @@ int FOO; case c3__tstr: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _mint_used(); { - u3_noun sep = u3_cqfu_seep(van, sut, c3__both, q_gen); + u3_noun sep = u3qfu_seep(van, sut, c3__both, q_gen); u3_noun bid = u3nt(u3k(p_gen), u3k(q_gen), sep); - u3_noun boc = u3_cqf_bull(bid, sut); + u3_noun boc = u3qf_bull(bid, sut); u3_noun ret = _mint_in(van, boc, gol, r_gen); u3z(bid); @@ -719,13 +719,13 @@ int FOO; case c3__cnts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun sec = u3_cqfu_seek(van, sut, c3__read, p_gen); + u3_noun sec = u3qfu_seek(van, sut, c3__read, p_gen); u3_noun lar = _mint_foil(sec); u3_noun p_lar = u3h(lar); u3_noun q_lar = u3t(lar); u3_noun pq_lar = u3h(q_lar); u3_noun qq_lar = u3t(q_lar); - u3_noun mew = u3_cqfu_snub(van, sut, q_gen); + u3_noun mew = u3qfu_snub(van, sut, q_gen); u3_noun yom = _mint_edit (van, sut, mew, p_lar, u3k(qq_lar), u3_nul); u3_noun p_yom = u3h(yom); @@ -788,8 +788,8 @@ int FOO; case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun typ = u3_cqfu_play(van, sut, p_gen); - u3_noun dug = u3_cqfu_duck(van, typ); + u3_noun typ = u3qfu_play(van, sut, p_gen); + u3_noun dug = u3qfu_duck(van, typ); u3t_push(u3nc(c3__mean, dug)); { @@ -822,7 +822,7 @@ int FOO; case c3__zpts: p_gen = u3t(gen); _mint_used(); { - u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0); u3_noun sev = _mint_corn(von, sut, p_gen); u3z(von); @@ -835,7 +835,7 @@ int FOO; ( _mint_nice(van, gol, - u3_cqfu_play(van, sut, p_gen)), + u3qfu_play(van, sut, p_gen)), u3nc(1, u3k(q_gen))); } case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen); @@ -869,17 +869,17 @@ int FOO; _mint_used(); { u3_noun vos = _mint_in(van, sut, c3__noun, q_gen); - u3_noun zur = u3_cqfu_play(van, sut, p_gen); + u3_noun zur = u3qfu_play(van, sut, p_gen); u3_noun p_vos = u3h(vos); u3_noun q_vos = u3t(vos); u3_noun waz = u3nc(1, u3k(p_vos)); u3_noun sif = u3k(zur); - u3_noun cig = u3_cqf_cell(sif, p_vos); + u3_noun cig = u3qf_cell(sif, p_vos); u3_noun ret; ret = u3nc( _mint_nice(van, gol, cig), - u3_cqf_cons(waz, q_vos)); + u3qf_cons(waz, q_vos)); u3z(waz); u3z(zur); @@ -892,8 +892,8 @@ int FOO; _mint_used(); { if ( c3y == _mint_vet(van) ) { - u3_noun zur = u3_cqfu_play(van, sut, p_gen); - u3_noun dun = u3_cqfu_dunq(van, "lost", zur); + u3_noun zur = u3qfu_play(van, sut, p_gen); + u3_noun dun = u3qfu_dunq(van, "lost", zur); u3t_push(u3nc(c3__mean, dun)); return u3m_error("mint-lost"); @@ -923,7 +923,7 @@ int FOO; /* boilerplate */ u3_noun - u3_cwfu_mint(u3_noun cor) + u3wfu_mint(u3_noun cor) { u3_noun sut, gol, gen, van; @@ -940,13 +940,13 @@ int FOO; } u3_noun - u3_cqfu_mint(u3_noun van, + u3qfu_mint(u3_noun van, u3_noun sut, u3_noun gol, u3_noun gen) { c3_m fun_m = c3__mint; - u3_noun vrf = u3r_at(u3_cqfu_van_vrf, van); + u3_noun vrf = u3r_at(u3qfu_van_vrf, van); u3_noun pro = u3z_find_4(fun_m, vrf, sut, gol, gen); if ( u3_none != pro ) { diff --git a/j/6/ut_mull.c b/j/6/ut_mull.c index 5d6a552626..4dc1d5de29 100644 --- a/j/6/ut_mull.c +++ b/j/6/ut_mull.c @@ -15,7 +15,7 @@ u3_noun van) { // u3_noun vet = u3j_hook(u3k(van), "vet"); - u3_noun vet = u3r_at(u3_cqfu_van_vet, van); + u3_noun vet = u3r_at(u3qfu_van_vet, van); switch ( vet ) { case c3n: @@ -117,7 +117,7 @@ u3_noun sut, u3_noun gen) { - u3_noun fug = u3_cqfu_mint(van, sut, c3__noun, gen); + u3_noun fug = u3qfu_mint(van, sut, c3__noun, gen); u3_noun axe = _mull_coke(u3k(u3t(fug))); u3z(fug); @@ -130,9 +130,9 @@ u3_noun gol, u3_noun typ) { - if ( c3n == u3_cqfu_nest(van, gol, c3y, typ) ) { - // u3_noun dun = u3_cqfu_dunq(van, "need", gol); - // u3_noun niz = u3_cqfu_dunq(van, "have", typ); + if ( c3n == u3qfu_nest(van, gol, c3y, typ) ) { + // u3_noun dun = u3qfu_dunq(van, "need", gol); + // u3_noun niz = u3qfu_dunq(van, "have", typ); // u3t_push(u3nc(c3__mean, dun)); // u3t_push(u3nc(c3__mean, niz)); @@ -266,9 +266,9 @@ u3_noun zil = _mull_in(van, sut, c3__noun, dox, qi_mew); u3_noun p_zil = u3h(zil); u3_noun q_zil = u3t(zil); - u3_noun cuf = u3_cqfu_tock + u3_noun cuf = u3qfu_tock (van, sut, pi_mew, p_zil, p_yom); - u3_noun dof = u3_cqfu_tock + u3_noun dof = u3qfu_tock (van, sut, pi_mew, q_zil, q_yom); if ( u3r_sing(u3h(cuf), u3h(dof)) ) { @@ -305,7 +305,7 @@ if ( c3n == u3du(gen) ) { u3_noun ter = u3r_at(u3v_con_3, van); - u3_noun rex = u3_cqfp_open(ter, gen); + u3_noun rex = u3qfp_open(ter, gen); ret = _mull_in(van, sut, gol, dox, rex); u3z(rex); @@ -317,8 +317,8 @@ { u3_noun hed = _mull_in(van, sut, c3__noun, dox, u3h(gen)); u3_noun tal = _mull_in(van, sut, c3__noun, dox, u3t(gen)); - u3_noun dis = u3_cqf_cell(u3h(hed), u3h(tal)); - u3_noun dat = u3_cqf_cell(u3t(hed), u3t(tal)); + u3_noun dis = u3qf_cell(u3h(hed), u3h(tal)); + u3_noun dat = u3qf_cell(u3t(hed), u3t(tal)); u3_noun ret = u3nc(_mull_nice(van, gol, dis), dat); u3z(tal); @@ -330,11 +330,11 @@ else switch ( u3h(gen) ) { default: { u3_noun ter = u3r_at(u3v_con_3, van); - u3_noun rex = u3_cqfp_open(ter, gen); + u3_noun rex = u3qfp_open(ter, gen); if ( c3y == u3r_sing(rex, gen) ) { #if 1 - u3_noun zix = u3_cqfu_shep + u3_noun zix = u3qfu_shep (van, "gene", 'q', u3k(gen)); u3t_push(u3nc(c3__mean, zix)); @@ -353,15 +353,15 @@ case c3__bcpt: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun sep = u3_cqfu_seep(van, sut, c3__read, p_gen); - u3_noun pox = u3_cqfu_seep(van, dox, c3__read, p_gen); + u3_noun sep = u3qfu_seep(van, sut, c3__read, p_gen); + u3_noun pox = u3qfu_seep(van, dox, c3__read, p_gen); u3_noun axe = u3h(sep); if ( axe != u3h(pox) ) { return u3m_error("mull-bonk-wing"); } else { - u3_noun rex = u3_cqfl_whip(van, q_gen, axe); + u3_noun rex = u3qfl_whip(van, q_gen, axe); u3_noun ret = _mull_in(van, sut, gol, dox, rex); u3z(sep); @@ -375,14 +375,14 @@ case c3__wtts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun nob = u3_cqfl_bunt(van, p_gen); - u3_noun p_waz = u3_cqfu_play(van, sut, nob); - u3_noun q_waz = u3_cqfu_play(van, dox, nob); + u3_noun nob = u3qfl_bunt(van, p_gen); + u3_noun p_waz = u3qfu_play(van, sut, nob); + u3_noun q_waz = u3qfu_play(van, dox, nob); u3_noun dok = u3nc(c3__cnzz, u3k(q_gen)); u3_noun p_syx = _mull_doke(van, sut, dok); u3_noun q_syx = _mull_doke(van, dox, dok); - u3_noun p_pov = u3_cqfu_fish(van, p_waz, p_syx); - u3_noun q_pov = u3_cqfu_fish(van, q_waz, q_syx); + u3_noun p_pov = u3qfu_fish(van, p_waz, p_syx); + u3_noun q_pov = u3qfu_fish(van, q_waz, q_syx); if ( (c3n == u3r_sing(p_syx, q_syx)) || (c3n == u3r_sing(p_pov, q_pov)) ) @@ -403,10 +403,10 @@ { u3_noun bol = _mull_bean(); u3_noun nor = _mull_in(van, sut, bol, dox, p_gen); - u3_noun p_fex = u3_cqfu_gain(van, sut, p_gen); - u3_noun q_fex = u3_cqfu_gain(van, dox, p_gen); - u3_noun p_wux = u3_cqfu_lose(van, sut, p_gen); - u3_noun q_wux = u3_cqfu_lose(van, dox, p_gen); + u3_noun p_fex = u3qfu_gain(van, sut, p_gen); + u3_noun q_fex = u3qfu_gain(van, dox, p_gen); + u3_noun p_wux = u3qfu_lose(van, sut, p_gen); + u3_noun q_wux = u3qfu_lose(van, dox, p_gen); u3_noun hiq, ran; u3_noun dis, dat; u3_noun ret; @@ -416,7 +416,7 @@ c3__void, (c3__void == q_fex) ? c3__void - : u3_cqfu_play(van, q_fex, q_gen)); + : u3qfu_play(van, q_fex, q_gen)); } else if ( c3__void == q_fex ) { hiq = u3m_error("mull-bonk-c"); } @@ -427,14 +427,14 @@ c3__void, (c3__void == q_wux) ? c3__void - : u3_cqfu_play(van, q_wux, r_gen)); + : u3qfu_play(van, q_wux, r_gen)); } else if ( c3__void == q_wux ) { ran = u3m_error("mull-bonk-d"); } else ran = _mull_in(van, p_wux, gol, q_wux, r_gen); - dis = u3_cqf_fork(u3h(hiq), u3h(ran)); - dat = u3_cqf_fork(u3t(hiq), u3t(ran)); + dis = u3qf_fork(u3h(hiq), u3h(ran)); + dat = u3qf_fork(u3t(hiq), u3t(ran)); ret = u3nc(_mull_nice(van, gol, dis), dat); @@ -454,8 +454,8 @@ { u3_noun hed = _mull_in(van, sut, c3__noun, dox, p_gen); u3_noun tal = _mull_in(van, sut, c3__noun, dox, q_gen); - u3_noun dis = u3_cqf_cell(u3h(hed), u3h(tal)); - u3_noun dat = u3_cqf_cell(u3t(hed), u3t(tal)); + u3_noun dis = u3qf_cell(u3h(hed), u3h(tal)); + u3_noun dat = u3qf_cell(u3t(hed), u3t(tal)); u3_noun ret = u3nc(_mull_nice(van, gol, dis), dat); u3z(tal); @@ -526,7 +526,7 @@ case c3__dtzy: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun typ = u3_cqfu_play(van, sut, gen); + u3_noun typ = u3qfu_play(van, sut, gen); return _mull_both(van, gol, typ); } case c3__ktbr: p_gen = u3t(gen); @@ -534,8 +534,8 @@ { u3_noun vat = _mull_in(van, sut, gol, dox, p_gen); u3_noun pro = u3nc - (u3_cqfu_wrap(van, u3h(vat), c3__iron), - u3_cqfu_wrap(van, u3t(vat), c3__iron)); + (u3qfu_wrap(van, u3h(vat), c3__iron), + u3qfu_wrap(van, u3t(vat), c3__iron)); u3z(vat); return pro; @@ -545,8 +545,8 @@ { u3_noun vat = _mull_in(van, sut, gol, dox, p_gen); u3_noun pro = u3nc - (u3_cqfu_wrap(van, u3h(vat), c3__zinc), - u3_cqfu_wrap(van, u3t(vat), c3__zinc)); + (u3qfu_wrap(van, u3h(vat), c3__zinc), + u3qfu_wrap(van, u3t(vat), c3__zinc)); u3z(vat); return pro; @@ -556,8 +556,8 @@ { u3_noun vat = _mull_in(van, sut, gol, dox, p_gen); u3_noun pro = u3nc - (u3_cqfu_wrap(van, u3h(vat), c3__lead), - u3_cqfu_wrap(van, u3t(vat), c3__lead)); + (u3qfu_wrap(van, u3h(vat), c3__lead), + u3qfu_wrap(van, u3t(vat), c3__lead)); u3z(vat); return pro; @@ -568,8 +568,8 @@ u3_noun vat = _mull_in(van, sut, gol, dox, q_gen); u3_noun ret = u3nc( - u3_cqfu_conk(van, u3h(vat), p_gen), - u3_cqfu_conk(van, u3t(vat), p_gen)); + u3qfu_conk(van, u3h(vat), p_gen), + u3qfu_conk(van, u3t(vat), p_gen)); u3z(vat); return ret; @@ -580,8 +580,8 @@ u3_noun vat = _mull_in(van, sut, gol, dox, q_gen); u3_noun ret = u3nc( - u3_cqfu_conk(van, u3h(vat), p_gen), - u3_cqfu_conk(van, u3t(vat), p_gen)); + u3qfu_conk(van, u3h(vat), p_gen), + u3qfu_conk(van, u3t(vat), p_gen)); u3z(vat); return ret; @@ -595,8 +595,8 @@ _mull_used(); { u3_noun p_hif = _mull_nice - (van, gol, u3_cqfu_play(van, sut, p_gen)); - u3_noun q_hif = u3_cqfu_play(van, dox, p_gen); + (van, gol, u3qfu_play(van, sut, p_gen)); + u3_noun q_hif = u3qfu_play(van, dox, p_gen); u3_noun zel = _mull_in(van, sut, p_hif, dox, q_gen); u3_noun ret = u3nc(p_hif, q_hif); @@ -608,8 +608,8 @@ _mull_used(); { u3_noun p_hif = _mull_nice - (van, gol, u3_cqfu_play(van, sut, p_gen)); - u3_noun q_hif = u3_cqfu_play(van, dox, p_gen); + (van, gol, u3qfu_play(van, sut, p_gen)); + u3_noun q_hif = u3qfu_play(van, dox, p_gen); u3_noun zel = _mull_in(van, sut, p_hif, dox, q_gen); u3_noun ret = u3nc(p_hif, q_hif); @@ -631,12 +631,12 @@ case c3__tstr: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _mull_used(); { - u3_noun sep = u3_cqfu_seep(van, sut, c3__both, q_gen); - u3_noun pox = u3_cqfu_seep(van, dox, c3__both, q_gen); + u3_noun sep = u3qfu_seep(van, sut, c3__both, q_gen); + u3_noun pox = u3qfu_seep(van, dox, c3__both, q_gen); u3_noun bid = u3nt(u3k(p_gen), u3k(q_gen), sep); u3_noun yub = u3nt(u3k(p_gen), u3k(q_gen), pox); - u3_noun boc = u3_cqf_bull(bid, sut); - u3_noun nuf = u3_cqf_bull(yub, dox); + u3_noun boc = u3qf_bull(bid, sut); + u3_noun nuf = u3qf_bull(yub, dox); u3_noun ret = _mull_in(van, boc, gol, nuf, r_gen); u3z(bid); @@ -649,8 +649,8 @@ case c3__cnts: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun sec = u3_cqfu_seek(van, sut, c3__read, p_gen); - u3_noun suc = u3_cqfu_seek(van, dox, c3__read, p_gen); + u3_noun sec = u3qfu_seek(van, sut, c3__read, p_gen); + u3_noun suc = u3qfu_seek(van, dox, c3__read, p_gen); u3_noun lar = _mull_foil(sec); u3_noun p_lar = u3h(lar); u3_noun q_lar = u3t(lar); @@ -666,13 +666,13 @@ u3m_error("mull-bonk-e"); } { - u3_noun mew = u3_cqfu_snub(van, sut, q_gen); + u3_noun mew = u3qfu_snub(van, sut, q_gen); u3_noun yom = _mull_edit (van, sut, dox, mew, u3k(qq_lar), u3k(qq_vug)); - u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); - u3_noun p_ret = u3_cqfu_fire(van, sut, u3h(yom)); - u3_noun q_ret = u3_cqfu_fire(von, sut, u3t(yom)); + u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0); + u3_noun p_ret = u3qfu_fire(van, sut, u3h(yom)); + u3_noun q_ret = u3qfu_fire(von, sut, u3t(yom)); u3z(von); u3z(yom); @@ -732,8 +732,8 @@ case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun typ = u3_cqfu_play(van, sut, p_gen); - u3_noun dug = u3_cqfu_duck(van, typ); + u3_noun typ = u3qfu_play(van, sut, p_gen); + u3_noun dug = u3qfu_duck(van, typ); u3_noun ret; u3t_push(u3nc(c3__mean, dug)); @@ -753,8 +753,8 @@ case c3__zpcm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun p_ret = u3_cqfu_play(van, sut, p_gen); - u3_noun q_ret = u3_cqfu_play(van, sut, q_gen); + u3_noun p_ret = u3qfu_play(van, sut, p_gen); + u3_noun q_ret = u3qfu_play(van, sut, q_gen); return u3nc (_mull_nice(van, gol, p_ret), @@ -788,11 +788,11 @@ case c3__zpsm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun p_zur = u3_cqfu_play(van, sut, p_gen); - u3_noun q_zur = u3_cqfu_play (van, dox, p_gen); + u3_noun p_zur = u3qfu_play(van, sut, p_gen); + u3_noun q_zur = u3qfu_play (van, dox, p_gen); u3_noun vos = _mull_in(van, sut, c3__noun, dox, q_gen); - u3_noun p_ret = u3_cqf_cell(p_zur, u3h(vos)); - u3_noun q_ret = u3_cqf_cell(q_zur, u3t(vos)); + u3_noun p_ret = u3qf_cell(p_zur, u3h(vos)); + u3_noun q_ret = u3qf_cell(q_zur, u3t(vos)); u3z(vos); u3z(q_zur); @@ -831,7 +831,7 @@ /* boilerplate */ u3_noun - u3_cwfu_mull(u3_noun cor) + u3wfu_mull(u3_noun cor) { u3_noun sut, gol, dox, gen, van; @@ -849,7 +849,7 @@ } u3_noun - u3_cqfu_mull(u3_noun van, + u3qfu_mull(u3_noun van, u3_noun sut, u3_noun gol, u3_noun dox, diff --git a/j/6/ut_nest.c b/j/6/ut_nest.c index 3fbbc1d2f2..74fb1cbe9b 100644 --- a/j/6/ut_nest.c +++ b/j/6/ut_nest.c @@ -59,8 +59,8 @@ } else { u3_noun pqn_dab = u3t(qn_dab); u3_noun pqn_hem = u3t(qn_hem); - u3_noun vis = u3_cqfu_play(van, sut, pqn_dab); - u3_noun lon = u3_cqfu_play(van, ref, pqn_hem); + u3_noun vis = u3qfu_play(van, sut, pqn_dab); + u3_noun lon = u3qfu_play(van, ref, pqn_hem); u3_noun ret = _nest_dext(van, vis, tel, lon, gil); u3z(vis); @@ -114,13 +114,13 @@ else { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( (c3y == u3_cqdi_has(gil, hud)) ) { + if ( (c3y == u3qdi_has(gil, hud)) ) { u3z(hud); return c3y; } else { - u3_noun zoc = u3_cqdi_put(gil, hud); + u3_noun zoc = u3qdi_put(gil, hud); u3_noun tus = u3nt(c3__core, u3k(qq_sut), u3k(q_sut)); @@ -147,9 +147,9 @@ _nest_dext(van, qq_ref, tel, qq_sut, gil)); } case c3__iron: { - u3_noun s_sam = u3_cqfu_peek + u3_noun s_sam = u3qfu_peek (van, qq_sut, c3__rite, 2); - u3_noun r_sam = u3_cqfu_peek + u3_noun r_sam = u3qfu_peek (van, qq_ref, c3__rite, 2); u3_noun ret = _nest_dext(van, r_sam, tel, s_sam, gil); @@ -161,9 +161,9 @@ return c3y; } case c3__zinc: { - u3_noun s_pal = u3_cqfu_peek + u3_noun s_pal = u3qfu_peek (van, qq_sut, c3__read, 2); - u3_noun r_pal = u3_cqfu_peek + u3_noun r_pal = u3qfu_peek (van, qq_ref, c3__read, 2); u3_noun ret = _nest_dext(van, s_pal, tel, r_pal, gil); @@ -204,7 +204,7 @@ case c3__atom: { if ( (c3y == u3du(ref)) && (c3__atom == u3h(ref)) ) { - if ( c3n == u3_cqf_fitz(u3t(sut), u3t(ref)) ) { + if ( c3n == u3qf_fitz(u3t(sut), u3t(ref)) ) { // u3_err("fitz: need", u3t(sut)); // u3_err("fitz: have", u3t(ref)); return c3n; @@ -287,13 +287,13 @@ { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( (c3y == u3_cqdi_has(gil, hud)) ) { + if ( (c3y == u3qdi_has(gil, hud)) ) { u3z(hud); return c3y; } else { - u3_noun zoc = u3_cqdi_put(gil, hud); - u3_noun fop = u3_cqfu_rest(van, sut, p_sut); + u3_noun zoc = u3qdi_put(gil, hud); + u3_noun fop = u3qfu_rest(van, sut, p_sut); u3_noun hiv = _nest_dext(van, fop, tel, ref, zoc); u3z(hud); @@ -319,8 +319,8 @@ if ( (c3y == tyn) || (c3n == tel) ) { return tyn; } else { - // u3_noun dun = u3_cqfu_dunq(van, "need", sut); - // u3_noun niz = u3_cqfu_dunq(van, "have", ref); + // u3_noun dun = u3qfu_dunq(van, "need", sut); + // u3_noun niz = u3qfu_dunq(van, "have", ref); // u3t_push(u3nc(c3__mean, dun)); // u3t_push(u3nc(c3__mean, niz)); @@ -390,7 +390,7 @@ } case c3__cell: return c3n; case c3__core: { - u3_noun gam = u3_cqfu_repo(van, ref); + u3_noun gam = u3qfu_repo(van, ref); u3_noun hiv = _nest_dext(van, sut, tel, gam, gil); u3z(gam); @@ -423,13 +423,13 @@ u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( (c3y == u3_cqdi_has(gil, hud)) ) { + if ( (c3y == u3qdi_has(gil, hud)) ) { u3z(hud); return c3y; } else { - u3_noun zoc = u3_cqdi_put(gil, hud); - u3_noun gam = u3_cqfu_repo(van, ref); + u3_noun zoc = u3qdi_put(gil, hud); + u3_noun gam = u3qfu_repo(van, ref); { u3_noun hiv = _nest_dext(van, sut, tel, gam, zoc); @@ -460,7 +460,7 @@ /* boilerplate */ u3_noun - u3_cwfu_nest(u3_noun cor) + u3wfu_nest(u3_noun cor) { u3_noun sut, tel, ref, van; @@ -478,7 +478,7 @@ } u3_noun - u3_cqfu_nest(u3_noun van, + u3qfu_nest(u3_noun van, u3_noun sut, u3_noun tel, u3_noun ref) diff --git a/j/6/ut_park.c b/j/6/ut_park.c index 54c49e331f..ae93269959 100644 --- a/j/6/ut_park.c +++ b/j/6/ut_park.c @@ -18,7 +18,7 @@ return u3m_bail(c3__fail); } // else if ( c3n == u3j_hook(u3k(van), "vet") ) { - else if ( c3n == u3r_at(u3_cqfu_van_vet, van) ) { + else if ( c3n == u3r_at(u3qfu_van_vet, van) ) { return c3y; } else { @@ -41,7 +41,7 @@ case c3__iron: return c3n; case c3__zinc: return c3a(!(u3r_sing(1, axe)), - u3r_sing(2, u3_cqc_cap(axe))); + u3r_sing(2, u3qc_cap(axe))); } } else if ( c3__rite == way ) { @@ -52,7 +52,7 @@ case c3__lead: return c3n; case c3__iron: return c3a(!(u3r_sing(1, axe)), - u3r_sing(2, u3_cqc_cap(axe))); + u3r_sing(2, u3qc_cap(axe))); case c3__zinc: return c3n; } } @@ -64,7 +64,7 @@ /* boilerplate */ u3_noun - u3_cwfu_park( + u3wfu_park( u3_noun cor) { u3_noun sut, way, axe, van; @@ -83,7 +83,7 @@ } u3_noun - u3_cqfu_park(u3_noun van, + u3qfu_park(u3_noun van, u3_noun sut, u3_noun way, u3_noun axe) diff --git a/j/6/ut_peek.c b/j/6/ut_peek.c index 39fd4c3c58..a2b1765395 100644 --- a/j/6/ut_peek.c +++ b/j/6/ut_peek.c @@ -48,8 +48,8 @@ if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { return u3m_bail(c3__fail); } else { - u3_atom tip = u3_cqc_cap(axe); - u3_atom tap = u3_cqc_mas(axe); + u3_atom tip = u3qc_cap(axe); + u3_atom tap = u3qc_mas(axe); if ( 2 == tip ) { pro = _cqfu_peek(van, p_sut, way, tap); @@ -73,14 +73,14 @@ { return u3m_bail(c3__fail); } else { - u3_atom tip = u3_cqc_cap(axe); - u3_atom tap = u3_cqc_mas(axe); + u3_atom tip = u3qc_cap(axe); + u3_atom tap = u3qc_mas(axe); if ( 3 == tip ) { - if ( c3n == u3_cqfu_park(van, sut, way, tap) ) + if ( c3n == u3qfu_park(van, sut, way, tap) ) { - // u3_noun dun = u3_cqfu_dunq(van, "type", sut); - u3_noun waz = u3_cqfu_shep + // u3_noun dun = u3qfu_dunq(van, "type", sut); + u3_noun waz = u3qfu_shep (van, "axis", 'd', u3k(axe)); // u3t_push(u3nc(c3__mean, dun)); @@ -120,7 +120,7 @@ u3_noun hed = _peek_in(van, p_sut, way, axe, gil); u3_noun tal = _peek_in(van, q_sut, way, axe, gil); - pro = u3_cqf_fork(hed, tal); + pro = u3qf_fork(hed, tal); u3z(hed); u3z(tal); @@ -130,12 +130,12 @@ } case c3__hold: { p_sut = u3t(sut); - if ( (c3y == u3_cqdi_has(gil, sut)) ) { + if ( (c3y == u3qdi_has(gil, sut)) ) { return c3__void; } else { - u3_noun zoc = u3_cqdi_put(gil, sut); - u3_noun fop = u3_cqfu_repo(van, sut); + u3_noun zoc = u3qdi_put(gil, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _peek_in(van, fop, way, axe, zoc); u3z(fop); @@ -163,7 +163,7 @@ /* boilerplate */ u3_noun - u3_cwfu_peek( + u3wfu_peek( u3_noun cor) { u3_noun sut, way, axe, van; @@ -182,7 +182,7 @@ } u3_noun - u3_cqfu_peek(u3_noun van, + u3qfu_peek(u3_noun van, u3_noun sut, u3_noun way, u3_noun axe) diff --git a/j/6/ut_play.c b/j/6/ut_play.c index 0151e95cfe..aa8fe06461 100644 --- a/j/6/ut_play.c +++ b/j/6/ut_play.c @@ -97,7 +97,7 @@ u3_noun pi_mew = u3h(i_mew); u3_noun qi_mew = u3t(i_mew); u3_noun laf = _play_in(van, sut, qi_mew); - u3_noun ruz = u3_cqfu_tock(van, sut, pi_mew, laf, rag); + u3_noun ruz = u3qfu_tock(van, sut, pi_mew, laf, rag); u3z(laf); u3z(rag); @@ -142,7 +142,7 @@ #if 1 return _play_in(van, sut, gen); #else - u3_noun zix = u3_cqfu_shep + u3_noun zix = u3qfu_shep (van, "gene", 'q', u3k(gen)); u3_noun ret; @@ -166,11 +166,11 @@ if ( c3n == u3du(gen) ) { open: { u3_noun ter = u3r_at(u3v_con_3, van); - u3_noun rex = u3_cqfp_open(ter, gen); + u3_noun rex = u3qfp_open(ter, gen); u3_noun ret; if ( c3y == u3r_sing(rex, gen) ) { - u3_noun zix = u3_cqfu_shep + u3_noun zix = u3qfu_shep (van, "gene", 'q', u3k(gen)); u3t_push(u3nc(c3__mean, zix)); @@ -187,7 +187,7 @@ { u3_noun dis = _play_x(van, sut, u3h(gen)); u3_noun dat = _play_x(van, sut, u3t(gen)); - u3_noun ret = u3_cqf_cell(dis, dat); + u3_noun ret = u3qf_cell(dis, dat); u3z(dis); u3z(dat); @@ -200,9 +200,9 @@ case c3__bcpt: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { - u3_noun sep = u3_cqfu_seep(van, sut, c3__read, p_gen); + u3_noun sep = u3qfu_seep(van, sut, c3__read, p_gen); u3_noun axe = u3h(sep); - u3_noun rex = u3_cqfl_whip(van, q_gen, axe); + u3_noun rex = u3qfl_whip(van, q_gen, axe); u3_noun ret = _play_x(van, sut, rex); u3z(sep); @@ -218,13 +218,13 @@ case c3__wtcl: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _play_used(); { - u3_noun fex = u3_cqfu_gain(van, sut, p_gen); - u3_noun wux = u3_cqfu_lose(van, sut, p_gen); + u3_noun fex = u3qfu_gain(van, sut, p_gen); + u3_noun wux = u3qfu_lose(van, sut, p_gen); u3_noun dez = (fex == c3__void) ? c3__void : _play_x(van, fex, q_gen); u3_noun doz = (wux == c3__void) ? c3__void : _play_x(van, wux, r_gen); - u3_noun ret = u3_cqf_fork(dez, doz); + u3_noun ret = u3qf_fork(dez, doz); u3z(dez); u3z(doz); u3z(fex); u3z(wux); @@ -235,7 +235,7 @@ { u3_noun dis = _play_x(van, sut, p_gen); u3_noun dat = _play_x(van, sut, q_gen); - u3_noun ret = u3_cqf_cell(dis, dat); + u3_noun ret = u3qf_cell(dis, dat); u3z(dis); u3z(dat); @@ -267,7 +267,7 @@ u3_noun boc = (c3n == u3ud(q_gen)) ? c3__noun : u3nc(c3__atom, u3k(p_gen)); - u3_noun ret = u3_cqf_cube(q_gen, boc); + u3_noun ret = u3qf_cube(q_gen, boc); u3z(boc); return ret; @@ -293,7 +293,7 @@ _play_used(); { u3_noun boc = _play_x(van, sut, p_gen); - u3_noun pro = u3_cqfu_wrap(van, boc, c3__iron); + u3_noun pro = u3qfu_wrap(van, boc, c3__iron); u3z(boc); return pro; @@ -302,7 +302,7 @@ _play_used(); { u3_noun boc = _play_x(van, sut, p_gen); - u3_noun pro = u3_cqfu_wrap(van, boc, c3__zinc); + u3_noun pro = u3qfu_wrap(van, boc, c3__zinc); u3z(boc); return pro; @@ -311,7 +311,7 @@ _play_used(); { u3_noun boc = _play_x(van, sut, p_gen); - u3_noun pro = u3_cqfu_wrap(van, boc, c3__lead); + u3_noun pro = u3qfu_wrap(van, boc, c3__lead); u3z(boc); return pro; @@ -320,7 +320,7 @@ _play_used(); { u3_noun boc = _play_x(van, sut, q_gen); - u3_noun ret = u3_cqfu_conk(van, boc, p_gen); + u3_noun ret = u3qfu_conk(van, boc, p_gen); u3z(boc); return ret; @@ -329,7 +329,7 @@ _play_used(); { u3_noun boc = _play_x(van, sut, q_gen); - u3_noun ret = u3_cqfu_conk(van, boc, p_gen); + u3_noun ret = u3qfu_conk(van, boc, p_gen); u3z(boc); return ret; @@ -361,9 +361,9 @@ case c3__tstr: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _play_used(); { - u3_noun sep = u3_cqfu_seep(van, sut, c3__both, q_gen); + u3_noun sep = u3qfu_seep(van, sut, c3__both, q_gen); u3_noun bid = u3nt(u3k(p_gen), u3k(q_gen), sep); - u3_noun boc = u3_cqf_bull(bid, sut); + u3_noun boc = u3qf_bull(bid, sut); u3_noun ret = _play_x(van, boc, r_gen); u3z(bid); @@ -374,13 +374,13 @@ case c3__cnts: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { - u3_noun sec = u3_cqfu_seek(van, sut, c3__read, p_gen); + u3_noun sec = u3qfu_seek(van, sut, c3__read, p_gen); u3_noun lar = _play_foil(sec); u3_noun q_lar = u3t(lar); u3_noun qq_lar = u3t(q_lar); - u3_noun mew = u3_cqfu_snub(van, sut, q_gen); + u3_noun mew = u3qfu_snub(van, sut, q_gen); u3_noun rag = _play_edit(van, sut, mew, u3k(qq_lar)); - u3_noun ret = u3_cqfu_fire(van, sut, rag); + u3_noun ret = u3qfu_fire(van, sut, rag); u3z(rag); u3z(mew); @@ -433,8 +433,8 @@ case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { - u3_noun typ = u3_cqfu_play(van, sut, p_gen); - u3_noun dug = u3_cqfu_duck(van, typ); + u3_noun typ = u3qfu_play(van, sut, p_gen); + u3_noun dug = u3qfu_duck(van, typ); u3_noun ret; u3t_push(u3nc(c3__mean, dug)); @@ -486,7 +486,7 @@ { u3_noun zur = _play_x(van, sut, p_gen); u3_noun vos = _play_x(van, sut, q_gen); - u3_noun ret = u3_cqf_cell(zur, vos); + u3_noun ret = u3qf_cell(zur, vos); u3z(zur); u3z(vos); @@ -508,7 +508,7 @@ u3_noun sut, u3_noun gen) { - u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0); u3_noun ret = _play_x(von, sut, gen); u3z(von); @@ -518,7 +518,7 @@ /* boilerplate */ u3_noun - u3_cwfu_play( + u3wfu_play( u3_noun cor) { u3_noun sut, gen, van; @@ -533,7 +533,7 @@ } u3_noun - u3_cqfu_play(u3_noun van, + u3qfu_play(u3_noun van, u3_noun sut, u3_noun gen) { diff --git a/j/6/ut_repo.c b/j/6/ut_repo.c index c2942be900..ee62da4074 100644 --- a/j/6/ut_repo.c +++ b/j/6/ut_repo.c @@ -8,7 +8,7 @@ /* logic */ u3_noun - u3_cqfu_repo( + u3qfu_repo( u3_noun van, u3_noun sut) { @@ -57,13 +57,13 @@ } case c3__hold: { p_sut = u3t(sut); - return u3_cqfu_rest(van, sut, p_sut); + return u3qfu_rest(van, sut, p_sut); } } } u3_noun - u3_cwfu_repo( + u3wfu_repo( u3_noun cor) { u3_noun sut; @@ -71,6 +71,6 @@ if ( u3_none == (sut = u3r_at(u3v_sam, cor)) ) { return u3m_bail(c3__fail); } else { - return u3_cqfu_repo(cor, sut); + return u3qfu_repo(cor, sut); } } diff --git a/j/6/ut_rest.c b/j/6/ut_rest.c index f541787b59..17f758bdae 100644 --- a/j/6/ut_rest.c +++ b/j/6/ut_rest.c @@ -19,7 +19,7 @@ u3_noun t_leg = u3t(leg); return u3nc - (u3_cqfu_play(van, u3h(i_leg), u3t(i_leg)), + (u3qfu_play(van, u3h(i_leg), u3t(i_leg)), _rest_in_list(van, t_leg)); } } @@ -29,8 +29,8 @@ u3_noun van, u3_noun gar) { - u3_noun gun = u3_cqdi_gas(u3_nul, gar); - u3_noun nog = u3_cqdi_tap(gun, u3_nul); + u3_noun gun = u3qdi_gas(u3_nul, gar); + u3_noun nog = u3qdi_tap(gun, u3_nul); u3z(gun); return nog; @@ -47,7 +47,7 @@ u3_noun buf = _rest_in_fork ( u3t(nog), - u3_cqf_fork(u3h(nog), fub)); + u3qf_fork(u3h(nog), fub)); u3z(fub); return buf; @@ -76,7 +76,7 @@ if ( u3_nul == leg ) { return c3n; } else { - return c3o(u3_cqdi_has(fan, u3h(leg)), + return c3o(u3qdi_has(fan, u3h(leg)), _rest_hit_fan(fan, u3t(leg))); } } @@ -84,14 +84,14 @@ u3_noun _cqfu_rest(u3_noun van, u3_noun sut, u3_noun leg) { - u3_noun fan = u3r_at(u3_cqfu_van_fan, van); + u3_noun fan = u3r_at(u3qfu_van_fan, van); if ( c3y == _rest_hit_fan(fan, leg) ) { return u3m_error("rest-loop"); } else { - u3_noun naf = u3_cqdi_gas(fan, leg); - u3_noun nav = u3i_molt(u3k(van), u3_cqfu_van_fan, u3k(naf), 0); + u3_noun naf = u3qdi_gas(fan, leg); + u3_noun nav = u3i_molt(u3k(van), u3qfu_van_fan, u3k(naf), 0); u3_noun mez = _rest_in(nav, leg); u3z(naf); @@ -103,7 +103,7 @@ /* boilerplate */ u3_noun - u3_cwfu_rest( + u3wfu_rest( u3_noun cor) { u3_noun sut, leg, van; @@ -118,7 +118,7 @@ } u3_noun - u3_cqfu_rest(u3_noun van, + u3qfu_rest(u3_noun van, u3_noun sut, u3_noun leg) { diff --git a/j/6/ut_seek.c b/j/6/ut_seek.c index ab98c7c722..ce6e52cb61 100644 --- a/j/6/ut_seek.c +++ b/j/6/ut_seek.c @@ -42,7 +42,7 @@ if ( c3__yew != u3h(qiqq_tor) ) { return yon; } else { - u3_noun nuy = u3_cqf_look(syx, u3t(qiqq_tor)); + u3_noun nuy = u3qf_look(syx, u3t(qiqq_tor)); if ( u3_nul == nuy ) { return u3m_error("silk"); @@ -105,8 +105,8 @@ if ( u3_nul == hey ) { return u3_nul; } - if ( u3_ckb_lent(u3k(hey)) != - u3_ckb_lent(u3k(qq_tor)) ) + if ( u3kb_lent(u3k(hey)) != + u3kb_lent(u3k(qq_tor)) ) { return u3m_error("silk"); } @@ -114,7 +114,7 @@ ret = u3nq (u3_nul, c3n, - u3_cqc_peg(pq_tor, _seek_silk_yaw(hey)), + u3qc_peg(pq_tor, _seek_silk_yaw(hey)), _seek_silk_fum(hey, qq_tor)); u3z(hey); @@ -175,7 +175,7 @@ u3r_cell(u3t(q_zar), &pq_zar, &qq_zar); wip = _seek_flat(qq_zar); - syp = u3_cqfu_fire(van, sut, wip); + syp = u3qfu_fire(van, sut, wip); u3z(wip); } @@ -186,13 +186,13 @@ if ( c3n == u3r_cell(u3t(yip), &p_yip, &q_yip) ) { return u3m_bail(c3__fail); } - hud = u3_cqfu_fink(van, syp, p_yip, way, q_yip); + hud = u3qfu_fink(van, syp, p_yip, way, q_yip); { u3_noun p_hud, q_hud; u3r_cell(hud, &p_hud, &q_hud); - ret = u3nc(u3_cqc_peg(p_zar, p_hud), + ret = u3nc(u3qc_peg(p_zar, p_hud), u3k(q_hud)); u3z(hud); } @@ -205,9 +205,9 @@ } else { ret = u3nt - (u3_cqc_peg(p_zar, p_yip), + (u3qc_peg(p_zar, p_yip), c3y, - u3_cqfu_peek(van, syp, way, p_yip)); + u3qfu_peek(van, syp, way, p_yip)); } } u3z(yip); @@ -220,7 +220,7 @@ /* boilerplate */ u3_noun - u3_cwfu_seek(u3_noun cor) + u3wfu_seek(u3_noun cor) { u3_noun sut, way, hyp, van; @@ -237,7 +237,7 @@ } u3_noun - u3_cqfu_seek(u3_noun van, + u3qfu_seek(u3_noun van, u3_noun sut, u3_noun way, u3_noun hyp) @@ -256,12 +256,12 @@ } u3_noun - u3_cqfu_seep(u3_noun van, + u3qfu_seep(u3_noun van, u3_noun sut, u3_noun way, u3_noun hyp) { - u3_noun zar = u3_cqfu_seek(van, sut, way, hyp); + u3_noun zar = u3qfu_seek(van, sut, way, hyp); u3_noun p_zar = u3h(zar); u3_noun q_zar = u3t(zar); @@ -277,7 +277,7 @@ } u3_noun - u3_cwfu_seep(u3_noun cor) + u3wfu_seep(u3_noun cor) { u3_noun sut, way, hyp, van; @@ -289,7 +289,7 @@ { return u3m_bail(c3__fail); } else { - return u3_cqfu_seep(van, sut, way, hyp); + return u3qfu_seep(van, sut, way, hyp); } } diff --git a/j/6/ut_sift.c b/j/6/ut_sift.c index cb83d12018..9cf7123356 100644 --- a/j/6/ut_sift.c +++ b/j/6/ut_sift.c @@ -8,7 +8,7 @@ /* boilerplate */ u3_noun - u3_cwfu_sift( + u3wfu_sift( u3_noun cor) { u3_noun sut, ref, van; @@ -20,12 +20,12 @@ { return u3m_bail(c3__fail); } else { - return u3_cqfu_sift(van, sut, ref); + return u3qfu_sift(van, sut, ref); } } u3_noun - u3_cqfu_sift(u3_noun van, + u3qfu_sift(u3_noun van, u3_noun sut, u3_noun ref) { diff --git a/j/6/ut_swab.c b/j/6/ut_swab.c index b44d32d243..a1f5cefef4 100644 --- a/j/6/ut_swab.c +++ b/j/6/ut_swab.c @@ -22,7 +22,7 @@ u3_noun t_har = u3t(har); u3_noun pi_har = u3h(i_har); u3_noun qi_har = u3t(i_har); - u3_noun peh = u3_cqb_flop(pi_har); + u3_noun peh = u3qb_flop(pi_har); u3_noun ret = u3nc(u3nc(peh, u3k(qi_har)), _cqfu_snub (van, sut, t_har)); @@ -34,7 +34,7 @@ /* boilerplate */ u3_noun - u3_cwfu_snub( + u3wfu_snub( u3_noun cor) { u3_noun van, sut, har; @@ -51,7 +51,7 @@ } u3_noun - u3_cqfu_snub(u3_noun van, + u3qfu_snub(u3_noun van, u3_noun sut, u3_noun har) { diff --git a/j/6/ut_tack.c b/j/6/ut_tack.c index ca273e1e4a..592013ecc7 100644 --- a/j/6/ut_tack.c +++ b/j/6/ut_tack.c @@ -6,7 +6,7 @@ u3_noun - u3_cqfu_tack(u3_noun van, + u3qfu_tack(u3_noun van, u3_noun sut, u3_noun peh, u3_noun mur) diff --git a/j/6/ut_tock.c b/j/6/ut_tock.c index 0a30750890..d9444a965e 100644 --- a/j/6/ut_tock.c +++ b/j/6/ut_tock.c @@ -23,7 +23,7 @@ u3_noun pi_men = u3h(i_men); u3_noun qi_men = u3t(i_men); u3_noun t_men = u3t(men); - u3_noun geq = u3_cqfu_tack(van, pi_men, peh, mur); + u3_noun geq = u3qfu_tack(van, pi_men, peh, mur); u3_noun p_geq = u3h(geq); u3_noun q_geq = u3t(geq); u3_noun mox = _tock_in(van, sut, peh, mur, t_men); @@ -71,7 +71,7 @@ /* boilerplate */ u3_noun - u3_cwfu_tock(u3_noun cor) + u3wfu_tock(u3_noun cor) { u3_noun van, sut, peh, mur, men; @@ -89,7 +89,7 @@ } u3_noun - u3_cqfu_tock(u3_noun van, + u3qfu_tock(u3_noun van, u3_noun sut, u3_noun peh, u3_noun mur, diff --git a/j/6/ut_wrap.c b/j/6/ut_wrap.c index 7a6a14a636..433d3a1169 100644 --- a/j/6/ut_wrap.c +++ b/j/6/ut_wrap.c @@ -39,13 +39,13 @@ } case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { - return u3_cqf_fork + return u3qf_fork (_cqfu_wrap(van, p_sut, yoz), _cqfu_wrap(van, q_sut, yoz)); } case c3__hold: { - u3_noun fop = u3_cqfu_repo(van, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _cqfu_wrap(van, fop, yoz); u3z(fop); @@ -57,7 +57,7 @@ /* boilerplate */ u3_noun - u3_cwfu_wrap( + u3wfu_wrap( u3_noun cor) { u3_noun sut, yoz, van; @@ -72,7 +72,7 @@ } u3_noun - u3_cqfu_wrap(u3_noun van, + u3qfu_wrap(u3_noun van, u3_noun sut, u3_noun yoz) { diff --git a/j/dash.c b/j/dash.c index 22dd856005..9079122a7f 100644 --- a/j/dash.c +++ b/j/dash.c @@ -4,62 +4,62 @@ */ #include "all.h" -static u3e_harm _mood__hoon_add_a[] = {{".2", u3_cwa_add, c3y}, {}}; -static u3e_harm _mood__hoon_dec_a[] = {{".2", u3_cwa_dec, c3y}, {}}; -static u3e_harm _mood__hoon_div_a[] = {{".2", u3_cwa_div, c3y}, {}}; -static u3e_harm _mood__hoon_gte_a[] = {{".2", u3_cwa_gte, c3y}, {}}; -static u3e_harm _mood__hoon_gth_a[] = {{".2", u3_cwa_gth, c3y}, {}}; -static u3e_harm _mood__hoon_lte_a[] = {{".2", u3_cwa_lte, c3y}, {}}; -static u3e_harm _mood__hoon_lth_a[] = {{".2", u3_cwa_lth, c3y}, {}}; -static u3e_harm _mood__hoon_mod_a[] = {{".2", u3_cwa_mod, c3y}, {}}; -static u3e_harm _mood__hoon_mul_a[] = {{".2", u3_cwa_mul, c3y}, {}}; -static u3e_harm _mood__hoon_sub_a[] = {{".2", u3_cwa_sub, c3y}, {}}; +static u3e_harm _mood__hoon_add_a[] = {{".2", u3wa_add, c3y}, {}}; +static u3e_harm _mood__hoon_dec_a[] = {{".2", u3wa_dec, c3y}, {}}; +static u3e_harm _mood__hoon_div_a[] = {{".2", u3wa_div, c3y}, {}}; +static u3e_harm _mood__hoon_gte_a[] = {{".2", u3wa_gte, c3y}, {}}; +static u3e_harm _mood__hoon_gth_a[] = {{".2", u3wa_gth, c3y}, {}}; +static u3e_harm _mood__hoon_lte_a[] = {{".2", u3wa_lte, c3y}, {}}; +static u3e_harm _mood__hoon_lth_a[] = {{".2", u3wa_lth, c3y}, {}}; +static u3e_harm _mood__hoon_mod_a[] = {{".2", u3wa_mod, c3y}, {}}; +static u3e_harm _mood__hoon_mul_a[] = {{".2", u3wa_mul, c3y}, {}}; +static u3e_harm _mood__hoon_sub_a[] = {{".2", u3wa_sub, c3y}, {}}; -static u3e_harm _mood__hoon_bind_a[] = {{".2", u3_cwb_bind, c3y}, {}}; -static u3e_harm _mood__hoon_clap_a[] = {{".2", u3_cwb_clap, c3y}, {}}; -static u3e_harm _mood__hoon_drop_a[] = {{".2", u3_cwb_drop, c3y}, {}}; -static u3e_harm _mood__hoon_flop_a[] = {{".2", u3_cwb_flop, c3y}, {}}; -static u3e_harm _mood__hoon_lent_a[] = {{".2", u3_cwb_lent, c3y}, {}}; -static u3e_harm _mood__hoon_levy_a[] = {{".2", u3_cwb_levy, c3y}, {}}; -static u3e_harm _mood__hoon_lien_a[] = {{".2", u3_cwb_lien, c3y}, {}}; -static u3e_harm _mood__hoon_need_a[] = {{".2", u3_cwb_need, c3y}, {}}; -static u3e_harm _mood__hoon_reel_a[] = {{".2", u3_cwb_reel, c3y}, {}}; -static u3e_harm _mood__hoon_roll_a[] = {{".2", u3_cwb_roll, c3y}, {}}; -static u3e_harm _mood__hoon_skim_a[] = {{".2", u3_cwb_skim, c3y}, {}}; -static u3e_harm _mood__hoon_skip_a[] = {{".2", u3_cwb_skip, c3y}, {}}; -// static u3e_harm _mood__hoon_scag_a[] = {{".2", u3_cwb_scag, c3y}, {}}; -static u3e_harm _mood__hoon_slag_a[] = {{".2", u3_cwb_slag, c3y}, {}}; -static u3e_harm _mood__hoon_snag_a[] = {{".2", u3_cwb_snag, c3y}, {}}; -// static u3e_harm _mood__hoon_sort_a[] = {{".2", u3_cwb_sort, c3y}, {}}; -static u3e_harm _mood__hoon_turn_a[] = {{".2", u3_cwb_turn, c3y}, {}}; -static u3e_harm _mood__hoon_weld_a[] = {{".2", u3_cwb_weld, c3y}, {}}; +static u3e_harm _mood__hoon_bind_a[] = {{".2", u3wb_bind, c3y}, {}}; +static u3e_harm _mood__hoon_clap_a[] = {{".2", u3wb_clap, c3y}, {}}; +static u3e_harm _mood__hoon_drop_a[] = {{".2", u3wb_drop, c3y}, {}}; +static u3e_harm _mood__hoon_flop_a[] = {{".2", u3wb_flop, c3y}, {}}; +static u3e_harm _mood__hoon_lent_a[] = {{".2", u3wb_lent, c3y}, {}}; +static u3e_harm _mood__hoon_levy_a[] = {{".2", u3wb_levy, c3y}, {}}; +static u3e_harm _mood__hoon_lien_a[] = {{".2", u3wb_lien, c3y}, {}}; +static u3e_harm _mood__hoon_need_a[] = {{".2", u3wb_need, c3y}, {}}; +static u3e_harm _mood__hoon_reel_a[] = {{".2", u3wb_reel, c3y}, {}}; +static u3e_harm _mood__hoon_roll_a[] = {{".2", u3wb_roll, c3y}, {}}; +static u3e_harm _mood__hoon_skim_a[] = {{".2", u3wb_skim, c3y}, {}}; +static u3e_harm _mood__hoon_skip_a[] = {{".2", u3wb_skip, c3y}, {}}; +// static u3e_harm _mood__hoon_scag_a[] = {{".2", u3wb_scag, c3y}, {}}; +static u3e_harm _mood__hoon_slag_a[] = {{".2", u3wb_slag, c3y}, {}}; +static u3e_harm _mood__hoon_snag_a[] = {{".2", u3wb_snag, c3y}, {}}; +// static u3e_harm _mood__hoon_sort_a[] = {{".2", u3wb_sort, c3y}, {}}; +static u3e_harm _mood__hoon_turn_a[] = {{".2", u3wb_turn, c3y}, {}}; +static u3e_harm _mood__hoon_weld_a[] = {{".2", u3wb_weld, c3y}, {}}; -static u3e_harm _mood__hoon_bex_a[] = {{".2", u3_cwc_bex, c3y}, {}}; -static u3e_harm _mood__hoon_can_a[] = {{".2", u3_cwc_can, c3y}, {}}; -static u3e_harm _mood__hoon_cap_a[] = {{".2", u3_cwc_cap, c3y}, {}}; -static u3e_harm _mood__hoon_cat_a[] = {{".2", u3_cwc_cat, c3y}, {}}; -static u3e_harm _mood__hoon_con_a[] = {{".2", u3_cwc_con, c3y}, {}}; -static u3e_harm _mood__hoon_cut_a[] = {{".2", u3_cwc_cut, c3y}, {}}; -static u3e_harm _mood__hoon_dis_a[] = {{".2", u3_cwc_dis, c3y}, {}}; -static u3e_harm _mood__hoon_dor_a[] = {{".2", u3_cwc_dor, c3y}, {}}; -static u3e_harm _mood__hoon_end_a[] = {{".2", u3_cwc_end, c3y}, {}}; -static u3e_harm _mood__hoon_gor_a[] = {{".2", u3_cwc_gor, c3y}, {}}; -static u3e_harm _mood__hoon_hor_a[] = {{".2", u3_cwc_hor, c3y}, {}}; -static u3e_harm _mood__hoon_lsh_a[] = {{".2", u3_cwc_lsh, c3y}, {}}; -static u3e_harm _mood__hoon_mas_a[] = {{".2", u3_cwc_mas, c3y}, {}}; -static u3e_harm _mood__hoon_met_a[] = {{".2", u3_cwc_met, c3y}, {}}; -static u3e_harm _mood__hoon_mix_a[] = {{".2", u3_cwc_mix, c3y}, {}}; -static u3e_harm _mood__hoon_mug_a[] = {{".2", u3_cwc_mug, c3y}, {}}; -static u3e_harm _mood__hoon_peg_a[] = {{".2", u3_cwc_peg, c3y}, {}}; -static u3e_harm _mood__hoon_rap_a[] = {{".2", u3_cwc_rap, c3y}, {}}; -static u3e_harm _mood__hoon_rip_a[] = {{".2", u3_cwc_rip, c3y}, {}}; -static u3e_harm _mood__hoon_rsh_a[] = {{".2", u3_cwc_rsh, c3y}, {}}; -static u3e_harm _mood__hoon_vor_a[] = {{".2", u3_cwc_vor, c3y}, {}}; +static u3e_harm _mood__hoon_bex_a[] = {{".2", u3wc_bex, c3y}, {}}; +static u3e_harm _mood__hoon_can_a[] = {{".2", u3wc_can, c3y}, {}}; +static u3e_harm _mood__hoon_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; +static u3e_harm _mood__hoon_cat_a[] = {{".2", u3wc_cat, c3y}, {}}; +static u3e_harm _mood__hoon_con_a[] = {{".2", u3wc_con, c3y}, {}}; +static u3e_harm _mood__hoon_cut_a[] = {{".2", u3wc_cut, c3y}, {}}; +static u3e_harm _mood__hoon_dis_a[] = {{".2", u3wc_dis, c3y}, {}}; +static u3e_harm _mood__hoon_dor_a[] = {{".2", u3wc_dor, c3y}, {}}; +static u3e_harm _mood__hoon_end_a[] = {{".2", u3wc_end, c3y}, {}}; +static u3e_harm _mood__hoon_gor_a[] = {{".2", u3wc_gor, c3y}, {}}; +static u3e_harm _mood__hoon_hor_a[] = {{".2", u3wc_hor, c3y}, {}}; +static u3e_harm _mood__hoon_lsh_a[] = {{".2", u3wc_lsh, c3y}, {}}; +static u3e_harm _mood__hoon_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; +static u3e_harm _mood__hoon_met_a[] = {{".2", u3wc_met, c3y}, {}}; +static u3e_harm _mood__hoon_mix_a[] = {{".2", u3wc_mix, c3y}, {}}; +static u3e_harm _mood__hoon_mug_a[] = {{".2", u3wc_mug, c3y}, {}}; +static u3e_harm _mood__hoon_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; +static u3e_harm _mood__hoon_rap_a[] = {{".2", u3wc_rap, c3y}, {}}; +static u3e_harm _mood__hoon_rip_a[] = {{".2", u3wc_rip, c3y}, {}}; +static u3e_harm _mood__hoon_rsh_a[] = {{".2", u3wc_rsh, c3y}, {}}; +static u3e_harm _mood__hoon_vor_a[] = {{".2", u3wc_vor, c3y}, {}}; -static u3e_harm _mood__hoon__po_ind_a[] = {{".2", u3_cwcp_ind}, {}}; -static u3e_harm _mood__hoon__po_ins_a[] = {{".2", u3_cwcp_ins}, {}}; -static u3e_harm _mood__hoon__po_tod_a[] = {{".2", u3_cwcp_tod}, {}}; -static u3e_harm _mood__hoon__po_tos_a[] = {{".2", u3_cwcp_tos}, {}}; +static u3e_harm _mood__hoon__po_ind_a[] = {{".2", u3wcp_ind}, {}}; +static u3e_harm _mood__hoon__po_ins_a[] = {{".2", u3wcp_ins}, {}}; +static u3e_harm _mood__hoon__po_tod_a[] = {{".2", u3wcp_tod}, {}}; +static u3e_harm _mood__hoon__po_tos_a[] = {{".2", u3wcp_tos}, {}}; static u3e_core _mood__hoon__po_d[] = { { "ind", _mood__hoon__po_ind_a }, { "ins", _mood__hoon__po_ins_a }, @@ -68,13 +68,13 @@ static u3e_core _mood__hoon__po_d[] = {} }; -static u3e_harm _mood__hoon__by_gas_a[] = {{".2", u3_cwdb_gas, c3y}, {}}; -static u3e_harm _mood__hoon__by_get_a[] = {{".2", u3_cwdb_get, c3y}, {}}; -static u3e_harm _mood__hoon__by_has_a[] = {{".2", u3_cwdb_has, c3y}, {}}; -static u3e_harm _mood__hoon__by_int_a[] = {{".2", u3_cwdb_int, c3y}, {}}; -static u3e_harm _mood__hoon__by_put_a[] = {{".2", u3_cwdb_put, c3y}, {}}; -static u3e_harm _mood__hoon__by_tap_a[] = {{".2", u3_cwdb_tap, c3y}, {}}; -static u3e_harm _mood__hoon__by_uni_a[] = {{".2", u3_cwdb_uni, c3y}, {}}; +static u3e_harm _mood__hoon__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}}; +static u3e_harm _mood__hoon__by_get_a[] = {{".2", u3wdb_get, c3y}, {}}; +static u3e_harm _mood__hoon__by_has_a[] = {{".2", u3wdb_has, c3y}, {}}; +static u3e_harm _mood__hoon__by_int_a[] = {{".2", u3wdb_int, c3y}, {}}; +static u3e_harm _mood__hoon__by_put_a[] = {{".2", u3wdb_put, c3y}, {}}; +static u3e_harm _mood__hoon__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}}; +static u3e_harm _mood__hoon__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}}; static u3e_core _mood__hoon__by_d[] = { { "gas", _mood__hoon__by_gas_a }, { "get", _mood__hoon__by_get_a }, @@ -86,13 +86,13 @@ static u3e_core _mood__hoon__by_d[] = {} }; -static u3e_harm _mood__hoon__in_gas_a[] = {{".2", u3_cwdi_gas}, {}}; -static u3e_harm _mood__hoon__in_has_a[] = {{".2", u3_cwdi_has}, {}}; -static u3e_harm _mood__hoon__in_mer_a[] = {{".2", u3_cwdi_mer}, {}}; -static u3e_harm _mood__hoon__in_int_a[] = {{".2", u3_cwdi_int}, {}}; -static u3e_harm _mood__hoon__in_put_a[] = {{".2", u3_cwdi_put}, {}}; -static u3e_harm _mood__hoon__in_tap_a[] = {{".2", u3_cwdi_tap}, {}}; -static u3e_harm _mood__hoon__in_uni_a[] = {{".2", u3_cwdi_uni}, {}}; +static u3e_harm _mood__hoon__in_gas_a[] = {{".2", u3wdi_gas}, {}}; +static u3e_harm _mood__hoon__in_has_a[] = {{".2", u3wdi_has}, {}}; +static u3e_harm _mood__hoon__in_mer_a[] = {{".2", u3wdi_mer}, {}}; +static u3e_harm _mood__hoon__in_int_a[] = {{".2", u3wdi_int}, {}}; +static u3e_harm _mood__hoon__in_put_a[] = {{".2", u3wdi_put}, {}}; +static u3e_harm _mood__hoon__in_tap_a[] = {{".2", u3wdi_tap}, {}}; +static u3e_harm _mood__hoon__in_uni_a[] = {{".2", u3wdi_uni}, {}}; static u3e_core _mood__hoon__in_d[] = { { "gas", _mood__hoon__in_gas_a }, { "has", _mood__hoon__in_has_a }, @@ -104,107 +104,107 @@ static u3e_core _mood__hoon__in_d[] = {} }; -static u3e_harm _mood__hoon_cue_a[] = {{".2", u3_cwe_cue}, {}}; -static u3e_harm _mood__hoon_jam_a[] = {{".2", u3_cwe_jam}, {}}; -static u3e_harm _mood__hoon_mat_a[] = {{".2", u3_cwe_mat}, {}}; -static u3e_harm _mood__hoon_rub_a[] = {{".2", u3_cwe_rub}, {}}; -static u3e_harm _mood__hoon_lore_a[] = {{".2", u3_cwe_lore}, {}}; -static u3e_harm _mood__hoon_loss_a[] = {{".2", u3_cwe_loss}, {}}; -static u3e_harm _mood__hoon_mink_a[] = {{".2", u3_cwe_mink}, {}}; -static u3e_harm _mood__hoon_mule_a[] = {{".2", u3_cwe_mule}, {}}; -static u3e_harm _mood__hoon_repg_a[] = {{".2", u3_cwe_repg}, {}}; -static u3e_harm _mood__hoon_rexp_a[] = {{".2", u3_cwe_rexp}, {}}; -static u3e_harm _mood__hoon_trip_a[] = {{".2", u3_cwe_trip}, {}}; +static u3e_harm _mood__hoon_cue_a[] = {{".2", u3we_cue}, {}}; +static u3e_harm _mood__hoon_jam_a[] = {{".2", u3we_jam}, {}}; +static u3e_harm _mood__hoon_mat_a[] = {{".2", u3we_mat}, {}}; +static u3e_harm _mood__hoon_rub_a[] = {{".2", u3we_rub}, {}}; +static u3e_harm _mood__hoon_lore_a[] = {{".2", u3we_lore}, {}}; +static u3e_harm _mood__hoon_loss_a[] = {{".2", u3we_loss}, {}}; +static u3e_harm _mood__hoon_mink_a[] = {{".2", u3we_mink}, {}}; +static u3e_harm _mood__hoon_mule_a[] = {{".2", u3we_mule}, {}}; +static u3e_harm _mood__hoon_repg_a[] = {{".2", u3we_repg}, {}}; +static u3e_harm _mood__hoon_rexp_a[] = {{".2", u3we_rexp}, {}}; +static u3e_harm _mood__hoon_trip_a[] = {{".2", u3we_trip}, {}}; -static u3e_harm _mood__hoon__aesc_en_a[] = {{".2", u3_cwea_en}, {}}; -static u3e_harm _mood__hoon__aesc_de_a[] = {{".2", u3_cwea_en}, {}}; +static u3e_harm _mood__hoon__aesc_en_a[] = {{".2", u3wea_en}, {}}; +static u3e_harm _mood__hoon__aesc_de_a[] = {{".2", u3wea_en}, {}}; static u3e_core _mood__hoon__aesc_d[] = { { "en", _mood__hoon__aesc_en_a }, { "de", _mood__hoon__aesc_de_a }, {} }; -static u3e_harm _mood__hoon__bend_fun_a[] = {{".2", u3_cwe_bend_fun}, {}}; +static u3e_harm _mood__hoon__bend_fun_a[] = {{".2", u3we_bend_fun}, {}}; static u3e_core _mood__hoon__bend_d[] = { { "fun", _mood__hoon__bend_fun_a }, {} }; -static u3e_harm _mood__hoon__cold_fun_a[] = {{".2", u3_cwe_cold_fun}, {}}; +static u3e_harm _mood__hoon__cold_fun_a[] = {{".2", u3we_cold_fun}, {}}; static u3e_core _mood__hoon__cold_d[] = { { "fun", _mood__hoon__cold_fun_a }, {} }; -static u3e_harm _mood__hoon__cook_fun_a[] = {{".2", u3_cwe_cook_fun}, {}}; +static u3e_harm _mood__hoon__cook_fun_a[] = {{".2", u3we_cook_fun}, {}}; static u3e_core _mood__hoon__cook_d[] = { { "fun", _mood__hoon__cook_fun_a }, {} }; -static u3e_harm _mood__hoon__comp_fun_a[] = {{".2", u3_cwe_comp_fun}, {}}; +static u3e_harm _mood__hoon__comp_fun_a[] = {{".2", u3we_comp_fun}, {}}; static u3e_core _mood__hoon__comp_d[] = { { "fun", _mood__hoon__comp_fun_a }, {} }; -static u3e_harm _mood__hoon__easy_fun_a[] = {{".2", u3_cwe_easy_fun}, {}}; +static u3e_harm _mood__hoon__easy_fun_a[] = {{".2", u3we_easy_fun}, {}}; static u3e_core _mood__hoon__easy_d[] = { { "fun", _mood__hoon__easy_fun_a }, {} }; -static u3e_harm _mood__hoon__glue_fun_a[] = {{".2", u3_cwe_glue_fun}, {}}; +static u3e_harm _mood__hoon__glue_fun_a[] = {{".2", u3we_glue_fun}, {}}; static u3e_core _mood__hoon__glue_d[] = { { "fun", _mood__hoon__glue_fun_a }, {} }; -static u3e_harm _mood__hoon__here_fun_a[] = {{".2", u3_cwe_here_fun}, {}}; +static u3e_harm _mood__hoon__here_fun_a[] = {{".2", u3we_here_fun}, {}}; static u3e_core _mood__hoon__here_d[] = { { "fun", _mood__hoon__here_fun_a }, {} }; -static u3e_harm _mood__hoon__just_fun_a[] = {{".2", u3_cwe_just_fun}, {}}; +static u3e_harm _mood__hoon__just_fun_a[] = {{".2", u3we_just_fun}, {}}; static u3e_core _mood__hoon__just_d[] = { { "fun", _mood__hoon__just_fun_a }, {} }; -static u3e_harm _mood__hoon__mask_fun_a[] = {{".2", u3_cwe_mask_fun}, {}}; +static u3e_harm _mood__hoon__mask_fun_a[] = {{".2", u3we_mask_fun}, {}}; static u3e_core _mood__hoon__mask_d[] = { { "fun", _mood__hoon__mask_fun_a }, {} }; -static u3e_harm _mood__hoon__shim_fun_a[] = {{".2", u3_cwe_shim_fun}, {}}; +static u3e_harm _mood__hoon__shim_fun_a[] = {{".2", u3we_shim_fun}, {}}; static u3e_core _mood__hoon__shim_d[] = { { "fun", _mood__hoon__shim_fun_a }, {} }; -static u3e_harm _mood__hoon__stag_fun_a[] = {{".2", u3_cwe_stag_fun}, {}}; +static u3e_harm _mood__hoon__stag_fun_a[] = {{".2", u3we_stag_fun}, {}}; static u3e_core _mood__hoon__stag_d[] = { { "fun", _mood__hoon__stag_fun_a }, {} }; -static u3e_harm _mood__hoon__stew_fun_a[] = {{".2", u3_cwe_stew_fun}, {}}; +static u3e_harm _mood__hoon__stew_fun_a[] = {{".2", u3we_stew_fun}, {}}; static u3e_core _mood__hoon__stew_d[] = { { "fun", _mood__hoon__stew_fun_a }, {} }; -static u3e_harm _mood__hoon__stir_fun_a[] = {{".2", u3_cwe_stir_fun}, {}}; +static u3e_harm _mood__hoon__stir_fun_a[] = {{".2", u3we_stir_fun}, {}}; static u3e_core _mood__hoon__stir_d[] = { { "fun", _mood__hoon__stir_fun_a }, {} }; -static u3e_harm _mood__hoon__og_raw_a[] = {{".2", u3_cweo_raw}, {}}; +static u3e_harm _mood__hoon__og_raw_a[] = {{".2", u3weo_raw}, {}}; static u3e_core _mood__hoon__og_d[] = { { "raw", _mood__hoon__og_raw_a }, {} }; -static u3e_harm _mood__hoon__rd_sun_a[] = {{".2", u3_cwer_sun}, {}}; -static u3e_harm _mood__hoon__rd_mul_a[] = {{".2", u3_cwer_mul}, {}}; -static u3e_harm _mood__hoon__rd_div_a[] = {{".2", u3_cwer_div}, {}}; -static u3e_harm _mood__hoon__rd_add_a[] = {{".2", u3_cwer_add}, {}}; -static u3e_harm _mood__hoon__rd_sub_a[] = {{".2", u3_cwer_sub}, {}}; -static u3e_harm _mood__hoon__rd_lte_a[] = {{".2", u3_cwer_lte}, {}}; -static u3e_harm _mood__hoon__rd_lth_a[] = {{".2", u3_cwer_lth}, {}}; -static u3e_harm _mood__hoon__rd_gte_a[] = {{".2", u3_cwer_gte}, {}}; -static u3e_harm _mood__hoon__rd_gth_a[] = {{".2", u3_cwer_gth}, {}}; +static u3e_harm _mood__hoon__rd_sun_a[] = {{".2", u3wer_sun}, {}}; +static u3e_harm _mood__hoon__rd_mul_a[] = {{".2", u3wer_mul}, {}}; +static u3e_harm _mood__hoon__rd_div_a[] = {{".2", u3wer_div}, {}}; +static u3e_harm _mood__hoon__rd_add_a[] = {{".2", u3wer_add}, {}}; +static u3e_harm _mood__hoon__rd_sub_a[] = {{".2", u3wer_sub}, {}}; +static u3e_harm _mood__hoon__rd_lte_a[] = {{".2", u3wer_lte}, {}}; +static u3e_harm _mood__hoon__rd_lth_a[] = {{".2", u3wer_lth}, {}}; +static u3e_harm _mood__hoon__rd_gte_a[] = {{".2", u3wer_gte}, {}}; +static u3e_harm _mood__hoon__rd_gth_a[] = {{".2", u3wer_gth}, {}}; static u3e_core _mood__hoon__rd_d[] = { { "sun", _mood__hoon__rd_sun_a }, { "mul", _mood__hoon__rd_mul_a }, @@ -218,9 +218,9 @@ static u3e_core _mood__hoon__rd_d[] = {} }; -static u3e_harm _mood__hoon__coed__ed_puck_a[] = {{".2", u3_cwee_puck}, {}}; -static u3e_harm _mood__hoon__coed__ed_sign_a[] = {{".2", u3_cwee_sign}, {}}; -static u3e_harm _mood__hoon__coed__ed_veri_a[] = {{".2", u3_cwee_veri}, {}}; +static u3e_harm _mood__hoon__coed__ed_puck_a[] = {{".2", u3wee_puck}, {}}; +static u3e_harm _mood__hoon__coed__ed_sign_a[] = {{".2", u3wee_sign}, {}}; +static u3e_harm _mood__hoon__coed__ed_veri_a[] = {{".2", u3wee_veri}, {}}; static u3e_core _mood__hoon__coed__ed_d[] = { { "sign", _mood__hoon__coed__ed_sign_a }, { "puck", _mood__hoon__coed__ed_puck_a }, @@ -232,55 +232,55 @@ static u3e_core _mood__hoon__coed_d[] = {} }; -static u3e_harm _mood__hoon_pfix_a[] = {{".2", u3_cwe_pfix}, {}}; -static u3e_harm _mood__hoon_plug_a[] = {{".2", u3_cwe_plug}, {}}; -static u3e_harm _mood__hoon_pose_a[] = {{".2", u3_cwe_pose}, {}}; -static u3e_harm _mood__hoon_sfix_a[] = {{".2", u3_cwe_sfix}, {}}; -static u3e_harm _mood__hoon_shax_a[] = {{".2", u3_cwe_shax}, {}}; -static u3e_harm _mood__hoon_shas_a[] = {{".2", u3_cwe_shas}, {}}; -static u3e_harm _mood__hoon_shal_a[] = {{".2", u3_cwe_shal}, {}}; +static u3e_harm _mood__hoon_pfix_a[] = {{".2", u3we_pfix}, {}}; +static u3e_harm _mood__hoon_plug_a[] = {{".2", u3we_plug}, {}}; +static u3e_harm _mood__hoon_pose_a[] = {{".2", u3we_pose}, {}}; +static u3e_harm _mood__hoon_sfix_a[] = {{".2", u3we_sfix}, {}}; +static u3e_harm _mood__hoon_shax_a[] = {{".2", u3we_shax}, {}}; +static u3e_harm _mood__hoon_shas_a[] = {{".2", u3we_shas}, {}}; +static u3e_harm _mood__hoon_shal_a[] = {{".2", u3we_shal}, {}}; -static u3e_harm _mood__hoon_bull_a[] = {{".2", u3_cwf_bull}, {}}; -static u3e_harm _mood__hoon_cell_a[] = {{".2", u3_cwf_cell}, {}}; -static u3e_harm _mood__hoon_comb_a[] = {{".2", u3_cwf_comb}, {}}; -static u3e_harm _mood__hoon_cons_a[] = {{".2", u3_cwf_cons}, {}}; -static u3e_harm _mood__hoon_core_a[] = {{".2", u3_cwf_core}, {}}; -static u3e_harm _mood__hoon_cube_a[] = {{".2", u3_cwf_cube}, {}}; -static u3e_harm _mood__hoon_face_a[] = {{".2", u3_cwf_face}, {}}; -static u3e_harm _mood__hoon_fitz_a[] = {{".2", u3_cwf_fitz}, {}}; -static u3e_harm _mood__hoon_flan_a[] = {{".2", u3_cwf_flan}, {}}; -static u3e_harm _mood__hoon_flay_a[] = {{".2", u3_cwf_flay}, {}}; -static u3e_harm _mood__hoon_flip_a[] = {{".2", u3_cwf_flip}, {}}; -static u3e_harm _mood__hoon_flor_a[] = {{".2", u3_cwf_flor}, {}}; -static u3e_harm _mood__hoon_fork_a[] = {{".2", u3_cwf_fork}, {}}; -static u3e_harm _mood__hoon_hike_a[] = {{".2", u3_cwf_hike}, {}}; -static u3e_harm _mood__hoon_look_a[] = {{".2", u3_cwf_look}, {}}; +static u3e_harm _mood__hoon_bull_a[] = {{".2", u3wf_bull}, {}}; +static u3e_harm _mood__hoon_cell_a[] = {{".2", u3wf_cell}, {}}; +static u3e_harm _mood__hoon_comb_a[] = {{".2", u3wf_comb}, {}}; +static u3e_harm _mood__hoon_cons_a[] = {{".2", u3wf_cons}, {}}; +static u3e_harm _mood__hoon_core_a[] = {{".2", u3wf_core}, {}}; +static u3e_harm _mood__hoon_cube_a[] = {{".2", u3wf_cube}, {}}; +static u3e_harm _mood__hoon_face_a[] = {{".2", u3wf_face}, {}}; +static u3e_harm _mood__hoon_fitz_a[] = {{".2", u3wf_fitz}, {}}; +static u3e_harm _mood__hoon_flan_a[] = {{".2", u3wf_flan}, {}}; +static u3e_harm _mood__hoon_flay_a[] = {{".2", u3wf_flay}, {}}; +static u3e_harm _mood__hoon_flip_a[] = {{".2", u3wf_flip}, {}}; +static u3e_harm _mood__hoon_flor_a[] = {{".2", u3wf_flor}, {}}; +static u3e_harm _mood__hoon_fork_a[] = {{".2", u3wf_fork}, {}}; +static u3e_harm _mood__hoon_hike_a[] = {{".2", u3wf_hike}, {}}; +static u3e_harm _mood__hoon_look_a[] = {{".2", u3wf_look}, {}}; -static u3e_harm _mood__hoon__ut_busk_a[] = {{".2", u3_cwfu_busk}, {}}; -static u3e_harm _mood__hoon__ut_bust_a[] = {{".2", u3_cwfu_bust}, {}}; -static u3e_harm _mood__hoon__ut_conk_a[] = {{".2", u3_cwfu_conk}, {}}; -static u3e_harm _mood__hoon__ut_crop_a[] = {{".2", u3_cwfu_crop}, {}}; -static u3e_harm _mood__hoon__ut_cull_a[] = {{".2", u3_cwfu_cull}, {}}; -static u3e_harm _mood__hoon__ut_find_a[] = {{".2", u3_cwfu_find}, {}}; -static u3e_harm _mood__hoon__ut_fino_a[] = {{".2", u3_cwfu_fino}, {}}; -static u3e_harm _mood__hoon__ut_fink_a[] = {{".2", u3_cwfu_fink}, {}}; -static u3e_harm _mood__hoon__ut_fire_a[] = {{".2", u3_cwfu_fire}, {}}; -static u3e_harm _mood__hoon__ut_firm_a[] = {{".2", u3_cwfu_firm}, {}}; -static u3e_harm _mood__hoon__ut_fish_a[] = {{".2", u3_cwfu_fish}, {}}; -static u3e_harm _mood__hoon__ut_fuse_a[] = {{".2", u3_cwfu_fuse}, {}}; -static u3e_harm _mood__hoon__ut_heal_a[] = {{".2", u3_cwfu_heal}, {}}; -static u3e_harm _mood__hoon__ut_mint_a[] = {{".2", u3_cwfu_mint}, {}}; -static u3e_harm _mood__hoon__ut_mull_a[] = {{".2", u3_cwfu_mull}, {}}; -static u3e_harm _mood__hoon__ut_nest_a[] = {{".2", u3_cwfu_nest}, {}}; -static u3e_harm _mood__hoon__ut_park_a[] = {{".2", u3_cwfu_park}, {}}; -static u3e_harm _mood__hoon__ut_peek_a[] = {{".2", u3_cwfu_peek}, {}}; -static u3e_harm _mood__hoon__ut_play_a[] = {{".2", u3_cwfu_play}, {}}; -static u3e_harm _mood__hoon__ut_rest_a[] = {{".2", u3_cwfu_rest}, {}}; -static u3e_harm _mood__hoon__ut_seek_a[] = {{".2", u3_cwfu_seek}, {}}; -static u3e_harm _mood__hoon__ut_seep_a[] = {{".2", u3_cwfu_seep}, {}}; -static u3e_harm _mood__hoon__ut_snub_a[] = {{".2", u3_cwfu_snub}, {}}; -static u3e_harm _mood__hoon__ut_tock_a[] = {{".2", u3_cwfu_tock}, {}}; -static u3e_harm _mood__hoon__ut_wrap_a[] = {{".2", u3_cwfu_wrap}, {}}; +static u3e_harm _mood__hoon__ut_busk_a[] = {{".2", u3wfu_busk}, {}}; +static u3e_harm _mood__hoon__ut_bust_a[] = {{".2", u3wfu_bust}, {}}; +static u3e_harm _mood__hoon__ut_conk_a[] = {{".2", u3wfu_conk}, {}}; +static u3e_harm _mood__hoon__ut_crop_a[] = {{".2", u3wfu_crop}, {}}; +static u3e_harm _mood__hoon__ut_cull_a[] = {{".2", u3wfu_cull}, {}}; +static u3e_harm _mood__hoon__ut_find_a[] = {{".2", u3wfu_find}, {}}; +static u3e_harm _mood__hoon__ut_fino_a[] = {{".2", u3wfu_fino}, {}}; +static u3e_harm _mood__hoon__ut_fink_a[] = {{".2", u3wfu_fink}, {}}; +static u3e_harm _mood__hoon__ut_fire_a[] = {{".2", u3wfu_fire}, {}}; +static u3e_harm _mood__hoon__ut_firm_a[] = {{".2", u3wfu_firm}, {}}; +static u3e_harm _mood__hoon__ut_fish_a[] = {{".2", u3wfu_fish}, {}}; +static u3e_harm _mood__hoon__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}}; +static u3e_harm _mood__hoon__ut_heal_a[] = {{".2", u3wfu_heal}, {}}; +static u3e_harm _mood__hoon__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; +static u3e_harm _mood__hoon__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; +static u3e_harm _mood__hoon__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; +static u3e_harm _mood__hoon__ut_park_a[] = {{".2", u3wfu_park}, {}}; +static u3e_harm _mood__hoon__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; +static u3e_harm _mood__hoon__ut_play_a[] = {{".2", u3wfu_play}, {}}; +static u3e_harm _mood__hoon__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; +static u3e_harm _mood__hoon__ut_seek_a[] = {{".2", u3wfu_seek}, {}}; +static u3e_harm _mood__hoon__ut_seep_a[] = {{".2", u3wfu_seep}, {}}; +static u3e_harm _mood__hoon__ut_snub_a[] = {{".2", u3wfu_snub}, {}}; +static u3e_harm _mood__hoon__ut_tock_a[] = {{".2", u3wfu_tock}, {}}; +static u3e_harm _mood__hoon__ut_wrap_a[] = {{".2", u3wfu_wrap}, {}}; static u3e_core _mood__hoon__ut_d[] = { @@ -312,23 +312,23 @@ static u3e_core _mood__hoon__ut_d[] = {} }; static u3e_harm _mood__hoon__ut_a[] = - { {"burn", u3_cwfu_burn}, - {"repo", u3_cwfu_repo}, + { {"burn", u3wfu_burn}, + {"repo", u3wfu_repo}, {} }; static u3e_harm _mood__hoon__ap_a[] = - { // {"hack", u3_cwfp_open}, - // {"late", u3_cwfp_open}, - {"open", u3_cwfp_open}, - {"rake", u3_cwfp_rake}, + { // {"hack", u3wfp_open}, + // {"late", u3wfp_open}, + {"open", u3wfp_open}, + {"rake", u3wfp_rake}, {} }; #if 0 static u3e_harm _mood__hoon__al_a[] = - { {"bunt", u3_cwfl_bunt}, - {"whip", u3_cwfl_whip}, + { {"bunt", u3wfl_bunt}, + {"whip", u3wfl_whip}, {} }; #endif diff --git a/v/cttp.c b/v/cttp.c index 72df4c4dc7..b121e45b70 100644 --- a/v/cttp.c +++ b/v/cttp.c @@ -303,7 +303,7 @@ static c3_w _cttp_mcut_host(c3_c* buf_c, c3_w len_w, u3_noun hot) { if ( c3y == u3h(hot) ) { - len_w = _cttp_mcut_path(buf_c, len_w, '.', u3_ckb_flop(u3k(u3t(hot)))); + len_w = _cttp_mcut_path(buf_c, len_w, '.', u3kb_flop(u3k(u3t(hot)))); } else { c3_w ipf_w = u3r_word(0, u3t(hot)); diff --git a/v/raft.c b/v/raft.c index 7d7ad68e57..36b8c79c58 100644 --- a/v/raft.c +++ b/v/raft.c @@ -1495,7 +1495,7 @@ _raft_lame(u3_noun ovo, u3_noun why, u3_noun tan) // with a crypto failure, just drop the packet. // if ( (c3__exit == why) && (c3__hear == u3h(u3t(ovo))) ) { - u3_lo_punt(2, u3_ckb_flop(u3k(tan))); + u3_lo_punt(2, u3kb_flop(u3k(tan))); bov = u3nc(u3k(u3h(ovo)), u3nc(c3__hole, u3k(u3t(u3t(ovo))))); u3z(why); @@ -1530,7 +1530,7 @@ _raft_lame(u3_noun ovo, u3_noun why, u3_noun tan) u3z(vab); uL(fprintf(uH, "crude: all delivery failed!\n")); - u3_lo_punt(2, u3_ckb_flop(u3k(tan))); + u3_lo_punt(2, u3kb_flop(u3k(tan))); c3_assert(!"crud"); } } @@ -1733,7 +1733,7 @@ u3_raft_work(void) if ( 0 == u3Z->lug_u.len_d ) { return; } - ova = u3_ckb_flop(u3A->roe); + ova = u3kb_flop(u3A->roe); u3A->roe = u3_nul; while ( u3_nul != ova ) { @@ -1754,7 +1754,7 @@ u3_raft_work(void) u3_noun ron; u3_noun ovo; - ova = u3_ckb_flop(u3A->roe); + ova = u3kb_flop(u3A->roe); u3A->roe = u3_nul; while ( u3_nul != ova ) { @@ -1772,7 +1772,7 @@ u3_raft_work(void) egg_u->did = c3n; egg_u->vir = vir; - ron = u3_cke_jam(u3nc(u3k(u3A->now), ovo)); + ron = u3ke_jam(u3nc(u3k(u3A->now), ovo)); c3_assert(u3A->key); ron = u3dc("en:crua", u3k(u3A->key), ron); diff --git a/v/sist.c b/v/sist.c index c65aacbc45..f2b95d308b 100644 --- a/v/sist.c +++ b/v/sist.c @@ -221,7 +221,7 @@ _sist_suck(u3_noun ovo, u3_noun gon) free(hed_c); } - u3_lo_punt(2, u3_ckb_flop(u3k(u3t(gon)))); + u3_lo_punt(2, u3kb_flop(u3k(u3t(gon)))); // u3_loom_exit(); u3_lo_exit(); @@ -1041,7 +1041,7 @@ _sist_rest() u3z(dep); } } - roe = u3nc(u3_cke_cue(ron), roe); + roe = u3nc(u3ke_cue(ron), roe); } u3A->ent_d = c3_max(las_d + 1ULL, old_d); } diff --git a/v/term.c b/v/term.c index 55a40fb610..269fe53f1d 100644 --- a/v/term.c +++ b/v/term.c @@ -1050,7 +1050,7 @@ _term_ef_blit(u3_utty* uty_u, case c3__lin: { u3_noun lin = u3t(blt); - c3_w len_w = u3_ckb_lent(u3k(lin)); + c3_w len_w = u3kb_lent(u3k(lin)); c3_w* lin_w = c3_malloc(4 * len_w); { @@ -1082,7 +1082,7 @@ _term_ef_blit(u3_utty* uty_u, u3_noun jam; fprintf(stderr, "jamming...\r\n"); - jam = u3_cke_jam(pib); + jam = u3ke_jam(pib); fprintf(stderr, "jammed.\r\n"); _term_it_save(u3k(u3h(u3t(blt))), jam); diff --git a/v/time.c b/v/time.c index 69d69705ec..15d455b6e8 100644 --- a/v/time.c +++ b/v/time.c @@ -147,12 +147,12 @@ u3_time_out_ts(struct timespec* tim_ts, u3_noun now) c3_d u3_time_gap_ms(u3_noun now, u3_noun wen) { - if ( c3n == u3_cka_gth(u3k(wen), u3k(now)) ) { + if ( c3n == u3ka_gth(u3k(wen), u3k(now)) ) { u3z(wen); u3z(now); return 0ULL; } else { - u3_noun dif = u3_cka_sub(wen, now); + u3_noun dif = u3ka_sub(wen, now); c3_d fsc_d = u3r_chub(0, dif); c3_d sec_d = u3r_chub(1, dif); diff --git a/v/unix.c b/v/unix.c index 21d67fb002..580c08cbdc 100644 --- a/v/unix.c +++ b/v/unix.c @@ -673,7 +673,7 @@ _unix_file_load(u3_ufil* fil_u) if ( (0 == raw) || ('^' != fil_u->dot_c[1]) ) { return raw; } - else return u3_cke_cue(raw); + else return u3ke_cue(raw); } @@ -737,7 +737,7 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) { u3_weak ole; if ( c3n == u3du(wib) ) { - ole = u3_ckdb_get(u3k(pam), u3k(wib)); + ole = u3kdb_get(u3k(pam), u3k(wib)); if ( u3_none == ole ) { ole = u3do("cosh", u3nt(0, woz, u3_nul)); @@ -749,24 +749,24 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) ole = elo; } - pam = u3_ckdb_put(pam, wib, ole); + pam = u3kdb_put(pam, wib, ole); } else { u3_noun fid = u3h(wib); u3_noun har = u3t(wib); - ole = u3_ckdb_get(u3k(pam), u3k(fid)); + ole = u3kdb_get(u3k(pam), u3k(fid)); if ( u3_none == ole ) { ole = u3nt - (0, u3_nul, u3_ckdb_put(u3_nul, + (0, u3_nul, u3kdb_put(u3_nul, u3k(har), u3do("cosh", u3nt(0, woz, u3_nul)))); ole = u3do("cosh", ole); } else { u3_noun roo = u3t(u3t(ole)); - u3_weak tup = u3_ckdb_get(u3k(roo), u3k(har)); + u3_weak tup = u3kdb_get(u3k(roo), u3k(har)); u3_noun oor, elo; if ( u3_none == tup ) { @@ -779,12 +779,12 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) tup = upt; } - oor = u3_ckdb_put(u3k(roo), u3k(har), tup); + oor = u3kdb_put(u3k(roo), u3k(har), tup); elo = u3do("cosh", u3nt(0, u3k(u3h(u3t(ole))), oor)); u3z(ole); ole = elo; } - pam = u3_ckdb_put(pam, u3k(fid), ole); + pam = u3kdb_put(pam, u3k(fid), ole); u3z(wib); } return pam; @@ -805,7 +805,7 @@ _unix_dir_ankh(u3_udir* dir_u) // uL(fprintf(uH, "dir %s\n", u3r_string(pre))); if ( 0 != u3h(ank) ) { - pam = u3_ckdb_put(pam, pre, ank); + pam = u3kdb_put(pam, pre, ank); } } @@ -1178,7 +1178,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u, } if ( c3y == u3du(god) ) { - oat = u3_cke_jam(god); + oat = u3ke_jam(god); pax_c = pux_c; free(pox_c); } else { oat = god; diff --git a/v/walk.c b/v/walk.c index 5a3413f391..c432fc6c67 100644 --- a/v/walk.c +++ b/v/walk.c @@ -199,18 +199,18 @@ _walk_in(const c3_c* dir_c, c3_w len_w) { u3_noun nam = u3i_string(nam_c); u3_noun ext = u3i_string(ext_c); - u3_noun get = u3_ckdb_get(u3k(map), u3k(nam)); + u3_noun get = u3kdb_get(u3k(map), u3k(nam)); u3_noun dat = u3_walk_load(pat_c); u3_noun hax; if ( !strcmp("noun", ext_c) ) { - dat = u3_cke_cue(dat); + dat = u3ke_cue(dat); } hax = u3do("sham", u3k(dat)); if ( u3_none == get ) { get = u3_nul; } - get = u3_ckdb_put(get, ext, u3nt(c3y, hax, dat)); - map = u3_ckdb_put(map, nam, u3nc(c3n, get)); + get = u3kdb_put(get, ext, u3nt(c3y, hax, dat)); + map = u3kdb_put(map, nam, u3nc(c3n, get)); } free(nam_c); free(ext_c); @@ -219,7 +219,7 @@ _walk_in(const c3_c* dir_c, c3_w len_w) u3_noun dir = _walk_in(pat_c, lef_w); if ( u3_nul != dir ) { - map = u3_ckdb_put + map = u3kdb_put (map, u3i_string(fil_c), u3nc(c3n, dir)); } else u3z(tim); From 6e9e1443a52dd100547c85e77c0d78f7bd445f33 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 6 Nov 2014 11:29:53 -0800 Subject: [PATCH 13/14] Relocation. --- Makefile | 28 ++++++++++++++-------------- Spec/u3.md | 34 ++++++++++++++++++---------------- i/all.h | 26 +++++++++++++------------- i/{g => n}/a.h | 0 i/{g => n}/e.h | 0 i/{g => n}/h.h | 0 i/{g => n}/i.h | 0 i/{g => n}/j.h | 0 i/{g => n}/m.h | 0 i/{g => n}/n.h | 0 i/{g => n}/r.h | 0 i/{g => n}/t.h | 0 i/{g => n}/u.h | 0 i/{g => n}/v.h | 0 i/{g => n}/x.h | 0 i/{g => n}/z.h | 0 {g => n}/a.c | 0 {g => n}/e.c | 0 {g => n}/h.c | 0 {g => n}/i.c | 0 {g => n}/j.c | 0 {g => n}/m.c | 0 {g => n}/n.c | 0 {g => n}/r.c | 0 {g => n}/t.c | 0 {g => n}/v.c | 0 {g => n}/x.c | 0 {g => n}/z.c | 0 28 files changed, 45 insertions(+), 43 deletions(-) rename i/{g => n}/a.h (100%) rename i/{g => n}/e.h (100%) rename i/{g => n}/h.h (100%) rename i/{g => n}/i.h (100%) rename i/{g => n}/j.h (100%) rename i/{g => n}/m.h (100%) rename i/{g => n}/n.h (100%) rename i/{g => n}/r.h (100%) rename i/{g => n}/t.h (100%) rename i/{g => n}/u.h (100%) rename i/{g => n}/v.h (100%) rename i/{g => n}/x.h (100%) rename i/{g => n}/z.h (100%) rename {g => n}/a.c (100%) rename {g => n}/e.c (100%) rename {g => n}/h.c (100%) rename {g => n}/i.c (100%) rename {g => n}/j.c (100%) rename {g => n}/m.c (100%) rename {g => n}/n.c (100%) rename {g => n}/r.c (100%) rename {g => n}/t.c (100%) rename {g => n}/v.c (100%) rename {g => n}/x.c (100%) rename {g => n}/z.c (100%) diff --git a/Makefile b/Makefile index 3a44d0fa1f..df1ff2b9b8 100644 --- a/Makefile +++ b/Makefile @@ -78,19 +78,19 @@ CWFLAGS=-Wall .c.o: $(CC) -c $(CWFLAGS) $(CFLAGS) -o $@ $< -G_OFILES=\ - g/a.o \ - g/e.o \ - g/h.o \ - g/i.o \ - g/j.o \ - g/m.o \ - g/n.o \ - g/r.o \ - g/t.o \ - g/x.o \ - g/v.o \ - g/z.o +N_OFILES=\ + n/a.o \ + n/e.o \ + n/h.o \ + n/i.o \ + n/j.o \ + n/m.o \ + n/n.o \ + n/r.o \ + n/t.o \ + n/x.o \ + n/v.o \ + n/z.o J_1_OFILES=\ j/1/add.o \ @@ -246,7 +246,7 @@ J_OFILES=\ $(J_6_OFILES_UT) \ j/dash.o -BASE_OFILES=$(G_OFILES) $(J_OFILES) +BASE_OFILES=$(N_OFILES) $(J_OFILES) CRE2_OFILES=\ outside/cre2/src/src/cre2.o diff --git a/Spec/u3.md b/Spec/u3.md index 44c54cea9d..9543ec94d7 100644 --- a/Spec/u3.md +++ b/Spec/u3.md @@ -139,23 +139,25 @@ with nouns is in `u3`. ### u3: a map of the system There are two kinds of symbols in `u3`: regular and irregular. -They all start with `u3`, but the regular names follow this -pattern: +Regular symbols follow this pattern: - prefix purpose header - --------------------------------------------------- - u3a_ allocation - u3e_ persistence - u3h_ hashtables - u3i_ noun construction - u3j_ jet control - u3m_ system management - u3n_ nock computation - u3r_ noun access (error returns) - u3t_ profiling - u3v_ arvo - u3x_ noun access (error crashes) - u3z_ memoization + prefix purpose .h .c + ------------------------------------------------------- + u3a_ allocation i/n/a.h n/a.c + u3e_ persistence i/n/e.h n/e.c + u3h_ hashtables i/n/h.h n/h.c + u3i_ noun construction i/n/i.h n/i.c + u3j_ jet control i/n/j.h n/j.c + u3m_ system management i/n/m.h n/m.c + u3n_ nock computation i/n/n.h n/n.c + u3r_ noun access (error returns) i/n/r.h n/r.c + u3t_ profiling i/n/t.h n/t.c + u3v_ arvo i/n/v.h n/v.c + u3x_ noun access (error crashes) i/n/x.h n/x.c + u3z_ memoization i/n/z.h n/z.c + u3k[a-g] jets (transfer, C args) i/j/k.h j/[a-g]/*.c + u3q[a-g] jets (retain, C args) i/j/q.h j/[a-g]/*.c + u3w[a-g] jets (retain, nock core) i/j/w.h j/[a-g]/*.c u3 deals with reference-counted, immutable, acyclic nouns. 90% diff --git a/i/all.h b/i/all.h index 38dc466f11..8d2ec6e2e1 100644 --- a/i/all.h +++ b/i/all.h @@ -11,20 +11,20 @@ /** u3: noun environment. **/ -# include "g/u.h" // general u3 +# include "n/u.h" // general u3 -# include "g/a.h" // u3a: allocation -# include "g/e.h" // u3e: persistence -# include "g/h.h" // u3h: hashtables -# include "g/i.h" // u3i: noun construction -# include "g/j.h" // u3j: jet control -# include "g/m.h" // u3m: master state -# include "g/n.h" // u3n: nock execution -# include "g/r.h" // u3r: noun access (error returns) -# include "g/t.h" // u3t: profiling / tracing -# include "g/x.h" // u3x: noun access (error crashes) -# include "g/v.h" // u3v: arvo kernel -# include "g/z.h" // u3z: memoization +# include "n/a.h" // u3a: allocation +# include "n/e.h" // u3e: persistence +# include "n/h.h" // u3h: hashtables +# include "n/i.h" // u3i: noun construction +# include "n/j.h" // u3j: jet control +# include "n/m.h" // u3m: master state +# include "n/n.h" // u3n: nock execution +# include "n/r.h" // u3r: noun access (error returns) +# include "n/t.h" // u3t: profiling / tracing +# include "n/x.h" // u3x: noun access (error crashes) +# include "n/v.h" // u3v: arvo kernel +# include "n/z.h" // u3z: memoization # include "j/k.h" // u3k: jets (transfer, args) # include "j/q.h" // u3q: jets (retain, args) diff --git a/i/g/a.h b/i/n/a.h similarity index 100% rename from i/g/a.h rename to i/n/a.h diff --git a/i/g/e.h b/i/n/e.h similarity index 100% rename from i/g/e.h rename to i/n/e.h diff --git a/i/g/h.h b/i/n/h.h similarity index 100% rename from i/g/h.h rename to i/n/h.h diff --git a/i/g/i.h b/i/n/i.h similarity index 100% rename from i/g/i.h rename to i/n/i.h diff --git a/i/g/j.h b/i/n/j.h similarity index 100% rename from i/g/j.h rename to i/n/j.h diff --git a/i/g/m.h b/i/n/m.h similarity index 100% rename from i/g/m.h rename to i/n/m.h diff --git a/i/g/n.h b/i/n/n.h similarity index 100% rename from i/g/n.h rename to i/n/n.h diff --git a/i/g/r.h b/i/n/r.h similarity index 100% rename from i/g/r.h rename to i/n/r.h diff --git a/i/g/t.h b/i/n/t.h similarity index 100% rename from i/g/t.h rename to i/n/t.h diff --git a/i/g/u.h b/i/n/u.h similarity index 100% rename from i/g/u.h rename to i/n/u.h diff --git a/i/g/v.h b/i/n/v.h similarity index 100% rename from i/g/v.h rename to i/n/v.h diff --git a/i/g/x.h b/i/n/x.h similarity index 100% rename from i/g/x.h rename to i/n/x.h diff --git a/i/g/z.h b/i/n/z.h similarity index 100% rename from i/g/z.h rename to i/n/z.h diff --git a/g/a.c b/n/a.c similarity index 100% rename from g/a.c rename to n/a.c diff --git a/g/e.c b/n/e.c similarity index 100% rename from g/e.c rename to n/e.c diff --git a/g/h.c b/n/h.c similarity index 100% rename from g/h.c rename to n/h.c diff --git a/g/i.c b/n/i.c similarity index 100% rename from g/i.c rename to n/i.c diff --git a/g/j.c b/n/j.c similarity index 100% rename from g/j.c rename to n/j.c diff --git a/g/m.c b/n/m.c similarity index 100% rename from g/m.c rename to n/m.c diff --git a/g/n.c b/n/n.c similarity index 100% rename from g/n.c rename to n/n.c diff --git a/g/r.c b/n/r.c similarity index 100% rename from g/r.c rename to n/r.c diff --git a/g/t.c b/n/t.c similarity index 100% rename from g/t.c rename to n/t.c diff --git a/g/v.c b/n/v.c similarity index 100% rename from g/v.c rename to n/v.c diff --git a/g/x.c b/n/x.c similarity index 100% rename from g/x.c rename to n/x.c diff --git a/g/z.c b/n/z.c similarity index 100% rename from g/z.c rename to n/z.c From 8cbbcfd67d874f771f600dc50dc951a02d0ae277 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 6 Nov 2014 11:49:41 -0800 Subject: [PATCH 14/14] More renaming. --- Makefile | 288 +++++++++++++++++++++---------------------- i/j/k.h | 4 +- j/{1 => a}/add.c | 0 j/{1 => a}/dec.c | 0 j/{1 => a}/div.c | 0 j/{1 => a}/gte.c | 0 j/{1 => a}/gth.c | 0 j/{1 => a}/lte.c | 0 j/{1 => a}/lth.c | 0 j/{1 => a}/mod.c | 0 j/{1 => a}/mul.c | 0 j/{1 => a}/sub.c | 0 j/{2 => b}/bind.c | 0 j/{2 => b}/clap.c | 0 j/{2 => b}/drop.c | 0 j/{2 => b}/flop.c | 0 j/{2 => b}/lent.c | 0 j/{2 => b}/levy.c | 0 j/{2 => b}/lien.c | 0 j/{2 => b}/need.c | 0 j/{2 => b}/reel.c | 0 j/{2 => b}/roll.c | 0 j/{2 => b}/scag.c | 0 j/{2 => b}/skim.c | 0 j/{2 => b}/skip.c | 0 j/{2 => b}/slag.c | 0 j/{2 => b}/snag.c | 0 j/{2 => b}/sort.c | 0 j/{2 => b}/turn.c | 0 j/{2 => b}/weld.c | 0 j/{3 => c}/bex.c | 0 j/{3 => c}/can.c | 0 j/{3 => c}/cap.c | 0 j/{3 => c}/cat.c | 0 j/{3 => c}/con.c | 0 j/{3 => c}/cut.c | 0 j/{3 => c}/dis.c | 0 j/{3 => c}/dor.c | 0 j/{3 => c}/end.c | 0 j/{3 => c}/gor.c | 0 j/{3 => c}/hor.c | 0 j/{3 => c}/lsh.c | 0 j/{3 => c}/mas.c | 0 j/{3 => c}/met.c | 0 j/{3 => c}/mix.c | 0 j/{3 => c}/mug.c | 0 j/{3 => c}/peg.c | 0 j/{3 => c}/po.c | 0 j/{3 => c}/rap.c | 0 j/{3 => c}/rip.c | 0 j/{3 => c}/rsh.c | 0 j/{3 => c}/vor.c | 0 j/{4 => d}/by_gas.c | 0 j/{4 => d}/by_get.c | 0 j/{4 => d}/by_has.c | 0 j/{4 => d}/by_int.c | 0 j/{4 => d}/by_put.c | 0 j/{4 => d}/by_uni.c | 0 j/{4 => d}/in_gas.c | 0 j/{4 => d}/in_has.c | 0 j/{4 => d}/in_int.c | 0 j/{4 => d}/in_mer.c | 0 j/{4 => d}/in_put.c | 0 j/{4 => d}/in_tap.c | 0 j/{4 => d}/in_uni.c | 0 j/{5 => e}/aesc.c | 0 j/{5 => e}/cue.c | 0 j/{5 => e}/ed_puck.c | 0 j/{5 => e}/ed_sign.c | 0 j/{5 => e}/ed_veri.c | 0 j/{5 => e}/jam.c | 0 j/{5 => e}/lore.c | 0 j/{5 => e}/loss.c | 0 j/{5 => e}/mat.c | 0 j/{5 => e}/mink.c | 0 j/{5 => e}/mule.c | 0 j/{5 => e}/parse.c | 0 j/{5 => e}/rd.c | 0 j/{5 => e}/repg.c | 0 j/{5 => e}/rexp.c | 0 j/{5 => e}/rub.c | 0 j/{5 => e}/shax.c | 0 j/{5 => e}/tape.c | 0 j/{5 => e}/trip.c | 0 j/{6 => f}/al.c | 0 j/{6 => f}/ap.c | 0 j/{6 => f}/bull.c | 0 j/{6 => f}/cell.c | 0 j/{6 => f}/comb.c | 0 j/{6 => f}/cons.c | 0 j/{6 => f}/core.c | 0 j/{6 => f}/cube.c | 0 j/{6 => f}/face.c | 0 j/{6 => f}/fine.c | 0 j/{6 => f}/fitz.c | 0 j/{6 => f}/flan.c | 0 j/{6 => f}/flay.c | 0 j/{6 => f}/flip.c | 0 j/{6 => f}/flor.c | 0 j/{6 => f}/fork.c | 0 j/{6 => f}/hike.c | 0 j/{6 => f}/look.c | 0 j/{6 => f}/slot.c | 0 j/{6 => f}/type.c | 0 j/{6 => f}/ut.c | 0 j/{6 => f}/ut_burn.c | 0 j/{6 => f}/ut_busk.c | 0 j/{6 => f}/ut_bust.c | 0 j/{6 => f}/ut_conk.c | 0 j/{6 => f}/ut_crop.c | 0 j/{6 => f}/ut_cull.c | 0 j/{6 => f}/ut_find.c | 0 j/{6 => f}/ut_fink.c | 0 j/{6 => f}/ut_fire.c | 0 j/{6 => f}/ut_firm.c | 0 j/{6 => f}/ut_fish.c | 0 j/{6 => f}/ut_fuse.c | 0 j/{6 => f}/ut_gain.c | 0 j/{6 => f}/ut_heal.c | 0 j/{6 => f}/ut_lose.c | 0 j/{6 => f}/ut_mint.c | 0 j/{6 => f}/ut_mull.c | 0 j/{6 => f}/ut_nest.c | 0 j/{6 => f}/ut_park.c | 0 j/{6 => f}/ut_peek.c | 0 j/{6 => f}/ut_play.c | 0 j/{6 => f}/ut_repo.c | 0 j/{6 => f}/ut_rest.c | 0 j/{6 => f}/ut_seek.c | 0 j/{6 => f}/ut_sift.c | 0 j/{6 => f}/ut_swab.c | 0 j/{6 => f}/ut_tack.c | 0 j/{6 => f}/ut_tock.c | 0 j/{6 => f}/ut_wrap.c | 0 j/{dash.c => tree.c} | 0 135 files changed, 146 insertions(+), 146 deletions(-) rename j/{1 => a}/add.c (100%) rename j/{1 => a}/dec.c (100%) rename j/{1 => a}/div.c (100%) rename j/{1 => a}/gte.c (100%) rename j/{1 => a}/gth.c (100%) rename j/{1 => a}/lte.c (100%) rename j/{1 => a}/lth.c (100%) rename j/{1 => a}/mod.c (100%) rename j/{1 => a}/mul.c (100%) rename j/{1 => a}/sub.c (100%) rename j/{2 => b}/bind.c (100%) rename j/{2 => b}/clap.c (100%) rename j/{2 => b}/drop.c (100%) rename j/{2 => b}/flop.c (100%) rename j/{2 => b}/lent.c (100%) rename j/{2 => b}/levy.c (100%) rename j/{2 => b}/lien.c (100%) rename j/{2 => b}/need.c (100%) rename j/{2 => b}/reel.c (100%) rename j/{2 => b}/roll.c (100%) rename j/{2 => b}/scag.c (100%) rename j/{2 => b}/skim.c (100%) rename j/{2 => b}/skip.c (100%) rename j/{2 => b}/slag.c (100%) rename j/{2 => b}/snag.c (100%) rename j/{2 => b}/sort.c (100%) rename j/{2 => b}/turn.c (100%) rename j/{2 => b}/weld.c (100%) rename j/{3 => c}/bex.c (100%) rename j/{3 => c}/can.c (100%) rename j/{3 => c}/cap.c (100%) rename j/{3 => c}/cat.c (100%) rename j/{3 => c}/con.c (100%) rename j/{3 => c}/cut.c (100%) rename j/{3 => c}/dis.c (100%) rename j/{3 => c}/dor.c (100%) rename j/{3 => c}/end.c (100%) rename j/{3 => c}/gor.c (100%) rename j/{3 => c}/hor.c (100%) rename j/{3 => c}/lsh.c (100%) rename j/{3 => c}/mas.c (100%) rename j/{3 => c}/met.c (100%) rename j/{3 => c}/mix.c (100%) rename j/{3 => c}/mug.c (100%) rename j/{3 => c}/peg.c (100%) rename j/{3 => c}/po.c (100%) rename j/{3 => c}/rap.c (100%) rename j/{3 => c}/rip.c (100%) rename j/{3 => c}/rsh.c (100%) rename j/{3 => c}/vor.c (100%) rename j/{4 => d}/by_gas.c (100%) rename j/{4 => d}/by_get.c (100%) rename j/{4 => d}/by_has.c (100%) rename j/{4 => d}/by_int.c (100%) rename j/{4 => d}/by_put.c (100%) rename j/{4 => d}/by_uni.c (100%) rename j/{4 => d}/in_gas.c (100%) rename j/{4 => d}/in_has.c (100%) rename j/{4 => d}/in_int.c (100%) rename j/{4 => d}/in_mer.c (100%) rename j/{4 => d}/in_put.c (100%) rename j/{4 => d}/in_tap.c (100%) rename j/{4 => d}/in_uni.c (100%) rename j/{5 => e}/aesc.c (100%) rename j/{5 => e}/cue.c (100%) rename j/{5 => e}/ed_puck.c (100%) rename j/{5 => e}/ed_sign.c (100%) rename j/{5 => e}/ed_veri.c (100%) rename j/{5 => e}/jam.c (100%) rename j/{5 => e}/lore.c (100%) rename j/{5 => e}/loss.c (100%) rename j/{5 => e}/mat.c (100%) rename j/{5 => e}/mink.c (100%) rename j/{5 => e}/mule.c (100%) rename j/{5 => e}/parse.c (100%) rename j/{5 => e}/rd.c (100%) rename j/{5 => e}/repg.c (100%) rename j/{5 => e}/rexp.c (100%) rename j/{5 => e}/rub.c (100%) rename j/{5 => e}/shax.c (100%) rename j/{5 => e}/tape.c (100%) rename j/{5 => e}/trip.c (100%) rename j/{6 => f}/al.c (100%) rename j/{6 => f}/ap.c (100%) rename j/{6 => f}/bull.c (100%) rename j/{6 => f}/cell.c (100%) rename j/{6 => f}/comb.c (100%) rename j/{6 => f}/cons.c (100%) rename j/{6 => f}/core.c (100%) rename j/{6 => f}/cube.c (100%) rename j/{6 => f}/face.c (100%) rename j/{6 => f}/fine.c (100%) rename j/{6 => f}/fitz.c (100%) rename j/{6 => f}/flan.c (100%) rename j/{6 => f}/flay.c (100%) rename j/{6 => f}/flip.c (100%) rename j/{6 => f}/flor.c (100%) rename j/{6 => f}/fork.c (100%) rename j/{6 => f}/hike.c (100%) rename j/{6 => f}/look.c (100%) rename j/{6 => f}/slot.c (100%) rename j/{6 => f}/type.c (100%) rename j/{6 => f}/ut.c (100%) rename j/{6 => f}/ut_burn.c (100%) rename j/{6 => f}/ut_busk.c (100%) rename j/{6 => f}/ut_bust.c (100%) rename j/{6 => f}/ut_conk.c (100%) rename j/{6 => f}/ut_crop.c (100%) rename j/{6 => f}/ut_cull.c (100%) rename j/{6 => f}/ut_find.c (100%) rename j/{6 => f}/ut_fink.c (100%) rename j/{6 => f}/ut_fire.c (100%) rename j/{6 => f}/ut_firm.c (100%) rename j/{6 => f}/ut_fish.c (100%) rename j/{6 => f}/ut_fuse.c (100%) rename j/{6 => f}/ut_gain.c (100%) rename j/{6 => f}/ut_heal.c (100%) rename j/{6 => f}/ut_lose.c (100%) rename j/{6 => f}/ut_mint.c (100%) rename j/{6 => f}/ut_mull.c (100%) rename j/{6 => f}/ut_nest.c (100%) rename j/{6 => f}/ut_park.c (100%) rename j/{6 => f}/ut_peek.c (100%) rename j/{6 => f}/ut_play.c (100%) rename j/{6 => f}/ut_repo.c (100%) rename j/{6 => f}/ut_rest.c (100%) rename j/{6 => f}/ut_seek.c (100%) rename j/{6 => f}/ut_sift.c (100%) rename j/{6 => f}/ut_swab.c (100%) rename j/{6 => f}/ut_tack.c (100%) rename j/{6 => f}/ut_tock.c (100%) rename j/{6 => f}/ut_wrap.c (100%) rename j/{dash.c => tree.c} (100%) diff --git a/Makefile b/Makefile index df1ff2b9b8..6f495cc1d5 100644 --- a/Makefile +++ b/Makefile @@ -92,159 +92,159 @@ N_OFILES=\ n/v.o \ n/z.o -J_1_OFILES=\ - j/1/add.o \ - j/1/dec.o \ - j/1/div.o \ - j/1/gte.o \ - j/1/gth.o \ - j/1/lte.o \ - j/1/lth.o \ - j/1/mod.o \ - j/1/mul.o \ - j/1/sub.o +J_A_OFILES=\ + j/a/add.o \ + j/a/dec.o \ + j/a/div.o \ + j/a/gte.o \ + j/a/gth.o \ + j/a/lte.o \ + j/a/lth.o \ + j/a/mod.o \ + j/a/mul.o \ + j/a/sub.o -J_2_OFILES=\ - j/2/bind.o \ - j/2/clap.o \ - j/2/drop.o \ - j/2/flop.o \ - j/2/lent.o \ - j/2/levy.o \ - j/2/lien.o \ - j/2/need.o \ - j/2/reel.o \ - j/2/roll.o \ - j/2/skim.o \ - j/2/skip.o \ - j/2/scag.o \ - j/2/slag.o \ - j/2/snag.o \ - j/2/sort.o \ - j/2/turn.o \ - j/2/weld.o +J_B_OFILES=\ + j/b/bind.o \ + j/b/clap.o \ + j/b/drop.o \ + j/b/flop.o \ + j/b/lent.o \ + j/b/levy.o \ + j/b/lien.o \ + j/b/need.o \ + j/b/reel.o \ + j/b/roll.o \ + j/b/skim.o \ + j/b/skip.o \ + j/b/scag.o \ + j/b/slag.o \ + j/b/snag.o \ + j/b/sort.o \ + j/b/turn.o \ + j/b/weld.o -J_3_OFILES=\ - j/3/bex.o \ - j/3/can.o \ - j/3/cap.o \ - j/3/cat.o \ - j/3/con.o \ - j/3/cut.o \ - j/3/dor.o \ - j/3/dis.o \ - j/3/end.o \ - j/3/gor.o \ - j/3/hor.o \ - j/3/lsh.o \ - j/3/mas.o \ - j/3/met.o \ - j/3/mix.o \ - j/3/mug.o \ - j/3/peg.o \ - j/3/po.o \ - j/3/rap.o \ - j/3/rip.o \ - j/3/rsh.o \ - j/3/vor.o +J_C_OFILES=\ + j/c/bex.o \ + j/c/can.o \ + j/c/cap.o \ + j/c/cat.o \ + j/c/con.o \ + j/c/cut.o \ + j/c/dor.o \ + j/c/dis.o \ + j/c/end.o \ + j/c/gor.o \ + j/c/hor.o \ + j/c/lsh.o \ + j/c/mas.o \ + j/c/met.o \ + j/c/mix.o \ + j/c/mug.o \ + j/c/peg.o \ + j/c/po.o \ + j/c/rap.o \ + j/c/rip.o \ + j/c/rsh.o \ + j/c/vor.o -J_4_OFILES=\ - j/4/in_has.o \ - j/4/in_int.o \ - j/4/in_gas.o \ - j/4/in_mer.o \ - j/4/in_put.o \ - j/4/in_tap.o \ - j/4/in_uni.o \ - j/4/by_gas.o \ - j/4/by_get.o \ - j/4/by_has.o \ - j/4/by_int.o \ - j/4/by_put.o \ - j/4/by_uni.o +J_D_OFILES=\ + j/d/in_has.o \ + j/d/in_int.o \ + j/d/in_gas.o \ + j/d/in_mer.o \ + j/d/in_put.o \ + j/d/in_tap.o \ + j/d/in_uni.o \ + j/d/by_gas.o \ + j/d/by_get.o \ + j/d/by_has.o \ + j/d/by_int.o \ + j/d/by_put.o \ + j/d/by_uni.o -J_5_OFILES=\ - j/5/aesc.o \ - j/5/cue.o \ - j/5/jam.o \ - j/5/mat.o \ - j/5/mink.o \ - j/5/mule.o \ - j/5/parse.o \ - j/5/rd.o \ - j/5/repg.o \ - j/5/rexp.o \ - j/5/rub.o \ - j/5/shax.o \ - j/5/lore.o \ - j/5/loss.o \ - j/5/trip.o +J_E_OFILES=\ + j/e/aesc.o \ + j/e/cue.o \ + j/e/jam.o \ + j/e/mat.o \ + j/e/mink.o \ + j/e/mule.o \ + j/e/parse.o \ + j/e/rd.o \ + j/e/repg.o \ + j/e/rexp.o \ + j/e/rub.o \ + j/e/shax.o \ + j/e/lore.o \ + j/e/loss.o \ + j/e/trip.o -J_5_OFILES_ED=\ - j/5/ed_puck.o \ - j/5/ed_sign.o \ - j/5/ed_veri.o +J_E_OFILES_ED=\ + j/e/ed_puck.o \ + j/e/ed_sign.o \ + j/e/ed_veri.o -J_6_OFILES=\ - j/6/al.o \ - j/6/ap.o \ - j/6/bull.o \ - j/6/cell.o \ - j/6/comb.o \ - j/6/cons.o \ - j/6/core.o \ - j/6/cube.o \ - j/6/face.o \ - j/6/fitz.o \ - j/6/flan.o \ - j/6/flay.o \ - j/6/flip.o \ - j/6/flor.o \ - j/6/fork.o \ - j/6/hike.o \ - j/6/look.o \ +J_F_OFILES=\ + j/f/al.o \ + j/f/ap.o \ + j/f/bull.o \ + j/f/cell.o \ + j/f/comb.o \ + j/f/cons.o \ + j/f/core.o \ + j/f/cube.o \ + j/f/face.o \ + j/f/fitz.o \ + j/f/flan.o \ + j/f/flay.o \ + j/f/flip.o \ + j/f/flor.o \ + j/f/fork.o \ + j/f/hike.o \ + j/f/look.o \ -J_6_OFILES_UT=\ - j/6/ut.o \ - j/6/ut_burn.o \ - j/6/ut_busk.o \ - j/6/ut_bust.o \ - j/6/ut_conk.o \ - j/6/ut_crop.o \ - j/6/ut_cull.o \ - j/6/ut_find.o \ - j/6/ut_fink.o \ - j/6/ut_fire.o \ - j/6/ut_firm.o \ - j/6/ut_fish.o \ - j/6/ut_fuse.o \ - j/6/ut_gain.o \ - j/6/ut_heal.o \ - j/6/ut_lose.o \ - j/6/ut_mint.o \ - j/6/ut_mull.o \ - j/6/ut_nest.o \ - j/6/ut_park.o \ - j/6/ut_peek.o \ - j/6/ut_play.o \ - j/6/ut_repo.o \ - j/6/ut_rest.o \ - j/6/ut_seek.o \ - j/6/ut_swab.o \ - j/6/ut_tack.o \ - j/6/ut_tock.o \ - j/6/ut_wrap.o +J_F_OFILES_UT=\ + j/f/ut.o \ + j/f/ut_burn.o \ + j/f/ut_busk.o \ + j/f/ut_bust.o \ + j/f/ut_conk.o \ + j/f/ut_crop.o \ + j/f/ut_cull.o \ + j/f/ut_find.o \ + j/f/ut_fink.o \ + j/f/ut_fire.o \ + j/f/ut_firm.o \ + j/f/ut_fish.o \ + j/f/ut_fuse.o \ + j/f/ut_gain.o \ + j/f/ut_heal.o \ + j/f/ut_lose.o \ + j/f/ut_mint.o \ + j/f/ut_mull.o \ + j/f/ut_nest.o \ + j/f/ut_park.o \ + j/f/ut_peek.o \ + j/f/ut_play.o \ + j/f/ut_repo.o \ + j/f/ut_rest.o \ + j/f/ut_seek.o \ + j/f/ut_swab.o \ + j/f/ut_tack.o \ + j/f/ut_tock.o \ + j/f/ut_wrap.o J_OFILES=\ - $(J_1_OFILES) \ - $(J_2_OFILES) \ - $(J_3_OFILES) \ - $(J_4_OFILES) \ - $(J_5_OFILES) \ - $(J_5_OFILES_ED) \ - $(J_6_OFILES) \ - $(J_6_OFILES_UT) \ - j/dash.o + $(J_A_OFILES) \ + $(J_B_OFILES) \ + $(J_C_OFILES) \ + $(J_D_OFILES) \ + $(J_E_OFILES) \ + $(J_E_OFILES_ED) \ + $(J_F_OFILES) \ + $(J_F_OFILES_UT) \ + j/tree.o BASE_OFILES=$(N_OFILES) $(J_OFILES) diff --git a/i/j/k.h b/i/j/k.h index 96b31e14a5..b7bcaf3a13 100644 --- a/i/j/k.h +++ b/i/j/k.h @@ -72,8 +72,8 @@ /* u3kdi_put(): put in set. */ - u3_weak - u3kdi_put(u3_noun a, u3_noun b); + u3_weak + u3kdi_put(u3_noun a, u3_noun b); # define u3kdb_tap(a, b) u3kdi_tap(a, b) diff --git a/j/1/add.c b/j/a/add.c similarity index 100% rename from j/1/add.c rename to j/a/add.c diff --git a/j/1/dec.c b/j/a/dec.c similarity index 100% rename from j/1/dec.c rename to j/a/dec.c diff --git a/j/1/div.c b/j/a/div.c similarity index 100% rename from j/1/div.c rename to j/a/div.c diff --git a/j/1/gte.c b/j/a/gte.c similarity index 100% rename from j/1/gte.c rename to j/a/gte.c diff --git a/j/1/gth.c b/j/a/gth.c similarity index 100% rename from j/1/gth.c rename to j/a/gth.c diff --git a/j/1/lte.c b/j/a/lte.c similarity index 100% rename from j/1/lte.c rename to j/a/lte.c diff --git a/j/1/lth.c b/j/a/lth.c similarity index 100% rename from j/1/lth.c rename to j/a/lth.c diff --git a/j/1/mod.c b/j/a/mod.c similarity index 100% rename from j/1/mod.c rename to j/a/mod.c diff --git a/j/1/mul.c b/j/a/mul.c similarity index 100% rename from j/1/mul.c rename to j/a/mul.c diff --git a/j/1/sub.c b/j/a/sub.c similarity index 100% rename from j/1/sub.c rename to j/a/sub.c diff --git a/j/2/bind.c b/j/b/bind.c similarity index 100% rename from j/2/bind.c rename to j/b/bind.c diff --git a/j/2/clap.c b/j/b/clap.c similarity index 100% rename from j/2/clap.c rename to j/b/clap.c diff --git a/j/2/drop.c b/j/b/drop.c similarity index 100% rename from j/2/drop.c rename to j/b/drop.c diff --git a/j/2/flop.c b/j/b/flop.c similarity index 100% rename from j/2/flop.c rename to j/b/flop.c diff --git a/j/2/lent.c b/j/b/lent.c similarity index 100% rename from j/2/lent.c rename to j/b/lent.c diff --git a/j/2/levy.c b/j/b/levy.c similarity index 100% rename from j/2/levy.c rename to j/b/levy.c diff --git a/j/2/lien.c b/j/b/lien.c similarity index 100% rename from j/2/lien.c rename to j/b/lien.c diff --git a/j/2/need.c b/j/b/need.c similarity index 100% rename from j/2/need.c rename to j/b/need.c diff --git a/j/2/reel.c b/j/b/reel.c similarity index 100% rename from j/2/reel.c rename to j/b/reel.c diff --git a/j/2/roll.c b/j/b/roll.c similarity index 100% rename from j/2/roll.c rename to j/b/roll.c diff --git a/j/2/scag.c b/j/b/scag.c similarity index 100% rename from j/2/scag.c rename to j/b/scag.c diff --git a/j/2/skim.c b/j/b/skim.c similarity index 100% rename from j/2/skim.c rename to j/b/skim.c diff --git a/j/2/skip.c b/j/b/skip.c similarity index 100% rename from j/2/skip.c rename to j/b/skip.c diff --git a/j/2/slag.c b/j/b/slag.c similarity index 100% rename from j/2/slag.c rename to j/b/slag.c diff --git a/j/2/snag.c b/j/b/snag.c similarity index 100% rename from j/2/snag.c rename to j/b/snag.c diff --git a/j/2/sort.c b/j/b/sort.c similarity index 100% rename from j/2/sort.c rename to j/b/sort.c diff --git a/j/2/turn.c b/j/b/turn.c similarity index 100% rename from j/2/turn.c rename to j/b/turn.c diff --git a/j/2/weld.c b/j/b/weld.c similarity index 100% rename from j/2/weld.c rename to j/b/weld.c diff --git a/j/3/bex.c b/j/c/bex.c similarity index 100% rename from j/3/bex.c rename to j/c/bex.c diff --git a/j/3/can.c b/j/c/can.c similarity index 100% rename from j/3/can.c rename to j/c/can.c diff --git a/j/3/cap.c b/j/c/cap.c similarity index 100% rename from j/3/cap.c rename to j/c/cap.c diff --git a/j/3/cat.c b/j/c/cat.c similarity index 100% rename from j/3/cat.c rename to j/c/cat.c diff --git a/j/3/con.c b/j/c/con.c similarity index 100% rename from j/3/con.c rename to j/c/con.c diff --git a/j/3/cut.c b/j/c/cut.c similarity index 100% rename from j/3/cut.c rename to j/c/cut.c diff --git a/j/3/dis.c b/j/c/dis.c similarity index 100% rename from j/3/dis.c rename to j/c/dis.c diff --git a/j/3/dor.c b/j/c/dor.c similarity index 100% rename from j/3/dor.c rename to j/c/dor.c diff --git a/j/3/end.c b/j/c/end.c similarity index 100% rename from j/3/end.c rename to j/c/end.c diff --git a/j/3/gor.c b/j/c/gor.c similarity index 100% rename from j/3/gor.c rename to j/c/gor.c diff --git a/j/3/hor.c b/j/c/hor.c similarity index 100% rename from j/3/hor.c rename to j/c/hor.c diff --git a/j/3/lsh.c b/j/c/lsh.c similarity index 100% rename from j/3/lsh.c rename to j/c/lsh.c diff --git a/j/3/mas.c b/j/c/mas.c similarity index 100% rename from j/3/mas.c rename to j/c/mas.c diff --git a/j/3/met.c b/j/c/met.c similarity index 100% rename from j/3/met.c rename to j/c/met.c diff --git a/j/3/mix.c b/j/c/mix.c similarity index 100% rename from j/3/mix.c rename to j/c/mix.c diff --git a/j/3/mug.c b/j/c/mug.c similarity index 100% rename from j/3/mug.c rename to j/c/mug.c diff --git a/j/3/peg.c b/j/c/peg.c similarity index 100% rename from j/3/peg.c rename to j/c/peg.c diff --git a/j/3/po.c b/j/c/po.c similarity index 100% rename from j/3/po.c rename to j/c/po.c diff --git a/j/3/rap.c b/j/c/rap.c similarity index 100% rename from j/3/rap.c rename to j/c/rap.c diff --git a/j/3/rip.c b/j/c/rip.c similarity index 100% rename from j/3/rip.c rename to j/c/rip.c diff --git a/j/3/rsh.c b/j/c/rsh.c similarity index 100% rename from j/3/rsh.c rename to j/c/rsh.c diff --git a/j/3/vor.c b/j/c/vor.c similarity index 100% rename from j/3/vor.c rename to j/c/vor.c diff --git a/j/4/by_gas.c b/j/d/by_gas.c similarity index 100% rename from j/4/by_gas.c rename to j/d/by_gas.c diff --git a/j/4/by_get.c b/j/d/by_get.c similarity index 100% rename from j/4/by_get.c rename to j/d/by_get.c diff --git a/j/4/by_has.c b/j/d/by_has.c similarity index 100% rename from j/4/by_has.c rename to j/d/by_has.c diff --git a/j/4/by_int.c b/j/d/by_int.c similarity index 100% rename from j/4/by_int.c rename to j/d/by_int.c diff --git a/j/4/by_put.c b/j/d/by_put.c similarity index 100% rename from j/4/by_put.c rename to j/d/by_put.c diff --git a/j/4/by_uni.c b/j/d/by_uni.c similarity index 100% rename from j/4/by_uni.c rename to j/d/by_uni.c diff --git a/j/4/in_gas.c b/j/d/in_gas.c similarity index 100% rename from j/4/in_gas.c rename to j/d/in_gas.c diff --git a/j/4/in_has.c b/j/d/in_has.c similarity index 100% rename from j/4/in_has.c rename to j/d/in_has.c diff --git a/j/4/in_int.c b/j/d/in_int.c similarity index 100% rename from j/4/in_int.c rename to j/d/in_int.c diff --git a/j/4/in_mer.c b/j/d/in_mer.c similarity index 100% rename from j/4/in_mer.c rename to j/d/in_mer.c diff --git a/j/4/in_put.c b/j/d/in_put.c similarity index 100% rename from j/4/in_put.c rename to j/d/in_put.c diff --git a/j/4/in_tap.c b/j/d/in_tap.c similarity index 100% rename from j/4/in_tap.c rename to j/d/in_tap.c diff --git a/j/4/in_uni.c b/j/d/in_uni.c similarity index 100% rename from j/4/in_uni.c rename to j/d/in_uni.c diff --git a/j/5/aesc.c b/j/e/aesc.c similarity index 100% rename from j/5/aesc.c rename to j/e/aesc.c diff --git a/j/5/cue.c b/j/e/cue.c similarity index 100% rename from j/5/cue.c rename to j/e/cue.c diff --git a/j/5/ed_puck.c b/j/e/ed_puck.c similarity index 100% rename from j/5/ed_puck.c rename to j/e/ed_puck.c diff --git a/j/5/ed_sign.c b/j/e/ed_sign.c similarity index 100% rename from j/5/ed_sign.c rename to j/e/ed_sign.c diff --git a/j/5/ed_veri.c b/j/e/ed_veri.c similarity index 100% rename from j/5/ed_veri.c rename to j/e/ed_veri.c diff --git a/j/5/jam.c b/j/e/jam.c similarity index 100% rename from j/5/jam.c rename to j/e/jam.c diff --git a/j/5/lore.c b/j/e/lore.c similarity index 100% rename from j/5/lore.c rename to j/e/lore.c diff --git a/j/5/loss.c b/j/e/loss.c similarity index 100% rename from j/5/loss.c rename to j/e/loss.c diff --git a/j/5/mat.c b/j/e/mat.c similarity index 100% rename from j/5/mat.c rename to j/e/mat.c diff --git a/j/5/mink.c b/j/e/mink.c similarity index 100% rename from j/5/mink.c rename to j/e/mink.c diff --git a/j/5/mule.c b/j/e/mule.c similarity index 100% rename from j/5/mule.c rename to j/e/mule.c diff --git a/j/5/parse.c b/j/e/parse.c similarity index 100% rename from j/5/parse.c rename to j/e/parse.c diff --git a/j/5/rd.c b/j/e/rd.c similarity index 100% rename from j/5/rd.c rename to j/e/rd.c diff --git a/j/5/repg.c b/j/e/repg.c similarity index 100% rename from j/5/repg.c rename to j/e/repg.c diff --git a/j/5/rexp.c b/j/e/rexp.c similarity index 100% rename from j/5/rexp.c rename to j/e/rexp.c diff --git a/j/5/rub.c b/j/e/rub.c similarity index 100% rename from j/5/rub.c rename to j/e/rub.c diff --git a/j/5/shax.c b/j/e/shax.c similarity index 100% rename from j/5/shax.c rename to j/e/shax.c diff --git a/j/5/tape.c b/j/e/tape.c similarity index 100% rename from j/5/tape.c rename to j/e/tape.c diff --git a/j/5/trip.c b/j/e/trip.c similarity index 100% rename from j/5/trip.c rename to j/e/trip.c diff --git a/j/6/al.c b/j/f/al.c similarity index 100% rename from j/6/al.c rename to j/f/al.c diff --git a/j/6/ap.c b/j/f/ap.c similarity index 100% rename from j/6/ap.c rename to j/f/ap.c diff --git a/j/6/bull.c b/j/f/bull.c similarity index 100% rename from j/6/bull.c rename to j/f/bull.c diff --git a/j/6/cell.c b/j/f/cell.c similarity index 100% rename from j/6/cell.c rename to j/f/cell.c diff --git a/j/6/comb.c b/j/f/comb.c similarity index 100% rename from j/6/comb.c rename to j/f/comb.c diff --git a/j/6/cons.c b/j/f/cons.c similarity index 100% rename from j/6/cons.c rename to j/f/cons.c diff --git a/j/6/core.c b/j/f/core.c similarity index 100% rename from j/6/core.c rename to j/f/core.c diff --git a/j/6/cube.c b/j/f/cube.c similarity index 100% rename from j/6/cube.c rename to j/f/cube.c diff --git a/j/6/face.c b/j/f/face.c similarity index 100% rename from j/6/face.c rename to j/f/face.c diff --git a/j/6/fine.c b/j/f/fine.c similarity index 100% rename from j/6/fine.c rename to j/f/fine.c diff --git a/j/6/fitz.c b/j/f/fitz.c similarity index 100% rename from j/6/fitz.c rename to j/f/fitz.c diff --git a/j/6/flan.c b/j/f/flan.c similarity index 100% rename from j/6/flan.c rename to j/f/flan.c diff --git a/j/6/flay.c b/j/f/flay.c similarity index 100% rename from j/6/flay.c rename to j/f/flay.c diff --git a/j/6/flip.c b/j/f/flip.c similarity index 100% rename from j/6/flip.c rename to j/f/flip.c diff --git a/j/6/flor.c b/j/f/flor.c similarity index 100% rename from j/6/flor.c rename to j/f/flor.c diff --git a/j/6/fork.c b/j/f/fork.c similarity index 100% rename from j/6/fork.c rename to j/f/fork.c diff --git a/j/6/hike.c b/j/f/hike.c similarity index 100% rename from j/6/hike.c rename to j/f/hike.c diff --git a/j/6/look.c b/j/f/look.c similarity index 100% rename from j/6/look.c rename to j/f/look.c diff --git a/j/6/slot.c b/j/f/slot.c similarity index 100% rename from j/6/slot.c rename to j/f/slot.c diff --git a/j/6/type.c b/j/f/type.c similarity index 100% rename from j/6/type.c rename to j/f/type.c diff --git a/j/6/ut.c b/j/f/ut.c similarity index 100% rename from j/6/ut.c rename to j/f/ut.c diff --git a/j/6/ut_burn.c b/j/f/ut_burn.c similarity index 100% rename from j/6/ut_burn.c rename to j/f/ut_burn.c diff --git a/j/6/ut_busk.c b/j/f/ut_busk.c similarity index 100% rename from j/6/ut_busk.c rename to j/f/ut_busk.c diff --git a/j/6/ut_bust.c b/j/f/ut_bust.c similarity index 100% rename from j/6/ut_bust.c rename to j/f/ut_bust.c diff --git a/j/6/ut_conk.c b/j/f/ut_conk.c similarity index 100% rename from j/6/ut_conk.c rename to j/f/ut_conk.c diff --git a/j/6/ut_crop.c b/j/f/ut_crop.c similarity index 100% rename from j/6/ut_crop.c rename to j/f/ut_crop.c diff --git a/j/6/ut_cull.c b/j/f/ut_cull.c similarity index 100% rename from j/6/ut_cull.c rename to j/f/ut_cull.c diff --git a/j/6/ut_find.c b/j/f/ut_find.c similarity index 100% rename from j/6/ut_find.c rename to j/f/ut_find.c diff --git a/j/6/ut_fink.c b/j/f/ut_fink.c similarity index 100% rename from j/6/ut_fink.c rename to j/f/ut_fink.c diff --git a/j/6/ut_fire.c b/j/f/ut_fire.c similarity index 100% rename from j/6/ut_fire.c rename to j/f/ut_fire.c diff --git a/j/6/ut_firm.c b/j/f/ut_firm.c similarity index 100% rename from j/6/ut_firm.c rename to j/f/ut_firm.c diff --git a/j/6/ut_fish.c b/j/f/ut_fish.c similarity index 100% rename from j/6/ut_fish.c rename to j/f/ut_fish.c diff --git a/j/6/ut_fuse.c b/j/f/ut_fuse.c similarity index 100% rename from j/6/ut_fuse.c rename to j/f/ut_fuse.c diff --git a/j/6/ut_gain.c b/j/f/ut_gain.c similarity index 100% rename from j/6/ut_gain.c rename to j/f/ut_gain.c diff --git a/j/6/ut_heal.c b/j/f/ut_heal.c similarity index 100% rename from j/6/ut_heal.c rename to j/f/ut_heal.c diff --git a/j/6/ut_lose.c b/j/f/ut_lose.c similarity index 100% rename from j/6/ut_lose.c rename to j/f/ut_lose.c diff --git a/j/6/ut_mint.c b/j/f/ut_mint.c similarity index 100% rename from j/6/ut_mint.c rename to j/f/ut_mint.c diff --git a/j/6/ut_mull.c b/j/f/ut_mull.c similarity index 100% rename from j/6/ut_mull.c rename to j/f/ut_mull.c diff --git a/j/6/ut_nest.c b/j/f/ut_nest.c similarity index 100% rename from j/6/ut_nest.c rename to j/f/ut_nest.c diff --git a/j/6/ut_park.c b/j/f/ut_park.c similarity index 100% rename from j/6/ut_park.c rename to j/f/ut_park.c diff --git a/j/6/ut_peek.c b/j/f/ut_peek.c similarity index 100% rename from j/6/ut_peek.c rename to j/f/ut_peek.c diff --git a/j/6/ut_play.c b/j/f/ut_play.c similarity index 100% rename from j/6/ut_play.c rename to j/f/ut_play.c diff --git a/j/6/ut_repo.c b/j/f/ut_repo.c similarity index 100% rename from j/6/ut_repo.c rename to j/f/ut_repo.c diff --git a/j/6/ut_rest.c b/j/f/ut_rest.c similarity index 100% rename from j/6/ut_rest.c rename to j/f/ut_rest.c diff --git a/j/6/ut_seek.c b/j/f/ut_seek.c similarity index 100% rename from j/6/ut_seek.c rename to j/f/ut_seek.c diff --git a/j/6/ut_sift.c b/j/f/ut_sift.c similarity index 100% rename from j/6/ut_sift.c rename to j/f/ut_sift.c diff --git a/j/6/ut_swab.c b/j/f/ut_swab.c similarity index 100% rename from j/6/ut_swab.c rename to j/f/ut_swab.c diff --git a/j/6/ut_tack.c b/j/f/ut_tack.c similarity index 100% rename from j/6/ut_tack.c rename to j/f/ut_tack.c diff --git a/j/6/ut_tock.c b/j/f/ut_tock.c similarity index 100% rename from j/6/ut_tock.c rename to j/f/ut_tock.c diff --git a/j/6/ut_wrap.c b/j/f/ut_wrap.c similarity index 100% rename from j/6/ut_wrap.c rename to j/f/ut_wrap.c diff --git a/j/dash.c b/j/tree.c similarity index 100% rename from j/dash.c rename to j/tree.c