Merge branch 'main' into 1.5.0

Author: tobozo

examples/deserializeYml/deserializeYml.ino

@@ -3,6 +3,10 @@
 #include <ArduinoJson.h>
 #include <YAMLDuino.h>
 
+#if ARDUINOJSON_VERSION_MAJOR<7
+  #error "ArduinoJSON version is deprecated, please upgrade to 7.x"
+#endif
+
 const char* yaml_sample_str = R"_YAML_STRING_(
 first: true
 blah:

examples/test/platformio.ini

@@ -6,9 +6,10 @@ src_dir        = src
 
 [env]
 framework = arduino
+platform  = espressif32
 lib_deps =
   bblanchon/ArduinoJson @ ^7
-;  tobozo/YAMLDuino @ ^1.5
+  ;  tobozo/YAMLDuino @ ^1.5
   YAMLDuino
 lib_ldf_mode = deep
 

examples/test/src/test.cpp

@@ -1,6 +1,14 @@
 
 #include <ArduinoJson.h>
 
+// very dirty but necessary for the CI test
+// don't do that in your project!!
+#if ARDUINOJSON_VERSION_MAJOR<7
+  #define ARDUINOJSONDOC DynamicJsonDocument json_doc(2048)
+#else
+  #define ARDUINOJSONDOC JsonDocument json_doc
+#endif
+
 //#define YAML_DISABLE_CJSON // not needed here
 //#define YAML_DISABLE_ARDUINOJSON // not needed here
 
@@ -55,6 +63,7 @@ fourth: false
   unquoted_hex: 0x1234
   double_quoted_hex: "0x1234"
   single_quoted_hex: '0x1234'
+
   inline_json_for_the_haters: { "hello":"json", "nested":[3,2,"1","moon"] }
 whatever:
   nope: ["n","o","p","e"]

src/ArduinoYaml.cpp

@@ -1064,25 +1064,34 @@ namespace YAML
             char* end;
             scalar = SCALAR_s(yamlNode);
             number = strtod(scalar, &end);
+            bool is_double = false;
             bool is_bool = false;
             bool bool_value = false;
             bool is_string = quoted_implicit || (end == scalar || *end);
             if( is_string && yaml_node_is_bool( yamlNode, &bool_value ) ) {
               is_bool = true;
             }
+            if( SCALAR_Quoted(yamlNode) ) {
+              is_string = true;
+            }
+            if( !is_bool && !is_string ) {
+              is_double = String(scalar).indexOf(".") > 0;
+            }
             switch( nt ) {
               case YAMLNode::Type::Sequence:
               {
                 JsonArray array = jsonNode[nodename];
                 if(is_bool)        array.add( bool_value );
                 else if(is_string) array.add( scalar );
-                else               array.add( number );
+                else if(is_double) array.add( number );
+                else               array.add( (int64_t)number );
               }
               break;
               case YAMLNode::Type::Map:
                 if(is_bool)        jsonNode[nodename] = bool_value;
                 else if(is_string) jsonNode[nodename] = scalar;
-                else               jsonNode[nodename] = number;
+                else if(is_double) jsonNode[nodename] = number;
+                else               jsonNode[nodename] = (int64_t)number;
               break;
               default: YAML_LOG_e("Error invalid nesting type"); break;
             }
@@ -1110,8 +1119,6 @@ namespace YAML
                 deserializeYml_JsonObject( document, itemNode, jsonNode, YAMLNode::Type::Sequence, _nodeItemName.c_str(), depth+1 );
               }
             }
-
-
           }
           break;
           case YAML_MAPPING_NODE:

src/ArduinoYaml.hpp

@@ -128,6 +128,7 @@ namespace YAML
   // shorthand to libyaml scalar values
   #define SCALAR_c(x) (const char*)x->data.scalar.value
   #define SCALAR_s(x)       (char*)x->data.scalar.value
+  #define SCALAR_Quoted(n) n->data.scalar.style == YAML_SINGLE_QUOTED_SCALAR_STYLE || n->data.scalar.style == YAML_DOUBLE_QUOTED_SCALAR_STYLE
 
   void setYAMLIndent( int spaces_per_indent=2 ); // min=2, max=16
   void setJSONIndent( const char* spaces_or_tabs=JSON_SCALAR_TAB, int folding_depth=JSON_FOLDING_DEPTH );