RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:17:44 +00:00
Code Issues Activity Actions

LibCpp: Do lexing in the Preprocessor

Browse source 
We now call Preprocessor::process_and_lex() and pass the result to the
parser.

Doing the lexing in the preprocessor will allow us to maintain the
original position information of tokens after substituting definitions.
This commit is contained in:
Itamar 2021-08-06 10:29:57 +03:00 • committed by Andreas Kling
parent bf7262681e
commit 4673a517f6
9 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@
#include <AK/String.h>
#include <AK/StringView.h>
#include <AK/Vector.h>
#include <LibCpp/Token.h>
namespace Cpp {
@ -19,8 +20,7 @@ class Preprocessor {
public:
explicit Preprocessor(const String& filename, const StringView& program);
const String& process();
const String& processed_text();
Vector<Token> process_and_lex();
Vector<StringView> included_paths() const { return m_included_paths; }
struct DefinedValue {
@ -38,13 +38,13 @@ public:
private:
using PreprocessorKeyword = StringView;
PreprocessorKeyword handle_preprocessor_line(const StringView&);
void handle_preprocessor_keyword(const StringView& keyword, GenericLexer& line_lexer);
PreprocessorKeyword handle_preprocessor_line(StringView const&);
void handle_preprocessor_keyword(StringView const& keyword, GenericLexer& line_lexer);
Vector<Token> process_line(StringView const& line);
String m_filename;
String m_program;
Definitions m_definitions;
const String m_filename;
const StringView m_program;
StringBuilder m_builder;
Vector<StringView> m_lines;
size_t m_line_index { 0 };
size_t m_current_depth { 0 };