char *p;
qd_parse qd;
PyObject *rc = 0;
+ int paren;
ec pp = EC_INIT;
if (!PyArg_ParseTuple(arg, "s:parse", &p)) goto end;
qd.p = p; qd.e = 0;
+ qd_skipspc(&qd); paren = qd_delim(&qd, '(');
if (!ec_ptparse(&qd, &pp)) VALERR(qd.e);
+ qd_skipspc(&qd); if (paren && !qd_delim(&qd, ')'))
+ { EC_DESTROY(&pp); VALERR("missing `)'"); }
rc = Py_BuildValue("(Ns)", ecpt_pywrapout(me, &pp), qd.p);
end:
return (rc);
mp *xx = 0;
int n;
qd_parse qd;
+ int paren;
Py_XINCREF(x);
if (!x || x == Py_None)
getecptout(p, x);
goto fix;
} else if (TEXT_CHECK(x)) {
- qd.p = TEXT_PTR(x);
- qd.e = 0;
- if (!ec_ptparse(&qd, p))
- VALERR(qd.e);
+ qd.p = TEXT_PTR(x); qd.e = 0;
+ qd_skipspc(&qd); paren = qd_delim(&qd, '(');
+ if (!ec_ptparse(&qd, p)) VALERR(qd.e);
+ qd_skipspc(&qd); if (paren && !qd_delim(&qd, ')'))
+ { EC_DESTROY(p); VALERR("missing `)'"); }
qd_skipspc(&qd); if (!qd_eofp(&qd)) VALERR("junk at eof");
goto fix;
} else if (c && (xx = tomp(x)) != 0) {
} else if (PySequence_Check(x)) {
t = x; x = 0;
n = PySequence_Size(t); if (n < 0) goto end;
- if (n != 2 && (n != 3 || !c))
+ if (n != 2 && n != 3)
TYERR("want sequence of two or three items");
if ((x = PySequence_GetItem(t, 0)) == 0 ||
(y = PySequence_GetItem(t, 1)) == 0 ||
if (!PyArg_ParseTuple(arg, "s:parse", &p)) goto end;
qd.p = p; qd.e = 0;
if ((c = ec_curveparse(&qd)) == 0) VALERR(qd.e);
- rc = eccurve_pywrap(0, c);
+ rc = Py_BuildValue("(Ns)", eccurve_pywrap(0, c), qd.p);
end:
return (rc);
}