Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-12 13:51:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

My BBCode parser now also inherith from Reference.

Browse Source
This commit is contained in:
Relintai 2022-07-19 14:27:01 +02:00
parent 661ba986d7
commit f69cd86e5c
2 changed files with 90 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
modules/web/html/bbcode_parser.cpp
View File

@ -1,6 +1,7 @@
#include "bbcode_parser.h" #include "bbcode_parser.h"
#include "core/error_macros.h" #include "core/error_macros.h"
#include "core/log/logger.h"
bool BBCodeParserAttribute::match_attrib(const String &attrib) { bool BBCodeParserAttribute::match_attrib(const String &attrib) {
return attribute == attrib; return attribute == attrib;
@ -16,7 +17,7 @@ bool BBCodeParserAttribute::contains_data(const String &d) {
return data.find(d) != -1; return data.find(d) != -1;
} }
String BBCodeParserAttribute::to_string() { String BBCodeParserAttribute::convert_to_string() const {
if (single) { if (single) {
return attribute; return attribute;
} }
@ -28,8 +29,8 @@ String BBCodeParserAttribute::to_string() {
} }
} }
void BBCodeParserAttribute::print() { void BBCodeParserAttribute::print() const {
ERR_PRINT(to_string()); PLOG_MSG(convert_to_string());
} }
BBCodeParserAttribute::BBCodeParserAttribute() { BBCodeParserAttribute::BBCodeParserAttribute() {
@ -39,65 +40,65 @@ BBCodeParserAttribute::BBCodeParserAttribute() {
BBCodeParserAttribute::~BBCodeParserAttribute() { BBCodeParserAttribute::~BBCodeParserAttribute() {
} }
BBCodeParserTag *BBCodeParserTag::get_first(const String &t) { Ref<BBCodeParserTag> BBCodeParserTag::get_first(const String &t) {
if (tag == t) { if (tag == t) {
return this; return Ref<BBCodeParserTag>(this);
} }
for (int i = 0; i < tags.size(); ++i) { for (int i = 0; i < tags.size(); ++i) {
BBCodeParserTag *ht = tags[i]->get_first(t); Ref<BBCodeParserTag> ht = tags.write[i]->get_first(t);
if (ht) { if (ht.is_valid()) {
return ht; return ht;
} }
} }
return nullptr; return Ref<BBCodeParserTag>();
} }
BBCodeParserTag *BBCodeParserTag::get_first(const String &t, const String &attrib, const String &val) { Ref<BBCodeParserTag> BBCodeParserTag::get_first(const String &t, const String &attrib, const String &val) {
if (tag == t) { if (tag == t) {
if (has_attribute(attrib, val)) { if (has_attribute(attrib, val)) {
return this; return Ref<BBCodeParserTag>(this);
} }
} }
for (int i = 0; i < tags.size(); ++i) { for (int i = 0; i < tags.size(); ++i) {
BBCodeParserTag *ht = tags[i]->get_first(t, attrib, val); Ref<BBCodeParserTag> ht = tags.write[i]->get_first(t, attrib, val);
if (ht) { if (ht.is_valid()) {
return ht; return ht;
} }
} }
return nullptr; return Ref<BBCodeParserTag>();
} }
String BBCodeParserTag::get_attribute_value(const String &attrib) { String BBCodeParserTag::get_attribute_value(const String &attrib) {
BBCodeParserAttribute *a = get_attribute(attrib); Ref<BBCodeParserAttribute> a = get_attribute(attrib);
if (a) { if (a.is_valid()) {
return a->data; return a->data;
} }
return ""; return "";
} }
BBCodeParserAttribute *BBCodeParserTag::get_attribute(const String &attrib) { Ref<BBCodeParserAttribute> BBCodeParserTag::get_attribute(const String &attrib) {
for (int i = 0; i < attributes.size(); ++i) { for (int i = 0; i < attributes.size(); ++i) {
BBCodeParserAttribute *a = attributes[i]; Ref<BBCodeParserAttribute> a = attributes[i];
if (a->match_attrib(attrib)) { if (a->match_attrib(attrib)) {
return a; return a;
} }
} }
return nullptr; return Ref<BBCodeParserAttribute>();
} }
bool BBCodeParserTag::has_attribute(const String &attrib) { bool BBCodeParserTag::has_attribute(const String &attrib) {
for (int i = 0; i < attributes.size(); ++i) { for (int i = 0; i < attributes.size(); ++i) {
BBCodeParserAttribute *a = attributes[i]; Ref<BBCodeParserAttribute> a = attributes[i];
if (a->match_attrib(attrib)) { if (a->match_attrib(attrib)) {
return true; return true;
@ -107,21 +108,21 @@ bool BBCodeParserTag::has_attribute(const String &attrib) {
return false; return false;
} }
BBCodeParserAttribute *BBCodeParserTag::get_attribute(const String &attrib, const String &contains_val) { Ref<BBCodeParserAttribute> BBCodeParserTag::get_attribute(const String &attrib, const String &contains_val) {
for (int i = 0; i < attributes.size(); ++i) { for (int i = 0; i < attributes.size(); ++i) {
BBCodeParserAttribute *a = attributes[i]; Ref<BBCodeParserAttribute> a = attributes[i];
if (a->match_attrib(attrib) && a->contains_data(contains_val)) { if (a->match_attrib(attrib) && a->contains_data(contains_val)) {
return a; return a;
} }
} }
return nullptr; return Ref<BBCodeParserAttribute>();
} }
bool BBCodeParserTag::has_attribute(const String &attrib, const String &contains_val) { bool BBCodeParserTag::has_attribute(const String &attrib, const String &contains_val) {
for (int i = 0; i < attributes.size(); ++i) { for (int i = 0; i < attributes.size(); ++i) {
BBCodeParserAttribute *a = attributes[i]; Ref<BBCodeParserAttribute> a = attributes[i];
if (a->match_attrib(attrib) && a->contains_data(contains_val)) { if (a->match_attrib(attrib) && a->contains_data(contains_val)) {
return true; return true;
@ -219,7 +220,8 @@ void BBCodeParserTag::parse_args(const String &args) {
int equals_index = args.find_char('=', i); int equals_index = args.find_char('=', i);
BBCodeParserAttribute *a = memnew(BBCodeParserAttribute); Ref<BBCodeParserAttribute> a;
a.instance();
if (equals_index == -1) { if (equals_index == -1) {
a->attribute = args.substr(i, args.size() - i); a->attribute = args.substr(i, args.size() - i);
@ -279,7 +281,7 @@ void BBCodeParserTag::parse_args(const String &args) {
} }
} }
String BBCodeParserTag::to_string(const int level) { String BBCodeParserTag::convert_to_string(const int level) const {
String s; String s;
s += String(" ").repeat(level); s += String(" ").repeat(level);
@ -292,7 +294,7 @@ String BBCodeParserTag::to_string(const int level) {
s += "(!CONTENT TAG HAS TAGS!)\n"; s += "(!CONTENT TAG HAS TAGS!)\n";
for (int i = 0; i < tags.size(); ++i) { for (int i = 0; i < tags.size(); ++i) {
s += tags[i]->to_string(level + 1) + "\n"; s += tags[i]->convert_to_string(level + 1) + "\n";
} }
} }
} else if (type == BBCODE_PARSER_TAG_TYPE_OPENING_TAG) { } else if (type == BBCODE_PARSER_TAG_TYPE_OPENING_TAG) {
@ -301,13 +303,13 @@ String BBCodeParserTag::to_string(const int level) {
s += "[" + tag; s += "[" + tag;
for (int i = 0; i < attributes.size(); ++i) { for (int i = 0; i < attributes.size(); ++i) {
s += " " + attributes[i]->to_string(); s += " " + attributes[i]->convert_to_string();
} }
s += "]\n"; s += "]\n";
for (int i = 0; i < tags.size(); ++i) { for (int i = 0; i < tags.size(); ++i) {
s += tags[i]->to_string(ln); s += tags[i]->convert_to_string(ln);
} }
s += String(" ").repeat(level); s += String(" ").repeat(level);
@ -323,14 +325,14 @@ String BBCodeParserTag::to_string(const int level) {
s += "(!CLOSING TAG HAS TAGS!)\n"; s += "(!CLOSING TAG HAS TAGS!)\n";
for (int i = 0; i < tags.size(); ++i) { for (int i = 0; i < tags.size(); ++i) {
s += tags[i]->to_string(level + 1) + "\n"; s += tags[i]->convert_to_string(level + 1) + "\n";
} }
} }
} else if (type == BBCODE_PARSER_TAG_TYPE_SELF_CLOSING_TAG) { } else if (type == BBCODE_PARSER_TAG_TYPE_SELF_CLOSING_TAG) {
s += "[" + tag; s += "[" + tag;
for (int i = 0; i < attributes.size(); ++i) { for (int i = 0; i < attributes.size(); ++i) {
s += " " + attributes[i]->to_string(); s += " " + attributes[i]->convert_to_string();
} }
s += "/]\n"; s += "/]\n";
@ -339,20 +341,20 @@ String BBCodeParserTag::to_string(const int level) {
s += String(" ").repeat(level); s += String(" ").repeat(level);
for (int i = 0; i < tags.size(); ++i) { for (int i = 0; i < tags.size(); ++i) {
s += tags[i]->to_string(level + 1) + "\n"; s += tags[i]->convert_to_string(level + 1) + "\n";
} }
} }
} else if (type == BBCODE_PARSER_TAG_TYPE_NONE) { } else if (type == BBCODE_PARSER_TAG_TYPE_NONE) {
for (int i = 0; i < tags.size(); ++i) { for (int i = 0; i < tags.size(); ++i) {
s += tags[i]->to_string(level) + "\n"; s += tags[i]->convert_to_string(level) + "\n";
s += String(" ").repeat(level); s += String(" ").repeat(level);
} }
} }
return s; return s;
} }
void BBCodeParserTag::print() { void BBCodeParserTag::print() const {
ERR_PRINT(to_string()); PLOG_MSG(convert_to_string());
} }
BBCodeParserTag::BBCodeParserTag() { BBCodeParserTag::BBCodeParserTag() {
@ -360,17 +362,12 @@ BBCodeParserTag::BBCodeParserTag() {
} }
BBCodeParserTag::~BBCodeParserTag() { BBCodeParserTag::~BBCodeParserTag() {
for (int i = 0; i < tags.size(); ++i) { tags.clear();
memdelete(tags[i]); attributes.clear();
}
for (int i = 0; i < attributes.size(); ++i) {
memdelete(attributes[i]);
}
} }
void BBCodeParser::parse(const String &data) { void BBCodeParser::parse(const String &data) {
Vector<BBCodeParserTag *> tags; Vector<Ref<BBCodeParserTag>> tags;
// split into tags // split into tags
for (int i = 0; i < data.size(); ++i) { for (int i = 0; i < data.size(); ++i) {
@ -378,7 +375,7 @@ void BBCodeParser::parse(const String &data) {
// tag // tag
for (int j = i + 1; j < data.size(); ++j) { for (int j = i + 1; j < data.size(); ++j) {
if (data[j] == ']') { if (data[j] == ']') {
BBCodeParserTag *t = memnew(BBCodeParserTag); Ref<BBCodeParserTag> t = memnew(BBCodeParserTag);
t->data = data.substr(i, j - i + 1); t->data = data.substr(i, j - i + 1);
t->process(); t->process();
@ -394,7 +391,7 @@ void BBCodeParser::parse(const String &data) {
for (int j = i + 1; j < data.size(); ++j) { for (int j = i + 1; j < data.size(); ++j) {
if (data[j] == '[') { if (data[j] == '[') {
BBCodeParserTag *t = memnew(BBCodeParserTag); Ref<BBCodeParserTag> t = memnew(BBCodeParserTag);
t->data = data.substr(i, j - i); t->data = data.substr(i, j - i);
t->type = BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_CONTENT; t->type = BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_CONTENT;
@ -408,51 +405,46 @@ void BBCodeParser::parse(const String &data) {
} }
} }
if (root) { root.instance();
memdelete(root);
}
root = memnew(BBCodeParserTag);
// process tags into hierarchical order // process tags into hierarchical order
Vector<BBCodeParserTag *> tag_stack; Vector<Ref<BBCodeParserTag>> tag_stack;
for (int i = 0; i < tags.size(); ++i) { for (int i = 0; i < tags.size(); ++i) {
BBCodeParserTag *t = tags[i]; Ref<BBCodeParserTag> t = tags[i];
ERR_CONTINUE_MSG(t == nullptr, "BBCodeParser::parse: t == nullptr!"); ERR_CONTINUE(!t.is_valid());
if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_NONE) { if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_NONE) {
ERR_PRINT("BBCodeParser::parse: t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_NONE!"); ERR_PRINT("BBCodeParser::parse: t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_NONE!");
memdelete(t); //memdelete(t);
tags.write[i] = nullptr; tags.write[i].unref();
continue; continue;
} else if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_OPENING_TAG) { } else if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_OPENING_TAG) {
tag_stack.push_back(t); tag_stack.push_back(t);
tags.write[i] = nullptr; tags.write[i].unref();
continue; continue;
} else if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_SELF_CLOSING_TAG) { } else if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_SELF_CLOSING_TAG) {
if (tag_stack.size() == 0) { if (tag_stack.size() == 0) {
root->tags.push_back(t); root->tags.push_back(t);
} else { } else {
tag_stack[tag_stack.size() - 1]->tags.push_back(t); tag_stack.write[tag_stack.size() - 1]->tags.push_back(t);
} }
tags.write[i] = nullptr; tags.write[i].unref();
continue; continue;
} else if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_CONTENT) { } else if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_CONTENT) {
if (tag_stack.size() == 0) { if (tag_stack.size() == 0) {
root->tags.push_back(t); root->tags.push_back(t);
} else { } else {
tag_stack[tag_stack.size() - 1]->tags.push_back(t); tag_stack.write[tag_stack.size() - 1]->tags.push_back(t);
} }
tags.write[i] = nullptr; tags.write[i].unref();
continue; continue;
} else if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_CLOSING_TAG) { } else if (t->type == BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_CLOSING_TAG) {
if (tag_stack.size() == 0) { if (tag_stack.size() == 0) {
memdelete(t); tags.write[i].unref();
tags.write[i] = nullptr;
// ill-formed html // ill-formed html
continue; continue;
@ -461,7 +453,7 @@ void BBCodeParser::parse(const String &data) {
// find it's pair // find it's pair
int tag_index = 0; int tag_index = 0;
for (int j = tag_stack.size() - 1; j > 0; --j) { for (int j = tag_stack.size() - 1; j > 0; --j) {
BBCodeParserTag *ts = tag_stack[j]; Ref<BBCodeParserTag> ts = tag_stack[j];
// we sould only have opening tags on the stack // we sould only have opening tags on the stack
if (ts->tag == t->tag) { if (ts->tag == t->tag) {
@ -471,12 +463,12 @@ void BBCodeParser::parse(const String &data) {
} }
} }
BBCodeParserTag *opening_tag = tag_stack[tag_index]; Ref<BBCodeParserTag> opening_tag = tag_stack[tag_index];
// mark everything else that we found before finding the opening tag as self closing, and add them to out opening tag // mark everything else that we found before finding the opening tag as self closing, and add them to out opening tag
// If the html is ill formed, it just grabs everything from the tag stack // If the html is ill formed, it just grabs everything from the tag stack
for (int j = tag_index + 1; j < tag_stack.size(); ++j) { for (int j = tag_index + 1; j < tag_stack.size(); ++j) {
BBCodeParserTag *ts = tag_stack[j]; Ref<BBCodeParserTag> ts = tag_stack[j];
ts->type = BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_SELF_CLOSING_TAG; ts->type = BBCodeParserTag::BBCODE_PARSER_TAG_TYPE_SELF_CLOSING_TAG;
opening_tag->tags.push_back(ts); opening_tag->tags.push_back(ts);
@ -487,11 +479,10 @@ void BBCodeParser::parse(const String &data) {
if (tag_stack.size() == 0) { if (tag_stack.size() == 0) {
root->tags.push_back(opening_tag); root->tags.push_back(opening_tag);
} else { } else {
tag_stack[tag_stack.size() - 1]->tags.push_back(opening_tag); tag_stack.write[tag_stack.size() - 1]->tags.push_back(opening_tag);
} }
memdelete(t); tags.write[i].unref();
tags.write[i] = nullptr;
continue; continue;
} }
@ -503,36 +494,31 @@ void BBCodeParser::parse(const String &data) {
} }
for (int i = 0; i < tags.size(); ++i) { for (int i = 0; i < tags.size(); ++i) {
BBCodeParserTag *t = tags[i]; Ref<BBCodeParserTag> t = tags[i];
if (t != nullptr) { if (t.is_valid()) {
ERR_PRINT("BBCodeParser::parse(const String &data): tag was not processed!\n"); ERR_PRINT("BBCodeParser::parse(const String &data): tag was not processed!\n");
t->print(); t->print();
memdelete(t);
} }
} }
} }
String BBCodeParser::to_string() { String BBCodeParser::convert_to_string() const {
if (!root) { if (!root.is_valid()) {
return ""; return "";
} }
return root->to_string(); return root->convert_to_string();
} }
void BBCodeParser::print() { void BBCodeParser::print() const {
if (root) { if (root.is_valid()) {
root->print(); root->print();
} }
} }
BBCodeParser::BBCodeParser() { BBCodeParser::BBCodeParser() {
root = nullptr;
} }
BBCodeParser::~BBCodeParser() { BBCodeParser::~BBCodeParser() {
if (root) { root.unref();
memdelete(root);
}
} }

40
modules/web/html/bbcode_parser.h
View File

@ -4,7 +4,11 @@
#include "core/ustring.h" #include "core/ustring.h"
#include "core/vector.h" #include "core/vector.h"
class BBCodeParserAttribute { #include "core/reference.h"
class BBCodeParserAttribute : public Reference {
GDCLASS(BBCodeParserAttribute, Reference);
public: public:
String attribute; String attribute;
String data; String data;
@ -15,14 +19,16 @@ public:
bool match_data(const Vector<String> &d); bool match_data(const Vector<String> &d);
bool contains_data(const String &d); bool contains_data(const String &d);
String to_string(); String convert_to_string() const;
void print(); void print() const;
BBCodeParserAttribute(); BBCodeParserAttribute();
virtual ~BBCodeParserAttribute(); virtual ~BBCodeParserAttribute();
}; };
class BBCodeParserTag { class BBCodeParserTag : public Reference {
GDCLASS(BBCodeParserTag, Reference);
public: public:
enum BBCodeParserTagType { enum BBCodeParserTagType {
BBCODE_PARSER_TAG_TYPE_NONE = 0, BBCODE_PARSER_TAG_TYPE_NONE = 0,
@ -37,39 +43,41 @@ public:
String tag; String tag;
String data; String data;
Vector<BBCodeParserTag *> tags; Vector<Ref<BBCodeParserTag>> tags;
Vector<BBCodeParserAttribute *> attributes; Vector<Ref<BBCodeParserAttribute>> attributes;
BBCodeParserTag *get_first(const String &t); Ref<BBCodeParserTag> get_first(const String &t);
BBCodeParserTag *get_first(const String &t, const String &attrib, const String &val); Ref<BBCodeParserTag> get_first(const String &t, const String &attrib, const String &val);
String get_attribute_value(const String &attrib); String get_attribute_value(const String &attrib);
BBCodeParserAttribute *get_attribute(const String &attrib); Ref<BBCodeParserAttribute> get_attribute(const String &attrib);
bool has_attribute(const String &attrib); bool has_attribute(const String &attrib);
BBCodeParserAttribute *get_attribute(const String &attrib, const String &contains_val); Ref<BBCodeParserAttribute> get_attribute(const String &attrib, const String &contains_val);
bool has_attribute(const String &attrib, const String &contains_val); bool has_attribute(const String &attrib, const String &contains_val);
void process(); void process();
void parse_args(const String &args); void parse_args(const String &args);
String to_string(const int level = 0); String convert_to_string(const int level = 0) const;
void print(); void print() const;
BBCodeParserTag(); BBCodeParserTag();
virtual ~BBCodeParserTag(); virtual ~BBCodeParserTag();
}; };
class BBCodeParser { class BBCodeParser : public Reference {
GDCLASS(BBCodeParser, Reference);
public: public:
BBCodeParserTag *root; Ref<BBCodeParserTag> root;
void parse(const String &data); void parse(const String &data);
//void parse_tag(const String &data, const int index); //void parse_tag(const String &data, const int index);
String to_string(); String convert_to_string() const;
void print(); void print() const;
BBCodeParser(); BBCodeParser();
virtual ~BBCodeParser(); virtual ~BBCodeParser();