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