Zend language scanner: minor refactorings #20480
Conversation
| zend_arena *ast_arena; | ||
| } zend_lex_state; | ||
|
|
||
| typedef struct _zend_heredoc_label { |
There was a problem hiding this comment.
I don't think it makes sense to make these private, as they can be accessed via the public struct via heredoc_label_stack. Similar issue for zend_nest_location.
There was a problem hiding this comment.
Good point, will revert.
| #define ZEND_SCANNER_H | ||
|
|
||
| #include "zend_globals.h" | ||
| #include "zend_arena.h" |
There was a problem hiding this comment.
You still include zend_globals, so what exactly do we gain by adding all these headers explicitly?
There was a problem hiding this comment.
I wanted to remove it, but annoyingly zend_php_scanner_event is defined there. And I don't know if it's sensible to "flip" the header inclusion so that zend_globals includes zend_language_scanner.h or not...
There was a problem hiding this comment.
Hm I don't think that makes sense, I don't like to pull the scanner into everything
There was a problem hiding this comment.
That's what I thought too, I'm happy to remove the extra header includes and just have a comment explaining why we include globals.
uint32_t