diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 16:35:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make the string_value of mvt_value std::optional

Browse Source
This commit is contained in:
Erica Fischer
2024-01-25 11:12:23 -08:00
parent 09f271646d
commit a5eabab8bf
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
evaluator.cpp
+7 -7
View File
@@ -8,10 +8,10 @@
#include "errors.hpp"
#include "milo/dtoa_milo.h"
static std::string mvt_value_to_string(mvt_value one, bool &fail) {
static std::string mvt_value_to_string(mvt_value const &one, bool &fail) {
switch (one.type) {
case mvt_string:
return one.string_value;
return *(one.string_value);
case mvt_float:
return milo::dtoa_milo(one.numeric_value.float_value);
case mvt_double:
@@ -34,7 +34,7 @@ static std::string mvt_value_to_string(mvt_value one, bool &fail) {
}
}
int compare_fsl(mvt_value one, json_object *two, bool &fail) {
int compare_fsl(mvt_value const &one, json_object *two, bool &fail) {
// In FSL expressions, the attribute value is coerced to the type
// of the JSON literal value it is being compared to.
//
@@ -53,7 +53,7 @@ int compare_fsl(mvt_value one, json_object *two, bool &fail) {
switch (one.type) {
case mvt_string: {
char *endptr = NULL;
const char *s = one.string_value.c_str();
const char *s = one.string_value->c_str();
lhs = strtod(s, &endptr);
if (endptr == s) {
fail = true; // non-numeric-string op number => null
@@ -106,7 +106,7 @@ int compare_fsl(mvt_value one, json_object *two, bool &fail) {
switch (one.type) {
case mvt_string:
lhs = one.string_value.size() > 0;
lhs = one.string_value->size() > 0;
break;
case mvt_float:
lhs = one.numeric_value.float_value != 0;
@@ -144,7 +144,7 @@ int compare_fsl(mvt_value one, json_object *two, bool &fail) {
exit(EXIT_IMPOSSIBLE);
}
int compare(mvt_value one, json_object *two, bool &fail) {
int compare(mvt_value const &one, json_object *two, bool &fail) {
switch (one.type) {
case mvt_string:
if (two->type != JSON_STRING) {
@@ -152,7 +152,7 @@ int compare(mvt_value one, json_object *two, bool &fail) {
return false; // string vs non-string
}
return strcmp(one.string_value.c_str(), two->value.string.string);
return strcmp(one.string_value->c_str(), two->value.string.string);
case mvt_double:
case mvt_float: