X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=opcode.pl;h=ef51941f435137e3bfa8edcd570017ae89209f8a;hb=cc97bb9e08974d3aba0c2bf61277f68eea5a2a6a;hp=8f480d6ee08d6f32df823344e4db27629cc78b3f;hpb=59af01353dbbede40ae5b5d1b0330b847ffb82dc;p=p5sagit%2Fp5-mst-13.2.git diff --git a/opcode.pl b/opcode.pl index 8f480d6..ef51941 100755 --- a/opcode.pl +++ b/opcode.pl @@ -1,7 +1,15 @@ #!/usr/bin/perl +BEGIN { + # Get function prototypes + require 'regen_lib.pl'; +} -unlink "opcode.h"; -open(OC, ">opcode.h") || die "Can't create opcode.h: $!\n"; +$opcode_new = 'opcode.h-new'; +$opname_new = 'opnames.h-new'; +open(OC, ">$opcode_new") || die "Can't create $opcode_new: $!\n"; +binmode OC; +open(ON, ">$opname_new") || die "Can't create $opname_new: $!\n"; +binmode ON; select OC; # Read data. @@ -25,39 +33,136 @@ while () { $args{$key} = $args; } +# Set up aliases + +my %alias; + +# Format is "this function" => "does these op names" +my @raw_alias = ( + Perl_do_kv => [qw( keys values )], + Perl_unimplemented_op => [qw(padany mapstart)], + # All the ops with a body of { return NORMAL; } + Perl_pp_null => [qw(scalar regcmaybe lineseq scope)], + + Perl_pp_goto => ['dump'], + Perl_pp_require => ['dofile'], + Perl_pp_untie => ['dbmclose'], + Perl_pp_sysread => [qw(read recv)], + Perl_pp_sysseek => ['seek'], + Perl_pp_ioctl => ['fcntl'], + Perl_pp_ssockopt => ['gsockopt'], + Perl_pp_getpeername => ['getsockname'], + Perl_pp_stat => ['lstat'], + Perl_pp_ftrowned => [qw(fteowned ftzero ftsock ftchr ftblk + ftfile ftdir ftpipe ftsuid ftsgid + ftsvtx)], + Perl_pp_fttext => ['ftbinary'], + Perl_pp_gmtime => ['localtime'], + Perl_pp_semget => [qw(shmget msgget)], + Perl_pp_semctl => [qw(shmctl msgctl)], + Perl_pp_ghostent => [qw(ghbyname ghbyaddr)], + Perl_pp_gnetent => [qw(gnbyname gnbyaddr)], + Perl_pp_gprotoent => [qw(gpbyname gpbynumber)], + Perl_pp_gservent => [qw(gsbyname gsbyport)], + Perl_pp_gpwent => [qw(gpwnam gpwuid)], + Perl_pp_ggrent => [qw(ggrnam ggrgid)], + Perl_pp_ftis => [qw(ftsize ftmtime ftatime ftctime)], + Perl_pp_chown => [qw(unlink chmod utime kill)], + Perl_pp_link => ['symlink'], + Perl_pp_ftrread => [qw(ftrwrite ftrexec fteread ftewrite + fteexec)], + Perl_pp_shmwrite => [qw(shmread msgsnd msgrcv semop)], + Perl_pp_send => ['syswrite'], + Perl_pp_defined => [qw(dor dorassign)], + Perl_pp_and => ['andassign'], + Perl_pp_or => ['orassign'], + Perl_pp_ucfirst => ['lcfirst'], + Perl_pp_sle => [qw(slt sgt sge)], + Perl_pp_print => ['say'], + Perl_pp_index => ['rindex'], + Perl_pp_oct => ['hex'], + Perl_pp_shift => ['pop'], + Perl_pp_sin => [qw(cos exp log sqrt)], + Perl_pp_bit_or => ['bit_xor'], + ); + +while (my ($func, $names) = splice @raw_alias, 0, 2) { + $alias{$_} = $func for @$names; +} + # Emit defines. $i = 0; print <<"END"; -/* !!!!!!! DO NOT EDIT THIS FILE !!!!!!! - This file is built by opcode.pl from its data. Any changes made here - will be lost! -*/ +/* -*- buffer-read-only: t -*- + * + * opcode.h + * + * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + * 2001, 2002, 2003, 2004, 2005, 2006, 2007 by Larry Wall and others + * + * You may distribute under the terms of either the GNU General Public + * License or the Artistic License, as specified in the README file. + * + * !!!!!!! DO NOT EDIT THIS FILE !!!!!!! + * This file is built by opcode.pl from its data. Any changes made here + * will be lost! + */ + +#ifndef PERL_GLOBAL_STRUCT_INIT #define Perl_pp_i_preinc Perl_pp_preinc #define Perl_pp_i_predec Perl_pp_predec #define Perl_pp_i_postinc Perl_pp_postinc #define Perl_pp_i_postdec Perl_pp_postdec -typedef enum { +PERL_PPDEF(Perl_unimplemented_op) + END + +print ON <<"END"; +/* -*- buffer-read-only: t -*- + * + * opnames.h + * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + * 2007 by Larry Wall and others + * + * You may distribute under the terms of either the GNU General Public + * License or the Artistic License, as specified in the README file. + * + * + * !!!!!!! DO NOT EDIT THIS FILE !!!!!!! + * This file is built by opcode.pl from its data. Any changes made here + * will be lost! + */ + +typedef enum opcode { +END + for (@ops) { - print "\t", &tab(3,"OP_\U$_,"), "/* ", $i++, " */\n"; + print ON "\t", &tab(3,"OP_\U$_,"), "/* ", $i++, " */\n"; } -print "\t", &tab(3,"OP_max"), "\n"; -print "} opcode;\n"; -print "\n#define MAXO ", scalar @ops, "\n\n"; +print ON "\t", &tab(3,"OP_max"), "\n"; +print ON "} opcode;\n"; +print ON "\n#define MAXO ", scalar @ops, "\n"; +print ON "#define OP_phoney_INPUT_ONLY -1\n"; +print ON "#define OP_phoney_OUTPUT_ONLY -2\n\n"; # Emit op names and descriptions. print <op_type == OP_CUSTOM ? custom_op_name(o) : \\ + PL_op_name[(o)->op_type]) +#define OP_DESC(o) ((o)->op_type == OP_CUSTOM ? custom_op_desc(o) : \\ + PL_op_desc[(o)->op_type]) + #ifndef DOINIT -EXT char *PL_op_name[]; +EXTCONST char* const PL_op_name[]; #else -EXT char *PL_op_name[] = { +EXTCONST char* const PL_op_name[] = { END for (@ops) { @@ -72,13 +177,18 @@ END print <pp_proto.h' or die "Error creating pp_proto.h: $!"; -open PPSYM, '>pp.sym' or die "Error creating pp.sym: $!"; +$pp_proto_new = 'pp_proto.h-new'; +$pp_sym_new = 'pp.sym-new'; + +open PP, ">$pp_proto_new" or die "Error creating $pp_proto_new: $!"; +binmode PP; +open PPSYM, ">$pp_sym_new" or die "Error creating $pp_sym_new: $!"; +binmode PPSYM; print PP <<"END"; -/* !!!!!!! DO NOT EDIT THIS FILE !!!!!!! +/* -*- buffer-read-only: t -*- + !!!!!!! DO NOT EDIT THIS FILE !!!!!!! This file is built by opcode.pl from its data. Any changes made here will be lost! */ @@ -229,8 +407,9 @@ print PP <<"END"; END print PPSYM <<"END"; +# -*- buffer-read-only: t -*- # -# !!!!!!! DO NOT EDIT THIS FILE !!!!!!! +# !!!!!!! DO NOT EDIT THIS FILE !!!!!!! # This file is built by opcode.pl from its data. Any changes made here # will be lost! # @@ -248,13 +427,28 @@ print PP "\n\n"; for (@ops) { next if /^i_(pre|post)(inc|dec)$/; + next if /^custom$/; print PP "PERL_PPDEF(Perl_pp_$_)\n"; print PPSYM "Perl_pp_$_\n"; } +print PP "\n/* ex: set ro: */\n"; +print PPSYM "\n# ex: set ro:\n"; close PP or die "Error closing pp_proto.h: $!"; close PPSYM or die "Error closing pp.sym: $!"; +foreach ('pp_proto.h', 'pp.sym') { + safer_rename_silent $_, "$_-old"; +} +safer_rename $pp_proto_new, 'pp_proto.h'; +safer_rename $pp_sym_new, 'pp.sym'; + +END { + foreach ('opcode.h', 'opnames.h', 'pp_proto.h', 'pp.sym') { + 1 while unlink "$_-old"; + } +} + ########################################################################### sub tab { local($l, $t) = @_; @@ -273,18 +467,36 @@ sub tab { # lt and friends do SETs (including ncmp, but not scmp) +# Additional mode of failure: the opcode can modify TARG before it "used" +# all the arguments (or may call an external function which does the same). +# If the target coincides with one of the arguments ==> kaboom. + # pp.c pos substr each not OK (RETPUSHUNDEF) # substr vec also not OK due to LV to target (are they???) # ref not OK (RETPUSHNO) # trans not OK (dTARG; TARG = sv_newmortal();) # ucfirst etc not OK: TMP arg processed inplace -# each repeat not OK too due to array context +# quotemeta not OK (unsafe when TARG == arg) +# each repeat not OK too due to list context # pack split - unknown whether they are safe +# sprintf: is calling do_sprintf(TARG,...) which can act on TARG +# before other args are processed. + +# Suspicious wrt "additional mode of failure" (and only it): +# schop, chop, postinc/dec, bit_and etc, negate, complement. + +# Also suspicious: 4-arg substr, sprintf, uc/lc (POK_only), reverse, pack. + +# substr/vec: doing TAINT_off()??? # pp_hot.c # readline - unknown whether it is safe # match subst not OK (dTARG) # grepwhile not OK (not always setting) +# join not OK (unsafe when TARG == arg) + +# Suspicious wrt "additional mode of failure": concat (dealt with +# in ck_sassign()), join (same). # pp_ctl.c # mapwhile flip caller not OK (not always setting) @@ -299,8 +511,43 @@ sub tab { # sselect shm* sem* msg* syscall - unknown whether they are safe # gmtime not OK (list context) +# Suspicious wrt "additional mode of failure": warn, die, select. + __END__ +# New ops always go at the end, just before 'custom' + +# A recapitulation of the format of this file: +# The file consists of five columns: the name of the op, an English +# description, the name of the "check" routine used to optimize this +# operation, some flags, and a description of the operands. + +# The flags consist of options followed by a mandatory op class signifier + +# The classes are: +# baseop - 0 unop - 1 binop - 2 +# logop - | listop - @ pmop - / +# padop/svop - $ padop - # (unused) loop - { +# baseop/unop - % loopexop - } filestatop - - +# pvop/svop - " cop - ; + +# Other options are: +# needs stack mark - m +# needs constant folding - f +# produces a scalar - s +# produces an integer - i +# needs a target - t +# target can be in a pad - T +# has a corresponding integer version - I +# has side effects - d +# uses $_ if no argument given - u + +# Values for the operands are: +# scalar - S list - L array - A +# hash - H sub (CV) - C file - F +# socket - Fs filetest - F- reference - R +# "?" denotes an optional operand. + # Nothing. null null operation ck_null 0 @@ -314,22 +561,22 @@ wantarray wantarray ck_null is0 const constant item ck_svconst s$ -gvsv scalar variable ck_null ds* -gv glob value ck_null ds* +gvsv scalar variable ck_null ds$ +gv glob value ck_null ds$ gelem glob elem ck_null d2 S S padsv private variable ck_null ds0 padav private array ck_null d0 padhv private hash ck_null d0 -padany private something ck_null d0 +padany private value ck_null d0 pushre push regexp ck_null d/ # References and stuff. rv2gv ref-to-glob cast ck_rvconst ds1 -rv2sv scalar deref ck_rvconst ds1 +rv2sv scalar dereference ck_rvconst ds1 av2arylen array length ck_null is1 -rv2cv subroutine deref ck_rvconst d1 +rv2cv subroutine dereference ck_rvconst d1 anoncode anonymous subroutine ck_anoncode $ prototype subroutine prototype ck_null s% S refgen reference constructor ck_spair m1 L @@ -339,22 +586,22 @@ bless bless ck_fun s@ S S? # Pushy I/O. -backtick backticks ck_null t% +backtick quoted execution (``, qx) ck_open t% S # glob defaults its first arg to $_ -glob glob ck_glob t@ S? S? -readline ck_null t% -rcatline append I/O operator ck_null t% +glob glob ck_glob t@ S? +readline ck_null t% F? +rcatline append I/O operator ck_null t$ # Bindable operators. -regcmaybe regexp comp once ck_fun s1 S -regcreset regexp reset interpolation flag ck_fun s1 S +regcmaybe regexp internal guard ck_fun s1 S +regcreset regexp internal reset ck_fun s1 S regcomp regexp compilation ck_null s| S -match pattern match ck_match d/ -qr pattern quote ck_match s/ -subst substitution ck_null dis/ S -substcont substitution cont ck_null dis| -trans character translation ck_null is" S +match pattern match (m//) ck_match d/ +qr pattern quote (qr//) ck_match s/ +subst substitution (s///) ck_match dis/ S +substcont substitution iterator ck_null dis| +trans transliteration (tr///) ck_match is" S # Lvalue operators. # sassign is special-cased for op class @@ -362,77 +609,77 @@ trans character translation ck_null is" S sassign scalar assignment ck_sassign s0 aassign list assignment ck_null t2 L L -chop chop ck_spair mTs% L -schop scalar chop ck_null sTu% S? -chomp safe chop ck_spair mTs% L -schomp scalar safe chop ck_null sTu% S? +chop chop ck_spair mts% L +schop scalar chop ck_null stu% S? +chomp chomp ck_spair mTs% L +schomp scalar chomp ck_null sTu% S? defined defined operator ck_defined isu% S? undef undef operator ck_lfun s% S? study study ck_fun su% S? pos match position ck_lfun stu% S? -preinc preincrement ck_lfun dIs1 S -i_preinc integer preincrement ck_lfun dis1 S -predec predecrement ck_lfun dIs1 S -i_predec integer predecrement ck_lfun dis1 S -postinc postincrement ck_lfun dIsT1 S -i_postinc integer postincrement ck_lfun disT1 S -postdec postdecrement ck_lfun dIsT1 S -i_postdec integer postdecrement ck_lfun disT1 S +preinc preincrement (++) ck_lfun dIs1 S +i_preinc integer preincrement (++) ck_lfun dis1 S +predec predecrement (--) ck_lfun dIs1 S +i_predec integer predecrement (--) ck_lfun dis1 S +postinc postincrement (++) ck_lfun dIst1 S +i_postinc integer postincrement (++) ck_lfun disT1 S +postdec postdecrement (--) ck_lfun dIst1 S +i_postdec integer postdecrement (--) ck_lfun disT1 S # Ordinary operators. -pow exponentiation ck_null fsT2 S S - -multiply multiplication ck_null IfsT2 S S -i_multiply integer multiplication ck_null ifsT2 S S -divide division ck_null IfsT2 S S -i_divide integer division ck_null ifsT2 S S -modulo modulus ck_null IifsT2 S S -i_modulo integer modulus ck_null ifsT2 S S -repeat repeat ck_repeat mt2 L S - -add addition ck_null IfsT2 S S -i_add integer addition ck_null ifsT2 S S -subtract subtraction ck_null IfsT2 S S -i_subtract integer subtraction ck_null ifsT2 S S -concat concatenation ck_concat fsT2 S S +pow exponentiation (**) ck_null fsT2 S S + +multiply multiplication (*) ck_null IfsT2 S S +i_multiply integer multiplication (*) ck_null ifsT2 S S +divide division (/) ck_null IfsT2 S S +i_divide integer division (/) ck_null ifsT2 S S +modulo modulus (%) ck_null IifsT2 S S +i_modulo integer modulus (%) ck_null ifsT2 S S +repeat repeat (x) ck_repeat mt2 L S + +add addition (+) ck_null IfsT2 S S +i_add integer addition (+) ck_null ifsT2 S S +subtract subtraction (-) ck_null IfsT2 S S +i_subtract integer subtraction (-) ck_null ifsT2 S S +concat concatenation (.) or string ck_concat fsT2 S S stringify string ck_fun fsT@ S -left_shift left bitshift ck_bitop fsT2 S S -right_shift right bitshift ck_bitop fsT2 S S - -lt numeric lt ck_null Iifs2 S S -i_lt integer lt ck_null ifs2 S S -gt numeric gt ck_null Iifs2 S S -i_gt integer gt ck_null ifs2 S S -le numeric le ck_null Iifs2 S S -i_le integer le ck_null ifs2 S S -ge numeric ge ck_null Iifs2 S S -i_ge integer ge ck_null ifs2 S S -eq numeric eq ck_null Iifs2 S S -i_eq integer eq ck_null ifs2 S S -ne numeric ne ck_null Iifs2 S S -i_ne integer ne ck_null ifs2 S S -ncmp spaceship operator ck_null Iifst2 S S -i_ncmp integer spaceship ck_null ifst2 S S - -slt string lt ck_scmp ifs2 S S -sgt string gt ck_scmp ifs2 S S -sle string le ck_scmp ifs2 S S -sge string ge ck_scmp ifs2 S S +left_shift left bitshift (<<) ck_bitop fsT2 S S +right_shift right bitshift (>>) ck_bitop fsT2 S S + +lt numeric lt (<) ck_null Iifs2 S S +i_lt integer lt (<) ck_null ifs2 S S +gt numeric gt (>) ck_null Iifs2 S S +i_gt integer gt (>) ck_null ifs2 S S +le numeric le (<=) ck_null Iifs2 S S +i_le integer le (<=) ck_null ifs2 S S +ge numeric ge (>=) ck_null Iifs2 S S +i_ge integer ge (>=) ck_null ifs2 S S +eq numeric eq (==) ck_null Iifs2 S S +i_eq integer eq (==) ck_null ifs2 S S +ne numeric ne (!=) ck_null Iifs2 S S +i_ne integer ne (!=) ck_null ifs2 S S +ncmp numeric comparison (<=>) ck_null Iifst2 S S +i_ncmp integer comparison (<=>) ck_null ifst2 S S + +slt string lt ck_null ifs2 S S +sgt string gt ck_null ifs2 S S +sle string le ck_null ifs2 S S +sge string ge ck_null ifs2 S S seq string eq ck_null ifs2 S S sne string ne ck_null ifs2 S S -scmp string comparison ck_scmp ifst2 S S +scmp string comparison (cmp) ck_null ifst2 S S -bit_and bitwise and ck_bitop fsT2 S S -bit_xor bitwise xor ck_bitop fsT2 S S -bit_or bitwise or ck_bitop fsT2 S S +bit_and bitwise and (&) ck_bitop fst2 S S +bit_xor bitwise xor (^) ck_bitop fst2 S S +bit_or bitwise or (|) ck_bitop fst2 S S -negate negate ck_null IfsT1 S -i_negate integer negate ck_null ifsT1 S +negate negation (-) ck_null Ifst1 S +i_negate integer negation (-) ck_null ifsT1 S not not ck_null ifs1 S -complement 1's complement ck_bitop fsT1 S +complement 1's complement (~) ck_bitop fst1 S # High falutin' math. @@ -455,27 +702,27 @@ abs abs ck_fun fsTu% S? # String stuff. length length ck_lengthconst isTu% S? -substr substr ck_fun st@ S S S? S? +substr substr ck_substr st@ S S S? S? vec vec ck_fun ist@ S S S index index ck_index isT@ S S S? rindex rindex ck_index isT@ S S S? -sprintf sprintf ck_fun_locale mfsT@ S L +sprintf sprintf ck_fun mst@ S L formline formline ck_fun ms@ S L ord ord ck_fun ifsTu% S? chr chr ck_fun fsTu% S? crypt crypt ck_fun fsT@ S S -ucfirst upper case first ck_fun_locale fstu% S? -lcfirst lower case first ck_fun_locale fstu% S? -uc upper case ck_fun_locale fstu% S? -lc lower case ck_fun_locale fstu% S? -quotemeta quote metachars ck_fun fsTu% S? +ucfirst ucfirst ck_fun fstu% S? +lcfirst lcfirst ck_fun fstu% S? +uc uc ck_fun fstu% S? +lc lc ck_fun fstu% S? +quotemeta quotemeta ck_fun fstu% S? # Arrays. -rv2av array deref ck_rvconst dt1 -aelemfast known array element ck_null s* A S +rv2av array dereference ck_rvconst dt1 +aelemfast constant array element ck_null s$ A S aelem array element ck_null s2 A S aslice array slice ck_null m@ A L @@ -485,31 +732,31 @@ each each ck_fun % H values values ck_fun t% H keys keys ck_fun t% H delete delete ck_delete % S -exists exists operator ck_exists is% S -rv2hv hash deref ck_rvconst dt1 -helem hash elem ck_null s2@ H S +exists exists ck_exists is% S +rv2hv hash dereference ck_rvconst dt1 +helem hash element ck_null s2@ H S hslice hash slice ck_null m@ H L # Explosives and implosives. -unpack unpack ck_fun @ S S +unpack unpack ck_unpack @ S S? pack pack ck_fun mst@ S L split split ck_split t@ S S S -join join ck_fun msT@ S L +join join or string ck_join mst@ S L # List operators. list list ck_null m@ L lslice list slice ck_null 2 H L L -anonlist anonymous list ck_fun ms@ L -anonhash anonymous hash ck_fun ms@ L +anonlist anonymous list ([]) ck_fun ms@ L +anonhash anonymous hash ({}) ck_fun ms@ L splice splice ck_fun m@ A S? S? L push push ck_fun imsT@ A L -pop pop ck_shift s% A -shift shift ck_shift s% A +pop pop ck_shift s% A? +shift shift ck_shift s% A? unshift unshift ck_fun imsT@ A L -sort sort ck_sort m@ C? L +sort sort ck_sort dm@ C? L reverse reverse ck_fun mt@ L grepstart grep ck_grep dm@ C L @@ -526,20 +773,21 @@ flop range (or flop) ck_null 1 # Control. -and logical and ck_null | -or logical or ck_null | -xor logical xor ck_null fs| S S -cond_expr conditional expression ck_null d| -andassign logical and assignment ck_null s| -orassign logical or assignment ck_null s| +and logical and (&&) ck_null | +or logical or (||) ck_null | +xor logical xor ck_null fs2 S S +cond_expr conditional expression ck_null d| +andassign logical and assignment (&&=) ck_null s| +orassign logical or assignment (||=) ck_null s| -method method lookup ck_null d1 +method method lookup ck_method d1 entersub subroutine entry ck_subr dmt1 L leavesub subroutine exit ck_null 1 +leavesublv lvalue subroutine return ck_null 1 caller caller ck_fun t% S? warn warn ck_fun imst@ L -die die ck_fun dimst@ L -reset reset ck_fun is% S? +die die ck_die dimst@ L +reset symbol reset ck_fun is% S? lineseq line sequence ck_null @ nextstate next statement ck_null s; @@ -552,26 +800,27 @@ enteriter foreach loop entry ck_null d{ iter foreach loop iterator ck_null 0 enterloop loop entry ck_null d{ leaveloop loop exit ck_null 2 -return return ck_null dm@ L +return return ck_return dm@ L last last ck_null ds} next next ck_null ds} redo redo ck_null ds} dump dump ck_null ds} goto goto ck_null ds} -exit exit ck_fun ds% S? +exit exit ck_exit ds% S? +# continued below -#nswitch numeric switch ck_null d -#cswitch character switch ck_null d +#nswitch numeric switch ck_null d +#cswitch character switch ck_null d # I/O. -open open ck_fun ist@ F S? +open open ck_open ismt@ F S? L close close ck_fun is% F? pipe_op pipe ck_fun is@ F F fileno fileno ck_fun ist% F umask umask ck_fun ist% S? -binmode binmode ck_fun s% F +binmode binmode ck_fun s@ F S? tie tie ck_fun idms@ R S L untie untie ck_fun is% R @@ -595,8 +844,8 @@ sysseek sysseek ck_fun s@ F S S sysread sysread ck_fun imst@ F R S S? syswrite syswrite ck_fun imst@ F S S? S? -send send ck_fun imst@ F S S S? -recv recv ck_fun imst@ F R S S +send send ck_fun imst@ Fs S S S? +recv recv ck_fun imst@ Fs R S S eof eof ck_eof is% F? tell tell ck_fun st% F? @@ -610,56 +859,57 @@ flock flock ck_fun isT@ F S # Sockets. -socket socket ck_fun is@ F S S S -sockpair socketpair ck_fun is@ F F S S S +socket socket ck_fun is@ Fs S S S +sockpair socketpair ck_fun is@ Fs Fs S S S -bind bind ck_fun is@ F S -connect connect ck_fun is@ F S -listen listen ck_fun is@ F S -accept accept ck_fun ist@ F F -shutdown shutdown ck_fun ist@ F S +bind bind ck_fun is@ Fs S +connect connect ck_fun is@ Fs S +listen listen ck_fun is@ Fs S +accept accept ck_fun ist@ Fs Fs +shutdown shutdown ck_fun ist@ Fs S -gsockopt getsockopt ck_fun is@ F S S -ssockopt setsockopt ck_fun is@ F S S S +gsockopt getsockopt ck_fun is@ Fs S S +ssockopt setsockopt ck_fun is@ Fs S S S -getsockname getsockname ck_fun is% F -getpeername getpeername ck_fun is% F +getsockname getsockname ck_fun is% Fs +getpeername getpeername ck_fun is% Fs # Stat calls. lstat lstat ck_ftst u- F stat stat ck_ftst u- F -ftrread -R ck_ftst isu- F -ftrwrite -W ck_ftst isu- F -ftrexec -X ck_ftst isu- F -fteread -r ck_ftst isu- F -ftewrite -w ck_ftst isu- F -fteexec -x ck_ftst isu- F -ftis -e ck_ftst isu- F -fteowned -O ck_ftst isu- F -ftrowned -o ck_ftst isu- F -ftzero -z ck_ftst isu- F -ftsize -s ck_ftst istu- F -ftmtime -M ck_ftst stu- F -ftatime -A ck_ftst stu- F -ftctime -C ck_ftst stu- F -ftsock -S ck_ftst isu- F -ftchr -c ck_ftst isu- F -ftblk -b ck_ftst isu- F -ftfile -f ck_ftst isu- F -ftdir -d ck_ftst isu- F -ftpipe -p ck_ftst isu- F -ftlink -l ck_ftst isu- F -ftsuid -u ck_ftst isu- F -ftsgid -g ck_ftst isu- F -ftsvtx -k ck_ftst isu- F -fttty -t ck_ftst is- F -fttext -T ck_ftst isu- F -ftbinary -B ck_ftst isu- F +ftrread -R ck_ftst isu- F- +ftrwrite -W ck_ftst isu- F- +ftrexec -X ck_ftst isu- F- +fteread -r ck_ftst isu- F- +ftewrite -w ck_ftst isu- F- +fteexec -x ck_ftst isu- F- +ftis -e ck_ftst isu- F- +ftsize -s ck_ftst istu- F- +ftmtime -M ck_ftst stu- F- +ftatime -A ck_ftst stu- F- +ftctime -C ck_ftst stu- F- +ftrowned -O ck_ftst isu- F- +fteowned -o ck_ftst isu- F- +ftzero -z ck_ftst isu- F- +ftsock -S ck_ftst isu- F- +ftchr -c ck_ftst isu- F- +ftblk -b ck_ftst isu- F- +ftfile -f ck_ftst isu- F- +ftdir -d ck_ftst isu- F- +ftpipe -p ck_ftst isu- F- +ftsuid -u ck_ftst isu- F- +ftsgid -g ck_ftst isu- F- +ftsvtx -k ck_ftst isu- F- +ftlink -l ck_ftst isu- F- +fttty -t ck_ftst is- F- +fttext -T ck_ftst isu- F- +ftbinary -B ck_ftst isu- F- # File calls. -chdir chdir ck_fun isT% S? +# chdir really behaves as if it had both "S?" and "F?" +chdir chdir ck_chdir isT% S? chown chown ck_fun imsT@ L chroot chroot ck_fun isTu% S? unlink unlink ck_fun imsTu@ L @@ -669,7 +919,7 @@ rename rename ck_fun isT@ S S link link ck_fun isT@ S S symlink symlink ck_fun isT@ S S readlink readlink ck_fun stu% S? -mkdir mkdir ck_fun isT@ S S +mkdir mkdir ck_fun isTu@ S? S? rmdir rmdir ck_fun isTu% S? # Directory calls. @@ -697,6 +947,10 @@ setpriority setpriority ck_fun isT@ S S S # Time calls. +# NOTE: MacOS patches the 'i' of time() away later when the interpreter +# is created because in MacOS time() is already returning times > 2**31-1, +# that is, non-integers. + time time ck_null isT0 tms times ck_null 0 localtime localtime ck_fun t% S? @@ -720,19 +974,19 @@ msgrcv msgrcv ck_fun imst@ S S S S S # Semaphores. +semop semop ck_fun imst@ S S semget semget ck_fun imst@ S S S semctl semctl ck_fun imst@ S S S S -semop semop ck_fun imst@ S S # Eval. require require ck_require du% S? -dofile do 'file' ck_fun d1 S -entereval eval string ck_eval d% S -leaveeval eval exit ck_null 1 S +dofile do "file" ck_fun d1 S +entereval eval "string" ck_eval d% S +leaveeval eval "string" exit ck_null 1 S #evalonce eval constant string ck_null d1 S -entertry eval block ck_null | -leavetry eval block exit ck_null @ +entertry eval {block} ck_null | +leavetry eval {block} exit ck_null @ # Get system info. @@ -773,5 +1027,25 @@ getlogin getlogin ck_null st0 syscall syscall ck_fun imst@ S L # For multi-threading -lock lock ck_rfun s% S -threadsv per-thread variable ck_null ds0 +lock lock ck_rfun s% R + +# Control (contd.) +setstate set statement info ck_null s; +method_named method with known name ck_null d$ + +dor defined or (//) ck_null | +dorassign defined or assignment (//=) ck_null s| + +entergiven given() ck_null d| +leavegiven leave given block ck_null 1 +enterwhen when() ck_null d| +leavewhen leave when block ck_null 1 +break break ck_null 0 +continue continue ck_null 0 +smartmatch smart match ck_smartmatch s2 + +say say ck_listiob ims@ F? L + +# Add new ops before this, the custom operator. + +custom unknown custom operator ck_null 0