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