diff --git a/src/CalcManager/Ratpack/conv.cpp b/src/CalcManager/Ratpack/conv.cpp index a9adcb74..cd7af0e2 100644 --- a/src/CalcManager/Ratpack/conv.cpp +++ b/src/CalcManager/Ratpack/conv.cpp @@ -131,7 +131,8 @@ void* zmalloc(size_t a) void _dupnum(_In_ PNUMBER dest, _In_ const NUMBER* const src) { - memcpy(dest, src, (int)(sizeof(NUMBER) + ((src)->cdigit) * (sizeof(MANTTYPE)))); + memcpy(dest, src, (int)(sizeof(NUMBER) - sizeof(MANTTYPE*))); + memcpy(dest->mant, src->mant, (int)(src->cdigit) * sizeof(MANTTYPE)); } //----------------------------------------------------------------------------- @@ -151,6 +152,7 @@ void _destroynum(_In_ PNUMBER pnum) { if (pnum != nullptr) { + free(pnum->mant); free(pnum); } } @@ -198,14 +200,18 @@ PNUMBER _createnum(_In_ uint32_t size) uint32_t cbAlloc; // sizeof( MANTTYPE ) is the size of a 'digit' - if (SUCCEEDED(Calc_ULongAdd(size, 1, &cbAlloc)) && SUCCEEDED(Calc_ULongMult(cbAlloc, sizeof(MANTTYPE), &cbAlloc)) - && SUCCEEDED(Calc_ULongAdd(cbAlloc, sizeof(NUMBER), &cbAlloc))) + if (SUCCEEDED(Calc_ULongMult(size, sizeof(MANTTYPE), &cbAlloc))) { - pnumret = (PNUMBER)zmalloc(cbAlloc); + pnumret = (PNUMBER)zmalloc(sizeof(NUMBER)); if (pnumret == nullptr) { throw(CALC_E_OUTOFMEMORY); } + pnumret->mant = (MANTTYPE*)zmalloc(cbAlloc); + if (pnumret->mant == nullptr) + { + throw(CALC_E_OUTOFMEMORY); + } } else { diff --git a/src/CalcManager/Ratpack/ratconst.h b/src/CalcManager/Ratpack/ratconst.h index 00f10ad7..7ddf78b3 100644 --- a/src/CalcManager/Ratpack/ratconst.h +++ b/src/CalcManager/Ratpack/ratconst.h @@ -4,591 +4,345 @@ #pragma once // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_num_one = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_num_one[] = { + 1, +}; +inline const NUMBER init_num_one = { 1, 1, 0, p_init_num_one }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_num_two = { 1, - 1, - 0, - { - 2, - } }; +MANTTYPE p_init_num_two[] = { + 2, +}; +inline const NUMBER init_num_two = { 1, 1, 0, p_init_num_two }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_num_five = { 1, - 1, - 0, - { - 5, - } }; +MANTTYPE p_init_num_five[] = { + 5, +}; +inline const NUMBER init_num_five = { 1, 1, 0, p_init_num_five }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_num_six = { 1, - 1, - 0, - { - 6, - } }; +MANTTYPE p_init_num_six[] = { + 6, +}; +inline const NUMBER init_num_six = { 1, 1, 0, p_init_num_six }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_num_ten = { 1, - 1, - 0, - { - 10, - } }; +MANTTYPE p_init_num_ten[] = { + 10, +}; +inline const NUMBER init_num_ten = { 1, 1, 0, p_init_num_ten }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_smallest = { 1, - 1, - 0, - { - 1, - } }; -inline const NUMBER init_q_rat_smallest = { 1, - 4, - 0, - { - 0, - 190439170, - 901055854, - 10097, - } }; +MANTTYPE p_init_p_rat_smallest[] = { + 1, +}; +inline const NUMBER init_p_rat_smallest = { 1, 1, 0, p_init_p_rat_smallest }; +MANTTYPE p_init_q_rat_smallest[] = { + 0, + 190439170, + 901055854, + 10097, +}; +inline const NUMBER init_q_rat_smallest = { 1, 4, 0, p_init_q_rat_smallest }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_negsmallest = { -1, - 1, - 0, - { - 1, - } }; -inline const NUMBER init_q_rat_negsmallest = { 1, - 4, - 0, - { - 0, - 190439170, - 901055854, - 10097, - } }; +MANTTYPE p_init_p_rat_negsmallest[] = { + 1, +}; +inline const NUMBER init_p_rat_negsmallest = { -1, 1, 0, p_init_p_rat_negsmallest }; +MANTTYPE p_init_q_rat_negsmallest[] = { + 0, + 190439170, + 901055854, + 10097, +}; +inline const NUMBER init_q_rat_negsmallest = { 1, 4, 0, p_init_q_rat_negsmallest }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_pt_eight_five = { 1, - 1, - 0, - { - 85, - } }; -inline const NUMBER init_q_pt_eight_five = { 1, - 1, - 0, - { - 100, - } }; +MANTTYPE p_init_p_pt_eight_five[] = { + 85, +}; +inline const NUMBER init_p_pt_eight_five = { 1, 1, 0, p_init_p_pt_eight_five }; +MANTTYPE p_init_q_pt_eight_five[] = { + 100, +}; +inline const NUMBER init_q_pt_eight_five = { 1, 1, 0, p_init_q_pt_eight_five }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_six = { 1, - 1, - 0, - { - 6, - } }; -inline const NUMBER init_q_rat_six = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_six[] = { + 6, +}; +inline const NUMBER init_p_rat_six = { 1, 1, 0, p_init_p_rat_six }; +MANTTYPE p_init_q_rat_six[] = { + 1, +}; +inline const NUMBER init_q_rat_six = { 1, 1, 0, p_init_q_rat_six }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_two = { 1, - 1, - 0, - { - 2, - } }; -inline const NUMBER init_q_rat_two = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_two[] = { + 2, +}; +inline const NUMBER init_p_rat_two = { 1, 1, 0, p_init_p_rat_two }; +MANTTYPE p_init_q_rat_two[] = { + 1, +}; +inline const NUMBER init_q_rat_two = { 1, 1, 0, p_init_q_rat_two }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_zero = { 1, - 1, - 0, - { - 0, - } }; -inline const NUMBER init_q_rat_zero = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_zero[] = { + 0, +}; +inline const NUMBER init_p_rat_zero = { 1, 1, 0, p_init_p_rat_zero }; +MANTTYPE p_init_q_rat_zero[] = { + 1, +}; +inline const NUMBER init_q_rat_zero = { 1, 1, 0, p_init_q_rat_zero }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_one = { 1, - 1, - 0, - { - 1, - } }; -inline const NUMBER init_q_rat_one = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_one[] = { + 1, +}; +inline const NUMBER init_p_rat_one = { 1, 1, 0, p_init_p_rat_one }; +MANTTYPE p_init_q_rat_one[] = { + 1, +}; +inline const NUMBER init_q_rat_one = { 1, 1, 0, p_init_q_rat_one }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_neg_one = { -1, - 1, - 0, - { - 1, - } }; -inline const NUMBER init_q_rat_neg_one = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_neg_one[] = { + 1, +}; +inline const NUMBER init_p_rat_neg_one = { -1, 1, 0, p_init_p_rat_neg_one }; +MANTTYPE p_init_q_rat_neg_one[] = { + 1, +}; +inline const NUMBER init_q_rat_neg_one = { 1, 1, 0, p_init_q_rat_neg_one }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_half = { 1, - 1, - 0, - { - 1, - } }; -inline const NUMBER init_q_rat_half = { 1, - 1, - 0, - { - 2, - } }; +MANTTYPE p_init_p_rat_half[] = { + 1, +}; +inline const NUMBER init_p_rat_half = { 1, 1, 0, p_init_p_rat_half }; +MANTTYPE p_init_q_rat_half[] = { + 2, +}; +inline const NUMBER init_q_rat_half = { 1, 1, 0, p_init_q_rat_half }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_ten = { 1, - 1, - 0, - { - 10, - } }; -inline const NUMBER init_q_rat_ten = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_ten[] = { + 10, +}; +inline const NUMBER init_p_rat_ten = { 1, 1, 0, p_init_p_rat_ten }; +MANTTYPE p_init_q_rat_ten[] = { + 1, +}; +inline const NUMBER init_q_rat_ten = { 1, 1, 0, p_init_q_rat_ten }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_pi = { 1, - 6, - 0, - { - 125527896, - 283898350, - 1960493936, - 1672850762, - 1288168272, - 8, - } }; -inline const NUMBER init_q_pi = { 1, - 6, - 0, - { - 1288380402, - 1120116153, - 1860424692, - 1944118326, - 1583591604, - 2, - } }; +MANTTYPE p_init_p_pi[] = { + 125527896, 283898350, 1960493936, 1672850762, 1288168272, 8, +}; +inline const NUMBER init_p_pi = { 1, 6, 0, p_init_p_pi }; +MANTTYPE p_init_q_pi[] = { + 1288380402, 1120116153, 1860424692, 1944118326, 1583591604, 2, +}; +inline const NUMBER init_q_pi = { 1, 6, 0, p_init_q_pi }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_two_pi = { 1, - 6, - 0, - { - 251055792, - 567796700, - 1773504224, - 1198217877, - 428852897, - 17, - } }; -inline const NUMBER init_q_two_pi = { 1, - 6, - 0, - { - 1288380402, - 1120116153, - 1860424692, - 1944118326, - 1583591604, - 2, - } }; +MANTTYPE p_init_p_two_pi[] = { + 251055792, 567796700, 1773504224, 1198217877, 428852897, 17, +}; +inline const NUMBER init_p_two_pi = { 1, 6, 0, p_init_p_two_pi }; +MANTTYPE p_init_q_two_pi[] = { + 1288380402, 1120116153, 1860424692, 1944118326, 1583591604, 2, +}; +inline const NUMBER init_q_two_pi = { 1, 6, 0, p_init_q_two_pi }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_pi_over_two = { 1, - 6, - 0, - { - 125527896, - 283898350, - 1960493936, - 1672850762, - 1288168272, - 8, - } }; -inline const NUMBER init_q_pi_over_two = { 1, - 6, - 0, - { - 429277156, - 92748659, - 1573365737, - 1740753005, - 1019699561, - 5, - } }; +MANTTYPE p_init_p_pi_over_two[] = { + 125527896, 283898350, 1960493936, 1672850762, 1288168272, 8, +}; +inline const NUMBER init_p_pi_over_two = { 1, 6, 0, p_init_p_pi_over_two }; +MANTTYPE p_init_q_pi_over_two[] = { + 429277156, 92748659, 1573365737, 1740753005, 1019699561, 5, +}; +inline const NUMBER init_q_pi_over_two = { 1, 6, 0, p_init_q_pi_over_two }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_one_pt_five_pi = { 1, - 6, - 0, - { - 1241201312, - 270061909, - 1051574664, - 1924965045, - 1340320627, - 70, - } }; -inline const NUMBER init_q_one_pt_five_pi = { 1, - 6, - 0, - { - 1579671539, - 1837970263, - 1067644340, - 523549916, - 2119366659, - 14, - } }; +MANTTYPE p_init_p_one_pt_five_pi[] = { + 1241201312, 270061909, 1051574664, 1924965045, 1340320627, 70, +}; +inline const NUMBER init_p_one_pt_five_pi = { 1, 6, 0, p_init_p_one_pt_five_pi }; +MANTTYPE p_init_q_one_pt_five_pi[] = { + 1579671539, 1837970263, 1067644340, 523549916, 2119366659, 14, +}; +inline const NUMBER init_q_one_pt_five_pi = { 1, 6, 0, p_init_q_one_pt_five_pi }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_e_to_one_half = { 1, - 6, - 0, - { - 256945612, - 216219427, - 223516738, - 477442596, - 581063757, - 23, - } }; -inline const NUMBER init_q_e_to_one_half = { 1, - 6, - 0, - { - 1536828363, - 698484484, - 1127331835, - 224219346, - 245499408, - 14, - } }; +MANTTYPE p_init_p_e_to_one_half[] = { + 256945612, 216219427, 223516738, 477442596, 581063757, 23, +}; +inline const NUMBER init_p_e_to_one_half = { 1, 6, 0, p_init_p_e_to_one_half }; +MANTTYPE p_init_q_e_to_one_half[] = { + 1536828363, 698484484, 1127331835, 224219346, 245499408, 14, +}; +inline const NUMBER init_q_e_to_one_half = { 1, 6, 0, p_init_q_e_to_one_half }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_exp = { 1, - 6, - 0, - { - 943665199, - 1606559160, - 1094967530, - 1759391384, - 1671799163, - 1123581, - } }; -inline const NUMBER init_q_rat_exp = { 1, - 6, - 0, - { - 879242208, - 2022880100, - 617392930, - 1374929092, - 1367479163, - 413342, - } }; +MANTTYPE p_init_p_rat_exp[] = { + 943665199, 1606559160, 1094967530, 1759391384, 1671799163, 1123581, +}; +inline const NUMBER init_p_rat_exp = { 1, 6, 0, p_init_p_rat_exp }; +MANTTYPE p_init_q_rat_exp[] = { + 879242208, 2022880100, 617392930, 1374929092, 1367479163, 413342, +}; +inline const NUMBER init_q_rat_exp = { 1, 6, 0, p_init_q_rat_exp }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_ln_ten = { 1, - 6, - 0, - { - 2086268922, - 165794492, - 1416063951, - 1851428830, - 1893239400, - 65366841, - } }; -inline const NUMBER init_q_ln_ten = { 1, - 6, - 0, - { - 26790652, - 564532679, - 783998273, - 216030448, - 1564709968, - 28388458, - } }; +MANTTYPE p_init_p_ln_ten[] = { + 2086268922, 165794492, 1416063951, 1851428830, 1893239400, 65366841, +}; +inline const NUMBER init_p_ln_ten = { 1, 6, 0, p_init_p_ln_ten }; +MANTTYPE p_init_q_ln_ten[] = { + 26790652, 564532679, 783998273, 216030448, 1564709968, 28388458, +}; +inline const NUMBER init_q_ln_ten = { 1, 6, 0, p_init_q_ln_ten }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_ln_two = { 1, - 6, - 0, - { - 1789230241, - 1057927868, - 715399197, - 908801241, - 1411265331, - 3, - } }; -inline const NUMBER init_q_ln_two = { 1, - 6, - 0, - { - 1559869847, - 1930657510, - 1228561531, - 219003871, - 593099283, - 5, - } }; +MANTTYPE p_init_p_ln_two[] = { + 1789230241, 1057927868, 715399197, 908801241, 1411265331, 3, +}; +inline const NUMBER init_p_ln_two = { 1, 6, 0, p_init_p_ln_two }; +MANTTYPE p_init_q_ln_two[] = { + 1559869847, 1930657510, 1228561531, 219003871, 593099283, 5, +}; +inline const NUMBER init_q_ln_two = { 1, 6, 0, p_init_q_ln_two }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rad_to_deg = { 1, - 6, - 0, - { - 2127722024, - 1904928383, - 2016479213, - 2048947859, - 1578647346, - 492, - } }; -inline const NUMBER init_q_rad_to_deg = { 1, - 6, - 0, - { - 125527896, - 283898350, - 1960493936, - 1672850762, - 1288168272, - 8, - } }; +MANTTYPE p_init_p_rad_to_deg[] = { + 2127722024, 1904928383, 2016479213, 2048947859, 1578647346, 492, +}; +inline const NUMBER init_p_rad_to_deg = { 1, 6, 0, p_init_p_rad_to_deg }; +MANTTYPE p_init_q_rad_to_deg[] = { + 125527896, 283898350, 1960493936, 1672850762, 1288168272, 8, +}; +inline const NUMBER init_q_rad_to_deg = { 1, 6, 0, p_init_q_rad_to_deg }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rad_to_grad = { 1, - 6, - 0, - { - 2125526288, - 684931327, - 570267400, - 129125085, - 1038224725, - 547, - } }; -inline const NUMBER init_q_rad_to_grad = { 1, - 6, - 0, - { - 125527896, - 283898350, - 1960493936, - 1672850762, - 1288168272, - 8, - } }; +MANTTYPE p_init_p_rad_to_grad[] = { + 2125526288, 684931327, 570267400, 129125085, 1038224725, 547, +}; +inline const NUMBER init_p_rad_to_grad = { 1, 6, 0, p_init_p_rad_to_grad }; +MANTTYPE p_init_q_rad_to_grad[] = { + 125527896, 283898350, 1960493936, 1672850762, 1288168272, 8, +}; +inline const NUMBER init_q_rad_to_grad = { 1, 6, 0, p_init_q_rad_to_grad }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_qword = { 1, - 3, - 0, - { - 2147483647, - 2147483647, - 3, - } }; -inline const NUMBER init_q_rat_qword = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_qword[] = { + 2147483647, + 2147483647, + 3, +}; +inline const NUMBER init_p_rat_qword = { 1, 3, 0, p_init_p_rat_qword }; +MANTTYPE p_init_q_rat_qword[] = { + 1, +}; +inline const NUMBER init_q_rat_qword = { 1, 1, 0, p_init_q_rat_qword }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_dword = { 1, - 2, - 0, - { - 2147483647, - 1, - } }; -inline const NUMBER init_q_rat_dword = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_dword[] = { + 2147483647, + 1, +}; +inline const NUMBER init_p_rat_dword = { 1, 2, 0, p_init_p_rat_dword }; +MANTTYPE p_init_q_rat_dword[] = { + 1, +}; +inline const NUMBER init_q_rat_dword = { 1, 1, 0, p_init_q_rat_dword }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_max_i32 = { 1, - 1, - 0, - { - 2147483647, - } }; -inline const NUMBER init_q_rat_max_i32 = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_max_i32[] = { + 2147483647, +}; +inline const NUMBER init_p_rat_max_i32 = { 1, 1, 0, p_init_p_rat_max_i32 }; +MANTTYPE p_init_q_rat_max_i32[] = { + 1, +}; +inline const NUMBER init_q_rat_max_i32 = { 1, 1, 0, p_init_q_rat_max_i32 }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_min_i32 = { -1, - 2, - 0, - { - 0, - 1, - } }; -inline const NUMBER init_q_rat_min_i32 = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_min_i32[] = { + 0, + 1, +}; +inline const NUMBER init_p_rat_min_i32 = { -1, 2, 0, p_init_p_rat_min_i32 }; +MANTTYPE p_init_q_rat_min_i32[] = { + 1, +}; +inline const NUMBER init_q_rat_min_i32 = { 1, 1, 0, p_init_q_rat_min_i32 }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_word = { 1, - 1, - 0, - { - 65535, - } }; -inline const NUMBER init_q_rat_word = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_word[] = { + 65535, +}; +inline const NUMBER init_p_rat_word = { 1, 1, 0, p_init_p_rat_word }; +MANTTYPE p_init_q_rat_word[] = { + 1, +}; +inline const NUMBER init_q_rat_word = { 1, 1, 0, p_init_q_rat_word }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_byte = { 1, - 1, - 0, - { - 255, - } }; -inline const NUMBER init_q_rat_byte = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_byte[] = { + 255, +}; +inline const NUMBER init_p_rat_byte = { 1, 1, 0, p_init_p_rat_byte }; +MANTTYPE p_init_q_rat_byte[] = { + 1, +}; +inline const NUMBER init_q_rat_byte = { 1, 1, 0, p_init_q_rat_byte }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_400 = { 1, - 1, - 0, - { - 400, - } }; -inline const NUMBER init_q_rat_400 = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_400[] = { + 400, +}; +inline const NUMBER init_p_rat_400 = { 1, 1, 0, p_init_p_rat_400 }; +MANTTYPE p_init_q_rat_400[] = { + 1, +}; +inline const NUMBER init_q_rat_400 = { 1, 1, 0, p_init_q_rat_400 }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_360 = { 1, - 1, - 0, - { - 360, - } }; -inline const NUMBER init_q_rat_360 = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_360[] = { + 360, +}; +inline const NUMBER init_p_rat_360 = { 1, 1, 0, p_init_p_rat_360 }; +MANTTYPE p_init_q_rat_360[] = { + 1, +}; +inline const NUMBER init_q_rat_360 = { 1, 1, 0, p_init_q_rat_360 }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_200 = { 1, - 1, - 0, - { - 200, - } }; -inline const NUMBER init_q_rat_200 = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_200[] = { + 200, +}; +inline const NUMBER init_p_rat_200 = { 1, 1, 0, p_init_p_rat_200 }; +MANTTYPE p_init_q_rat_200[] = { + 1, +}; +inline const NUMBER init_q_rat_200 = { 1, 1, 0, p_init_q_rat_200 }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_180 = { 1, - 1, - 0, - { - 180, - } }; -inline const NUMBER init_q_rat_180 = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_180[] = { + 180, +}; +inline const NUMBER init_p_rat_180 = { 1, 1, 0, p_init_p_rat_180 }; +MANTTYPE p_init_q_rat_180[] = { + 1, +}; +inline const NUMBER init_q_rat_180 = { 1, 1, 0, p_init_q_rat_180 }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_max_exp = { 1, - 1, - 0, - { - 100000, - } }; -inline const NUMBER init_q_rat_max_exp = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_max_exp[] = { + 100000, +}; +inline const NUMBER init_p_rat_max_exp = { 1, 1, 0, p_init_p_rat_max_exp }; +MANTTYPE p_init_q_rat_max_exp[] = { + 1, +}; +inline const NUMBER init_q_rat_max_exp = { 1, 1, 0, p_init_q_rat_max_exp }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_min_exp = { -1, - 1, - 0, - { - 100000, - } }; -inline const NUMBER init_q_rat_min_exp = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_min_exp[] = { + 100000, +}; +inline const NUMBER init_p_rat_min_exp = { -1, 1, 0, p_init_p_rat_min_exp }; +MANTTYPE p_init_q_rat_min_exp[] = { + 1, +}; +inline const NUMBER init_q_rat_min_exp = { 1, 1, 0, p_init_q_rat_min_exp }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_max_fact = { 1, - 1, - 0, - { - 3249, - } }; -inline const NUMBER init_q_rat_max_fact = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_max_fact[] = { + 3249, +}; +inline const NUMBER init_p_rat_max_fact = { 1, 1, 0, p_init_p_rat_max_fact }; +MANTTYPE p_init_q_rat_max_fact[] = { + 1, +}; +inline const NUMBER init_q_rat_max_fact = { 1, 1, 0, p_init_q_rat_max_fact }; // Autogenerated by _dumprawrat in support.cpp -inline const NUMBER init_p_rat_min_fact = { -1, - 1, - 0, - { - 1000, - } }; -inline const NUMBER init_q_rat_min_fact = { 1, - 1, - 0, - { - 1, - } }; +MANTTYPE p_init_p_rat_min_fact[] = { + 1000, +}; +inline const NUMBER init_p_rat_min_fact = { -1, 1, 0, p_init_p_rat_min_fact }; +MANTTYPE p_init_q_rat_min_fact[] = { + 1, +}; +inline const NUMBER init_q_rat_min_fact = { 1, 1, 0, p_init_q_rat_min_fact }; diff --git a/src/CalcManager/Ratpack/ratpak.h b/src/CalcManager/Ratpack/ratpak.h index c18a70fd..88812e5d 100644 --- a/src/CalcManager/Ratpack/ratpak.h +++ b/src/CalcManager/Ratpack/ratpak.h @@ -66,7 +66,7 @@ typedef struct _number // radix being used. int32_t exp; // The offset of digits from the radix point // (decimal point in radix 10) - MANTTYPE mant[]; + MANTTYPE* mant; // This is actually allocated as a continuation of the // NUMBER structure. } NUMBER, *PNUMBER, **PPNUMBER;