xpressn.c, formula(), #4/6 move around
This commit is contained in:
parent
b156921ea0
commit
577352e6bb
|
|
@ -1003,15 +1003,15 @@ formula(dico_t *dico, const char *s, const char *s_end, bool *perror)
|
||||||
fu = 0;
|
fu = 0;
|
||||||
} else if (alfa(c)) {
|
} else if (alfa(c)) {
|
||||||
const char *s_next = fetchid(s, s_end);
|
const char *s_next = fetchid(s, s_end);
|
||||||
const char *t;
|
|
||||||
spice_dstring_reinit(&tstr);
|
|
||||||
for (t = s; t < s_next;)
|
|
||||||
cadd(&tstr, upcase(*t++));
|
|
||||||
{
|
{
|
||||||
fu = keyword(fmathS, s, s_next); /* numeric function? */
|
fu = keyword(fmathS, s, s_next); /* numeric function? */
|
||||||
if (fu > 0) {
|
if (fu > 0) {
|
||||||
state = S_init; /* S_init means: ignore for the moment */
|
state = S_init; /* S_init means: ignore for the moment */
|
||||||
} else {
|
} else {
|
||||||
|
const char *t;
|
||||||
|
spice_dstring_reinit(&tstr);
|
||||||
|
for (t = s; t < s_next;)
|
||||||
|
cadd(&tstr, upcase(*t++));
|
||||||
u = fetchnumentry(dico, spice_dstring_value(&tstr), &error);
|
u = fetchnumentry(dico, spice_dstring_value(&tstr), &error);
|
||||||
state = S_atom;
|
state = S_atom;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue