Fixed collision with round math.h function
This commit is contained in:
parent
f210ed78c2
commit
e2a6b25345
@ -32,7 +32,7 @@ byte func; /* Function header detected */
|
|||||||
byte hash_ext;
|
byte hash_ext;
|
||||||
int curly; /* Level inside curly brackets */
|
int curly; /* Level inside curly brackets */
|
||||||
int xtern; /* Level inside a extern "C" {} situation */
|
int xtern; /* Level inside a extern "C" {} situation */
|
||||||
int round; /* Level inside () */
|
int round1; /* Level inside () */
|
||||||
int line, col;
|
int line, col;
|
||||||
dword chars;
|
dword chars;
|
||||||
char lastch;
|
char lastch;
|
||||||
@ -151,7 +151,7 @@ void phInit(char *filename) // filename is for reference only!!!
|
|||||||
slosh = last_slosh = start = func = comment = double_slash = hash = ignore1 =
|
slosh = last_slosh = start = func = comment = double_slash = hash = ignore1 =
|
||||||
quote1 = quote2 = hash_ext = false;
|
quote1 = quote2 = hash_ext = false;
|
||||||
|
|
||||||
buff_idx = curly = xtern = col = round = 0;
|
buff_idx = curly = xtern = col = round1 = 0;
|
||||||
|
|
||||||
line = 1;
|
line = 1;
|
||||||
|
|
||||||
@ -268,12 +268,12 @@ void phChar(char ch) {
|
|||||||
if (!IsIgnore()) {
|
if (!IsIgnore()) {
|
||||||
char st[80];
|
char st[80];
|
||||||
|
|
||||||
if ((curly == xtern) && (round == 0) && (start)) {
|
if ((curly == xtern) && (round1 == 0) && (start)) {
|
||||||
func = true;
|
func = true;
|
||||||
DBG("[FUNCTION]")
|
DBG("[FUNCTION]")
|
||||||
}
|
}
|
||||||
round++;
|
round1++;
|
||||||
sprintf(st, "[ROUND++ %d]", round);
|
sprintf(st, "[ROUND++ %d]", round1);
|
||||||
DBG(st)
|
DBG(st)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -282,9 +282,9 @@ void phChar(char ch) {
|
|||||||
if (!IsIgnore()) {
|
if (!IsIgnore()) {
|
||||||
char st[80];
|
char st[80];
|
||||||
|
|
||||||
if (round > 0) {
|
if (round1 > 0) {
|
||||||
round--;
|
round1--;
|
||||||
sprintf(st, "[ROUND-- %d]", round);
|
sprintf(st, "[ROUND-- %d]", round1);
|
||||||
DBG(st)
|
DBG(st)
|
||||||
} else {
|
} else {
|
||||||
ERR("too many \")\"\n");
|
ERR("too many \")\"\n");
|
||||||
@ -464,8 +464,8 @@ boolT phPost(void) {
|
|||||||
err = false;
|
err = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (round > 0) {
|
if (round1 > 0) {
|
||||||
sprintf(msg, "EOF: ( level = %d", round);
|
sprintf(msg, "EOF: ( level = %d", round1);
|
||||||
WARN(msg);
|
WARN(msg);
|
||||||
err = false;
|
err = false;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user