jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support binary integer literals in the preprocessor

Browse source
This commit is contained in:
Olly Betts 2022-07-25 18:13:59 +12:00
commit 1bfe88eeda
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -7,6 +7,9 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
Version 4.1.0 (in progress) Version 4.1.0 (in progress)
=========================== ===========================
2022-07-25: olly
Support for C++14 binary integer literals in preprocessor expressions.
2022-07-20: wsfulton 2022-07-20: wsfulton
[C#, Java] Ensure the order of interfaces generated in proxy interfaces for the [C#, Java] Ensure the order of interfaces generated in proxy interfaces for the
%interface family of macros is the same as that parsed from the bases in C++. %interface family of macros is the same as that parsed from the bases in C++.

4
Examples/test-suite/cpp14_binary_integer_literals.i
View file

@ -1,5 +1,9 @@
%module cpp14_binary_integer_literals %module cpp14_binary_integer_literals
#if 0b100 < 4
# error binary constant in preprocessor expression failed
#endif
%inline %{ %inline %{
int b1 = 0b1; int b1 = 0b1;
int b2 = 0b10; int b2 = 0b10;

7
Source/Preprocessor/expr.c
View file

@ -318,7 +318,12 @@ int Preprocessor_expr(DOH *s, int *error) {
if ((token == SWIG_TOKEN_INT) || (token == SWIG_TOKEN_UINT) || (token == SWIG_TOKEN_LONG) || (token == SWIG_TOKEN_ULONG)) { if ((token == SWIG_TOKEN_INT) || (token == SWIG_TOKEN_UINT) || (token == SWIG_TOKEN_LONG) || (token == SWIG_TOKEN_ULONG)) {
/* A number. Reduce EXPR_TOP to an EXPR_VALUE */ /* A number. Reduce EXPR_TOP to an EXPR_VALUE */
char *c = Char(Scanner_text(scan)); char *c = Char(Scanner_text(scan));
stack[sp].value = (long) strtol(c, 0, 0); if (c[0] == '0' && (c[1] == 'b' || c[1] == 'B')) {
// strtol() doesn't handle binary constants.
stack[sp].value = (long) strtol(c + 2, 0, 2);
} else {
stack[sp].value = (long) strtol(c, 0, 0);
}
stack[sp].svalue = 0; stack[sp].svalue = 0;
stack[sp].op = EXPR_VALUE; stack[sp].op = EXPR_VALUE;
} else if ((token == SWIG_TOKEN_MINUS) || (token == SWIG_TOKEN_PLUS) || (token == SWIG_TOKEN_LNOT) || (token == SWIG_TOKEN_NOT)) { } else if ((token == SWIG_TOKEN_MINUS) || (token == SWIG_TOKEN_PLUS) || (token == SWIG_TOKEN_LNOT) || (token == SWIG_TOKEN_NOT)) {