Skip to content

Commit 28751c8

Browse files
committed
astyle formatting
[ci skip]
1 parent 4b61640 commit 28751c8

2 files changed

Lines changed: 78 additions & 76 deletions

File tree

‎lib/mathlib.cpp‎

Lines changed: 76 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -25,98 +25,100 @@
2525
#include <cctype>
2626
#include <limits>
2727

28-
MathLib::biguint MathLib::toULongNumber(const std::string & str) {
29-
// hexadecimal numbers:
30-
if (isHex(str)) {
31-
if (str[0] == '-') {
32-
biguint ret = 0;
33-
std::istringstream istr(str);
34-
istr >> std::hex >> ret;
35-
return ret;
36-
} else {
37-
unsigned long long ret = 0;
38-
std::istringstream istr(str);
39-
istr >> std::hex >> ret;
40-
return (biguint)ret;
41-
}
42-
}
43-
44-
// octal numbers:
45-
if (isOct(str)) {
28+
MathLib::biguint MathLib::toULongNumber(const std::string & str)
29+
{
30+
// hexadecimal numbers:
31+
if (isHex(str)) {
32+
if (str[0] == '-') {
4633
biguint ret = 0;
4734
std::istringstream istr(str);
48-
istr >> std::oct >> ret;
49-
return ret;
50-
}
51-
52-
// binary numbers:
53-
if (isBin(str)) {
54-
biguint ret = 0;
55-
for (std::string::size_type i = str[0] == '0'?2:3; i < str.length(); i++) {
56-
ret <<= 1;
57-
if (str[i] == '1')
58-
ret |= 1;
59-
}
60-
/* if (str[0] == '-')
61-
ret = -ret; */
35+
istr >> std::hex >> ret;
6236
return ret;
37+
} else {
38+
unsigned long long ret = 0;
39+
std::istringstream istr(str);
40+
istr >> std::hex >> ret;
41+
return (biguint)ret;
6342
}
43+
}
6444

65-
if (isFloat(str)) {
66-
return static_cast<biguint>(std::atof(str.c_str()));
67-
}
68-
45+
// octal numbers:
46+
if (isOct(str)) {
6947
biguint ret = 0;
7048
std::istringstream istr(str);
71-
istr >> ret;
49+
istr >> std::oct >> ret;
7250
return ret;
73-
}
74-
75-
MathLib::bigint MathLib::toLongNumber(const std::string & str) {
76-
// hexadecimal numbers:
77-
if (isHex(str)) {
78-
if (str[0] == '-') {
79-
bigint ret = 0;
80-
std::istringstream istr(str);
81-
istr >> std::hex >> ret;
82-
return ret;
83-
} else {
84-
unsigned long long ret = 0;
85-
std::istringstream istr(str);
86-
istr >> std::hex >> ret;
87-
return (bigint)ret;
88-
}
89-
}
51+
}
9052

91-
// octal numbers:
92-
if (isOct(str)) {
93-
bigint ret = 0;
94-
std::istringstream istr(str);
95-
istr >> std::oct >> ret;
96-
return ret;
53+
// binary numbers:
54+
if (isBin(str)) {
55+
biguint ret = 0;
56+
for (std::string::size_type i = str[0] == '0'?2:3; i < str.length(); i++) {
57+
ret <<= 1;
58+
if (str[i] == '1')
59+
ret |= 1;
9760
}
61+
/* if (str[0] == '-')
62+
ret = -ret; */
63+
return ret;
64+
}
65+
66+
if (isFloat(str)) {
67+
return static_cast<biguint>(std::atof(str.c_str()));
68+
}
69+
70+
biguint ret = 0;
71+
std::istringstream istr(str);
72+
istr >> ret;
73+
return ret;
74+
}
9875

99-
// binary numbers:
100-
if (isBin(str)) {
76+
MathLib::bigint MathLib::toLongNumber(const std::string & str)
77+
{
78+
// hexadecimal numbers:
79+
if (isHex(str)) {
80+
if (str[0] == '-') {
10181
bigint ret = 0;
102-
for (std::string::size_type i = str[0] == '0'?2:3; i < str.length(); i++) {
103-
ret <<= 1;
104-
if (str[i] == '1')
105-
ret |= 1;
106-
}
107-
if (str[0] == '-')
108-
ret = -ret;
82+
std::istringstream istr(str);
83+
istr >> std::hex >> ret;
10984
return ret;
85+
} else {
86+
unsigned long long ret = 0;
87+
std::istringstream istr(str);
88+
istr >> std::hex >> ret;
89+
return (bigint)ret;
11090
}
91+
}
11192

112-
if (isFloat(str)) {
113-
return static_cast<bigint>(std::atof(str.c_str()));
114-
}
115-
93+
// octal numbers:
94+
if (isOct(str)) {
11695
bigint ret = 0;
11796
std::istringstream istr(str);
118-
istr >> ret;
97+
istr >> std::oct >> ret;
11998
return ret;
99+
}
100+
101+
// binary numbers:
102+
if (isBin(str)) {
103+
bigint ret = 0;
104+
for (std::string::size_type i = str[0] == '0'?2:3; i < str.length(); i++) {
105+
ret <<= 1;
106+
if (str[i] == '1')
107+
ret |= 1;
108+
}
109+
if (str[0] == '-')
110+
ret = -ret;
111+
return ret;
112+
}
113+
114+
if (isFloat(str)) {
115+
return static_cast<bigint>(std::atof(str.c_str()));
116+
}
117+
118+
bigint ret = 0;
119+
std::istringstream istr(str);
120+
istr >> ret;
121+
return ret;
120122
}
121123

122124

‎lib/templatesimplifier.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ static std::string ShiftInt(const char cop, const Token* left, const Token* righ
804804
{
805805
if (cop == '&' || cop == '|' || cop == '^')
806806
return MathLib::calculate(left->str(), right->str(), cop);
807-
807+
808808
const MathLib::bigint leftInt=MathLib::toLongNumber(left->str());
809809
const MathLib::bigint rightInt=MathLib::toLongNumber(right->str());
810810
if (cop == '<') {
@@ -820,7 +820,7 @@ static std::string ShiftUInt(const char cop, const Token* left, const Token* rig
820820
{
821821
if (cop == '&' || cop == '|' || cop == '^')
822822
return MathLib::calculate(left->str(), right->str(), cop);
823-
823+
824824
const MathLib::biguint leftInt=MathLib::toULongNumber(left->str());
825825
const MathLib::biguint rightInt=MathLib::toULongNumber(right->str());
826826
if (cop == '<') {

0 commit comments

Comments
 (0)