RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 20:28:11 +00:00
Code Issues Activity Actions

LibCpp: Lex before processing the source in the Preprocessor

Browse source 
Previously, the preprocessor first split the source into lines, and then
processed and lexed each line separately.

This patch makes the preprocessor first lex the source, and then do the
processing on the tokenized representation.

This generally simplifies the code, and also fixes an issue we
previously had with multiline comments (we did not recognize them
correctly when processing each line separately).
This commit is contained in:
Itamar 2021-08-20 17:06:29 +03:00 • committed by Andreas Kling
parent 165a0082c4
commit 7a4a32b112
2 changed files with 64 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibCpp/Preprocessor.h
View file

@ -49,10 +49,11 @@ public:
Function<Definitions(StringView)> definitions_in_header_callback { nullptr };
private:
using PreprocessorKeyword = StringView;
PreprocessorKeyword handle_preprocessor_line(StringView const&);
void handle_preprocessor_statement(StringView const&);
void handle_include_statement(StringView const&);
void handle_preprocessor_keyword(StringView const& keyword, GenericLexer& line_lexer);
void process_line(StringView const& line);
String remove_escaped_newlines(StringView const& value);
size_t do_substitution(Vector<Token> const& tokens, size_t token_index, Definition const&);
Optional<Definition> create_definition(StringView line);
@ -69,13 +70,12 @@ private:
String m_filename;
String m_program;
Vector<StringView> m_lines;
Vector<Token> m_tokens;
Vector<Token> m_processed_tokens;
Definitions m_definitions;
Vector<Substitution> m_substitutions;
size_t m_line_index { 0 };
size_t m_current_line { 0 };
size_t m_current_depth { 0 };
Vector<size_t> m_depths_of_taken_branches;
Vector<size_t> m_depths_of_not_taken_branches;