Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Pyston
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
Pyston
Commits
dba4dc72
Commit
dba4dc72
authored
Aug 14, 2015
by
Kevin Modzelewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Copy in CPython's PyString_Repr
Probably more compatible, but also much faster. Also, set str_cls->tp_repr.
parent
d5932147
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
54 additions
and
48 deletions
+54
-48
src/runtime/str.cpp
src/runtime/str.cpp
+54
-48
No files found.
src/runtime/str.cpp
View file @
dba4dc72
...
...
@@ -1293,63 +1293,68 @@ static bool _needs_escaping[256]
static
char
_hex
[
17
]
=
"0123456789abcdef"
;
// really only needs to be 16 but clang will complain
extern
"C"
PyObject
*
PyString_Repr
(
PyObject
*
obj
,
int
smartquotes
)
noexcept
{
BoxedString
*
self
=
(
BoxedString
*
)
obj
;
assert
(
PyString_Check
(
self
));
std
::
ostringstream
os
(
""
);
llvm
::
StringRef
s
(
self
->
s
());
char
quote
=
'\''
;
if
(
smartquotes
&&
s
.
find
(
'\''
,
0
)
!=
std
::
string
::
npos
&&
s
.
find
(
'\"'
,
0
)
==
std
::
string
::
npos
)
{
quote
=
'\"'
;
}
os
<<
quote
;
for
(
int
i
=
0
;
i
<
s
.
size
();
i
++
)
{
char
c
=
s
[
i
];
if
((
c
==
'\''
&&
quote
==
'\"'
)
||
!
_needs_escaping
[
c
&
0xff
])
{
os
<<
c
;
}
else
{
char
special
=
0
;
switch
(
c
)
{
case
'\t'
:
special
=
't'
;
break
;
case
'\n'
:
special
=
'n'
;
break
;
case
'\r'
:
special
=
'r'
;
break
;
case
'\''
:
special
=
'\''
;
break
;
case
'\"'
:
special
=
'\"'
;
break
;
case
'\\'
:
special
=
'\\'
;
break
;
BoxedString
*
op
=
(
BoxedString
*
)
obj
;
size_t
newsize
=
2
+
4
*
Py_SIZE
(
op
);
PyObject
*
v
;
if
(
newsize
>
PY_SSIZE_T_MAX
||
newsize
/
4
!=
Py_SIZE
(
op
))
{
PyErr_SetString
(
PyExc_OverflowError
,
"string is too large to make repr"
);
return
NULL
;
}
if
(
special
)
{
os
<<
'\\'
;
os
<<
special
;
v
=
PyString_FromStringAndSize
((
char
*
)
NULL
,
newsize
);
if
(
v
==
NULL
)
{
return
NULL
;
}
else
{
os
<<
'\\'
;
os
<<
'x'
;
os
<<
_hex
[(
c
&
0xff
)
/
16
];
os
<<
_hex
[(
c
&
0xff
)
%
16
];
}
Py_ssize_t
i
;
char
c
;
char
*
p
;
int
quote
;
/* figure out which quote to use; single is preferred */
quote
=
'\''
;
if
(
smartquotes
&&
memchr
(
op
->
data
(),
'\''
,
Py_SIZE
(
op
))
&&
!
memchr
(
op
->
data
(),
'"'
,
Py_SIZE
(
op
)))
quote
=
'"'
;
p
=
PyString_AS_STRING
(
v
);
*
p
++
=
quote
;
for
(
i
=
0
;
i
<
Py_SIZE
(
op
);
i
++
)
{
/* There's at least enough room for a hex escape
* and a closing quote. */
assert
(
newsize
-
(
p
-
PyString_AS_STRING
(
v
))
>=
5
);
c
=
op
->
data
()[
i
];
if
(
c
==
quote
||
c
==
'\\'
)
*
p
++
=
'\\'
,
*
p
++
=
c
;
else
if
(
c
==
'\t'
)
*
p
++
=
'\\'
,
*
p
++
=
't'
;
else
if
(
c
==
'\n'
)
*
p
++
=
'\\'
,
*
p
++
=
'n'
;
else
if
(
c
==
'\r'
)
*
p
++
=
'\\'
,
*
p
++
=
'r'
;
else
if
(
c
<
' '
||
c
>=
0x7f
)
{
/* For performance, we don't want to call
* PyOS_snprintf here (extra layers of
* function call). */
sprintf
(
p
,
"
\\
x%02x"
,
c
&
0xff
);
p
+=
4
;
}
else
*
p
++
=
c
;
}
assert
(
newsize
-
(
p
-
PyString_AS_STRING
(
v
))
>=
1
);
*
p
++
=
quote
;
*
p
=
'\0'
;
if
(
_PyString_Resize
(
&
v
,
(
p
-
PyString_AS_STRING
(
v
))))
return
NULL
;
return
v
;
}
os
<<
quote
;
return
boxString
(
os
.
str
());
}
extern
"C"
Box
*
strRepr
(
BoxedString
*
self
)
{
return
PyString_Repr
(
self
,
1
/* smartquotes */
);
}
extern
"C"
Box
*
str_repr
(
Box
*
self
)
noexcept
{
return
PyString_Repr
(
self
,
1
/* smartquotes */
);
}
/* Unescape a backslash-escaped string. If unicode is non-zero,
the string is a u-literal. If recode_encoding is non-zero,
the string is UTF-8 encoded and should be re-encoded in the
...
...
@@ -2882,6 +2887,7 @@ void setupStr() {
add_operators
(
str_cls
);
str_cls
->
freeze
();
str_cls
->
tp_repr
=
str_repr
;
str_cls
->
tp_iter
=
(
decltype
(
str_cls
->
tp_iter
))
strIter
;
str_cls
->
tp_hash
=
(
hashfunc
)
str_hash
;
str_cls
->
tp_as_sequence
->
sq_length
=
str_length
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment