From 8fbf4fa9edcb9efd1ca5d650ed235eb4770dea3a Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 6 Dec 2012 17:41:04 -0500
Subject: create NameConstant AST class for None, True, and False literals
 (closes #16619)

---
 Python/compile.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'Python/compile.c')

diff --git a/Python/compile.c b/Python/compile.c
index 3cf71ef09e..3e960ccbfe 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3194,12 +3194,18 @@ expr_constant(struct compiler *c, expr_ty e)
     case Name_kind:
         /* optimize away names that can't be reassigned */
         id = PyUnicode_AsUTF8(e->v.Name.id);
-        if (strcmp(id, "True") == 0) return 1;
-        if (strcmp(id, "False") == 0) return 0;
-        if (strcmp(id, "None") == 0) return 0;
-        if (strcmp(id, "__debug__") == 0)
-            return ! c->c_optimize;
-        /* fall through */
+        if (id && strcmp(id, "__debug__") == 0)
+            return !c->c_optimize;
+        return -1;
+    case NameConstant_kind: {
+        PyObject *o = e->v.NameConstant.value;
+        if (o == Py_None)
+            return 0;
+        else if (o == Py_True)
+            return 1;
+        else if (o == Py_False)
+            return 0;
+    }
     default:
         return -1;
     }
@@ -3375,6 +3381,9 @@ compiler_visit_expr(struct compiler *c, expr_ty e)
     case Ellipsis_kind:
         ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
         break;
+    case NameConstant_kind:
+        ADDOP_O(c, LOAD_CONST, e->v.NameConstant.value, consts);
+        break;
     /* The following exprs can be assignment targets. */
     case Attribute_kind:
         if (e->v.Attribute.ctx != AugStore)
-- 
cgit v1.2.1


From 114832065bf0892650154c391093095d8d950c25 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 6 Dec 2012 17:49:58 -0500
Subject: assert than we never try to deal with True, False, or None as a name

---
 Python/compile.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Python/compile.c')

diff --git a/Python/compile.c b/Python/compile.c
index 3e960ccbfe..8f876a6d0d 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2635,6 +2635,10 @@ compiler_nameop(struct compiler *c, identifier name, expr_context_ty ctx)
     if (!mangled)
         return 0;
 
+    assert(PyUnicode_CompareWithASCIIString(name, "None") &&
+           PyUnicode_CompareWithASCIIString(name, "True") &&
+           PyUnicode_CompareWithASCIIString(name, "False"));
+
     op = 0;
     optype = OP_NAME;
     scope = PyST_GetScope(c->u->u_ste, mangled);
-- 
cgit v1.2.1