summaryrefslogtreecommitdiff
path: root/giscanner/ast.py
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@gnome.org>2015-09-27 13:06:49 -0500
committerMichael Catanzaro <mcatanzaro@gnome.org>2015-09-27 13:06:56 -0500
commit232f3c831260f596e36159112292897962a505b4 (patch)
treebfa8aae73980843ccbb3ddc50ff79193550a4447 /giscanner/ast.py
parent5ae7bd58b6266997b61d897ad6562118eeb59210 (diff)
downloadgobject-introspection-232f3c831260f596e36159112292897962a505b4.tar.gz
Revert "scanner: Warn and ignore on incorrect transfer annotations"
It broke at least atk and mutter. This reverts commit 5ae7bd58b6266997b61d897ad6562118eeb59210.
Diffstat (limited to 'giscanner/ast.py')
-rw-r--r--giscanner/ast.py18
1 files changed, 7 insertions, 11 deletions
diff --git a/giscanner/ast.py b/giscanner/ast.py
index 405a71fd..c7ea2d74 100644
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -214,17 +214,13 @@ TYPE_FILENAME = Type(target_fundamental='filename', ctype='gchar*')
TYPE_VALIST = Type(target_fundamental='va_list', ctype='va_list')
-BASIC_TYPES = [TYPE_BOOLEAN, TYPE_INT8, TYPE_UINT8, TYPE_INT16,
- TYPE_UINT16, TYPE_INT32, TYPE_UINT32, TYPE_INT64,
- TYPE_UINT64, TYPE_CHAR, TYPE_SHORT, TYPE_USHORT, TYPE_INT,
- TYPE_UINT, TYPE_LONG, TYPE_ULONG, TYPE_SIZE, TYPE_SSIZE,
- TYPE_LONG_LONG, TYPE_LONG_ULONG,
- TYPE_FLOAT, TYPE_DOUBLE,
- TYPE_LONG_DOUBLE, TYPE_UNICHAR, TYPE_GTYPE]
-
-BASIC_GIR_TYPES = [TYPE_INTPTR, TYPE_UINTPTR]
-BASIC_GIR_TYPES.extend(BASIC_TYPES)
-
+BASIC_GIR_TYPES = [TYPE_BOOLEAN, TYPE_INT8, TYPE_UINT8, TYPE_INT16,
+ TYPE_UINT16, TYPE_INT32, TYPE_UINT32, TYPE_INT64,
+ TYPE_UINT64, TYPE_CHAR, TYPE_SHORT, TYPE_USHORT, TYPE_INT,
+ TYPE_UINT, TYPE_LONG, TYPE_ULONG, TYPE_SIZE, TYPE_SSIZE,
+ TYPE_LONG_LONG, TYPE_LONG_ULONG, TYPE_INTPTR, TYPE_UINTPTR,
+ TYPE_FLOAT, TYPE_DOUBLE,
+ TYPE_LONG_DOUBLE, TYPE_UNICHAR, TYPE_GTYPE]
GIR_TYPES = [TYPE_NONE, TYPE_ANY]
GIR_TYPES.extend(BASIC_GIR_TYPES)
GIR_TYPES.extend([TYPE_STRING, TYPE_FILENAME, TYPE_VALIST])