Skip to content

Commit 90a7b4e

Browse files
committed
remove SSF._general_int
1 parent 61487bc commit 90a7b4e

File tree

8 files changed

+7
-15
lines changed

8 files changed

+7
-15
lines changed

bits/10_ssf.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,6 @@ function datenum_local(v/*:Date*/, date1904/*:?boolean*/)/*:number*/ {
199199
else if(v >= base1904) epoch += 24*60*60*1000;
200200
return (epoch - (dnthresh + (v.getTimezoneOffset() - basedate.getTimezoneOffset()) * 60000)) / (24 * 60 * 60 * 1000);
201201
}
202-
/* The longest 32-bit integer text is "-4294967296", exactly 11 chars */
203-
function general_fmt_int(v/*:number*/)/*:string*/ { return v.toString(10); }
204-
SSF._general_int = general_fmt_int;
205-
206202
/* ECMA-376 18.8.30 numFmt*/
207203
/* Note: `toPrecision` uses standard form when prec > E and E >= -6 */
208204
var general_fmt_num = (function make_general_fmt_num() {
@@ -255,6 +251,7 @@ SSF._general_num = general_fmt_num;
255251
- "up to 11 characters" displayed for numbers
256252
- Default date format (code 14) used for Dates
257253
254+
The longest 32-bit integer text is "-2147483648", exactly 11 chars
258255
TODO: technically the display depends on the width of the cell
259256
*/
260257
function general_fmt(v/*:any*/, opts/*:any*/) {

bits/20_jsutils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ function cc2str(arr/*:Array<number>*/, debomit)/*:string*/ {
124124
"\u02dc": "\x98", "\u2122": "\x99", "\u0161": "\x9a", "\u203a": "\x9b",
125125
"\u0153": "\x9c", "\u017e": "\x9e", "\u0178": "\x9f"
126126
};
127-
return new TextDecoder("latin1").decode(arr).replace(/[\x80\x9F]/g, function(c) { return rev[c] || c; });
127+
return new TextDecoder("latin1").decode(arr).replace(/[ƒˆŠŒŽ˜šœžŸ]/g, function(c) { return rev[c] || c; });
128128
} catch(e) {}
129129

130130
var o = [];

bits/66_wscommon.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ function safe_format(p/*:Cell*/, fmtid/*:number*/, fillid/*:?number*/, opts, the
9292
if(p.t === 'e') p.w = p.w || BErr[p.v];
9393
else if(fmtid === 0) {
9494
if(p.t === 'n') {
95-
if((p.v|0) === p.v) p.w = SSF._general_int(p.v);
95+
if((p.v|0) === p.v) p.w = p.v.toString(10);
9696
else p.w = SSF._general_num(p.v);
9797
}
9898
else if(p.t === 'd') {
9999
var dd = datenum(p.v);
100-
if((dd|0) === dd) p.w = SSF._general_int(dd);
100+
if((dd|0) === dd) p.w = dd.toString(10);
101101
else p.w = SSF._general_num(dd);
102102
}
103103
else if(p.v === undefined) return "";

bits/75_xlml.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function safe_format_xlml(cell/*:Cell*/, nf, o) {
6262
if(cell.t === 'e') { cell.w = cell.w || BErr[cell.v]; }
6363
else if(nf === "General") {
6464
if(cell.t === 'n') {
65-
if((cell.v|0) === cell.v) cell.w = SSF._general_int(cell.v);
65+
if((cell.v|0) === cell.v) cell.w = cell.v.toString(10);
6666
else cell.w = SSF._general_num(cell.v);
6767
}
6868
else cell.w = SSF._general(cell.v);

bits/76_xls.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function safe_format_xf(p/*:any*/, opts/*:ParseOpts*/, date1904/*:?boolean*/) {
8383
if(p.t === 'e') { p.w = p.w || BErr[p.v]; }
8484
else if(fmtid === 0 || fmtid == "General") {
8585
if(p.t === 'n') {
86-
if((p.v|0) === p.v) p.w = SSF._general_int(p.v);
86+
if((p.v|0) === p.v) p.w = p.v.toString(10);
8787
else p.w = SSF._general_num(p.v);
8888
}
8989
else p.w = SSF._general(p.v);

misc/flowdeps.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ type SSFModule = {
3030
_table:SSFTable;
3131
init_table:any;
3232
33-
_general_int:(v:number)=>string;
3433
_general_num:(v:number)=>string;
3534
_general:(v:number, o:?any)=>string;
3635
_eval:any;

packages/ssf/bits/40_general.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/* The longest 32-bit integer text is "-4294967296", exactly 11 chars */
2-
function general_fmt_int(v/*:number*/)/*:string*/ { return v.toString(10); }
3-
SSF._general_int = general_fmt_int;
4-
51
/* ECMA-376 18.8.30 numFmt*/
62
/* Note: `toPrecision` uses standard form when prec > E and E >= -6 */
73
var general_fmt_num = (function make_general_fmt_num() {
@@ -54,6 +50,7 @@ SSF._general_num = general_fmt_num;
5450
- "up to 11 characters" displayed for numbers
5551
- Default date format (code 14) used for Dates
5652
53+
The longest 32-bit integer text is "-2147483648", exactly 11 chars
5754
TODO: technically the display depends on the width of the cell
5855
*/
5956
function general_fmt(v/*:any*/, opts/*:any*/) {

packages/ssf/misc/flow.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ type SSFModule = {
2020
_table:SSFTable;
2121
init_table:any;
2222
23-
_general_int:(v:number)=>string;
2423
_general_num:(v:number)=>string;
2524
_general:(v:number, o:?any)=>string;
2625
_eval:any;

0 commit comments

Comments
 (0)