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