[Python-checkins] CVS: python/dist/src/Python ceval.c,2.302,2.303 compile.c,2.234,2.235
Martin v. L?wis
loewis@users.sourceforge.net
Tue, 01 Jan 2002 11:59:13 -0800
Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv10915/Python
Modified Files:
ceval.c compile.c
Log Message:
Patch #494783: Rename cmp_op enumerators.
Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.302
retrieving revision 2.303
diff -C2 -d -r2.302 -r2.303
*** ceval.c 2001/12/25 18:49:11 2.302
--- ceval.c 2002/01/01 19:59:11 2.303
***************
*** 1786,1797 ****
b = PyInt_AS_LONG(w);
switch (oparg) {
! case LT: res = a < b; break;
! case LE: res = a <= b; break;
! case EQ: res = a == b; break;
! case NE: res = a != b; break;
! case GT: res = a > b; break;
! case GE: res = a >= b; break;
! case IS: res = v == w; break;
! case IS_NOT: res = v != w; break;
default: goto slow_compare;
}
--- 1786,1797 ----
b = PyInt_AS_LONG(w);
switch (oparg) {
! case PyCmp_LT: res = a < b; break;
! case PyCmp_LE: res = a <= b; break;
! case PyCmp_EQ: res = a == b; break;
! case PyCmp_NE: res = a != b; break;
! case PyCmp_GT: res = a > b; break;
! case PyCmp_GE: res = a >= b; break;
! case PyCmp_IS: res = v == w; break;
! case PyCmp_IS_NOT: res = v != w; break;
default: goto slow_compare;
}
***************
*** 2987,2990 ****
--- 2987,2994 ----
cf->cf_flags |= compilerflags;
}
+ if (codeflags & CO_GENERATOR_ALLOWED) {
+ result = 1;
+ cf->cf_flags |= CO_GENERATOR_ALLOWED;
+ }
}
return result;
***************
*** 3471,3489 ****
int res = 0;
switch (op) {
! case IS:
! case IS_NOT:
res = (v == w);
! if (op == (int) IS_NOT)
res = !res;
break;
! case IN:
! case NOT_IN:
res = PySequence_Contains(w, v);
if (res < 0)
return NULL;
! if (op == (int) NOT_IN)
res = !res;
break;
! case EXC_MATCH:
res = PyErr_GivenExceptionMatches(v, w);
break;
--- 3475,3493 ----
int res = 0;
switch (op) {
! case PyCmp_IS:
! case PyCmp_IS_NOT:
res = (v == w);
! if (op == (int) PyCmp_IS_NOT)
res = !res;
break;
! case PyCmp_IN:
! case PyCmp_NOT_IN:
res = PySequence_Contains(w, v);
if (res < 0)
return NULL;
! if (op == (int) PyCmp_NOT_IN)
res = !res;
break;
! case PyCmp_EXC_MATCH:
res = PyErr_GivenExceptionMatches(v, w);
break;
Index: compile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v
retrieving revision 2.234
retrieving revision 2.235
diff -C2 -d -r2.234 -r2.235
*** compile.c 2001/12/13 19:51:56 2.234
--- compile.c 2002/01/01 19:59:11 2.235
***************
*** 703,707 ****
/*fprintf(stderr, "%3d: %3d\n", c->c_nexti, byte);*/
assert(byte >= 0 && byte <= 255);
! assert(c->c_code);
if (com_check_size(&c->c_code, c->c_nexti)) {
c->c_errors++;
--- 703,707 ----
/*fprintf(stderr, "%3d: %3d\n", c->c_nexti, byte);*/
assert(byte >= 0 && byte <= 255);
! assert(c->c_code != 0);
if (com_check_size(&c->c_code, c->c_nexti)) {
c->c_errors++;
***************
*** 2139,2151 ****
n = CHILD(n, 0);
switch (TYPE(n)) {
! case LESS: return LT;
! case GREATER: return GT;
case EQEQUAL: /* == */
! case EQUAL: return EQ;
! case LESSEQUAL: return LE;
! case GREATEREQUAL: return GE;
! case NOTEQUAL: return NE; /* <> or != */
! case NAME: if (strcmp(STR(n), "in") == 0) return IN;
! if (strcmp(STR(n), "is") == 0) return IS;
}
}
--- 2139,2151 ----
n = CHILD(n, 0);
switch (TYPE(n)) {
! case LESS: return PyCmp_LT;
! case GREATER: return PyCmp_GT;
case EQEQUAL: /* == */
! case EQUAL: return PyCmp_EQ;
! case LESSEQUAL: return PyCmp_LE;
! case GREATEREQUAL: return PyCmp_GE;
! case NOTEQUAL: return PyCmp_NE; /* <> or != */
! case NAME: if (strcmp(STR(n), "in") == 0) return PyCmp_IN;
! if (strcmp(STR(n), "is") == 0) return PyCmp_IS;
}
}
***************
*** 2153,2162 ****
switch (TYPE(CHILD(n, 0))) {
case NAME: if (strcmp(STR(CHILD(n, 1)), "in") == 0)
! return NOT_IN;
if (strcmp(STR(CHILD(n, 0)), "is") == 0)
! return IS_NOT;
}
}
! return BAD;
}
--- 2153,2162 ----
switch (TYPE(CHILD(n, 0))) {
case NAME: if (strcmp(STR(CHILD(n, 1)), "in") == 0)
! return PyCmp_NOT_IN;
if (strcmp(STR(CHILD(n, 0)), "is") == 0)
! return PyCmp_IS_NOT;
}
}
! return PyCmp_BAD;
}
***************
*** 2215,2219 ****
}
op = cmp_type(CHILD(n, i-1));
! if (op == BAD) {
com_error(c, PyExc_SystemError,
"com_comparison: unknown comparison op");
--- 2215,2219 ----
}
op = cmp_type(CHILD(n, i-1));
! if (op == PyCmp_BAD) {
com_error(c, PyExc_SystemError,
"com_comparison: unknown comparison op");
***************
*** 3248,3252 ****
com_push(c, 1);
com_node(c, CHILD(ch, 1));
! com_addoparg(c, COMPARE_OP, EXC_MATCH);
com_pop(c, 1);
com_addfwref(c, JUMP_IF_FALSE, &except_anchor);
--- 3248,3252 ----
com_push(c, 1);
com_node(c, CHILD(ch, 1));
! com_addoparg(c, COMPARE_OP, PyCmp_EXC_MATCH);
com_pop(c, 1);
com_addfwref(c, JUMP_IF_FALSE, &except_anchor);