Skip to content
Permalink
brython/www/src/py_string.js
Newer
Older
Raw Normal view History
100644 1953 lines (1787 sloc) 64 KB
@PierreQuentel
First import
Sep 5, 2014
1
;(function($B){
2
Merged with legacy_format_refactor
Jan 14, 2015
3
eval($B.InjectBuiltins())
@PierreQuentel
First import
Sep 5, 2014
4
@jonathanverner
Fix strip handling of bracket character (GH Issue #521).
Nov 2, 2016
5
if (!String.prototype.trim) {
6
// Polyfill for older browsers
7
// The code does not use a regex to make it a bit faster.
8
// Implementation taken from a comment by Timo on the blog:
9
// http://blog.stevenlevithan.com/archives/faster-trim-javascript
10
String.prototype.trim = function () {
11
var c;
12
for (var i = 0; i < this.length; i++) {
13
c = this.charCodeAt(i);
14
if (c == 32 || c == 10 || c == 13 || c == 9 || c == 12 || c == 11 || c == 160 || c == 5760 || c == 6158 || c == 8192 || c == 8193 || c == 8194 || c == 8195 || c == 8196 || c == 8197 || c == 8198 || c == 8199 || c == 8200 || c == 8201 || c == 8202 || c == 8232 || c == 8233 || c == 8239 || c == 8287 || c == 12288 || c == 65279)
15
continue; else break;
16
}
17
for (var j = this.length - 1; j >= i; j--) {
18
c = this.charCodeAt(j);
19
if (c == 32 || c == 10 || c == 13 || c == 9 || c == 12 || c == 11 || c == 160 || c == 5760 || c == 6158 || c == 8192 || c == 8193 || c == 8194 || c == 8195 || c == 8196 || c == 8197 || c == 8198 || c == 8199 || c == 8200 || c == 8201 || c == 8202 || c == 8232 || c == 8233 || c == 8239 || c == 8287 || c == 12288 || c == 65279)
20
continue; else break;
21
}
22
return this.substring(i, j + 1);
23
}
24
}
25
if (!String.prototype.trimLeft) {
26
// Convenience method for browsers which do not have a native trimLeft
27
// (which is a nonstandard extension in Firefox and Chrome)
28
String.prototype.trimLeft = function () {
29
var c;
30
for (var i = 0; i < this.length; i++) {
31
c = this.charCodeAt(i);
32
if (c == 32 || c == 10 || c == 13 || c == 9 || c == 12 || c == 11 || c == 160 || c == 5760 || c == 6158 || c == 8192 || c == 8193 || c == 8194 || c == 8195 || c == 8196 || c == 8197 || c == 8198 || c == 8199 || c == 8200 || c == 8201 || c == 8202 || c == 8232 || c == 8233 || c == 8239 || c == 8287 || c == 12288 || c == 65279)
33
continue; else break;
34
}
35
return this.substring(i);
36
};
37
}
38
if (!String.prototype.trimRight) {
39
String.prototype.trimRight = function () {
40
// Convenience method for browsers which do not have a native trimRight
41
// (which is a nonstandard extension in Firefox and Chrome)
42
var c;
43
for (var j = this.length - 1; j >= 0; j--) {
44
c = this.charCodeAt(j);
45
if (c == 32 || c == 10 || c == 13 || c == 9 || c == 12 || c == 11 || c == 160 || c == 5760 || c == 6158 || c == 8192 || c == 8193 || c == 8194 || c == 8195 || c == 8196 || c == 8197 || c == 8198 || c == 8199 || c == 8200 || c == 8201 || c == 8202 || c == 8232 || c == 8233 || c == 8239 || c == 8287 || c == 12288 || c == 65279)
46
continue; else break;
47
}
48
return this.substring(0, j + 1);
49
};
50
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
51
Implement "object" as a new-style class. $B.make_class also returns a…
Feb 10, 2018
52
var object = _b_.object
@PierreQuentel
First import
Sep 5, 2014
53
54
var $StringDict = {__class__:$B.$type,
Implement "object" as a new-style class. $B.make_class also returns a…
Feb 10, 2018
55
__dir__:object.__dir__,
@PierreQuentel
First import
Sep 5, 2014
56
__name__:'str',
57
$native:true
58
}
59
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
60
function normalize_start_end($){
61
if($.start===null||$.start===_b_.None){$.start = 0}
62
else if($.start<0){$.start += $.self.length; $.start=Math.max(0, $.start)}
63
if($.end===null||$.end===_b_.None){$.end = $.self.length}
64
else if($.end<0){$.end += $.self.length; $.end=Math.max(0, $.end)}
65
66
if(!isinstance($.start,_b_.int)||!isinstance($.end,_b_.int)){
Implement exceptions as new-style classes
Feb 10, 2018
67
throw _b_.TypeError.$factory(
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
68
"slice indices must be integers or None or have an __index__ method")}
69
70
}
71
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
72
function reverse(s){
73
// Reverse a string
74
return s.split('').reverse().join('')
75
}
76
77
function check_str(obj){
Implement exceptions as new-style classes
Feb 10, 2018
78
if(!_b_.isinstance(obj,str)){throw _b_.TypeError.$factory("can't convert '"+
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
79
$B.get_class(obj).__name__+"' object to str implicitely")}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
80
}
81
@PierreQuentel
First import
Sep 5, 2014
82
$StringDict.__add__ = function(self,other){
83
if(!(typeof other==="string")){
84
try{return getattr(other,'__radd__')(self)}
Implement exceptions as new-style classes
Feb 10, 2018
85
catch(err){throw _b_.TypeError.$factory(
@PierreQuentel
First import
Sep 5, 2014
86
"Can't convert "+$B.get_class(other).__name__+" to str implicitely")}
87
}
88
return self+other
89
}
90
91
$StringDict.__contains__ = function(self,item){
Implement exceptions as new-style classes
Feb 10, 2018
92
if(!(typeof item==="string")){throw _b_.TypeError.$factory(
@PierreQuentel
First import
Sep 5, 2014
93
"'in <string>' requires string as left operand, not "+item.__class__)}
94
var nbcar = item.length
95
if(nbcar==0) return true // a string contains the empty string
96
if(self.length==0) return nbcar==0
Updated to latest copy of the repo
Jan 1, 2015
97
for(var i=0, _len_i = self.length; i < _len_i;i++){
@PierreQuentel
First import
Sep 5, 2014
98
if(self.substr(i,nbcar)==item) return true
99
}
100
return false
101
}
102
103
$StringDict.__delitem__ = function(){
Implement exceptions as new-style classes
Feb 10, 2018
104
throw _b_.TypeError.$factory("'str' object doesn't support item deletion")
@PierreQuentel
First import
Sep 5, 2014
105
}
106
Merged with legacy_format_refactor
Jan 14, 2015
107
// __dir__must be assigned explicitely because attribute resolution for builtin
108
// classes doesn't use __mro__
Implement "object" as a new-style class. $B.make_class also returns a…
Feb 10, 2018
109
$StringDict.__dir__ = object.__dir__
Merged with legacy_format_refactor
Jan 14, 2015
110
@PierreQuentel
First import
Sep 5, 2014
111
$StringDict.__eq__ = function(self,other){
112
if(other===undefined){ // compare object "self" to class "str"
113
return self===str
114
}
Merged with legacy_format_refactor
Jan 14, 2015
115
if (_b_.isinstance(other, _b_.str)) {
116
return other.valueOf() == self.valueOf()
117
}
@PierreQuentel
First import
Sep 5, 2014
118
return other===self.valueOf()
119
}
120
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
121
function preformat(self, fmt){
122
if(fmt.empty){return _b_.str(self)}
123
if(fmt.type && fmt.type!='s'){
Implement exceptions as new-style classes
Feb 10, 2018
124
throw _b_.ValueError.$factory("Unknown format code '"+fmt.type+
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
125
"' for object of type 'str'")
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
126
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
127
return self
128
}
129
130
$StringDict.__format__ = function(self, format_spec) {
131
var fmt = new $B.parse_format_spec(format_spec)
Raise an exception if a string format specifier has a sign
Sep 24, 2017
132
if(fmt.sign!==undefined){
Implement exceptions as new-style classes
Feb 10, 2018
133
throw _b_.ValueError.$factory("Sign not allowed in string format specifier")
Raise an exception if a string format specifier has a sign
Sep 24, 2017
134
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
135
// For strings, alignment default to left
136
fmt.align = fmt.align || '<'
137
return $B.format_width(preformat(self, fmt), fmt)
@PierreQuentel
First import
Sep 5, 2014
138
}
139
140
$StringDict.__getitem__ = function(self,arg){
141
if(isinstance(arg,_b_.int)){
142
var pos = arg
143
if(arg<0) pos+=self.length
144
if(pos>=0 && pos<self.length) return self.charAt(pos)
Implement exceptions as new-style classes
Feb 10, 2018
145
throw _b_.IndexError.$factory('string index out of range')
@PierreQuentel
First import
Sep 5, 2014
146
}
147
if(isinstance(arg,slice)) {
@PierreQuentel
Mutualize code for access by slice to lists and strings
Oct 15, 2015
148
var s=_b_.slice.$dict.$conv_for_seq(arg, self.length),
149
start=s.start, stop=s.stop, step=s.step
@PierreQuentel
First import
Sep 5, 2014
150
var res = '',i=null
151
if(step>0){
152
if(stop<=start) return ''
153
for(var i=start;i<stop;i+=step) res += self.charAt(i)
154
} else {
155
if(stop>=start) return ''
@PierreQuentel
Fixes #285 : off-by-one string slicing with negative step (s[1:0:-1]))
Sep 14, 2015
156
for(var i=start;i>stop;i+=step) res += self.charAt(i)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
157
}
@PierreQuentel
First import
Sep 5, 2014
158
return res
159
}
Implement "int" as new-style class
Feb 10, 2018
160
if(isinstance(arg,bool)) return self.__getitem__(_b_.int.$factory(arg))
Implement exceptions as new-style classes
Feb 10, 2018
161
throw _b_.TypeError.$factory('string indices must be integers')
@PierreQuentel
First import
Sep 5, 2014
162
}
163
164
$StringDict.__hash__ = function(self) {
Updated to latest copy of the repo
Jan 1, 2015
165
if (self === undefined) {
166
return $StringDict.__hashvalue__ || $B.$py_next_hash-- // for hash of string type (not instance of string)
167
}
168
@PierreQuentel
First import
Sep 5, 2014
169
//http://stackoverflow.com/questions/2909106/python-whats-a-correct-and-good-way-to-implement-hash
170
// this implementation for strings maybe good enough for us..
171
172
var hash=1;
Updated to latest copy of the repo
Jan 1, 2015
173
for(var i=0, _len_i = self.length; i < _len_i; i++) {
@PierreQuentel
First import
Sep 5, 2014
174
hash=(101*hash + self.charCodeAt(i)) & 0xFFFFFFFF
175
}
176
177
return hash
178
}
179
180
$StringDict.__init__ = function(self,arg){
181
self.valueOf = function(){return arg}
182
self.toString = function(){return arg}
@PierreQuentel
Fixes #253 : some builtin functions that should return None instead r…
Aug 24, 2015
183
return _b_.None
@PierreQuentel
First import
Sep 5, 2014
184
}
185
186
var $str_iterator = $B.$iterator_class('str_iterator')
187
$StringDict.__iter__ = function(self){
188
var items = self.split('') // list of all characters in string
189
return $B.$iterator(items,$str_iterator)
190
}
191
192
$StringDict.__len__ = function(self){return self.length}
193
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
194
// Start of section for legacy formatting (with %)
195
Merged with legacy_format_refactor
Jan 14, 2015
196
var kwarg_key = new RegExp('([^\\)]*)\\)')
197
198
var NotANumber = function() {
199
this.name = 'NotANumber'
200
}
201
202
var number_check=function(s) {
203
if(!isinstance(s,[_b_.int,_b_.float])){
204
throw new NotANumber()
205
}
206
}
207
208
var get_char_array = function(size, char) {
209
if (size <= 0)
210
return ''
211
return new Array(size + 1).join(char)
212
}
213
214
var format_padding = function(s, flags, minus_one) {
215
var padding = flags.padding
216
if (!padding) { // undefined
217
return s
218
}
219
s = s.toString()
220
padding = parseInt(padding, 10)
221
if (minus_one) { // numeric formatting where sign goes in front of padding
222
padding -= 1
223
}
224
if (!flags.left) {
225
return get_char_array(padding - s.length, flags.pad_char) + s
226
} else {
227
// left adjusted
228
return s + get_char_array(padding - s.length, flags.pad_char)
229
}
230
}
231
232
var format_int_precision = function(val, flags) {
233
var precision = flags.precision
234
if (!precision) {
235
return val.toString()
236
}
237
precision = parseInt(precision, 10)
@earney
fix int precision issue when int is a long int
Jun 18, 2015
238
var s
239
if (val.__class__ === $B.LongInt.$dict) {
240
s=$B.LongInt.$dict.to_base(val, 10)
241
} else {
242
s=val.toString()
243
}
Merged with legacy_format_refactor
Jan 14, 2015
244
if (s[0] === '-') {
245
return '-' + get_char_array(precision - s.length + 1, '0') + s.slice(1)
246
}
247
return get_char_array(precision - s.length, '0') + s
248
}
249
250
var format_float_precision = function(val, upper, flags, modifier) {
251
var precision = flags.precision
252
// val is a float
253
if (isFinite(val)) {
Fix bug with float formatting
Dec 22, 2016
254
return modifier(val, precision, flags, upper)
Merged with legacy_format_refactor
Jan 14, 2015
255
}
256
if (val === Infinity) {
257
val = 'inf'
258
} else if (val === -Infinity) {
259
val = '-inf'
260
} else {
261
val = 'nan'
262
}
263
if (upper) {
264
return val.toUpperCase()
265
}
266
return val
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
267
Merged with legacy_format_refactor
Jan 14, 2015
268
}
269
270
var format_sign = function(val, flags) {
271
if (flags.sign) {
272
if (val >= 0) {
273
return "+"
@PierreQuentel
First import
Sep 5, 2014
274
}
Merged with legacy_format_refactor
Jan 14, 2015
275
} else if (flags.space) {
276
if (val >= 0) {
277
return " "
278
}
279
}
280
return ""
281
}
@PierreQuentel
First import
Sep 5, 2014
282
Merged with legacy_format_refactor
Jan 14, 2015
283
var str_format = function(val, flags) {
284
// string format supports left and right padding
285
flags.pad_char = " " // even if 0 padding is defined, don't use it
286
return format_padding(str(val), flags)
287
}
@PierreQuentel
First import
Sep 5, 2014
288
Merged with legacy_format_refactor
Jan 14, 2015
289
var num_format = function(val, flags) {
290
number_check(val)
@earney
make string format compatible with long int
Jun 7, 2015
291
if (val.__class__ === $B.LongInt.$dict) {
292
val = $B.LongInt.$dict.to_base(val, 10)
293
} else {
294
val = parseInt(val)
295
}
296
Merged with legacy_format_refactor
Jan 14, 2015
297
var s = format_int_precision(val, flags)
298
if (flags.pad_char === '0') {
299
if (val < 0) {
300
s = s.substring(1)
301
return '-' + format_padding(s, flags, true)
302
}
303
var sign = format_sign(val, flags)
304
if (sign !== '') {
305
return sign + format_padding(s, flags, true)
306
}
307
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
308
Merged with legacy_format_refactor
Jan 14, 2015
309
return format_padding(format_sign(val, flags) + s, flags)
310
}
@PierreQuentel
First import
Sep 5, 2014
311
Merged with legacy_format_refactor
Jan 14, 2015
312
var repr_format = function(val, flags) {
313
flags.pad_char = " " // even if 0 padding is defined, don't use it
314
return format_padding(repr(val), flags)
315
}
@PierreQuentel
First import
Sep 5, 2014
316
Merged with legacy_format_refactor
Jan 14, 2015
317
var ascii_format = function(val, flags) {
318
flags.pad_char = " " // even if 0 padding is defined, don't use it
319
return format_padding(ascii(val), flags)
320
}
@PierreQuentel
First import
Sep 5, 2014
321
Set of minor bug fixes and improvements
Sep 11, 2017
322
// converts val to float and sets precision if missing
Merged with legacy_format_refactor
Jan 14, 2015
323
var _float_helper = function(val, flags) {
324
number_check(val)
325
if (!flags.precision) {
326
if (!flags.decimal_point) {
327
flags.precision = 6
328
} else {
329
flags.precision = 0
330
}
331
} else {
332
flags.precision = parseInt(flags.precision, 10)
333
validate_precision(flags.precision)
334
}
335
return parseFloat(val)
336
}
@PierreQuentel
First import
Sep 5, 2014
337
Merged with legacy_format_refactor
Jan 14, 2015
338
// used to capture and remove trailing zeroes
339
var trailing_zeros = /(.*?)(0+)([eE].*)/
340
var leading_zeros = /\.(0*)/
341
var trailing_dot = /\.$/
@PierreQuentel
First import
Sep 5, 2014
342
Merged with legacy_format_refactor
Jan 14, 2015
343
var validate_precision = function(precision) {
344
// force precision to limits of javascript
@PierreQuentel
Cleaning in py2js.js
Sep 20, 2015
345
if (precision > 20) { precision = 20 }
Merged with legacy_format_refactor
Jan 14, 2015
346
}
347
348
// gG
349
var floating_point_format = function(val, upper, flags) {
350
val = _float_helper(val, flags)
351
var v = val.toString()
352
var v_len = v.length
353
var dot_idx = v.indexOf('.')
354
if (dot_idx < 0) {
355
dot_idx = v_len
356
}
357
if (val < 1 && val > -1) {
358
var zeros = leading_zeros.exec(v)
359
var numzeros
360
if (zeros) {
361
numzeros = zeros[1].length
362
} else {
363
numzeros = 0
364
}
365
if (numzeros >= 4) {
366
val = format_sign(val, flags) + format_float_precision(val, upper, flags, _floating_g_exp_helper)
367
if (!flags.alternate) {
368
var trl = trailing_zeros.exec(val)
369
if (trl) {
370
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
371
}
Merged with legacy_format_refactor
Jan 14, 2015
372
} else {
373
if (flags.precision <= 1) {
374
val = val[0] + '.' + val.substring(1)
@PierreQuentel
Huge set of changes in core Brython scripts : new names and namespace…
Oct 8, 2014
375
}
Merged with legacy_format_refactor
Jan 14, 2015
376
}
377
return format_padding(val, flags)
378
}
Fix bug with float formatting
Dec 22, 2016
379
flags.precision = (flags.precision || 0) + numzeros
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
380
return format_padding(format_sign(val, flags) + format_float_precision(val, upper, flags,
Merged with legacy_format_refactor
Jan 14, 2015
381
function(val, precision) {
Fix bug with float formatting
Dec 22, 2016
382
return val.toFixed(min(precision, v_len - dot_idx) + numzeros)
Merged with legacy_format_refactor
Jan 14, 2015
383
}), flags)
384
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
385
Merged with legacy_format_refactor
Jan 14, 2015
386
if (dot_idx > flags.precision) {
387
val = format_sign(val, flags) + format_float_precision(val, upper, flags, _floating_g_exp_helper)
388
if (!flags.alternate) {
389
var trl = trailing_zeros.exec(val)
390
if (trl) {
391
val = trl[1].replace(trailing_dot, '') + trl[3] // remove trailing
392
}
393
} else {
394
if (flags.precision <= 1) {
395
val = val[0] + '.' + val.substring(1)
396
}
397
}
398
return format_padding(val, flags)
399
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
400
return format_padding(format_sign(val, flags) + format_float_precision(val, upper, flags,
Merged with legacy_format_refactor
Jan 14, 2015
401
function(val, precision) {
402
if (!flags.decimal_point) {
403
precision = min(v_len - 1, 6)
404
} else if (precision > v_len) {
405
if (!flags.alternate) {
406
precision = v_len
@PierreQuentel
First import
Sep 5, 2014
407
}
Merged with legacy_format_refactor
Jan 14, 2015
408
}
409
if (precision < dot_idx) {
410
precision = dot_idx
411
}
412
return val.toFixed(precision - dot_idx)
413
}), flags)
414
}
@PierreQuentel
First import
Sep 5, 2014
415
Merged with legacy_format_refactor
Jan 14, 2015
416
var _floating_g_exp_helper = function(val, precision, flags, upper) {
417
if (precision) {
418
--precision
419
}
420
val = val.toExponential(precision)
421
// pad exponent to two digits
422
var e_idx = val.lastIndexOf('e')
423
if (e_idx > val.length - 4) {
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
424
val = val.substring(0, e_idx + 2) + '0' + val.substring(e_idx + 2)
Merged with legacy_format_refactor
Jan 14, 2015
425
}
426
if (upper) {
427
return val.toUpperCase()
428
}
429
return val
430
}
431
432
// fF
433
var floating_point_decimal_format = function(val, upper, flags) {
434
val = _float_helper(val, flags)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
435
return format_padding(format_sign(val, flags) + format_float_precision(val, upper, flags,
Merged with legacy_format_refactor
Jan 14, 2015
436
function(val, precision, flags) {
437
val = val.toFixed(precision)
438
if (precision === 0 && flags.alternate) {
439
val += '.'
440
}
441
return val
442
}), flags)
443
}
444
445
var _floating_exp_helper = function(val, precision, flags, upper) {
446
val = val.toExponential(precision)
447
// pad exponent to two digits
448
var e_idx = val.lastIndexOf('e')
449
if (e_idx > val.length - 4) {
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
450
val = val.substring(0, e_idx + 2) + '0' + val.substring(e_idx + 2)
Merged with legacy_format_refactor
Jan 14, 2015
451
}
452
if (upper) {
453
return val.toUpperCase()
454
}
455
return val
456
}
457
458
// eE
459
var floating_point_exponential_format = function(val, upper, flags) {
460
val = _float_helper(val, flags)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
461
Merged with legacy_format_refactor
Jan 14, 2015
462
return format_padding(format_sign(val, flags) + format_float_precision(val, upper, flags, _floating_exp_helper), flags)
463
}
464
465
var signed_hex_format = function(val, upper, flags) {
@earney
make string format compatible with long int
Jun 7, 2015
466
var ret
Merged with legacy_format_refactor
Jan 14, 2015
467
number_check(val)
@earney
make string format compatible with long int
Jun 7, 2015
468
469
if (val.__class__ === $B.LongInt.$dict) {
470
ret=$B.LongInt.$dict.to_base(val, 16)
471
} else {
472
ret = parseInt(val)
473
ret = ret.toString(16)
474
}
Merged with legacy_format_refactor
Jan 14, 2015
475
ret = format_int_precision(ret, flags)
476
if (upper) {
477
ret = ret.toUpperCase()
478
}
479
if (flags.pad_char === '0') {
480
if (val < 0) {
481
ret = ret.substring(1)
482
ret = '-' + format_padding(ret, flags, true)
483
}
484
var sign = format_sign(val, flags)
485
if (sign !== '') {
486
ret = sign + format_padding(ret, flags, true)
@PierreQuentel
First import
Sep 5, 2014
487
}
Merged with legacy_format_refactor
Jan 14, 2015
488
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
489
Merged with legacy_format_refactor
Jan 14, 2015
490
if (flags.alternate) {
491
if (ret.charAt(0) === '-') {
492
if (upper) {
493
ret = "-0X" + ret.slice(1)
494
} else {
495
ret = "-0x" + ret.slice(1)
496
}
497
} else {
498
if (upper) {
499
ret = "0X" + ret
500
} else {
501
ret = "0x" + ret
502
}
503
}
504
}
505
return format_padding(format_sign(val, flags) + ret, flags)
506
}
@PierreQuentel
First import
Sep 5, 2014
507
Merged with legacy_format_refactor
Jan 14, 2015
508
var octal_format = function(val, flags) {
509
number_check(val)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
510
var ret
@earney
also long int octal string formatting....
Jun 7, 2015
511
512
if (val.__class__ === $B.LongInt.$dict) {
513
ret = $B.LongInt.$dict.to_base(8)
514
} else {
515
ret = parseInt(val)
516
ret = ret.toString(8)
517
}
518
Merged with legacy_format_refactor
Jan 14, 2015
519
ret = format_int_precision(ret, flags)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
520
Merged with legacy_format_refactor
Jan 14, 2015
521
if (flags.pad_char === '0') {
522
if (val < 0) {
523
ret = ret.substring(1)
524
ret = '-' + format_padding(ret, flags, true)
525
}
526
var sign = format_sign(val, flags)
527
if (sign !== '') {
528
ret = sign + format_padding(ret, flags, true)
529
}
@PierreQuentel
First import
Sep 5, 2014
530
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
531
Merged with legacy_format_refactor
Jan 14, 2015
532
if (flags.alternate) {
533
if (ret.charAt(0) === '-') {
534
ret = "-0o" + ret.slice(1)
535
} else {
536
ret = "0o" + ret
537
}
@PierreQuentel
First import
Sep 5, 2014
538
}
Merged with legacy_format_refactor
Jan 14, 2015
539
return format_padding(ret, flags)
540
}
541
542
var single_char_format = function(val, flags) {
543
if(isinstance(val,str) && val.length==1) return val
544
try {
Implement "int" as new-style class
Feb 10, 2018
545
val = _b_.int.$factory(val) // yes, floats are valid (they are cast to int)
Merged with legacy_format_refactor
Jan 14, 2015
546
} catch (err) {
Implement exceptions as new-style classes
Feb 10, 2018
547
throw _b_.TypeError.$factory('%c requires int or char')
Merged with legacy_format_refactor
Jan 14, 2015
548
}
549
return format_padding(chr(val), flags)
550
}
551
552
var num_flag = function(c, flags) {
553
if (c === '0' && !flags.padding && !flags.decimal_point && !flags.left) {
554
flags.pad_char = '0'
555
return
556
}
557
if (!flags.decimal_point) {
558
flags.padding = (flags.padding || "") + c
559
} else {
560
flags.precision = (flags.precision || "") + c
561
}
562
}
563
564
var decimal_point_flag = function(val, flags) {
565
if (flags.decimal_point) {
566
// can only have one decimal point
567
throw new UnsupportedChar()
568
}
569
flags.decimal_point = true
570
}
571
572
var neg_flag = function(val, flags) {
573
flags.pad_char = ' ' // overrides '0' flag
574
flags.left = true
575
}
576
577
var space_flag = function(val, flags) {
578
flags.space = true
579
}
580
581
var sign_flag = function(val, flags) {
582
flags.sign = true
583
}
584
585
var alternate_flag = function(val, flags) {
586
flags.alternate = true
587
}
588
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
589
var char_mapping = {
Merged with legacy_format_refactor
Jan 14, 2015
590
's': str_format,
591
'd': num_format,
592
'i': num_format,
593
'u': num_format,
594
'o': octal_format,
595
'r': repr_format,
596
'a': ascii_format,
597
'g': function(val, flags) {return floating_point_format(val, false, flags)},
598
'G': function(val, flags) {return floating_point_format(val, true, flags)},
599
'f': function(val, flags) {return floating_point_decimal_format(val, false, flags)},
600
'F': function(val, flags) {return floating_point_decimal_format(val, true, flags)},
601
'e': function(val, flags) {return floating_point_exponential_format(val, false, flags)},
602
'E': function(val, flags) {return floating_point_exponential_format(val, true, flags)},
603
'x': function(val, flags) {return signed_hex_format(val, false, flags)},
604
'X': function(val, flags) {return signed_hex_format(val, true, flags)},
605
'c': single_char_format,
606
'0': function(val, flags) {return num_flag('0', flags)},
607
'1': function(val, flags) {return num_flag('1', flags)},
608
'2': function(val, flags) {return num_flag('2', flags)},
609
'3': function(val, flags) {return num_flag('3', flags)},
610
'4': function(val, flags) {return num_flag('4', flags)},
611
'5': function(val, flags) {return num_flag('5', flags)},
612
'6': function(val, flags) {return num_flag('6', flags)},
613
'7': function(val, flags) {return num_flag('7', flags)},
614
'8': function(val, flags) {return num_flag('8', flags)},
615
'9': function(val, flags) {return num_flag('9', flags)},
616
'-': neg_flag,
617
' ': space_flag,
618
'+': sign_flag,
619
'.': decimal_point_flag,
620
'#': alternate_flag
621
}
622
623
// exception thrown when an unsupported char is encountered in legacy format
624
var UnsupportedChar = function() {
625
this.name = "UnsupportedChar"
626
}
627
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
628
$StringDict.__mod__ = function(self, args) {
Merged with legacy_format_refactor
Jan 14, 2015
629
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
630
var length = self.length,
631
pos = 0 |0,
632
argpos = null,
633
getitem
634
if (_b_.isinstance(args, _b_.tuple)) {
Merged with legacy_format_refactor
Jan 14, 2015
635
argpos = 0 |0
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
636
}else{
Implement exceptions as new-style classes
Feb 10, 2018
637
getitem = _b_.getattr(args,'__getitem__', _b_.None)
Merged with legacy_format_refactor
Jan 14, 2015
638
}
639
var ret = ''
640
var $get_kwarg_string = function(s) {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
641
// returns [self, newpos]
Merged with legacy_format_refactor
Jan 14, 2015
642
++pos
643
var rslt = kwarg_key.exec(s.substring(newpos))
644
if (!rslt) {
Implement exceptions as new-style classes
Feb 10, 2018
645
throw _b_.ValueError.$factory("incomplete format key")
Merged with legacy_format_refactor
Jan 14, 2015
646
}
647
var key = rslt[1]
648
newpos += rslt[0].length
649
try {
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
650
var self = getitem(key)
Merged with legacy_format_refactor
Jan 14, 2015
651
} catch(err) {
652
if (err.name === "KeyError") {
653
throw err
654
}
Implement exceptions as new-style classes
Feb 10, 2018
655
throw _b_.TypeError.$factory("format requires a mapping")
Merged with legacy_format_refactor
Jan 14, 2015
656
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
657
return get_string_value(s, self)
Merged with legacy_format_refactor
Jan 14, 2015
658
}
659
660
var $get_arg_string = function(s) {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
661
// returns [self, newpos]
662
var self
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
663
Merged with legacy_format_refactor
Jan 14, 2015
664
// non-tuple args
665
if (argpos === null) {
666
// args is the value
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
667
self = args
Merged with legacy_format_refactor
Jan 14, 2015
668
} else {
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
669
self = args[argpos++]
670
if(self===undefined){
Implement exceptions as new-style classes
Feb 10, 2018
671
throw _b_.TypeError.$factory("not enough arguments for format string")
@PierreQuentel
First import
Sep 5, 2014
672
}
673
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
674
return get_string_value(s, self)
Merged with legacy_format_refactor
Jan 14, 2015
675
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
676
var get_string_value = function(s, self) {
Merged with legacy_format_refactor
Jan 14, 2015
677
// todo: get flags, type
678
// todo: string value based on flags, type, value
679
var flags = {'pad_char': ' '}
680
do {
@PierreQuentel
Add a few "var" to remove names from global Javascript namespace
Feb 20, 2015
681
var func = char_mapping[s[newpos]]
Merged with legacy_format_refactor
Jan 14, 2015
682
try {
683
if (func === undefined) {
684
throw new UnsupportedChar()
685
} else {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
686
var ret = func(self, flags)
Merged with legacy_format_refactor
Jan 14, 2015
687
if (ret !== undefined) {
688
return ret
689
}
690
++newpos
691
}
692
} catch (err) {
693
if (err.name === "UnsupportedChar") {
694
invalid_char = s[newpos]
695
if (invalid_char === undefined) {
Implement exceptions as new-style classes
Feb 10, 2018
696
throw _b_.ValueError.$factory("incomplete format")
Merged with legacy_format_refactor
Jan 14, 2015
697
}
Implement exceptions as new-style classes
Feb 10, 2018
698
throw _b_.ValueError.$factory("unsupported format character '" + invalid_char +
Merged with legacy_format_refactor
Jan 14, 2015
699
"' (0x" + invalid_char.charCodeAt(0).toString(16) + ") at index " + newpos)
700
} else if (err.name === "NotANumber") {
701
var try_char = s[newpos]
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
702
var cls = self.__class__
Merged with legacy_format_refactor
Jan 14, 2015
703
if (!cls) {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
704
if (typeof(self) === 'string') {
Merged with legacy_format_refactor
Jan 14, 2015
705
cls = 'str'
706
} else {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
707
cls = typeof(self)
Merged with legacy_format_refactor
Jan 14, 2015
708
}
709
} else {
710
cls = cls.__name__
711
}
Implement exceptions as new-style classes
Feb 10, 2018
712
throw _b_.TypeError.$factory("%" + try_char + " format: a number is required, not " + cls)
Merged with legacy_format_refactor
Jan 14, 2015
713
} else {
714
throw err
715
}
@PierreQuentel
First import
Sep 5, 2014
716
}
Merged with legacy_format_refactor
Jan 14, 2015
717
} while (true)
@PierreQuentel
First import
Sep 5, 2014
718
}
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
719
var nbph = 0 // number of placeholders
Merged with legacy_format_refactor
Jan 14, 2015
720
do {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
721
var newpos = self.indexOf('%', pos)
Merged with legacy_format_refactor
Jan 14, 2015
722
if (newpos < 0) {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
723
ret += self.substring(pos)
Merged with legacy_format_refactor
Jan 14, 2015
724
break
725
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
726
ret += self.substring(pos, newpos)
Merged with legacy_format_refactor
Jan 14, 2015
727
++newpos
728
if (newpos < length) {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
729
if (self[newpos] === '%') {
Merged with legacy_format_refactor
Jan 14, 2015
730
ret += '%'
731
} else {
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
732
nbph++
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
733
if (self[newpos] === '(') {
Merged with legacy_format_refactor
Jan 14, 2015
734
++newpos
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
735
ret += $get_kwarg_string(self)
Merged with legacy_format_refactor
Jan 14, 2015
736
} else {
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
737
ret += $get_arg_string(self)
Merged with legacy_format_refactor
Jan 14, 2015
738
}
739
}
740
} else {
741
// % at end of string
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
}
744
pos = newpos + 1
745
} while (pos < length)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
746
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
747
if(argpos!==null){
748
if(args.length>argpos){
Implement exceptions as new-style classes
Feb 10, 2018
749
throw _b_.TypeError.$factory('not enough arguments for format string')
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
750
}else if(args.length<argpos){
Implement exceptions as new-style classes
Feb 10, 2018
751
throw _b_.TypeError.$factory('not all arguments converted during string formatting')
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
752
}
753
}else if(nbph==0){
Implement exceptions as new-style classes
Feb 10, 2018
754
throw _b_.TypeError.$factory('not all arguments converted during string formatting')
Fixes #375 : "Old style" string formatting misses error case
Feb 9, 2016
755
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
756
return ret
Merged with legacy_format_refactor
Jan 14, 2015
757
}
@PierreQuentel
First import
Sep 5, 2014
758
Implement "object" as a new-style class. $B.make_class also returns a…
Feb 10, 2018
759
$StringDict.__mro__ = [object]
@PierreQuentel
First import
Sep 5, 2014
760
Clean up scripts, based on uglifyjs warnings
Oct 8, 2016
761
$StringDict.__mul__ = function(){
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
762
var $=$B.args('__mul__',2,{self:null,other:null},['self','other'],
763
arguments,{},null,null)
Implement exceptions as new-style classes
Feb 10, 2018
764
if(!isinstance($.other,_b_.int)){throw _b_.TypeError.$factory(
@PierreQuentel
First import
Sep 5, 2014
765
"Can't multiply sequence by non-int of type '"+
Clean up scripts, based on uglifyjs warnings
Oct 8, 2016
766
$B.get_class($.other).__name__+"'")}
Add many "var" to avoid global JS namespace pollution
Sep 30, 2016
767
var $res = ''
Clean up scripts, based on uglifyjs warnings
Oct 8, 2016
768
for(var i=0;i<$.other;i++){$res+=$.self.valueOf()}
@PierreQuentel
First import
Sep 5, 2014
769
return $res
770
}
771
772
$StringDict.__ne__ = function(self,other){return other!==self.valueOf()}
773
774
$StringDict.__repr__ = function(self){
@PierreQuentel
Fixes #260 : string.format() issues
Aug 28, 2015
775
var res = self.replace(/\n/g,'\\\\n')
776
// escape the escape char
777
res = res.replace(/\\/g, '\\\\')
778
if(res.search('"')==-1 && res.search("'")==-1){
779
return "'"+res+"'"
@PierreQuentel
Change str.__repr__
May 19, 2015
780
}else if(self.search('"')==-1){
@PierreQuentel
Fixes #260 : string.format() issues
Aug 28, 2015
781
return '"'+res+'"'
@PierreQuentel
Change str.__repr__
May 19, 2015
782
}
@PierreQuentel
First import
Sep 5, 2014
783
var qesc = new RegExp("'","g") // to escape single quote
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
784
res = "'"+res.replace(qesc,"\\'")+"'"
@PierreQuentel
First import
Sep 5, 2014
785
return res
786
}
787
788
$StringDict.__setitem__ = function(self,attr,value){
Implement exceptions as new-style classes
Feb 10, 2018
789
throw _b_.TypeError.$factory("'str' object does not support item assignment")
@PierreQuentel
First import
Sep 5, 2014
790
}
791
$StringDict.__str__ = function(self){
792
if(self===undefined) return "<class 'str'>"
793
return self.toString()
794
}
795
$StringDict.toString = function(){return 'string!'}
796
797
// generate comparison methods
798
var $comp_func = function(self,other){
Implement exceptions as new-style classes
Feb 10, 2018
799
if(typeof other !=="string"){throw _b_.TypeError.$factory(
@PierreQuentel
First import
Sep 5, 2014
800
"unorderable types: 'str' > "+$B.get_class(other).__name__+"()")}
801
return self > other
802
}
803
$comp_func += '' // source code
804
var $comps = {'>':'gt','>=':'ge','<':'lt','<=':'le'}
805
for(var $op in $comps){
806
eval("$StringDict.__"+$comps[$op]+'__ = '+$comp_func.replace(/>/gm,$op))
807
}
808
809
// add "reflected" methods
810
$B.make_rmethods($StringDict)
811
812
// unsupported operations
813
var $notimplemented = function(self,other){
Implement exceptions as new-style classes
Feb 10, 2018
814
throw NotImplementedError.$factory("OPERATOR not implemented for class str")
@PierreQuentel
First import
Sep 5, 2014
815
}
816
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
817
// Copy static methods from unicode
818
var from_unicode = [
819
"title",
820
"capitalize",
821
"casefold",
822
"islower",
823
"isupper",
824
"istitle",
825
"isspace",
826
"isalpha",
827
"isalnum",
828
"isdecimal",
829
"isdigit",
830
"isnumeric",
831
"isidentifier",
832
"isprintable",
833
"lower",
834
"swapcase",
835
"upper"
836
]
837
for(var i=0;i<from_unicode.length;i++){
838
var name = from_unicode[i]
839
$StringDict[name] = unicode[name]
840
}
@PierreQuentel
First import
Sep 5, 2014
841
842
$StringDict.center = function(self,width,fillchar){
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
843
var $=$B.args("center",3,
844
{self:null, width:null, fillchar:null},
845
['self', 'width', 'fillchar'],
846
arguments,{fillchar:' '},null,null)
847
848
if($.width<=self.length) return self
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
849
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
850
var pad = parseInt(($.width-self.length)/2)
851
var res = $.fillchar.repeat(pad)
@PierreQuentel
First import
Sep 5, 2014
852
res += self + res
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
853
if(res.length<$.width){res += $.fillchar}
@PierreQuentel
First import
Sep 5, 2014
854
return res
855
}
856
@PierreQuentel
Fixes #287 : s.count with an optional start parameter
Sep 14, 2015
857
$StringDict.count = function(){
858
var $ = $B.args('count', 4, {self:null, sub:null, start:null, stop:null},
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
859
['self', 'sub', 'start', 'stop'], arguments, {start:null, stop:null},
@PierreQuentel
Fixes #287 : s.count with an optional start parameter
Sep 14, 2015
860
null, null)
Implement exceptions as new-style classes
Feb 10, 2018
861
if(!(typeof $.sub==="string")){throw _b_.TypeError.$factory(
@PierreQuentel
Fix bug in str.count()
Sep 15, 2015
862
"Can't convert '"+$B.get_class($.sub).__name__+"' object to str implicitly")}
@PierreQuentel
Rewrite str.count ; passes the tests in Lib/test/string_tests
Sep 15, 2015
863
var substr = $.self
864
if($.start!==null){
865
var _slice
866
if($.stop!==null){_slice = _b_.slice($.start, $.stop)}
867
else{_slice = _b_.slice($.start,$.self.length)}
868
substr = $StringDict.__getitem__.apply(null, [$.self].concat(_slice))
869
}else{
870
if($.self.length+$.sub.length==0){return 1} // ''.count('') = 1
871
}
872
if($.sub.length==0){
873
if($.start==$.self.length){return 1} // 'aaa'.count('',3) = 1
874
else if(substr.length==0){return 0} // 'aaa'.count('',4) = 0
875
return substr.length+1
876
}
877
var n=0, pos=0
878
while(pos<substr.length){
879
pos=substr.indexOf($.sub,pos)
@PierreQuentel
Fixes #287 : s.count with an optional start parameter
Sep 14, 2015
880
if(pos>=0){ n++; pos+=$.sub.length} else break;
@PierreQuentel
First import
Sep 5, 2014
881
}
882
return n
883
}
884
885
$StringDict.encode = function(self, encoding) {
886
if (encoding === undefined) encoding='utf-8'
@PierreQuentel
Fixes #159 : [codecs] ROT13 cant encode
Apr 22, 2015
887
if(encoding=='rot13' || encoding=='rot_13'){
888
// Special case : returns a string
889
var res = ''
890
for(var i=0, _len = self.length; i<_len ; i++){
891
var char = self.charAt(i)
892
if(('a'<=char && char<='m') || ('A'<=char && char<='M')){
893
res += String.fromCharCode(String.charCodeAt(char)+13)
894
}else if(('m'<char && char<='z') || ('M'<char && char<='Z')){
895
res += String.fromCharCode(String.charCodeAt(char)-13)
896
}else{res += char}
897
}
898
return res
899
}
Implement bytes and bytearray as "new style" classes
Feb 9, 2018
900
return _b_.bytes.$factory(self, encoding)
@PierreQuentel
First import
Sep 5, 2014
901
}
902
@PierreQuentel
Cleaning in py2js.js
Sep 20, 2015
903
$StringDict.endswith = function(){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
904
// Return True if the string ends with the specified suffix, otherwise
905
// return False. suffix can also be a tuple of suffixes to look for.
906
// With optional start, test beginning at that position. With optional
@PierreQuentel
First import
Sep 5, 2014
907
// end, stop comparing at that position.
@PierreQuentel
Cleaning in py2js.js
Sep 20, 2015
908
var $=$B.args("endswith",4,
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
909
{self:null, suffix:null, start:null, end:null},
@PierreQuentel
Remove function $MakeArgs in py_utils.js, replace it in all scripts b…
Jul 5, 2015
910
['self', 'suffix', 'start', 'end'],
@PierreQuentel
Cleaning in py2js.js
Sep 20, 2015
911
arguments,{start:0, end:null},null,null)
912
913
normalize_start_end($)
914
915
var suffixes = $.suffix
@PierreQuentel
First import
Sep 5, 2014
916
if(!isinstance(suffixes,_b_.tuple)){suffixes=[suffixes]}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
917
@PierreQuentel
Cleaning in py2js.js
Sep 20, 2015
918
var s = $.self.substring($.start,$.end)
Updated to latest copy of the repo
Jan 1, 2015
919
for(var i=0, _len_i = suffixes.length; i < _len_i;i++){
Add many "var" to avoid global JS namespace pollution
Sep 30, 2016
920
var suffix = suffixes[i]
Implement exceptions as new-style classes
Feb 10, 2018
921
if(!_b_.isinstance(suffix, str)){throw _b_.TypeError.$factory(
@PierreQuentel
Cleaning in py2js.js
Sep 20, 2015
922
"endswith first arg must be str or a tuple of str, not int")}
@PierreQuentel
First import
Sep 5, 2014
923
if(suffix.length<=s.length &&
924
s.substr(s.length-suffix.length)==suffix) return true
925
}
926
return false
927
}
928
929
$StringDict.expandtabs = function(self, tabsize) {
@PierreQuentel
Rewrite str.expandtabs() - passes tests in Lib/test/string_tests.py
Sep 15, 2015
930
var $ = $B.args('expandtabs', 2, {self:null, tabsize:null},
931
['self', 'tabsize'], arguments, {tabsize:8}, null, null)
932
var s=$B.$GetInt($.tabsize), col=0,pos=0,res=''
933
if(s==1){return self.replace(/\t/g,' ')}
934
while(pos<self.length){
935
var car = self.charAt(pos)
936
switch(car){
937
case '\t':
938
while(col%s > 0){res += ' ';col++}
939
break
940
case '\r':
941
case '\n':
942
res += car
943
col = 0
944
break
945
default:
946
res += car
947
col++
948
break
949
}
950
pos++
951
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
952
@PierreQuentel
Rewrite str.expandtabs() - passes tests in Lib/test/string_tests.py
Sep 15, 2015
953
return res
@PierreQuentel
First import
Sep 5, 2014
954
}
955
@PierreQuentel
Rewrite str.find. Fixes #290 : "a".find("\\") crashes. Passes tests i…
Sep 18, 2015
956
$StringDict.find = function(){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
957
// Return the lowest index in the string where substring sub is found,
958
// such that sub is contained in the slice s[start:end]. Optional
959
// arguments start and end are interpreted as in slice notation.
@PierreQuentel
First import
Sep 5, 2014
960
// Return -1 if sub is not found.
@PierreQuentel
Rewrite str.find. Fixes #290 : "a".find("\\") crashes. Passes tests i…
Sep 18, 2015
961
var $=$B.args("$StringDict.find",4,
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
962
{self:null, sub:null, start:null, end:null},
@PierreQuentel
Remove function $MakeArgs in py_utils.js, replace it in all scripts b…
Jul 5, 2015
963
['self', 'sub', 'start','end'],
@PierreQuentel
Rewrite str.find. Fixes #290 : "a".find("\\") crashes. Passes tests i…
Sep 18, 2015
964
arguments,{start:0,end:null},null,null)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
965
check_str($.sub)
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
966
normalize_start_end($)
967
@PierreQuentel
Rewrite str.find. Fixes #290 : "a".find("\\") crashes. Passes tests i…
Sep 18, 2015
968
if(!isinstance($.start,_b_.int)||!isinstance($.end,_b_.int)){
Implement exceptions as new-style classes
Feb 10, 2018
969
throw _b_.TypeError.$factory(
@PierreQuentel
First import
Sep 5, 2014
970
"slice indices must be integers or None or have an __index__ method")}
@PierreQuentel
Rewrite str.find. Fixes #290 : "a".find("\\") crashes. Passes tests i…
Sep 18, 2015
971
var s = $.self.substring($.start,$.end)
972
973
if($.sub.length==0 && $.start==$.self.length){return $.self.length}
974
if(s.length+$.sub.length==0){return -1}
975
976
var last_search = s.length-$.sub.length
977
for(var i=0;i<=last_search;i++){
978
if(s.substr(i, $.sub.length)==$.sub){return $.start+i}
@PierreQuentel
First import
Sep 5, 2014
979
}
@PierreQuentel
Rewrite str.find. Fixes #290 : "a".find("\\") crashes. Passes tests i…
Sep 18, 2015
980
return -1
@PierreQuentel
First import
Sep 5, 2014
981
}
982
@PierreQuentel
Fixes #260 : string.format() issues
Aug 28, 2015
983
// Next function used by method .format()
984
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
985
function parse_format(fmt_string){
@PierreQuentel
First import
Sep 5, 2014
986
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
987
// Parse a "format string", as described in the Python documentation
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
988
// Return a format object. For the format string
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
989
// a.x[z]!r:...
990
// the object has attributes :
991
// - name : "a"
992
// - name_ext : [".x", "[z]"]
993
// - conv : r
994
// - spec : rest of string after :
@PierreQuentel
First import
Sep 5, 2014
995
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
996
var elts = fmt_string.split(':'), name, conv, spec, name_ext=[]
997
if(elts.length==1){
998
// No : in the string : it only contains a name
999
name = fmt_string
1000
}else{
1001
// name is before the first ":"
1002
// spec (the format specification) is after
1003
name = elts[0]
1004
spec = elts.splice(1).join(':')
1005
}
1006
1007
var elts = name.split('!')
1008
if(elts.length>1){
1009
name=elts[0]
1010
conv=elts[1] // conversion flag
1011
if(conv.length!==1 || 'ras'.search(conv)==-1){
Implement exceptions as new-style classes
Feb 10, 2018
1012
throw _b_.ValueError.$factory('wrong conversion flag '+conv)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1013
}
1014
}
@PierreQuentel
First import
Sep 5, 2014
1015
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1016
if(name!==undefined){
1017
// "name' may be a subscription or attribute
1018
// Put these "extensions" in the list "name_ext"
1019
function name_repl(match){
1020
name_ext.push(match)
1021
return ''
1022
}
1023
var name_ext_re = /\.[_a-zA-Z][_a-zA-Z0-9]*|\[[_a-zA-Z][_a-zA-Z0-9]*\]|\[[0-9]+\]/g
1024
name = name.replace(name_ext_re, name_repl)
1025
}
@PierreQuentel
First import
Sep 5, 2014
1026
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1027
return {name: name, name_ext: name_ext,
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1028
conv: conv, spec: spec||''}
1029
}
@PierreQuentel
First import
Sep 5, 2014
1030
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1031
$StringDict.format = function(self) {
@PierreQuentel
Rename __BRYTHON__.$MakeArgs1() to __BRYTHON__.args()
Sep 10, 2015
1032
var $ = $B.args('format', 1, {self:null}, ['self'],
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1033
arguments, {}, '$args', '$kw')
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1034
1035
// Parse self to detect formatting instructions
1036
// Create a list "parts" made of sections of the string :
1037
// - elements of even rank are literal text
1038
// - elements of odd rank are "format objects", built from the
1039
// format strings in self (of the form {...})
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1040
var pos=0,
1041
_len=self.length,
1042
car,
1043
text='',
1044
parts=[],
Clean up scripts, based on uglifyjs warnings
Oct 8, 2016
1045
rank=0
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1046
while(pos<_len){
1047
car = self.charAt(pos)
1048
if(car=='{' && self.charAt(pos+1)=='{'){
1049
// replace {{ by literal {
1050
text += '{'
1051
pos+=2
1052
}else if(car=='}' && self.charAt(pos+1)=='}'){
1053
// replace }} by literal }
1054
text += '}'
1055
pos+=2
1056
}else if(car=='{'){
1057
// Start of a format string
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1058
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1059
// Store current literal text
1060
parts.push(text)
1061
1062
// Search the end of the format string, ie the } closing the
1063
// opening {. Since the string can contain other pairs {} for
1064
// nested formatting, an integer nb is incremented for each { and
1065
// decremented for each } ; the end of the format string is
1066
// reached when nb==0
1067
var end = pos+1, nb=1
1068
while(end<_len){
1069
if(self.charAt(end)=='{'){nb++;end++}
1070
else if(self.charAt(end)=='}'){
1071
nb--;end++
1072
if(nb==0){
1073
// End of format string
1074
var fmt_string = self.substring(pos+1, end-1)
1075
1076
// Create a format object, by function parse_format
1077
var fmt_obj = parse_format(fmt_string)
1078
1079
// If no name is explicitely provided, use the rank
1080
if(!fmt_obj.name){
1081
fmt_obj.name=rank+''
1082
rank++
1083
}
@PierreQuentel
First import
Sep 5, 2014
1084
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
1085
if(fmt_obj.spec!==undefined){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1086
// "spec" may contain "nested replacement fields"
Fixes #303 : string formatting with floating point, variable number o…
Dec 3, 2015
1087
// In this case, evaluate them using the positional
1088
// or keyword arguments passed to format()
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1089
function replace_nested(name, key){
Fixes #303 : string formatting with floating point, variable number o…
Dec 3, 2015
1090
if(/\d+/.exec(key)){
1091
// If key is numeric, search in positional
1092
// arguments
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1093
return _b_.tuple.$dict.__getitem__($.$args,
Fixes #303 : string formatting with floating point, variable number o…
Dec 3, 2015
1094
parseInt(key))
1095
}else{
1096
// Else try in keyword arguments
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1097
return _b_.dict.$dict.__getitem__($.$kw, key)
Fixes #303 : string formatting with floating point, variable number o…
Dec 3, 2015
1098
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1099
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1100
fmt_obj.spec = fmt_obj.spec.replace(/\{(.+?)\}/g,
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1101
replace_nested)
1102
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1103
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1104
// Store format object in list "parts"
1105
parts.push(fmt_obj)
1106
text = ''
1107
break
1108
}
1109
}else{end++}
@PierreQuentel
First import
Sep 5, 2014
1110
}
Implement exceptions as new-style classes
Feb 10, 2018
1111
if(nb>0){throw ValueError.$factory("wrong format "+self)}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1112
pos = end
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1113
}else{text += car;pos++;}
@PierreQuentel
First import
Sep 5, 2014
1114
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1115
if(text){parts.push(text)}
1116
// Apply formatting to the values passed to format()
1117
var res = '', fmt
1118
for(var i=0;i<parts.length;i++){
1119
// Literal text is added unchanged
1120
if(typeof parts[i]=='string'){res += parts[i];continue}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1121
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1122
// Format objects
1123
fmt = parts[i]
1124
if(fmt.name.charAt(0).search(/\d/)>-1){
1125
// Numerical reference : use positional arguments
1126
var pos = parseInt(fmt.name),
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1127
value = _b_.tuple.$dict.__getitem__($.$args, pos)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1128
}else{
1129
// Use keyword arguments
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1130
var value = _b_.dict.$dict.__getitem__($.$kw, fmt.name)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1131
}
1132
// If name has extensions (attributes or subscriptions)
1133
for(var j=0;j<fmt.name_ext.length;j++){
1134
var ext = fmt.name_ext[j]
1135
if(ext.charAt(0)=='.'){
1136
// Attribute
1137
value = _b_.getattr(value, ext.substr(1))
1138
}else{
1139
// Subscription
1140
var key = ext.substr(1, ext.length-2)
1141
// An index made of digits is transformed into an integer
1142
if(key.charAt(0).search(/\d/)>-1){key = parseInt(key)}
1143
value = _b_.getattr(value, '__getitem__')(key)
1144
}
1145
}
Support old-style and new-style classes.
Feb 9, 2018
1146
// XXX temporary
1147
value = value.__class__ === $B.$factory ? value.$dict : value
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1148
// If the conversion flag is set, first call a function to convert
1149
// the value
1150
if(fmt.conv=='a'){value = _b_.ascii(value)}
1151
else if(fmt.conv=='r'){value = _b_.repr(value)}
1152
else if(fmt.conv=='s'){value = _b_.str(value)}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1153
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1154
// Call attribute __format__ to perform the actual formatting
Support old-style and new-style classes.
Feb 9, 2018
1155
if(value.$is_class || value.$factory){
Fixes #755 : string format problem with classes
Jan 8, 2018
1156
// For classes, don't use the class __format__ method
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1157
res += value.__class__.__format__(value, fmt.spec)
Fixes #755 : string format problem with classes
Jan 8, 2018
1158
}else{
1159
res += _b_.getattr(value, '__format__')(fmt.spec)
1160
}
@PierreQuentel
First import
Sep 5, 2014
1161
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1162
return res
@PierreQuentel
First import
Sep 5, 2014
1163
}
1164
1165
$StringDict.format_map = function(self) {
Implement exceptions as new-style classes
Feb 10, 2018
1166
throw NotImplementedError.$factory("function format_map not implemented yet");
@PierreQuentel
First import
Sep 5, 2014
1167
}
1168
1169
$StringDict.index = function(self){
1170
// Like find(), but raise ValueError when the substring is not found.
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1171
var res = $StringDict.find.apply(null,arguments)
Implement exceptions as new-style classes
Feb 10, 2018
1172
if(res===-1) throw _b_.ValueError.$factory("substring not found")
@PierreQuentel
First import
Sep 5, 2014
1173
return res
1174
}
1175
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1176
$StringDict.join = function(){
1177
var $=$B.args('join',2,{self:null,iterable:null},
1178
['self', 'iterable'], arguments, {}, null, null)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1179
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1180
var iterable=_b_.iter($.iterable)
Restore current exception when internal code expects to raise another…
Dec 28, 2017
1181
var res = [],
1182
count=0,
1183
ce = $B.current_exception
@PierreQuentel
First import
Sep 5, 2014
1184
while(1){
1185
try{
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1186
var obj2 = _b_.next(iterable)
Implement exceptions as new-style classes
Feb 10, 2018
1187
if(!isinstance(obj2,str)){throw _b_.TypeError.$factory(
@PierreQuentel
First import
Sep 5, 2014
1188
"sequence item "+count+": expected str instance, "+$B.get_class(obj2).__name__+" found")}
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1189
res.push(obj2)
@PierreQuentel
First import
Sep 5, 2014
1190
}catch(err){
Restore current exception when internal code expects to raise another…
Dec 28, 2017
1191
if(_b_.isinstance(err, _b_.StopIteration)){
1192
$B.current_exception = ce
1193
break
1194
}
@PierreQuentel
First import
Sep 5, 2014
1195
else{throw err}
1196
}
1197
}
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1198
return res.join($.self)
@PierreQuentel
First import
Sep 5, 2014
1199
}
1200
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1201
$StringDict.ljust = function(self) {
1202
var $=$B.args('ljust',3,{self:null,width:null,fillchar:null},
1203
['self','width','fillchar'],arguments,{fillchar:' '},null,null)
1204
1205
if ($.width <= self.length) return self
1206
return self + $.fillchar.repeat($.width - self.length)
@PierreQuentel
First import
Sep 5, 2014
1207
}
1208
1209
$StringDict.lstrip = function(self,x){
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1210
var $=$B.args('lstrip',2,{self:null,chars:null},['self','chars'],
1211
arguments,{chars:_b_.None},null,null)
@jonathanverner
Fix strip handling of bracket character (GH Issue #521).
Nov 2, 2016
1212
if($.chars===_b_.None){return $.self.trimLeft()}
1213
for (var i = 0; i < $.self.length; i++) {
1214
if ($.chars.indexOf($.self.charAt(i)) === -1) {
1215
return $.self.substring(i);
1216
}
1217
}
1218
return '';
@PierreQuentel
First import
Sep 5, 2014
1219
}
1220
1221
// note, maketrans should be a static function.
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1222
$StringDict.maketrans = function() {
1223
var $ = $B.args('maketrans', 3, {x:null,y:null,z:null},['x','y','z'],
1224
arguments, {y:null, z:null}, null, null)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1225
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1226
var _t=_b_.dict()
1227
// make 'default' translate table
1228
for(var i=0; i < 256; i++) _t.$numeric_dict[i]=i
1229
1230
if($.y===null && $.z===null){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1231
// If there is only one argument, it must be a dictionary mapping
1232
// Unicode ordinals (integers) or characters (strings of length 1) to
1233
// Unicode ordinals, strings (of arbitrary lengths) or None. Character
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1234
// keys will then be converted to ordinals.
1235
if(!_b_.isinstance($.x, _b_.dict)){
Implement exceptions as new-style classes
Feb 10, 2018
1236
throw _b_.TypeError.$factory('maketrans only argument must be a dict')
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1237
}
1238
var items = _b_.list(_b_.dict.$dict.items($.x))
1239
for(var i=0, len=items.length;i<len;i++){
1240
var k = items[i][0], v=items[i][1]
1241
if(!_b_.isinstance(k, _b_.int)){
1242
if(_b_.isinstance(k, _b_.str) && k.length==1){k = _b_.ord(k)}
Implement exceptions as new-style classes
Feb 10, 2018
1243
else{throw _b_.TypeError.$factory("dictionary key "+k+
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1244
" is not int or 1-char string")}
1245
}
1246
if(v!==_b_.None && !_b_.isinstance(v, [_b_.int, _b_.str])){
Implement exceptions as new-style classes
Feb 10, 2018
1247
throw _b_.TypeError.$factory("dictionary value "+v+
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1248
" is not None, integer or string")
1249
}
1250
_t.$numeric_dict[k] = v
1251
}
1252
return _t
1253
}else{
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1254
// If there are two arguments, they must be strings of equal length,
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1255
// and in the resulting dictionary, each character in x will be mapped
1256
// to the character at the same position in y
1257
if(!(_b_.isinstance($.x, _b_.str) && _b_.isinstance($.y, _b_.str))){
Implement exceptions as new-style classes
Feb 10, 2018
1258
throw _b_.TypeError.$factory("maketrans arguments must be strings")
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1259
}else if($.x.length!==$.y.length){
Implement exceptions as new-style classes
Feb 10, 2018
1260
throw _b_.TypeError.$factory("maketrans arguments must be strings or same length")
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1261
}else{
1262
var toNone = {}
1263
if($.z!==null){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1264
// If there is a third argument, it must be a string, whose
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1265
// characters will be mapped to None in the result
1266
if(!_b_.isinstance($.z, _b_.str)){
Implement exceptions as new-style classes
Feb 10, 2018
1267
throw _b_.TypeError.$factory('maketrans third argument must be a string')
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1268
}
1269
for(var i=0,len=$.z.length;i<len;i++){
1270
toNone[_b_.ord($.z.charAt(i))] = true
1271
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1272
}
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1273
for(var i=0,len=$.x.length;i<len;i++){
1274
_t.$numeric_dict[_b_.ord($.x.charAt(i))] = _b_.ord($.y.charAt(i))
1275
}
1276
for(var k in toNone){
1277
_t.$numeric_dict[k] = _b_.None
1278
}
1279
return _t
1280
}
1281
}
@PierreQuentel
First import
Sep 5, 2014
1282
}
1283
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1284
$StringDict.partition = function() {
1285
var $=$B.args('partition',2,{self:null,sep:null},['self','sep'],
1286
arguments,{},null,null)
Implement exceptions as new-style classes
Feb 10, 2018
1287
if($.sep==''){throw _b_.ValueError.$factory('empty separator')}
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1288
check_str($.sep)
1289
var i=$.self.indexOf($.sep)
1290
if (i== -1) return _b_.tuple([$.self, '', ''])
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1291
return _b_.tuple([$.self.substring(0,i), $.sep,
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1292
$.self.substring(i+$.sep.length)])
@PierreQuentel
First import
Sep 5, 2014
1293
}
1294
1295
function $re_escape(str)
1296
{
1297
var specials = "[.*+?|()$^"
Updated to latest copy of the repo
Jan 1, 2015
1298
for(var i=0, _len_i = specials.length; i < _len_i;i++){
@PierreQuentel
First import
Sep 5, 2014
1299
var re = new RegExp('\\'+specials.charAt(i),'g')
1300
str = str.replace(re, "\\"+specials.charAt(i))
1301
}
1302
return str
1303
}
1304
Updated to latest copy of the repo
Jan 1, 2015
1305
$StringDict.replace = function(self, old, _new, count) {
1306
// Replaces occurrences of 'old' by '_new'. Count references
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1307
// the number of times to replace. In CPython, negative or undefined
Updated to latest copy of the repo
Jan 1, 2015
1308
// values of count means replace all.
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1309
var $ = $B.args('replace', 4, {self:null,old:null,$$new:null,count:null},
1310
['self','old','$$new','count'], arguments, {count:-1},null,null),
1311
count=$.count,self=$.self,old=$.old,_new=$.$$new
@PierreQuentel
Fixes bugs with str.replace()
Sep 18, 2015
1312
// Validate type of old
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1313
check_str(old)
1314
check_str(_new)
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1315
// Validate instance type of 'count'
1316
if (!isinstance(count,[_b_.int,_b_.float])) {
Implement exceptions as new-style classes
Feb 10, 2018
1317
throw _b_.TypeError.$factory("'" + $B.get_class(count).__name__ +
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1318
"' object cannot be interpreted as an integer");
1319
} else if (isinstance(count, _b_.float)) {
Implement exceptions as new-style classes
Feb 10, 2018
1320
throw _b_.TypeError.$factory("integer argument expected, got float");
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1321
}
1322
if(count==0){return self}
1323
if(count.__class__==$B.LongInt.$dict){count=parseInt(count.value)}
1324
if(old==''){
1325
if(_new==''){return self}
1326
if(self==''){return _new}
1327
var elts=self.split('')
1328
if(count>-1 && elts.length>=count){
1329
var rest = elts.slice(count).join('')
1330
return _new+elts.slice(0, count).join(_new)+rest
1331
}else{return _new+elts.join(_new)+_new}
1332
}else{
1333
var elts = $StringDict.split(self,old,count)
@PierreQuentel
First import
Sep 5, 2014
1334
}
Updated to latest copy of the repo
Jan 1, 2015
1335
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1336
var res = self, pos = -1
1337
if(old.length==0){
1338
var res = _new
1339
for(var i=0;i<elts.length;i++){
1340
res += elts[i]+_new
1341
}
1342
return res+rest
1343
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1344
Updated to latest copy of the repo
Jan 1, 2015
1345
if (count < 0) count = res.length;
1346
while (count > 0) {
1347
pos = res.indexOf(old, pos);
1348
if (pos < 0)
1349
break;
1350
res = res.substr(0, pos) + _new + res.substr(pos + old.length);
1351
pos = pos + _new.length;
1352
count--;
1353
}
1354
return res;
@PierreQuentel
First import
Sep 5, 2014
1355
}
1356
1357
$StringDict.rfind = function(self){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1358
// Return the highest index in the string where substring sub is found,
1359
// such that sub is contained within s[start:end]. Optional arguments
@PierreQuentel
First import
Sep 5, 2014
1360
// start and end are interpreted as in slice notation. Return -1 on failure.
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1361
var $=$B.args("rfind",4,
@PierreQuentel
Remove function $MakeArgs in py_utils.js, replace it in all scripts b…
Jul 5, 2015
1362
{self:null, sub:null, start:null, end:null},
1363
['self', 'sub', 'start', 'end'],
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1364
arguments,{start:0, end:null},null,null)
@PierreQuentel
First import
Sep 5, 2014
1365
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1366
normalize_start_end($)
1367
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1368
check_str($.sub)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1369
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1370
if($.sub.length==0){
1371
if($.start>$.self.length){return -1}
1372
else{return $.self.length}
1373
}
1374
var sublen = $.sub.length
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1375
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1376
for(var i=$.end-sublen;i>=$.start;i--){
1377
if($.self.substr(i, sublen)==$.sub){return i}
1378
}
1379
return -1
@PierreQuentel
First import
Sep 5, 2014
1380
}
1381
1382
$StringDict.rindex = function(){
1383
// Like rfind() but raises ValueError when the substring sub is not found
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1384
var res = $StringDict.rfind.apply(null,arguments)
Implement exceptions as new-style classes
Feb 10, 2018
1385
if(res==-1){throw _b_.ValueError.$factory("substring not found")}
@PierreQuentel
First import
Sep 5, 2014
1386
return res
1387
}
1388
1389
$StringDict.rjust = function(self) {
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1390
var $=$B.args("rjust",3,
@PierreQuentel
Remove function $MakeArgs in py_utils.js, replace it in all scripts b…
Jul 5, 2015
1391
{self:null, width:null, fillchar:null},
1392
['self', 'width', 'fillchar'],
1393
arguments,{fillchar:' '},null,null)
@PierreQuentel
First import
Sep 5, 2014
1394
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1395
if ($.width <= self.length) return self
@PierreQuentel
First import
Sep 5, 2014
1396
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1397
return $.fillchar.repeat($.width - self.length) + self
@PierreQuentel
First import
Sep 5, 2014
1398
}
1399
1400
$StringDict.rpartition = function(self,sep) {
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1401
var $=$B.args('rpartition',2,{self:null,sep:null},['self','sep'],
1402
arguments,{},null,null)
1403
check_str($.sep)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1404
var self = reverse($.self),
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1405
sep = reverse($.sep)
1406
var items = $StringDict.partition(self,sep).reverse()
1407
for(var i=0;i<items.length;i++){
1408
items[i]=items[i].split('').reverse().join('')
1409
}
1410
return items
@PierreQuentel
First import
Sep 5, 2014
1411
}
1412
1413
$StringDict.rsplit = function(self) {
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1414
var $=$B.args("rsplit",3,{self:null,sep:null,maxsplit:null},
1415
['self','sep','maxsplit'],arguments,
1416
{sep:_b_.None, maxsplit:-1},null,null),
Clean up scripts, based on uglifyjs warnings
Oct 8, 2016
1417
sep=$.sep
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1418
1419
// Use split on the reverse of the string and of separator
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1420
var rev_str = reverse($.self),
1421
rev_sep = sep === _b_.None ? sep : reverse($.sep),
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1422
rev_res = $StringDict.split(rev_str, rev_sep, $.maxsplit)
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1423
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1424
// Reverse the list, then each string inside the list
1425
rev_res.reverse()
1426
for(var i=0;i<rev_res.length;i++){
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1427
rev_res[i] = reverse(rev_res[i])
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1428
}
1429
return rev_res
@PierreQuentel
First import
Sep 5, 2014
1430
}
1431
1432
$StringDict.rstrip = function(self,x){
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1433
var $=$B.args('rstrip',2,{self:null,chars:null},['self','chars'],
1434
arguments,{chars:_b_.None},null,null)
@jonathanverner
Fix strip handling of bracket character (GH Issue #521).
Nov 2, 2016
1435
if($.chars===_b_.None){return $.self.trimRight()}
1436
for (var j = $.self.length-1; j >= 0; j--) {
1437
if ($.chars.indexOf($.self.charAt(j)) === -1) {
1438
return $.self.substring(0,j+1);
1439
}
1440
}
1441
return '';
@PierreQuentel
First import
Sep 5, 2014
1442
}
1443
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1444
$StringDict.split = function(){
Clean up scripts, based on uglifyjs warnings
Oct 8, 2016
1445
var pos=0
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1446
var $=$B.args("split",3,{self:null,sep:null,maxsplit:null},
1447
['self','sep','maxsplit'],arguments,
1448
{sep:_b_.None, maxsplit:-1},null,null)
1449
var sep=$.sep,maxsplit=$.maxsplit,self=$.self
1450
if(maxsplit.__class__===$B.LongInt.$dict){maxsplit=parseInt(maxsplit.value)}
Implement exceptions as new-style classes
Feb 10, 2018
1451
if(sep=='') throw _b_.ValueError.$factory('empty separator')
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1452
if(sep===_b_.None){
@PierreQuentel
First import
Sep 5, 2014
1453
var res = []
1454
while(pos<self.length&&self.charAt(pos).search(/\s/)>-1){pos++}
@PierreQuentel
Bug fix : "1".split() returns ['1'], not []
May 28, 2015
1455
if(pos===self.length-1){return [self]}
@PierreQuentel
First import
Sep 5, 2014
1456
var name = ''
1457
while(1){
1458
if(self.charAt(pos).search(/\s/)===-1){
1459
if(name===''){name=self.charAt(pos)}
1460
else{name+=self.charAt(pos)}
1461
}else{
1462
if(name!==''){
1463
res.push(name)
1464
if(maxsplit!==-1&&res.length===maxsplit+1){
1465
res.pop()
1466
res.push(name+self.substr(pos))
1467
return res
1468
}
1469
name=''
1470
}
1471
}
1472
pos++
1473
if(pos>self.length-1){
1474
if(name){res.push(name)}
1475
break
1476
}
1477
}
1478
return res
1479
}else{
Clean up scripts, based on uglifyjs warnings
Oct 8, 2016
1480
var res = [],s='',seplen=sep.length
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1481
if(maxsplit==0){return [self]}
1482
while(pos<self.length){
1483
if(self.substr(pos,seplen)==sep){
1484
res.push(s)
1485
pos += seplen
1486
if(maxsplit>-1 && res.length>=maxsplit){
1487
res.push(self.substr(pos))
1488
return res
1489
}
1490
s= ''
1491
}else{
1492
s += self.charAt(pos)
1493
pos++
@PierreQuentel
First import
Sep 5, 2014
1494
}
1495
}
@PierreQuentel
Fixes many bugs in str methods (split, rsplit, find, rfind, lower, up…
Sep 18, 2015
1496
res.push(s)
1497
return res
@PierreQuentel
First import
Sep 5, 2014
1498
}
1499
}
1500
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1501
$StringDict.splitlines = function(self){
1502
var $=$B.args('splitlines',2,{self:null,keepends:null},
1503
['self','keepends'],arguments,{keepends:false},null,null)
1504
if(!_b_.isinstance($.keepends,[_b_.bool, _b_.int])){
Implement exceptions as new-style classes
Feb 10, 2018
1505
throw _b_.TypeError.$factory('integer argument expected, got '+
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1506
$B.get_class($.keepends).__name)
1507
}
Implement "int" as new-style class
Feb 10, 2018
1508
var keepends = _b_.int.$factory($.keepends)
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1509
// Remove trailing line breaks
1510
if(keepends){
Clean up scripts, based on uglifyjs warnings
Oct 8, 2016
1511
var res = [],
1512
start=pos,
1513
pos=0,
1514
self=$.self
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1515
while(pos<self.length){
1516
if(self.substr(pos,2)=='\r\n'){
1517
res.push(self.substring(start,pos+2))
1518
start = pos+2
1519
pos = start
1520
}else if(self.charAt(pos)=='\r' || self.charAt(pos)=='\n'){
1521
res.push(self.substring(start,pos+1))
1522
start = pos+1
1523
pos = start
1524
}else{pos++}
1525
}
1526
var rest = self.substr(start)
1527
if(rest){res.push(rest)}
1528
return res
1529
}else{
1530
var self = $.self.replace(/[\r\n]$/,'')
1531
return self.split(/\n|\r\n|\r/)
1532
}
1533
}
@PierreQuentel
First import
Sep 5, 2014
1534
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1535
$StringDict.startswith = function(){
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1536
// Return True if string starts with the prefix, otherwise return False.
1537
// prefix can also be a tuple of prefixes to look for. With optional
1538
// start, test string beginning at that position. With optional end,
@PierreQuentel
First import
Sep 5, 2014
1539
// stop comparing string at that position.
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1540
var $=$B.args("startswith",4,
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1541
{self:null, prefix:null, start:null, end:null},
@PierreQuentel
Remove function $MakeArgs in py_utils.js, replace it in all scripts b…
Jul 5, 2015
1542
['self', 'prefix', 'start', 'end'],
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1543
arguments,{start:0, end:null},null,null)
@PierreQuentel
First import
Sep 5, 2014
1544
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1545
normalize_start_end($)
1546
1547
var prefixes = $.prefix
1548
if(!isinstance(prefixes,_b_.tuple)){prefixes=[prefixes]}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1549
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1550
var s = $.self.substring($.start,$.end)
1551
for(var i=0, _len_i = prefixes.length; i < _len_i;i++){
1552
prefix = prefixes[i]
Implement exceptions as new-style classes
Feb 10, 2018
1553
if(!_b_.isinstance(prefix, str)){throw _b_.TypeError.$factory(
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1554
"endswith first arg must be str or a tuple of str, not int")}
1555
if(s.substr(0,prefix.length)==prefix) return true
@PierreQuentel
First import
Sep 5, 2014
1556
}
1557
return false
@PierreQuentel
Fixes bugs in str methods
Sep 20, 2015
1558
@PierreQuentel
First import
Sep 5, 2014
1559
}
1560
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1561
$StringDict.strip = function(){
1562
var $=$B.args('strip',2,{self:null,chars:null},['self','chars'],
1563
arguments,{chars:_b_.None},null,null)
@jonathanverner
Fix strip handling of bracket character (GH Issue #521).
Nov 2, 2016
1564
if($.chars===_b_.None){return $.self.trim()}
1565
for (var i = 0; i < $.self.length; i++) {
1566
if ($.chars.indexOf($.self.charAt(i)) === -1) {
1567
break;
1568
}
1569
}
1570
for (var j = $.self.length-1; j >= i; j--) {
1571
if ($.chars.indexOf($.self.charAt(j)) === -1) {
1572
break;
1573
}
1574
}
1575
return $.self.substring(i,j+1);
@PierreQuentel
First import
Sep 5, 2014
1576
}
1577
1578
$StringDict.translate = function(self,table) {
@earney
convert more array.push to non function version
Apr 13, 2015
1579
var res = [], pos=0
@PierreQuentel
First import
Sep 5, 2014
1580
if (isinstance(table, _b_.dict)) {
Updated to latest copy of the repo
Jan 1, 2015
1581
for (var i=0, _len_i = self.length; i < _len_i; i++) {
@PierreQuentel
First import
Sep 5, 2014
1582
var repl = _b_.dict.$dict.get(table,self.charCodeAt(i),-1)
@earney
convert more array.push to non function version
Apr 13, 2015
1583
if(repl==-1){res[pos++]=self.charAt(i)}
Fixes #361 : maketrans returning error in Brython console
Jan 6, 2016
1584
else if(repl!==None){res[pos++]=_b_.chr(repl)}
@PierreQuentel
First import
Sep 5, 2014
1585
}
1586
}
@earney
convert more array.push to non function version
Apr 13, 2015
1587
return res.join('')
@PierreQuentel
First import
Sep 5, 2014
1588
}
1589
1590
$StringDict.zfill = function(self, width) {
@PierreQuentel
Fix bugs in str methods : center, join, lstrip, replace, rjust, rstri…
Sep 18, 2015
1591
var $=$B.args('zfill',2,{self:null,width:null},
1592
['self','width'],arguments,{},null,null)
1593
if ($.width <= self.length) {return self}
1594
switch(self.charAt(0)){
1595
case '+':
1596
case '-':
1597
return self.charAt(0)+'0'.repeat($.width-self.length)+self.substr(1)
1598
default:
1599
return '0'.repeat(width - self.length)+self
1600
}
@PierreQuentel
First import
Sep 5, 2014
1601
}
1602
1603
function str(arg){
Implement "object" as a new-style class. $B.make_class also returns a…
Feb 10, 2018
1604
//console.log("str", arg)
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1605
arg = arg.__class__ === $B.$factory ? arg.$dict : arg
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
1606
if(arg===undefined){console.log("undef"); return '<undefined>'}
@earney
make str(i) a bit more efficient
Mar 23, 2015
1607
switch(typeof arg) {
Fixes #363 : Arithmetic on Nan and integer
Jan 30, 2016
1608
case 'string':
1609
return arg
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1610
case 'number':
Fixes #363 : Arithmetic on Nan and integer
Jan 30, 2016
1611
if(isFinite(arg)){return arg.toString()}
@earney
make str(i) a bit more efficient
Mar 23, 2015
1612
}
@PierreQuentel
Improve speed of str() on integers and strings
Mar 22, 2015
1613
try{
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
1614
if(arg.$is_class || arg.$factory){
1615
// arg is a class
@PierreQuentel
Fixes #155 : metaclass not set as the type of a class when called dir…
Mar 17, 2015
1616
// In this case, str() doesn't use the attribute __str__ of the
@PierreQuentel
Fix str() for classes
Mar 16, 2015
1617
// class or its subclasses, but the attribute __str__ of the
1618
// class metaclass (usually "type") or its subclasses (usually
1619
// "object")
1620
// The metaclass is the attribute __class__ of the class dictionary
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1621
var func = $B.$getattr(arg.__class__, '__str__')
Fixes #720 : "call stack exceeded" for comparison operators using fun…
Dec 7, 2017
1622
return func(arg)
@PierreQuentel
Fix str() for classes
Mar 16, 2015
1623
}
@PierreQuentel
First import
Sep 5, 2014
1624
var f = getattr(arg,'__str__')
1625
// XXX fix : if not better than object.__str__, try __repr__
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1626
//return f()
@PierreQuentel
First import
Sep 5, 2014
1627
}
1628
catch(err){
Major rewriting of class implementation. Needed for issue #766.
Feb 3, 2018
1629
console.log('err ', err)
@PierreQuentel
First import
Sep 5, 2014
1630
try{ // try __repr__
1631
var f = getattr(arg,'__repr__')
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1632
//return getattr(f,'__call__')()
@PierreQuentel
First import
Sep 5, 2014
1633
}catch(err){
@PierreQuentel
Improve message when trying to print a Javascript object that has no …
Aug 9, 2015
1634
if($B.debug>1){console.log(err)}
1635
console.log('Warning - no method __str__ or __repr__, default to toString', arg)
@earney
better console log messages
Jun 19, 2015
1636
return arg.toString()
@PierreQuentel
First import
Sep 5, 2014
1637
}
1638
}
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
1639
return $B.$call(f)()
@PierreQuentel
First import
Sep 5, 2014
1640
}
1641
str.__class__ = $B.$factory
1642
str.$dict = $StringDict
1643
$StringDict.$factory = str
1644
$StringDict.__new__ = function(cls){
1645
if(cls===undefined){
Implement exceptions as new-style classes
Feb 10, 2018
1646
throw _b_.TypeError.$factory('str.__new__(): not enough arguments')
@PierreQuentel
First import
Sep 5, 2014
1647
}
1648
return {__class__:cls.$dict}
1649
}
1650
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
1651
$B.set_func_names($StringDict, "builtins")
Updated to latest copy of the repo
Jan 1, 2015
1652
@PierreQuentel
First import
Sep 5, 2014
1653
// dictionary and factory for subclasses of string
1654
var $StringSubclassDict = {
1655
__class__:$B.$type,
1656
__name__:'str'
1657
}
1658
1659
// the methods in subclass apply the methods in $StringDict to the
1660
// result of instance.valueOf(), which is a Javascript string
1661
for(var $attr in $StringDict){
1662
if(typeof $StringDict[$attr]=='function'){
1663
$StringSubclassDict[$attr]=(function(attr){
1664
return function(){
@earney
convert more array.push to non function version
Apr 13, 2015
1665
var args = [], pos=0
@PierreQuentel
First import
Sep 5, 2014
1666
if(arguments.length>0){
@earney
convert more array.push to non function version
Apr 13, 2015
1667
var args = [arguments[0].valueOf()], pos=1
Updated to latest copy of the repo
Jan 1, 2015
1668
for(var i=1, _len_i = arguments.length; i < _len_i;i++){
@earney
convert more array.push to non function version
Apr 13, 2015
1669
args[pos++]=arguments[i]
@PierreQuentel
First import
Sep 5, 2014
1670
}
1671
}
1672
return $StringDict[attr].apply(null,args)
1673
}
1674
})($attr)
1675
}
1676
}
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
1677
$StringSubclassDict.__new__ = function(cls){
1678
return {__class__:cls.$factory ? cls : cls.$dict}
1679
}
Implement "object" as a new-style class. $B.make_class also returns a…
Feb 10, 2018
1680
$StringSubclassDict.__mro__ = [object]
@PierreQuentel
First import
Sep 5, 2014
1681
1682
// factory for str subclasses
1683
$B.$StringSubclassFactory = {
1684
__class__:$B.$factory,
1685
$dict:$StringSubclassDict
1686
}
1687
For dict, float, int, set and string classes : support old-style and …
Feb 9, 2018
1688
$B.set_func_names($StringSubclassDict, "builtins")
1689
@PierreQuentel
First import
Sep 5, 2014
1690
_b_.str = str
1691
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
1692
// Function to parse the 2nd argument of format()
1693
$B.parse_format_spec = function(spec){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1694
1695
if(spec==''){this.empty=true}
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
1696
else{
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1697
var pos=0,
1698
aligns = '<>=^',
1699
digits = '0123456789',
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
1700
types = 'bcdeEfFgGnosxX%',
1701
align_pos = aligns.indexOf(spec.charAt(0))
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1702
if(align_pos!=-1){
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
1703
if(spec.charAt(1) && aligns.indexOf(spec.charAt(1))!=-1){
1704
// If the second char is also an alignment specifier, the
1705
// first char is the fill value
1706
this.fill = spec.charAt(0)
1707
this.align = spec.charAt(1)
1708
pos = 2
1709
}else{
1710
// The first character defines alignment : fill defaults to ' '
1711
this.align=aligns[align_pos];
1712
this.fill=' ';
1713
pos++
1714
}
1715
}else{
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1716
align_pos = aligns.indexOf(spec.charAt(1))
1717
if(spec.charAt(1) && align_pos!=-1){
1718
// The second character defines alignment : fill is the first one
1719
this.align=aligns[align_pos]
1720
this.fill=spec.charAt(0)
1721
pos = 2
1722
}
1723
}
1724
var car = spec.charAt(pos)
1725
if(car=='+'||car=='-'||car==' '){
1726
this.sign=car;
1727
pos++;
1728
car=spec.charAt(pos);
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
1729
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1730
if(car=='#'){this.alternate=true;pos++;car=spec.charAt(pos)}
@PierreQuentel
Fixes bugs with str.format()
Aug 29, 2015
1731
if(car=='0'){
1732
// sign-aware : equivalent to fill=0 and align=='='
1733
this.fill='0'
1734
this.align = '='
1735
pos++;car=spec.charAt(pos)
1736
}
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
1737
while(car && digits.indexOf(car)>-1){
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1738
if(this.width===undefined){this.width=car}
1739
else{this.width+=car}
1740
pos++;car=spec.charAt(pos)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
1741
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1742
if(this.width!==undefined){this.width=parseInt(this.width)}
1743
if(car==','){this.comma=true;pos++;car=spec.charAt(pos)}
1744
if(car=='.'){
1745
if(digits.indexOf(spec.charAt(pos+1))==-1){
Implement exceptions as new-style classes
Feb 10, 2018
1746
throw _b_.ValueError.$factory("Missing precision in format spec")
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1747
}
1748
this.precision = spec.charAt(pos+1)
1749
pos+=2;car=spec.charAt(pos)
1750
while(car && digits.indexOf(car)>-1){
1751
this.precision+=car;pos++;car=spec.charAt(pos)
1752
}
1753
this.precision = parseInt(this.precision)
1754
}
1755
if(car && types.indexOf(car)>-1){this.type=car;pos++;car=spec.charAt(pos)}
1756
if(pos!==spec.length){
Remove error messages
Nov 11, 2015
1757
//console.log('error', spec, this, pos, spec.charAt(pos))
Implement exceptions as new-style classes
Feb 10, 2018
1758
throw _b_.ValueError.$factory("Invalid format specifier")
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1759
}
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1760
}
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1761
this.toString = function(){
1762
return (this.fill===undefined ? '' : _b_.str(this.fill))+
1763
(this.align||'')+
1764
(this.sign||'')+
1765
(this.alternate ? '#' : '')+
1766
(this.sign_aware ? '0' : '')+
1767
(this.width || '')+
1768
(this.comma ? ',' : '')+
1769
(this.precision ? '.'+this.precision : '')+
1770
(this.type || '')
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
1771
}
1772
}
1773
1774
$B.format_width = function(s, fmt){
1775
if(fmt.width && s.length<fmt.width){
1776
var fill=fmt.fill || ' ', align = fmt.align || '<',
1777
missing = fmt.width-s.length
1778
switch(align){
1779
case '<':
1780
return s+fill.repeat(missing)
1781
case '>':
1782
return fill.repeat(missing)+s
1783
case '=':
@PierreQuentel
Fixes #260 : string.format() issues
Aug 28, 2015
1784
if('+-'.indexOf(s.charAt(0))>-1){
1785
return s.charAt(0)+fill.repeat(missing)+s.substr(1)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
1786
}else{
Fixes #654 : printing exceptions differs from CPython
Aug 31, 2017
1787
return fill.repeat(missing)+s
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
1788
}
1789
case '^':
Add many "var" to avoid global JS namespace pollution
Sep 30, 2016
1790
var left = parseInt(missing/2)
@PierreQuentel
Major rewriting of "new style" string formatting.
Aug 27, 2015
1791
return fill.repeat(left)+s+fill.repeat(missing-left)
@PierreQuentel
Fixes issues with float.__format__
Aug 21, 2015
1792
}
1793
}
1794
return s
1795
}
1796
Improved implementation of f-strings
Jul 10, 2017
1797
function fstring_expression(){
1798
this.type = 'expression'
1799
this.expression = ''
1800
this.conversion = null
1801
this.fmt = null
1802
}
1803
First implementation of f-strings
Jun 29, 2017
1804
$B.parse_fstring = function(string){
1805
// Parse a f-string
1806
var elts = [],
1807
pos = 0,
1808
current = '',
1809
ctype = null,
1810
nb_braces = 0,
1811
car
1812
1813
while(pos<string.length){
1814
if(ctype===null){
1815
car = string.charAt(pos)
1816
if(car=='{'){
1817
if(string.charAt(pos+1)=='{'){
1818
ctype = 'string'
1819
current = '{'
1820
pos += 2
1821
}else{
1822
ctype = 'expression'
1823
nb_braces = 1
1824
pos++
1825
}
1826
}else if(car=='}'){
1827
if(string.charAt(pos+1)==car){
1828
ctype = 'string'
1829
current = '}'
Improve implementation of f-strings
Jul 14, 2017
1830
pos += 2
First implementation of f-strings
Jun 29, 2017
1831
}else{
1832
throw Error(" f-string: single '}' is not allowed")
1833
}
1834
}else{
1835
ctype = 'string'
1836
current = car
Improve implementation of f-strings
Jul 14, 2017
1837
pos++
First implementation of f-strings
Jun 29, 2017
1838
}
1839
}else if(ctype=='string'){
1840
// end of string is the first single { or end of string
Improve implementation of f-strings
Jul 14, 2017
1841
var i=pos
First implementation of f-strings
Jun 29, 2017
1842
while(i<string.length){
1843
car = string.charAt(i)
1844
if(car=='{'){
1845
if(string.charAt(i+1)=='{'){
1846
current += '{'
1847
i+=2
1848
}else{
1849
elts.push(current)
1850
ctype = 'expression'
1851
pos = i+1
1852
break
1853
}
1854
}else if(car=='}'){
1855
if(string.charAt(i+1)==car){
1856
current += car
1857
i += 2
1858
}else{
1859
throw Error(" f-string: single '}' is not allowed")
1860
}
1861
}else{
1862
current += car
1863
i++
1864
}
1865
}
1866
pos = i+1
1867
}else{
1868
// End of expression is the } matching the opening {
1869
// There may be nested braces
1870
var i = pos,
1871
nb_braces = 1,
Improve implementation of f-strings
Jul 14, 2017
1872
nb_paren = 0,
Improved implementation of f-strings
Jul 10, 2017
1873
current = new fstring_expression()
First implementation of f-strings
Jun 29, 2017
1874
while(i<string.length){
1875
car = string.charAt(i)
Improve implementation of f-strings
Jul 14, 2017
1876
if(car=='{' && nb_paren==0){
First implementation of f-strings
Jun 29, 2017
1877
nb_braces++
f-strings : support {expr} in format specifiers
Jul 14, 2017
1878
current.expression += car
First implementation of f-strings
Jun 29, 2017
1879
i++
Improve implementation of f-strings
Jul 14, 2017
1880
}else if(car=='}' && nb_paren==0){
First implementation of f-strings
Jun 29, 2017
1881
nb_braces -= 1
1882
if(nb_braces==0){
1883
// end of expression
Improved implementation of f-strings
Jul 10, 2017
1884
elts.push(current)
First implementation of f-strings
Jun 29, 2017
1885
ctype = null
Improved implementation of f-strings
Jul 10, 2017
1886
current = ''
f-strings : support {expr} in format specifiers
Jul 14, 2017
1887
pos = i+1
1888
break
First implementation of f-strings
Jun 29, 2017
1889
}
f-strings : support {expr} in format specifiers
Jul 14, 2017
1890
current.expression += car
1891
i++
Improved implementation of f-strings
Jul 10, 2017
1892
}else if(car=='\\'){
1893
// backslash is not allowed in expressions
1894
throw Error("f-string expression part cannot include a" +
1895
" backslash")
Fixes a bug in parsing of f-string conversion flags
Dec 23, 2017
1896
}else if(nb_paren == 0 && car=='!' && current.fmt===null &&
Fixes bug with f-strings
Dec 27, 2017
1897
':}'.indexOf(string.charAt(i + 2))>-1){
Improved implementation of f-strings
Jul 10, 2017
1898
if(current.expression.length==0){
1899
throw Error("f-string: empty expression not allowed")
1900
}
1901
if('ars'.indexOf(string.charAt(i+1)) == -1){
1902
throw Error("f-string: invalid conversion character:" +
1903
" expected 's', 'r', or 'a'")
1904
}else{
1905
current.conversion = string.charAt(i+1)
1906
i += 2
1907
}
Improve implementation of f-strings
Jul 14, 2017
1908
}else if(car=='('){
1909
nb_paren++
1910
current.expression += car
1911
i++
1912
}else if(car==')'){
1913
nb_paren--
1914
current.expression += car
1915
i++
1916
}else if(car=='"'){
1917
// triple string ?
1918
if(string.substr(i, 3)=='"""'){
1919
var end = string.indexOf('"""', i+3)
1920
if(end==-1){throw Error("f-string: unterminated string")}
1921
else{
1922
var trs = string.substring(i, end+3)
1923
trs = trs.replace('\n', '\\n\\')
1924
current.expression += trs
1925
i = end+3
1926
}
1927
}else{
1928
var end = string.indexOf('"', i+1)
1929
if(end==-1){throw Error("f-string: unterminated string")}
1930
else{
1931
current.expression += string.substring(i, end+1)
1932
i = end+1
1933
}
1934
}
1935
}else if(nb_paren == 0 && car==':'){
Improved implementation of f-strings
Jul 10, 2017
1936
current.fmt = true
1937
current.expression += car
1938
i++
First implementation of f-strings
Jun 29, 2017
1939
}else{
Improved implementation of f-strings
Jul 10, 2017
1940
current.expression += car
First implementation of f-strings
Jun 29, 2017
1941
i++
1942
}
1943
}
1944
if(nb_braces>0){
1945
throw Error("f-string: expected '}'")
1946
}
1947
}
1948
}
1949
if(current.length>0){elts.push(current)}
1950
return elts
1951
}
1952
@PierreQuentel
First import
Sep 5, 2014
1953
})(__BRYTHON__)