3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PlaceholderParser: simplistic extension to parse UTF8 characters

Browse Source 
in the G-code and string constants.
Solves https://github.com/prusa3d/Slic3r/issues/600
This commit is contained in:
bubnikv 2017-12-04 17:42:35 +01:00
parent 2b0b8e6e68
commit fb1bebd982
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
xs/src/libslic3r/PlaceholderParser.cpp
View File

@ -22,6 +22,8 @@
#endif #endif
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
// Unicode iterator to iterate over utf8.
#include <boost/regex/pending/unicode_iterator.hpp>
// Spirit v2.5 allows you to suppress automatic generation // Spirit v2.5 allows you to suppress automatic generation
// of predefined terminals to speed up complation. With // of predefined terminals to speed up complation. With
@ -598,6 +600,39 @@ namespace client
template <typename It, typename Attr> static bool parse_inf(It&, It const&, Attr&) { return false; } template <typename It, typename Attr> static bool parse_inf(It&, It const&, Attr&) { return false; }
}; };
struct unicode_char_parser : qi::primitive_parser<unicode_char_parser>
{
// Define the attribute type exposed by this parser component
template <typename Context, typename Iterator>
struct attribute
{
typedef wchar_t type;
};
// This function is called during the actual parsing process
template <typename Iterator, typename Context , typename Skipper, typename Attribute>
bool parse(Iterator& first, Iterator const& last, Context& context, Skipper const& skipper, Attribute& attr) const
{
skip_over(first, last, skipper);
if (first == last) return false;
boost::u8_to_u32_iterator<Iterator> f(first);
boost::u8_to_u32_iterator<Iterator> l(last);
if (f == l) return false;
attr = *f++;
first = f.base();
return true;
}
// This function is called during error handling to create a human readable string for the error context.
template <typename Context>
spirit::info what(Context&) const
{
return spirit::info("unicode_char");
}
};
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// Our calculator grammar // Our calculator grammar
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -617,6 +652,7 @@ namespace client
qi::no_skip_type no_skip; qi::no_skip_type no_skip;
qi::real_parser<double, strict_real_policies_without_nan_inf> strict_double; qi::real_parser<double, strict_real_policies_without_nan_inf> strict_double;
spirit::ascii::char_type char_; spirit::ascii::char_type char_;
unicode_char_parser utf8char;
spirit::bool_type bool_; spirit::bool_type bool_;
spirit::int_type int_; spirit::int_type int_;
spirit::double_type double_; spirit::double_type double_;
@ -649,7 +685,7 @@ namespace client
// Free-form text up to a first brace, including spaces and newlines. // Free-form text up to a first brace, including spaces and newlines.
// The free-form text will be inserted into the processed text without a modification. // The free-form text will be inserted into the processed text without a modification.
text = no_skip[raw[+(char_ - '[' - '{')]]; text = no_skip[raw[+(utf8char - char_('[') - char_('{'))]];
text.name("text"); text.name("text");
// New style of macro expansion. // New style of macro expansion.
@ -749,7 +785,7 @@ namespace client
| (strict_double > iter_pos) [ px::bind(&FactorActions::double_, _1, _2, _val) ] | (strict_double > iter_pos) [ px::bind(&FactorActions::double_, _1, _2, _val) ]
| (int_ > iter_pos) [ px::bind(&FactorActions::int_, _1, _2, _val) ] | (int_ > iter_pos) [ px::bind(&FactorActions::int_, _1, _2, _val) ]
| (kw[bool_] > iter_pos) [ px::bind(&FactorActions::bool_, _1, _2, _val) ] | (kw[bool_] > iter_pos) [ px::bind(&FactorActions::bool_, _1, _2, _val) ]
| raw[lexeme['"' > *((char_ - char_('\\') - char_('"')) | ('\\' > char_)) > '"']] | raw[lexeme['"' > *((utf8char - char_('\\') - char_('"')) | ('\\' > char_)) > '"']]
[ px::bind(&FactorActions::string_, _1, _val) ] [ px::bind(&FactorActions::string_, _1, _val) ]
); );
factor.name("factor"); factor.name("factor");