GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-16 04:45:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Emit original string on failure to parse.

Browse Source
This commit is contained in:
Joseph Lenox 2017-11-06 21:11:17 -06:00
parent add2895f38
commit f366700b44
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xs/src/libslic3r/ConditionalGcode.cpp
View File

@ -44,6 +44,7 @@ std::string evaluate(const std::string& expression_string) {
#if SLIC3R_DEBUG #if SLIC3R_DEBUG
std::cerr << __FILE__ << ":" << __LINE__ << " "<< "Failed to parse: " << expression_string.c_str() << std::endl; std::cerr << __FILE__ << ":" << __LINE__ << " "<< "Failed to parse: " << expression_string.c_str() << std::endl;
#endif #endif
result << "{" << expression_string << "}";
} }
std::string output = result.str(); std::string output = result.str();
trim(output); trim(output);

2
xs/t/24_gcodemath.t
View File

@ -41,6 +41,6 @@ use Test::More tests => 6;
my $test_string = "M104 S{a}; Sets temp to {4*5}"; my $test_string = "M104 S{a}; Sets temp to {4*5}";
my $result = Slic3r::ConditionalGCode::apply_math($test_string); my $result = Slic3r::ConditionalGCode::apply_math($test_string);
is $result, "M104 S; Sets temp to 20", 'Blank string emittal on failure to parse'; is $result, "M104 S{a}; Sets temp to 20", 'Original string emittal on failure to parse';
} }
} }