Author: Antonio Cuni <[email protected]>
Branch: faster-rstruct-2
Changeset: r91282:91e0aa0b6c31
Date: 2017-05-13 15:11 +0200
http://bitbucket.org/pypy/pypy/changeset/91e0aa0b6c31/
Log: rename fmtiter.result into wbuf, which makes more sense
diff --git a/pypy/module/struct/formatiterator.py
b/pypy/module/struct/formatiterator.py
--- a/pypy/module/struct/formatiterator.py
+++ b/pypy/module/struct/formatiterator.py
@@ -15,7 +15,7 @@
self.args_w = args_w
self.args_index = 0
self.pos = 0
- self.result = MutableStringBuffer(size)
+ self.wbuf = MutableStringBuffer(size)
def advance(self, count):
self.pos += count
@@ -36,7 +36,7 @@
@jit.unroll_safe
def align(self, mask):
pad = (-self.pos) & mask
- self.result.setzeros(self.pos, pad)
+ self.wbuf.setzeros(self.pos, pad)
self.advance(pad)
def finished(self):
diff --git a/pypy/module/struct/interp_struct.py
b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -48,8 +48,8 @@
raise OperationError(space.w_OverflowError, space.newtext(e.msg))
except StructError as e:
raise OperationError(get_error(space), space.newtext(e.msg))
- assert fmtiter.pos == fmtiter.result.getlength(), 'missing .advance() or
wrong calcsize()'
- return fmtiter.result.finish()
+ assert fmtiter.pos == fmtiter.wbuf.getlength(), 'missing .advance() or
wrong calcsize()'
+ return fmtiter.wbuf.finish()
@unwrap_spec(format='text')
diff --git a/rpython/rlib/rstruct/ieee.py b/rpython/rlib/rstruct/ieee.py
--- a/rpython/rlib/rstruct/ieee.py
+++ b/rpython/rlib/rstruct/ieee.py
@@ -265,22 +265,22 @@
return (mant, (sign << BITS - MANT_DIG - 1) | exp)
-def pack_float(result, pos, x, size, be):
+def pack_float(wbuf, pos, x, size, be):
unsigned = float_pack(x, size)
value = rarithmetic.longlongmask(unsigned)
- pack_float_to_buffer(result, pos, value, size, be)
+ pack_float_to_buffer(wbuf, pos, value, size, be)
@jit.unroll_safe
-def pack_float_to_buffer(result, pos, value, size, be):
+def pack_float_to_buffer(wbuf, pos, value, size, be):
if be:
# write in reversed order
for i in range(size):
c = chr((value >> (i * 8)) & 0xFF)
- result.setitem(pos + size - i - 1, c)
+ wbuf.setitem(pos + size - i - 1, c)
else:
for i in range(size):
c = chr((value >> (i * 8)) & 0xFF)
- result.setitem(pos+i, c)
+ wbuf.setitem(pos+i, c)
@jit.unroll_safe
def pack_float80(result, x, size, be):
diff --git a/rpython/rlib/rstruct/nativefmttable.py
b/rpython/rlib/rstruct/nativefmttable.py
--- a/rpython/rlib/rstruct/nativefmttable.py
+++ b/rpython/rlib/rstruct/nativefmttable.py
@@ -33,7 +33,7 @@
return
# slow path
value = longlong2float.float2longlong(doubleval)
- pack_float_to_buffer(fmtiter.result, fmtiter.pos, value, 8,
fmtiter.bigendian)
+ pack_float_to_buffer(fmtiter.wbuf, fmtiter.pos, value, 8,
fmtiter.bigendian)
fmtiter.advance(8)
def pack_float(fmtiter):
@@ -44,7 +44,7 @@
# slow path
value = longlong2float.singlefloat2uint(floatval)
value = widen(value)
- pack_float_to_buffer(fmtiter.result, fmtiter.pos, value, 4,
fmtiter.bigendian)
+ pack_float_to_buffer(fmtiter.wbuf, fmtiter.pos, value, 4,
fmtiter.bigendian)
fmtiter.advance(4)
# ____________________________________________________________
@@ -142,7 +142,7 @@
if len(unistr) != 1:
raise StructError("expected a unicode string of length 1")
c = unistr[0] # string->char conversion for the annotator
- unichar.pack_unichar(c, fmtiter.result, fmtiter.pos)
+ unichar.pack_unichar(c, fmtiter.wbuf, fmtiter.pos)
fmtiter.advance(unichar.UNICODE_SIZE)
@specialize.argtype(0)
diff --git a/rpython/rlib/rstruct/standardfmttable.py
b/rpython/rlib/rstruct/standardfmttable.py
--- a/rpython/rlib/rstruct/standardfmttable.py
+++ b/rpython/rlib/rstruct/standardfmttable.py
@@ -40,7 +40,7 @@
raise CannotWrite
#
# typed_write() might raise CannotWrite
- fmtiter.result.typed_write(TYPE, fmtiter.pos, value)
+ fmtiter.wbuf.typed_write(TYPE, fmtiter.pos, value)
fmtiter.advance(size)
#
@specialize.argtype(0)
@@ -57,7 +57,7 @@
return do_pack_fastpath_maybe
def pack_pad(fmtiter, count):
- fmtiter.result.setzeros(fmtiter.pos, count)
+ fmtiter.wbuf.setzeros(fmtiter.pos, count)
fmtiter.advance(count)
def pack_char(fmtiter):
@@ -65,23 +65,23 @@
if len(string) != 1:
raise StructError("expected a string of length 1")
c = string[0] # string->char conversion for the annotator
- fmtiter.result.setitem(fmtiter.pos, c)
+ fmtiter.wbuf.setitem(fmtiter.pos, c)
fmtiter.advance(1)
def pack_bool(fmtiter):
c = '\x01' if fmtiter.accept_bool_arg() else '\x00'
- fmtiter.result.setitem(fmtiter.pos, c)
+ fmtiter.wbuf.setitem(fmtiter.pos, c)
fmtiter.advance(1)
def _pack_string(fmtiter, string, count):
pos = fmtiter.pos
if len(string) < count:
n = len(string)
- fmtiter.result.setslice(pos, string)
- fmtiter.result.setzeros(pos+n, count-n)
+ fmtiter.wbuf.setslice(pos, string)
+ fmtiter.wbuf.setzeros(pos+n, count-n)
else:
assert count >= 0
- fmtiter.result.setslice(pos, string[:count])
+ fmtiter.wbuf.setslice(pos, string[:count])
fmtiter.advance(count)
def pack_string(fmtiter, count):
@@ -97,7 +97,7 @@
raise StructError("bad '0p' in struct format")
if prefix > 255:
prefix = 255
- fmtiter.result.setitem(fmtiter.pos, chr(prefix))
+ fmtiter.wbuf.setitem(fmtiter.pos, chr(prefix))
fmtiter.advance(1)
_pack_string(fmtiter, string, count-1)
@@ -110,7 +110,7 @@
return
# slow path
try:
- result = ieee.pack_float(fmtiter.result, fmtiter.pos,
+ result = ieee.pack_float(fmtiter.wbuf, fmtiter.pos,
fl, size, fmtiter.bigendian)
except OverflowError:
assert size == 4
@@ -180,11 +180,11 @@
if fmtiter.bigendian:
for i in unroll_revrange_size:
x = (value >> (8*i)) & 0xff
- fmtiter.result.setitem(pos-i, chr(x))
+ fmtiter.wbuf.setitem(pos-i, chr(x))
else:
for i in unroll_revrange_size:
- fmtiter.result.setitem(pos-i, chr(value & 0xff))
+ fmtiter.wbuf.setitem(pos-i, chr(value & 0xff))
value >>= 8
fmtiter.advance(size)
diff --git a/rpython/rlib/rstruct/test/test_pack.py
b/rpython/rlib/rstruct/test/test_pack.py
--- a/rpython/rlib/rstruct/test/test_pack.py
+++ b/rpython/rlib/rstruct/test/test_pack.py
@@ -10,7 +10,7 @@
from rpython.rlib.rstring import StringBuilder
self.value = value
self.bigendian = bigendian
- self.result = MutableStringBuffer(size)
+ self.wbuf = MutableStringBuffer(size)
self.pos = 0
def advance(self, count):
@@ -18,8 +18,8 @@
def finish(self):
# check that we called advance() the right number of times
- assert self.pos == self.result.getlength()
- return self.result.finish()
+ assert self.pos == self.wbuf.getlength()
+ return self.wbuf.finish()
def _accept_arg(self):
return self.value
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
