EXPR_REGEX matchs "*obj"

vstinner · vstinner · commit ef315d0170ba · 2021-04-14T15:03:25.000+02:00
diff --git a/tests/test_upgrade_pythoncapi.py b/tests/test_upgrade_pythoncapi.py
@@ -110,6 +110,15 @@ def check_dont_replace(self, source):
         source = reformat(source)
         self.assertEqual(patch(source), source)
 
+    def test_expr_regex(self):
+        # Test EXPR_REGEX
+        self.check_replace("a->b->ob_type", "Py_TYPE(a->b)")
+        self.check_replace("a.b->ob_type", "Py_TYPE(a.b)")
+        self.check_replace("array[2]->ob_type", "Py_TYPE(array[2])")
+
+        # Don't match function calls
+        self.check_dont_replace("func()->ob_type")
+
     def test_pythoncapi_compat(self):
         # If pythoncapi_compat.h is included, avoid compatibility includes
         # and macros.
@@ -531,27 +540,33 @@ def test_py_is(self):
         """)
 
         self.check_replace("""
-            void test_expr(struct MyStruct *obj)
+            void test_expr(struct MyStruct *obj, PyObject **obj2)
             {
                 if (obj->attr1 == Py_None) {
                     return 1;
                 }
                 if (obj->attr2.name == Py_None) {
                     return 1;
                 }
+                if (*obj2 == Py_None) {
+                    return 1;
+                }
                 return 0;
             }
         """, """
             #include "pythoncapi_compat.h"
 
-            void test_expr(struct MyStruct *obj)
+            void test_expr(struct MyStruct *obj, PyObject **obj2)
             {
                 if (Py_IsNone(obj->attr1)) {
                     return 1;
                 }
                 if (Py_IsNone(obj->attr2.name)) {
                     return 1;
                 }
+                if (Py_IsNone(*obj2)) {
+                    return 1;
+                }
                 return 0;
             }
         """)
diff --git a/upgrade_pythoncapi.py b/upgrade_pythoncapi.py
@@ -21,9 +21,11 @@
 ID_REGEX = r'\b[a-zA-Z][a-zA-Z0-9_]*\b'
 # Match 'array[3]'
 SUBEXPR_REGEX = fr'{ID_REGEX}(?:\[[^]]+\])*'
-# Match a C expression like "frame", "frame.attr" or "obj->attr".
+# Match a C expression like "frame", "frame.attr", "obj->attr" or "*obj".
 # Don't match functions calls like "func()".
-EXPR_REGEX = fr"{SUBEXPR_REGEX}(?:(?:->|\.){SUBEXPR_REGEX})*"
+EXPR_REGEX = (fr"\*?"  # "*" prefix
+              fr"{SUBEXPR_REGEX}"  # "var"
+              fr"(?:(?:->|\.){SUBEXPR_REGEX})*")  # "->attr" or ".attr"
 
 
 def get_member_regex_str(member):
