diff --git a/include/quickjspp.hpp b/include/quickjspp.hpp index b1a2e3f25c..01411a2120 100644 --- a/include/quickjspp.hpp +++ b/include/quickjspp.hpp @@ -406,10 +406,6 @@ struct js_traits> case JS_TAG_BOOL: return is_boolean::value || std::is_integral_v || std::is_floating_point_v; - case JS_TAG_BIG_DECIMAL: - [[fallthrough]]; - case JS_TAG_BIG_FLOAT: - [[fallthrough]]; case JS_TAG_FLOAT64: default: // >JS_TAG_FLOAT64 (JS_NAN_BOXING) return is_double::value || std::is_floating_point_v; diff --git a/src/generator/config/ruleconvert.cpp b/src/generator/config/ruleconvert.cpp index 550b2b9359..4e77ce317d 100644 --- a/src/generator/config/ruleconvert.cpp +++ b/src/generator/config/ruleconvert.cpp @@ -10,7 +10,7 @@ /// rule type lists #define basic_types "DOMAIN", "DOMAIN-SUFFIX", "DOMAIN-KEYWORD", "IP-CIDR", "SRC-IP-CIDR", "GEOIP", "MATCH", "FINAL" -string_array ClashRuleTypes = {basic_types, "IP-CIDR6", "SRC-PORT", "DST-PORT", "PROCESS-NAME"}; +string_array ClashRuleTypes = {basic_types, "IP-CIDR6", "SRC-PORT", "DST-PORT", "PROCESS-NAME", "AND", "OR", "NOT"}; string_array Surge2RuleTypes = {basic_types, "IP-CIDR6", "USER-AGENT", "URL-REGEX", "PROCESS-NAME", "IN-PORT", "DEST-PORT", "SRC-IP"}; string_array SurgeRuleTypes = {basic_types, "IP-CIDR6", "USER-AGENT", "URL-REGEX", "AND", "OR", "NOT", "PROCESS-NAME", "IN-PORT", "DEST-PORT", "SRC-IP"}; string_array QuanXRuleTypes = {basic_types, "USER-AGENT", "HOST", "HOST-SUFFIX", "HOST-KEYWORD"}; @@ -106,7 +106,7 @@ static std::string transformRuleToCommon(string_view_array &temp, const std::str strLine += ","; strLine += group; } - else + else if (temp.size() < 4) { strLine = temp[0]; strLine += ","; @@ -118,7 +118,7 @@ static std::string transformRuleToCommon(string_view_array &temp, const std::str strLine += ","; strLine += temp[2]; } - } + } else strLine = input + "," + group; return strLine; }