JSON --by-file, filename can have ', YAML can have " #897, #898

Author: AlDanial

Unix/cloc

@@ -4805,9 +4805,11 @@ sub generate_report {                        # {{{1
         if ($BY_FILE) {
             $clean_lang_or_file = rm_leading_tempdir($lang_or_file, \%TEMP_DIR);
             $clean_lang_or_file = xml_metachars($clean_lang_or_file) if $out_style eq "xml";
-            if ($out_style eq "json" or $out_style eq "yaml")  {
-                # YAML, JSON do not allow protected characters in keys
+            if ($out_style eq "yaml")  {
+                # YAML does not allow protected single quotes in keys
                 $clean_lang_or_file =~ s/'/0x27/g;
+            } elsif ($out_style eq "json")  {
+                # JSON does not allow protected double quotes in keys
                 $clean_lang_or_file =~ s/"/0x2b/g;
             } elsif ($out_style ne "txt")  {
                 # text output is allowed to keep its quotes as they are

cloc

@@ -4797,9 +4797,11 @@ sub generate_report {                        # {{{1
         if ($BY_FILE) {
             $clean_lang_or_file = rm_leading_tempdir($lang_or_file, \%TEMP_DIR);
             $clean_lang_or_file = xml_metachars($clean_lang_or_file) if $out_style eq "xml";
-            if ($out_style eq "json" or $out_style eq "yaml")  {
-                # YAML, JSON do not allow protected characters in keys
+            if ($out_style eq "yaml")  {
+                # YAML does not allow protected single quotes in keys
                 $clean_lang_or_file =~ s/'/0x27/g;
+            } elsif ($out_style eq "json")  {
+                # JSON does not allow protected double quotes in keys
                 $clean_lang_or_file =~ s/"/0x2b/g;
             } elsif ($out_style ne "txt")  {
                 # text output is allowed to keep its quotes as they are

tests/inputs/issues/898/irregular"file2.md

@@ -0,0 +1,12 @@
+---
+id: 5dc174fcf86c76b9248c6eb3
+title: Step 3
+challengeType: 0
+dashedName: step-2
+demoType: onLoad                                                                                                                 ---
+
+# --description--
+
+In this workshop, you will learn how to work with basic HTML elements like
+headings.
+

tests/outputs/issues/898/results.yaml

@@ -3,12 +3,17 @@
 header : 
   cloc_url           : github.com/AlDanial/cloc
   cloc_version       : 2.05
-  elapsed_seconds    : 0.00426006317138672
-  n_files            : 2
-  n_lines            : 24
-  files_per_second   : 469.476606223416
-  lines_per_second   : 5633.71927468099
+  elapsed_seconds    : 0.00424814224243164
+  n_files            : 3
+  n_lines            : 36
+  files_per_second   : 706.191042765743
+  lines_per_second   : 8474.29251318891
   report_file        : ../../../outputs/issues/898/results.yaml
+'./irregular"file2.md' :
+  blank: 3
+  comment: 0
+  code: 9
+  language: Markdown
 './irregular0x27file.md' :
   blank: 3
   comment: 0
@@ -20,7 +25,7 @@ header :
   code: 9
   language: Markdown
 SUM: 
-  blank: 6
+  blank: 9
   comment: 0
-  code: 18
-  nFiles: 2
+  code: 27
+  nFiles: 3