mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 08:47:34 +00:00
LibCpp: Parse ellipsis
We can now parse the printf function declaration :^)
This commit is contained in:
parent
5c79297b2c
commit
1d3b5dabc3
4 changed files with 42 additions and 22 deletions
|
@ -91,10 +91,15 @@ void Type::dump(size_t indent) const
|
|||
void Parameter::dump(size_t indent) const
|
||||
{
|
||||
ASTNode::dump(indent);
|
||||
if (m_is_ellipsis) {
|
||||
print_indent(indent + 1);
|
||||
outln("...");
|
||||
}
|
||||
if (!m_name.is_null()) {
|
||||
print_indent(indent);
|
||||
outln("{}", m_name);
|
||||
}
|
||||
if (m_type)
|
||||
m_type->dump(indent + 1);
|
||||
}
|
||||
|
||||
|
|
|
@ -202,13 +202,15 @@ public:
|
|||
virtual const char* class_name() const override { return "Parameter"; }
|
||||
virtual void dump(size_t indent) const override;
|
||||
|
||||
Parameter(ASTNode* parent, Optional<Position> start, Optional<Position> end, StringView name, const String& filename)
|
||||
Parameter(ASTNode* parent, Optional<Position> start, Optional<Position> end, const String& filename, StringView name)
|
||||
: VariableOrParameterDeclaration(parent, start, end, filename)
|
||||
{
|
||||
m_name = name;
|
||||
}
|
||||
|
||||
virtual bool is_parameter() const override { return true; }
|
||||
|
||||
bool m_is_ellipsis { false };
|
||||
};
|
||||
|
||||
class Type : public ASTNode {
|
||||
|
|
|
@ -24,9 +24,6 @@
|
|||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#undef CPP_DEBUG
|
||||
#define CPP_DEBUG 1
|
||||
|
||||
#ifdef CPP_DEBUG
|
||||
# define DEBUG_SPAM
|
||||
#endif
|
||||
|
@ -560,6 +557,14 @@ Optional<NonnullRefPtrVector<Parameter>> Parser::parse_parameter_list(ASTNode& p
|
|||
SCOPE_LOGGER();
|
||||
NonnullRefPtrVector<Parameter> parameters;
|
||||
while (peek().m_type != Token::Type::RightParen && !eof()) {
|
||||
if (match_ellipsis()) {
|
||||
auto last_dot = consume();
|
||||
while (peek().type() == Token::Type::Dot)
|
||||
last_dot = consume();
|
||||
auto param = create_ast_node<Parameter>(parent, position(), last_dot.end(), StringView {});
|
||||
param->m_is_ellipsis = true;
|
||||
parameters.append(move(param));
|
||||
} else {
|
||||
auto type = parse_type(parent);
|
||||
|
||||
auto name_identifier = peek(Token::Type::Identifier);
|
||||
|
@ -574,6 +579,8 @@ Optional<NonnullRefPtrVector<Parameter>> Parser::parse_parameter_list(ASTNode& p
|
|||
|
||||
param->m_type = move(type);
|
||||
parameters.append(move(param));
|
||||
}
|
||||
|
||||
if (peek(Token::Type::Comma).has_value())
|
||||
consume(Token::Type::Comma);
|
||||
}
|
||||
|
@ -640,12 +647,11 @@ Token Parser::consume()
|
|||
return m_tokens[m_state.token_index++];
|
||||
}
|
||||
|
||||
Token Parser::peek() const
|
||||
Token Parser::peek(size_t offset) const
|
||||
{
|
||||
if (eof()) {
|
||||
if (m_state.token_index + offset >= m_tokens.size())
|
||||
return { Token::Type::EOF_TOKEN, position(), position() };
|
||||
}
|
||||
return m_tokens[m_state.token_index];
|
||||
return m_tokens[m_state.token_index + offset];
|
||||
}
|
||||
|
||||
Optional<Token> Parser::peek(Token::Type type) const
|
||||
|
@ -1086,5 +1092,11 @@ void Parser::consume_attribute_specification()
|
|||
}
|
||||
}
|
||||
|
||||
bool Parser::match_ellipsis()
|
||||
{
|
||||
if (m_state.token_index > m_tokens.size() - 3)
|
||||
return false;
|
||||
return peek().type() == Token::Type::Dot && peek().type() == Token::Type::Dot && peek().type() == Token::Type::Dot;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -111,7 +111,7 @@ private:
|
|||
Token consume(Token::Type);
|
||||
Token consume();
|
||||
Token consume_keyword(const String&);
|
||||
Token peek() const;
|
||||
Token peek(size_t offset = 0) const;
|
||||
Optional<Token> peek(Token::Type) const;
|
||||
Position position() const;
|
||||
StringView text_of_range(Position start, Position end) const;
|
||||
|
@ -163,6 +163,7 @@ private:
|
|||
Vector<StringView> parse_type_qualifiers();
|
||||
bool match_attribute_specification();
|
||||
void consume_attribute_specification();
|
||||
bool match_ellipsis();
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue