summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2021-04-19 09:56:05 (GMT)
committeralbert-github <albert.tests@gmail.com>2021-04-19 09:56:05 (GMT)
commite12a17cfba22bb0f8f7a331bf38237ed09866ddd (patch)
treef8660e6d241087d08b4608c2edf6efa9e1043698 /src
parent98c67549bc3cd855873e0ef5eeab7c6410699d78 (diff)
downloadDoxygen-e12a17cfba22bb0f8f7a331bf38237ed09866ddd.zip
Doxygen-e12a17cfba22bb0f8f7a331bf38237ed09866ddd.tar.gz
Doxygen-e12a17cfba22bb0f8f7a331bf38237ed09866ddd.tar.bz2
Warning from preprocessor regarding binary literals
When having a line like: ``` #if (JITTERLISP_FIXNUM_TAG_BIN == 0) ``` with ``` #define JITTERLISP_FIXNUM_TAG_BIN 0b0000 ``` we get the warning: ``` warning: preprocessing issue while doing constant expression evaluation: syntax error: input=' ( 0b0000 == 0)' ``` The equivalent hexadecimal / octal / decimal versions are OK, the handling for the binary was missing. (Found by Fossies in the poke package).
Diffstat (limited to 'src')
-rw-r--r--src/constexp.l3
-rw-r--r--src/constexp.y6
-rw-r--r--src/cppvalue.cpp10
-rw-r--r--src/cppvalue.h1
4 files changed, 20 insertions, 0 deletions
diff --git a/src/constexp.l b/src/constexp.l
index acff1eb..479649a 100644
--- a/src/constexp.l
+++ b/src/constexp.l
@@ -90,6 +90,9 @@ CONSTSUFFIX ([uU][lL]?[lL]?)|([lL][lL]?[uU]?)
(0x|0X)[0-9a-fA-F]+{CONSTSUFFIX}? { yyextra->strToken=yytext+2;
return TOK_HEXADECIMALINT;
}
+(0b|0B)[01]+{CONSTSUFFIX}? { yyextra->strToken=yytext+2;
+ return TOK_BINARYINT;
+ }
(([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+))([eE]([\-\+])?[0-9]+)?([fFlL])? {
yyextra->strToken=yytext; return TOK_FLOAT;
}
diff --git a/src/constexp.y b/src/constexp.y
index 560b3c3..4ebbc79 100644
--- a/src/constexp.y
+++ b/src/constexp.y
@@ -64,6 +64,7 @@ int constexpYYerror(yyscan_t yyscanner, const char *s)
%token TOK_OCTALINT
%token TOK_DECIMALINT
%token TOK_HEXADECIMALINT
+%token TOK_BINARYINT
%token TOK_CHARACTER
%token TOK_FLOAT
@@ -276,6 +277,11 @@ constant: TOK_OCTALINT
struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
$$ = parseHexadecimal(yyextra->strToken);
}
+ | TOK_BINARYINT
+ {
+ struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
+ $$ = parseBinary(yyextra->strToken);
+ }
| TOK_CHARACTER
{
struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
diff --git a/src/cppvalue.cpp b/src/cppvalue.cpp
index 31f0ab5..b6e7f65 100644
--- a/src/cppvalue.cpp
+++ b/src/cppvalue.cpp
@@ -51,6 +51,16 @@ CPPValue parseHexadecimal(const std::string& token)
return CPPValue(val);
}
+CPPValue parseBinary(const std::string& token)
+{
+ long val = 0;
+ for (const char *p = token.c_str(); *p != 0; p++)
+ {
+ if (*p >= '0' && *p <= '1') val = val * 2 + *p - '0';
+ }
+ return CPPValue(val);
+}
+
CPPValue parseCharacter(const std::string& token) // does not work for '\n' and the alike
{
if (token[1]=='\\')
diff --git a/src/cppvalue.h b/src/cppvalue.h
index 7732068..74fe4d7 100644
--- a/src/cppvalue.h
+++ b/src/cppvalue.h
@@ -52,6 +52,7 @@ class CPPValue
extern CPPValue parseOctal(const std::string& token);
extern CPPValue parseDecimal(const std::string& token);
extern CPPValue parseHexadecimal(const std::string& token);
+extern CPPValue parseBinary(const std::string& token);
extern CPPValue parseCharacter(const std::string& token);
extern CPPValue parseFloat(const std::string& token);