Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changes for complex and power (**) operator

This commit is contained in:
Guido van Rossum 1996-01-12 01:13:16 +00:00
parent 8a5c5d277e
commit 50564e8dae
2 changed files with 136 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Python/ceval.c
View File

@ -82,6 +82,7 @@ static int call_trace
PROTO((object **, object **, frameobject *, char *, object *)); PROTO((object **, object **, frameobject *, char *, object *));
static object *add PROTO((object *, object *)); static object *add PROTO((object *, object *));
static object *sub PROTO((object *, object *)); static object *sub PROTO((object *, object *));
static object *pow PROTO((object *, object *));
static object *mul PROTO((object *, object *)); static object *mul PROTO((object *, object *));
static object *divide PROTO((object *, object *)); static object *divide PROTO((object *, object *));
static object *mod PROTO((object *, object *)); static object *mod PROTO((object *, object *));
@ -675,6 +676,15 @@ eval_code2(co, globals, locals,
PUSH(x); PUSH(x);
break; break;
case BINARY_POWER:
w = POP();
v = POP();
x = pow(v, w);
DECREF(v);
DECREF(w);
PUSH(x);
break;
case BINARY_MULTIPLY: case BINARY_MULTIPLY:
w = POP(); w = POP();
v = POP(); v = POP();
@ -2204,6 +2214,34 @@ mod(v, w)
return NULL; return NULL;
} }
static object *
pow(v, w)
object *v, *w;
{
object *res;
BINOP("__pow__", "__rpow__", pow);
if (v->ob_type->tp_as_number == NULL ||
w->ob_type->tp_as_number == NULL) {
err_setstr(TypeError, "pow() requires numeric arguments");
return NULL;
}
if (
#ifndef WITHOUT_COMPLEX
!is_complexobject(v) &&
#endif
is_floatobject(w) && getfloatvalue(v) < 0.0) {
if (!err_occurred())
err_setstr(ValueError, "negative number to float power");
return NULL;
}
if (coerce(&v, &w) != 0)
return NULL;
res = (*v->ob_type->tp_as_number->nb_power)(v, w, None);
DECREF(v);
DECREF(w);
return res;
}
static object * static object *
neg(v) neg(v)
object *v; object *v;

106
Python/compile.c
View File

@ -287,6 +287,7 @@ static int com_init PROTO((struct compiling *, char *));
static void com_free PROTO((struct compiling *)); static void com_free PROTO((struct compiling *));
static void com_done PROTO((struct compiling *)); static void com_done PROTO((struct compiling *));
static void com_node PROTO((struct compiling *, struct _node *)); static void com_node PROTO((struct compiling *, struct _node *));
static void com_factor PROTO((struct compiling *, struct _node *));
static void com_addbyte PROTO((struct compiling *, int)); static void com_addbyte PROTO((struct compiling *, int));
static void com_addint PROTO((struct compiling *, int)); static void com_addint PROTO((struct compiling *, int));
static void com_addoparg PROTO((struct compiling *, int, int)); static void com_addoparg PROTO((struct compiling *, int, int));
@ -563,8 +564,16 @@ parsenumber(s)
extern double atof PROTO((const char *)); extern double atof PROTO((const char *));
char *end; char *end;
long x; long x;
#ifndef WITHOUT_COMPLEX
complex c;
int imflag;
#endif
errno = 0; errno = 0;
end = s + strlen(s) - 1; end = s + strlen(s) - 1;
#ifndef WITHOUT_COMPLEX
imflag = *end == 'i' || *end == 'I' || *end == 'j' || *end == 'J';
#endif
if (*end == 'l' || *end == 'L') if (*end == 'l' || *end == 'L')
return long_scan(s, 0); return long_scan(s, 0);
if (s[0] == '0') if (s[0] == '0')
@ -580,6 +589,14 @@ parsenumber(s)
return newintobject(x); return newintobject(x);
} }
/* XXX Huge floats may silently fail */ /* XXX Huge floats may silently fail */
#ifndef WITHOUT_COMPLEX
if (imflag) {
c.real = 0.;
c.imag = atof(s);
return newcomplexobject(c);
}
else
#endif
return newfloatobject(atof(s)); return newfloatobject(atof(s));
} }
@ -810,15 +827,23 @@ com_apply_subscript(c, n)
node *n; node *n;
{ {
REQ(n, subscript); REQ(n, subscript);
if (NCH(n) == 1 && TYPE(CHILD(n, 0)) != COLON) { if (TYPE(CHILD(n, 0)) == COLON || (NCH(n) > 1 && TYPE(CHILD(n, 1)) == COLON)) {
/* It's a single subscript */
com_node(c, CHILD(n, 0));
com_addbyte(c, BINARY_SUBSCR);
}
else {
/* It's a slice: [expr] ':' [expr] */ /* It's a slice: [expr] ':' [expr] */
com_slice(c, n, SLICE); com_slice(c, n, SLICE);
} }
else {
/* It's a list of subscripts */
if (NCH(n) == 1)
com_node(c, CHILD(n, 0));
else {
int i;
int len = (NCH(n)+1)/2;
for (i = 0; i < NCH(n); i += 2)
com_node(c, CHILD(n, i));
com_addoparg(c, BUILD_TUPLE, len);
}
com_addbyte(c, BINARY_SUBSCR);
}
} }
static int static int
@ -921,6 +946,25 @@ com_apply_trailer(c, n)
} }
} }
static void
com_power(c, n)
struct compiling *c;
node *n;
{
int i;
REQ(n, power);
com_atom(c, CHILD(n, 0));
for (i = 1; i < NCH(n); i++) {
if (TYPE(CHILD(n, i)) == DOUBLESTAR) {
com_factor(c, CHILD(n, i+1));
com_addbyte(c, BINARY_POWER);
break;
}
else
com_apply_trailer(c, CHILD(n, i));
}
}
static void static void
com_factor(c, n) com_factor(c, n)
struct compiling *c; struct compiling *c;
@ -941,9 +985,7 @@ com_factor(c, n)
com_addbyte(c, UNARY_INVERT); com_addbyte(c, UNARY_INVERT);
} }
else { else {
com_atom(c, CHILD(n, 0)); com_power(c, CHILD(n, 0));
for (i = 1; i < NCH(n); i++)
com_apply_trailer(c, CHILD(n, i));
} }
} }
@ -1338,7 +1380,15 @@ com_assign_subscript(c, n, assigning)
node *n; node *n;
int assigning; int assigning;
{ {
com_node(c, n); if (NCH(n) == 1)
com_node(c, CHILD(n, 0));
else {
int i;
int len = (NCH(n)+1)/2;
for (i = 0; i < NCH(n); i += 2)
com_node(c, CHILD(n, i));
com_addoparg(c, BUILD_TUPLE, len);
}
com_addbyte(c, assigning ? STORE_SUBSCR : DELETE_SUBSCR); com_addbyte(c, assigning ? STORE_SUBSCR : DELETE_SUBSCR);
} }
@ -1359,11 +1409,11 @@ com_assign_trailer(c, n, assigning)
break; break;
case LSQB: /* '[' subscript ']' */ case LSQB: /* '[' subscript ']' */
n = CHILD(n, 1); n = CHILD(n, 1);
REQ(n, subscript); /* subscript: expr | [expr] ':' [expr] */ REQ(n, subscript); /* subscript: expr (',' expr)* | [expr] ':' [expr] */
if (NCH(n) > 1 || TYPE(CHILD(n, 0)) == COLON) if (TYPE(CHILD(n, 0)) == COLON || (NCH(n) > 1 && TYPE(CHILD(n, 1)) == COLON))
com_assign_slice(c, n, assigning); com_assign_slice(c, n, assigning);
else else
com_assign_subscript(c, CHILD(n, 0), assigning); com_assign_subscript(c, n, assigning);
break; break;
default: default:
err_setstr(SystemError, "unknown trailer type"); err_setstr(SystemError, "unknown trailer type");
@ -1438,6 +1488,7 @@ com_assign(c, n, assigning)
case shift_expr: case shift_expr:
case arith_expr: case arith_expr:
case term: case term:
case factor:
if (NCH(n) > 1) { if (NCH(n) > 1) {
err_setstr(SyntaxError, err_setstr(SyntaxError,
"can't assign to operator"); "can't assign to operator");
@ -1447,17 +1498,24 @@ com_assign(c, n, assigning)
n = CHILD(n, 0); n = CHILD(n, 0);
break; break;
case factor: /* ('+'|'-'|'~') factor | atom trailer* */ case power: /* atom trailer* ('**' power)* */
if (TYPE(CHILD(n, 0)) != atom) { /* '+'|'-'|'~' */ /* ('+'|'-'|'~') factor | atom trailer* */
if (TYPE(CHILD(n, 0)) != atom) {
err_setstr(SyntaxError, err_setstr(SyntaxError,
"can't assign to operator"); "can't assign to operator");
c->c_errors++; c->c_errors++;
return; return;
} }
if (NCH(n) > 1) { /* trailer present */ if (NCH(n) > 1) { /* trailer or exponent present */
int i; int i;
com_node(c, CHILD(n, 0)); com_node(c, CHILD(n, 0));
for (i = 1; i+1 < NCH(n); i++) { for (i = 1; i+1 < NCH(n); i++) {
if (TYPE(CHILD(n, i)) == DOUBLESTAR) {
err_setstr(SyntaxError,
"can't assign to operator");
c->c_errors++;
return;
}
com_apply_trailer(c, CHILD(n, i)); com_apply_trailer(c, CHILD(n, i));
} /* NB i is still alive */ } /* NB i is still alive */
com_assign_trailer(c, com_assign_trailer(c,
@ -2059,6 +2117,7 @@ get_docstring(n)
case arith_expr: case arith_expr:
case term: case term:
case factor: case factor:
case power:
if (NCH(n) == 1) if (NCH(n) == 1)
return get_docstring(CHILD(n, 0)); return get_docstring(CHILD(n, 0));
break; break;
@ -2136,7 +2195,7 @@ com_argdefs(c, n)
ndefs = 0; ndefs = 0;
for (i = 0; i < nch; i++) { for (i = 0; i < nch; i++) {
int t; int t;
if (TYPE(CHILD(n, i)) == STAR) if (TYPE(CHILD(n, i)) == STAR || TYPE(CHILD(n, i)) == DOUBLESTAR)
break; break;
nargs++; nargs++;
i++; i++;
@ -2373,6 +2432,9 @@ com_node(c, n)
case factor: case factor:
com_factor(c, n); com_factor(c, n);
break; break;
case power:
com_power(c, n);
break;
case atom: case atom:
com_atom(c, n); com_atom(c, n);
break; break;
@ -2431,7 +2493,7 @@ com_arglist(c, n)
node *ch = CHILD(n, i); node *ch = CHILD(n, i);
node *fp; node *fp;
char *name; char *name;
if (TYPE(ch) == STAR) if (TYPE(ch) == STAR || TYPE(ch) == DOUBLESTAR)
break; break;
REQ(ch, fpdef); /* fpdef: NAME | '(' fplist ')' */ REQ(ch, fpdef); /* fpdef: NAME | '(' fplist ')' */
fp = CHILD(ch, 0); fp = CHILD(ch, 0);
@ -2455,6 +2517,7 @@ com_arglist(c, n)
if (i < nch) { if (i < nch) {
node *ch; node *ch;
ch = CHILD(n, i); ch = CHILD(n, i);
if (TYPE(ch) != DOUBLESTAR) {
REQ(ch, STAR); REQ(ch, STAR);
ch = CHILD(n, i+1); ch = CHILD(n, i+1);
if (TYPE(ch) == NAME) { if (TYPE(ch) == NAME) {
@ -2463,14 +2526,19 @@ com_arglist(c, n)
com_newlocal(c, STR(ch)); com_newlocal(c, STR(ch));
} }
} }
}
/* Handle **keywords */ /* Handle **keywords */
if (i < nch) { if (i < nch) {
node *ch; node *ch;
ch = CHILD(n, i); ch = CHILD(n, i);
if (TYPE(ch) != DOUBLESTAR) {
REQ(ch, STAR); REQ(ch, STAR);
ch = CHILD(n, i+1); ch = CHILD(n, i+1);
REQ(ch, STAR); REQ(ch, STAR);
ch = CHILD(n, i+2); ch = CHILD(n, i+2);
}
else
ch = CHILD(n, i+1);
REQ(ch, NAME); REQ(ch, NAME);
c->c_flags |= CO_VARKEYWORDS; c->c_flags |= CO_VARKEYWORDS;
com_newlocal(c, STR(ch)); com_newlocal(c, STR(ch));
@ -2482,7 +2550,7 @@ com_arglist(c, n)
for (i = 0; i < nch; i++) { for (i = 0; i < nch; i++) {
node *ch = CHILD(n, i); node *ch = CHILD(n, i);
node *fp; node *fp;
if (TYPE(ch) == STAR) if (TYPE(ch) == STAR || TYPE(ch) == DOUBLESTAR)
break; break;
REQ(ch, fpdef); /* fpdef: NAME | '(' fplist ')' */ REQ(ch, fpdef); /* fpdef: NAME | '(' fplist ')' */
fp = CHILD(ch, 0); fp = CHILD(ch, 0);