projects
/
gnome.gobject-introspection
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
519f55f
)
Revert "[TYPEDEF] transformer.py - revert last bad fix"
author
Alan Knowles
<alan@akbkhome.com>
Mon, 5 Apr 2010 04:15:51 +0000
(12:15 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Mon, 5 Apr 2010 04:15:51 +0000
(12:15 +0800)
This reverts commit
f2cc0562e09af102dc97732686476fead8a1a365
.
Conflicts:
giscanner/transformer.py
giscanner/transformer.py
patch
|
blob
|
history
diff --git
a/giscanner/transformer.py
b/giscanner/transformer.py
index
97fd499
..
3533002
100644
(file)
--- a/
giscanner/transformer.py
+++ b/
giscanner/transformer.py
@@
-33,7
+33,7
@@
from .odict import odict
from .sourcescanner import (
SourceSymbol, ctype_name, CTYPE_POINTER,
CTYPE_BASIC_TYPE, CTYPE_UNION, CTYPE_ARRAY, CTYPE_TYPEDEF,
from .sourcescanner import (
SourceSymbol, ctype_name, CTYPE_POINTER,
CTYPE_BASIC_TYPE, CTYPE_UNION, CTYPE_ARRAY, CTYPE_TYPEDEF,
- CTYPE_VOID, CTYPE_ENUM, CTYPE_FUNCTION, CTYPE_STRUCT,
CTYPE_INVALID,
+ CTYPE_VOID, CTYPE_ENUM, CTYPE_FUNCTION, CTYPE_STRUCT,
CSYMBOL_TYPE_FUNCTION, CSYMBOL_TYPE_TYPEDEF, CSYMBOL_TYPE_STRUCT,
CSYMBOL_TYPE_ENUM, CSYMBOL_TYPE_UNION, CSYMBOL_TYPE_OBJECT,
CSYMBOL_TYPE_MEMBER, CSYMBOL_TYPE_ELLIPSIS, CSYMBOL_TYPE_CONST,
CSYMBOL_TYPE_FUNCTION, CSYMBOL_TYPE_TYPEDEF, CSYMBOL_TYPE_STRUCT,
CSYMBOL_TYPE_ENUM, CSYMBOL_TYPE_UNION, CSYMBOL_TYPE_OBJECT,
CSYMBOL_TYPE_MEMBER, CSYMBOL_TYPE_ELLIPSIS, CSYMBOL_TYPE_CONST,
@@
-350,6
+350,7
@@
class Transformer(object):
value = 'void'
elif source_type.type == CTYPE_BASIC_TYPE:
value = source_type.name
value = 'void'
elif source_type.type == CTYPE_BASIC_TYPE:
value = source_type.name
+<<<<<<< HEAD
<<<<<<< HEAD
# skip adding invalid types.
=======
<<<<<<< HEAD
# skip adding invalid types.
=======
@@
-360,6
+361,10
@@
class Transformer(object):
value_add = self._create_source_type(source_type.base_type)
if len(value_add):
value += ' ' + value_add
value_add = self._create_source_type(source_type.base_type)
if len(value_add):
value += ' ' + value_add
+=======
+ if source_type.base_type:
+ value += ' ' + self._create_source_type(source_type.base_type)
+>>>>>>> f2cc056... [TYPEDEF] transformer.py - revert last bad fix
elif source_type.type == CTYPE_TYPEDEF:
value = source_type.name
elif source_type.type == CTYPE_ARRAY:
elif source_type.type == CTYPE_TYPEDEF:
value = source_type.name
elif source_type.type == CTYPE_ARRAY:
@@
-367,6
+372,7
@@
class Transformer(object):
elif source_type.type == CTYPE_POINTER:
value = self._create_source_type(source_type.base_type) + '*'
<<<<<<< HEAD
elif source_type.type == CTYPE_POINTER:
value = self._create_source_type(source_type.base_type) + '*'
<<<<<<< HEAD
+<<<<<<< HEAD
=======
elif source_type.type == CTYPE_STRUCT:
value = source_type.name
=======
elif source_type.type == CTYPE_STRUCT:
value = source_type.name
@@
-374,6
+380,8
@@
class Transformer(object):
elif source_type.type == CTYPE_INVALID:
#this happens if const is after the type..
value = ''
elif source_type.type == CTYPE_INVALID:
#this happens if const is after the type..
value = ''
+=======
+>>>>>>> f2cc056... [TYPEDEF] transformer.py - revert last bad fix
else:
value = 'any'
return value
else:
value = 'any'
return value