Mercurial > cpython-lru_cache-weakref

diff Python/bltinmodule.c @ 1415:06570429f062 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* import.c (get_module): pass .py filename to parse_file, not .pyc filename! * funcobject.c (func_repr): don't call getstringvalue(None) for anonymous functions. * bltinmodule.c: removed lambda (which is now a built-in function); removed implied lambda for string arg to filter/map/reduce. * Grammar, graminit.[ch], compile.[ch]: replaced lambda as built-in function by lambda as grammar entity: instead of "lambda('x: x+1')" you write "lambda x: x+1". * Xtmodule.c (checkargdict): return 0, not NULL, for error.
author Guido van Rossum <guido@python.org>
date Tue, 30 Nov 1993 13:40:46 +0000
parents aac8231a715c
children f2d04054c934
line wrap: on
line diff
--- a/Python/bltinmodule.c	Tue Nov 23 17:54:03 1993 +0000
+++ b/Python/bltinmodule.c	Tue Nov 30 13:40:46 1993 +0000
@@ -79,23 +79,13 @@
 	if (!getargs(args, "(OO)", &func, &seq))
 		return NULL;
 
-	if (is_stringobject(func)) {
-		if ((func = exec_eval(func, lambda_input)) == NULL)
-			return NULL;
-	}
-	else {
-		INCREF(func);
-	}
-
 	if (is_stringobject(seq)) {
 		object *r = filterstring(func, seq);
-		DECREF(func);
 		return r;
 	}
 
 	if (is_tupleobject(seq)) {
 		object *r = filtertuple(func, seq);
-		DECREF(func);
 		return r;
 	}
 
@@ -150,13 +140,11 @@
 	if (setlistslice(result, j, len, NULL) < 0)
 		goto Fail_1;
 
-	DECREF(func);
 	return result;
 
 Fail_1:
 	DECREF(result);
 Fail_2:
-	DECREF(func);
 	return NULL;
 }
 
@@ -306,10 +294,10 @@
 			globals != NULL && !is_dictobject(globals) ||
 			locals != NULL && !is_dictobject(locals)) {
 		err_setstr(TypeError,
-		  "eval/lambda arguments must be (string|code)[,dict[,dict]]");
+		  "eval arguments must be (string|code)[,dict[,dict]]");
 		return NULL;
 	}
-	/* XXX The following is only correct for eval(), not for lambda() */
+
 	if (is_codeobject(str))
 		return eval_code((codeobject *) str, globals, locals,
 				 (object *)NULL, (object *)NULL);
@@ -318,7 +306,7 @@
 		err_setstr(ValueError, "embedded '\\0' in string arg");
 		return NULL;
 	}
-	if (start == eval_input || start == lambda_input) {
+	if (start == eval_input) {
 		while (*s == ' ' || *s == '\t')
 			s++;
 	}
@@ -460,14 +448,6 @@
 	func = gettupleitem(args, 0);
 	n    = gettuplesize(args) - 1;
 
-	if (is_stringobject(func)) {
-		if ((func = exec_eval(func, lambda_input)) == NULL)
-			return NULL;
-	}
-	else {
-		INCREF(func);
-	}
-
 	if ((seqs = NEW(sequence, n)) == NULL) {
 		err_nomem();
 		goto Fail_2;
@@ -549,13 +529,11 @@
 	}
 
 	if (seqs) DEL(seqs);
-	DECREF(func);
 	return result;
 
 Fail_1:
 	DECREF(result);
 Fail_2:
-	DECREF(func);
 	if (seqs) DEL(seqs);
 	return NULL;
 }
@@ -639,14 +617,6 @@
 }
 
 static object *
-builtin_lambda(self, v)
-	object *self;
-	object *v;
-{
-	return exec_eval(v, lambda_input);
-}
-
-static object *
 builtin_len(self, v)
 	object *self;
 	object *v;
@@ -977,14 +947,6 @@
 		return NULL;
 	}
 
-	if (is_stringobject(func)) {
-		if ((func = exec_eval(func, lambda_input)) == NULL)
-			return NULL;
-	}
-	else {
-		INCREF(func);
-	}
-
 	if ((len = (*sqf->sq_length)(seq)) < 0)
 		goto Fail_2;
 
@@ -1025,7 +987,6 @@
 	}
 
 	DECREF(args);
-	DECREF(func);
 
 	return result;
 
@@ -1035,7 +996,6 @@
 Fail_1:
 	DECREF(result);
 Fail_2:
-	DECREF(func);
 	return NULL;
 }
 
@@ -1133,7 +1093,6 @@
 	{"id",		builtin_id},
 	{"input",	builtin_input},
 	{"int",		builtin_int},
-	{"lambda",	builtin_lambda},
 	{"len",		builtin_len},
 	{"long",	builtin_long},
 	{"map",		builtin_map},