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