Merge branch 'master' of https://github.com/danielaparker/jsoncons

danielaparker · Sep 22, 2023 · 8e77f7c · 8e77f7c
2 parents 03f9bc2 + c45caa5
commit 8e77f7c
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 19 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: cmake
       run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON
     - name: build

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install_gcc
       run: |
            sudo apt update
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install_gcc
       run: |
            sudo apt update
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install_gcc
       run: |
            sudo apt update
@@ -76,7 +76,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install_gcc
       run: |
            sudo apt update
@@ -98,7 +98,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install_gcc
       run: |
            sudo apt update
@@ -121,7 +121,7 @@ jobs:
 #    runs-on: ubuntu-18.04
 #
 #    steps:
-#    - uses: actions/checkout@v3
+#    - uses: actions/checkout@v4
 #      with:
 #        fetch-depth: 0
 #    - name: Install

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -45,7 +45,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -70,7 +70,7 @@ jobs:
     runs-on: windows-2019
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -95,7 +95,7 @@ jobs:
     runs-on: windows-2019
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 

diff --git a/include/jsoncons/json_encoder.hpp b/include/jsoncons/json_encoder.hpp
@@ -673,6 +673,16 @@ namespace detail {
                 case semantic_tag::bigint:
                     write_bigint_value(sv);
                     break;
+                case semantic_tag::bigdec:
+                {
+                	// output lossless number
+                	if (options_.bigint_format() == bigint_chars_format::number)
+                	{
+	                	write_bigint_value(sv);
+				break;
+			}
+			JSONCONS_FALLTHROUGH;
+		}
                 default:
                 {
                     sink_.push_back('\"');
@@ -1324,6 +1334,16 @@ namespace detail {
                 case semantic_tag::bigint:
                     write_bigint_value(sv);
                     break;
+                case semantic_tag::bigdec:
+                {
+                	// output lossless number
+                	if (options_.bigint_format() == bigint_chars_format::number)
+                	{
+	                	write_bigint_value(sv);
+                		break;
+			}
+			JSONCONS_FALLTHROUGH;
+		}
                 default:
                 {
                     sink_.push_back('\"');

diff --git a/include/jsoncons_ext/jsonpath/expression.hpp b/include/jsoncons_ext/jsonpath/expression.hpp
@@ -3077,9 +3077,9 @@ namespace detail {
 
             if ((options & result_options::path) == result_options::path)
             {
-                auto callback = [&result](const json_location_type& path, reference)
+                auto callback = [&result](const json_location_type& pathp, reference)
                 {
-                    result.emplace_back(path.to_string()); 
+                    result.emplace_back(pathp.to_string()); 
                 };
                 evaluate(resources, root, path, instance, callback, options);
             }

diff --git a/include/jsoncons_ext/jsonpath/json_query.hpp b/include/jsoncons_ext/jsonpath/json_query.hpp
@@ -127,9 +127,9 @@ namespace jsonpath {
 
         jsoncons::jsonpath::detail::dynamic_resources<Json,reference> resources;
 
-        auto f = [&callback](const json_location_type& path, reference val)
+        auto f = [&callback](const json_location_type& pathp, reference val)
         {
-            callback(path.to_string(), val);
+            callback(pathp.to_string(), val);
         };
         expr.evaluate_with_replacement(resources, instance, resources.root_path_node(), instance, f);
     }
@@ -154,9 +154,9 @@ namespace jsonpath {
 
         jsoncons::jsonpath::detail::dynamic_resources<Json,reference> resources{alloc_set.get_allocator()};
 
-        auto f = [&callback](const json_location_type& path, reference val)
+        auto f = [&callback](const json_location_type& pathp, reference val)
         {
-            callback(path.to_string(), val);
+            callback(pathp.to_string(), val);
         };
         expr.evaluate_with_replacement(resources, instance, resources.root_path_node(), instance, f);
     }