diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-26 14:40:50 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-26 14:40:50 (GMT) |
commit | d1e058b9c1f93aa0a986dbc8a754c5eabd747e27 (patch) | |
tree | 5dadd9d3fae88b0d9e37182ea073e60ebe3197a5 /src/constexp.y | |
parent | c42c0ae66542e4e154c2646fc725890554208d89 (diff) | |
parent | a5c98ade388f4f18ec30476ca706760a8129c73f (diff) | |
download | Doxygen-d1e058b9c1f93aa0a986dbc8a754c5eabd747e27.zip Doxygen-d1e058b9c1f93aa0a986dbc8a754c5eabd747e27.tar.gz Doxygen-d1e058b9c1f93aa0a986dbc8a754c5eabd747e27.tar.bz2 |
Merge branch 'master' into feature/bug_fenced_code
Diffstat (limited to 'src/constexp.y')
-rw-r--r-- | src/constexp.y | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/constexp.y b/src/constexp.y index 62a51f3..100614a 100644 --- a/src/constexp.y +++ b/src/constexp.y @@ -19,21 +19,16 @@ %{ #include "cppvalue.h" -#include "constexp.h" +#include "constexp_p.h" #include "message.h" -#if defined(_MSC_VER) -#define MSDOS -#endif - - #include <stdio.h> #include <stdlib.h> int constexpYYerror(yyscan_t yyscanner, const char *s) { struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner); - warn(yyextra->g_constExpFileName, yyextra->g_constExpLineNr, + warn(yyextra->constExpFileName, yyextra->constExpLineNr, "preprocessing issue while doing constant expression evaluation: %s",s); return 0; } @@ -80,7 +75,7 @@ int constexpYYerror(yyscan_t yyscanner, const char *s) start: constant_expression { struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner); - yyextra->g_resultValue = $1; return 0; + yyextra->resultValue = $1; return 0; } ; @@ -272,27 +267,27 @@ primary_expression: constant constant: TOK_OCTALINT { struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner); - $$ = parseOctal(yyextra->g_strToken); + $$ = parseOctal(yyextra->strToken); } | TOK_DECIMALINT { struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner); - $$ = parseDecimal(yyextra->g_strToken); + $$ = parseDecimal(yyextra->strToken); } | TOK_HEXADECIMALINT { struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner); - $$ = parseHexadecimal(yyextra->g_strToken); + $$ = parseHexadecimal(yyextra->strToken); } | TOK_CHARACTER { struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner); - $$ = parseCharacter(yyextra->g_strToken); + $$ = parseCharacter(yyextra->strToken); } | TOK_FLOAT { struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner); - $$ = parseFloat(yyextra->g_strToken); + $$ = parseFloat(yyextra->strToken); } ; |