sfja.skp/web-stack-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bing bong code wrong

Browse Source
This commit is contained in:
SimonFJ20 2023-01-18 01:29:03 +01:00
parent 83782004fd
commit 578b5f7fbd
2 changed files with 156 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
src/bong.cpp
View File

@ -339,85 +339,110 @@ auto Lexer::step() noexcept -> void
} }
} }
// auto Parser::parse_top_level() noexcept -> Result<std::unique_ptr<Node>, auto Parser::parse_top_level() noexcept -> Result<std::unique_ptr<Node>, Error>
// Error> {
// { if (!lexer.peek())
// if (!lexer.peek()) return Error { lexer.peek().unwrap_error() };
// return Error { lexer.peek().unwrap_error() }; else if (lexer.peek()->type == Tokens::Name)
// else if (lexer.peek()->type == Tokens::Name) return parse_element();
// return parse_element(); else
// else return parse_value();
// return parse_value(); }
// }
// auto Parser::parse_element() noexcept -> Result<std::unique_ptr<Node>, Error> auto Parser::parse_element() noexcept -> Result<std::unique_ptr<Node>, Error>
// { {
// auto name = *lexer.peek(); auto name = *lexer.peek();
// auto ids = Element::Ids {}; auto ids = Element::Ids {};
// auto classes = Element::Classes {}; auto classes = Element::Classes {};
// auto properties = Element::Properties {}; auto properties = Element::Properties {};
// auto values = Element::Values {}; auto values = Element::Values {};
// if (auto result = lexer.next(); !result) if (auto result = lexer.next(); !result)
// return Error { result.unwrap_error() }; return Error { result.unwrap_error() };
// return Result<std::unique_ptr<Node>, Error>::create_ok( return Result<std::unique_ptr<Node>, Error>::create_ok(
// std::make_unique<Element>( std::make_unique<Element>(
// Element { std::string { name.value() }, {}, {}, {}, {} })); Element { std::string { name.value() }, {}, {}, {}, {} }));
// } }
// auto Parser::parse_single_line_fields( auto remove_first_char(std::string_view value) noexcept -> std::string_view
// Element::Initializer& initializer) noexcept -> Result<void, Error> {
// { return value.substr(1, value.size() - 1);
// if (lexer.peek()->type == Tokens::Id) { }
// initializer.ids.push_back(std::string { lexer.peek()->value() });
// if (auto result = lexer.next(); !result)
// return Error { result.unwrap_error() };
// // do the rest;
// } else if (lexer.peek()->type == Tokens::Class) {
// initializer.classes.push_back(std::string { lexer.peek()->value() });
// if (auto result = lexer.next(); !result)
// return Error { result.unwrap_error() };
// // do the rest
// } else {
// if (auto result = parse_mandatory_same_line_whitespace(); !result)
// return result;
// if (lexer.peek()->type == Tokens::Name) {
// auto key = lexer.peek();
// if (auto result = lexer.next(); !result)
// return Error { result.unwrap_error() };
// if (auto result = parse_optional_whitespace(); !result)
// return result;
// if (lexer.peek()->type != Tokens::Equal
// and lexer.peek()->type != Tokens::Colon)
// return Error {
// fmt::format("expected '=' or ':', got {}",
// lexer.peek()->to_string()),
// lexer.peek()->location,
// };
// if (auto result = lexer.next(); !result)
// return Error { result.unwrap_error() };
// if (auto result = parse_optional_same_line_whitespace(); !result)
// return result;
// auto value = parse_single_line_value();
// if (!value)
// return value;
// // do the rest
// } else {
// auto value = parse_single_line_value();
// if (!value)
// return value;
// // do the rest
// }
// }
// return {};
// }
// auto Parser::parse_single_line_field(Element::Initializer& initializer) auto Parser::parse_single_line_fields(
// noexcept Element::Initializer& initializer) noexcept -> Result<void, Error>
// -> Result<void, Error> {
// { if (lexer.peek()->type == Tokens::Id)
return parse_single_line_fields_starts_id(initializer);
else if (lexer.peek()->type == Tokens::Class)
return parse_single_line_fields_starts_class(initializer);
else
return parse_single_line_fields_starts_with_property_or_value(
initializer);
}
// } auto Parser::parse_single_line_fields_starts_id(
Element::Initializer& initializer) noexcept -> Result<void, Error>
{
initializer.ids.push_back(std::string {
remove_first_char(lexer.peek()->value()),
});
if (auto result = lexer.next(); !result)
return Error { result.unwrap_error() };
return parse_single_line_fields_tail(initializer);
}
auto Parser::parse_single_line_fields_starts_class(
Element::Initializer& initializer) noexcept -> Result<void, Error>
{
initializer.classes.push_back(std::string {
remove_first_char(lexer.peek()->value()),
});
if (auto result = lexer.next(); !result)
return Error { result.unwrap_error() };
return parse_single_line_fields_tail(initializer);
}
auto Parser::parse_single_line_fields_starts_with_property_or_value(
Element::Initializer& initializer) noexcept -> Result<void, Error>
{
if (auto result = parse_mandatory_same_line_whitespace(); !result)
return result;
if (lexer.peek()->type == Tokens::Name) {
auto key = lexer.peek();
if (auto result = lexer.next(); !result)
return Error { result.unwrap_error() };
if (auto result = parse_optional_whitespace(); !result)
return result;
if (lexer.peek()->type != Tokens::Equal
and lexer.peek()->type != Tokens::Colon)
return Error {
fmt::format(
"expected '=' or ':', got {}", lexer.peek()->to_string()),
lexer.peek()->location,
};
if (auto result = lexer.next(); !result)
return Error { result.unwrap_error() };
if (auto result = parse_optional_same_line_whitespace(); !result)
return result;
auto value = parse_single_line_value();
if (!value)
return value.transform<void>();
initializer.properties.insert_or_assign(
std::string { key->value() }, *value);
return parse_single_line_fields_tail(initializer);
} else {
auto value = parse_single_line_value();
if (!value)
return value.transform<void>();
initializer.values.push_back(*value);
return parse_single_line_fields_tail(initializer);
}
}
auto Parser::parse_single_line_fields_tail(
Element::Initializer& initializer) noexcept -> Result<void, Error>
{ }
} }

105
src/bong.hpp
View File

@ -201,57 +201,66 @@ struct Bool final : public Node {
auto type() const noexcept -> Nodes override { return Nodes::Bool; } auto type() const noexcept -> Nodes override { return Nodes::Bool; }
}; };
// class Parser { class Parser {
// public: public:
// struct Error { struct Error {
// Error(Lexer::Error error) Error(Lexer::Error error)
// : message { std::move(error.message) } : message { std::move(error.message) }
// , location { error.location } , location { error.location }
// { } { }
// Error(std::string message, Location location) Error(std::string message, Location location)
// : message { std::move(message) } : message { std::move(message) }
// , location { location } , location { location }
// { } { }
// std::string message; std::string message;
// Location location; Location location;
// }; };
// Parser(Lexer lexer) Parser(Lexer lexer)
// : lexer { std::move(lexer) } : lexer { std::move(lexer) }
// { } { }
// auto parse_top_level() noexcept -> Result<std::unique_ptr<Node>, Error>; auto parse_top_level() noexcept -> Result<std::unique_ptr<Node>, Error>;
// auto parse_element() noexcept -> Result<std::unique_ptr<Node>, Error>; auto parse_element() noexcept -> Result<std::unique_ptr<Node>, Error>;
// auto parse_element_body(Element::Initializer& initializer) noexcept auto parse_element_body(Element::Initializer& initializer) noexcept
// -> Result<void, Error>; -> Result<void, Error>;
// auto parse_element_fields(Element::Initializer& initializer) noexcept auto parse_element_fields(Element::Initializer& initializer) noexcept
// -> Result<void, Error>; -> Result<void, Error>;
// auto parse_element_field(Element::Initializer& initializer) noexcept auto parse_element_field(Element::Initializer& initializer) noexcept
// -> Result<void, Error>; -> Result<void, Error>;
// auto parse_single_line_fields(Element::Initializer& initializer) noexcept auto parse_element_property() noexcept -> Result<void, Error>;
// -> Result<void, Error>; auto parse_single_line_fields(Element::Initializer& initializer) noexcept
// auto parse_element_property() noexcept -> Result<void, Error>; -> Result<void, Error>;
// auto parse_single_line_value() noexcept -> Result<void, Error>; auto parse_single_line_fields_starts_id(
// auto parse_value() noexcept -> Result<std::unique_ptr<Node>, Error>; Element::Initializer& initializer) noexcept -> Result<void, Error>;
// auto parse_object() noexcept -> Result<void, Error>; auto parse_single_line_fields_starts_class(
// auto parse_object_properties() noexcept -> Result<void, Error>; Element::Initializer& initializer) noexcept -> Result<void, Error>;
// auto parse_object_property() noexcept -> Result<void, Error>; auto parse_single_line_fields_starts_with_property_or_value(
// auto parse_array() noexcept -> Result<void, Error>; Element::Initializer& initializer) noexcept -> Result<void, Error>;
// auto parse_array_values() noexcept -> Result<void, Error>; auto parse_single_line_fields_tail(
// auto parse_bool() noexcept -> Result<void, Error>; Element::Initializer& initializer) noexcept -> Result<void, Error>;
// auto parse_mandatory_same_line_whitespace() noexcept -> Result<void, auto parse_single_line_value() noexcept
// Error>; auto parse_optional_same_line_whitespace() noexcept -> -> Result<std::unique_ptr<Node>, Error>;
// Result<void, Error>; auto parse_mandatory_linebreak() noexcept -> auto parse_value() noexcept -> Result<std::unique_ptr<Node>, Error>;
// Result<void, Error>; auto parse_single_line_whitespace() noexcept -> auto parse_object() noexcept -> Result<void, Error>;
// Result<void, Error>; auto parse_line_breaker() noexcept -> Result<void, auto parse_object_properties() noexcept -> Result<void, Error>;
// Error>; auto parse_whitespace_and_line_break() noexcept -> Result<void, auto parse_object_property() noexcept -> Result<void, Error>;
// Error>; auto parse_optional_whitespace() noexcept -> Result<void, Error>; auto parse_array() noexcept -> Result<void, Error>;
// auto parse_mandatory_whitespace() noexcept -> Result<void, Error>; auto parse_array_values() noexcept -> Result<void, Error>;
// auto parse_singular_whitespace() noexcept -> Result<void, Error>; auto parse_bool() noexcept -> Result<void, Error>;
auto parse_mandatory_same_line_whitespace() noexcept -> Result<void, Error>;
auto parse_optional_same_line_whitespace() noexcept -> Result<void, Error>;
auto parse_mandatory_linebreak() noexcept -> Result<void, Error>;
auto parse_single_line_whitespace() noexcept -> Result<void, Error>;
auto parse_line_breaker() noexcept -> Result<void, Error>;
auto parse_whitespace_and_line_break() noexcept -> Result<void, Error>;
auto parse_optional_whitespace() noexcept -> Result<void, Error>;
auto parse_mandatory_whitespace() noexcept -> Result<void, Error>;
auto parse_singular_whitespace() noexcept -> Result<void, Error>;
// private: private:
// Lexer lexer; Lexer lexer;
// }; };
} }