add a asdl bytes type, so Bytes.s be properly typechecked

benjaminp · benjaminp · commit e2498419034e · 2011-08-09T16:08:39.000-05:00
diff --git a/Include/asdl.h b/Include/asdl.h
@@ -3,6 +3,7 @@
 
 typedef PyObject * identifier;
 typedef PyObject * string;
+typedef PyObject * bytes;
 typedef PyObject * object;
 
 /* It would be nice if the code generated by asdl_c.py was completely
diff --git a/Parser/Python.asdl b/Parser/Python.asdl
@@ -1,4 +1,4 @@
--- ASDL's four builtin types are identifier, int, string, object
+-- ASDL's five builtin types are identifier, int, string, bytes, object
 
 module Python
 {
@@ -67,7 +67,7 @@ module Python
 			 expr? starargs, expr? kwargs)
 	     | Num(object n) -- a number as a PyObject.
 	     | Str(string s) -- need to specify raw, unicode, etc?
-	     | Bytes(string s)
+	     | Bytes(bytes s)
 	     | Ellipsis
 	     -- other literals? bools?
 
diff --git a/Parser/asdl.py b/Parser/asdl.py
@@ -228,7 +228,7 @@ def p_field_5(self, type_):
         " field ::= Id ? "
         return Field(type[0], opt=True)
 
-builtin_types = ("identifier", "string", "int", "bool", "object")
+builtin_types = ("identifier", "string", "bytes", "int", "bool", "object")
 
 # below is a collection of classes to capture the AST of an AST :-)
 # not sure if any of the methods are useful yet, but I'm adding them
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -776,6 +776,7 @@ def visitModule(self, mod):
 }
 #define ast2obj_identifier ast2obj_object
 #define ast2obj_string ast2obj_object
+#define ast2obj_bytes ast2obj_object
 
 static PyObject* ast2obj_int(long b)
 {
@@ -813,6 +814,15 @@ def visitModule(self, mod):
     return obj2ast_object(obj, out, arena);
 }
 
+static int obj2ast_bytes(PyObject* obj, PyObject** out, PyArena* arena)
+{
+    if (!PyBytes_CheckExact(obj)) {
+        PyErr_SetString(PyExc_TypeError, "AST bytes must be of type bytes");
+        return 1;
+    }
+    return obj2ast_object(obj, out, arena);
+}
+
 static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
 {
     int i;
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
@@ -573,6 +573,7 @@ static PyObject* ast2obj_object(void *o)
 }
 #define ast2obj_identifier ast2obj_object
 #define ast2obj_string ast2obj_object
+#define ast2obj_bytes ast2obj_object
 
 static PyObject* ast2obj_int(long b)
 {
@@ -610,6 +611,15 @@ static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
     return obj2ast_object(obj, out, arena);
 }
 
+static int obj2ast_bytes(PyObject* obj, PyObject** out, PyArena* arena)
+{
+    if (!PyBytes_CheckExact(obj)) {
+        PyErr_SetString(PyExc_TypeError, "AST bytes must be of type bytes");
+        return 1;
+    }
+    return obj2ast_object(obj, out, arena);
+}
+
 static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
 {
     int i;
@@ -1773,7 +1783,7 @@ Str(string s, int lineno, int col_offset, PyArena *arena)
 }
 
 expr_ty
-Bytes(string s, int lineno, int col_offset, PyArena *arena)
+Bytes(bytes s, int lineno, int col_offset, PyArena *arena)
 {
         expr_ty p;
         if (!s) {
@@ -2804,7 +2814,7 @@ ast2obj_expr(void* _o)
         case Bytes_kind:
                 result = PyType_GenericNew(Bytes_type, NULL, NULL);
                 if (!result) goto failed;
-                value = ast2obj_string(o->v.Bytes.s);
+                value = ast2obj_bytes(o->v.Bytes.s);
                 if (!value) goto failed;
                 if (PyObject_SetAttrString(result, "s", value) == -1)
                         goto failed;
@@ -5509,13 +5519,13 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
                 return 1;
         }
         if (isinstance) {
-                string s;
+                bytes s;
 
                 if (PyObject_HasAttrString(obj, "s")) {
                         int res;
                         tmp = PyObject_GetAttrString(obj, "s");
                         if (tmp == NULL) goto failed;
-                        res = obj2ast_string(tmp, &s, arena);
+                        res = obj2ast_bytes(tmp, &s, arena);
                         if (res != 0) goto failed;
                         Py_XDECREF(tmp);
                         tmp = NULL;

Original file line number	Diff line number	Diff line change
`@@ -776,6 +776,7 @@ def visitModule(self, mod):`
`776`	`776`	`}`
`777`	`777`	`#define ast2obj_identifier ast2obj_object`
`778`	`778`	`#define ast2obj_string ast2obj_object`
	`779`	`+#define ast2obj_bytes ast2obj_object`
`779`	`780`
`780`	`781`	`static PyObject* ast2obj_int(long b)`
`781`	`782`	`{`
`@@ -813,6 +814,15 @@ def visitModule(self, mod):`
`813`	`814`	`return obj2ast_object(obj, out, arena);`
`814`	`815`	`}`
`815`	`816`
	`817`	`+static int obj2ast_bytes(PyObject* obj, PyObject** out, PyArena* arena)`
	`818`	`+{`
	`819`	`+ if (!PyBytes_CheckExact(obj)) {`
	`820`	`+ PyErr_SetString(PyExc_TypeError, "AST bytes must be of type bytes");`
	`821`	`+ return 1;`
	`822`	`+ }`
	`823`	`+ return obj2ast_object(obj, out, arena);`
	`824`	`+}`
	`825`	`+`
`816`	`826`	`static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)`
`817`	`827`	`{`
`818`	`828`	`int i;`