@@ -445,7 +445,7 @@ mergeInto(LibraryManager.library, {
445
445
// time.h
446
446
// ==========================================================================
447
447
448
- _mktime_js__deps : [ '_yday_from_date ' ] ,
448
+ _mktime_js__deps : [ '$ydayFromDate ' ] ,
449
449
_mktime_js__sig : 'ip' ,
450
450
_mktime_js : function ( tmPtr ) {
451
451
var date = new Date ( { { { makeGetValue ( 'tmPtr' , C_STRUCTS . tm . tm_year , 'i32' ) } } } + 1900 ,
@@ -476,7 +476,7 @@ mergeInto(LibraryManager.library, {
476
476
}
477
477
478
478
{ { { makeSetValue ( 'tmPtr' , C_STRUCTS . tm . tm_wday , 'date.getDay()' , 'i32' ) } } } ;
479
- var yday = __yday_from_date ( date ) | 0 ;
479
+ var yday = ydayFromDate ( date ) | 0 ;
480
480
{ { { makeSetValue ( 'tmPtr' , C_STRUCTS . tm . tm_yday , 'yday' , 'i32' ) } } } ;
481
481
// To match expected behavior, update fields from date
482
482
{ { { makeSetValue ( 'tmPtr' , C_STRUCTS . tm . tm_sec , 'date.getSeconds()' , 'i32' ) } } } ;
@@ -524,7 +524,7 @@ mergeInto(LibraryManager.library, {
524
524
return ( date . getTime ( ) / 1000 ) | 0 ;
525
525
} ,
526
526
527
- _localtime_js__deps : [ '$readI53FromI64' , '_yday_from_date ' ] ,
527
+ _localtime_js__deps : [ '$readI53FromI64' , '$ydayFromDate ' ] ,
528
528
_localtime_js__sig : 'ipp' ,
529
529
_localtime_js : function ( time , tmPtr ) {
530
530
var date = new Date ( { { { makeGetValue ( 'time' , 0 , 'i53' ) } } } * 1000 ) ;
@@ -536,7 +536,7 @@ mergeInto(LibraryManager.library, {
536
536
{ { { makeSetValue ( 'tmPtr' , C_STRUCTS . tm . tm_year , 'date.getFullYear()-1900' , 'i32' ) } } } ;
537
537
{ { { makeSetValue ( 'tmPtr' , C_STRUCTS . tm . tm_wday , 'date.getDay()' , 'i32' ) } } } ;
538
538
539
- var yday = __yday_from_date ( date ) | 0 ;
539
+ var yday = ydayFromDate ( date ) | 0 ;
540
540
{ { { makeSetValue ( 'tmPtr' , C_STRUCTS . tm . tm_yday , 'yday' , 'i32' ) } } } ;
541
541
{ { { makeSetValue ( 'tmPtr' , C_STRUCTS . tm . tm_gmtoff , '-(date.getTimezoneOffset() * 60)' , 'i32' ) } } } ;
542
542
@@ -631,39 +631,39 @@ mergeInto(LibraryManager.library, {
631
631
}
632
632
} ,
633
633
634
- _MONTH_DAYS_REGULAR : [ 31 , 28 , 31 , 30 , 31 , 30 , 31 , 31 , 30 , 31 , 30 , 31 ] ,
635
- _MONTH_DAYS_LEAP : [ 31 , 29 , 31 , 30 , 31 , 30 , 31 , 31 , 30 , 31 , 30 , 31 ] ,
636
- _MONTH_DAYS_REGULAR_CUMULATIVE : [ 0 , 31 , 59 , 90 , 120 , 151 , 181 , 212 , 243 , 273 , 304 , 334 ] ,
637
- _MONTH_DAYS_LEAP_CUMULATIVE : [ 0 , 31 , 60 , 91 , 121 , 152 , 182 , 213 , 244 , 274 , 305 , 335 ] ,
634
+ $MONTH_DAYS_REGULAR : [ 31 , 28 , 31 , 30 , 31 , 30 , 31 , 31 , 30 , 31 , 30 , 31 ] ,
635
+ $MONTH_DAYS_LEAP : [ 31 , 29 , 31 , 30 , 31 , 30 , 31 , 31 , 30 , 31 , 30 , 31 ] ,
636
+ $MONTH_DAYS_REGULAR_CUMULATIVE : [ 0 , 31 , 59 , 90 , 120 , 151 , 181 , 212 , 243 , 273 , 304 , 334 ] ,
637
+ $MONTH_DAYS_LEAP_CUMULATIVE : [ 0 , 31 , 60 , 91 , 121 , 152 , 182 , 213 , 244 , 274 , 305 , 335 ] ,
638
638
639
- _isLeapYear : function ( year ) {
639
+ $isLeapYear : function ( year ) {
640
640
return year % 4 === 0 && ( year % 100 !== 0 || year % 400 === 0 ) ;
641
641
} ,
642
642
643
- _yday_from_date__deps : [ '_isLeapYear ' , '_MONTH_DAYS_LEAP_CUMULATIVE ' , '_MONTH_DAYS_REGULAR_CUMULATIVE ' ] ,
644
- _yday_from_date : function ( date ) {
645
- var isLeapYear = __isLeapYear ( date . getFullYear ( ) ) ;
646
- var monthDaysCumulative = ( isLeapYear ? __MONTH_DAYS_LEAP_CUMULATIVE : __MONTH_DAYS_REGULAR_CUMULATIVE ) ;
643
+ $ydayFromDate__deps : [ '$isLeapYear ' , '$MONTH_DAYS_LEAP_CUMULATIVE ' , '$MONTH_DAYS_REGULAR_CUMULATIVE ' ] ,
644
+ $ydayFromDate : function ( date ) {
645
+ var leap = isLeapYear ( date . getFullYear ( ) ) ;
646
+ var monthDaysCumulative = ( leap ? MONTH_DAYS_LEAP_CUMULATIVE : MONTH_DAYS_REGULAR_CUMULATIVE ) ;
647
647
var yday = monthDaysCumulative [ date . getMonth ( ) ] + date . getDate ( ) - 1 ; // -1 since it's days since Jan 1
648
648
649
649
return yday ;
650
650
} ,
651
651
652
- _arraySum : function ( array , index ) {
652
+ $arraySum : function ( array , index ) {
653
653
var sum = 0 ;
654
654
for ( var i = 0 ; i <= index ; sum += array [ i ++ ] ) {
655
655
// no-op
656
656
}
657
657
return sum ;
658
658
} ,
659
659
660
- _addDays__deps : [ '_isLeapYear ' , '_MONTH_DAYS_LEAP ' , '_MONTH_DAYS_REGULAR ' ] ,
661
- _addDays : function ( date , days ) {
660
+ $addDays__deps : [ '$isLeapYear ' , '$MONTH_DAYS_LEAP ' , '$MONTH_DAYS_REGULAR ' ] ,
661
+ $addDays : function ( date , days ) {
662
662
var newDate = new Date ( date . getTime ( ) ) ;
663
663
while ( days > 0 ) {
664
- var leap = __isLeapYear ( newDate . getFullYear ( ) ) ;
664
+ var leap = isLeapYear ( newDate . getFullYear ( ) ) ;
665
665
var currentMonth = newDate . getMonth ( ) ;
666
- var daysInCurrentMonth = ( leap ? __MONTH_DAYS_LEAP : __MONTH_DAYS_REGULAR ) [ currentMonth ] ;
666
+ var daysInCurrentMonth = ( leap ? MONTH_DAYS_LEAP : MONTH_DAYS_REGULAR ) [ currentMonth ] ;
667
667
668
668
if ( days > daysInCurrentMonth - newDate . getDate ( ) ) {
669
669
// we spill over to next month
@@ -687,7 +687,7 @@ mergeInto(LibraryManager.library, {
687
687
688
688
// Note: this is not used in STANDALONE_WASM mode, because it is more
689
689
// compact to do it in JS.
690
- strftime__deps : [ '_isLeapYear ' , '_arraySum ' , '_addDays ' , '_MONTH_DAYS_REGULAR ' , '_MONTH_DAYS_LEAP ' ,
690
+ strftime__deps : [ '$isLeapYear ' , '$arraySum ' , '$addDays ' , '$MONTH_DAYS_REGULAR ' , '$MONTH_DAYS_LEAP ' ,
691
691
'$intArrayFromString' , '$writeArrayToMemory'
692
692
] ,
693
693
strftime__sig : 'ppppp' ,
@@ -798,7 +798,7 @@ mergeInto(LibraryManager.library, {
798
798
}
799
799
800
800
function getWeekBasedYear ( date ) {
801
- var thisDate = __addDays ( new Date ( date . tm_year + 1900 , 0 , 1 ) , date . tm_yday ) ;
801
+ var thisDate = addDays ( new Date ( date . tm_year + 1900 , 0 , 1 ) , date . tm_yday ) ;
802
802
803
803
var janFourthThisYear = new Date ( thisDate . getFullYear ( ) , 0 , 4 ) ;
804
804
var janFourthNextYear = new Date ( thisDate . getFullYear ( ) + 1 , 0 , 4 ) ;
@@ -866,7 +866,7 @@ mergeInto(LibraryManager.library, {
866
866
} ,
867
867
'%j' : function ( date ) {
868
868
// Day of the year (001-366)
869
- return leadingNulls ( date . tm_mday + __arraySum ( __isLeapYear ( date . tm_year + 1900 ) ? __MONTH_DAYS_LEAP : __MONTH_DAYS_REGULAR , date . tm_mon - 1 ) , 3 ) ;
869
+ return leadingNulls ( date . tm_mday + arraySum ( isLeapYear ( date . tm_year + 1900 ) ? MONTH_DAYS_LEAP : MONTH_DAYS_REGULAR , date . tm_mon - 1 ) , 3 ) ;
870
870
} ,
871
871
'%m' : function ( date ) {
872
872
return leadingNulls ( date . tm_mon + 1 , 2 ) ;
@@ -913,14 +913,14 @@ mergeInto(LibraryManager.library, {
913
913
// If 31 December of prev year a Thursday, or Friday of a
914
914
// leap year, then the prev year has 53 weeks.
915
915
var dec31 = ( date . tm_wday + 7 - date . tm_yday - 1 ) % 7 ;
916
- if ( dec31 == 4 || ( dec31 == 5 && __isLeapYear ( date . tm_year % 400 - 1 ) ) ) {
916
+ if ( dec31 == 4 || ( dec31 == 5 && isLeapYear ( date . tm_year % 400 - 1 ) ) ) {
917
917
val ++ ;
918
918
}
919
919
} else if ( val == 53 ) {
920
920
// If 1 January is not a Thursday, and not a Wednesday of a
921
921
// leap year, then this year has only 52 weeks.
922
922
var jan1 = ( date . tm_wday + 371 - date . tm_yday ) % 7 ;
923
- if ( jan1 != 4 && ( jan1 != 3 || ! __isLeapYear ( date . tm_year ) ) )
923
+ if ( jan1 != 4 && ( jan1 != 3 || ! isLeapYear ( date . tm_year ) ) )
924
924
val = 1 ;
925
925
}
926
926
return leadingNulls ( val , 2 ) ;
@@ -982,7 +982,7 @@ mergeInto(LibraryManager.library, {
982
982
return _strftime ( s , maxsize , format , tm ) ; // no locale support yet
983
983
} ,
984
984
985
- strptime__deps : [ '_isLeapYear ' , '_arraySum ' , '_addDays ' , '_MONTH_DAYS_REGULAR ' , '_MONTH_DAYS_LEAP ' ,
985
+ strptime__deps : [ '$isLeapYear ' , '$arraySum ' , '$addDays ' , '$MONTH_DAYS_REGULAR ' , '$MONTH_DAYS_LEAP ' ,
986
986
'$jstoi_q' , '$intArrayFromString' ] ,
987
987
strptime__sig : 'pppp' ,
988
988
strptime : function ( buf , format , tm ) {
@@ -1143,10 +1143,10 @@ mergeInto(LibraryManager.library, {
1143
1143
} else if ( ( value = getMatch ( 'j' ) ) ) {
1144
1144
// get day of month from day of year ...
1145
1145
var day = jstoi_q ( value ) ;
1146
- var leapYear = __isLeapYear ( date . year ) ;
1146
+ var leapYear = isLeapYear ( date . year ) ;
1147
1147
for ( var month = 0 ; month < 12 ; ++ month ) {
1148
- var daysUntilMonth = __arraySum ( leapYear ? __MONTH_DAYS_LEAP : __MONTH_DAYS_REGULAR , month - 1 ) ;
1149
- if ( day <= daysUntilMonth + ( leapYear ? __MONTH_DAYS_LEAP : __MONTH_DAYS_REGULAR ) [ month ] ) {
1148
+ var daysUntilMonth = arraySum ( leapYear ? MONTH_DAYS_LEAP : MONTH_DAYS_REGULAR , month - 1 ) ;
1149
+ if ( day <= daysUntilMonth + ( leapYear ? MONTH_DAYS_LEAP : MONTH_DAYS_REGULAR ) [ month ] ) {
1150
1150
date . day = day - daysUntilMonth ;
1151
1151
}
1152
1152
}
@@ -1165,10 +1165,10 @@ mergeInto(LibraryManager.library, {
1165
1165
var endDate ;
1166
1166
if ( janFirst . getDay ( ) === 0 ) {
1167
1167
// Jan 1st is a Sunday, and, hence in the 1st CW
1168
- endDate = __addDays ( janFirst , weekDayNumber + 7 * ( weekNumber - 1 ) ) ;
1168
+ endDate = addDays ( janFirst , weekDayNumber + 7 * ( weekNumber - 1 ) ) ;
1169
1169
} else {
1170
1170
// Jan 1st is not a Sunday, and, hence still in the 0th CW
1171
- endDate = __addDays ( janFirst , 7 - janFirst . getDay ( ) + weekDayNumber + 7 * ( weekNumber - 1 ) ) ;
1171
+ endDate = addDays ( janFirst , 7 - janFirst . getDay ( ) + weekDayNumber + 7 * ( weekNumber - 1 ) ) ;
1172
1172
}
1173
1173
date . day = endDate . getDate ( ) ;
1174
1174
date . month = endDate . getMonth ( ) ;
@@ -1184,10 +1184,10 @@ mergeInto(LibraryManager.library, {
1184
1184
var endDate ;
1185
1185
if ( janFirst . getDay ( ) === 1 ) {
1186
1186
// Jan 1st is a Monday, and, hence in the 1st CW
1187
- endDate = __addDays ( janFirst , weekDayNumber + 7 * ( weekNumber - 1 ) ) ;
1187
+ endDate = addDays ( janFirst , weekDayNumber + 7 * ( weekNumber - 1 ) ) ;
1188
1188
} else {
1189
1189
// Jan 1st is not a Monday, and, hence still in the 0th CW
1190
- endDate = __addDays ( janFirst , 7 - janFirst . getDay ( ) + 1 + weekDayNumber + 7 * ( weekNumber - 1 ) ) ;
1190
+ endDate = addDays ( janFirst , 7 - janFirst . getDay ( ) + 1 + weekDayNumber + 7 * ( weekNumber - 1 ) ) ;
1191
1191
}
1192
1192
1193
1193
date . day = endDate . getDate ( ) ;
@@ -1215,7 +1215,7 @@ mergeInto(LibraryManager.library, {
1215
1215
{ { { makeSetValue ( 'tm' , C_STRUCTS . tm . tm_mon , 'fullDate.getMonth()' , 'i32' ) } } } ;
1216
1216
{ { { makeSetValue ( 'tm' , C_STRUCTS . tm . tm_year , 'fullDate.getFullYear()-1900' , 'i32' ) } } } ;
1217
1217
{ { { makeSetValue ( 'tm' , C_STRUCTS . tm . tm_wday , 'fullDate.getDay()' , 'i32' ) } } } ;
1218
- { { { makeSetValue ( 'tm' , C_STRUCTS . tm . tm_yday , '__arraySum(__isLeapYear (fullDate.getFullYear()) ? __MONTH_DAYS_LEAP : __MONTH_DAYS_REGULAR , fullDate.getMonth()-1)+fullDate.getDate()-1' , 'i32' ) } } } ;
1218
+ { { { makeSetValue ( 'tm' , C_STRUCTS . tm . tm_yday , 'arraySum(isLeapYear (fullDate.getFullYear()) ? MONTH_DAYS_LEAP : MONTH_DAYS_REGULAR , fullDate.getMonth()-1)+fullDate.getDate()-1' , 'i32' ) } } } ;
1219
1219
{ { { makeSetValue ( 'tm' , C_STRUCTS . tm . tm_isdst , '0' , 'i32' ) } } } ;
1220
1220
1221
1221
// we need to convert the matched sequence into an integer array to take care of UTF-8 characters > 0x7F
@@ -2475,9 +2475,9 @@ mergeInto(LibraryManager.library, {
2475
2475
return [ args , funcname , str ] ;
2476
2476
} ,
2477
2477
2478
- emscripten_get_callstack_js__deps : [ '$traverseStack' , '$jsStackTrace' , '$warnOnce' ] ,
2479
- emscripten_get_callstack_js__docs : '/** @param {number=} flags */' ,
2480
- emscripten_get_callstack_js : function ( flags ) {
2478
+ $getCallstack__deps : [ '$traverseStack' , '$jsStackTrace' , '$warnOnce' ] ,
2479
+ $getCallstack__docs : '/** @param {number=} flags */' ,
2480
+ $getCallstack : function ( flags ) {
2481
2481
var callstack = jsStackTrace ( ) ;
2482
2482
2483
2483
// Find the symbols in the callstack that corresponds to the functions that
@@ -2588,13 +2588,13 @@ mergeInto(LibraryManager.library, {
2588
2588
return callstack ;
2589
2589
} ,
2590
2590
2591
- emscripten_get_callstack__deps : [ 'emscripten_get_callstack_js ' ] ,
2591
+ emscripten_get_callstack__deps : [ '$getCallstack ' ] ,
2592
2592
emscripten_get_callstack : function ( flags , str , maxbytes ) {
2593
2593
// Use explicit calls to from64 rather then using the __sig
2594
2594
// magic here. This is because the __sig wrapper uses arrow function
2595
2595
// notation which causes the inner call to traverseStack to fail.
2596
2596
{ { { from64 ( 'str' ) } } } ;
2597
- var callstack = _emscripten_get_callstack_js ( flags ) ;
2597
+ var callstack = getCallstack ( flags ) ;
2598
2598
// User can query the required amount of bytes to hold the callstack.
2599
2599
if ( ! str || maxbytes <= 0 ) {
2600
2600
return lengthBytesUTF8 ( callstack ) + 1 ;
@@ -2606,11 +2606,11 @@ mergeInto(LibraryManager.library, {
2606
2606
return bytesWrittenExcludingNull + 1 ;
2607
2607
} ,
2608
2608
2609
- emscripten_log_js__deps : [ 'emscripten_get_callstack_js ' ] ,
2610
- emscripten_log_js : function ( flags , str ) {
2609
+ $emscriptenLog__deps : [ '$getCallstack ' ] ,
2610
+ $emscriptenLog : function ( flags , str ) {
2611
2611
if ( flags & { { { cDefine ( 'EM_LOG_C_STACK' ) | cDefine ( 'EM_LOG_JS_STACK' ) } } } ) {
2612
2612
str = str . replace ( / \s + $ / , '' ) ; // Ensure the message and the callstack are joined cleanly with exactly one newline.
2613
- str += ( str . length > 0 ? '\n' : '' ) + _emscripten_get_callstack_js ( flags ) ;
2613
+ str += ( str . length > 0 ? '\n' : '' ) + getCallstack ( flags ) ;
2614
2614
}
2615
2615
2616
2616
if ( flags & { { { cDefine ( 'EM_LOG_CONSOLE' ) } } } ) {
@@ -2633,11 +2633,11 @@ mergeInto(LibraryManager.library, {
2633
2633
} ,
2634
2634
2635
2635
emscripten_log__sig : 'vipp ',
2636
- emscripten_log__deps : [ '$formatString' , 'emscripten_log_js ' ] ,
2636
+ emscripten_log__deps : [ '$formatString' , '$emscriptenLog ' ] ,
2637
2637
emscripten_log : function ( flags , format , varargs ) {
2638
2638
var result = formatString ( format , varargs ) ;
2639
2639
var str = UTF8ArrayToString ( result , 0 ) ;
2640
- _emscripten_log_js ( flags , str ) ;
2640
+ emscriptenLog ( flags , str ) ;
2641
2641
} ,
2642
2642
2643
2643
// We never free the return values of this function so we need to allocate
@@ -3121,9 +3121,9 @@ mergeInto(LibraryManager.library, {
3121
3121
#if LINK_AS_CXX
3122
3122
// libunwind
3123
3123
3124
- _Unwind_Backtrace__deps: [ 'emscripten_get_callstack_js ' ] ,
3124
+ _Unwind_Backtrace__deps: [ '$getCallstack ' ] ,
3125
3125
_Unwind_Backtrace : function ( func , arg ) {
3126
- var trace = _emscripten_get_callstack_js ( ) ;
3126
+ var trace = getCallstack ( ) ;
3127
3127
var parts = trace . split ( '\n' ) ;
3128
3128
for ( var i = 0 ; i < parts . length ; i ++ ) {
3129
3129
var ret = { { { makeDynCall ( 'iii' , 'func' ) } } } ( 0 , arg ) ;
0 commit comments