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