Move some macro for universal parser #8044
Conversation
S-H-GAMELINKS
force-pushed
the
remove/universal-parser-internal-ctype-depend
branch
2 times, most recently
from
01b93d6
to
e17892f
Compare
parse.y
Outdated
| #ifdef ISSPACE | ||
| #undef ISSPACE | ||
| #define ISSPACE parse_isspace | ||
| #endif |
There was a problem hiding this comment.
Is #ifdef needed?
This means ISSPACE macro needs to be defined previously.
There was a problem hiding this comment.
Thanks for comment.
ISSPACE macro already defined in include/ruby/internal/ctype.h and that included in ruby/ruby.h.
parse.y include ruby/ruby.h, and I thought #undef ISSPACE is needed.
There was a problem hiding this comment.
At the moment include/ruby/internal/ctype.h is included into parse.y in both cases of with UNIVERSAL_PARSER and without UNIVERSAL_PARSER. However we may remove such inclusion in the future if possible. Current code wrapped with #ifdef might not work once include/ruby/internal/ctype.h is not included because #define ISSPACE parse_isspace is not defined without ISSPACE definition ahead of this line.
Could you try to remove #ifdef ISSPACE ... #ifdef STRNCASECMP ?
There was a problem hiding this comment.
Thanks comment and I understand. I'll try it.
And shoud I remove also #ifdef ISASCII ?
There was a problem hiding this comment.
Removed #ifdef ISSPACE ... #ifdef STRNCASECMP(also #ifdef ISASCII).
It' be fine that all test has passed, I think.
There was a problem hiding this comment.
Not only #ifdef ISSPACE and #ifdef ISASCII but also other #ifdef XXX like #ifdef ISCNTRL, #ifdef ISALPHA ...
By the way, current positions for parse_XXX is only for without UNIVERSAL_PARSER. Could you move these definitions to the place outside of UNIVERSAL_PARSER macro branches and RIPPER macro branches like
Line 542 in 2903e94
# without UNIVERSAL_PARSER
$ nm parse.o | grep isspace
0000000000010ab0 t _parse_isspace
000000000002a9b8 t _rb_enc_isspace
# with UNIVERSAL_PARSER
$ nm parse.o | grep isspace
0000000000010a08 t _rb_isspace
There was a problem hiding this comment.
Thanks comment, It's fixed to move outside of UNIVERSAL_PARSER macro branches and RIPPER macro branche.
S-H-GAMELINKS
force-pushed
the
remove/universal-parser-internal-ctype-depend
branch
2 times, most recently
from
30352c9
to
a884201
Compare
S-H-GAMELINKS
force-pushed
the
remove/universal-parser-internal-ctype-depend
branch
from
a884201
to
6870455
Compare
Move some macro that defined in
internal/ctype.htoparse.y.