Skip to content

[CURA-13248] Fix quoted extruder capture in template regex #2342

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

Open
HellAholic wants to merge 3 commits into
base: main
Choose a base branch
from
+2 −2
Open

[CURA-13248] Fix quoted extruder capture in template regex #2342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a278e3
Fix quoted extruder capture in template regex
HellAholic Jun 29, 2026
fbd7498
Merge branch 'main' into CURA-13248
HellAholic Jul 3, 2026
d45dcfc
bump dependency version
HellAholic Jul 3, 2026
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 conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "5.14.0-alpha.0"
commit: "unknown"
requirements:
- "cura-formulae-engine/1.2.0@ultimaker/testing"
- "cura-formulae-engine/1.2.1@ultimaker/testing"
- "scripta/[>=1.1.0]@ultimaker/testing"
- "libpng/1.6.48"
- "onetbb/2022.3.0"
Expand Down
2 changes: 1 addition & 1 deletion src/gcode_export/GcodeTemplateResolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ std::string GcodeTemplateResolver::resolveGCodeTemplate(
std::string output;
GcodeConditionState condition_state = GcodeConditionState::OutsideCondition;

static const boost::regex expression_regex(R"({\s*(?<condition>if|else|elif|endif)?\s*(?<expression>[^{}]*?)\s*(?:,\s*(?<extruder_nr>[^{},]*))?\s*}(?<end_of_line>\n?))");
static const boost::regex expression_regex(R"({\s*(?<condition>if|else|elif|endif)?\s*(?<expression>[^{}]*?)\s*(?:,\s*(?<extruder_nr>[^{},'"]+))?\s*}(?<end_of_line>\n?))");

// Create local environment containing the context-specific extra settings, and are chained to the extruder and global environment
std::map<std::optional<size_t>, std::shared_ptr<cfe::env::LocalEnvironment>> local_environments;
Expand Down
Loading