Skip to content
Permalink
brython/www/src/py_string.js
Newer
Older
Raw Normal view History
100644 2919 lines (2706 sloc) 87.9 KB
@PierreQuentel
First import
Sep 5, 2014
1
;(function($B){
2
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
3
var _b_ = $B.builtins
@PierreQuentel
First import
Sep 5, 2014
4
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
5
// build tables from data in unicode_data.js
@PierreQuentel
Generate internal tables for Unicode in unicode_data.js instead of py…
Oct 22, 2019
6
var unicode_tables = $B.unicode_tables
@PierreQuentel
First import
Sep 5, 2014
7
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
8
9
$B.has_surrogate = function(s){
10
// Check if there are "surrogate pairs" characters in string s
11
for(var i = 0; i < s.length; i++){
12
code = s.charCodeAt(i)
13
if(code >= 0xD800 && code <= 0xDBFF){
14
return true
15
}
16
}
17
return false
18
}
19
Change in string management. Related to issue #1736.
Aug 7, 2021
20
$B.String = function(s){
21
var codepoints = [],
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
22
surrogates = [],
23
j = 0
Change in string management. Related to issue #1736.
Aug 7, 2021
24
for(var i = 0, len = s.length; i < len; i++){
25
var cp = s.codePointAt(i)
26
if(cp >= 0x10000){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
27
surrogates.push(j)
Change in string management. Related to issue #1736.
Aug 7, 2021
28
i++
29
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
30
j++
Change in string management. Related to issue #1736.
Aug 7, 2021
31
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
32
if(surrogates.length == 0){
33
return s
Change in string management. Related to issue #1736.
Aug 7, 2021
34
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
35
var res = new String(s)
36
res.__class__ = str
37
res.surrogates = surrogates
38
return res
39
}
40
41
function pypos2jspos(s, pypos){
42
// convert Python position to JS position
43
if(s.surrogates === undefined){
44
return pypos
45
}
46
var nb = 0
47
while(s.surrogates[nb] < pypos){
48
nb++
49
}
50
return pypos + nb
Change in string management. Related to issue #1736.
Aug 7, 2021
51
}
52
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
53
function jspos2pypos(s, jspos){
54
// convert JS position to Python position
55
if(s.surrogates === undefined){
56
return jspos
57
}
58
var nb = 0
59
while(s.surrogates[nb] + nb < jspos){
60
nb++
61
}
62
return jspos - nb
63
}
64
str
Feb 10, 2018
65
var str = {
Coding style
Mar 19, 2018
66
__class__: _b_.type,
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
67
__dir__: _b_.object.__dir__,
Fixes #1007 : __name__ should not be an attribute of bool values, int…
Jan 2, 2019
68
$infos: {
69
__module__: "builtins",
70
__name__: "str"
71
},
str
Feb 10, 2018
72
$is_class: true,
Coding style
Mar 19, 2018
73
$native: true
@PierreQuentel
First import
Sep 5, 2014
74
}
75
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
76
function normalize_start_end($){
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
77
var len
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
78
if(typeof $.self == "string"){
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
79
len = $.self.length
80
}else{
81
len = str.__len__($.self)
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
82
}
83
if($.start === null || $.start === _b_.None){
84
$.start = 0
85
}else if($.start < 0){
86
$.start += len
Coding style
Mar 19, 2018
87
$.start = Math.max(0, $.start)
88
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
89
if($.end === null || $.end === _b_.None){
90
$.end = len
91
}else if($.end < 0){
92
$.end += len
Coding style
Mar 19, 2018
93
$.end = Math.max(0, $.end)
94
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
95
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
96
if(! _b_.isinstance($.start, _b_.int) || ! _b_.isinstance($.end, _b_.int)){
Coding style
Mar 19, 2018
97
throw _b_.TypeError.$factory("slice indices must be integers " +
98
"or None or have an __index__ method")
99
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
100
if($.self.surrogates){
101
$.js_start = pypos2jspos($.self, $.start)
102
$.js_end = pypos2jspos($.self, $.end)
103
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
104
}
105
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
106
function reverse(s){
107
// Reverse a string
Coding style
Mar 19, 2018
108
return s.split("").reverse().join("")
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
109
}
110
Fixes some error messages in string methods
Apr 5, 2021
111
function check_str(obj, prefix){
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
112
if(obj instanceof String || typeof obj == "string"){
113
return
114
}
Coding style
Mar 19, 2018
115
if(! _b_.isinstance(obj, str)){
Fixes some error messages in string methods
Apr 5, 2021
116
throw _b_.TypeError.$factory((prefix || '') +
117
"must be str, not " + $B.class_name(obj))
Coding style
Mar 19, 2018
118
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
119
}
120
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
121
function to_chars(s){
122
// Transform Javascript string s into a list of Python characters
123
// (2 JS chars if surrogate, 1 otherwise)
124
var chars = []
125
for(var i = 0, len = s.length; i < len; i++){
126
var code = s.charCodeAt(i)
127
if(code >= 0xD800 && code <= 0xDBFF){
128
chars.push(s.substr(i, 2))
129
i++
130
}else{
131
chars.push(s.charAt(i))
132
}
133
}
134
return chars
135
}
136
@PierreQuentel
Fix bug in string hash
Apr 26, 2021
137
function to_codepoints(s){
138
// Transform Javascript string s into a list of codepoints
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
139
if(s.codepoints){
Change in string management. Related to issue #1736.
Aug 7, 2021
140
return s.codepoints
141
}
@PierreQuentel
Fix bug in string hash
Apr 26, 2021
142
var cps = []
143
for(var i = 0, len = s.length; i < len; i++){
144
var code = s.charCodeAt(i)
145
if(code >= 0xD800 && code <= 0xDBFF){
146
var v = 0x10000
147
v += (code & 0x03FF) << 10
148
v += (s.charCodeAt(i + 1) & 0x03FF)
149
cps.push(v)
150
i++
151
}else{
152
cps.push(code)
153
}
154
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
155
return s.codepoints = cps
@PierreQuentel
Fix bug in string hash
Apr 26, 2021
156
}
157
Add method __add__ for strings with surrogate pairs
Dec 11, 2020
158
str.__add__ = function(self, other){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
159
if(! _b_.isinstance(other, str)){
160
try{
161
return $B.$getattr(other, "__radd__")(self)
162
}catch(err){
Coding style
Mar 19, 2018
163
throw _b_.TypeError.$factory("Can't convert " +
Replace occurrences of $B.get_class(obj).__name__ by $B.class_name(ob…
Jan 3, 2019
164
$B.class_name(other) + " to str implicitly")}
@PierreQuentel
First import
Sep 5, 2014
165
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
166
return $B.String(self + other)
@PierreQuentel
First import
Sep 5, 2014
167
}
168
Coding style
Mar 19, 2018
169
str.__contains__ = function(self, item){
Fixes #1365 : strings with surrogate pairs (was: re module may be cra…
Apr 25, 2020
170
if(! _b_.isinstance(item, str)){
Coding style
Mar 19, 2018
171
throw _b_.TypeError.$factory("'in <string>' requires " +
172
"string as left operand, not " + item.__class__)
173
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
174
if(item.__class__ === str || _b_.isinstance(item, str)){
Fixes #1365 : strings with surrogate pairs (was: re module may be cra…
Apr 25, 2020
175
var nbcar = item.length
176
}else{
177
var nbcar = _b_.len(item)
178
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
179
if(nbcar == 0){
180
// a string contains the empty string
181
return true
182
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
183
var len = self.length
184
if(len == 0){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
185
return nbcar == 0
186
}
Coding style
Mar 19, 2018
187
for(var i = 0, len = self.length; i < len; i++){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
188
if(self.substr(i, nbcar) == item){
189
return true
190
}
@PierreQuentel
First import
Sep 5, 2014
191
}
192
return false
193
}
194
str
Feb 10, 2018
195
str.__delitem__ = function(){
Implement exceptions as new-style classes
Feb 10, 2018
196
throw _b_.TypeError.$factory("'str' object doesn't support item deletion")
@PierreQuentel
First import
Sep 5, 2014
197
}
198
Coding style
Mar 19, 2018
199
// __dir__must be assigned explicitely because attribute resolution for
200
// builtin classes doesn't use __mro__
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
201
str.__dir__ = _b_.object.__dir__
Merged with legacy_format_refactor
Jan 14, 2015
202
Fixes bugs related to strings (equality of strings with surrogate pai…
Jan 15, 2021
203
str.__eq__ = function(self, other){
Coding style
Mar 23, 2018
204
if(_b_.isinstance(other, _b_.str)){
Merged with legacy_format_refactor
Jan 14, 2015
205
return other.valueOf() == self.valueOf()
206
}
Impacts of dict implementation change in other scripts
Dec 10, 2018
207
return _b_.NotImplemented
@PierreQuentel
First import
Sep 5, 2014
208
}
209
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
210
function preformat(self, fmt){
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
211
if(fmt.empty){
212
return _b_.str.$factory(self)
213
}
Coding style
Mar 19, 2018
214
if(fmt.type && fmt.type != "s"){
215
throw _b_.ValueError.$factory("Unknown format code '" + fmt.type +
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
216
"' for object of type 'str'")
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
217
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
218
return self
219
}
220
str
Feb 10, 2018
221
str.__format__ = function(self, format_spec) {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
222
var fmt = new $B.parse_format_spec(format_spec)
Coding style
Mar 19, 2018
223
if(fmt.sign !== undefined){
224
throw _b_.ValueError.$factory(
225
"Sign not allowed in string format specifier")
Raise an exception if a string format specifier has a sign
Sep 24, 2017
226
}
Fixes #1396 : string formatting - precision truncation not up to spec
May 21, 2020
227
if(fmt.precision){
228
self = self.substr(0, fmt.precision)
229
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
230
// For strings, alignment default to left
Coding style
Mar 19, 2018
231
fmt.align = fmt.align || "<"
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
232
return $B.format_width(preformat(self, fmt), fmt)
@PierreQuentel
First import
Sep 5, 2014
233
}
234
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
235
str.__getitem__ = function(self, arg){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
236
var len = str.__len__(self)
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
237
if(_b_.isinstance(arg, _b_.int)){
@PierreQuentel
First import
Sep 5, 2014
238
var pos = arg
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
239
if(arg < 0){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
240
pos += len
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
241
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
242
if(pos >= 0 && pos < len){
243
var jspos = pypos2jspos(self, pos)
244
if(self.codePointAt(jspos) >= 0x10000){
245
return $B.String(self.substr(jspos, 2))
246
}else{
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
247
return self[jspos]
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
248
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
249
}
Coding style
Mar 19, 2018
250
throw _b_.IndexError.$factory("string index out of range")
251
}
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
252
if(_b_.isinstance(arg, _b_.slice)){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
253
var s = _b_.slice.$conv_for_seq(arg, len),
254
start = pypos2jspos(self, s.start),
255
stop = pypos2jspos(self, s.stop),
Coding style
Mar 19, 2018
256
step = s.step
257
var res = "",
Coding style
Mar 19, 2018
258
i = null
Coding style
Mar 19, 2018
259
if(step > 0){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
260
if(stop <= start){
261
return ""
262
}
263
for(var i = start; i < stop; i += step){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
264
res += self[i]
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
265
}
Coding style
Mar 23, 2018
266
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
267
if(stop >= start){
268
return ''
269
}
270
for(var i = start; i > stop; i += step){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
271
res += self[i]
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
272
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
273
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
274
return $B.String(res)
@PierreQuentel
First import
Sep 5, 2014
275
}
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
276
if(_b_.isinstance(arg, _b_.bool)){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
277
return self.__getitem__(_b_.int.$factory(arg))
278
}
Coding style
Mar 19, 2018
279
throw _b_.TypeError.$factory("string indices must be integers")
@PierreQuentel
First import
Sep 5, 2014
280
}
281
Change algorithm to compute hash of strings
Dec 20, 2018
282
var prefix = 2,
283
suffix = 3,
Cache string hash
Jun 12, 2020
284
mask = (2 ** 32 - 1),
285
str_hash_cache = {}
286
When str hash cache is reset, update the counter
Jun 18, 2020
287
str.$nb_str_hash_cache = 0
Cache string hash
Jun 12, 2020
288
Change algorithm to compute hash of strings
Dec 20, 2018
289
function fnv(p){
290
if(p.length == 0){
291
return 0
292
}
@PierreQuentel
First import
Sep 5, 2014
293
Change algorithm to compute hash of strings
Dec 20, 2018
294
var x = prefix
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
295
x = (x ^ (p[0] << 7)) & mask
Change algorithm to compute hash of strings
Dec 20, 2018
296
for(var i = 0, len = p.length; i < len; i++){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
297
x = ((1000003 * x) ^ p[i]) & mask
Change algorithm to compute hash of strings
Dec 20, 2018
298
}
299
x = (x ^ p.length) & mask
300
x = (x ^ suffix) & mask
@PierreQuentel
First import
Sep 5, 2014
301
Change algorithm to compute hash of strings
Dec 20, 2018
302
if(x == -1){
303
x = -2
304
}
305
return x
306
}
Add methods get_test.py() and post() to ajax objects
Jan 4, 2019
307
Change algorithm to compute hash of strings
Dec 20, 2018
308
str.__hash__ = function(self) {
Cache string hash
Jun 12, 2020
309
if(str_hash_cache[self] !== undefined){
310
return str_hash_cache[self]
311
}
When str hash cache is reset, update the counter
Jun 18, 2020
312
str.$nb_str_hash_cache++
313
if(str.$nb_str_hash_cache > 100000){
Limit size of string hash cache
Jun 18, 2020
314
// Avoid memory overflow
When str hash cache is reset, update the counter
Jun 18, 2020
315
str.$nb_str_hash_cache = 0
Limit size of string hash cache
Jun 18, 2020
316
str_hash_cache = {}
317
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
318
try{
319
return str_hash_cache[self] = fnv(to_codepoints(self))
320
}catch(err){
321
console.log('error hash, cps', self, to_codepoints(self))
322
throw err
323
}
@PierreQuentel
First import
Sep 5, 2014
324
}
325
Coding style
Mar 19, 2018
326
str.__init__ = function(self, arg){
@PierreQuentel
First import
Sep 5, 2014
327
self.valueOf = function(){return arg}
328
self.toString = function(){return arg}
@PierreQuentel
Fixes #253 : some builtin functions that should return None instead r…
Aug 24, 2015
329
return _b_.None
@PierreQuentel
First import
Sep 5, 2014
330
}
331
Simplify implementation of iteration on built-in types. Change implem…
Apr 3, 2019
332
var str_iterator = $B.make_iterator_class("str_iterator")
str
Feb 10, 2018
333
str.__iter__ = function(self){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
334
return str_iterator.$factory(to_chars(self))
@PierreQuentel
First import
Sep 5, 2014
335
}
336
Fixes #1365 : strings with surrogate pairs (was: re module may be cra…
Apr 25, 2020
337
str.__len__ = function(self){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
338
if(self.surrogates === undefined){
339
return self.length
Change in string management. Related to issue #1736.
Aug 7, 2021
340
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
341
if(self.len !== undefined){
342
return self.len
343
}
344
var len = self.len = self.valueOf().length - self.surrogates.length
345
return len
Fixes #1365 : strings with surrogate pairs (was: re module may be cra…
Apr 25, 2020
346
}
@PierreQuentel
First import
Sep 5, 2014
347
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
348
// Start of section for legacy formatting (with %)
349
Coding style
Mar 19, 2018
350
var kwarg_key = new RegExp("([^\\)]*)\\)")
Merged with legacy_format_refactor
Jan 14, 2015
351
352
var NotANumber = function() {
Coding style
Mar 19, 2018
353
this.name = "NotANumber"
Merged with legacy_format_refactor
Jan 14, 2015
354
}
355
Coding style
Mar 19, 2018
356
var number_check = function(s){
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
357
if(! _b_.isinstance(s, [_b_.int, _b_.float])){
Merged with legacy_format_refactor
Jan 14, 2015
358
throw new NotANumber()
359
}
360
}
361
Coding style
Mar 19, 2018
362
var get_char_array = function(size, char){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
363
if(size <= 0){
364
return ""
365
}
Merged with legacy_format_refactor
Jan 14, 2015
366
return new Array(size + 1).join(char)
367
}
368
Coding style
Mar 19, 2018
369
var format_padding = function(s, flags, minus_one){
Merged with legacy_format_refactor
Jan 14, 2015
370
var padding = flags.padding
Coding style
Mar 23, 2018
371
if(! padding){ // undefined
Merged with legacy_format_refactor
Jan 14, 2015
372
return s
373
}
374
s = s.toString()
375
padding = parseInt(padding, 10)
Coding style
Mar 23, 2018
376
if(minus_one){ // numeric formatting where sign goes in front of padding
Merged with legacy_format_refactor
Jan 14, 2015
377
padding -= 1
378
}
Coding style
Mar 19, 2018
379
if(! flags.left){
Merged with legacy_format_refactor
Jan 14, 2015
380
return get_char_array(padding - s.length, flags.pad_char) + s
Coding style
Mar 19, 2018
381
}else{
Merged with legacy_format_refactor
Jan 14, 2015
382
// left adjusted
383
return s + get_char_array(padding - s.length, flags.pad_char)
384
}
385
}
386
Coding style
Mar 19, 2018
387
var format_int_precision = function(val, flags){
Merged with legacy_format_refactor
Jan 14, 2015
388
var precision = flags.precision
Coding style
Mar 19, 2018
389
if(!precision){
Merged with legacy_format_refactor
Jan 14, 2015
390
return val.toString()
391
}
392
precision = parseInt(precision, 10)
@earney
fix int precision issue when int is a long int
Jun 18, 2015
393
var s
Coding style
Mar 19, 2018
394
if(val.__class__ === $B.long_int){
395
s = $B.long_int.to_base(val, 10)
396
}else{
397
s = val.toString()
@earney
fix int precision issue when int is a long int
Jun 18, 2015
398
}
Coding style
Mar 19, 2018
399
if(s[0] === "-"){
400
return "-" + get_char_array(precision - s.length + 1, "0") + s.slice(1)
Merged with legacy_format_refactor
Jan 14, 2015
401
}
Coding style
Mar 19, 2018
402
return get_char_array(precision - s.length, "0") + s
Merged with legacy_format_refactor
Jan 14, 2015
403
}
404
Coding style
Mar 19, 2018
405
var format_float_precision = function(val, upper, flags, modifier){
Merged with legacy_format_refactor
Jan 14, 2015
406
var precision = flags.precision
407
// val is a float
Coding style
Mar 19, 2018
408
if(isFinite(val)){
Fix bug with float formatting
Dec 22, 2016
409
return modifier(val, precision, flags, upper)
Merged with legacy_format_refactor
Jan 14, 2015
410
}
Coding style
Mar 19, 2018
411
if(val === Infinity){
412
val = "inf"
413
}else if(val === -Infinity){
414
val = "-inf"
415
}else{
416
val = "nan"
Merged with legacy_format_refactor
Jan 14, 2015
417
}
Coding style
Mar 19, 2018
418
if(upper){
Merged with legacy_format_refactor
Jan 14, 2015
419
return val.toUpperCase()
420
}
421
return val
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
422
Merged with legacy_format_refactor
Jan 14, 2015
423
}
424
Coding style
Mar 19, 2018
425
var format_sign = function(val, flags){
426
if(flags.sign){
427
if(val >= 0){
Merged with legacy_format_refactor
Jan 14, 2015
428
return "+"
@PierreQuentel
First import
Sep 5, 2014
429
}
Coding style
Mar 19, 2018
430
}else if (flags.space){
431
if(val >= 0){
Merged with legacy_format_refactor
Jan 14, 2015
432
return " "
433
}
434
}
435
return ""
436
}
@PierreQuentel
First import
Sep 5, 2014
437
Merged with legacy_format_refactor
Jan 14, 2015
438
var str_format = function(val, flags) {
439
// string format supports left and right padding
440
flags.pad_char = " " // even if 0 padding is defined, don't use it
str
Feb 10, 2018
441
return format_padding(str.$factory(val), flags)
Merged with legacy_format_refactor
Jan 14, 2015
442
}
@PierreQuentel
First import
Sep 5, 2014
443
Merged with legacy_format_refactor
Jan 14, 2015
444
var num_format = function(val, flags) {
445
number_check(val)
Coding style
Mar 19, 2018
446
if(val.__class__ === $B.long_int){
447
val = $B.long_int.to_base(val, 10)
448
}else{
449
val = parseInt(val)
@earney
make string format compatible with long int
Jun 7, 2015
450
}
451
Merged with legacy_format_refactor
Jan 14, 2015
452
var s = format_int_precision(val, flags)
Coding style
Mar 19, 2018
453
if(flags.pad_char === "0"){
454
if(val < 0){
Merged with legacy_format_refactor
Jan 14, 2015
455
s = s.substring(1)
Coding style
Mar 19, 2018
456
return "-" + format_padding(s, flags, true)
Merged with legacy_format_refactor
Jan 14, 2015
457
}
458
var sign = format_sign(val, flags)
Coding style
Mar 19, 2018
459
if(sign !== ""){
Merged with legacy_format_refactor
Jan 14, 2015
460
return sign + format_padding(s, flags, true)
461
}
462
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
463
Merged with legacy_format_refactor
Jan 14, 2015
464
return format_padding(format_sign(val, flags) + s, flags)
465
}
@PierreQuentel
First import
Sep 5, 2014
466
Merged with legacy_format_refactor
Jan 14, 2015
467
var repr_format = function(val, flags) {
468
flags.pad_char = " " // even if 0 padding is defined, don't use it
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
469
return format_padding(_b_.repr(val), flags)
Merged with legacy_format_refactor
Jan 14, 2015
470
}
@PierreQuentel
First import
Sep 5, 2014
471
Merged with legacy_format_refactor
Jan 14, 2015
472
var ascii_format = function(val, flags) {
473
flags.pad_char = " " // even if 0 padding is defined, don't use it
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
474
return format_padding(_b_.ascii(val), flags)
Merged with legacy_format_refactor
Jan 14, 2015
475
}
@PierreQuentel
First import
Sep 5, 2014
476
Set of minor bug fixes and improvements
Sep 11, 2017
477
// converts val to float and sets precision if missing
Coding style
Mar 19, 2018
478
var _float_helper = function(val, flags){
Merged with legacy_format_refactor
Jan 14, 2015
479
number_check(val)
Coding style
Mar 19, 2018
480
if(! flags.precision){
481
if(! flags.decimal_point){
Merged with legacy_format_refactor
Jan 14, 2015
482
flags.precision = 6
Coding style
Mar 19, 2018
483
}else{
Merged with legacy_format_refactor
Jan 14, 2015
484
flags.precision = 0
485
}
Coding style
Mar 19, 2018
486
}else{
Merged with legacy_format_refactor
Jan 14, 2015
487
flags.precision = parseInt(flags.precision, 10)
488
validate_precision(flags.precision)
489
}
490
return parseFloat(val)
491
}
@PierreQuentel
First import
Sep 5, 2014
492
Merged with legacy_format_refactor
Jan 14, 2015
493
// used to capture and remove trailing zeroes
Coding style
Mar 19, 2018
494
var trailing_zeros = /(.*?)(0+)([eE].*)/,
495
leading_zeros = /\.(0*)/,
496
trailing_dot = /\.$/
@PierreQuentel
First import
Sep 5, 2014
497
Merged with legacy_format_refactor
Jan 14, 2015
498
var validate_precision = function(precision) {
499
// force precision to limits of javascript
Coding style
Mar 19, 2018
500
if(precision > 20){precision = 20}
Merged with legacy_format_refactor
Jan 14, 2015
501
}
502
503
// gG
Coding style
Mar 19, 2018
504
var floating_point_format = function(val, upper, flags){
505
val = _float_helper(val, flags),
506
v = val.toString(),
507
v_len = v.length,
508
dot_idx = v.indexOf('.')
509
if(dot_idx < 0){dot_idx = v_len}
510
if(val < 1 && val > -1){
511
var zeros = leading_zeros.exec(v),
512
numzeros
513
if(zeros){
Merged with legacy_format_refactor
Jan 14, 2015
514
numzeros = zeros[1].length
Coding style
Mar 19, 2018
515
}else{
Merged with legacy_format_refactor
Jan 14, 2015
516
numzeros = 0
517
}
Coding style
Mar 19, 2018
518
if(numzeros >= 4){
519
val = format_sign(val, flags) + format_float_precision(val, upper,
520
flags, _floating_g_exp_helper)
521
if(!flags.alternate){
Merged with legacy_format_refactor
Jan 14, 2015
522
var trl = trailing_zeros.exec(val)
Coding style
Mar 19, 2018
523
if(trl){
524
val = trl[1].replace(trailing_dot, "") + trl[3] // remove trailing
@PierreQuentel
Huge set of changes in core Brython scripts : new names and namespace…
Oct 8, 2014
525
}
Coding style
Mar 19, 2018
526
}else{
527
if(flags.precision <= 1){
528
val = val[0] + "." + val.substring(1)
@PierreQuentel
Huge set of changes in core Brython scripts : new names and namespace…
Oct 8, 2014
529
}
Merged with legacy_format_refactor
Jan 14, 2015
530
}
531
return format_padding(val, flags)
532
}
Fix bug with float formatting
Dec 22, 2016
533
flags.precision = (flags.precision || 0) + numzeros
Coding style
Mar 19, 2018
534
return format_padding(format_sign(val, flags) +
535
format_float_precision(val, upper, flags,
536
function(val, precision) {
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
537
return val.toFixed(_b_.min(precision, v_len - dot_idx) +
Coding style
Mar 19, 2018
538
numzeros)
539
}),
540
flags
541
)
542
}
543
544
if(dot_idx > flags.precision){
545
val = format_sign(val, flags) + format_float_precision(val, upper,
546
flags, _floating_g_exp_helper)
547
if(! flags.alternate){
Merged with legacy_format_refactor
Jan 14, 2015
548
var trl = trailing_zeros.exec(val)
Coding style
Mar 19, 2018
549
if(trl){
550
val = trl[1].replace(trailing_dot, "") + trl[3] // remove trailing
Merged with legacy_format_refactor
Jan 14, 2015
551
}
Coding style
Mar 19, 2018
552
}else{
553
if(flags.precision <= 1){
554
val = val[0] + "." + val.substring(1)
Merged with legacy_format_refactor
Jan 14, 2015
555
}
556
}
557
return format_padding(val, flags)
558
}
Coding style
Mar 19, 2018
559
return format_padding(format_sign(val, flags) +
560
format_float_precision(val, upper, flags,
561
function(val, precision) {
562
if(!flags.decimal_point){
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
563
precision = _b_.min(v_len - 1, 6)
Coding style
Mar 19, 2018
564
}else if (precision > v_len){
565
if(! flags.alternate){
566
precision = v_len
567
}
@PierreQuentel
First import
Sep 5, 2014
568
}
Coding style
Mar 19, 2018
569
if(precision < dot_idx){
570
precision = dot_idx
571
}
572
return val.toFixed(precision - dot_idx)
573
}),
574
flags
575
)
Merged with legacy_format_refactor
Jan 14, 2015
576
}
@PierreQuentel
First import
Sep 5, 2014
577
Coding style
Mar 19, 2018
578
var _floating_g_exp_helper = function(val, precision, flags, upper){
579
if(precision){--precision}
Merged with legacy_format_refactor
Jan 14, 2015
580
val = val.toExponential(precision)
581
// pad exponent to two digits
Coding style
Mar 19, 2018
582
var e_idx = val.lastIndexOf("e")
583
if(e_idx > val.length - 4){
584
val = val.substring(0, e_idx + 2) + "0" + val.substring(e_idx + 2)
Merged with legacy_format_refactor
Jan 14, 2015
585
}
Coding style
Mar 19, 2018
586
if(upper){return val.toUpperCase()}
Merged with legacy_format_refactor
Jan 14, 2015
587
return val
588
}
589
590
// fF
591
var floating_point_decimal_format = function(val, upper, flags) {
592
val = _float_helper(val, flags)
Coding style
Mar 19, 2018
593
return format_padding(format_sign(val, flags) +
594
format_float_precision(val, upper, flags,
595
function(val, precision, flags) {
596
val = val.toFixed(precision)
597
if(precision === 0 && flags.alternate){
598
val += '.'
599
}
600
return val
601
}),
602
flags
603
)
Merged with legacy_format_refactor
Jan 14, 2015
604
}
605
606
var _floating_exp_helper = function(val, precision, flags, upper) {
607
val = val.toExponential(precision)
608
// pad exponent to two digits
Coding style
Mar 19, 2018
609
var e_idx = val.lastIndexOf("e")
Coding style
Mar 23, 2018
610
if(e_idx > val.length - 4){
Coding style
Mar 19, 2018
611
val = val.substring(0, e_idx + 2) + "0" + val.substring(e_idx + 2)
Merged with legacy_format_refactor
Jan 14, 2015
612
}
Coding style
Mar 19, 2018
613
if(upper){return val.toUpperCase()}
Merged with legacy_format_refactor
Jan 14, 2015
614
return val
615
}
616
617
// eE
Coding style
Mar 19, 2018
618
var floating_point_exponential_format = function(val, upper, flags){
Merged with legacy_format_refactor
Jan 14, 2015
619
val = _float_helper(val, flags)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
620
Coding style
Mar 19, 2018
621
return format_padding(format_sign(val, flags) +
622
format_float_precision(val, upper, flags, _floating_exp_helper), flags)
Merged with legacy_format_refactor
Jan 14, 2015
623
}
624
Coding style
Mar 19, 2018
625
var signed_hex_format = function(val, upper, flags){
@earney
make string format compatible with long int
Jun 7, 2015
626
var ret
Merged with legacy_format_refactor
Jan 14, 2015
627
number_check(val)
@earney
make string format compatible with long int
Jun 7, 2015
628
Coding style
Mar 23, 2018
629
if(val.__class__ === $B.long_int){
Coding style
Mar 19, 2018
630
ret = $B.long_int.to_base(val, 16)
631
}else{
@earney
make string format compatible with long int
Jun 7, 2015
632
ret = parseInt(val)
633
ret = ret.toString(16)
634
}
Merged with legacy_format_refactor
Jan 14, 2015
635
ret = format_int_precision(ret, flags)
Coding style
Mar 19, 2018
636
if(upper){ret = ret.toUpperCase()}
Coding style
Mar 23, 2018
637
if(flags.pad_char === "0"){
Coding style
Mar 19, 2018
638
if(val < 0){
Merged with legacy_format_refactor
Jan 14, 2015
639
ret = ret.substring(1)
Coding style
Mar 19, 2018
640
ret = "-" + format_padding(ret, flags, true)
Merged with legacy_format_refactor
Jan 14, 2015
641
}
642
var sign = format_sign(val, flags)
Coding style
Mar 19, 2018
643
if(sign !== ""){
Merged with legacy_format_refactor
Jan 14, 2015
644
ret = sign + format_padding(ret, flags, true)
@PierreQuentel
First import
Sep 5, 2014
645
}
Merged with legacy_format_refactor
Jan 14, 2015
646
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
647
Coding style
Mar 19, 2018
648
if(flags.alternate){
649
if(ret.charAt(0) === "-"){
650
if(upper){ret = "-0X" + ret.slice(1)}
651
else{ret = "-0x" + ret.slice(1)}
652
}else{
653
if(upper){ret = "0X" + ret}
654
else{ret = "0x" + ret}
Merged with legacy_format_refactor
Jan 14, 2015
655
}
656
}
657
return format_padding(format_sign(val, flags) + ret, flags)
658
}
@PierreQuentel
First import
Sep 5, 2014
659
Merged with legacy_format_refactor
Jan 14, 2015
660
var octal_format = function(val, flags) {
661
number_check(val)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
662
var ret
@earney
also long int octal string formatting....
Jun 7, 2015
663
Coding style
Mar 19, 2018
664
if(val.__class__ === $B.long_int){
665
ret = $B.long_int.to_base(8)
666
}else{
667
ret = parseInt(val)
668
ret = ret.toString(8)
@earney
also long int octal string formatting....
Jun 7, 2015
669
}
670
Merged with legacy_format_refactor
Jan 14, 2015
671
ret = format_int_precision(ret, flags)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
672
Coding style
Mar 19, 2018
673
if(flags.pad_char === "0"){
674
if(val < 0){
Merged with legacy_format_refactor
Jan 14, 2015
675
ret = ret.substring(1)
Coding style
Mar 19, 2018
676
ret = "-" + format_padding(ret, flags, true)
Merged with legacy_format_refactor
Jan 14, 2015
677
}
678
var sign = format_sign(val, flags)
Coding style
Mar 19, 2018
679
if(sign !== ""){
Merged with legacy_format_refactor
Jan 14, 2015
680
ret = sign + format_padding(ret, flags, true)
681
}
@PierreQuentel
First import
Sep 5, 2014
682
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
683
Coding style
Mar 19, 2018
684
if(flags.alternate){
685
if(ret.charAt(0) === "-"){ret = "-0o" + ret.slice(1)}
686
else{ret = "0o" + ret}
@PierreQuentel
First import
Sep 5, 2014
687
}
Merged with legacy_format_refactor
Jan 14, 2015
688
return format_padding(ret, flags)
689
}
690
Implement PEP 461 : Adding % formatting to bytes and bytearray (cf. i…
Dec 18, 2019
691
function series_of_bytes(val, flags){
692
if(val.__class__ && val.__class__.$buffer_protocol){
693
var it = _b_.iter(val),
694
ints = []
695
while(true){
696
try{
697
ints.push(_b_.next(it))
698
}catch(err){
699
if(err.__class__ === _b_.StopIteration){
700
var b = _b_.bytes.$factory(ints)
701
return format_padding(_b_.bytes.decode(b, "ascii"), flags)
702
}
703
throw err
704
}
705
}
706
}else{
707
try{
708
bytes_obj = $B.$getattr(val, "__bytes__")
709
return format_padding(_b_.bytes.decode(bytes_obj), flags)
710
}catch(err){
711
if(err.__class__ === _b_.AttributeError){
712
throw _b_.TypeError.$factory("%b does not accept '" +
713
$B.class_name(val) + "'")
714
}
715
throw err
716
}
717
}
718
}
719
Coding style
Mar 19, 2018
720
var single_char_format = function(val, flags){
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
721
if(_b_.isinstance(val, str) && val.length == 1){
Implement PEP 461 : Adding % formatting to bytes and bytearray (cf. i…
Dec 18, 2019
722
return val
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
723
}else if(_b_.isinstance(val, _b_.bytes) && val.source.length == 1){
Implement PEP 461 : Adding % formatting to bytes and bytearray (cf. i…
Dec 18, 2019
724
val = val.source[0]
725
}else{
726
try{
727
val = _b_.int.$factory(val) // yes, floats are valid (they are cast to int)
728
}catch (err){
729
throw _b_.TypeError.$factory("%c requires int or char")
730
}
Merged with legacy_format_refactor
Jan 14, 2015
731
}
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
732
return format_padding(_b_.chr(val), flags)
Merged with legacy_format_refactor
Jan 14, 2015
733
}
734
Coding style
Mar 19, 2018
735
var num_flag = function(c, flags){
736
if(c === "0" && ! flags.padding && ! flags.decimal_point && ! flags.left){
737
flags.pad_char = "0"
Merged with legacy_format_refactor
Jan 14, 2015
738
return
739
}
Coding style
Mar 19, 2018
740
if(!flags.decimal_point){
Merged with legacy_format_refactor
Jan 14, 2015
741
flags.padding = (flags.padding || "") + c
Coding style
Mar 19, 2018
742
}else{
Merged with legacy_format_refactor
Jan 14, 2015
743
flags.precision = (flags.precision || "") + c
744
}
745
}
746
747
var decimal_point_flag = function(val, flags) {
Coding style
Mar 23, 2018
748
if(flags.decimal_point){
Merged with legacy_format_refactor
Jan 14, 2015
749
// can only have one decimal point
750
throw new UnsupportedChar()
751
}
752
flags.decimal_point = true
753
}
754
Coding style
Mar 19, 2018
755
var neg_flag = function(val, flags){
756
flags.pad_char = " " // overrides '0' flag
Merged with legacy_format_refactor
Jan 14, 2015
757
flags.left = true
758
}
759
Coding style
Mar 19, 2018
760
var space_flag = function(val, flags){
Merged with legacy_format_refactor
Jan 14, 2015
761
flags.space = true
762
}
763
Coding style
Mar 19, 2018
764
var sign_flag = function(val, flags){
Merged with legacy_format_refactor
Jan 14, 2015
765
flags.sign = true
766
}
767
Coding style
Mar 19, 2018
768
var alternate_flag = function(val, flags){
Merged with legacy_format_refactor
Jan 14, 2015
769
flags.alternate = true
770
}
771
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
772
var char_mapping = {
Implement PEP 461 : Adding % formatting to bytes and bytearray (cf. i…
Dec 18, 2019
773
"b": series_of_bytes,
Coding style
Mar 19, 2018
774
"s": str_format,
775
"d": num_format,
776
"i": num_format,
777
"u": num_format,
778
"o": octal_format,
779
"r": repr_format,
780
"a": ascii_format,
781
"g": function(val, flags){
782
return floating_point_format(val, false, flags)
783
},
784
"G": function(val, flags){return floating_point_format(val, true, flags)},
785
"f": function(val, flags){
786
return floating_point_decimal_format(val, false, flags)
787
},
788
"F": function(val, flags){
789
return floating_point_decimal_format(val, true, flags)
790
},
791
"e": function(val, flags){
792
return floating_point_exponential_format(val, false, flags)
793
},
794
"E": function(val, flags){
795
return floating_point_exponential_format(val, true, flags)
796
},
797
"x": function(val, flags){return signed_hex_format(val, false, flags)},
798
"X": function(val, flags){return signed_hex_format(val, true, flags)},
799
"c": single_char_format,
800
"0": function(val, flags){return num_flag("0", flags)},
801
"1": function(val, flags){return num_flag("1", flags)},
802
"2": function(val, flags){return num_flag("2", flags)},
803
"3": function(val, flags){return num_flag("3", flags)},
804
"4": function(val, flags){return num_flag("4", flags)},
805
"5": function(val, flags){return num_flag("5", flags)},
806
"6": function(val, flags){return num_flag("6", flags)},
807
"7": function(val, flags){return num_flag("7", flags)},
808
"8": function(val, flags){return num_flag("8", flags)},
809
"9": function(val, flags){return num_flag("9", flags)},
810
"-": neg_flag,
811
" ": space_flag,
812
"+": sign_flag,
813
".": decimal_point_flag,
814
"#": alternate_flag
Merged with legacy_format_refactor
Jan 14, 2015
815
}
816
817
// exception thrown when an unsupported char is encountered in legacy format
Coding style
Mar 19, 2018
818
var UnsupportedChar = function(){
Merged with legacy_format_refactor
Jan 14, 2015
819
this.name = "UnsupportedChar"
820
}
821
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
822
str.__mod__ = function(self, args){
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
823
var length = self.length,
Coding style
Mar 19, 2018
824
pos = 0 | 0,
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
825
argpos = null,
826
getitem
Coding style
Mar 19, 2018
827
if(_b_.isinstance(args, _b_.tuple)){
828
argpos = 0 | 0
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
829
}else{
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
830
getitem = $B.$getattr(args, "__getitem__", _b_.None)
Merged with legacy_format_refactor
Jan 14, 2015
831
}
832
var ret = ''
833
var $get_kwarg_string = function(s) {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
834
// returns [self, newpos]
Merged with legacy_format_refactor
Jan 14, 2015
835
++pos
836
var rslt = kwarg_key.exec(s.substring(newpos))
Coding style
Mar 19, 2018
837
if(! rslt){
Implement exceptions as new-style classes
Feb 10, 2018
838
throw _b_.ValueError.$factory("incomplete format key")
Merged with legacy_format_refactor
Jan 14, 2015
839
}
840
var key = rslt[1]
841
newpos += rslt[0].length
Coding style
Mar 23, 2018
842
try{
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
843
var self = getitem(key)
Coding style
Mar 19, 2018
844
}catch(err){
Fixes #1528 : logging module seems unusable
Nov 2, 2020
845
if(err.__class__ === _b_.KeyError){
Merged with legacy_format_refactor
Jan 14, 2015
846
throw err
847
}
Implement exceptions as new-style classes
Feb 10, 2018
848
throw _b_.TypeError.$factory("format requires a mapping")
Merged with legacy_format_refactor
Jan 14, 2015
849
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
850
return get_string_value(s, self)
Merged with legacy_format_refactor
Jan 14, 2015
851
}
852
853
var $get_arg_string = function(s) {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
854
// returns [self, newpos]
855
var self
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
856
Merged with legacy_format_refactor
Jan 14, 2015
857
// non-tuple args
Coding style
Mar 19, 2018
858
if(argpos === null){
Merged with legacy_format_refactor
Jan 14, 2015
859
// args is the value
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
860
self = args
Coding style
Mar 19, 2018
861
}else{
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
862
self = args[argpos++]
Coding style
Mar 19, 2018
863
if(self === undefined){
864
throw _b_.TypeError.$factory(
865
"not enough arguments for format string")
@PierreQuentel
First import
Sep 5, 2014
866
}
867
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
868
return get_string_value(s, self)
Merged with legacy_format_refactor
Jan 14, 2015
869
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
870
var get_string_value = function(s, self) {
Merged with legacy_format_refactor
Jan 14, 2015
871
// todo: get flags, type
872
// todo: string value based on flags, type, value
Coding style
Mar 19, 2018
873
var flags = {"pad_char": " "}
874
do{
@PierreQuentel
Add a few "var" to remove names from global Javascript namespace
Feb 20, 2015
875
var func = char_mapping[s[newpos]]
Coding style
Mar 23, 2018
876
try{
Coding style
Mar 19, 2018
877
if(func === undefined){
Merged with legacy_format_refactor
Jan 14, 2015
878
throw new UnsupportedChar()
Coding style
Mar 19, 2018
879
}else{
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
880
var ret = func(self, flags)
Coding style
Mar 19, 2018
881
if(ret !== undefined){
Merged with legacy_format_refactor
Jan 14, 2015
882
return ret
883
}
884
++newpos
885
}
Coding style
Mar 19, 2018
886
}catch (err){
887
if(err.name == "UnsupportedChar"){
Merged with legacy_format_refactor
Jan 14, 2015
888
invalid_char = s[newpos]
Coding style
Mar 19, 2018
889
if(invalid_char === undefined){
Implement exceptions as new-style classes
Feb 10, 2018
890
throw _b_.ValueError.$factory("incomplete format")
Merged with legacy_format_refactor
Jan 14, 2015
891
}
Coding style
Mar 19, 2018
892
throw _b_.ValueError.$factory(
893
"unsupported format character '" + invalid_char +
894
"' (0x" + invalid_char.charCodeAt(0).toString(16) +
895
") at index " + newpos)
896
}else if(err.name === "NotANumber"){
897
var try_char = s[newpos],
898
cls = self.__class__
899
if(!cls){
900
if(typeof(self) === "string"){
901
cls = "str"
902
}else{
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
903
cls = typeof(self)
Merged with legacy_format_refactor
Jan 14, 2015
904
}
Coding style
Mar 19, 2018
905
}else{
Replace occurrences of $B.get_class(obj).__name__ by $B.class_name(ob…
Jan 3, 2019
906
cls = cls.$infos.__name__
Merged with legacy_format_refactor
Jan 14, 2015
907
}
Coding style
Mar 19, 2018
908
throw _b_.TypeError.$factory("%" + try_char +
909
" format: a number is required, not " + cls)
910
}else{
Merged with legacy_format_refactor
Jan 14, 2015
911
throw err
912
}
@PierreQuentel
First import
Sep 5, 2014
913
}
Coding style
Mar 19, 2018
914
}while (true)
@PierreQuentel
First import
Sep 5, 2014
915
}
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
916
var nbph = 0 // number of placeholders
Coding style
Mar 19, 2018
917
do{
918
var newpos = self.indexOf("%", pos)
919
if(newpos < 0){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
920
ret += self.substring(pos)
Merged with legacy_format_refactor
Jan 14, 2015
921
break
922
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
923
ret += self.substring(pos, newpos)
Merged with legacy_format_refactor
Jan 14, 2015
924
++newpos
Coding style
Mar 19, 2018
925
if(newpos < length){
926
if(self[newpos] === "%"){
927
ret += "%"
928
}else{
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
929
nbph++
Coding style
Mar 19, 2018
930
if(self[newpos] === "("){
Merged with legacy_format_refactor
Jan 14, 2015
931
++newpos
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
932
ret += $get_kwarg_string(self)
Coding style
Mar 23, 2018
933
}else{
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
934
ret += $get_arg_string(self)
Merged with legacy_format_refactor
Jan 14, 2015
935
}
936
}
Coding style
Mar 19, 2018
937
}else{
Merged with legacy_format_refactor
Jan 14, 2015
938
// % at end of string
Implement exceptions as new-style classes
Feb 10, 2018
939
throw _b_.ValueError.$factory("incomplete format")
Merged with legacy_format_refactor
Jan 14, 2015
940
}
941
pos = newpos + 1
Coding style
Mar 19, 2018
942
}while(pos < length)
943
944
if(argpos !== null){
945
if(args.length > argpos){
946
throw _b_.TypeError.$factory(
947
"not enough arguments for format string")
948
}else if(args.length < argpos){
949
throw _b_.TypeError.$factory(
950
"not all arguments converted during string formatting")
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
951
}
Coding style
Mar 19, 2018
952
}else if(nbph == 0){
953
throw _b_.TypeError.$factory(
954
"not all arguments converted during string formatting")
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
955
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
956
return ret
Merged with legacy_format_refactor
Jan 14, 2015
957
}
@PierreQuentel
First import
Sep 5, 2014
958
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
959
str.__mro__ = [_b_.object]
@PierreQuentel
First import
Sep 5, 2014
960
str
Feb 10, 2018
961
str.__mul__ = function(){
Coding style
Mar 19, 2018
962
var $ = $B.args("__mul__", 2, {self: null, other: null},
963
["self", "other"], arguments, {}, null, null)
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
964
if(! _b_.isinstance($.other, _b_.int)){throw _b_.TypeError.$factory(
Coding style
Mar 19, 2018
965
"Can't multiply sequence by non-int of type '" +
Replace occurrences of $B.get_class(obj).__name__ by $B.class_name(ob…
Jan 3, 2019
966
$B.class_name($.other) + "'")}
In py_string.js : simplify str.__len__ and str.__mul__
Mar 30, 2021
967
return $.self.valueOf().repeat($.other)
@PierreQuentel
First import
Sep 5, 2014
968
}
969
Fixes bugs related to strings (equality of strings with surrogate pai…
Jan 15, 2021
970
str.__ne__ = function(self, other){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
971
return other.valueOf() !== self.valueOf()
Fixes bugs related to strings (equality of strings with surrogate pai…
Jan 15, 2021
972
}
@PierreQuentel
First import
Sep 5, 2014
973
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
974
function __newobj__(){
975
// __newobj__ is called with a generator as only argument
976
var $ = $B.args('__newobj__', 0, {}, [], arguments, {}, 'args', null),
977
args = $.args
978
var res = args[1]
979
res.__class__ = args[0]
980
return res
981
}
982
983
str.__reduce_ex__ = function(self){
984
return $B.fast_tuple([
985
__newobj__,
986
$B.fast_tuple([self.__class__ || _b_.str, self]),
987
_b_.None,
988
_b_.None])
989
}
990
str
Feb 10, 2018
991
str.__repr__ = function(self){
@PierreQuentel
Fixes bugs with management of escaped characters (\a, \b, \n etc.) in…
Aug 17, 2018
992
// special cases
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
993
var t = {
994
8: "\\x08",
995
9: "\\t",
996
10: "\\n",
997
11: "\\x0b",
998
12: "\\x0c",
999
13: "\\r",
1000
92: "\\\\"
1001
}
1002
var repl = '',
1003
chars = to_chars(self)
1004
for(var i = 0; i < chars.length; i++){
1005
var cp = _b_.ord(chars[i])
1006
if(t[cp] !== undefined){
1007
repl += t[cp]
1008
}else if($B.is_unicode_cn(cp)){
Minor change in repr() of strings
Dec 8, 2020
1009
var s = cp.toString(16)
Fixes #1440 : management of unassigned Unicode code points
Jul 8, 2020
1010
while(s.length < 4){
1011
s = '0' + s
1012
}
1013
repl += '\\u' + s
Fixes bugs related to strings (equality of strings with surrogate pai…
Jan 15, 2021
1014
}else if(cp < 0x20 || (cp >= 0x7f && cp < 0xa0)){
1015
cp = cp.toString(16)
Minor change in repr() of strings
Dec 8, 2020
1016
if(cp.length < 2){
1017
cp = '0' + cp
1018
}
1019
repl += '\\x' + cp
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1020
}else if(cp >= 0x300 && cp <= 0x36F){
1021
repl += "\u200B" + chars[i]
Fixes #1440 : management of unassigned Unicode code points
Jul 8, 2020
1022
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1023
repl += chars[i]
Fixes #1440 : management of unassigned Unicode code points
Jul 8, 2020
1024
}
1025
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1026
var res = repl
Coding style
Mar 19, 2018
1027
if(res.search('"') == -1 && res.search("'") == -1){
1028
return "'" + res + "'"
1029
}else if(self.search('"') == -1){
1030
return '"' + res + '"'
1031
}
1032
var qesc = new RegExp("'", "g") // to escape single quote
1033
res = "'" + res.replace(qesc, "\\'") + "'"
@PierreQuentel
First import
Sep 5, 2014
1034
return res
1035
}
1036
@PierreQuentel
Rewrite implementation of special methods for operations (__add__, __…
Jun 6, 2021
1037
str.__rmul__ = function(self, other){
1038
if(_b_.isinstance(other, _b_.int)){
1039
other = _b_.int.numerator(other)
1040
var res = ''
1041
while(other > 0){
1042
res += self
1043
other--
1044
}
1045
return res
1046
}
1047
return _b_.NotImplemented
1048
}
1049
Fixes #1637 : setattr on strings does not throw AttributeError, getat…
Mar 16, 2021
1050
str.__setattr__ = function(self, attr, value){
1051
if(typeof self === "string"){
1052
if(str.hasOwnProperty(attr)){
In py_string.js : simplify str.__len__ and str.__mul__
Mar 30, 2021
1053
throw _b_.AttributeError.$factory("'str' object attribute '" +
Fixes #1637 : setattr on strings does not throw AttributeError, getat…
Mar 16, 2021
1054
attr + "' is read-only")
1055
}else{
1056
throw _b_.AttributeError.$factory(
1057
"'str' object has no attribute '" + attr + "'")
1058
}
1059
}
1060
// str subclass : use __dict__
1061
_b_.dict.$setitem(self.__dict__, attr, value)
1062
return $N
1063
}
1064
Coding style
Mar 19, 2018
1065
str.__setitem__ = function(self, attr, value){
1066
throw _b_.TypeError.$factory(
1067
"'str' object does not support item assignment")
@PierreQuentel
First import
Sep 5, 2014
1068
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1069
Remove debug trace
Mar 27, 2019
1070
var combining = []
1071
for(var cp = 0x300; cp <= 0x36F; cp++){
1072
combining.push(String.fromCharCode(cp))
1073
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1074
var combining_re = new RegExp("(" + combining.join("|") + ")", "g")
@PierreQuentel
Fixes bugs with management of escaped characters (\a, \b, \n etc.) in…
Aug 17, 2018
1075
str
Feb 10, 2018
1076
str.__str__ = function(self){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1077
var repl = '',
1078
chars = to_chars(self)
1079
if(chars.length == self.length){
1080
return self.replace(combining_re, "\u200B$1")
1081
}
1082
for(var i = 0; i < chars.length; i++){
1083
var cp = _b_.ord(chars[i])
1084
if(cp >= 0x300 && cp <= 0x36F){
1085
repl += "\u200B" + chars[i]
1086
}else{
1087
repl += chars[i]
1088
}
1089
}
1090
return repl
@PierreQuentel
First import
Sep 5, 2014
1091
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1092
Coding style
Mar 19, 2018
1093
str.toString = function(){return "string!"}
@PierreQuentel
First import
Sep 5, 2014
1094
1095
// generate comparison methods
1096
var $comp_func = function(self,other){
Fixes #1038 : inconsistent errors when comparing incompatible types w…
Feb 13, 2019
1097
if(typeof other !== "string"){return _b_.NotImplemented}
@PierreQuentel
First import
Sep 5, 2014
1098
return self > other
1099
}
Coding style
Mar 19, 2018
1100
$comp_func += "" // source code
1101
var $comps = {">": "gt", ">=": "ge", "<": "lt", "<=": "le"}
@PierreQuentel
First import
Sep 5, 2014
1102
for(var $op in $comps){
Coding style
Mar 19, 2018
1103
eval("str.__" + $comps[$op] + '__ = ' + $comp_func.replace(/>/gm,$op))
@PierreQuentel
First import
Sep 5, 2014
1104
}
1105
1106
// unsupported operations
Coding style
Mar 19, 2018
1107
var $notimplemented = function(self, other){
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1108
throw _b_.NotImplementedError.$factory(
Coding style
Mar 19, 2018
1109
"OPERATOR not implemented for class str")
@PierreQuentel
First import
Sep 5, 2014
1110
}
1111
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1112
str.capitalize = function(self){
1113
var $ = $B.args("capitalize", 1, {self}, ["self"],
1114
arguments, {}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1115
if(self.length == 0){
1116
return ""
1117
}
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1118
return self.charAt(0).toUpperCase() + self.substr(1)
1119
}
1120
1121
str.casefold = function(self){
1122
var $ = $B.args("casefold", 1, {self}, ["self"],
1123
arguments, {}, null, null),
1124
res = "",
1125
char,
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1126
cf,
1127
chars = to_chars($.self)
1128
1129
for(var i = 0, len = chars.length; i < len; i++){
1130
char = chars[i]
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1131
cf = $B.unicode_casefold[char]
1132
if(cf){
1133
cf.forEach(function(cp){
1134
res += String.fromCharCode(cp)
1135
})
1136
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1137
res += char.toLowerCase()
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1138
}
1139
}
1140
return res
1141
}
@PierreQuentel
First import
Sep 5, 2014
1142
Coding style
Mar 19, 2018
1143
str.center = function(){
1144
var $ = $B.args("center", 3, {self: null, width: null, fillchar: null},
1145
["self", "width", "fillchar"],
1146
arguments, {fillchar:" "}, null, null),
1147
self = $.self
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1148
Coding style
Mar 19, 2018
1149
if($.width <= self.length) {return self}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1150
Coding style
Mar 19, 2018
1151
var pad = parseInt(($.width - self.length) / 2),
1152
res = $.fillchar.repeat(pad)
@PierreQuentel
First import
Sep 5, 2014
1153
res += self + res
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1154
if(res.length < $.width){
1155
res += $.fillchar
1156
}
@PierreQuentel
First import
Sep 5, 2014
1157
return res
1158
}
1159
str
Feb 10, 2018
1160
str.count = function(){
Coding style
Mar 19, 2018
1161
var $ = $B.args("count", 4, {self:null, sub:null, start:null, stop:null},
1162
["self", "sub", "start", "stop"], arguments, {start:null, stop:null},
@PierreQuentel
Fixes #287 : s.count with an optional start parameter
Sep 14, 2015
1163
null, null)
Change in string management. Related to issue #1736.
Aug 7, 2021
1164
if(!(typeof $.sub.valueOf() == "string")){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1165
throw _b_.TypeError.$factory("Can't convert '" + $B.class_name($.sub) +
1166
"' object to str implicitly")
1167
}
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1168
var substr = $.self
Coding style
Mar 19, 2018
1169
if($.start !== null){
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1170
var _slice
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1171
if($.stop !== null){
1172
_slice = _b_.slice.$factory($.start, $.stop)
1173
}else{
1174
_slice = _b_.slice.$factory($.start, $.self.length)
1175
}
str
Feb 10, 2018
1176
substr = str.__getitem__.apply(null, [$.self].concat(_slice))
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1177
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1178
if($.self.length + $.sub.length == 0){
1179
return 1
1180
}
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1181
}
Coding style
Mar 19, 2018
1182
if($.sub.length == 0){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1183
if($.start == $.self.length){
1184
return 1
1185
}else if(substr.length == 0){
1186
return 0
1187
}
Coding style
Mar 19, 2018
1188
return substr.length + 1
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1189
}
Coding style
Mar 19, 2018
1190
var n = 0,
1191
pos = 0
1192
while(pos < substr.length){
1193
pos = substr.indexOf($.sub, pos)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1194
if(pos >= 0){
1195
n++
1196
pos += $.sub.length
1197
}else{
1198
break
1199
}
@PierreQuentel
First import
Sep 5, 2014
1200
}
1201
return n
1202
}
1203
Fix bugs introduced by previous merged PR
Apr 2, 2019
1204
str.encode = function(){
1205
var $ = $B.args("encode", 3, {self: null, encoding: null, errors: null},
1206
["self", "encoding", "errors"], arguments,
1207
{encoding: "utf-8", errors: "strict"}, null, null)
1208
if($.encoding == "rot13" || $.encoding == "rot_13"){
@PierreQuentel
Fixes #159 : [codecs] ROT13 cant encode
Apr 22, 2015
1209
// Special case : returns a string
Coding style
Mar 19, 2018
1210
var res = ""
Fix bugs introduced by previous merged PR
Apr 2, 2019
1211
for(var i = 0, len = $.self.length; i < len ; i++){
1212
var char = $.self.charAt(i)
Coding style
Mar 19, 2018
1213
if(("a" <= char && char <= "m") || ("A" <= char && char <= "M")){
1214
res += String.fromCharCode(String.charCodeAt(char) + 13)
1215
}else if(("m" < char && char <= "z") ||
1216
("M" < char && char <= "Z")){
1217
res += String.fromCharCode(String.charCodeAt(char) - 13)
@PierreQuentel
Fixes #159 : [codecs] ROT13 cant encode
Apr 22, 2015
1218
}else{res += char}
1219
}
1220
return res
1221
}
Fix bugs introduced by previous merged PR
Apr 2, 2019
1222
return _b_.bytes.__new__(_b_.bytes, $.self, $.encoding, $.errors)
@PierreQuentel
First import
Sep 5, 2014
1223
}
1224
str
Feb 10, 2018
1225
str.endswith = function(){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1226
// Return True if the string ends with the specified suffix, otherwise
1227
// return False. suffix can also be a tuple of suffixes to look for.
1228
// With optional start, test beginning at that position. With optional
@PierreQuentel
First import
Sep 5, 2014
1229
// end, stop comparing at that position.
Coding style
Mar 19, 2018
1230
var $ = $B.args("endswith", 4,
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1231
{self:null, suffix:null, start:null, end:null},
Coding style
Mar 19, 2018
1232
["self", "suffix", "start", "end"],
1233
arguments, {start: 0, end: null}, null, null)
@PierreQuentel
Cleaning in py2js.js
Sep 20, 2015
1234
1235
normalize_start_end($)
1236
1237
var suffixes = $.suffix
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1238
if(! _b_.isinstance(suffixes,_b_.tuple)){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1239
suffixes = [suffixes]
1240
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1241
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1242
var chars = to_chars($.self),
1243
s = chars.slice($.start, $.end)
Coding style
Mar 19, 2018
1244
for(var i = 0, len = suffixes.length; i < len; i++){
Add many "var" to avoid global JS namespace pollution
Sep 30, 2016
1245
var suffix = suffixes[i]
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1246
if(! _b_.isinstance(suffix, str)){
1247
throw _b_.TypeError.$factory(
1248
"endswith first arg must be str or a tuple of str, not int")
1249
}
Coding style
Mar 19, 2018
1250
if(suffix.length <= s.length &&
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1251
s.slice(s.length - suffix.length).join('') == suffix){
1252
return true
1253
}
@PierreQuentel
First import
Sep 5, 2014
1254
}
1255
return false
1256
}
1257
str
Feb 10, 2018
1258
str.expandtabs = function(self, tabsize) {
Coding style
Mar 19, 2018
1259
var $ = $B.args("expandtabs", 2, {self: null, tabsize: null},
1260
["self", "tabsize"], arguments, {tabsize: 8}, null, null)
1261
var s = $B.$GetInt($.tabsize),
1262
col = 0,
1263
pos = 0,
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1264
res = "",
1265
chars = to_chars(self)
1266
if(s == 1){
1267
return self.replace(/\t/g," ")
1268
}
1269
while(pos < chars.length){
1270
var car = chars[pos]
@PierreQuentel
Rewrite str.expandtabs() - passes tests in Lib/test/string_tests.py
Sep 15, 2015
1271
switch(car){
Coding style
Mar 19, 2018
1272
case "\t":
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1273
while(col % s > 0){
1274
res += " ";
1275
col++
1276
}
@PierreQuentel
Rewrite str.expandtabs() - passes tests in Lib/test/string_tests.py
Sep 15, 2015
1277
break
Coding style
Mar 19, 2018
1278
case "\r":
1279
case "\n":
@PierreQuentel
Rewrite str.expandtabs() - passes tests in Lib/test/string_tests.py
Sep 15, 2015
1280
res += car
1281
col = 0
1282
break
1283
default:
1284
res += car
1285
col++
1286
break
1287
}
1288
pos++
1289
}
1290
return res
@PierreQuentel
First import
Sep 5, 2014
1291
}
1292
str
Feb 10, 2018
1293
str.find = function(){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1294
// Return the lowest index in the string where substring sub is found,
1295
// such that sub is contained in the slice s[start:end]. Optional
1296
// arguments start and end are interpreted as in slice notation.
@PierreQuentel
First import
Sep 5, 2014
1297
// Return -1 if sub is not found.
Coding style
Mar 19, 2018
1298
var $ = $B.args("str.find", 4,
Fixes issue in str.find()
Apr 16, 2019
1299
{self: null, sub: null, start: null, end: null},
1300
["self", "sub", "start", "end"],
1301
arguments, {start: 0, end: null}, null, null)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1302
check_str($.sub)
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1303
normalize_start_end($)
@PierreQuentel
Split strings into 2 classes in py2js: one for f-strings (JoinedStrCt…
Sep 2, 2021
1304
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
1305
var len = str.__len__($.self),
1306
sub_len = str.__len__($.sub)
@PierreQuentel
Rewrite str.find. Fixes #290 : "a".find("\\") crashes. Passes tests i…
Sep 18, 2015
1307
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
1308
if(sub_len == 0 && $.start == len){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1309
return len
1310
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
1311
if(len + sub_len == 0){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1312
return -1
1313
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
1314
// Use .indexOf(), not .search(), to avoid conversion to reg exp
1315
var js_start = pypos2jspos($.self, $.start),
1316
js_end = pypos2jspos($.self, $.end),
1317
ix = $.self.substring(js_start, js_end).indexOf($.sub)
1318
if(ix == -1){
1319
return -1
@PierreQuentel
First import
Sep 5, 2014
1320
}
Fixes #1754 : highlight() in master branch hangs
Aug 24, 2021
1321
return jspos2pypos($.self, js_start + ix)
@PierreQuentel
First import
Sep 5, 2014
1322
}
1323
@PierreQuentel
Fixes #260 : string.format() issues
Aug 28, 2015
1324
// Next function used by method .format()
1325
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1326
$B.parse_format = function(fmt_string){
@PierreQuentel
First import
Sep 5, 2014
1327
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1328
// Parse a "format string", as described in the Python documentation
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1329
// Return a format object. For the format string
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1330
// a.x[z]!r:...
1331
// the object has attributes :
1332
// - name : "a"
1333
// - name_ext : [".x", "[z]"]
1334
// - conv : r
1335
// - spec : rest of string after :
@PierreQuentel
First import
Sep 5, 2014
1336
Coding style
Mar 19, 2018
1337
var elts = fmt_string.split(":"),
1338
name,
1339
conv,
1340
spec,
Coding style
Mar 19, 2018
1341
name_ext = []
Coding style
Mar 19, 2018
1342
if(elts.length == 1){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1343
// No : in the string : it only contains a name
1344
name = fmt_string
1345
}else{
1346
// name is before the first ":"
1347
// spec (the format specification) is after
1348
name = elts[0]
Coding style
Mar 19, 2018
1349
spec = elts.splice(1).join(":")
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1350
}
1351
Coding style
Mar 19, 2018
1352
var elts = name.split("!")
1353
if(elts.length > 1){
1354
name = elts[0]
1355
conv = elts[1] // conversion flag
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1356
}
@PierreQuentel
First import
Sep 5, 2014
1357
Coding style
Mar 19, 2018
1358
if(name !== undefined){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1359
// "name' may be a subscription or attribute
1360
// Put these "extensions" in the list "name_ext"
1361
function name_repl(match){
1362
name_ext.push(match)
Coding style
Mar 19, 2018
1363
return ""
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1364
}
1365
var name_ext_re = /\.[_a-zA-Z][_a-zA-Z0-9]*|\[[_a-zA-Z][_a-zA-Z0-9]*\]|\[[0-9]+\]/g
1366
name = name.replace(name_ext_re, name_repl)
1367
}
@PierreQuentel
First import
Sep 5, 2014
1368
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1369
return {name: name, name_ext: name_ext,
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1370
conv: conv, spec: spec || "", string: fmt_string}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1371
}
@PierreQuentel
First import
Sep 5, 2014
1372
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1373
$B.split_format = function(self){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1374
// Parse self to detect formatting instructions
1375
// Create a list "parts" made of sections of the string :
1376
// - elements of even rank are literal text
1377
// - elements of odd rank are "format objects", built from the
1378
// format strings in self (of the form {...})
Coding style
Mar 19, 2018
1379
var pos = 0,
1380
_len = self.length,
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1381
car,
Coding style
Mar 19, 2018
1382
text = "",
1383
parts = [],
1384
rank = 0
1385
while(pos < _len){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1386
car = self.charAt(pos)
Coding style
Mar 21, 2018
1387
if(car == "{" && self.charAt(pos + 1) == "{"){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1388
// replace {{ by literal {
Coding style
Mar 19, 2018
1389
text += "{"
1390
pos += 2
1391
}else if(car == "}" && self.charAt(pos + 1) == "}"){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1392
// replace }} by literal }
Coding style
Mar 19, 2018
1393
text += "}"
1394
pos += 2
1395
}else if(car == "{"){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1396
// Start of a format string
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1397
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1398
// Store current literal text
1399
parts.push(text)
1400
1401
// Search the end of the format string, ie the } closing the
1402
// opening {. Since the string can contain other pairs {} for
1403
// nested formatting, an integer nb is incremented for each { and
1404
// decremented for each } ; the end of the format string is
Coding style
Mar 19, 2018
1405
// reached when nb == 0
1406
var end = pos + 1,
1407
nb = 1
1408
while(end < _len){
1409
if(self.charAt(end) == "{"){nb++; end++}
1410
else if(self.charAt(end) == "}"){
1411
nb--; end++
1412
if(nb == 0){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1413
// End of format string
Coding style
Mar 19, 2018
1414
var fmt_string = self.substring(pos + 1, end - 1)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1415
1416
// Create a format object, by function parse_format
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1417
var fmt_obj = $B.parse_format(fmt_string)
1418
fmt_obj.raw_name = fmt_obj.name
1419
fmt_obj.raw_spec = fmt_obj.spec
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1420
1421
// If no name is explicitely provided, use the rank
1422
if(!fmt_obj.name){
Coding style
Mar 19, 2018
1423
fmt_obj.name = rank + ""
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1424
rank++
1425
}
@PierreQuentel
First import
Sep 5, 2014
1426
Coding style
Mar 19, 2018
1427
if(fmt_obj.spec !== undefined){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1428
// "spec" may contain "nested replacement fields"
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1429
// Replace empty fields by the rank in positional
1430
// arguments
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1431
function replace_nested(name, key){
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1432
if(key == ""){
1433
// Use implicit rank
1434
return "{" + rank++ + "}"
Fixes #303 : string formatting with floating point, variable number o…
Dec 3, 2015
1435
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1436
return "{" + key + "}"
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1437
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1438
fmt_obj.spec = fmt_obj.spec.replace(/\{(.*?)\}/g,
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1439
replace_nested)
1440
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1441
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1442
// Store format object in list "parts"
1443
parts.push(fmt_obj)
Coding style
Mar 19, 2018
1444
text = ""
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1445
break
1446
}
1447
}else{end++}
@PierreQuentel
First import
Sep 5, 2014
1448
}
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1449
if(nb > 0){
1450
throw _b_.ValueError.$factory("wrong format " + self)
1451
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1452
pos = end
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1453
}else{
1454
text += car
1455
pos++
1456
}
1457
}
1458
if(text){
1459
parts.push(text)
@PierreQuentel
First import
Sep 5, 2014
1460
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1461
return parts
1462
}
1463
1464
str.format = function(self) {
Implement str.format_map()
Nov 22, 2020
1465
// Special management of keyword arguments if str.format is called by
1466
// str.format_map(mapping) : the argument "mapping" might not be a
1467
// dictionary
1468
var last_arg = $B.last(arguments)
1469
if(last_arg.$nat == "mapping"){
1470
var mapping = last_arg.mapping,
1471
getitem = $B.$getattr(mapping, "__getitem__")
1472
// Get the rest of the arguments
1473
var args = []
1474
for(var i = 0, len = arguments.length - 1; i < len; i++){
1475
args.push(arguments[i])
1476
}
1477
var $ = $B.args("format", 1, {self: null}, ["self"],
1478
args, {}, "$args", null)
1479
}else{
1480
var $ = $B.args("format", 1, {self: null}, ["self"],
1481
arguments, {}, "$args", "$kw"),
1482
mapping = $.$kw, // dictionary
1483
getitem = function(key){
1484
return _b_.dict.$getitem(mapping, key)
1485
}
1486
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1487
var parts = $B.split_format($.self)
1488
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1489
// Apply formatting to the values passed to format()
Coding style
Mar 19, 2018
1490
var res = "",
1491
fmt
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1492
Coding style
Mar 19, 2018
1493
for(var i = 0; i < parts.length; i++){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1494
// Literal text is added unchanged
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
1495
if(typeof parts[i] == "string"){
1496
res += parts[i];
1497
continue
1498
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1499
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1500
// Format objects
1501
fmt = parts[i]
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1502
1503
if(fmt.spec !== undefined){
1504
// "spec" may contain "nested replacement fields"
1505
// In this case, evaluate them using the positional
1506
// or keyword arguments passed to format()
1507
function replace_nested(name, key){
1508
if(/\d+/.exec(key)){
1509
// If key is numeric, search in positional
1510
// arguments
1511
return _b_.tuple.__getitem__($.$args,
1512
parseInt(key))
1513
}else{
1514
// Else try in keyword arguments
1515
return _b_.dict.__getitem__($.$kw, key)
1516
}
1517
}
1518
fmt.spec = fmt.spec.replace(/\{(.*?)\}/g,
1519
replace_nested)
1520
}
Coding style
Mar 21, 2018
1521
if(fmt.name.charAt(0).search(/\d/) > -1){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1522
// Numerical reference : use positional arguments
1523
var pos = parseInt(fmt.name),
list and tuple
Feb 11, 2018
1524
value = _b_.tuple.__getitem__($.$args, pos)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1525
}else{
1526
// Use keyword arguments
Implement str.format_map()
Nov 22, 2020
1527
var value = getitem(fmt.name)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1528
}
1529
// If name has extensions (attributes or subscriptions)
Coding style
Mar 19, 2018
1530
for(var j = 0; j < fmt.name_ext.length; j++){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1531
var ext = fmt.name_ext[j]
Coding style
Mar 19, 2018
1532
if(ext.charAt(0) == "."){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1533
// Attribute
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1534
value = $B.$getattr(value, ext.substr(1))
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1535
}else{
1536
// Subscription
Coding style
Mar 19, 2018
1537
var key = ext.substr(1, ext.length - 2)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1538
// An index made of digits is transformed into an integer
Coding style
Mar 19, 2018
1539
if(key.charAt(0).search(/\d/) > -1){key = parseInt(key)}
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1540
value = $B.$getattr(value, "__getitem__")(key)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1541
}
1542
}
Fix minor bugs
Feb 12, 2018
1543
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1544
// If the conversion flag is set, first call a function to convert
1545
// the value
Coding style
Mar 19, 2018
1546
if(fmt.conv == "a"){value = _b_.ascii(value)}
1547
else if(fmt.conv == "r"){value = _b_.repr(value)}
1548
else if(fmt.conv == "s"){value = _b_.str.$factory(value)}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1549
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1550
// Call attribute __format__ to perform the actual formatting
Support old-style and new-style classes.
Feb 9, 2018
1551
if(value.$is_class || value.$factory){
Fixes #755 : string format problem with classes
Jan 8, 2018
1552
// For classes, don't use the class __format__ method
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1553
res += value.__class__.__format__(value, fmt.spec)
Fixes #755 : string format problem with classes
Jan 8, 2018
1554
}else{
Fixes #1396 : string formatting - precision truncation not up to spec
May 21, 2020
1555
res += $B.$getattr(value, "__format__")(fmt.spec)
Fixes #755 : string format problem with classes
Jan 8, 2018
1556
}
@PierreQuentel
First import
Sep 5, 2014
1557
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1558
return res
@PierreQuentel
First import
Sep 5, 2014
1559
}
1560
Implement str.format_map()
Nov 22, 2020
1561
str.format_map = function(self, mapping){
1562
var $ = $B.args("format_map", 2, {self: null, mapping: null},
1563
['self', 'mapping'], arguments, {}, null, null)
1564
return str.format(self, {$nat: 'mapping', mapping})
@PierreQuentel
First import
Sep 5, 2014
1565
}
1566
str
Feb 10, 2018
1567
str.index = function(self){
@PierreQuentel
First import
Sep 5, 2014
1568
// Like find(), but raise ValueError when the substring is not found.
Fixes issue in str.find()
Apr 16, 2019
1569
var res = str.find.apply(null, arguments)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1570
if(res === -1){
1571
throw _b_.ValueError.$factory("substring not found")
1572
}
@PierreQuentel
First import
Sep 5, 2014
1573
return res
1574
}
1575
Fixes #1076 : 'str' object has no attribute 'isascii'
Apr 2, 2019
1576
str.isascii = function(self){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1577
/* Return true if the string is empty or all characters in the string are
1578
ASCII, false otherwise. ASCII characters have code points in the range
1579
U+0000-U+007F. */
Fixes #1076 : 'str' object has no attribute 'isascii'
Apr 2, 2019
1580
for(var i = 0, len = self.length; i < len; i++){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1581
if(self.charCodeAt(i) > 127){
1582
return false
1583
}
Fixes #1076 : 'str' object has no attribute 'isascii'
Apr 2, 2019
1584
}
1585
return true
1586
}
1587
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1588
str.isalnum = function(self){
1589
/* Return true if all characters in the string are alphanumeric and there
1590
is at least one character, false otherwise. A character c is alphanumeric
1591
if one of the following returns True: c.isalpha(), c.isdecimal(),
1592
c.isdigit(), or c.isnumeric(). */
1593
var $ = $B.args("isalnum", 1, {self: null}, ["self"],
1594
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1595
cp
1596
for(var char of to_chars(self)){
1597
cp = _b_.ord(char)
1598
if(unicode_tables.Ll[cp] ||
1599
unicode_tables.Lu[cp] ||
1600
unicode_tables.Lm[cp] ||
1601
unicode_tables.Lt[cp] ||
1602
unicode_tables.Lo[cp] ||
1603
unicode_tables.Nd[cp] ||
1604
unicode_tables.digits[cp] ||
1605
unicode_tables.numeric[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1606
continue
1607
}
1608
return false
1609
}
1610
return true
1611
}
1612
1613
str.isalpha = function(self){
1614
/* Return true if all characters in the string are alphabetic and there is
1615
at least one character, false otherwise. Alphabetic characters are those
1616
characters defined in the Unicode character database as "Letter", i.e.,
1617
those with general category property being one of "Lm", "Lt", "Lu", "Ll",
1618
or "Lo". */
1619
var $ = $B.args("isalpha", 1, {self: null}, ["self"],
1620
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1621
cp
1622
for(var char of to_chars(self)){
1623
cp = _b_.ord(char)
1624
if(unicode_tables.Ll[cp] ||
1625
unicode_tables.Lu[cp] ||
1626
unicode_tables.Lm[cp] ||
1627
unicode_tables.Lt[cp] ||
1628
unicode_tables.Lo[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1629
continue
1630
}
1631
return false
1632
}
1633
return true
1634
}
1635
1636
str.isdecimal = function(self){
1637
/* Return true if all characters in the string are decimal characters and
1638
there is at least one character, false otherwise. Decimal characters are
1639
those that can be used to form numbers in base 10, e.g. U+0660,
1640
ARABIC-INDIC DIGIT ZERO. Formally a decimal character is a character in
1641
the Unicode General Category "Nd". */
1642
var $ = $B.args("isdecimal", 1, {self: null}, ["self"],
1643
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1644
cp
1645
for(var char of to_chars(self)){
1646
cp = _b_.ord(char)
1647
if(! unicode_tables.Nd[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1648
return false
1649
}
1650
}
1651
return self.length > 0
1652
}
1653
1654
str.isdigit = function(self){
1655
/* Return true if all characters in the string are digits and there is at
1656
least one character, false otherwise. */
1657
var $ = $B.args("isdigit", 1, {self: null}, ["self"],
1658
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1659
cp
1660
for(var char of to_chars(self)){
1661
cp = _b_.ord(char)
1662
if(! unicode_tables.digits[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1663
return false
1664
}
1665
}
1666
return self.length > 0
1667
}
1668
1669
str.isidentifier = function(self){
1670
/* Return true if the string is a valid identifier according to the
1671
language definition. */
1672
var $ = $B.args("isidentifier", 1, {self: null}, ["self"],
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1673
arguments, {}, null, null)
Support identifiers with surrogate pairs
Dec 26, 2020
1674
if(self.length == 0){
1675
return false
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1676
}
1677
var chars = to_chars(self)
1678
if(unicode_tables.XID_Start[_b_.ord(chars[0])] === undefined){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1679
return false
1680
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1681
for(var char of chars){
1682
var cp = _b_.ord(char)
1683
if(unicode_tables.XID_Continue[cp] === undefined){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1684
return false
1685
}
1686
}
1687
}
1688
return true
1689
}
1690
1691
str.islower = function(self){
1692
/* Return true if all cased characters 4 in the string are lowercase and
1693
there is at least one cased character, false otherwise. */
1694
var $ = $B.args("islower", 1, {self: null}, ["self"],
1695
arguments, {}, null, null),
1696
has_cased = false,
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1697
cp
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1698
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1699
for(var char of to_chars(self)){
1700
cp = _b_.ord(char)
1701
if(unicode_tables.Ll[cp]){
1702
has_cased = true
1703
continue
1704
}else if(unicode_tables.Lu[cp] || unicode_tables.Lt[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1705
return false
1706
}
1707
}
1708
return has_cased
1709
}
1710
1711
str.isnumeric = function(self){
1712
/* Return true if all characters in the string are numeric characters, and
1713
there is at least one character, false otherwise. Numeric characters
1714
include digit characters, and all characters that have the Unicode numeric
1715
value property, e.g. U+2155, VULGAR FRACTION ONE FIFTH. Formally, numeric
1716
characters are those with the property value Numeric_Type=Digit,
1717
Numeric_Type=Decimal or Numeric_Type=Numeric.*/
1718
var $ = $B.args("isnumeric", 1, {self: null}, ["self"],
1719
arguments, {}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1720
for(var char of to_chars(self)){
1721
if(! unicode_tables.numeric[_b_.ord(char)]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1722
return false
1723
}
1724
}
1725
return self.length > 0
1726
}
1727
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1728
var unprintable = {},
1729
unprintable_gc = ['Cc', 'Cf', 'Co', 'Cs','Zl', 'Zp', 'Zs']
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1730
1731
str.isprintable = function(self){
1732
/* Return true if all characters in the string are printable or the string
1733
is empty, false otherwise. Nonprintable characters are those characters
1734
defined in the Unicode character database as "Other" or "Separator",
1735
excepting the ASCII space (0x20) which is considered printable. */
1736
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1737
// Set unprintable if not set yet
1738
if(Object.keys(unprintable).length == 0){
1739
for(var i = 0; i < unprintable_gc.length; i++){
1740
var table = unicode_tables[unprintable_gc[i]]
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1741
for(var cp in table){
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1742
unprintable[cp] = true
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1743
}
1744
}
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1745
unprintable[32] = true
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1746
}
1747
var $ = $B.args("isprintable", 1, {self: null}, ["self"],
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1748
arguments, {}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1749
for(var char of to_chars(self)){
1750
if(unprintable[_b_.ord(char)]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1751
return false
1752
}
1753
}
1754
return true
1755
}
1756
1757
str.isspace = function(self){
1758
/* Return true if there are only whitespace characters in the string and
1759
there is at least one character, false otherwise.
1760
1761
A character is whitespace if in the Unicode character database, either its
1762
general category is Zs ("Separator, space"), or its bidirectional class is
1763
one of WS, B, or S.*/
1764
var $ = $B.args("isspace", 1, {self: null}, ["self"],
1765
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1766
cp
1767
for(var char of to_chars(self)){
1768
cp = _b_.ord(char)
1769
if(! unicode_tables.Zs[cp] &&
1770
$B.unicode_bidi_whitespace.indexOf(cp) == -1){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1771
return false
1772
}
1773
}
1774
return self.length > 0
1775
}
1776
1777
str.istitle = function(self){
1778
/* Return true if the string is a titlecased string and there is at least
1779
one character, for example uppercase characters may only follow uncased
1780
characters and lowercase characters only cased ones. Return false
1781
otherwise. */
1782
var $ = $B.args("istitle", 1, {self: null}, ["self"],
1783
arguments, {}, null, null)
1784
return self.length > 0 && str.title(self) == self
1785
}
1786
1787
str.isupper = function(self){
1788
/* Return true if all cased characters 4 in the string are lowercase and
1789
there is at least one cased character, false otherwise. */
1790
var $ = $B.args("islower", 1, {self: null}, ["self"],
1791
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1792
is_upper = false,
1793
cp
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1794
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1795
for(var char of to_chars(self)){
1796
cp = _b_.ord(char)
1797
if(unicode_tables.Lu[cp]){
1798
is_upper = true
1799
continue
1800
}else if(unicode_tables.Ll[cp] || unicode_tables.Lt[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1801
return false
1802
}
1803
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1804
return is_upper
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1805
}
1806
1807
str
Feb 10, 2018
1808
str.join = function(){
Coding style
Mar 19, 2018
1809
var $ = $B.args("join", 2, {self: null, iterable: null},
Coding style
Mar 19, 2018
1810
["self", "iterable"], arguments, {}, null, null)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1811
Coding style
Mar 19, 2018
1812
var iterable = _b_.iter($.iterable),
Coding style
Mar 19, 2018
1813
res = [],
Change implementation of exception management : one active exception …
Jul 17, 2018
1814
count = 0
@PierreQuentel
First import
Sep 5, 2014
1815
while(1){
1816
try{
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1817
var obj2 = _b_.next(iterable)
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1818
if(! _b_.isinstance(obj2, str)){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1819
throw _b_.TypeError.$factory("sequence item " + count +
1820
": expected str instance, " + $B.class_name(obj2) +
1821
" found")
1822
}
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1823
res.push(obj2)
@PierreQuentel
First import
Sep 5, 2014
1824
}catch(err){
Restore current exception when internal code expects to raise another…
Dec 28, 2017
1825
if(_b_.isinstance(err, _b_.StopIteration)){
1826
break
1827
}
@PierreQuentel
First import
Sep 5, 2014
1828
else{throw err}
1829
}
1830
}
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1831
return res.join($.self)
@PierreQuentel
First import
Sep 5, 2014
1832
}
1833
str
Feb 10, 2018
1834
str.ljust = function(self) {
Coding style
Mar 19, 2018
1835
var $ = $B.args("ljust", 3, {self: null, width: null, fillchar:null},
1836
["self", "width", "fillchar"],
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1837
arguments, {fillchar: " "}, null, null),
1838
len = str.__len__(self)
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1839
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1840
if($.width <= len){
1841
return self
1842
}
1843
return self + $.fillchar.repeat($.width - len)
@PierreQuentel
First import
Sep 5, 2014
1844
}
1845
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1846
str.lower = function(self){
1847
var $ = $B.args("lower", 1, {self: null}, ["self"],
1848
arguments, {}, null, null)
1849
return self.toLowerCase()
1850
}
1851
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1852
str.lstrip = function(self, x){
Coding style
Mar 19, 2018
1853
var $ = $B.args("lstrip", 2, {self: null, chars: null}, ["self", "chars"],
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
1854
arguments, {chars:_b_.None}, null, null),
1855
self = $.self,
1856
chars = $.chars
1857
if(chars === _b_.None){
1858
return self.trimStart()
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1859
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
1860
while(self.length > 0){
1861
var flag = false
1862
for(var char of chars){
1863
if(self.startsWith(char)){
1864
self = self.substr(char.length)
1865
flag = true
1866
break
1867
}
1868
}
1869
if(! flag){
1870
return $.self.surrogates ? $B.String(self) : self
@jonathanverner
Fix strip handling of bracket character (GH Issue #521).
Nov 2, 2016
1871
}
1872
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
1873
return ''
@PierreQuentel
First import
Sep 5, 2014
1874
}
1875
1876
// note, maketrans should be a static function.
str
Feb 10, 2018
1877
str.maketrans = function() {
Coding style
Mar 19, 2018
1878
var $ = $B.args("maketrans", 3, {x: null, y: null, z: null},
1879
["x", "y", "z"], arguments, {y: null, z: null}, null, null)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1880
For performance, replace "_b_.dict.$factory()" by "$B.empty_dict()" (…
Jun 29, 2020
1881
var _t = $B.empty_dict()
Fixes bug with NotImplemented (it is not an exception class)
Nov 18, 2018
1882
Coding style
Mar 19, 2018
1883
if($.y === null && $.z === null){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1884
// If there is only one argument, it must be a dictionary mapping
1885
// Unicode ordinals (integers) or characters (strings of length 1) to
1886
// Unicode ordinals, strings (of arbitrary lengths) or None. Character
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1887
// keys will then be converted to ordinals.
Coding style
Mar 19, 2018
1888
if(! _b_.isinstance($.x, _b_.dict)){
1889
throw _b_.TypeError.$factory(
1890
"maketrans only argument must be a dict")
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1891
}
dict
Feb 11, 2018
1892
var items = _b_.list.$factory(_b_.dict.items($.x))
Coding style
Mar 19, 2018
1893
for(var i = 0, len = items.length; i < len; i++){
1894
var k = items[i][0],
1895
v = items[i][1]
1896
if(! _b_.isinstance(k, _b_.int)){
1897
if(_b_.isinstance(k, _b_.str) && k.length == 1){
1898
k = _b_.ord(k)
1899
}else{throw _b_.TypeError.$factory("dictionary key " + k +
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1900
" is not int or 1-char string")}
1901
}
Coding style
Mar 19, 2018
1902
if(v !== _b_.None && ! _b_.isinstance(v, [_b_.int, _b_.str])){
1903
throw _b_.TypeError.$factory("dictionary value " + v +
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1904
" is not None, integer or string")
1905
}
Impacts of dict implementation change in other scripts
Dec 10, 2018
1906
_b_.dict.$setitem(_t, k, v)
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1907
}
1908
return _t
1909
}else{
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1910
// If there are two arguments, they must be strings of equal length,
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1911
// and in the resulting dictionary, each character in x will be mapped
1912
// to the character at the same position in y
Coding style
Mar 19, 2018
1913
if(! (_b_.isinstance($.x, _b_.str) && _b_.isinstance($.y, _b_.str))){
Implement exceptions as new-style classes
Feb 10, 2018
1914
throw _b_.TypeError.$factory("maketrans arguments must be strings")
Coding style
Mar 19, 2018
1915
}else if($.x.length !== $.y.length){
1916
throw _b_.TypeError.$factory(
1917
"maketrans arguments must be strings or same length")
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1918
}else{
1919
var toNone = {}
Coding style
Mar 19, 2018
1920
if($.z !== null){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1921
// If there is a third argument, it must be a string, whose
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1922
// characters will be mapped to None in the result
Coding style
Mar 19, 2018
1923
if(! _b_.isinstance($.z, _b_.str)){
1924
throw _b_.TypeError.$factory(
1925
"maketrans third argument must be a string")
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1926
}
Coding style
Mar 19, 2018
1927
for(var i = 0, len = $.z.length; i < len; i++){
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1928
toNone[_b_.ord($.z.charAt(i))] = true
1929
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1930
}
Coding style
Mar 19, 2018
1931
for(var i = 0, len = $.x.length; i < len; i++){
Impacts of dict implementation change in other scripts
Dec 10, 2018
1932
var key = _b_.ord($.x.charAt(i)),
Fixes #1078 : 'xyz'.maketrans('abc', 'def', 'abd') not happy with 3 args
Apr 2, 2019
1933
value = $.y.charCodeAt(i)
Impacts of dict implementation change in other scripts
Dec 10, 2018
1934
_b_.dict.$setitem(_t, key, value)
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1935
}
1936
for(var k in toNone){
Impacts of dict implementation change in other scripts
Dec 10, 2018
1937
_b_.dict.$setitem(_t, parseInt(k), _b_.None)
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1938
}
1939
return _t
1940
}
1941
}
@PierreQuentel
First import
Sep 5, 2014
1942
}
1943
Fixes #1077 : 'xyz'.maketrans({'a': 'A'}) not happy with strings
Apr 2, 2019
1944
str.maketrans.$type = "staticmethod"
1945
str
Feb 10, 2018
1946
str.partition = function() {
Coding style
Mar 19, 2018
1947
var $ = $B.args("partition", 2, {self: null, sep: null}, ["self", "sep"],
1948
arguments, {}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1949
if($.sep == ""){
1950
throw _b_.ValueError.$factory("empty separator")
1951
}
Coding style
Mar 19, 2018
1952
check_str($.sep)
@austin-schick
Fix bugs in string.partition
Apr 4, 2021
1953
var chars = to_chars($.self),
1954
i = $.self.indexOf($.sep)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1955
if(i == -1){
1956
return _b_.tuple.$factory([$.self, "", ""])
1957
}
1958
return _b_.tuple.$factory([chars.slice(0, i).join(''), $.sep,
1959
chars.slice(i + $.sep.length).join('')])
Coding style
Mar 19, 2018
1960
}
1961
Implement PEP 616 -- String methods to remove prefixes and suffixes (…
Jun 11, 2020
1962
str.removeprefix = function(){
1963
var $ = $B.args("removeprefix", 2, {self: null, prefix: null},
1964
["self", "prefix"], arguments, {}, null, null)
1965
if(!_b_.isinstance($.prefix, str)){
1966
throw _b_.ValueError.$factory("prefix should be str, not " +
1967
`'${$B.class_name($.prefix)}'`)
1968
}
1969
if(str.startswith($.self, $.prefix)){
1970
return $.self.substr($.prefix.length)
1971
}
1972
return $.self.substr(0)
1973
}
1974
1975
str.removesuffix = function(){
1976
var $ = $B.args("removesuffix", 2, {self: null, prefix: null},
1977
["self", "suffix"], arguments, {}, null, null)
1978
if(!_b_.isinstance($.suffix, str)){
1979
throw _b_.ValueError.$factory("suffix should be str, not " +
1980
`'${$B.class_name($.prefix)}'`)
1981
}
1982
if($.suffix.length > 0 && str.endswith($.self, $.suffix)){
1983
return $.self.substr(0, $.self.length - $.suffix.length)
1984
}
1985
return $.self.substr(0)
1986
}
1987
Coding style
Mar 19, 2018
1988
function $re_escape(str){
1989
var specials = "[.*+?|()$^"
1990
for(var i = 0, len = specials.length; i < len; i++){
1991
var re = new RegExp("\\"+specials.charAt(i), "g")
1992
str = str.replace(re, "\\"+specials.charAt(i))
1993
}
1994
return str
@PierreQuentel
First import
Sep 5, 2014
1995
}
1996
str
Feb 10, 2018
1997
str.replace = function(self, old, _new, count) {
Updated to latest copy of the repo
Jan 1, 2015
1998
// Replaces occurrences of 'old' by '_new'. Count references
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1999
// the number of times to replace. In CPython, negative or undefined
Updated to latest copy of the repo
Jan 1, 2015
2000
// values of count means replace all.
Coding style
Mar 19, 2018
2001
var $ = $B.args("replace", 4,
2002
{self: null, old: null, $$new: null, count: null},
2003
["self", "old", "$$new", "count"],
2004
arguments, {count: -1}, null, null),
2005
count = $.count,
2006
self = $.self,
2007
old = $.old,
2008
_new = $.$$new
@PierreQuentel
Fixes bugs with str.replace()
Sep 18, 2015
2009
// Validate type of old
Fixes some error messages in string methods
Apr 5, 2021
2010
check_str(old, "replace() argument 1 ")
2011
check_str(_new, "replace() argument 2 ")
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2012
// Validate instance type of 'count'
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
2013
if(! _b_.isinstance(count,[_b_.int, _b_.float])){
Replace occurrences of $B.get_class(obj).__name__ by $B.class_name(ob…
Jan 3, 2019
2014
throw _b_.TypeError.$factory("'" + $B.class_name(count) +
Coding style
Mar 19, 2018
2015
"' object cannot be interpreted as an integer")
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
2016
}else if(_b_.isinstance(count, _b_.float)){
Coding style
Mar 19, 2018
2017
throw _b_.TypeError.$factory("integer argument expected, got float")
2018
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2019
if(count == 0){
2020
return self
2021
}
2022
if(count.__class__ == $B.long_int){
2023
count = parseInt(count.value)
2024
}
Coding style
Mar 19, 2018
2025
if(old == ""){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2026
if(_new == ""){
2027
return self
2028
}
2029
if(self == ""){
2030
return _new
2031
}
Coding style
Mar 19, 2018
2032
var elts = self.split("")
2033
if(count > -1 && elts.length >= count){
2034
var rest = elts.slice(count).join("")
2035
return _new + elts.slice(0, count).join(_new) + rest
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2036
}else{
2037
return _new + elts.join(_new) + _new
2038
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2039
}else{
Coding style
Mar 19, 2018
2040
var elts = str.split(self, old, count)
@PierreQuentel
First import
Sep 5, 2014
2041
}
Updated to latest copy of the repo
Jan 1, 2015
2042
Coding style
Mar 19, 2018
2043
var res = self,
2044
pos = -1
2045
if(old.length == 0){
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2046
var res = _new
Coding style
Mar 19, 2018
2047
for(var i = 0; i < elts.length; i++){
2048
res += elts[i] + _new
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2049
}
Coding style
Mar 19, 2018
2050
return res + rest
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2051
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2052
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2053
if(count < 0){
2054
count = res.length
2055
}
Coding style
Mar 19, 2018
2056
while(count > 0){
2057
pos = res.indexOf(old, pos)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2058
if(pos < 0){
2059
break
2060
}
Coding style
Mar 19, 2018
2061
res = res.substr(0, pos) + _new + res.substr(pos + old.length)
2062
pos = pos + _new.length
2063
count--
Updated to latest copy of the repo
Jan 1, 2015
2064
}
Coding style
Mar 19, 2018
2065
return res
@PierreQuentel
First import
Sep 5, 2014
2066
}
2067
Improve speed of some bytes and str methods
May 24, 2019
2068
str.rfind = function(self, substr){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2069
// Return the highest index in the string where substring sub is found,
2070
// such that sub is contained within s[start:end]. Optional arguments
@PierreQuentel
First import
Sep 5, 2014
2071
// start and end are interpreted as in slice notation. Return -1 on failure.
Coding style
Mar 19, 2018
2072
var $ = $B.args("rfind", 4,
Coding style
Mar 19, 2018
2073
{self: null, sub: null, start: null, end: null},
2074
["self", "sub", "start", "end"],
2075
arguments, {start: 0, end: null}, null, null)
@PierreQuentel
First import
Sep 5, 2014
2076
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2077
normalize_start_end($)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2078
check_str($.sub)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2079
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2080
var len = str.__len__($.self),
2081
sub_len = str.__len__($.sub)
2082
2083
if(sub_len == 0){
2084
if($.js_start > len){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2085
return -1
2086
}else{
2087
return str.__len__($.self)
2088
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2089
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2090
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2091
// Use .indexOf(), not .search(), to avoid conversion to reg exp
2092
var js_start = pypos2jspos($.self, $.start),
2093
js_end = pypos2jspos($.self, $.end),
2094
ix = $.self.substring(js_start, js_end).lastIndexOf($.sub)
2095
if(ix == -1){
2096
return -1
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2097
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2098
return jspos2pypos($.self, js_start + ix) - $.start
@PierreQuentel
First import
Sep 5, 2014
2099
}
2100
str
Feb 10, 2018
2101
str.rindex = function(){
@PierreQuentel
First import
Sep 5, 2014
2102
// Like rfind() but raises ValueError when the substring sub is not found
Coding style
Mar 19, 2018
2103
var res = str.rfind.apply(null, arguments)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2104
if(res == -1){
2105
throw _b_.ValueError.$factory("substring not found")
2106
}
@PierreQuentel
First import
Sep 5, 2014
2107
return res
2108
}
2109
str
Feb 10, 2018
2110
str.rjust = function(self) {
Coding style
Mar 19, 2018
2111
var $ = $B.args("rjust",3,
2112
{self: null, width: null, fillchar: null},
2113
["self", "width", "fillchar"],
2114
arguments, {fillchar: " "}, null, null)
@PierreQuentel
First import
Sep 5, 2014
2115
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2116
var len = str.__len__(self)
2117
if($.width <= len){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2118
return self
2119
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2120
return $B.String($.fillchar.repeat($.width - len) + self)
@PierreQuentel
First import
Sep 5, 2014
2121
}
2122
str
Feb 10, 2018
2123
str.rpartition = function(self,sep) {
Coding style
Mar 19, 2018
2124
var $ = $B.args("rpartition", 2, {self: null, sep: null}, ["self", "sep"],
2125
arguments, {}, null, null)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2126
check_str($.sep)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2127
var self = reverse($.self),
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2128
sep = reverse($.sep)
Coding style
Mar 19, 2018
2129
var items = str.partition(self, sep).reverse()
2130
for(var i = 0; i < items.length; i++){
2131
items[i] = items[i].split("").reverse().join("")
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2132
}
2133
return items
@PierreQuentel
First import
Sep 5, 2014
2134
}
2135
str
Feb 10, 2018
2136
str.rsplit = function(self) {
Coding style
Mar 19, 2018
2137
var $ = $B.args("rsplit", 3, {self: null, sep: null, maxsplit: null},
2138
["self", "sep", "maxsplit"], arguments,
2139
{sep: _b_.None, maxsplit: -1}, null, null),
2140
sep = $.sep
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2141
2142
// Use split on the reverse of the string and of separator
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2143
var rev_str = reverse($.self),
2144
rev_sep = sep === _b_.None ? sep : reverse($.sep),
str
Feb 10, 2018
2145
rev_res = str.split(rev_str, rev_sep, $.maxsplit)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2146
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2147
// Reverse the list, then each string inside the list
2148
rev_res.reverse()
Coding style
Mar 19, 2018
2149
for(var i = 0; i < rev_res.length; i++){
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2150
rev_res[i] = reverse(rev_res[i])
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2151
}
2152
return rev_res
@PierreQuentel
First import
Sep 5, 2014
2153
}
2154
Coding style
Mar 19, 2018
2155
str.rstrip = function(self, x){
2156
var $ = $B.args("rstrip", 2, {self: null, chars: null}, ["self", "chars"],
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2157
arguments, {chars: _b_.None}, null, null),
2158
self = $.self,
2159
chars = $.chars
2160
if(chars === _b_.None){
2161
return self.trimEnd()
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2162
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2163
while(self.length > 0){
2164
var flag = false
2165
for(var char of chars){
2166
if(self.endsWith(char)){
2167
self = self.substr(0, self.length - char.length)
2168
flag = true
2169
break
2170
}
2171
}
2172
if(! flag){
2173
return $.self.surrogates ? $B.String(self) : self
@jonathanverner
Fix strip handling of bracket character (GH Issue #521).
Nov 2, 2016
2174
}
2175
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2176
return ''
@PierreQuentel
First import
Sep 5, 2014
2177
}
2178
str
Feb 10, 2018
2179
str.split = function(){
Coding style
Mar 19, 2018
2180
var $ = $B.args("split", 3, {self: null, sep: null, maxsplit: null},
2181
["self", "sep", "maxsplit"], arguments,
2182
{sep: _b_.None, maxsplit: -1}, null, null),
2183
sep = $.sep,
2184
maxsplit = $.maxsplit,
2185
self = $.self,
2186
pos = 0
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2187
if(maxsplit.__class__ === $B.long_int){
2188
maxsplit = parseInt(maxsplit.value)
2189
}
2190
if(sep == ""){
2191
throw _b_.ValueError.$factory("empty separator")
2192
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2193
Coding style
Mar 19, 2018
2194
if(sep === _b_.None){
@PierreQuentel
First import
Sep 5, 2014
2195
var res = []
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2196
while(pos < self.length && self.charAt(pos).search(/\s/) > -1){
2197
pos++
2198
}
2199
if(pos === self.length - 1){
2200
return [self]
2201
}
Coding style
Mar 19, 2018
2202
var name = ""
@PierreQuentel
First import
Sep 5, 2014
2203
while(1){
Coding style
Mar 19, 2018
2204
if(self.charAt(pos).search(/\s/) == -1){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2205
if(name == ""){
2206
name = self.charAt(pos)
2207
}else{
2208
name += self.charAt(pos)
2209
}
@PierreQuentel
First import
Sep 5, 2014
2210
}else{
Coding style
Mar 19, 2018
2211
if(name !== ""){
@PierreQuentel
First import
Sep 5, 2014
2212
res.push(name)
Coding style
Mar 19, 2018
2213
if(maxsplit !== -1 && res.length == maxsplit + 1){
@PierreQuentel
First import
Sep 5, 2014
2214
res.pop()
Coding style
Mar 19, 2018
2215
res.push(name + self.substr(pos))
@PierreQuentel
First import
Sep 5, 2014
2216
return res
2217
}
Coding style
Mar 19, 2018
2218
name = ""
@PierreQuentel
First import
Sep 5, 2014
2219
}
2220
}
2221
pos++
Coding style
Mar 19, 2018
2222
if(pos > self.length - 1){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2223
if(name){
2224
res.push(name)
2225
}
@PierreQuentel
First import
Sep 5, 2014
2226
break
2227
}
2228
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2229
return res.map($B.String)
@PierreQuentel
First import
Sep 5, 2014
2230
}else{
Coding style
Mar 19, 2018
2231
var res = [],
2232
s = "",
2233
seplen = sep.length
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2234
if(maxsplit == 0){
2235
return [self]
2236
}
Coding style
Mar 19, 2018
2237
while(pos < self.length){
2238
if(self.substr(pos, seplen) == sep){
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2239
res.push(s)
2240
pos += seplen
Coding style
Mar 19, 2018
2241
if(maxsplit > -1 && res.length >= maxsplit){
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2242
res.push(self.substr(pos))
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2243
return res.map($B.String)
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2244
}
Coding style
Mar 19, 2018
2245
s = ""
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2246
}else{
2247
s += self.charAt(pos)
2248
pos++
@PierreQuentel
First import
Sep 5, 2014
2249
}
2250
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2251
res.push(s)
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2252
return res.map($B.String)
@PierreQuentel
First import
Sep 5, 2014
2253
}
2254
}
2255
Fixes #1306 : improved compliance for str and bytes splitlines()
Feb 27, 2020
2256
str.splitlines = function(self) {
2257
var $ = $B.args('splitlines', 2, {self: null, keepends: null},
2258
['self','keepends'], arguments, {keepends: false},
2259
null, null)
2260
if(!_b_.isinstance($.keepends,[_b_.bool, _b_.int])){
2261
throw _b_.TypeError('integer argument expected, got '+
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2262
$B.get_class($.keepends).__name)
2263
}
Fixes #1306 : improved compliance for str and bytes splitlines()
Feb 27, 2020
2264
var keepends = _b_.int.$factory($.keepends),
2265
res = [],
2266
self = $.self,
2267
start = 0,
2268
pos = 0
2269
if(!self.length){
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2270
return res
2271
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2272
while(pos < self.length){
Fixes #1306 : improved compliance for str and bytes splitlines()
Feb 27, 2020
2273
if(self.substr(pos, 2) == '\r\n'){
2274
res.push(self.slice(start, keepends ? pos + 2 : pos))
2275
start = pos = pos+2
2276
}else if(self[pos] == '\r' || self[pos] == '\n'){
2277
res.push(self.slice(start, keepends ? pos+1 : pos))
2278
start = pos = pos+1
2279
}else{
2280
pos++
2281
}
2282
}
2283
if(start < self.length){
2284
res.push(self.slice(start))
2285
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2286
return res.map($B.String)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2287
}
@PierreQuentel
First import
Sep 5, 2014
2288
str
Feb 10, 2018
2289
str.startswith = function(){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2290
// Return True if string starts with the prefix, otherwise return False.
2291
// prefix can also be a tuple of prefixes to look for. With optional
2292
// start, test string beginning at that position. With optional end,
@PierreQuentel
First import
Sep 5, 2014
2293
// stop comparing string at that position.
Coding style
Mar 19, 2018
2294
var $ = $B.args("startswith", 4,
2295
{self: null, prefix: null, start: null, end: null},
2296
["self", "prefix", "start", "end"],
2297
arguments, {start: 0, end: null}, null, null)
@PierreQuentel
First import
Sep 5, 2014
2298
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2299
normalize_start_end($)
2300
2301
var prefixes = $.prefix
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
2302
if(! _b_.isinstance(prefixes, _b_.tuple)){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2303
prefixes = [prefixes]
2304
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2305
var s = $.self.substring($.js_start, $.js_end)
2306
for(var prefix of prefixes){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2307
if(! _b_.isinstance(prefix, str)){
2308
throw _b_.TypeError.$factory("endswith first arg must be str " +
2309
"or a tuple of str, not int")
2310
}
2311
if(s.substr(0, prefix.length) == prefix){
2312
return true
2313
}
@PierreQuentel
First import
Sep 5, 2014
2314
}
2315
return false
2316
}
2317
str
Feb 10, 2018
2318
str.strip = function(){
Coding style
Mar 19, 2018
2319
var $ = $B.args("strip", 2, {self: null, chars: null}, ["self", "chars"],
2320
arguments, {chars: _b_.None}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2321
if($.chars === _b_.None){
2322
return $.self.trim()
2323
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2324
return str.rstrip(str.lstrip($.self, $.chars), $.chars)
@PierreQuentel
First import
Sep 5, 2014
2325
}
2326
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2327
str.swapcase = function(self){
2328
var $ = $B.args("swapcase", 1, {self}, ["self"],
2329
arguments, {}, null, null),
2330
res = "",
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2331
cp
2332
2333
for(var char of to_chars(self)){
2334
cp = _b_.ord(char)
2335
if(unicode_tables.Ll[cp]){
2336
res += char.toUpperCase()
2337
}else if(unicode_tables.Lu[cp]){
2338
res += char.toLowerCase()
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2339
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2340
res += char
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2341
}
2342
}
2343
return res
2344
}
2345
2346
str.title = function(self){
2347
var $ = $B.args("title", 1, {self}, ["self"],
2348
arguments, {}, null, null),
2349
state,
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2350
cp,
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2351
res = ""
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2352
for(var char of to_chars(self)){
2353
cp = _b_.ord(char)
2354
if(unicode_tables.Ll[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2355
if(! state){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2356
res += char.toUpperCase()
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2357
state = "word"
2358
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2359
res += char
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2360
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2361
}else if(unicode_tables.Lu[cp] || unicode_tables.Lt[cp]){
2362
res += state ? char.toLowerCase() : char
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2363
state = "word"
2364
}else{
2365
state = null
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2366
res += char
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2367
}
2368
}
2369
return res
2370
}
2371
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2372
str.translate = function(self, table){
Coding style
Mar 19, 2018
2373
var res = [],
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2374
getitem = $B.$getattr(table, "__getitem__"),
2375
cp
2376
for(var char of to_chars(self)){
2377
cp = _b_.ord(char)
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2378
try{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2379
var repl = getitem(cp)
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2380
if(repl !== _b_.None){
Fixes #1278 : re.escape returning unprintable characters
Jan 26, 2020
2381
if(typeof repl == "string"){
2382
res.push(repl)
2383
}else if(typeof repl == "number"){
2384
res.push(String.fromCharCode(repl))
2385
}
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2386
}
2387
}catch(err){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2388
res.push(char)
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2389
}
@PierreQuentel
First import
Sep 5, 2014
2390
}
Coding style
Mar 19, 2018
2391
return res.join("")
@PierreQuentel
First import
Sep 5, 2014
2392
}
2393
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2394
str.upper = function(self){
2395
var $ = $B.args("upper", 1, {self: null}, ["self"],
2396
arguments, {}, null, null)
2397
return self.toUpperCase()
2398
}
2399
Coding style
Mar 19, 2018
2400
str.zfill = function(self, width){
Coding style
Mar 19, 2018
2401
var $ = $B.args("zfill", 2, {self: null, width: null},
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2402
["self", "width"], arguments, {}, null, null),
2403
len = str.__len__(self)
2404
if($.width <= len){
2405
return self
2406
}
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
2407
switch(self.charAt(0)){
Coding style
Mar 19, 2018
2408
case "+":
2409
case "-":
2410
return self.charAt(0) +
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2411
"0".repeat($.width - len) + self.substr(1)
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
2412
default:
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2413
return "0".repeat($.width - len) + self
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
2414
}
@PierreQuentel
First import
Sep 5, 2014
2415
}
2416
Implement str(arg, encoding, errors)
Jul 28, 2018
2417
str.$factory = function(arg, encoding, errors){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2418
if(arguments.length == 0){
2419
return ""
2420
}
@PierreQuentel
If the argument of str() is undefined, raise an exception instead of …
Aug 2, 2019
2421
if(arg === undefined){
Fixes #1352 : functions without return value are not always returning…
Apr 19, 2020
2422
return $B.UndefinedClass.__str__()
Better support of Javascript null. Fix bug in documentation (it is no…
Dec 14, 2020
2423
}else if(arg === null){
2424
return '<Javascript null>'
@PierreQuentel
If the argument of str() is undefined, raise an exception instead of …
Aug 2, 2019
2425
}
Fixes bug when str() arguments are passed as keywords
Nov 15, 2019
2426
if(encoding !== undefined){
2427
// Arguments may be passed as keywords (cf. issue #1060)
2428
var $ = $B.args("str", 3, {arg: null, encoding: null, errors: null},
2429
["arg", "encoding", "errors"], arguments,
2430
{encoding: "utf-8", errors: "strict"}, null, null),
2431
encoding = $.encoding,
2432
errors = $.errors
2433
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2434
if(typeof arg == "string" || arg instanceof String ||
2435
typeof arg == "number"){
2436
if(isFinite(arg)){
2437
return arg.toString()
2438
}
@earney
make str(i) a bit more efficient
Mar 23, 2015
2439
}
@PierreQuentel
Improve speed of str() on integers and strings
Mar 22, 2015
2440
try{
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
2441
if(arg.$is_class || arg.$factory){
2442
// arg is a class
@PierreQuentel
Fixes #155 : metaclass not set as the type of a class when called dir…
Mar 17, 2015
2443
// In this case, str() doesn't use the attribute __str__ of the
@PierreQuentel
Fix str() for classes
Mar 16, 2015
2444
// class or its subclasses, but the attribute __str__ of the
2445
// class metaclass (usually "type") or its subclasses (usually
2446
// "object")
2447
// The metaclass is the attribute __class__ of the class dictionary
Coding style
Mar 19, 2018
2448
var func = $B.$getattr(arg.__class__, "__str__")
Fixes #720 : "call stack exceeded" for comparison operators using fun…
Dec 7, 2017
2449
return func(arg)
@PierreQuentel
Fix str() for classes
Mar 16, 2015
2450
}
Fixes bug when str() arguments are passed as keywords
Nov 15, 2019
2451
Implement str(arg, encoding, errors)
Jul 28, 2018
2452
if(arg.__class__ && arg.__class__ === _b_.bytes &&
2453
encoding !== undefined){
2454
// str(bytes, encoding, errors) is equal to
2455
// bytes.decode(encoding, errors)
Fixes #1060 : str(bytes('abc', encoding='ascii'), encoding='ascii') r…
Mar 19, 2019
2456
return _b_.bytes.decode(arg, $.encoding, $.errors)
Implement str(arg, encoding, errors)
Jul 28, 2018
2457
}
Fixes #1229 : Python's repr and str function should ignore any instan…
Oct 27, 2019
2458
// Implicit invocation of __str__ uses method __str__ on the class,
2459
// even if arg has an attribute __str__
2460
var klass = arg.__class__ || $B.get_class(arg)
Handle hash() and str() for objects without a class (DOM objects)
May 3, 2020
2461
if(klass === undefined){
Adapt core Brython scripts to new interface with JS objects
Jul 17, 2020
2462
return $B.JSObj.__str__($B.JSObj.$factory(arg))
Handle hash() and str() for objects without a class (DOM objects)
May 3, 2020
2463
}
Fixes #1229 : Python's repr and str function should ignore any instan…
Oct 27, 2019
2464
var method = $B.$getattr(klass , "__str__", null)
2465
if(method === null ||
In str(obj), if obj.__str__ uses object.__str__ and obj has an attrib…
Nov 2, 2018
2466
// if not better than object.__str__, try __repr__
2467
(arg.__class__ && arg.__class__ !== _b_.object &&
Fixes #1229 : Python's repr and str function should ignore any instan…
Oct 27, 2019
2468
method.$infos && method.$infos.__func__ === _b_.object.__str__)){
2469
var method = $B.$getattr(klass, "__repr__")
In str(obj), if obj.__str__ uses object.__str__ and obj has an attrib…
Nov 2, 2018
2470
}
@PierreQuentel
First import
Sep 5, 2014
2471
}
2472
catch(err){
Change object.__getattribute__ and type.__getattribute__ to handle me…
Jun 28, 2018
2473
console.log("no __str__ for", arg)
Coding style
Mar 19, 2018
2474
console.log("err ", err)
In str(obj), if obj.__str__ uses object.__str__ and obj has an attrib…
Nov 2, 2018
2475
if($B.debug > 1){console.log(err)}
2476
console.log("Warning - no method __str__ or __repr__, " +
2477
"default to toString", arg)
Fixes #1060 (new issue)
May 20, 2019
2478
throw err
@PierreQuentel
First import
Sep 5, 2014
2479
}
Fixes #1229 : Python's repr and str function should ignore any instan…
Oct 27, 2019
2480
return $B.$call(method)(arg)
@PierreQuentel
First import
Sep 5, 2014
2481
}
str
Feb 10, 2018
2482
2483
str.__new__ = function(cls){
Coding style
Mar 19, 2018
2484
if(cls === undefined){
2485
throw _b_.TypeError.$factory("str.__new__(): not enough arguments")
@PierreQuentel
First import
Sep 5, 2014
2486
}
Coding style
Mar 19, 2018
2487
return {__class__: cls}
@PierreQuentel
First import
Sep 5, 2014
2488
}
2489
str
Feb 10, 2018
2490
$B.set_func_names(str, "builtins")
Updated to latest copy of the repo
Jan 1, 2015
2491
@PierreQuentel
First import
Sep 5, 2014
2492
// dictionary and factory for subclasses of string
str
Feb 10, 2018
2493
var StringSubclass = $B.StringSubclass = {
Coding style
Mar 19, 2018
2494
__class__: _b_.type,
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
2495
__mro__: [_b_.object],
Fixes #1007 : __name__ should not be an attribute of bool values, int…
Jan 2, 2019
2496
$infos: {
2497
__module__: "builtins",
2498
__name__: "str"
2499
},
str
Feb 10, 2018
2500
$is_class: true
@PierreQuentel
First import
Sep 5, 2014
2501
}
2502
str
Feb 10, 2018
2503
// the methods in subclass apply the methods in str to the
@PierreQuentel
First import
Sep 5, 2014
2504
// result of instance.valueOf(), which is a Javascript string
str
Feb 10, 2018
2505
for(var $attr in str){
Coding style
Mar 19, 2018
2506
if(typeof str[$attr] == "function"){
Coding style
Mar 19, 2018
2507
StringSubclass[$attr] = (function(attr){
@PierreQuentel
First import
Sep 5, 2014
2508
return function(){
Coding style
Mar 19, 2018
2509
var args = [],
2510
pos = 0
2511
if(arguments.length > 0){
2512
var args = [arguments[0].valueOf()],
2513
pos = 1
2514
for(var i = 1, len = arguments.length; i < len; i++){
2515
args[pos++] = arguments[i]
@PierreQuentel
First import
Sep 5, 2014
2516
}
2517
}
Coding style
Mar 19, 2018
2518
return str[attr].apply(null, args)
@PierreQuentel
First import
Sep 5, 2014
2519
}
2520
})($attr)
2521
}
2522
}
Implement str.format_map()
Nov 22, 2020
2523
str
Feb 10, 2018
2524
StringSubclass.__new__ = function(cls){
Remove lzst "old-style" classes and all the code that handled them
Feb 12, 2018
2525
return {__class__: cls}
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
2526
}
@PierreQuentel
First import
Sep 5, 2014
2527
str
Feb 10, 2018
2528
$B.set_func_names(StringSubclass, "builtins")
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
2529
@PierreQuentel
First import
Sep 5, 2014
2530
_b_.str = str
2531
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2532
// Function to parse the 2nd argument of format()
2533
$B.parse_format_spec = function(spec){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2534
if(spec == ""){
2535
this.empty = true
2536
}else{
Coding style
Mar 19, 2018
2537
var pos = 0,
2538
aligns = "<>=^",
2539
digits = "0123456789",
2540
types = "bcdeEfFgGnosxX%",
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
2541
align_pos = aligns.indexOf(spec.charAt(0))
Coding style
Mar 19, 2018
2542
if(align_pos != -1){
2543
if(spec.charAt(1) && aligns.indexOf(spec.charAt(1)) != -1){
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
2544
// If the second char is also an alignment specifier, the
2545
// first char is the fill value
2546
this.fill = spec.charAt(0)
2547
this.align = spec.charAt(1)
2548
pos = 2
2549
}else{
2550
// The first character defines alignment : fill defaults to ' '
Coding style
Mar 19, 2018
2551
this.align = aligns[align_pos]
2552
this.fill = " "
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
2553
pos++
2554
}
2555
}else{
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2556
align_pos = aligns.indexOf(spec.charAt(1))
Coding style
Mar 19, 2018
2557
if(spec.charAt(1) && align_pos != -1){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2558
// The second character defines alignment : fill is the first one
Coding style
Mar 19, 2018
2559
this.align = aligns[align_pos]
2560
this.fill = spec.charAt(0)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2561
pos = 2
2562
}
2563
}
2564
var car = spec.charAt(pos)
Coding style
Mar 19, 2018
2565
if(car == "+" || car == "-" || car == " "){
2566
this.sign = car
2567
pos++
2568
car = spec.charAt(pos)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2569
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2570
if(car == "#"){
2571
this.alternate = true; pos++; car = spec.charAt(pos)
2572
}
Coding style
Mar 19, 2018
2573
if(car == "0"){
Coding style
Mar 19, 2018
2574
// sign-aware : equivalent to fill = 0 and align == "="
Coding style
Mar 19, 2018
2575
this.fill = "0"
Fixes #1075 : format(123.456, "^-09.3f") not centered
Apr 2, 2019
2576
if(align_pos == -1){
2577
this.align = "="
2578
}
Coding style
Mar 19, 2018
2579
pos++
2580
car = spec.charAt(pos)
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
2581
}
Coding style
Mar 19, 2018
2582
while(car && digits.indexOf(car) > -1){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2583
if(this.width === undefined){
2584
this.width = car
2585
}else{
2586
this.width += car
2587
}
Coding style
Mar 19, 2018
2588
pos++
2589
car = spec.charAt(pos)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2590
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2591
if(this.width !== undefined){
2592
this.width = parseInt(this.width)
2593
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
2594
if(this.width === undefined && car == "{"){
2595
// Width is determined by a parameter
2596
var end_param_pos = spec.substr(pos).search("}")
2597
this.width = spec.substring(pos, end_param_pos)
2598
console.log("width", "[" + this.width + "]")
2599
pos += end_param_pos + 1
2600
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2601
if(car == ","){
2602
this.comma = true
2603
pos++
2604
car = spec.charAt(pos)
2605
}
Coding style
Mar 19, 2018
2606
if(car == "."){
2607
if(digits.indexOf(spec.charAt(pos + 1)) == -1){
2608
throw _b_.ValueError.$factory(
2609
"Missing precision in format spec")
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2610
}
Coding style
Mar 19, 2018
2611
this.precision = spec.charAt(pos + 1)
2612
pos += 2
2613
car = spec.charAt(pos)
2614
while(car && digits.indexOf(car) > -1){
Coding style
Mar 21, 2018
2615
this.precision += car
Coding style
Mar 19, 2018
2616
pos++
2617
car = spec.charAt(pos)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2618
}
2619
this.precision = parseInt(this.precision)
2620
}
Coding style
Mar 19, 2018
2621
if(car && types.indexOf(car) > -1){
2622
this.type = car
2623
pos++
2624
car = spec.charAt(pos)
2625
}
2626
if(pos !== spec.length){
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
2627
throw _b_.ValueError.$factory("Invalid format specifier: " + spec)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2628
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2629
}
Fixes #1076 : 'str' object has no attribute 'isascii'
Apr 2, 2019
2630
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2631
this.toString = function(){
Coding style
Mar 19, 2018
2632
return (this.fill === undefined ? "" : _b_.str.$factory(this.fill)) +
2633
(this.align || "") +
2634
(this.sign || "") +
2635
(this.alternate ? "#" : "") +
2636
(this.sign_aware ? "0" : "") +
2637
(this.width || "") +
2638
(this.comma ? "," : "") +
2639
(this.precision ? "." + this.precision : "") +
2640
(this.type || "")
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2641
}
2642
}
2643
2644
$B.format_width = function(s, fmt){
Coding style
Mar 19, 2018
2645
if(fmt.width && s.length < fmt.width){
2646
var fill = fmt.fill || " ",
2647
align = fmt.align || "<",
2648
missing = fmt.width - s.length
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2649
switch(align){
Coding style
Mar 19, 2018
2650
case "<":
2651
return s + fill.repeat(missing)
2652
case ">":
2653
return fill.repeat(missing) + s
2654
case "=":
2655
if("+-".indexOf(s.charAt(0)) > -1){
2656
return s.charAt(0) + fill.repeat(missing) + s.substr(1)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2657
}else{
Coding style
Mar 19, 2018
2658
return fill.repeat(missing) + s
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2659
}
Coding style
Mar 19, 2018
2660
case "^":
2661
var left = parseInt(missing / 2)
2662
return fill.repeat(left) + s + fill.repeat(missing - left)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2663
}
2664
}
2665
return s
2666
}
2667
Improved implementation of f-strings
Jul 10, 2017
2668
function fstring_expression(){
Coding style
Mar 19, 2018
2669
this.type = "expression"
2670
this.expression = ""
Improved implementation of f-strings
Jul 10, 2017
2671
this.conversion = null
2672
this.fmt = null
2673
}
2674
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2675
function fstring_error(msg, pos){
2676
error = Error(msg)
2677
error.position = pos
2678
throw error
2679
}
2680
First implementation of f-strings
Jun 29, 2017
2681
$B.parse_fstring = function(string){
2682
// Parse a f-string
2683
var elts = [],
2684
pos = 0,
Coding style
Mar 19, 2018
2685
current = "",
First implementation of f-strings
Jun 29, 2017
2686
ctype = null,
2687
nb_braces = 0,
Fixes #1734 : f-string parsing error
Jul 31, 2021
2688
expr_start,
First implementation of f-strings
Jun 29, 2017
2689
car
2690
Coding style
Mar 19, 2018
2691
while(pos < string.length){
2692
if(ctype === null){
First implementation of f-strings
Jun 29, 2017
2693
car = string.charAt(pos)
Coding style
Mar 19, 2018
2694
if(car == "{"){
Coding style
Mar 21, 2018
2695
if(string.charAt(pos + 1) == "{"){
Coding style
Mar 19, 2018
2696
ctype = "string"
2697
current = "{"
First implementation of f-strings
Jun 29, 2017
2698
pos += 2
2699
}else{
Coding style
Mar 19, 2018
2700
ctype = "expression"
Fixes #1734 : f-string parsing error
Jul 31, 2021
2701
expr_start = pos + 1
First implementation of f-strings
Jun 29, 2017
2702
nb_braces = 1
2703
pos++
2704
}
Coding style
Mar 19, 2018
2705
}else if(car == "}"){
Coding style
Mar 21, 2018
2706
if(string.charAt(pos + 1) == car){
Coding style
Mar 19, 2018
2707
ctype = "string"
2708
current = "}"
Improve implementation of f-strings
Jul 14, 2017
2709
pos += 2
First implementation of f-strings
Jun 29, 2017
2710
}else{
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2711
fstring_error(" f-string: single '}' is not allowed",
2712
pos)
First implementation of f-strings
Jun 29, 2017
2713
}
2714
}else{
Coding style
Mar 19, 2018
2715
ctype = "string"
First implementation of f-strings
Jun 29, 2017
2716
current = car
Improve implementation of f-strings
Jul 14, 2017
2717
pos++
First implementation of f-strings
Jun 29, 2017
2718
}
Coding style
Mar 19, 2018
2719
}else if(ctype == "string"){
First implementation of f-strings
Jun 29, 2017
2720
// end of string is the first single { or end of string
Coding style
Mar 19, 2018
2721
var i = pos
2722
while(i < string.length){
First implementation of f-strings
Jun 29, 2017
2723
car = string.charAt(i)
Coding style
Mar 19, 2018
2724
if(car == "{"){
Coding style
Mar 21, 2018
2725
if(string.charAt(i + 1) == "{"){
Coding style
Mar 19, 2018
2726
current += "{"
2727
i += 2
First implementation of f-strings
Jun 29, 2017
2728
}else{
2729
elts.push(current)
Coding style
Mar 19, 2018
2730
ctype = "expression"
Fixes #1734 : f-string parsing error
Jul 31, 2021
2731
expr_start = i + 1
Coding style
Mar 19, 2018
2732
pos = i + 1
First implementation of f-strings
Jun 29, 2017
2733
break
2734
}
Coding style
Mar 19, 2018
2735
}else if(car == "}"){
2736
if(string.charAt(i + 1) == car){
First implementation of f-strings
Jun 29, 2017
2737
current += car
2738
i += 2
2739
}else{
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2740
fstring_error(" f-string: single '}' is not allowed",
2741
pos)
First implementation of f-strings
Jun 29, 2017
2742
}
2743
}else{
2744
current += car
2745
i++
2746
}
2747
}
Coding style
Mar 19, 2018
2748
pos = i + 1
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2749
}else if(ctype == "debug"){
2750
// after the equal sign, whitespace are ignored and the only
2751
// valid characters are } and :
2752
while(string.charAt(i) == " "){i++}
2753
if(string.charAt(i) == "}"){
2754
// end of debug expression
Fixes #1734 : f-string parsing error
Jul 31, 2021
2755
console.log('end of debug', current)
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2756
elts.push(current)
2757
ctype = null
2758
current = ""
2759
pos = i + 1
2760
}
First implementation of f-strings
Jun 29, 2017
2761
}else{
2762
// End of expression is the } matching the opening {
2763
// There may be nested braces
2764
var i = pos,
2765
nb_braces = 1,
Improve implementation of f-strings
Jul 14, 2017
2766
nb_paren = 0,
Improved implementation of f-strings
Jul 10, 2017
2767
current = new fstring_expression()
Coding style
Mar 19, 2018
2768
while(i < string.length){
First implementation of f-strings
Jun 29, 2017
2769
car = string.charAt(i)
Coding style
Mar 19, 2018
2770
if(car == "{" && nb_paren == 0){
First implementation of f-strings
Jun 29, 2017
2771
nb_braces++
f-strings : support {expr} in format specifiers
Jul 14, 2017
2772
current.expression += car
First implementation of f-strings
Jun 29, 2017
2773
i++
Coding style
Mar 19, 2018
2774
}else if(car == "}" && nb_paren == 0){
First implementation of f-strings
Jun 29, 2017
2775
nb_braces -= 1
Coding style
Mar 19, 2018
2776
if(nb_braces == 0){
First implementation of f-strings
Jun 29, 2017
2777
// end of expression
Fixes #1734 : f-string parsing error
Jul 31, 2021
2778
if(current.fmt){
Changes in implementation of fstrings
Sep 5, 2021
2779
current.format_string = string.substring(fmt_start, i)
2780
current.format = $B.parse_fstring(current.format_string.substr(1))
Fixes #1734 : f-string parsing error
Jul 31, 2021
2781
}
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2782
if(current.expression == ""){
2783
fstring_error("f-string: empty expression not allowed",
2784
pos)
2785
}
Improved implementation of f-strings
Jul 10, 2017
2786
elts.push(current)
First implementation of f-strings
Jun 29, 2017
2787
ctype = null
Coding style
Mar 19, 2018
2788
current = ""
2789
pos = i + 1
f-strings : support {expr} in format specifiers
Jul 14, 2017
2790
break
First implementation of f-strings
Jun 29, 2017
2791
}
f-strings : support {expr} in format specifiers
Jul 14, 2017
2792
current.expression += car
2793
i++
Coding style
Mar 19, 2018
2794
}else if(car == "\\"){
Improved implementation of f-strings
Jul 10, 2017
2795
// backslash is not allowed in expressions
2796
throw Error("f-string expression part cannot include a" +
2797
" backslash")
Coding style
Mar 19, 2018
2798
}else if(nb_paren == 0 && car == "!" && current.fmt === null &&
Fixes #1734 : f-string parsing error
Jul 31, 2021
2799
":}".indexOf(string.charAt(i + 2)) > -1){
Coding style
Mar 19, 2018
2800
if(current.expression.length == 0){
Improved implementation of f-strings
Jul 10, 2017
2801
throw Error("f-string: empty expression not allowed")
2802
}
Coding style
Mar 19, 2018
2803
if("ars".indexOf(string.charAt(i + 1)) == -1){
Improved implementation of f-strings
Jul 10, 2017
2804
throw Error("f-string: invalid conversion character:" +
2805
" expected 's', 'r', or 'a'")
2806
}else{
Coding style
Mar 19, 2018
2807
current.conversion = string.charAt(i + 1)
Improved implementation of f-strings
Jul 10, 2017
2808
i += 2
2809
}
Coding style
Mar 19, 2018
2810
}else if(car == "("){
Improve implementation of f-strings
Jul 14, 2017
2811
nb_paren++
2812
current.expression += car
2813
i++
Coding style
Mar 19, 2018
2814
}else if(car == ")"){
Improve implementation of f-strings
Jul 14, 2017
2815
nb_paren--
2816
current.expression += car
2817
i++
Coding style
Mar 19, 2018
2818
}else if(car == '"'){
Improve implementation of f-strings
Jul 14, 2017
2819
// triple string ?
Coding style
Mar 19, 2018
2820
if(string.substr(i, 3) == '"""'){
2821
var end = string.indexOf('"""', i + 3)
2822
if(end == -1){
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2823
fstring_error("f-string: unterminated string", pos)
Coding style
Mar 19, 2018
2824
}else{
2825
var trs = string.substring(i, end + 3)
2826
trs = trs.replace("\n", "\\n\\")
Improve implementation of f-strings
Jul 14, 2017
2827
current.expression += trs
Coding style
Mar 19, 2018
2828
i = end + 3
Improve implementation of f-strings
Jul 14, 2017
2829
}
2830
}else{
Coding style
Mar 19, 2018
2831
var end = string.indexOf('"', i + 1)
2832
if(end == -1){
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2833
fstring_error("f-string: unterminated string", pos)
Coding style
Mar 19, 2018
2834
}else{
2835
current.expression += string.substring(i, end + 1)
2836
i = end + 1
Improve implementation of f-strings
Jul 14, 2017
2837
}
2838
}
Coding style
Mar 19, 2018
2839
}else if(nb_paren == 0 && car == ":"){
Improved implementation of f-strings
Jul 10, 2017
2840
current.fmt = true
Fixes #1734 : f-string parsing error
Jul 31, 2021
2841
var fmt_start = i
Improved implementation of f-strings
Jul 10, 2017
2842
current.expression += car
2843
i++
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2844
}else if(car == "="){
2845
// might be a "debug expression", eg f"{x=}"
Fixes #1427 : issue with print's f-string handling of new = option wh…
Jun 20, 2020
2846
var ce = current.expression,
2847
last_char = ce.charAt(ce.length - 1),
2848
last_char_re = ('()'.indexOf(last_char) > -1 ? "\\" : "") + last_char
Fixes #1440 : management of unassigned Unicode code points
Jul 8, 2020
2849
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2850
if(ce.length == 0 ||
Fixes #1544 : problem with unittest.mock (bug with '"' inside f-strings)
Nov 30, 2020
2851
nb_paren > 0 ||
Fixes regressions introduced by recent commits
Dec 27, 2019
2852
string.charAt(i + 1) == "=" ||
Fixes #1544 : problem with unittest.mock (bug with '"' inside f-strings)
Nov 30, 2020
2853
"=!<>:".search(last_char_re) > -1){
Fixes #1734 : f-string parsing error
Jul 31, 2021
2854
// not a debug expression
Fixes #1571 : async f-string doesn't see the correct value of a globa…
Jun 23, 2021
2855
current.expression += car
Fixes #1544 : problem with unittest.mock (bug with '"' inside f-strings)
Nov 30, 2020
2856
i += 1
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2857
}else{
2858
// add debug string
2859
tail = car
2860
while(string.charAt(i + 1).match(/\s/)){
2861
tail += string.charAt(i + 1)
2862
i++
2863
}
Fixes #1734 : f-string parsing error
Jul 31, 2021
2864
// push simple string
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2865
elts.push(current.expression + tail)
2866
// remove trailing whitespace from expression
2867
while(ce.match(/\s$/)){
2868
ce = ce.substr(0, ce.length - 1)
2869
}
2870
current.expression = ce
2871
ctype = "debug"
2872
i++
2873
}
First implementation of f-strings
Jun 29, 2017
2874
}else{
Improved implementation of f-strings
Jul 10, 2017
2875
current.expression += car
First implementation of f-strings
Jun 29, 2017
2876
i++
2877
}
2878
}
Coding style
Mar 21, 2018
2879
if(nb_braces > 0){
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2880
fstring_error("f-string: expected '}'", pos)
First implementation of f-strings
Jun 29, 2017
2881
}
2882
}
2883
}
Fixes #1571 : async f-string doesn't see the correct value of a globa…
Jun 23, 2021
2884
if(current.length > 0){
2885
elts.push(current)
2886
}
Fixes #1734 : f-string parsing error
Jul 31, 2021
2887
for(var elt of elts){
2888
if(typeof elt == "object"){
2889
if(elt.fmt_pos !== undefined &&
2890
elt.expression.charAt(elt.fmt_pos) != ':'){
2891
console.log('mauvais format', string, elts)
2892
throw Error()
2893
}
2894
}
2895
}
First implementation of f-strings
Jun 29, 2017
2896
return elts
2897
}
2898
Improvements to python_re.js. test_ignore_case_range passes.
Jan 19, 2021
2899
var _chr = $B.codepoint2jsstring = function(i){
Support upper() and lower() for strings with surrogate pairs
Jan 18, 2021
2900
if(i >= 0x10000 && i <= 0x10FFFF){
2901
var code = (i - 0x10000)
2902
return String.fromCodePoint(0xD800 | (code >> 10)) +
2903
String.fromCodePoint(0xDC00 | (code & 0x3FF))
2904
}else{
2905
return String.fromCodePoint(i)
2906
}
2907
}
Improvements to python_re.js. test_ignore_case_range passes.
Jan 19, 2021
2908
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2909
var _ord = $B.jsstring2codepoint = function(c){
Support upper() and lower() for strings with surrogate pairs
Jan 18, 2021
2910
if(c.length == 1){
2911
return c.charCodeAt(0)
2912
}
2913
var code = 0x10000
2914
code += (c.charCodeAt(0) & 0x03FF) << 10
2915
code += (c.charCodeAt(1) & 0x03FF)
2916
return code
2917
}
2918
@PierreQuentel
First import
Sep 5, 2014
2919
})(__BRYTHON__)