Mercurial > cpython-lru_cache-weakref

diff Python/symtable.c @ 36231:d3f4c467e439 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix icc warnings: conversion from "long" to "int" may lose significant bits
author Neal Norwitz <nnorwitz@gmail.com>
date Sun, 08 Jan 2006 01:06:06 +0000
parents bb6fa4a31f15
children af7d484208e9
line wrap: on
line diff
--- a/Python/symtable.c	Sun Jan 08 01:03:36 2006 +0000
+++ b/Python/symtable.c	Sun Jan 08 01:06:06 2006 +0000
@@ -354,7 +354,7 @@
 */
 
 static int 
-analyze_name(PySTEntryObject *ste, PyObject *dict, PyObject *name, int flags,
+analyze_name(PySTEntryObject *ste, PyObject *dict, PyObject *name, long flags,
 	     PyObject *bound, PyObject *local, PyObject *free, 
 	     PyObject *global)
 {
@@ -426,14 +426,14 @@
 analyze_cells(PyObject *scope, PyObject *free)
 {
         PyObject *name, *v, *w;
-	int flags, pos = 0, success = 0;
+	int pos = 0, success = 0;
 
 	w = PyInt_FromLong(CELL);
 	if (!w)
 		return 0;
 	while (PyDict_Next(scope, &pos, &name, &v)) {
 		assert(PyInt_Check(v));
-		flags = PyInt_AS_LONG(v);
+		long flags = PyInt_AS_LONG(v);
 		if (flags != LOCAL)
 			continue;
 		if (!PyDict_GetItem(free, name))
@@ -506,9 +506,10 @@
                PyObject *bound, PyObject *free, int class)
 {
 	PyObject *name, *v, *u, *w, *free_value = NULL;
-	int i, flags, pos = 0;
+	int pos = 0;
 
 	while (PyDict_Next(symbols, &pos, &name, &v)) {
+		long i, flags;
 		assert(PyInt_Check(v));
 		flags = PyInt_AS_LONG(v);
 		w = PyDict_GetItem(scope, name);
@@ -539,7 +540,7 @@
 			*/
 			if  (class && 
 			     PyInt_AS_LONG(o) & (DEF_BOUND | DEF_GLOBAL)) {
-				i = PyInt_AS_LONG(o) | DEF_FREE_CLASS;
+				long i = PyInt_AS_LONG(o) | DEF_FREE_CLASS;
 				o = PyInt_FromLong(i);
 				if (!o) {
 					Py_DECREF(free_value);
@@ -581,7 +582,7 @@
 {
 	PyObject *name, *v, *local = NULL, *scope = NULL, *newbound = NULL;
 	PyObject *newglobal = NULL, *newfree = NULL;
-	int i, flags, pos = 0, success = 0;
+	int i, pos = 0, success = 0;
 
 	local = PyDict_New();
 	if (!local)
@@ -614,7 +615,7 @@
 	assert(PySTEntry_Check(ste));
 	assert(PyDict_Check(ste->ste_symbols));
 	while (PyDict_Next(ste->ste_symbols, &pos, &name, &v)) {
-		flags = PyInt_AS_LONG(v);
+		long flags = PyInt_AS_LONG(v);
 		if (!analyze_name(ste, scope, name, flags, bound, local, free,
 				  global))
 			goto error;
@@ -750,7 +751,7 @@
 	return 1;
 }
 
-static int
+static long
 symtable_lookup(struct symtable *st, PyObject *name)
 {
 	PyObject *o;
@@ -769,7 +770,7 @@
 {
 	PyObject *o;
 	PyObject *dict;
-	int val;
+	long val;
 	PyObject *mangled = _Py_Mangle(st->st_private, name);
 
 	if (!mangled)
@@ -1018,7 +1019,7 @@
 		for (i = 0; i < asdl_seq_LEN(seq); i++) {
 			identifier name = asdl_seq_GET(seq, i);
 			char *c_name = PyString_AS_STRING(name);
-			int cur = symtable_lookup(st, name);
+			long cur = symtable_lookup(st, name);
 			if (cur < 0)
 				return 0;
 			if (cur & (DEF_LOCAL | USE)) {