Browse Source

Previous commit was incomplete.

pre-master-46
pnenzi 21 years ago
parent
commit
f79e9e703c
  1. 10
      src/frontend/dotcards.c

10
src/frontend/dotcards.c

@ -447,35 +447,35 @@ fixem(char *string)
else if (eq(string + 2, "0")) else if (eq(string + 2, "0"))
(void) sprintf(buf, "-v(%s)", s); (void) sprintf(buf, "-v(%s)", s);
else (void) sprintf(buf, "v(%s)-v(%s)", string + 2, s); else (void) sprintf(buf, "v(%s)-v(%s)", string + 2, s);
} else if (ciprefix("vm(", string)) {
} else if (ciprefix("vm(", string) &&strchr(string, ',')) {
for (s = string; *s && (*s != ','); s++) ; *s++ = '\0'; for (s = string; *s && (*s != ','); s++) ; *s++ = '\0';
for (t = s; *t && (*t != ')'); t++) ; *t = '\0'; for (t = s; *t && (*t != ')'); t++) ; *t = '\0';
if (eq(s, "0")) (void) sprintf(buf, "mag(v(%s))", string + 3); if (eq(s, "0")) (void) sprintf(buf, "mag(v(%s))", string + 3);
else if (eq(string + 3, "0")) else if (eq(string + 3, "0"))
(void) sprintf(buf, "mag(-v(%s))", s); (void) sprintf(buf, "mag(-v(%s))", s);
else (void) sprintf(buf, "mag(v(%s)-v(%s))", string + 3, s); else (void) sprintf(buf, "mag(v(%s)-v(%s))", string + 3, s);
} else if (ciprefix("vp(", string)) {
} else if (ciprefix("vp(", string) &&strchr(string, ',')) {
for (s = string; *s && (*s != ','); s++) ; *s++ = '\0'; for (s = string; *s && (*s != ','); s++) ; *s++ = '\0';
for (t = s; *t && (*t != ')'); t++) ; *t = '\0'; for (t = s; *t && (*t != ')'); t++) ; *t = '\0';
if (eq(s, "0")) (void) sprintf(buf, "ph(v(%s))", string + 3); if (eq(s, "0")) (void) sprintf(buf, "ph(v(%s))", string + 3);
else if (eq(string + 3, "0")) else if (eq(string + 3, "0"))
(void) sprintf(buf, "ph(-v(%s))", s); (void) sprintf(buf, "ph(-v(%s))", s);
else (void) sprintf(buf, "ph(v(%s)-v(%s))", string + 3, s); else (void) sprintf(buf, "ph(v(%s)-v(%s))", string + 3, s);
} else if (ciprefix("vi(", string)) {
} else if (ciprefix("vi(", string) &&strchr(string, ',')) {
for (s = string; *s && (*s != ','); s++) ; *s++ = '\0'; for (s = string; *s && (*s != ','); s++) ; *s++ = '\0';
for (t = s; *t && (*t != ')'); t++) ; *t = '\0'; for (t = s; *t && (*t != ')'); t++) ; *t = '\0';
if (eq(s, "0")) (void) sprintf(buf, "imag(v(%s))", string + 3); if (eq(s, "0")) (void) sprintf(buf, "imag(v(%s))", string + 3);
else if (eq(string + 3, "0")) else if (eq(string + 3, "0"))
(void) sprintf(buf, "imag(-v(%s))", s); (void) sprintf(buf, "imag(-v(%s))", s);
else (void) sprintf(buf, "imag(v(%s)-v(%s))", string + 3, s); else (void) sprintf(buf, "imag(v(%s)-v(%s))", string + 3, s);
} else if (ciprefix("vr(", string)) {
} else if (ciprefix("vr(", string) &&strchr(string, ',')) {
for (s = string; *s && (*s != ','); s++) ; *s++ = '\0'; for (s = string; *s && (*s != ','); s++) ; *s++ = '\0';
for (t = s; *t && (*t != ')'); t++) ; *t = '\0'; for (t = s; *t && (*t != ')'); t++) ; *t = '\0';
if (eq(s, "0")) (void) sprintf(buf, "real(v(%s))", string + 3); if (eq(s, "0")) (void) sprintf(buf, "real(v(%s))", string + 3);
else if (eq(string + 3, "0")) else if (eq(string + 3, "0"))
(void) sprintf(buf, "real(-v(%s))", s); (void) sprintf(buf, "real(-v(%s))", s);
else (void) sprintf(buf, "real(v(%s)-v(%s))", string + 3, s); else (void) sprintf(buf, "real(v(%s)-v(%s))", string + 3, s);
} else if (ciprefix("vdb(", string)) {
} else if (ciprefix("vdb(", string) &&strchr(string, ',')) {
for (s = string; *s && (*s != ','); s++) ; *s++ = '\0'; for (s = string; *s && (*s != ','); s++) ; *s++ = '\0';
for (t = s; *t && (*t != ')'); t++) ; *t = '\0'; for (t = s; *t && (*t != ')'); t++) ; *t = '\0';
if (eq(s, "0")) (void) sprintf(buf, "db(v(%s))", string + 4); if (eq(s, "0")) (void) sprintf(buf, "db(v(%s))", string + 4);

Loading…
Cancel
Save