Skip to content

Commit

Permalink
Merge pull request #28 from OpenVicProject/say-thanks-to-non-breaking…
Browse files Browse the repository at this point in the history 
…-space-breaking-everything-again

Add grammar support for BEL, HT, LF, and CR characters
  • Loading branch information
@Hop311
Hop311 authored Oct 22, 2023
2 parents 0e3640b + 7d5d86e commit efc11f5
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 27 deletions.
26 changes: 13 additions & 13 deletions include/openvic-dataloader/v2script/AbstractSyntaxTree.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,27 +166,27 @@ namespace ovdl::v2script::ast {
struct AbstractStringNode : public Node {
std::string _name;
AbstractStringNode();
AbstractStringNode(std::string&& name);
AbstractStringNode(std::string&& name, bool allow_newline);
AbstractStringNode(NodeLocation location);
AbstractStringNode(NodeLocation location, std::string&& name);
AbstractStringNode(NodeLocation location, std::string&& name, bool allow_newline);
OVDL_TYPE_DEFINE_SELF;
OVDL_RT_TYPE_DEF;
OVDL_PRINT_FUNC_DEF;
static constexpr std::string_view get_base_type_static() { return detail::type_name<AbstractStringNode>(); }
constexpr std::string_view get_base_type() const override { return ::ovdl::detail::type_name<std::decay_t<decltype(*this)>>(); }
};

#define OVDL_AST_STRING_NODE(NAME) \
struct NAME final : public AbstractStringNode { \
NAME(); \
NAME(std::string&& name); \
NAME(lexy::nullopt); \
NAME(NodeLocation location); \
NAME(NodeLocation location, std::string&& name); \
NAME(NodeLocation location, lexy::nullopt); \
OVDL_TYPE_DEFINE_SELF; \
OVDL_RT_TYPE_DEF; \
OVDL_PRINT_FUNC_DEF; \
#define OVDL_AST_STRING_NODE(NAME) \
struct NAME final : public AbstractStringNode { \
NAME(); \
NAME(std::string&& name, bool allow_newline = true); \
NAME(lexy::nullopt); \
NAME(NodeLocation location); \
NAME(NodeLocation location, std::string&& name, bool allow_newline = true); \
NAME(NodeLocation location, lexy::nullopt); \
OVDL_TYPE_DEFINE_SELF; \
OVDL_RT_TYPE_DEF; \
OVDL_PRINT_FUNC_DEF; \
}

// Value Expression Nodes
Expand Down
38 changes: 28 additions & 10 deletions src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,22 @@

using namespace ovdl::v2script::ast;

static void _handle_string_characters(std::string& string, bool allow_newline) {
size_t position = 0;
for (auto& c : string) {
switch (c) {
case '\r':
case '\n':
if (allow_newline) goto END_LOOP;
c = ' ';
break;
default: break;
}
END_LOOP:
position++;
}
}

void ovdl::v2script::ast::copy_into_node_ptr_vector(const std::vector<NodePtr>& source, std::vector<NodeUPtr>& dest) {
dest.clear();
dest.reserve(source.size());
Expand All @@ -23,22 +39,24 @@ void ovdl::v2script::ast::copy_into_node_ptr_vector(const std::vector<NodePtr>&
}

AbstractStringNode::AbstractStringNode() : Node({}) {}
AbstractStringNode::AbstractStringNode(NodeLocation location, std::string&& name) : Node(location),
_name(std::move(name)) {}
AbstractStringNode::AbstractStringNode(NodeLocation location, std::string&& name, bool allow_newline) : Node(location),
_name(std::move(name)) {
_handle_string_characters(_name, allow_newline);
}
AbstractStringNode::AbstractStringNode(NodeLocation location) : Node(location) {}
AbstractStringNode::AbstractStringNode(std::string&& name) : AbstractStringNode({}, std::move(name)) {}
AbstractStringNode::AbstractStringNode(std::string&& name, bool allow_newline) : AbstractStringNode({}, std::move(name), allow_newline) {}

std::ostream& AbstractStringNode::print(std::ostream& stream, size_t indent) const {
return stream << _name;
}

#define OVDL_AST_STRING_NODE_DEF(NAME, ...) \
NAME::NAME() : AbstractStringNode() {} \
NAME::NAME(std::string&& name) : AbstractStringNode(std::move(name)) {} \
NAME::NAME(lexy::nullopt) : AbstractStringNode() {} \
NAME::NAME(NodeLocation location) : AbstractStringNode(location) {} \
NAME::NAME(NodeLocation location, std::string&& name) : AbstractStringNode(location, std::move(name)) {} \
NAME::NAME(NodeLocation location, lexy::nullopt) : AbstractStringNode(location, {}) {} \
#define OVDL_AST_STRING_NODE_DEF(NAME, ...) \
NAME::NAME() : AbstractStringNode() {} \
NAME::NAME(std::string&& name, bool allow_newline) : AbstractStringNode(std::move(name), allow_newline) {} \
NAME::NAME(lexy::nullopt) : AbstractStringNode() {} \
NAME::NAME(NodeLocation location) : AbstractStringNode(location) {} \
NAME::NAME(NodeLocation location, std::string&& name, bool allow_newline) : AbstractStringNode(location, std::move(name), allow_newline) {} \
NAME::NAME(NodeLocation location, lexy::nullopt) : AbstractStringNode(location, {}, true) {} \
std::ostream& NAME::print(std::ostream& stream, size_t indent) const __VA_ARGS__

OVDL_AST_STRING_NODE_DEF(IdentifierNode, {
Expand Down
9 changes: 5 additions & 4 deletions src/openvic-dataloader/v2script/SimpleGrammar.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,13 @@ namespace ovdl::v2script::grammar {
template<ParseOptions Options>
struct StringExpression {
static constexpr auto rule = [] {
// Arbitrary code points that aren't control characters.
auto c = ovdl::detail::lexydsl::make_range<0x20, 0xFF>() - lexy::dsl::ascii::control;

if constexpr (Options.NoStringEscape) {
auto c = ovdl::detail::lexydsl::make_range<0x20, 0xFF>() / lexy::dsl::lit_b<0x07> / lexy::dsl::lit_b<0x09> / lexy::dsl::lit_b<0x0A> / lexy::dsl::lit_b<0x0D>;
return lexy::dsl::delimited(lexy::dsl::position(lexy::dsl::lit_b<'"'>))(c);
} else {
// Arbitrary code points that aren't control characters.
auto c = ovdl::detail::lexydsl::make_range<0x20, 0xFF>() - lexy::dsl::ascii::control;

// Escape sequences start with a backlash.
// They either map one of the symbols,
// or a Unicode code point of the form uXXXX.
Expand All @@ -102,7 +103,7 @@ namespace ovdl::v2script::grammar {
lexy::as_string<std::string> >>
lexy::callback<ast::NodePtr>(
[](const char* begin, auto&& str, const char* end) {
return ast::make_node_ptr<ast::StringNode>(ast::NodeLocation::make_from(begin, end), LEXY_MOV(str));
return ast::make_node_ptr<ast::StringNode>(ast::NodeLocation::make_from(begin, end), LEXY_MOV(str), Options.NoStringEscape);
});
};

Expand Down

0 comments on commit efc11f5

Please sign in to comment.