Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

S-Expression: Minimize lag when parsing level names #3103

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

S-Expression: Minimize lag when parsing level names #3103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/sexp-cpp
Open in desktop
Submodule sexp-cpp updated 31 files
+0 −35 .appveyor.yml
+2 −1 .clang-tidy
+1 −0 .gitattributes
+2 −0 .gitignore
+0 −68 .gitlab-ci.yml
+3 −6 .gitmodules
+0 −76 .travis.yml
+43 −91 CMakeLists.txt
+1 −0 VERSION
+0 −1 external/benchmark
+0 −1 external/googletest
+1 −0 external/tinycmmc
+84 −0 flake.lock
+24 −0 flake.nix
+35 −0 include/sexp/fwd.hpp
+8 −5 include/sexp/parser.hpp
+14 −0 include/sexp/value.hpp
+40 −0 mk/cmake/TinyCMMC.cmake
+8 −0 pkgconfig/sexp.pc.in
+6 −0 sexp-config.cmake.in
+29 −0 sexpcpp.nix
+10 −2 src/float.cpp
+1 −1 src/lexer.cpp
+86 −19 src/parser.cpp
+2 −2 src/util.cpp
+0 −3 src/value.cpp
+23 −12 tests/float_test.cpp
+9 −5 tests/io_test.cpp
+42 −15 tests/parser_test.cpp
+3 −2 tests/util_test.cpp
+4 −4 tests/value_test.cpp
2 changes: 1 addition & 1 deletion src/supertux/level_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ LevelParser::get_level_name(const std::string& filename)
try
{
register_translation_directory(filename);
auto doc = ReaderDocument::from_file(filename);
auto doc = ReaderDocument::from_file(filename, 1);
auto root = doc.get_root();

if (root.get_name() != "supertux-level") {
Expand Down
15 changes: 11 additions & 4 deletions src/util/reader_document.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,21 @@
#include "util/log.hpp"

ReaderDocument
ReaderDocument::from_stream(std::istream& stream, const std::string& filename)
ReaderDocument::from_string(const std::string& string, const std::string& filename, int depth)
{
sexp::Value sx = sexp::Parser::from_stream(stream, sexp::Parser::USE_ARRAYS);
std::istringstream stream(string);
return from_stream(stream, filename, depth);
}

ReaderDocument
ReaderDocument::from_stream(std::istream& stream, const std::string& filename, int depth)
{
sexp::Value sx = sexp::Parser::from_stream(stream, sexp::Parser::USE_ARRAYS, depth);
return ReaderDocument(filename, std::move(sx));
}

ReaderDocument
ReaderDocument::from_file(const std::string& filename)
ReaderDocument::from_file(const std::string& filename, int depth)
{
log_debug << "ReaderDocument::parse: " << filename << std::endl;

Expand All @@ -41,7 +48,7 @@ ReaderDocument::from_file(const std::string& filename)
msg << "Parser problem: Couldn't open file '" << filename << "'.";
throw std::runtime_error(msg.str());
} else {
return from_stream(in, filename);
return from_stream(in, filename, depth);
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/util/reader_document.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
class ReaderDocument final
{
public:
static ReaderDocument from_stream(std::istream& stream, const std::string& filename = "<stream>");
static ReaderDocument from_file(const std::string& filename);
static ReaderDocument from_string(const std::string& string, const std::string& filename = "<string>", int depth = -1);
static ReaderDocument from_stream(std::istream& stream, const std::string& filename = "<stream>", int depth = -1);
static ReaderDocument from_file(const std::string& filename, int depth = -1);

public:
ReaderDocument(const std::string& filename, sexp::Value sx);
Expand Down
6 changes: 1 addition & 5 deletions src/util/reader_mapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,7 @@ ReaderMapping::get(const char* key, std::string& value, const std::optional<cons
if (item[1].is_string()) {
value = item[1].as_string();
return true;
} else if (item[1].is_array() &&
item[1].as_array().size() == 2 &&
item[1].as_array()[0].is_symbol() &&
item[1].as_array()[0].as_string() == "_" &&
item[1].as_array()[1].is_string()) {
} else if (item[1].is_translatable_string()) {
if (s_translations_enabled) {
value = _(item[1].as_array()[1].as_string());
} else {
Expand Down
Loading