[pypy-svn] r45976 - in pypy/branch/pypy-more-rtti-inprogress: rpython/module translator/c
pedronis at codespeak.net
pedronis at codespeak.net
Sat Aug 25 12:51:46 CEST 2007
Author: pedronis
Date: Sat Aug 25 12:51:46 2007
New Revision: 45976
Modified:
pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os.py
pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_environ.py
pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_stat.py
pypy/branch/pypy-more-rtti-inprogress/translator/c/node.py
Log:
shorter names: lltypeimpl -> llimpl
Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os.py (original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os.py Sat Aug 25 12:51:46 2007
@@ -27,14 +27,14 @@
# a simple, yet usefull factory
def register_os_function_returning_int(self, fun, name, **kwds):
c_func = rffi.llexternal(name, [], rffi.INT, **kwds)
- def c_func_lltypeimpl():
+ def c_func_llimpl():
res = c_func()
if res == -1:
raise OSError(rffi.get_errno(), "%s failed" % name)
return res
- c_func_lltypeimpl.func_name = name + '_llimpl'
+ c_func_llimpl.func_name = name + '_llimpl'
- self.register(fun, [], int, llimpl=c_func_lltypeimpl,
+ self.register(fun, [], int, llimpl=c_func_llimpl,
export_name='ll_os.ll_os_' + name)
if hasattr(os, 'execv'):
@@ -43,7 +43,7 @@
os_execv = rffi.llexternal('execv', [rffi.CCHARP, rffi.CCHARPP],
rffi.INT)
- def execv_lltypeimpl(path, args):
+ def execv_llimpl(path, args):
l_path = rffi.str2charp(path)
l_args = rffi.liststr2charpp(args)
os_execv(l_path, l_args)
@@ -52,7 +52,7 @@
raise OSError(rffi.get_errno(), "execv failed")
self.register(os.execv, [str, [str]], s_ImpossibleValue, llimpl=
- execv_lltypeimpl, export_name="ll_os.ll_os_execv")
+ execv_llimpl, export_name="ll_os.ll_os_execv")
if hasattr(posix, 'spawnv'):
@registering(os.spawnv)
@@ -61,7 +61,7 @@
[rffi.INT, rffi.CCHARP, rffi.CCHARPP],
rffi.INT)
- def spawnv_lltypeimpl(mode, path, args):
+ def spawnv_llimpl(mode, path, args):
mode = rffi.cast(rffi.INT, mode)
l_path = rffi.str2charp(path)
l_args = rffi.liststr2charpp(args)
@@ -73,32 +73,32 @@
return rffi.cast(lltype.Signed, childpid)
self.register(os.spawnv, [int, str, [str]], int, llimpl=
- spawnv_lltypeimpl, export_name="ll_os.ll_os_spawnv")
+ spawnv_llimpl, export_name="ll_os.ll_os_spawnv")
@registering(os.dup)
def register_os_dup(self):
os_dup = rffi.llexternal('dup', [rffi.INT], rffi.INT)
- def dup_lltypeimpl(fd):
+ def dup_llimpl(fd):
newfd = rffi.cast(lltype.Signed, os_dup(rffi.cast(rffi.INT, fd)))
if newfd == -1:
raise OSError(rffi.get_errno(), "dup failed")
return newfd
- self.register(os.dup, [int], int, llimpl=dup_lltypeimpl,
+ self.register(os.dup, [int], int, llimpl=dup_llimpl,
export_name="ll_os.ll_os_dup", oofakeimpl=os.dup)
@registering(os.dup2)
def register_os_dup2(self):
os_dup2 = rffi.llexternal('dup2', [rffi.INT, rffi.INT], rffi.INT)
- def dup2_lltypeimpl(fd, newfd):
+ def dup2_llimpl(fd, newfd):
error = rffi.cast(lltype.Signed, os_dup2(rffi.cast(rffi.INT, fd),
rffi.cast(rffi.INT, newfd)))
if error == -1:
raise OSError(rffi.get_errno(), "dup2 failed")
- self.register(os.dup2, [int, int], s_None, llimpl=dup2_lltypeimpl,
+ self.register(os.dup2, [int, int], s_None, llimpl=dup2_llimpl,
export_name="ll_os.ll_os_dup2")
@registering(os.utime)
@@ -112,7 +112,7 @@
rffi.INT,
includes=['utime.h', 'sys/types.h'])
- def os_utime_lltypeimpl(path, tp):
+ def os_utime_llimpl(path, tp):
# XXX right now they're all ints, might change in future
# XXX does not use utimes, even when available
# NB. this function is specialized; we get one version where
@@ -132,7 +132,7 @@
rffi.free_charp(l_path)
if error == -1:
raise OSError(rffi.get_errno(), "os_utime failed")
- os_utime_lltypeimpl._annspecialcase_ = 'specialize:argtype(1)'
+ os_utime_llimpl._annspecialcase_ = 'specialize:argtype(1)'
s_string = SomeString()
s_tuple_of_2_floats = SomeTuple([SomeFloat(), SomeFloat()])
@@ -158,7 +158,7 @@
self.register(os.utime, os_utime_normalize_args, s_None,
"ll_os.ll_os_utime",
- llimpl=os_utime_lltypeimpl)
+ llimpl=os_utime_llimpl)
if hasattr(os, 'setsid'):
@registering(os.setsid)
@@ -166,14 +166,14 @@
os_setsid = rffi.llexternal('setsid', [], rffi.PID_T,
includes=['unistd.h'])
- def setsid_lltypeimpl():
+ def setsid_llimpl():
result = rffi.cast(lltype.Signed, os_setsid())
if result == -1:
raise OSError(rffi.get_errno(), "os_setsid failed")
return result
self.register(os.setsid, [], int, export_name="ll_os.ll_os_setsid",
- llimpl=setsid_lltypeimpl)
+ llimpl=setsid_llimpl)
if False and hasattr(os, 'uname'): # make it more portable
@registering(os.uname)
@@ -200,7 +200,7 @@
i += 1
return "".join(l)
- def uname_lltypeimpl():
+ def uname_llimpl():
l_utsbuf = lltype.malloc(UTSNAMEP.TO, flavor='raw')
result = os_uname(l_utsbuf)
if result == -1:
@@ -214,7 +214,7 @@
return retval
self.register(os.uname, [], (str, str, str, str, str),
- "ll_os.ll_uname", llimpl=uname_lltypeimpl)
+ "ll_os.ll_uname", llimpl=uname_llimpl)
@registering(os.getuid)
def register_os_getuid(self):
@@ -241,7 +241,7 @@
os_open = rffi.llexternal('open', [rffi.CCHARP, rffi.INT, mode_t],
rffi.INT)
- def os_open_lltypeimpl(path, flags, mode):
+ def os_open_llimpl(path, flags, mode):
l_path = rffi.str2charp(path)
result = rffi.cast(lltype.Signed, os_open(l_path,
rffi.cast(rffi.INT, flags),
@@ -255,7 +255,7 @@
return os.open(o_path._str, flags, mode)
self.register(os.open, [str, int, int], int, "ll_os.ll_os_open",
- llimpl=os_open_lltypeimpl, oofakeimpl=os_open_oofakeimpl)
+ llimpl=os_open_llimpl, oofakeimpl=os_open_oofakeimpl)
# ------------------------------- os.read -------------------------------
@@ -264,7 +264,7 @@
os_read = rffi.llexternal('read', [rffi.INT, rffi.VOIDP, rffi.SIZE_T],
rffi.SIZE_T)
- def os_read_lltypeimpl(fd, count):
+ def os_read_llimpl(fd, count):
if count < 0:
raise OSError(errno.EINVAL, None)
inbuf = lltype.malloc(rffi.CCHARP.TO, count, flavor='raw')
@@ -283,14 +283,14 @@
return OOSupport.to_rstr(os.read(fd, count))
self.register(os.read, [int, int], str, "ll_os.ll_os_read",
- llimpl=os_read_lltypeimpl, oofakeimpl=os_read_oofakeimpl)
+ llimpl=os_read_llimpl, oofakeimpl=os_read_oofakeimpl)
@registering(os.write)
def register_os_write(self):
os_write = rffi.llexternal('write', [rffi.INT, rffi.VOIDP,
rffi.SIZE_T], rffi.SIZE_T)
- def os_write_lltypeimpl(fd, data):
+ def os_write_llimpl(fd, data):
count = len(data)
outbuf = lltype.malloc(rffi.CCHARP.TO, count, flavor='raw')
try:
@@ -309,19 +309,19 @@
return os.write(fd, OOSupport.from_rstr(data))
self.register(os.write, [int, str], SomeInteger(nonneg=True),
- "ll_os.ll_os_write", llimpl=os_write_lltypeimpl,
+ "ll_os.ll_os_write", llimpl=os_write_llimpl,
oofakeimpl=os_write_oofakeimpl)
@registering(os.close)
def register_os_close(self):
os_close = rffi.llexternal('close', [rffi.INT], rffi.INT)
- def close_lltypeimpl(fd):
+ def close_llimpl(fd):
error = rffi.cast(lltype.Signed, os_close(rffi.cast(rffi.INT, fd)))
if error == -1:
raise OSError(rffi.get_errno(), "close failed")
- self.register(os.close, [int], s_None, llimpl=close_lltypeimpl,
+ self.register(os.close, [int], s_None, llimpl=close_llimpl,
export_name="ll_os.ll_os_close", oofakeimpl=os.close)
@registering(os.lseek)
@@ -353,7 +353,7 @@
[rffi.INT, rffi.LONGLONG, rffi.INT],
rffi.LONGLONG)
- def lseek_lltypeimpl(fd, pos, how):
+ def lseek_llimpl(fd, pos, how):
how = fix_seek_arg(how)
res = os_lseek(rffi.cast(rffi.INT, fd),
rffi.cast(rffi.LONGLONG, pos),
@@ -369,7 +369,7 @@
self.register(os.lseek, [int, r_longlong, int],
r_longlong,
- llimpl = lseek_lltypeimpl,
+ llimpl = lseek_llimpl,
export_name = "ll_os.ll_os_lseek",
oofakeimpl = os_lseek_oofakeimpl)
@@ -379,14 +379,14 @@
os_ftruncate = rffi.llexternal('ftruncate',
[rffi.INT, rffi.LONGLONG], rffi.INT)
- def ftruncate_lltypeimpl(fd, length):
+ def ftruncate_llimpl(fd, length):
res = os_ftruncate(rffi.cast(rffi.INT, fd),
rffi.cast(rffi.LONGLONG, length))
if res < 0:
raise OSError(rffi.get_errno(), "os_lseek failed")
self.register(os.ftruncate, [int, r_longlong], s_None,
- llimpl = ftruncate_lltypeimpl,
+ llimpl = ftruncate_llimpl,
export_name = "ll_os.ll_os_ftruncate")
@registering(os.access)
@@ -395,7 +395,7 @@
[rffi.CCHARP, rffi.INT],
rffi.INT)
- def access_lltypeimpl(path, mode):
+ def access_llimpl(path, mode):
path = rffi.str2charp(path)
mode = rffi.cast(rffi.INT, mode)
error = rffi.cast(lltype.Signed, os_access(path, mode))
@@ -405,7 +405,7 @@
def os_access_oofakeimpl(path, mode):
return os.access(OOSupport.from_rstr(path), mode)
- self.register(os.access, [str, int], s_Bool, llimpl=access_lltypeimpl,
+ self.register(os.access, [str, int], s_Bool, llimpl=access_llimpl,
export_name="ll_os.ll_os_access",
oofakeimpl=os_access_oofakeimpl)
@@ -415,7 +415,7 @@
[rffi.CCHARP, rffi.SIZE_T],
rffi.CCHARP)
- def os_getcwd_lltypeimpl():
+ def os_getcwd_llimpl():
bufsize = 256
while True:
buf = lltype.malloc(rffi.CCHARP.TO, bufsize, flavor='raw')
@@ -438,7 +438,7 @@
return OOSupport.to_rstr(os.getcwd())
self.register(os.getcwd, [], str,
- "ll_os.ll_os_getcwd", llimpl=os_getcwd_lltypeimpl,
+ "ll_os.ll_os_getcwd", llimpl=os_getcwd_llimpl,
oofakeimpl=os_getcwd_oofakeimpl)
@registering(os.listdir)
@@ -462,7 +462,7 @@
os_closedir = rffi.llexternal('closedir', [DIRP], rffi.INT,
includes = INCL)
- def os_listdir_lltypeimpl(path):
+ def os_listdir_llimpl(path):
path = rffi.str2charp(path)
dirp = os_opendir(path)
rffi.free_charp(path)
@@ -488,7 +488,7 @@
[str], # a single argument which is a str
[str], # returns a list of strings
"ll_os.ll_os_listdir",
- llimpl=os_listdir_lltypeimpl)
+ llimpl=os_listdir_llimpl)
@registering(os.pipe)
def register_os_pipe(self):
@@ -500,7 +500,7 @@
os_pipe = rffi.llexternal('pipe', [INT_ARRAY_P], rffi.INT,
includes=['unistd.h'])
- def os_pipe_lltypeimpl():
+ def os_pipe_llimpl():
filedes = lltype.malloc(INT_ARRAY_P.TO, flavor='raw')
error = os_pipe(filedes)
read_fd = filedes[0]
@@ -512,7 +512,7 @@
self.register(os.pipe, [], (int, int),
"ll_os.ll_os_pipe",
- llimpl=os_pipe_lltypeimpl)
+ llimpl=os_pipe_llimpl)
if hasattr(os, 'readlink'):
@registering(os.readlink)
@@ -521,7 +521,7 @@
[rffi.CCHARP, rffi.CCHARP, rffi.SIZE_T],
rffi.INT) # XXX SSIZE_T in POSIX.1-2001
- def os_readlink_lltypeimpl(path):
+ def os_readlink_llimpl(path):
l_path = rffi.str2charp(path)
try:
bufsize = 1023
@@ -551,7 +551,7 @@
self.register(os.readlink, [str], str,
"ll_os.ll_os_readlink",
- llimpl=os_readlink_lltypeimpl)
+ llimpl=os_readlink_llimpl)
@registering(os.waitpid)
def register_os_waitpid(self):
@@ -572,7 +572,7 @@
[rffi.PID_T, rffi.INTP, rffi.INT],
rffi.PID_T)
- def os_waitpid_lltypeimpl(pid, options):
+ def os_waitpid_llimpl(pid, options):
status_p = lltype.malloc(rffi.INTP.TO, 1, flavor='raw')
status_p[0] = 0
result = os_waitpid(rffi.cast(rffi.PID_T, pid),
@@ -587,57 +587,57 @@
self.register(os.waitpid, [int, int], (int, int),
"ll_os.ll_os_waitpid",
- llimpl=os_waitpid_lltypeimpl)
+ llimpl=os_waitpid_llimpl)
@registering(os.isatty)
def register_os_isatty(self):
os_isatty = rffi.llexternal('isatty', [rffi.INT], rffi.INT)
- def isatty_lltypeimpl(fd):
+ def isatty_llimpl(fd):
res = os_isatty(rffi.cast(rffi.INT, fd))
return res != 0
- self.register(os.isatty, [int], bool, llimpl=isatty_lltypeimpl,
+ self.register(os.isatty, [int], bool, llimpl=isatty_llimpl,
export_name="ll_os.ll_os_isatty")
@registering(os.strerror)
def register_os_strerror(self):
os_strerror = rffi.llexternal('strerror', [rffi.INT], rffi.CCHARP)
- def strerror_lltypeimpl(errnum):
+ def strerror_llimpl(errnum):
res = os_strerror(rffi.cast(rffi.INT, errnum))
if not res:
raise ValueError("os_strerror failed")
return rffi.charp2str(res)
- self.register(os.strerror, [int], str, llimpl=strerror_lltypeimpl,
+ self.register(os.strerror, [int], str, llimpl=strerror_llimpl,
export_name="ll_os.ll_os_strerror")
@registering(os.system)
def register_os_system(self):
os_system = rffi.llexternal('system', [rffi.CCHARP], rffi.INT)
- def system_lltypeimpl(command):
+ def system_llimpl(command):
l_command = rffi.str2charp(command)
res = os_system(l_command)
rffi.free_charp(l_command)
return res
- self.register(os.system, [str], int, llimpl=system_lltypeimpl,
+ self.register(os.system, [str], int, llimpl=system_llimpl,
export_name="ll_os.ll_os_system")
@registering(os.unlink)
def register_os_unlink(self):
os_unlink = rffi.llexternal('unlink', [rffi.CCHARP], rffi.INT)
- def unlink_lltypeimpl(pathname):
+ def unlink_llimpl(pathname):
l_pathname = rffi.str2charp(pathname)
res = os_unlink(l_pathname)
rffi.free_charp(l_pathname)
if res < 0:
raise OSError(rffi.get_errno(), "os_unlink failed")
- self.register(os.unlink, [str], s_None, llimpl=unlink_lltypeimpl,
+ self.register(os.unlink, [str], s_None, llimpl=unlink_llimpl,
export_name="ll_os.ll_os_unlink")
@registering(os.chdir)
@@ -649,14 +649,14 @@
os_chdir = rffi.llexternal('chdir', [rffi.CCHARP], rffi.INT,
includes=INCLUDES)
- def chdir_lltypeimpl(path):
+ def chdir_llimpl(path):
l_path = rffi.str2charp(path)
res = os_chdir(l_path)
rffi.free_charp(l_path)
if res < 0:
raise OSError(rffi.get_errno(), "os_chdir failed")
- self.register(os.chdir, [str], s_None, llimpl=chdir_lltypeimpl,
+ self.register(os.chdir, [str], s_None, llimpl=chdir_llimpl,
export_name="ll_os.ll_os_chdir")
@registering(os.mkdir)
@@ -672,7 +672,7 @@
os_mkdir = rffi.llexternal('mkdir', [rffi.CCHARP]+ARG2, rffi.INT,
includes=INCLUDES)
- def mkdir_lltypeimpl(pathname, *opt_mode):
+ def mkdir_llimpl(pathname, *opt_mode):
l_pathname = rffi.str2charp(pathname)
if opt_mode:
opt_mode = (rffi.cast(rffi.MODE_T, opt_mode[0]),)
@@ -681,7 +681,7 @@
if res < 0:
raise OSError(rffi.get_errno(), "os_mkdir failed")
- self.register(os.mkdir, [str]+arg2, s_None, llimpl=mkdir_lltypeimpl,
+ self.register(os.mkdir, [str]+arg2, s_None, llimpl=mkdir_llimpl,
export_name="ll_os.ll_os_mkdir")
@registering(os.rmdir)
@@ -693,14 +693,14 @@
os_rmdir = rffi.llexternal('rmdir', [rffi.CCHARP], rffi.INT,
includes=INCLUDES)
- def rmdir_lltypeimpl(pathname):
+ def rmdir_llimpl(pathname):
l_pathname = rffi.str2charp(pathname)
res = os_rmdir(l_pathname)
rffi.free_charp(l_pathname)
if res < 0:
raise OSError(rffi.get_errno(), "os_rmdir failed")
- self.register(os.rmdir, [str], s_None, llimpl=rmdir_lltypeimpl,
+ self.register(os.rmdir, [str], s_None, llimpl=rmdir_llimpl,
export_name="ll_os.ll_os_rmdir")
@registering(os.chmod)
@@ -714,14 +714,14 @@
os_chmod = rffi.llexternal('chmod', [rffi.CCHARP, MODE_T], rffi.INT,
includes=INCLUDES)
- def chmod_lltypeimpl(path, mode):
+ def chmod_llimpl(path, mode):
l_path = rffi.str2charp(path)
res = os_chmod(l_path, rffi.cast(MODE_T, mode))
rffi.free_charp(l_path)
if res < 0:
raise OSError(rffi.get_errno(), "os_chmod failed")
- self.register(os.chmod, [str, int], s_None, llimpl=chmod_lltypeimpl,
+ self.register(os.chmod, [str, int], s_None, llimpl=chmod_llimpl,
export_name="ll_os.ll_os_chmod")
@registering(os.rename)
@@ -729,7 +729,7 @@
os_rename = rffi.llexternal('rename', [rffi.CCHARP, rffi.CCHARP],
rffi.INT)
- def rename_lltypeimpl(oldpath, newpath):
+ def rename_llimpl(oldpath, newpath):
l_oldpath = rffi.str2charp(oldpath)
l_newpath = rffi.str2charp(newpath)
res = os_rename(l_oldpath, l_newpath)
@@ -738,7 +738,7 @@
if res < 0:
raise OSError(rffi.get_errno(), "os_rename failed")
- self.register(os.rename, [str, str], s_None, llimpl=rename_lltypeimpl,
+ self.register(os.rename, [str, str], s_None, llimpl=rename_llimpl,
export_name="ll_os.ll_os_rename")
@registering(os.umask)
@@ -749,11 +749,11 @@
mode_t = rffi.MODE_T
os_umask = rffi.llexternal('umask', [mode_t], mode_t)
- def umask_lltypeimpl(fd):
+ def umask_llimpl(fd):
res = os_umask(rffi.cast(mode_t, fd))
return rffi.cast(lltype.Signed, res)
- self.register(os.umask, [int], int, llimpl=umask_lltypeimpl,
+ self.register(os.umask, [int], int, llimpl=umask_llimpl,
export_name="ll_os.ll_os_umask")
if hasattr(os, 'kill'):
@@ -763,13 +763,13 @@
rffi.INT,
includes=['sys/types.h', 'signal.h'])
- def kill_lltypeimpl(pid, sig):
+ def kill_llimpl(pid, sig):
res = os_kill(rffi.cast(rffi.PID_T, pid),
rffi.cast(rffi.INT, sig))
if res < 0:
raise OSError(rffi.get_errno(), "os_kill failed")
- self.register(os.kill, [int, int], s_None, llimpl=kill_lltypeimpl,
+ self.register(os.kill, [int, int], s_None, llimpl=kill_llimpl,
export_name="ll_os.ll_os_kill")
if hasattr(os, 'link'):
@@ -779,7 +779,7 @@
rffi.INT,
includes = ['unistd.h'])
- def link_lltypeimpl(oldpath, newpath):
+ def link_llimpl(oldpath, newpath):
l_oldpath = rffi.str2charp(oldpath)
l_newpath = rffi.str2charp(newpath)
res = os_link(l_oldpath, l_newpath)
@@ -788,7 +788,7 @@
if res < 0:
raise OSError(rffi.get_errno(), "os_link failed")
- self.register(os.link, [str, str], s_None, llimpl=link_lltypeimpl,
+ self.register(os.link, [str, str], s_None, llimpl=link_llimpl,
export_name="ll_os.ll_os_link")
if hasattr(os, 'symlink'):
@@ -798,7 +798,7 @@
rffi.INT,
includes = ['unistd.h'])
- def symlink_lltypeimpl(oldpath, newpath):
+ def symlink_llimpl(oldpath, newpath):
l_oldpath = rffi.str2charp(oldpath)
l_newpath = rffi.str2charp(newpath)
res = os_symlink(l_oldpath, l_newpath)
@@ -808,7 +808,7 @@
raise OSError(rffi.get_errno(), "os_symlink failed")
self.register(os.symlink, [str, str], s_None,
- llimpl=symlink_lltypeimpl,
+ llimpl=symlink_llimpl,
export_name="ll_os.ll_os_symlink")
if hasattr(os, 'fork'):
@@ -817,23 +817,23 @@
os_fork = rffi.llexternal('fork', [], rffi.PID_T,
includes = ['sys/types.h', 'unistd.h'])
- def fork_lltypeimpl():
+ def fork_llimpl():
childpid = os_fork()
if childpid == -1:
raise OSError(rffi.get_errno(), "os_fork failed")
return rffi.cast(lltype.Signed, childpid)
- self.register(os.fork, [], int, llimpl=fork_lltypeimpl,
+ self.register(os.fork, [], int, llimpl=fork_llimpl,
export_name="ll_os.ll_os_fork")
@registering(os._exit)
def register_os__exit(self):
os__exit = rffi.llexternal('_exit', [rffi.INT], lltype.Void)
- def _exit_lltypeimpl(status):
+ def _exit_llimpl(status):
os__exit(rffi.cast(rffi.INT, status))
- self.register(os._exit, [int], s_None, llimpl=_exit_lltypeimpl,
+ self.register(os._exit, [int], s_None, llimpl=_exit_llimpl,
export_name="ll_os.ll_os__exit")
# --------------------------- os.stat & variants ---------------------------
@@ -874,16 +874,16 @@
includes=["sys/wait.h", "sys/types.h"])
if name in self.w_star_returning_int:
- def lltypeimpl(status):
+ def llimpl(status):
return os_c_func(status)
resulttype = int
else:
- def lltypeimpl(status):
+ def llimpl(status):
return bool(os_c_func(status))
resulttype = bool
- lltypeimpl.func_name = name + '_lltypeimpl'
+ llimpl.func_name = name + '_llimpl'
self.register(getattr(os, name), [int], resulttype, "ll_os."+name,
- llimpl=lltypeimpl)
+ llimpl=llimpl)
for name in w_star:
if hasattr(os, name):
@@ -895,14 +895,14 @@
def register_os_ttyname(self):
os_ttyname = rffi.llexternal('ttyname', [lltype.Signed], rffi.CCHARP)
- def ttyname_lltypeimpl(fd):
+ def ttyname_llimpl(fd):
l_name = os_ttyname(fd)
if not l_name:
raise OSError(rffi.get_errno(), "ttyname raised")
return rffi.charp2str(l_name)
self.register(os.ttyname, [int], str, "ll_os.ttyname",
- llimpl=ttyname_lltypeimpl)
+ llimpl=ttyname_llimpl)
# ____________________________________________________________
# Support for os.environ
Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_environ.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_environ.py (original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_environ.py Sat Aug 25 12:51:46 2007
@@ -53,7 +53,7 @@
os_getenv = rffi.llexternal('getenv', [rffi.CCHARP], rffi.CCHARP)
-def getenv_lltypeimpl(name):
+def getenv_llimpl(name):
l_name = rffi.str2charp(name)
l_result = os_getenv(l_name)
if l_result:
@@ -65,7 +65,7 @@
register_external(r_getenv, [str], annmodel.SomeString(can_be_None=True),
export_name='ll_os.ll_os_getenv',
- llimpl=getenv_lltypeimpl)
+ llimpl=getenv_llimpl)
# ____________________________________________________________
@@ -79,7 +79,7 @@
os_putenv = rffi.llexternal('putenv', [rffi.CCHARP], rffi.INT)
-def putenv_lltypeimpl(name, value):
+def putenv_llimpl(name, value):
l_string = rffi.str2charp('%s=%s' % (name, value))
error = os_putenv(l_string)
if error:
@@ -94,7 +94,7 @@
register_external(r_putenv, [str, str], annmodel.s_None,
export_name='ll_os.ll_os_putenv',
- llimpl=putenv_lltypeimpl)
+ llimpl=putenv_llimpl)
# ____________________________________________________________
@@ -106,7 +106,7 @@
os_unsetenv = rffi.llexternal('unsetenv', [rffi.CCHARP], rffi.INT)
- def unsetenv_lltypeimpl(name):
+ def unsetenv_llimpl(name):
l_name = rffi.str2charp(name)
error = os_unsetenv(l_name)
rffi.free_charp(l_name)
@@ -122,7 +122,7 @@
register_external(r_unsetenv, [str], annmodel.s_None,
export_name='ll_os.ll_os_unsetenv',
- llimpl=unsetenv_lltypeimpl)
+ llimpl=unsetenv_llimpl)
# ____________________________________________________________
# Access to the 'environ' external variable
@@ -142,7 +142,7 @@
def r_envkeys():
just_a_placeholder
-def envkeys_lltypeimpl():
+def envkeys_llimpl():
environ = os_get_environ()
result = []
i = 0
@@ -156,14 +156,14 @@
register_external(r_envkeys, [], [str], # returns a list of strings
export_name='ll_os.ll_os_envkeys',
- llimpl=envkeys_lltypeimpl)
+ llimpl=envkeys_llimpl)
# ____________________________________________________________
def r_envitems():
just_a_placeholder
-def envitems_lltypeimpl():
+def envitems_llimpl():
environ = os_get_environ()
result = []
i = 0
@@ -177,4 +177,4 @@
register_external(r_envitems, [], [(str, str)],
export_name='ll_os.ll_os_envitems',
- llimpl=envitems_lltypeimpl)
+ llimpl=envitems_llimpl)
Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_stat.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_stat.py (original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_stat.py Sat Aug 25 12:51:46 2007
@@ -168,7 +168,7 @@
os_mystat = rffi.llexternal(name, [ARG1, STRUCT_STAT], rffi.INT,
includes=INCLUDES)
- def os_mystat_lltypeimpl(arg):
+ def os_mystat_llimpl(arg):
stresult = lltype.malloc(STRUCT_STAT.TO, flavor='raw')
try:
if arg_is_path:
@@ -188,5 +188,5 @@
s_arg = int
register_external(getattr(os, name), [s_arg], s_StatResult,
"ll_os.ll_os_%s" % (name,),
- llimpl=func_with_new_name(os_mystat_lltypeimpl,
- 'os_%s_lltypeimpl' % (name,)))
+ llimpl=func_with_new_name(os_mystat_llimpl,
+ 'os_%s_llimpl' % (name,)))
Modified: pypy/branch/pypy-more-rtti-inprogress/translator/c/node.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/translator/c/node.py (original)
+++ pypy/branch/pypy-more-rtti-inprogress/translator/c/node.py Sat Aug 25 12:51:46 2007
@@ -718,7 +718,7 @@
return [FunctionCodeGenerator(graph, db)]
def sandbox_transform(fnobj, db):
- # for --sandbox: replace a function like os_open_lltypeimpl() with
+ # for --sandbox: replace a function like os_open_llimpl() with
# code that communicates with the external process to ask it to
# perform the operation.
from pypy.translator.sandbox import rsandbox
More information about the Pypy-commit
mailing list