Fix autopatching

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/test_autopatch_capi.py

@@ -90,3 +90,19 @@ def test_replace_field_access():
             '(PyObject*)function_call(a, b, c(0))->ob_type->ob_base;',
             '(PyObject*)Py_TYPE(function_call(a, b, c(0)))->ob_base;',
         )
+        check_autopatched(
+            '''
+            #if SOME_MACRO
+            obj->ob_type->tp_free(self);
+            #else
+            obj->ob_type->tp_free(self);
+            #endif
+            ''',
+            '''
+            #if SOME_MACRO
+            Py_TYPE(obj)->tp_free(self);
+            #else
+            Py_TYPE(obj)->tp_free(self);
+            #endif
+            ''',
+        )

graalpython/lib-graalpython/modules/autopatch_capi.py

@@ -99,27 +99,31 @@ def consume_identifier_backwards(idx):
             idx -= 1
         return idx
 
-    first = True
+    allowed_tokens = {'()', '[]', '.', 'id'}
     while idx >= 0:
         c = contents[idx]
-        if c == ')' and first:
+        if '()' in allowed_tokens and c == ')':
             idx = consume_pairwise_backwards(idx, '(', ')')
-        elif c == ']':
+            allowed_tokens = {'[]', 'id'}
+        elif '[]' in allowed_tokens and c == ']':
             idx = consume_pairwise_backwards(idx, '[', ']')
-        elif c.isidentifier() or c.isdigit():
+            allowed_tokens = {'[]', 'id'}
+        elif 'id' in allowed_tokens and c.isidentifier() or c.isdigit():
             id_start = consume_identifier_backwards(idx)
             if contents[id_start + 1: idx + 1] == 'return':
                 idx += 1
                 break
             idx = id_start
-        elif c == '.':
+            allowed_tokens = {'.'}
+        elif '.' in allowed_tokens and c == '.':
             idx -= 1
-        elif c == '>' and idx > 1 and contents[idx - 1] == '-':
+            allowed_tokens = {'[]', 'id'}
+        elif '.' in allowed_tokens and c == '>' and idx > 1 and contents[idx - 1] == '-':
             idx -= 2
+            allowed_tokens = {'[]', 'id'}
         else:
             idx += 1
             break
-        first = False
         idx = consume_whitespace_backwards(idx)
 
     receiver_start = consume_whitespace_forward(idx)