diff options
| author | Colin Walters <walters@verbum.org> | 2012-10-26 16:46:05 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2012-10-30 08:20:36 -0400 |
| commit | 383b0bdcc8e295d06035768062389797d3ba9262 (patch) | |
| tree | e024519716913823e22abcd46294a3dc48bd9acd /tests | |
| parent | ce4a25dc640bdb02ff30fc233abb1c468721cbbd (diff) | |
| download | gobject-introspection-383b0bdcc8e295d06035768062389797d3ba9262.tar.gz | |
scanner: Correctly handle large 64 bit integer constants
In C, positive integer constants are by default unsigned. This means
an expression like 0x8000000000000000 will be "unsigned long long".
In the actual scanner code, we were parsing them as "gint64", and
storing them as gint64. This was incorrect; we need to parse them
as guint64, and store the bits we get from that. This gives us
an equivalent result to what the C compiler does.
However, when we actually return the value as a Python "long"
(arbitrary length integer), we need to treat the value as unsigned if
the result indicated it was.
https://bugzilla.gnome.org/show_bug.cgi?id=685022
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scanner/Regress-1.0-expected.gir | 15 | ||||
| -rw-r--r-- | tests/scanner/regress.h | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 53b3adc0..17d9d786 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -90,11 +90,26 @@ and/or use gtk-doc annotations. --> <type name="gdouble" c:type="double"/> </field> </record> + <constant name="MAXUINT64" + value="18446744073709551615" + c:type="REGRESS_MAXUINT64"> + <type name="gint64" c:type="gint64"/> + </constant> + <constant name="MININT64" + value="-9223372036854775808" + c:type="REGRESS_MININT64"> + <type name="gint64" c:type="gint64"/> + </constant> <constant name="Mixed_Case_Constant" value="4423" c:type="REGRESS_Mixed_Case_Constant"> <type name="gint" c:type="gint"/> </constant> + <constant name="NEGATIVE_INT_CONSTANT" + value="-42" + c:type="REGRESS_NEGATIVE_INT_CONSTANT"> + <type name="gint" c:type="gint"/> + </constant> <constant name="STRING_CONSTANT" value="Some String" c:type="REGRESS_STRING_CONSTANT"> diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index aba29dfa..137c4e04 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -262,6 +262,7 @@ GQuark regress_atest_error_quark (void); /* constants */ +#define REGRESS_NEGATIVE_INT_CONSTANT -42 #define REGRESS_INT_CONSTANT 4422 #define REGRESS_DOUBLE_CONSTANT 44.22 #define REGRESS_STRING_CONSTANT "Some String" @@ -912,4 +913,8 @@ typedef struct { */ #define _DONTSCANTHIS 1 +/* https://bugzilla.gnome.org/show_bug.cgi?id=685022 */ +#define REGRESS_MININT64 ((gint64) G_GINT64_CONSTANT(0x8000000000000000)) +#define REGRESS_MAXUINT64 (G_GINT64_CONSTANT(0xffffffffffffffffU)) + #endif /* __GITESTTYPES_H__ */ |