Skip to content
Permalink
brython/www/src/py_string.js
Newer
Older
Raw Normal view History
100644 2933 lines (2720 sloc) 88.6 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)
Fixes #1815 : multiplying a string by a negative number raises an exc…
Nov 8, 2021
964
if(! _b_.isinstance($.other, _b_.int)){
965
throw _b_.TypeError.$factory(
Coding style
Mar 19, 2018
966
"Can't multiply sequence by non-int of type '" +
Fixes #1815 : multiplying a string by a negative number raises an exc…
Nov 8, 2021
967
$B.class_name($.other) + "'")
968
}
969
return $.self.valueOf().repeat($.other < 0 ? 0 : $.other)
@PierreQuentel
First import
Sep 5, 2014
970
}
971
Fixes bugs related to strings (equality of strings with surrogate pai…
Jan 15, 2021
972
str.__ne__ = function(self, other){
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
973
return other.valueOf() !== self.valueOf()
Fixes bugs related to strings (equality of strings with surrogate pai…
Jan 15, 2021
974
}
@PierreQuentel
First import
Sep 5, 2014
975
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
976
function __newobj__(){
977
// __newobj__ is called with a generator as only argument
978
var $ = $B.args('__newobj__', 0, {}, [], arguments, {}, 'args', null),
979
args = $.args
980
var res = args[1]
981
res.__class__ = args[0]
982
return res
983
}
984
985
str.__reduce_ex__ = function(self){
986
return $B.fast_tuple([
987
__newobj__,
988
$B.fast_tuple([self.__class__ || _b_.str, self]),
989
_b_.None,
990
_b_.None])
991
}
992
str
Feb 10, 2018
993
str.__repr__ = function(self){
@PierreQuentel
Fixes bugs with management of escaped characters (\a, \b, \n etc.) in…
Aug 17, 2018
994
// special cases
@PierreQuentel
Fixes repr() for some strings and bytes ('\xa0', 'x0d')
Nov 23, 2021
995
var t = $B.special_string_repr, // in brython_builtins.js
996
repl = '',
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
997
chars = to_chars(self)
998
for(var i = 0; i < chars.length; i++){
999
var cp = _b_.ord(chars[i])
1000
if(t[cp] !== undefined){
1001
repl += t[cp]
1002
}else if($B.is_unicode_cn(cp)){
Minor change in repr() of strings
Dec 8, 2020
1003
var s = cp.toString(16)
Fixes #1440 : management of unassigned Unicode code points
Jul 8, 2020
1004
while(s.length < 4){
1005
s = '0' + s
1006
}
1007
repl += '\\u' + s
Fixes bugs related to strings (equality of strings with surrogate pai…
Jan 15, 2021
1008
}else if(cp < 0x20 || (cp >= 0x7f && cp < 0xa0)){
1009
cp = cp.toString(16)
Minor change in repr() of strings
Dec 8, 2020
1010
if(cp.length < 2){
1011
cp = '0' + cp
1012
}
1013
repl += '\\x' + cp
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1014
}else if(cp >= 0x300 && cp <= 0x36F){
1015
repl += "\u200B" + chars[i]
Fixes #1440 : management of unassigned Unicode code points
Jul 8, 2020
1016
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1017
repl += chars[i]
Fixes #1440 : management of unassigned Unicode code points
Jul 8, 2020
1018
}
1019
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1020
var res = repl
Coding style
Mar 19, 2018
1021
if(res.search('"') == -1 && res.search("'") == -1){
1022
return "'" + res + "'"
1023
}else if(self.search('"') == -1){
1024
return '"' + res + '"'
1025
}
1026
var qesc = new RegExp("'", "g") // to escape single quote
1027
res = "'" + res.replace(qesc, "\\'") + "'"
@PierreQuentel
First import
Sep 5, 2014
1028
return res
1029
}
1030
@PierreQuentel
Rewrite implementation of special methods for operations (__add__, __…
Jun 6, 2021
1031
str.__rmul__ = function(self, other){
1032
if(_b_.isinstance(other, _b_.int)){
1033
other = _b_.int.numerator(other)
1034
var res = ''
1035
while(other > 0){
1036
res += self
1037
other--
1038
}
1039
return res
1040
}
1041
return _b_.NotImplemented
1042
}
1043
Fixes #1637 : setattr on strings does not throw AttributeError, getat…
Mar 16, 2021
1044
str.__setattr__ = function(self, attr, value){
1045
if(typeof self === "string"){
1046
if(str.hasOwnProperty(attr)){
In py_string.js : simplify str.__len__ and str.__mul__
Mar 30, 2021
1047
throw _b_.AttributeError.$factory("'str' object attribute '" +
Fixes #1637 : setattr on strings does not throw AttributeError, getat…
Mar 16, 2021
1048
attr + "' is read-only")
1049
}else{
1050
throw _b_.AttributeError.$factory(
1051
"'str' object has no attribute '" + attr + "'")
1052
}
1053
}
1054
// str subclass : use __dict__
1055
_b_.dict.$setitem(self.__dict__, attr, value)
1056
return $N
1057
}
1058
Coding style
Mar 19, 2018
1059
str.__setitem__ = function(self, attr, value){
1060
throw _b_.TypeError.$factory(
1061
"'str' object does not support item assignment")
@PierreQuentel
First import
Sep 5, 2014
1062
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1063
Remove debug trace
Mar 27, 2019
1064
var combining = []
1065
for(var cp = 0x300; cp <= 0x36F; cp++){
1066
combining.push(String.fromCharCode(cp))
1067
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1068
var combining_re = new RegExp("(" + combining.join("|") + ")", "g")
@PierreQuentel
Fixes bugs with management of escaped characters (\a, \b, \n etc.) in…
Aug 17, 2018
1069
str
Feb 10, 2018
1070
str.__str__ = function(self){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1071
var repl = '',
1072
chars = to_chars(self)
1073
if(chars.length == self.length){
1074
return self.replace(combining_re, "\u200B$1")
1075
}
1076
for(var i = 0; i < chars.length; i++){
1077
var cp = _b_.ord(chars[i])
1078
if(cp >= 0x300 && cp <= 0x36F){
1079
repl += "\u200B" + chars[i]
1080
}else{
1081
repl += chars[i]
1082
}
1083
}
1084
return repl
@PierreQuentel
First import
Sep 5, 2014
1085
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1086
Coding style
Mar 19, 2018
1087
str.toString = function(){return "string!"}
@PierreQuentel
First import
Sep 5, 2014
1088
1089
// generate comparison methods
1090
var $comp_func = function(self,other){
Fixes #1038 : inconsistent errors when comparing incompatible types w…
Feb 13, 2019
1091
if(typeof other !== "string"){return _b_.NotImplemented}
@PierreQuentel
First import
Sep 5, 2014
1092
return self > other
1093
}
Coding style
Mar 19, 2018
1094
$comp_func += "" // source code
1095
var $comps = {">": "gt", ">=": "ge", "<": "lt", "<=": "le"}
@PierreQuentel
First import
Sep 5, 2014
1096
for(var $op in $comps){
Coding style
Mar 19, 2018
1097
eval("str.__" + $comps[$op] + '__ = ' + $comp_func.replace(/>/gm,$op))
@PierreQuentel
First import
Sep 5, 2014
1098
}
1099
1100
// unsupported operations
Coding style
Mar 19, 2018
1101
var $notimplemented = function(self, other){
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1102
throw _b_.NotImplementedError.$factory(
Coding style
Mar 19, 2018
1103
"OPERATOR not implemented for class str")
@PierreQuentel
First import
Sep 5, 2014
1104
}
1105
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1106
str.capitalize = function(self){
1107
var $ = $B.args("capitalize", 1, {self}, ["self"],
1108
arguments, {}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1109
if(self.length == 0){
1110
return ""
1111
}
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1112
return self.charAt(0).toUpperCase() + self.substr(1)
1113
}
1114
1115
str.casefold = function(self){
1116
var $ = $B.args("casefold", 1, {self}, ["self"],
1117
arguments, {}, null, null),
1118
res = "",
1119
char,
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1120
cf,
1121
chars = to_chars($.self)
1122
1123
for(var i = 0, len = chars.length; i < len; i++){
1124
char = chars[i]
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1125
cf = $B.unicode_casefold[char]
1126
if(cf){
1127
cf.forEach(function(cp){
1128
res += String.fromCharCode(cp)
1129
})
1130
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1131
res += char.toLowerCase()
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1132
}
1133
}
1134
return res
1135
}
@PierreQuentel
First import
Sep 5, 2014
1136
Coding style
Mar 19, 2018
1137
str.center = function(){
1138
var $ = $B.args("center", 3, {self: null, width: null, fillchar: null},
1139
["self", "width", "fillchar"],
1140
arguments, {fillchar:" "}, null, null),
1141
self = $.self
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1142
Coding style
Mar 19, 2018
1143
if($.width <= self.length) {return self}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1144
Coding style
Mar 19, 2018
1145
var pad = parseInt(($.width - self.length) / 2),
1146
res = $.fillchar.repeat(pad)
@PierreQuentel
First import
Sep 5, 2014
1147
res += self + res
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1148
if(res.length < $.width){
1149
res += $.fillchar
1150
}
@PierreQuentel
First import
Sep 5, 2014
1151
return res
1152
}
1153
str
Feb 10, 2018
1154
str.count = function(){
Coding style
Mar 19, 2018
1155
var $ = $B.args("count", 4, {self:null, sub:null, start:null, stop:null},
1156
["self", "sub", "start", "stop"], arguments, {start:null, stop:null},
@PierreQuentel
Fixes #287 : s.count with an optional start parameter
Sep 14, 2015
1157
null, null)
Change in string management. Related to issue #1736.
Aug 7, 2021
1158
if(!(typeof $.sub.valueOf() == "string")){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1159
throw _b_.TypeError.$factory("Can't convert '" + $B.class_name($.sub) +
1160
"' object to str implicitly")
1161
}
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1162
var substr = $.self
Coding style
Mar 19, 2018
1163
if($.start !== null){
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1164
var _slice
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1165
if($.stop !== null){
1166
_slice = _b_.slice.$factory($.start, $.stop)
1167
}else{
1168
_slice = _b_.slice.$factory($.start, $.self.length)
1169
}
str
Feb 10, 2018
1170
substr = str.__getitem__.apply(null, [$.self].concat(_slice))
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1171
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1172
if($.self.length + $.sub.length == 0){
1173
return 1
1174
}
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1175
}
Coding style
Mar 19, 2018
1176
if($.sub.length == 0){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1177
if($.start == $.self.length){
1178
return 1
1179
}else if(substr.length == 0){
1180
return 0
1181
}
Coding style
Mar 19, 2018
1182
return substr.length + 1
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
1183
}
Coding style
Mar 19, 2018
1184
var n = 0,
1185
pos = 0
1186
while(pos < substr.length){
1187
pos = substr.indexOf($.sub, pos)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1188
if(pos >= 0){
1189
n++
1190
pos += $.sub.length
1191
}else{
1192
break
1193
}
@PierreQuentel
First import
Sep 5, 2014
1194
}
1195
return n
1196
}
1197
Fix bugs introduced by previous merged PR
Apr 2, 2019
1198
str.encode = function(){
1199
var $ = $B.args("encode", 3, {self: null, encoding: null, errors: null},
1200
["self", "encoding", "errors"], arguments,
1201
{encoding: "utf-8", errors: "strict"}, null, null)
1202
if($.encoding == "rot13" || $.encoding == "rot_13"){
@PierreQuentel
Fixes #159 : [codecs] ROT13 cant encode
Apr 22, 2015
1203
// Special case : returns a string
Coding style
Mar 19, 2018
1204
var res = ""
Fix bugs introduced by previous merged PR
Apr 2, 2019
1205
for(var i = 0, len = $.self.length; i < len ; i++){
1206
var char = $.self.charAt(i)
Coding style
Mar 19, 2018
1207
if(("a" <= char && char <= "m") || ("A" <= char && char <= "M")){
1208
res += String.fromCharCode(String.charCodeAt(char) + 13)
1209
}else if(("m" < char && char <= "z") ||
1210
("M" < char && char <= "Z")){
1211
res += String.fromCharCode(String.charCodeAt(char) - 13)
@PierreQuentel
Fixes #159 : [codecs] ROT13 cant encode
Apr 22, 2015
1212
}else{res += char}
1213
}
1214
return res
1215
}
Fix bugs introduced by previous merged PR
Apr 2, 2019
1216
return _b_.bytes.__new__(_b_.bytes, $.self, $.encoding, $.errors)
@PierreQuentel
First import
Sep 5, 2014
1217
}
1218
str
Feb 10, 2018
1219
str.endswith = function(){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1220
// Return True if the string ends with the specified suffix, otherwise
1221
// return False. suffix can also be a tuple of suffixes to look for.
1222
// With optional start, test beginning at that position. With optional
@PierreQuentel
First import
Sep 5, 2014
1223
// end, stop comparing at that position.
Coding style
Mar 19, 2018
1224
var $ = $B.args("endswith", 4,
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1225
{self:null, suffix:null, start:null, end:null},
Coding style
Mar 19, 2018
1226
["self", "suffix", "start", "end"],
1227
arguments, {start: 0, end: null}, null, null)
@PierreQuentel
Cleaning in py2js.js
Sep 20, 2015
1228
1229
normalize_start_end($)
1230
1231
var suffixes = $.suffix
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1232
if(! _b_.isinstance(suffixes,_b_.tuple)){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1233
suffixes = [suffixes]
1234
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1235
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1236
var chars = to_chars($.self),
1237
s = chars.slice($.start, $.end)
Coding style
Mar 19, 2018
1238
for(var i = 0, len = suffixes.length; i < len; i++){
Add many "var" to avoid global JS namespace pollution
Sep 30, 2016
1239
var suffix = suffixes[i]
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1240
if(! _b_.isinstance(suffix, str)){
1241
throw _b_.TypeError.$factory(
1242
"endswith first arg must be str or a tuple of str, not int")
1243
}
Coding style
Mar 19, 2018
1244
if(suffix.length <= s.length &&
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1245
s.slice(s.length - suffix.length).join('') == suffix){
1246
return true
1247
}
@PierreQuentel
First import
Sep 5, 2014
1248
}
1249
return false
1250
}
1251
str
Feb 10, 2018
1252
str.expandtabs = function(self, tabsize) {
Coding style
Mar 19, 2018
1253
var $ = $B.args("expandtabs", 2, {self: null, tabsize: null},
1254
["self", "tabsize"], arguments, {tabsize: 8}, null, null)
1255
var s = $B.$GetInt($.tabsize),
1256
col = 0,
1257
pos = 0,
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1258
res = "",
1259
chars = to_chars(self)
1260
if(s == 1){
1261
return self.replace(/\t/g," ")
1262
}
1263
while(pos < chars.length){
1264
var car = chars[pos]
@PierreQuentel
Rewrite str.expandtabs() - passes tests in Lib/test/string_tests.py
Sep 15, 2015
1265
switch(car){
Coding style
Mar 19, 2018
1266
case "\t":
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1267
while(col % s > 0){
1268
res += " ";
1269
col++
1270
}
@PierreQuentel
Rewrite str.expandtabs() - passes tests in Lib/test/string_tests.py
Sep 15, 2015
1271
break
Coding style
Mar 19, 2018
1272
case "\r":
1273
case "\n":
@PierreQuentel
Rewrite str.expandtabs() - passes tests in Lib/test/string_tests.py
Sep 15, 2015
1274
res += car
1275
col = 0
1276
break
1277
default:
1278
res += car
1279
col++
1280
break
1281
}
1282
pos++
1283
}
1284
return res
@PierreQuentel
First import
Sep 5, 2014
1285
}
1286
str
Feb 10, 2018
1287
str.find = function(){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1288
// Return the lowest index in the string where substring sub is found,
1289
// such that sub is contained in the slice s[start:end]. Optional
1290
// arguments start and end are interpreted as in slice notation.
@PierreQuentel
First import
Sep 5, 2014
1291
// Return -1 if sub is not found.
Coding style
Mar 19, 2018
1292
var $ = $B.args("str.find", 4,
Fixes issue in str.find()
Apr 16, 2019
1293
{self: null, sub: null, start: null, end: null},
1294
["self", "sub", "start", "end"],
1295
arguments, {start: 0, end: null}, null, null)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1296
check_str($.sub)
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1297
normalize_start_end($)
@PierreQuentel
Split strings into 2 classes in py2js: one for f-strings (JoinedStrCt…
Sep 2, 2021
1298
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
1299
var len = str.__len__($.self),
1300
sub_len = str.__len__($.sub)
@PierreQuentel
Rewrite str.find. Fixes #290 : "a".find("\\") crashes. Passes tests i…
Sep 18, 2015
1301
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
1302
if(sub_len == 0 && $.start == len){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1303
return len
1304
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
1305
if(len + sub_len == 0){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1306
return -1
1307
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
1308
// Use .indexOf(), not .search(), to avoid conversion to reg exp
1309
var js_start = pypos2jspos($.self, $.start),
1310
js_end = pypos2jspos($.self, $.end),
1311
ix = $.self.substring(js_start, js_end).indexOf($.sub)
1312
if(ix == -1){
1313
return -1
@PierreQuentel
First import
Sep 5, 2014
1314
}
Fixes #1754 : highlight() in master branch hangs
Aug 24, 2021
1315
return jspos2pypos($.self, js_start + ix)
@PierreQuentel
First import
Sep 5, 2014
1316
}
1317
@PierreQuentel
Fixes #260 : string.format() issues
Aug 28, 2015
1318
// Next function used by method .format()
1319
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1320
$B.parse_format = function(fmt_string){
@PierreQuentel
First import
Sep 5, 2014
1321
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1322
// Parse a "format string", as described in the Python documentation
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1323
// Return a format object. For the format string
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1324
// a.x[z]!r:...
1325
// the object has attributes :
1326
// - name : "a"
1327
// - name_ext : [".x", "[z]"]
1328
// - conv : r
1329
// - spec : rest of string after :
@PierreQuentel
First import
Sep 5, 2014
1330
Coding style
Mar 19, 2018
1331
var elts = fmt_string.split(":"),
1332
name,
1333
conv,
1334
spec,
Coding style
Mar 19, 2018
1335
name_ext = []
Coding style
Mar 19, 2018
1336
if(elts.length == 1){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1337
// No : in the string : it only contains a name
1338
name = fmt_string
1339
}else{
1340
// name is before the first ":"
1341
// spec (the format specification) is after
1342
name = elts[0]
Coding style
Mar 19, 2018
1343
spec = elts.splice(1).join(":")
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1344
}
1345
Coding style
Mar 19, 2018
1346
var elts = name.split("!")
1347
if(elts.length > 1){
1348
name = elts[0]
1349
conv = elts[1] // conversion flag
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1350
}
@PierreQuentel
First import
Sep 5, 2014
1351
Coding style
Mar 19, 2018
1352
if(name !== undefined){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1353
// "name' may be a subscription or attribute
1354
// Put these "extensions" in the list "name_ext"
1355
function name_repl(match){
1356
name_ext.push(match)
Coding style
Mar 19, 2018
1357
return ""
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1358
}
1359
var name_ext_re = /\.[_a-zA-Z][_a-zA-Z0-9]*|\[[_a-zA-Z][_a-zA-Z0-9]*\]|\[[0-9]+\]/g
1360
name = name.replace(name_ext_re, name_repl)
1361
}
@PierreQuentel
First import
Sep 5, 2014
1362
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1363
return {name: name, name_ext: name_ext,
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1364
conv: conv, spec: spec || "", string: fmt_string}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1365
}
@PierreQuentel
First import
Sep 5, 2014
1366
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1367
$B.split_format = function(self){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1368
// Parse self to detect formatting instructions
1369
// Create a list "parts" made of sections of the string :
1370
// - elements of even rank are literal text
1371
// - elements of odd rank are "format objects", built from the
1372
// format strings in self (of the form {...})
Coding style
Mar 19, 2018
1373
var pos = 0,
1374
_len = self.length,
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1375
car,
Coding style
Mar 19, 2018
1376
text = "",
1377
parts = [],
1378
rank = 0
1379
while(pos < _len){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1380
car = self.charAt(pos)
Coding style
Mar 21, 2018
1381
if(car == "{" && self.charAt(pos + 1) == "{"){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1382
// replace {{ by literal {
Coding style
Mar 19, 2018
1383
text += "{"
1384
pos += 2
1385
}else if(car == "}" && self.charAt(pos + 1) == "}"){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1386
// replace }} by literal }
Coding style
Mar 19, 2018
1387
text += "}"
1388
pos += 2
1389
}else if(car == "{"){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1390
// Start of a format string
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1391
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1392
// Store current literal text
1393
parts.push(text)
1394
1395
// Search the end of the format string, ie the } closing the
1396
// opening {. Since the string can contain other pairs {} for
1397
// nested formatting, an integer nb is incremented for each { and
1398
// decremented for each } ; the end of the format string is
Coding style
Mar 19, 2018
1399
// reached when nb == 0
1400
var end = pos + 1,
1401
nb = 1
1402
while(end < _len){
1403
if(self.charAt(end) == "{"){nb++; end++}
1404
else if(self.charAt(end) == "}"){
1405
nb--; end++
1406
if(nb == 0){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1407
// End of format string
Coding style
Mar 19, 2018
1408
var fmt_string = self.substring(pos + 1, end - 1)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1409
1410
// 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
1411
var fmt_obj = $B.parse_format(fmt_string)
1412
fmt_obj.raw_name = fmt_obj.name
1413
fmt_obj.raw_spec = fmt_obj.spec
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1414
1415
// If no name is explicitely provided, use the rank
1416
if(!fmt_obj.name){
Coding style
Mar 19, 2018
1417
fmt_obj.name = rank + ""
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1418
rank++
1419
}
@PierreQuentel
First import
Sep 5, 2014
1420
Coding style
Mar 19, 2018
1421
if(fmt_obj.spec !== undefined){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1422
// "spec" may contain "nested replacement fields"
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1423
// Replace empty fields by the rank in positional
1424
// arguments
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1425
function replace_nested(name, key){
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1426
if(key == ""){
1427
// Use implicit rank
1428
return "{" + rank++ + "}"
Fixes #303 : string formatting with floating point, variable number o…
Dec 3, 2015
1429
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1430
return "{" + key + "}"
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1431
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1432
fmt_obj.spec = fmt_obj.spec.replace(/\{(.*?)\}/g,
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1433
replace_nested)
1434
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1435
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1436
// Store format object in list "parts"
1437
parts.push(fmt_obj)
Coding style
Mar 19, 2018
1438
text = ""
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1439
break
1440
}
1441
}else{end++}
@PierreQuentel
First import
Sep 5, 2014
1442
}
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1443
if(nb > 0){
1444
throw _b_.ValueError.$factory("wrong format " + self)
1445
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1446
pos = end
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1447
}else{
1448
text += car
1449
pos++
1450
}
1451
}
1452
if(text){
1453
parts.push(text)
@PierreQuentel
First import
Sep 5, 2014
1454
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1455
return parts
1456
}
1457
1458
str.format = function(self) {
Implement str.format_map()
Nov 22, 2020
1459
// Special management of keyword arguments if str.format is called by
1460
// str.format_map(mapping) : the argument "mapping" might not be a
1461
// dictionary
1462
var last_arg = $B.last(arguments)
1463
if(last_arg.$nat == "mapping"){
1464
var mapping = last_arg.mapping,
1465
getitem = $B.$getattr(mapping, "__getitem__")
1466
// Get the rest of the arguments
1467
var args = []
1468
for(var i = 0, len = arguments.length - 1; i < len; i++){
1469
args.push(arguments[i])
1470
}
1471
var $ = $B.args("format", 1, {self: null}, ["self"],
1472
args, {}, "$args", null)
1473
}else{
1474
var $ = $B.args("format", 1, {self: null}, ["self"],
1475
arguments, {}, "$args", "$kw"),
1476
mapping = $.$kw, // dictionary
1477
getitem = function(key){
1478
return _b_.dict.$getitem(mapping, key)
1479
}
1480
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1481
var parts = $B.split_format($.self)
1482
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1483
// Apply formatting to the values passed to format()
Coding style
Mar 19, 2018
1484
var res = "",
1485
fmt
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1486
Coding style
Mar 19, 2018
1487
for(var i = 0; i < parts.length; i++){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1488
// Literal text is added unchanged
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
1489
if(typeof parts[i] == "string"){
1490
res += parts[i];
1491
continue
1492
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1493
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1494
// Format objects
1495
fmt = parts[i]
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
1496
1497
if(fmt.spec !== undefined){
1498
// "spec" may contain "nested replacement fields"
1499
// In this case, evaluate them using the positional
1500
// or keyword arguments passed to format()
1501
function replace_nested(name, key){
1502
if(/\d+/.exec(key)){
1503
// If key is numeric, search in positional
1504
// arguments
1505
return _b_.tuple.__getitem__($.$args,
1506
parseInt(key))
1507
}else{
1508
// Else try in keyword arguments
1509
return _b_.dict.__getitem__($.$kw, key)
1510
}
1511
}
1512
fmt.spec = fmt.spec.replace(/\{(.*?)\}/g,
1513
replace_nested)
1514
}
Coding style
Mar 21, 2018
1515
if(fmt.name.charAt(0).search(/\d/) > -1){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1516
// Numerical reference : use positional arguments
1517
var pos = parseInt(fmt.name),
list and tuple
Feb 11, 2018
1518
value = _b_.tuple.__getitem__($.$args, pos)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1519
}else{
1520
// Use keyword arguments
Implement str.format_map()
Nov 22, 2020
1521
var value = getitem(fmt.name)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1522
}
1523
// If name has extensions (attributes or subscriptions)
Coding style
Mar 19, 2018
1524
for(var j = 0; j < fmt.name_ext.length; j++){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1525
var ext = fmt.name_ext[j]
Coding style
Mar 19, 2018
1526
if(ext.charAt(0) == "."){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1527
// Attribute
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1528
value = $B.$getattr(value, ext.substr(1))
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1529
}else{
1530
// Subscription
Coding style
Mar 19, 2018
1531
var key = ext.substr(1, ext.length - 2)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1532
// An index made of digits is transformed into an integer
Coding style
Mar 19, 2018
1533
if(key.charAt(0).search(/\d/) > -1){key = parseInt(key)}
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1534
value = $B.$getattr(value, "__getitem__")(key)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1535
}
1536
}
Fix minor bugs
Feb 12, 2018
1537
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1538
// If the conversion flag is set, first call a function to convert
1539
// the value
Coding style
Mar 19, 2018
1540
if(fmt.conv == "a"){value = _b_.ascii(value)}
1541
else if(fmt.conv == "r"){value = _b_.repr(value)}
1542
else if(fmt.conv == "s"){value = _b_.str.$factory(value)}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1543
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1544
// Call attribute __format__ to perform the actual formatting
Support old-style and new-style classes.
Feb 9, 2018
1545
if(value.$is_class || value.$factory){
Fixes #755 : string format problem with classes
Jan 8, 2018
1546
// For classes, don't use the class __format__ method
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1547
res += value.__class__.__format__(value, fmt.spec)
Fixes #755 : string format problem with classes
Jan 8, 2018
1548
}else{
Fixes #1396 : string formatting - precision truncation not up to spec
May 21, 2020
1549
res += $B.$getattr(value, "__format__")(fmt.spec)
Fixes #755 : string format problem with classes
Jan 8, 2018
1550
}
@PierreQuentel
First import
Sep 5, 2014
1551
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1552
return res
@PierreQuentel
First import
Sep 5, 2014
1553
}
1554
Implement str.format_map()
Nov 22, 2020
1555
str.format_map = function(self, mapping){
1556
var $ = $B.args("format_map", 2, {self: null, mapping: null},
1557
['self', 'mapping'], arguments, {}, null, null)
1558
return str.format(self, {$nat: 'mapping', mapping})
@PierreQuentel
First import
Sep 5, 2014
1559
}
1560
str
Feb 10, 2018
1561
str.index = function(self){
@PierreQuentel
First import
Sep 5, 2014
1562
// Like find(), but raise ValueError when the substring is not found.
Fixes issue in str.find()
Apr 16, 2019
1563
var res = str.find.apply(null, arguments)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1564
if(res === -1){
1565
throw _b_.ValueError.$factory("substring not found")
1566
}
@PierreQuentel
First import
Sep 5, 2014
1567
return res
1568
}
1569
Fixes #1076 : 'str' object has no attribute 'isascii'
Apr 2, 2019
1570
str.isascii = function(self){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1571
/* Return true if the string is empty or all characters in the string are
1572
ASCII, false otherwise. ASCII characters have code points in the range
1573
U+0000-U+007F. */
Fixes #1076 : 'str' object has no attribute 'isascii'
Apr 2, 2019
1574
for(var i = 0, len = self.length; i < len; i++){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1575
if(self.charCodeAt(i) > 127){
1576
return false
1577
}
Fixes #1076 : 'str' object has no attribute 'isascii'
Apr 2, 2019
1578
}
1579
return true
1580
}
1581
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1582
str.isalnum = function(self){
1583
/* Return true if all characters in the string are alphanumeric and there
1584
is at least one character, false otherwise. A character c is alphanumeric
1585
if one of the following returns True: c.isalpha(), c.isdecimal(),
1586
c.isdigit(), or c.isnumeric(). */
1587
var $ = $B.args("isalnum", 1, {self: null}, ["self"],
1588
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1589
cp
1590
for(var char of to_chars(self)){
1591
cp = _b_.ord(char)
1592
if(unicode_tables.Ll[cp] ||
1593
unicode_tables.Lu[cp] ||
1594
unicode_tables.Lm[cp] ||
1595
unicode_tables.Lt[cp] ||
1596
unicode_tables.Lo[cp] ||
1597
unicode_tables.Nd[cp] ||
1598
unicode_tables.digits[cp] ||
1599
unicode_tables.numeric[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1600
continue
1601
}
1602
return false
1603
}
1604
return true
1605
}
1606
1607
str.isalpha = function(self){
1608
/* Return true if all characters in the string are alphabetic and there is
1609
at least one character, false otherwise. Alphabetic characters are those
1610
characters defined in the Unicode character database as "Letter", i.e.,
1611
those with general category property being one of "Lm", "Lt", "Lu", "Ll",
1612
or "Lo". */
1613
var $ = $B.args("isalpha", 1, {self: null}, ["self"],
1614
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1615
cp
1616
for(var char of to_chars(self)){
1617
cp = _b_.ord(char)
1618
if(unicode_tables.Ll[cp] ||
1619
unicode_tables.Lu[cp] ||
1620
unicode_tables.Lm[cp] ||
1621
unicode_tables.Lt[cp] ||
1622
unicode_tables.Lo[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1623
continue
1624
}
1625
return false
1626
}
1627
return true
1628
}
1629
1630
str.isdecimal = function(self){
1631
/* Return true if all characters in the string are decimal characters and
1632
there is at least one character, false otherwise. Decimal characters are
1633
those that can be used to form numbers in base 10, e.g. U+0660,
1634
ARABIC-INDIC DIGIT ZERO. Formally a decimal character is a character in
1635
the Unicode General Category "Nd". */
1636
var $ = $B.args("isdecimal", 1, {self: null}, ["self"],
1637
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1638
cp
1639
for(var char of to_chars(self)){
1640
cp = _b_.ord(char)
1641
if(! unicode_tables.Nd[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1642
return false
1643
}
1644
}
1645
return self.length > 0
1646
}
1647
1648
str.isdigit = function(self){
1649
/* Return true if all characters in the string are digits and there is at
1650
least one character, false otherwise. */
1651
var $ = $B.args("isdigit", 1, {self: null}, ["self"],
1652
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1653
cp
1654
for(var char of to_chars(self)){
1655
cp = _b_.ord(char)
1656
if(! unicode_tables.digits[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1657
return false
1658
}
1659
}
1660
return self.length > 0
1661
}
1662
1663
str.isidentifier = function(self){
1664
/* Return true if the string is a valid identifier according to the
1665
language definition. */
1666
var $ = $B.args("isidentifier", 1, {self: null}, ["self"],
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1667
arguments, {}, null, null)
Support identifiers with surrogate pairs
Dec 26, 2020
1668
if(self.length == 0){
1669
return false
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1670
}
1671
var chars = to_chars(self)
1672
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
1673
return false
1674
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1675
for(var char of chars){
1676
var cp = _b_.ord(char)
1677
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
1678
return false
1679
}
1680
}
1681
}
1682
return true
1683
}
1684
1685
str.islower = function(self){
1686
/* Return true if all cased characters 4 in the string are lowercase and
1687
there is at least one cased character, false otherwise. */
1688
var $ = $B.args("islower", 1, {self: null}, ["self"],
1689
arguments, {}, null, null),
1690
has_cased = false,
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1691
cp
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1692
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1693
for(var char of to_chars(self)){
1694
cp = _b_.ord(char)
1695
if(unicode_tables.Ll[cp]){
1696
has_cased = true
1697
continue
1698
}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
1699
return false
1700
}
1701
}
1702
return has_cased
1703
}
1704
1705
str.isnumeric = function(self){
1706
/* Return true if all characters in the string are numeric characters, and
1707
there is at least one character, false otherwise. Numeric characters
1708
include digit characters, and all characters that have the Unicode numeric
1709
value property, e.g. U+2155, VULGAR FRACTION ONE FIFTH. Formally, numeric
1710
characters are those with the property value Numeric_Type=Digit,
1711
Numeric_Type=Decimal or Numeric_Type=Numeric.*/
1712
var $ = $B.args("isnumeric", 1, {self: null}, ["self"],
1713
arguments, {}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1714
for(var char of to_chars(self)){
1715
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
1716
return false
1717
}
1718
}
1719
return self.length > 0
1720
}
1721
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1722
var unprintable = {},
1723
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
1724
1725
str.isprintable = function(self){
1726
/* Return true if all characters in the string are printable or the string
1727
is empty, false otherwise. Nonprintable characters are those characters
1728
defined in the Unicode character database as "Other" or "Separator",
1729
excepting the ASCII space (0x20) which is considered printable. */
1730
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1731
// Set unprintable if not set yet
1732
if(Object.keys(unprintable).length == 0){
1733
for(var i = 0; i < unprintable_gc.length; i++){
1734
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
1735
for(var cp in table){
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1736
unprintable[cp] = true
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1737
}
1738
}
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1739
unprintable[32] = true
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1740
}
1741
var $ = $B.args("isprintable", 1, {self: null}, ["self"],
Fixes #1500 : str.isprintable () raises error
Sep 27, 2020
1742
arguments, {}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1743
for(var char of to_chars(self)){
1744
if(unprintable[_b_.ord(char)]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1745
return false
1746
}
1747
}
1748
return true
1749
}
1750
1751
str.isspace = function(self){
1752
/* Return true if there are only whitespace characters in the string and
1753
there is at least one character, false otherwise.
1754
1755
A character is whitespace if in the Unicode character database, either its
1756
general category is Zs ("Separator, space"), or its bidirectional class is
1757
one of WS, B, or S.*/
1758
var $ = $B.args("isspace", 1, {self: null}, ["self"],
1759
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1760
cp
1761
for(var char of to_chars(self)){
1762
cp = _b_.ord(char)
1763
if(! unicode_tables.Zs[cp] &&
1764
$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
1765
return false
1766
}
1767
}
1768
return self.length > 0
1769
}
1770
1771
str.istitle = function(self){
1772
/* Return true if the string is a titlecased string and there is at least
1773
one character, for example uppercase characters may only follow uncased
1774
characters and lowercase characters only cased ones. Return false
1775
otherwise. */
1776
var $ = $B.args("istitle", 1, {self: null}, ["self"],
1777
arguments, {}, null, null)
1778
return self.length > 0 && str.title(self) == self
1779
}
1780
1781
str.isupper = function(self){
1782
/* Return true if all cased characters 4 in the string are lowercase and
1783
there is at least one cased character, false otherwise. */
1784
var $ = $B.args("islower", 1, {self: null}, ["self"],
1785
arguments, {}, null, null),
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1786
is_upper = false,
1787
cp
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1788
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1789
for(var char of to_chars(self)){
1790
cp = _b_.ord(char)
1791
if(unicode_tables.Lu[cp]){
1792
is_upper = true
1793
continue
1794
}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
1795
return false
1796
}
1797
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1798
return is_upper
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1799
}
1800
1801
str
Feb 10, 2018
1802
str.join = function(){
Coding style
Mar 19, 2018
1803
var $ = $B.args("join", 2, {self: null, iterable: null},
Coding style
Mar 19, 2018
1804
["self", "iterable"], arguments, {}, null, null)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1805
Coding style
Mar 19, 2018
1806
var iterable = _b_.iter($.iterable),
Coding style
Mar 19, 2018
1807
res = [],
Change implementation of exception management : one active exception …
Jul 17, 2018
1808
count = 0
@PierreQuentel
First import
Sep 5, 2014
1809
while(1){
1810
try{
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1811
var obj2 = _b_.next(iterable)
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
1812
if(! _b_.isinstance(obj2, str)){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1813
throw _b_.TypeError.$factory("sequence item " + count +
1814
": expected str instance, " + $B.class_name(obj2) +
1815
" found")
1816
}
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1817
res.push(obj2)
@PierreQuentel
First import
Sep 5, 2014
1818
}catch(err){
Restore current exception when internal code expects to raise another…
Dec 28, 2017
1819
if(_b_.isinstance(err, _b_.StopIteration)){
1820
break
1821
}
@PierreQuentel
First import
Sep 5, 2014
1822
else{throw err}
1823
}
1824
}
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1825
return res.join($.self)
@PierreQuentel
First import
Sep 5, 2014
1826
}
1827
str
Feb 10, 2018
1828
str.ljust = function(self) {
Coding style
Mar 19, 2018
1829
var $ = $B.args("ljust", 3, {self: null, width: null, fillchar:null},
1830
["self", "width", "fillchar"],
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1831
arguments, {fillchar: " "}, null, null),
1832
len = str.__len__(self)
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1833
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1834
if($.width <= len){
1835
return self
1836
}
1837
return self + $.fillchar.repeat($.width - len)
@PierreQuentel
First import
Sep 5, 2014
1838
}
1839
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
1840
str.lower = function(self){
1841
var $ = $B.args("lower", 1, {self: null}, ["self"],
1842
arguments, {}, null, null)
1843
return self.toLowerCase()
1844
}
1845
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1846
str.lstrip = function(self, x){
Coding style
Mar 19, 2018
1847
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
1848
arguments, {chars:_b_.None}, null, null),
1849
self = $.self,
1850
chars = $.chars
1851
if(chars === _b_.None){
1852
return self.trimStart()
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1853
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
1854
while(self.length > 0){
1855
var flag = false
1856
for(var char of chars){
1857
if(self.startsWith(char)){
1858
self = self.substr(char.length)
1859
flag = true
1860
break
1861
}
1862
}
1863
if(! flag){
1864
return $.self.surrogates ? $B.String(self) : self
@jonathanverner
Fix strip handling of bracket character (GH Issue #521).
Nov 2, 2016
1865
}
1866
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
1867
return ''
@PierreQuentel
First import
Sep 5, 2014
1868
}
1869
1870
// note, maketrans should be a static function.
str
Feb 10, 2018
1871
str.maketrans = function() {
Coding style
Mar 19, 2018
1872
var $ = $B.args("maketrans", 3, {x: null, y: null, z: null},
1873
["x", "y", "z"], arguments, {y: null, z: null}, null, null)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1874
For performance, replace "_b_.dict.$factory()" by "$B.empty_dict()" (…
Jun 29, 2020
1875
var _t = $B.empty_dict()
Fixes bug with NotImplemented (it is not an exception class)
Nov 18, 2018
1876
Coding style
Mar 19, 2018
1877
if($.y === null && $.z === null){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1878
// If there is only one argument, it must be a dictionary mapping
1879
// Unicode ordinals (integers) or characters (strings of length 1) to
1880
// Unicode ordinals, strings (of arbitrary lengths) or None. Character
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1881
// keys will then be converted to ordinals.
Coding style
Mar 19, 2018
1882
if(! _b_.isinstance($.x, _b_.dict)){
1883
throw _b_.TypeError.$factory(
1884
"maketrans only argument must be a dict")
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1885
}
dict
Feb 11, 2018
1886
var items = _b_.list.$factory(_b_.dict.items($.x))
Coding style
Mar 19, 2018
1887
for(var i = 0, len = items.length; i < len; i++){
1888
var k = items[i][0],
1889
v = items[i][1]
1890
if(! _b_.isinstance(k, _b_.int)){
1891
if(_b_.isinstance(k, _b_.str) && k.length == 1){
1892
k = _b_.ord(k)
1893
}else{throw _b_.TypeError.$factory("dictionary key " + k +
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1894
" is not int or 1-char string")}
1895
}
Coding style
Mar 19, 2018
1896
if(v !== _b_.None && ! _b_.isinstance(v, [_b_.int, _b_.str])){
1897
throw _b_.TypeError.$factory("dictionary value " + v +
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1898
" is not None, integer or string")
1899
}
Impacts of dict implementation change in other scripts
Dec 10, 2018
1900
_b_.dict.$setitem(_t, k, v)
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1901
}
1902
return _t
1903
}else{
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1904
// If there are two arguments, they must be strings of equal length,
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1905
// and in the resulting dictionary, each character in x will be mapped
1906
// to the character at the same position in y
Coding style
Mar 19, 2018
1907
if(! (_b_.isinstance($.x, _b_.str) && _b_.isinstance($.y, _b_.str))){
Implement exceptions as new-style classes
Feb 10, 2018
1908
throw _b_.TypeError.$factory("maketrans arguments must be strings")
Coding style
Mar 19, 2018
1909
}else if($.x.length !== $.y.length){
1910
throw _b_.TypeError.$factory(
1911
"maketrans arguments must be strings or same length")
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1912
}else{
1913
var toNone = {}
Coding style
Mar 19, 2018
1914
if($.z !== null){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1915
// If there is a third argument, it must be a string, whose
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1916
// characters will be mapped to None in the result
Coding style
Mar 19, 2018
1917
if(! _b_.isinstance($.z, _b_.str)){
1918
throw _b_.TypeError.$factory(
1919
"maketrans third argument must be a string")
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1920
}
Coding style
Mar 19, 2018
1921
for(var i = 0, len = $.z.length; i < len; i++){
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1922
toNone[_b_.ord($.z.charAt(i))] = true
1923
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1924
}
Coding style
Mar 19, 2018
1925
for(var i = 0, len = $.x.length; i < len; i++){
Impacts of dict implementation change in other scripts
Dec 10, 2018
1926
var key = _b_.ord($.x.charAt(i)),
Fixes #1078 : 'xyz'.maketrans('abc', 'def', 'abd') not happy with 3 args
Apr 2, 2019
1927
value = $.y.charCodeAt(i)
Impacts of dict implementation change in other scripts
Dec 10, 2018
1928
_b_.dict.$setitem(_t, key, value)
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1929
}
1930
for(var k in toNone){
Impacts of dict implementation change in other scripts
Dec 10, 2018
1931
_b_.dict.$setitem(_t, parseInt(k), _b_.None)
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1932
}
1933
return _t
1934
}
1935
}
@PierreQuentel
First import
Sep 5, 2014
1936
}
1937
Fixes #1077 : 'xyz'.maketrans({'a': 'A'}) not happy with strings
Apr 2, 2019
1938
str.maketrans.$type = "staticmethod"
1939
str
Feb 10, 2018
1940
str.partition = function() {
Coding style
Mar 19, 2018
1941
var $ = $B.args("partition", 2, {self: null, sep: null}, ["self", "sep"],
1942
arguments, {}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1943
if($.sep == ""){
1944
throw _b_.ValueError.$factory("empty separator")
1945
}
Coding style
Mar 19, 2018
1946
check_str($.sep)
@austin-schick
Fix bugs in string.partition
Apr 4, 2021
1947
var chars = to_chars($.self),
1948
i = $.self.indexOf($.sep)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
1949
if(i == -1){
1950
return _b_.tuple.$factory([$.self, "", ""])
1951
}
1952
return _b_.tuple.$factory([chars.slice(0, i).join(''), $.sep,
1953
chars.slice(i + $.sep.length).join('')])
Coding style
Mar 19, 2018
1954
}
1955
Implement PEP 616 -- String methods to remove prefixes and suffixes (…
Jun 11, 2020
1956
str.removeprefix = function(){
1957
var $ = $B.args("removeprefix", 2, {self: null, prefix: null},
1958
["self", "prefix"], arguments, {}, null, null)
1959
if(!_b_.isinstance($.prefix, str)){
1960
throw _b_.ValueError.$factory("prefix should be str, not " +
1961
`'${$B.class_name($.prefix)}'`)
1962
}
1963
if(str.startswith($.self, $.prefix)){
1964
return $.self.substr($.prefix.length)
1965
}
1966
return $.self.substr(0)
1967
}
1968
1969
str.removesuffix = function(){
1970
var $ = $B.args("removesuffix", 2, {self: null, prefix: null},
1971
["self", "suffix"], arguments, {}, null, null)
1972
if(!_b_.isinstance($.suffix, str)){
1973
throw _b_.ValueError.$factory("suffix should be str, not " +
1974
`'${$B.class_name($.prefix)}'`)
1975
}
1976
if($.suffix.length > 0 && str.endswith($.self, $.suffix)){
1977
return $.self.substr(0, $.self.length - $.suffix.length)
1978
}
1979
return $.self.substr(0)
1980
}
1981
Coding style
Mar 19, 2018
1982
function $re_escape(str){
1983
var specials = "[.*+?|()$^"
1984
for(var i = 0, len = specials.length; i < len; i++){
1985
var re = new RegExp("\\"+specials.charAt(i), "g")
1986
str = str.replace(re, "\\"+specials.charAt(i))
1987
}
1988
return str
@PierreQuentel
First import
Sep 5, 2014
1989
}
1990
str
Feb 10, 2018
1991
str.replace = function(self, old, _new, count) {
Updated to latest copy of the repo
Jan 1, 2015
1992
// Replaces occurrences of 'old' by '_new'. Count references
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1993
// the number of times to replace. In CPython, negative or undefined
Updated to latest copy of the repo
Jan 1, 2015
1994
// values of count means replace all.
Coding style
Mar 19, 2018
1995
var $ = $B.args("replace", 4,
@PierreQuentel
Major internal changes:
Sep 23, 2021
1996
{self: null, old: null, new: null, count: null},
1997
["self", "old", "new", "count"],
Coding style
Mar 19, 2018
1998
arguments, {count: -1}, null, null),
1999
count = $.count,
2000
self = $.self,
2001
old = $.old,
@PierreQuentel
Major internal changes:
Sep 23, 2021
2002
_new = $.new
@PierreQuentel
Fixes bugs with str.replace()
Sep 18, 2015
2003
// Validate type of old
Fixes some error messages in string methods
Apr 5, 2021
2004
check_str(old, "replace() argument 1 ")
2005
check_str(_new, "replace() argument 2 ")
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2006
// Validate instance type of 'count'
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
2007
if(! _b_.isinstance(count,[_b_.int, _b_.float])){
Replace occurrences of $B.get_class(obj).__name__ by $B.class_name(ob…
Jan 3, 2019
2008
throw _b_.TypeError.$factory("'" + $B.class_name(count) +
Coding style
Mar 19, 2018
2009
"' object cannot be interpreted as an integer")
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
2010
}else if(_b_.isinstance(count, _b_.float)){
Coding style
Mar 19, 2018
2011
throw _b_.TypeError.$factory("integer argument expected, got float")
2012
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2013
if(count == 0){
2014
return self
2015
}
2016
if(count.__class__ == $B.long_int){
2017
count = parseInt(count.value)
2018
}
Coding style
Mar 19, 2018
2019
if(old == ""){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2020
if(_new == ""){
2021
return self
2022
}
2023
if(self == ""){
2024
return _new
2025
}
Coding style
Mar 19, 2018
2026
var elts = self.split("")
2027
if(count > -1 && elts.length >= count){
2028
var rest = elts.slice(count).join("")
2029
return _new + elts.slice(0, count).join(_new) + rest
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2030
}else{
2031
return _new + elts.join(_new) + _new
2032
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2033
}else{
Coding style
Mar 19, 2018
2034
var elts = str.split(self, old, count)
@PierreQuentel
First import
Sep 5, 2014
2035
}
Updated to latest copy of the repo
Jan 1, 2015
2036
Coding style
Mar 19, 2018
2037
var res = self,
2038
pos = -1
2039
if(old.length == 0){
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2040
var res = _new
Coding style
Mar 19, 2018
2041
for(var i = 0; i < elts.length; i++){
2042
res += elts[i] + _new
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2043
}
Coding style
Mar 19, 2018
2044
return res + rest
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2045
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2046
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2047
if(count < 0){
2048
count = res.length
2049
}
Coding style
Mar 19, 2018
2050
while(count > 0){
2051
pos = res.indexOf(old, pos)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2052
if(pos < 0){
2053
break
2054
}
Coding style
Mar 19, 2018
2055
res = res.substr(0, pos) + _new + res.substr(pos + old.length)
2056
pos = pos + _new.length
2057
count--
Updated to latest copy of the repo
Jan 1, 2015
2058
}
Coding style
Mar 19, 2018
2059
return res
@PierreQuentel
First import
Sep 5, 2014
2060
}
2061
Improve speed of some bytes and str methods
May 24, 2019
2062
str.rfind = function(self, substr){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2063
// Return the highest index in the string where substring sub is found,
2064
// such that sub is contained within s[start:end]. Optional arguments
@PierreQuentel
First import
Sep 5, 2014
2065
// start and end are interpreted as in slice notation. Return -1 on failure.
Coding style
Mar 19, 2018
2066
var $ = $B.args("rfind", 4,
Coding style
Mar 19, 2018
2067
{self: null, sub: null, start: null, end: null},
2068
["self", "sub", "start", "end"],
2069
arguments, {start: 0, end: null}, null, null)
@PierreQuentel
First import
Sep 5, 2014
2070
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2071
normalize_start_end($)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2072
check_str($.sub)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2073
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2074
var len = str.__len__($.self),
2075
sub_len = str.__len__($.sub)
2076
2077
if(sub_len == 0){
2078
if($.js_start > len){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2079
return -1
2080
}else{
2081
return str.__len__($.self)
2082
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2083
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2084
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2085
// Use .indexOf(), not .search(), to avoid conversion to reg exp
2086
var js_start = pypos2jspos($.self, $.start),
2087
js_end = pypos2jspos($.self, $.end),
2088
ix = $.self.substring(js_start, js_end).lastIndexOf($.sub)
2089
if(ix == -1){
2090
return -1
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2091
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2092
return jspos2pypos($.self, js_start + ix) - $.start
@PierreQuentel
First import
Sep 5, 2014
2093
}
2094
str
Feb 10, 2018
2095
str.rindex = function(){
@PierreQuentel
First import
Sep 5, 2014
2096
// Like rfind() but raises ValueError when the substring sub is not found
Coding style
Mar 19, 2018
2097
var res = str.rfind.apply(null, arguments)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2098
if(res == -1){
2099
throw _b_.ValueError.$factory("substring not found")
2100
}
@PierreQuentel
First import
Sep 5, 2014
2101
return res
2102
}
2103
str
Feb 10, 2018
2104
str.rjust = function(self) {
Coding style
Mar 19, 2018
2105
var $ = $B.args("rjust",3,
2106
{self: null, width: null, fillchar: null},
2107
["self", "width", "fillchar"],
2108
arguments, {fillchar: " "}, null, null)
@PierreQuentel
First import
Sep 5, 2014
2109
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2110
var len = str.__len__(self)
2111
if($.width <= len){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2112
return self
2113
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2114
return $B.String($.fillchar.repeat($.width - len) + self)
@PierreQuentel
First import
Sep 5, 2014
2115
}
2116
str
Feb 10, 2018
2117
str.rpartition = function(self,sep) {
Coding style
Mar 19, 2018
2118
var $ = $B.args("rpartition", 2, {self: null, sep: null}, ["self", "sep"],
2119
arguments, {}, null, null)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2120
check_str($.sep)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2121
var self = reverse($.self),
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2122
sep = reverse($.sep)
Coding style
Mar 19, 2018
2123
var items = str.partition(self, sep).reverse()
2124
for(var i = 0; i < items.length; i++){
2125
items[i] = items[i].split("").reverse().join("")
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2126
}
2127
return items
@PierreQuentel
First import
Sep 5, 2014
2128
}
2129
str
Feb 10, 2018
2130
str.rsplit = function(self) {
Coding style
Mar 19, 2018
2131
var $ = $B.args("rsplit", 3, {self: null, sep: null, maxsplit: null},
2132
["self", "sep", "maxsplit"], arguments,
2133
{sep: _b_.None, maxsplit: -1}, null, null),
2134
sep = $.sep
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2135
2136
// Use split on the reverse of the string and of separator
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2137
var rev_str = reverse($.self),
2138
rev_sep = sep === _b_.None ? sep : reverse($.sep),
str
Feb 10, 2018
2139
rev_res = str.split(rev_str, rev_sep, $.maxsplit)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2140
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2141
// Reverse the list, then each string inside the list
2142
rev_res.reverse()
Coding style
Mar 19, 2018
2143
for(var i = 0; i < rev_res.length; i++){
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2144
rev_res[i] = reverse(rev_res[i])
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2145
}
2146
return rev_res
@PierreQuentel
First import
Sep 5, 2014
2147
}
2148
Coding style
Mar 19, 2018
2149
str.rstrip = function(self, x){
2150
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
2151
arguments, {chars: _b_.None}, null, null),
2152
self = $.self,
2153
chars = $.chars
2154
if(chars === _b_.None){
2155
return self.trimEnd()
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2156
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2157
while(self.length > 0){
2158
var flag = false
2159
for(var char of chars){
2160
if(self.endsWith(char)){
2161
self = self.substr(0, self.length - char.length)
2162
flag = true
2163
break
2164
}
2165
}
2166
if(! flag){
2167
return $.self.surrogates ? $B.String(self) : self
@jonathanverner
Fix strip handling of bracket character (GH Issue #521).
Nov 2, 2016
2168
}
2169
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2170
return ''
@PierreQuentel
First import
Sep 5, 2014
2171
}
2172
str
Feb 10, 2018
2173
str.split = function(){
Coding style
Mar 19, 2018
2174
var $ = $B.args("split", 3, {self: null, sep: null, maxsplit: null},
2175
["self", "sep", "maxsplit"], arguments,
2176
{sep: _b_.None, maxsplit: -1}, null, null),
2177
sep = $.sep,
2178
maxsplit = $.maxsplit,
2179
self = $.self,
2180
pos = 0
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2181
if(maxsplit.__class__ === $B.long_int){
2182
maxsplit = parseInt(maxsplit.value)
2183
}
2184
if(sep == ""){
2185
throw _b_.ValueError.$factory("empty separator")
2186
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2187
Coding style
Mar 19, 2018
2188
if(sep === _b_.None){
@PierreQuentel
First import
Sep 5, 2014
2189
var res = []
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2190
while(pos < self.length && self.charAt(pos).search(/\s/) > -1){
2191
pos++
2192
}
2193
if(pos === self.length - 1){
2194
return [self]
2195
}
Coding style
Mar 19, 2018
2196
var name = ""
@PierreQuentel
First import
Sep 5, 2014
2197
while(1){
Coding style
Mar 19, 2018
2198
if(self.charAt(pos).search(/\s/) == -1){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2199
if(name == ""){
2200
name = self.charAt(pos)
2201
}else{
2202
name += self.charAt(pos)
2203
}
@PierreQuentel
First import
Sep 5, 2014
2204
}else{
Coding style
Mar 19, 2018
2205
if(name !== ""){
@PierreQuentel
First import
Sep 5, 2014
2206
res.push(name)
Coding style
Mar 19, 2018
2207
if(maxsplit !== -1 && res.length == maxsplit + 1){
@PierreQuentel
First import
Sep 5, 2014
2208
res.pop()
Coding style
Mar 19, 2018
2209
res.push(name + self.substr(pos))
@PierreQuentel
First import
Sep 5, 2014
2210
return res
2211
}
Coding style
Mar 19, 2018
2212
name = ""
@PierreQuentel
First import
Sep 5, 2014
2213
}
2214
}
2215
pos++
Coding style
Mar 19, 2018
2216
if(pos > self.length - 1){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2217
if(name){
2218
res.push(name)
2219
}
@PierreQuentel
First import
Sep 5, 2014
2220
break
2221
}
2222
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2223
return res.map($B.String)
@PierreQuentel
First import
Sep 5, 2014
2224
}else{
Coding style
Mar 19, 2018
2225
var res = [],
2226
s = "",
2227
seplen = sep.length
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2228
if(maxsplit == 0){
2229
return [self]
2230
}
Coding style
Mar 19, 2018
2231
while(pos < self.length){
2232
if(self.substr(pos, seplen) == sep){
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2233
res.push(s)
2234
pos += seplen
Coding style
Mar 19, 2018
2235
if(maxsplit > -1 && res.length >= maxsplit){
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2236
res.push(self.substr(pos))
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2237
return res.map($B.String)
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2238
}
Coding style
Mar 19, 2018
2239
s = ""
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2240
}else{
2241
s += self.charAt(pos)
2242
pos++
@PierreQuentel
First import
Sep 5, 2014
2243
}
2244
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
2245
res.push(s)
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2246
return res.map($B.String)
@PierreQuentel
First import
Sep 5, 2014
2247
}
2248
}
2249
Fixes #1306 : improved compliance for str and bytes splitlines()
Feb 27, 2020
2250
str.splitlines = function(self) {
2251
var $ = $B.args('splitlines', 2, {self: null, keepends: null},
2252
['self','keepends'], arguments, {keepends: false},
2253
null, null)
2254
if(!_b_.isinstance($.keepends,[_b_.bool, _b_.int])){
2255
throw _b_.TypeError('integer argument expected, got '+
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2256
$B.get_class($.keepends).__name)
2257
}
Fixes #1306 : improved compliance for str and bytes splitlines()
Feb 27, 2020
2258
var keepends = _b_.int.$factory($.keepends),
2259
res = [],
2260
self = $.self,
2261
start = 0,
2262
pos = 0
2263
if(!self.length){
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2264
return res
2265
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2266
while(pos < self.length){
Fixes #1306 : improved compliance for str and bytes splitlines()
Feb 27, 2020
2267
if(self.substr(pos, 2) == '\r\n'){
2268
res.push(self.slice(start, keepends ? pos + 2 : pos))
2269
start = pos = pos+2
2270
}else if(self[pos] == '\r' || self[pos] == '\n'){
2271
res.push(self.slice(start, keepends ? pos+1 : pos))
2272
start = pos = pos+1
2273
}else{
2274
pos++
2275
}
2276
}
2277
if(start < self.length){
2278
res.push(self.slice(start))
2279
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2280
return res.map($B.String)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2281
}
@PierreQuentel
First import
Sep 5, 2014
2282
str
Feb 10, 2018
2283
str.startswith = function(){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2284
// Return True if string starts with the prefix, otherwise return False.
2285
// prefix can also be a tuple of prefixes to look for. With optional
2286
// start, test string beginning at that position. With optional end,
@PierreQuentel
First import
Sep 5, 2014
2287
// stop comparing string at that position.
Coding style
Mar 19, 2018
2288
var $ = $B.args("startswith", 4,
2289
{self: null, prefix: null, start: null, end: null},
2290
["self", "prefix", "start", "end"],
2291
arguments, {start: 0, end: null}, null, null)
@PierreQuentel
First import
Sep 5, 2014
2292
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
2293
normalize_start_end($)
2294
2295
var prefixes = $.prefix
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
2296
if(! _b_.isinstance(prefixes, _b_.tuple)){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2297
prefixes = [prefixes]
2298
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2299
var s = $.self.substring($.js_start, $.js_end)
2300
for(var prefix of prefixes){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2301
if(! _b_.isinstance(prefix, str)){
2302
throw _b_.TypeError.$factory("endswith first arg must be str " +
2303
"or a tuple of str, not int")
2304
}
2305
if(s.substr(0, prefix.length) == prefix){
2306
return true
2307
}
@PierreQuentel
First import
Sep 5, 2014
2308
}
2309
return false
2310
}
2311
str
Feb 10, 2018
2312
str.strip = function(){
Coding style
Mar 19, 2018
2313
var $ = $B.args("strip", 2, {self: null, chars: null}, ["self", "chars"],
2314
arguments, {chars: _b_.None}, null, null)
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2315
if($.chars === _b_.None){
2316
return $.self.trim()
2317
}
@PierreQuentel
Fix bugs in / improve speed of a couple of str methods
Aug 13, 2021
2318
return str.rstrip(str.lstrip($.self, $.chars), $.chars)
@PierreQuentel
First import
Sep 5, 2014
2319
}
2320
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2321
str.swapcase = function(self){
2322
var $ = $B.args("swapcase", 1, {self}, ["self"],
2323
arguments, {}, null, null),
2324
res = "",
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2325
cp
2326
2327
for(var char of to_chars(self)){
2328
cp = _b_.ord(char)
2329
if(unicode_tables.Ll[cp]){
2330
res += char.toUpperCase()
2331
}else if(unicode_tables.Lu[cp]){
2332
res += char.toLowerCase()
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2333
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2334
res += char
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2335
}
2336
}
2337
return res
2338
}
2339
2340
str.title = function(self){
2341
var $ = $B.args("title", 1, {self}, ["self"],
2342
arguments, {}, null, null),
2343
state,
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2344
cp,
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2345
res = ""
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2346
for(var char of to_chars(self)){
2347
cp = _b_.ord(char)
2348
if(unicode_tables.Ll[cp]){
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2349
if(! state){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2350
res += char.toUpperCase()
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2351
state = "word"
2352
}else{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2353
res += char
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2354
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2355
}else if(unicode_tables.Lu[cp] || unicode_tables.Lt[cp]){
2356
res += state ? char.toLowerCase() : char
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2357
state = "word"
2358
}else{
2359
state = null
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2360
res += char
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2361
}
2362
}
2363
return res
2364
}
2365
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2366
str.translate = function(self, table){
Coding style
Mar 19, 2018
2367
var res = [],
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2368
getitem = $B.$getattr(table, "__getitem__"),
2369
cp
2370
for(var char of to_chars(self)){
2371
cp = _b_.ord(char)
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2372
try{
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2373
var repl = getitem(cp)
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2374
if(repl !== _b_.None){
Fixes #1278 : re.escape returning unprintable characters
Jan 26, 2020
2375
if(typeof repl == "string"){
2376
res.push(repl)
2377
}else if(typeof repl == "number"){
2378
res.push(String.fromCharCode(repl))
2379
}
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2380
}
2381
}catch(err){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2382
res.push(char)
Fixes bugs in str.maketrans() and str.translate()
Nov 14, 2018
2383
}
@PierreQuentel
First import
Sep 5, 2014
2384
}
Coding style
Mar 19, 2018
2385
return res.join("")
@PierreQuentel
First import
Sep 5, 2014
2386
}
2387
@PierreQuentel
Replace unicode.min.js by the smaller unicode_data.js in py_string.js…
Oct 22, 2019
2388
str.upper = function(self){
2389
var $ = $B.args("upper", 1, {self: null}, ["self"],
2390
arguments, {}, null, null)
2391
return self.toUpperCase()
2392
}
2393
Coding style
Mar 19, 2018
2394
str.zfill = function(self, width){
Coding style
Mar 19, 2018
2395
var $ = $B.args("zfill", 2, {self: null, width: null},
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2396
["self", "width"], arguments, {}, null, null),
2397
len = str.__len__(self)
2398
if($.width <= len){
2399
return self
2400
}
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
2401
switch(self.charAt(0)){
Coding style
Mar 19, 2018
2402
case "+":
2403
case "-":
2404
return self.charAt(0) +
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2405
"0".repeat($.width - len) + self.substr(1)
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
2406
default:
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2407
return "0".repeat($.width - len) + self
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
2408
}
@PierreQuentel
First import
Sep 5, 2014
2409
}
2410
Implement str(arg, encoding, errors)
Jul 28, 2018
2411
str.$factory = function(arg, encoding, errors){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2412
if(arguments.length == 0){
2413
return ""
2414
}
@PierreQuentel
If the argument of str() is undefined, raise an exception instead of …
Aug 2, 2019
2415
if(arg === undefined){
Fixes #1352 : functions without return value are not always returning…
Apr 19, 2020
2416
return $B.UndefinedClass.__str__()
Better support of Javascript null. Fix bug in documentation (it is no…
Dec 14, 2020
2417
}else if(arg === null){
2418
return '<Javascript null>'
@PierreQuentel
If the argument of str() is undefined, raise an exception instead of …
Aug 2, 2019
2419
}
Fixes bug when str() arguments are passed as keywords
Nov 15, 2019
2420
if(encoding !== undefined){
2421
// Arguments may be passed as keywords (cf. issue #1060)
2422
var $ = $B.args("str", 3, {arg: null, encoding: null, errors: null},
2423
["arg", "encoding", "errors"], arguments,
2424
{encoding: "utf-8", errors: "strict"}, null, null),
2425
encoding = $.encoding,
2426
errors = $.errors
2427
}
@PierreQuentel
Rewrite implementation of strings :
Aug 10, 2021
2428
if(typeof arg == "string" || arg instanceof String ||
2429
typeof arg == "number"){
2430
if(isFinite(arg)){
2431
return arg.toString()
2432
}
@earney
make str(i) a bit more efficient
Mar 23, 2015
2433
}
@PierreQuentel
Improve speed of str() on integers and strings
Mar 22, 2015
2434
try{
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
2435
if(arg.$is_class || arg.$factory){
2436
// arg is a class
@PierreQuentel
Fixes #155 : metaclass not set as the type of a class when called dir…
Mar 17, 2015
2437
// In this case, str() doesn't use the attribute __str__ of the
@PierreQuentel
Fix str() for classes
Mar 16, 2015
2438
// class or its subclasses, but the attribute __str__ of the
2439
// class metaclass (usually "type") or its subclasses (usually
2440
// "object")
2441
// The metaclass is the attribute __class__ of the class dictionary
Coding style
Mar 19, 2018
2442
var func = $B.$getattr(arg.__class__, "__str__")
Fixes #720 : "call stack exceeded" for comparison operators using fun…
Dec 7, 2017
2443
return func(arg)
@PierreQuentel
Fix str() for classes
Mar 16, 2015
2444
}
Fixes bug when str() arguments are passed as keywords
Nov 15, 2019
2445
Implement str(arg, encoding, errors)
Jul 28, 2018
2446
if(arg.__class__ && arg.__class__ === _b_.bytes &&
2447
encoding !== undefined){
2448
// str(bytes, encoding, errors) is equal to
2449
// bytes.decode(encoding, errors)
Fixes #1060 : str(bytes('abc', encoding='ascii'), encoding='ascii') r…
Mar 19, 2019
2450
return _b_.bytes.decode(arg, $.encoding, $.errors)
Implement str(arg, encoding, errors)
Jul 28, 2018
2451
}
Fixes #1229 : Python's repr and str function should ignore any instan…
Oct 27, 2019
2452
// Implicit invocation of __str__ uses method __str__ on the class,
2453
// even if arg has an attribute __str__
2454
var klass = arg.__class__ || $B.get_class(arg)
Handle hash() and str() for objects without a class (DOM objects)
May 3, 2020
2455
if(klass === undefined){
Adapt core Brython scripts to new interface with JS objects
Jul 17, 2020
2456
return $B.JSObj.__str__($B.JSObj.$factory(arg))
Handle hash() and str() for objects without a class (DOM objects)
May 3, 2020
2457
}
Fixes #1229 : Python's repr and str function should ignore any instan…
Oct 27, 2019
2458
var method = $B.$getattr(klass , "__str__", null)
2459
if(method === null ||
In str(obj), if obj.__str__ uses object.__str__ and obj has an attrib…
Nov 2, 2018
2460
// if not better than object.__str__, try __repr__
2461
(arg.__class__ && arg.__class__ !== _b_.object &&
Fixes #1821 : repr() doesn't work as expected
Nov 16, 2021
2462
method === _b_.object.__str__)){
Fixes #1229 : Python's repr and str function should ignore any instan…
Oct 27, 2019
2463
var method = $B.$getattr(klass, "__repr__")
In str(obj), if obj.__str__ uses object.__str__ and obj has an attrib…
Nov 2, 2018
2464
}
@PierreQuentel
First import
Sep 5, 2014
2465
}
2466
catch(err){
Change object.__getattribute__ and type.__getattribute__ to handle me…
Jun 28, 2018
2467
console.log("no __str__ for", arg)
Coding style
Mar 19, 2018
2468
console.log("err ", err)
In str(obj), if obj.__str__ uses object.__str__ and obj has an attrib…
Nov 2, 2018
2469
if($B.debug > 1){console.log(err)}
2470
console.log("Warning - no method __str__ or __repr__, " +
2471
"default to toString", arg)
Fixes #1060 (new issue)
May 20, 2019
2472
throw err
@PierreQuentel
First import
Sep 5, 2014
2473
}
Fixes #1229 : Python's repr and str function should ignore any instan…
Oct 27, 2019
2474
return $B.$call(method)(arg)
@PierreQuentel
First import
Sep 5, 2014
2475
}
str
Feb 10, 2018
2476
2477
str.__new__ = function(cls){
Coding style
Mar 19, 2018
2478
if(cls === undefined){
2479
throw _b_.TypeError.$factory("str.__new__(): not enough arguments")
@PierreQuentel
First import
Sep 5, 2014
2480
}
Coding style
Mar 19, 2018
2481
return {__class__: cls}
@PierreQuentel
First import
Sep 5, 2014
2482
}
2483
str
Feb 10, 2018
2484
$B.set_func_names(str, "builtins")
Updated to latest copy of the repo
Jan 1, 2015
2485
@PierreQuentel
First import
Sep 5, 2014
2486
// dictionary and factory for subclasses of string
str
Feb 10, 2018
2487
var StringSubclass = $B.StringSubclass = {
Coding style
Mar 19, 2018
2488
__class__: _b_.type,
@PierreQuentel
Fixes #1655 : deepcopy failing for classes extending list
May 4, 2021
2489
__mro__: [_b_.object],
Fixes #1007 : __name__ should not be an attribute of bool values, int…
Jan 2, 2019
2490
$infos: {
2491
__module__: "builtins",
2492
__name__: "str"
2493
},
str
Feb 10, 2018
2494
$is_class: true
@PierreQuentel
First import
Sep 5, 2014
2495
}
2496
str
Feb 10, 2018
2497
// the methods in subclass apply the methods in str to the
@PierreQuentel
First import
Sep 5, 2014
2498
// result of instance.valueOf(), which is a Javascript string
str
Feb 10, 2018
2499
for(var $attr in str){
Coding style
Mar 19, 2018
2500
if(typeof str[$attr] == "function"){
Coding style
Mar 19, 2018
2501
StringSubclass[$attr] = (function(attr){
@PierreQuentel
First import
Sep 5, 2014
2502
return function(){
Coding style
Mar 19, 2018
2503
var args = [],
2504
pos = 0
2505
if(arguments.length > 0){
2506
var args = [arguments[0].valueOf()],
2507
pos = 1
2508
for(var i = 1, len = arguments.length; i < len; i++){
2509
args[pos++] = arguments[i]
@PierreQuentel
First import
Sep 5, 2014
2510
}
2511
}
Coding style
Mar 19, 2018
2512
return str[attr].apply(null, args)
@PierreQuentel
First import
Sep 5, 2014
2513
}
2514
})($attr)
2515
}
2516
}
Implement str.format_map()
Nov 22, 2020
2517
str
Feb 10, 2018
2518
StringSubclass.__new__ = function(cls){
Remove lzst "old-style" classes and all the code that handled them
Feb 12, 2018
2519
return {__class__: cls}
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
2520
}
@PierreQuentel
First import
Sep 5, 2014
2521
str
Feb 10, 2018
2522
$B.set_func_names(StringSubclass, "builtins")
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
2523
@PierreQuentel
First import
Sep 5, 2014
2524
_b_.str = str
2525
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2526
// Function to parse the 2nd argument of format()
2527
$B.parse_format_spec = function(spec){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2528
if(spec == ""){
2529
this.empty = true
2530
}else{
Coding style
Mar 19, 2018
2531
var pos = 0,
2532
aligns = "<>=^",
2533
digits = "0123456789",
2534
types = "bcdeEfFgGnosxX%",
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
2535
align_pos = aligns.indexOf(spec.charAt(0))
Coding style
Mar 19, 2018
2536
if(align_pos != -1){
2537
if(spec.charAt(1) && aligns.indexOf(spec.charAt(1)) != -1){
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
2538
// If the second char is also an alignment specifier, the
2539
// first char is the fill value
2540
this.fill = spec.charAt(0)
2541
this.align = spec.charAt(1)
2542
pos = 2
2543
}else{
2544
// The first character defines alignment : fill defaults to ' '
Coding style
Mar 19, 2018
2545
this.align = aligns[align_pos]
2546
this.fill = " "
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
2547
pos++
2548
}
2549
}else{
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2550
align_pos = aligns.indexOf(spec.charAt(1))
Coding style
Mar 19, 2018
2551
if(spec.charAt(1) && align_pos != -1){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2552
// The second character defines alignment : fill is the first one
Coding style
Mar 19, 2018
2553
this.align = aligns[align_pos]
2554
this.fill = spec.charAt(0)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2555
pos = 2
2556
}
2557
}
2558
var car = spec.charAt(pos)
Coding style
Mar 19, 2018
2559
if(car == "+" || car == "-" || car == " "){
2560
this.sign = car
2561
pos++
2562
car = spec.charAt(pos)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2563
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2564
if(car == "#"){
2565
this.alternate = true; pos++; car = spec.charAt(pos)
2566
}
Coding style
Mar 19, 2018
2567
if(car == "0"){
Coding style
Mar 19, 2018
2568
// sign-aware : equivalent to fill = 0 and align == "="
Coding style
Mar 19, 2018
2569
this.fill = "0"
Fixes #1075 : format(123.456, "^-09.3f") not centered
Apr 2, 2019
2570
if(align_pos == -1){
2571
this.align = "="
2572
}
Coding style
Mar 19, 2018
2573
pos++
2574
car = spec.charAt(pos)
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
2575
}
Coding style
Mar 19, 2018
2576
while(car && digits.indexOf(car) > -1){
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2577
if(this.width === undefined){
2578
this.width = car
2579
}else{
2580
this.width += car
2581
}
Coding style
Mar 19, 2018
2582
pos++
2583
car = spec.charAt(pos)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2584
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2585
if(this.width !== undefined){
2586
this.width = parseInt(this.width)
2587
}
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
2588
if(this.width === undefined && car == "{"){
2589
// Width is determined by a parameter
2590
var end_param_pos = spec.substr(pos).search("}")
2591
this.width = spec.substring(pos, end_param_pos)
2592
console.log("width", "[" + this.width + "]")
2593
pos += end_param_pos + 1
2594
}
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2595
if(car == ","){
2596
this.comma = true
2597
pos++
2598
car = spec.charAt(pos)
2599
}
Coding style
Mar 19, 2018
2600
if(car == "."){
2601
if(digits.indexOf(spec.charAt(pos + 1)) == -1){
2602
throw _b_.ValueError.$factory(
2603
"Missing precision in format spec")
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2604
}
Coding style
Mar 19, 2018
2605
this.precision = spec.charAt(pos + 1)
2606
pos += 2
2607
car = spec.charAt(pos)
2608
while(car && digits.indexOf(car) > -1){
Coding style
Mar 21, 2018
2609
this.precision += car
Coding style
Mar 19, 2018
2610
pos++
2611
car = spec.charAt(pos)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2612
}
2613
this.precision = parseInt(this.precision)
2614
}
Coding style
Mar 19, 2018
2615
if(car && types.indexOf(car) > -1){
2616
this.type = car
2617
pos++
2618
car = spec.charAt(pos)
2619
}
2620
if(pos !== spec.length){
Fixes bugs in string formatting to pass the tests in Lib/test/test_st…
Nov 12, 2018
2621
throw _b_.ValueError.$factory("Invalid format specifier: " + spec)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2622
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
2623
}
Fixes #1076 : 'str' object has no attribute 'isascii'
Apr 2, 2019
2624
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
2625
this.toString = function(){
Coding style
Mar 19, 2018
2626
return (this.fill === undefined ? "" : _b_.str.$factory(this.fill)) +
2627
(this.align || "") +
2628
(this.sign || "") +
2629
(this.alternate ? "#" : "") +
2630
(this.sign_aware ? "0" : "") +
2631
(this.width || "") +
2632
(this.comma ? "," : "") +
2633
(this.precision ? "." + this.precision : "") +
2634
(this.type || "")
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2635
}
2636
}
2637
2638
$B.format_width = function(s, fmt){
Coding style
Mar 19, 2018
2639
if(fmt.width && s.length < fmt.width){
2640
var fill = fmt.fill || " ",
2641
align = fmt.align || "<",
2642
missing = fmt.width - s.length
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2643
switch(align){
Coding style
Mar 19, 2018
2644
case "<":
2645
return s + fill.repeat(missing)
2646
case ">":
2647
return fill.repeat(missing) + s
2648
case "=":
2649
if("+-".indexOf(s.charAt(0)) > -1){
2650
return s.charAt(0) + fill.repeat(missing) + s.substr(1)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2651
}else{
Coding style
Mar 19, 2018
2652
return fill.repeat(missing) + s
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2653
}
Coding style
Mar 19, 2018
2654
case "^":
2655
var left = parseInt(missing / 2)
2656
return fill.repeat(left) + s + fill.repeat(missing - left)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
2657
}
2658
}
2659
return s
2660
}
2661
@PierreQuentel
Fixes bug in f-string parsing (in "f{releases[2:]}", parsing stopped …
Nov 10, 2021
2662
function fstring_expression(start){
Coding style
Mar 19, 2018
2663
this.type = "expression"
@PierreQuentel
Fixes bug in f-string parsing (in "f{releases[2:]}", parsing stopped …
Nov 10, 2021
2664
this.start = start
Coding style
Mar 19, 2018
2665
this.expression = ""
Improved implementation of f-strings
Jul 10, 2017
2666
this.conversion = null
2667
this.fmt = null
2668
}
2669
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2670
function fstring_error(msg, pos){
2671
error = Error(msg)
2672
error.position = pos
2673
throw error
2674
}
2675
First implementation of f-strings
Jun 29, 2017
2676
$B.parse_fstring = function(string){
2677
// Parse a f-string
2678
var elts = [],
2679
pos = 0,
Coding style
Mar 19, 2018
2680
current = "",
First implementation of f-strings
Jun 29, 2017
2681
ctype = null,
2682
nb_braces = 0,
Fixes #1734 : f-string parsing error
Jul 31, 2021
2683
expr_start,
First implementation of f-strings
Jun 29, 2017
2684
car
2685
Coding style
Mar 19, 2018
2686
while(pos < string.length){
2687
if(ctype === null){
First implementation of f-strings
Jun 29, 2017
2688
car = string.charAt(pos)
Coding style
Mar 19, 2018
2689
if(car == "{"){
Coding style
Mar 21, 2018
2690
if(string.charAt(pos + 1) == "{"){
Coding style
Mar 19, 2018
2691
ctype = "string"
2692
current = "{"
First implementation of f-strings
Jun 29, 2017
2693
pos += 2
2694
}else{
Coding style
Mar 19, 2018
2695
ctype = "expression"
Fixes #1734 : f-string parsing error
Jul 31, 2021
2696
expr_start = pos + 1
First implementation of f-strings
Jun 29, 2017
2697
nb_braces = 1
2698
pos++
2699
}
Coding style
Mar 19, 2018
2700
}else if(car == "}"){
Coding style
Mar 21, 2018
2701
if(string.charAt(pos + 1) == car){
Coding style
Mar 19, 2018
2702
ctype = "string"
2703
current = "}"
Improve implementation of f-strings
Jul 14, 2017
2704
pos += 2
First implementation of f-strings
Jun 29, 2017
2705
}else{
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2706
fstring_error(" f-string: single '}' is not allowed",
2707
pos)
First implementation of f-strings
Jun 29, 2017
2708
}
2709
}else{
Coding style
Mar 19, 2018
2710
ctype = "string"
First implementation of f-strings
Jun 29, 2017
2711
current = car
Improve implementation of f-strings
Jul 14, 2017
2712
pos++
First implementation of f-strings
Jun 29, 2017
2713
}
Coding style
Mar 19, 2018
2714
}else if(ctype == "string"){
First implementation of f-strings
Jun 29, 2017
2715
// end of string is the first single { or end of string
Coding style
Mar 19, 2018
2716
var i = pos
2717
while(i < string.length){
First implementation of f-strings
Jun 29, 2017
2718
car = string.charAt(i)
Coding style
Mar 19, 2018
2719
if(car == "{"){
Coding style
Mar 21, 2018
2720
if(string.charAt(i + 1) == "{"){
Coding style
Mar 19, 2018
2721
current += "{"
2722
i += 2
First implementation of f-strings
Jun 29, 2017
2723
}else{
2724
elts.push(current)
Coding style
Mar 19, 2018
2725
ctype = "expression"
Fixes #1734 : f-string parsing error
Jul 31, 2021
2726
expr_start = i + 1
Coding style
Mar 19, 2018
2727
pos = i + 1
First implementation of f-strings
Jun 29, 2017
2728
break
2729
}
Coding style
Mar 19, 2018
2730
}else if(car == "}"){
2731
if(string.charAt(i + 1) == car){
First implementation of f-strings
Jun 29, 2017
2732
current += car
2733
i += 2
2734
}else{
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2735
fstring_error(" f-string: single '}' is not allowed",
2736
pos)
First implementation of f-strings
Jun 29, 2017
2737
}
2738
}else{
2739
current += car
2740
i++
2741
}
2742
}
Coding style
Mar 19, 2018
2743
pos = i + 1
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2744
}else if(ctype == "debug"){
2745
// after the equal sign, whitespace are ignored and the only
2746
// valid characters are } and :
2747
while(string.charAt(i) == " "){i++}
2748
if(string.charAt(i) == "}"){
2749
// end of debug expression
2750
elts.push(current)
2751
ctype = null
2752
current = ""
2753
pos = i + 1
2754
}
First implementation of f-strings
Jun 29, 2017
2755
}else{
2756
// End of expression is the } matching the opening {
2757
// There may be nested braces
2758
var i = pos,
2759
nb_braces = 1,
Improve implementation of f-strings
Jul 14, 2017
2760
nb_paren = 0,
@PierreQuentel
Fixes bug in f-string parsing (in "f{releases[2:]}", parsing stopped …
Nov 10, 2021
2761
current = new fstring_expression(expr_start)
Coding style
Mar 19, 2018
2762
while(i < string.length){
First implementation of f-strings
Jun 29, 2017
2763
car = string.charAt(i)
Coding style
Mar 19, 2018
2764
if(car == "{" && nb_paren == 0){
First implementation of f-strings
Jun 29, 2017
2765
nb_braces++
f-strings : support {expr} in format specifiers
Jul 14, 2017
2766
current.expression += car
First implementation of f-strings
Jun 29, 2017
2767
i++
Coding style
Mar 19, 2018
2768
}else if(car == "}" && nb_paren == 0){
First implementation of f-strings
Jun 29, 2017
2769
nb_braces -= 1
Coding style
Mar 19, 2018
2770
if(nb_braces == 0){
First implementation of f-strings
Jun 29, 2017
2771
// end of expression
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2772
if(current.expression == ""){
2773
fstring_error("f-string: empty expression not allowed",
2774
pos)
2775
}
Improved implementation of f-strings
Jul 10, 2017
2776
elts.push(current)
First implementation of f-strings
Jun 29, 2017
2777
ctype = null
Coding style
Mar 19, 2018
2778
current = ""
2779
pos = i + 1
f-strings : support {expr} in format specifiers
Jul 14, 2017
2780
break
First implementation of f-strings
Jun 29, 2017
2781
}
f-strings : support {expr} in format specifiers
Jul 14, 2017
2782
current.expression += car
2783
i++
Coding style
Mar 19, 2018
2784
}else if(car == "\\"){
Improved implementation of f-strings
Jul 10, 2017
2785
// backslash is not allowed in expressions
2786
throw Error("f-string expression part cannot include a" +
2787
" backslash")
Coding style
Mar 19, 2018
2788
}else if(nb_paren == 0 && car == "!" && current.fmt === null &&
Fixes #1734 : f-string parsing error
Jul 31, 2021
2789
":}".indexOf(string.charAt(i + 2)) > -1){
Coding style
Mar 19, 2018
2790
if(current.expression.length == 0){
Improved implementation of f-strings
Jul 10, 2017
2791
throw Error("f-string: empty expression not allowed")
2792
}
Coding style
Mar 19, 2018
2793
if("ars".indexOf(string.charAt(i + 1)) == -1){
Improved implementation of f-strings
Jul 10, 2017
2794
throw Error("f-string: invalid conversion character:" +
2795
" expected 's', 'r', or 'a'")
2796
}else{
Coding style
Mar 19, 2018
2797
current.conversion = string.charAt(i + 1)
Improved implementation of f-strings
Jul 10, 2017
2798
i += 2
2799
}
@PierreQuentel
Fixes bug in f-string parsing (in "f{releases[2:]}", parsing stopped …
Nov 10, 2021
2800
}else if(car == "(" || car == '['){
Improve implementation of f-strings
Jul 14, 2017
2801
nb_paren++
2802
current.expression += car
2803
i++
@PierreQuentel
Fixes bug in f-string parsing (in "f{releases[2:]}", parsing stopped …
Nov 10, 2021
2804
}else if(car == ")" || car == ']'){
Improve implementation of f-strings
Jul 14, 2017
2805
nb_paren--
2806
current.expression += car
2807
i++
Coding style
Mar 19, 2018
2808
}else if(car == '"'){
Improve implementation of f-strings
Jul 14, 2017
2809
// triple string ?
Coding style
Mar 19, 2018
2810
if(string.substr(i, 3) == '"""'){
2811
var end = string.indexOf('"""', i + 3)
2812
if(end == -1){
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2813
fstring_error("f-string: unterminated string", pos)
Coding style
Mar 19, 2018
2814
}else{
2815
var trs = string.substring(i, end + 3)
2816
trs = trs.replace("\n", "\\n\\")
Improve implementation of f-strings
Jul 14, 2017
2817
current.expression += trs
Coding style
Mar 19, 2018
2818
i = end + 3
Improve implementation of f-strings
Jul 14, 2017
2819
}
2820
}else{
Coding style
Mar 19, 2018
2821
var end = string.indexOf('"', i + 1)
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
current.expression += string.substring(i, end + 1)
2826
i = end + 1
Improve implementation of f-strings
Jul 14, 2017
2827
}
2828
}
Coding style
Mar 19, 2018
2829
}else if(nb_paren == 0 && car == ":"){
@PierreQuentel
Simplify implementation of fstrings
Sep 7, 2021
2830
// start format
Improved implementation of f-strings
Jul 10, 2017
2831
current.fmt = true
@PierreQuentel
Simplify implementation of fstrings
Sep 7, 2021
2832
var cb = 0,
2833
fmt_complete = false
2834
for(var j = i + 1; j < string.length; j++){
2835
if(string[j] == '{'){
2836
if(string[j + 1] == '{'){
2837
j += 2
2838
}else{
2839
cb++
2840
}
2841
}else if(string[j] == '}'){
2842
if(string[j + 1] == '}'){
2843
j += 2
2844
}else if(cb == 0){
2845
fmt_complete = true
2846
var fmt = string.substring(i + 1, j)
2847
current.format = $B.parse_fstring(fmt)
2848
i = j
2849
break
2850
}else{
2851
cb--
2852
}
2853
}
2854
}
2855
if(! fmt_complete){
2856
fstring_error('invalid format', pos)
2857
}
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2858
}else if(car == "="){
2859
// might be a "debug expression", eg f"{x=}"
Fixes #1427 : issue with print's f-string handling of new = option wh…
Jun 20, 2020
2860
var ce = current.expression,
2861
last_char = ce.charAt(ce.length - 1),
2862
last_char_re = ('()'.indexOf(last_char) > -1 ? "\\" : "") + last_char
Fixes #1440 : management of unassigned Unicode code points
Jul 8, 2020
2863
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2864
if(ce.length == 0 ||
Fixes #1544 : problem with unittest.mock (bug with '"' inside f-strings)
Nov 30, 2020
2865
nb_paren > 0 ||
Fixes regressions introduced by recent commits
Dec 27, 2019
2866
string.charAt(i + 1) == "=" ||
Fixes #1544 : problem with unittest.mock (bug with '"' inside f-strings)
Nov 30, 2020
2867
"=!<>:".search(last_char_re) > -1){
Fixes #1734 : f-string parsing error
Jul 31, 2021
2868
// not a debug expression
Fixes #1571 : async f-string doesn't see the correct value of a globa…
Jun 23, 2021
2869
current.expression += car
Fixes #1544 : problem with unittest.mock (bug with '"' inside f-strings)
Nov 30, 2020
2870
i += 1
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2871
}else{
2872
// add debug string
2873
tail = car
2874
while(string.charAt(i + 1).match(/\s/)){
2875
tail += string.charAt(i + 1)
2876
i++
2877
}
Fixes #1734 : f-string parsing error
Jul 31, 2021
2878
// push simple string
Support f-string specifier = for debugging (anticipation of Python 3.8)
Oct 13, 2019
2879
elts.push(current.expression + tail)
2880
// remove trailing whitespace from expression
2881
while(ce.match(/\s$/)){
2882
ce = ce.substr(0, ce.length - 1)
2883
}
2884
current.expression = ce
2885
ctype = "debug"
2886
i++
2887
}
First implementation of f-strings
Jun 29, 2017
2888
}else{
Improved implementation of f-strings
Jul 10, 2017
2889
current.expression += car
First implementation of f-strings
Jun 29, 2017
2890
i++
2891
}
2892
}
Coding style
Mar 21, 2018
2893
if(nb_braces > 0){
Fixes #1554 : SyntaxError not raised for empty expressions in f-strings
Dec 12, 2020
2894
fstring_error("f-string: expected '}'", pos)
First implementation of f-strings
Jun 29, 2017
2895
}
2896
}
2897
}
Fixes #1571 : async f-string doesn't see the correct value of a globa…
Jun 23, 2021
2898
if(current.length > 0){
2899
elts.push(current)
2900
}
Fixes #1734 : f-string parsing error
Jul 31, 2021
2901
for(var elt of elts){
2902
if(typeof elt == "object"){
2903
if(elt.fmt_pos !== undefined &&
2904
elt.expression.charAt(elt.fmt_pos) != ':'){
2905
console.log('mauvais format', string, elts)
2906
throw Error()
2907
}
2908
}
2909
}
First implementation of f-strings
Jun 29, 2017
2910
return elts
2911
}
2912
Improvements to python_re.js. test_ignore_case_range passes.
Jan 19, 2021
2913
var _chr = $B.codepoint2jsstring = function(i){
Support upper() and lower() for strings with surrogate pairs
Jan 18, 2021
2914
if(i >= 0x10000 && i <= 0x10FFFF){
2915
var code = (i - 0x10000)
2916
return String.fromCodePoint(0xD800 | (code >> 10)) +
2917
String.fromCodePoint(0xDC00 | (code & 0x3FF))
2918
}else{
2919
return String.fromCodePoint(i)
2920
}
2921
}
Improvements to python_re.js. test_ignore_case_range passes.
Jan 19, 2021
2922
Fixes #1626 : print(object) returns [Object object] instead of __str_…
Mar 6, 2021
2923
var _ord = $B.jsstring2codepoint = function(c){
Support upper() and lower() for strings with surrogate pairs
Jan 18, 2021
2924
if(c.length == 1){
2925
return c.charCodeAt(0)
2926
}
2927
var code = 0x10000
2928
code += (c.charCodeAt(0) & 0x03FF) << 10
2929
code += (c.charCodeAt(1) & 0x03FF)
2930
return code
2931
}
2932
@PierreQuentel
First import
Sep 5, 2014
2933
})(__BRYTHON__)