Fix cpp string literal when next character is between [0-F] (#16245)

* Allow all characters with excape hex to be listeral string in C++ * Generated Code.
project-chip · Oct 30, 2023 · 1434422 · 1434422
1 parent 9c4d81f
commit 1434422
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 45 deletions.
diff --git a/src/app/zap-templates/common/ClusterTestGeneration.js b/src/app/zap-templates/common/ClusterTestGeneration.js
@@ -734,12 +734,9 @@ function octetStringEscapedForCLiteral(value)
   // Escape control characters, things outside the ASCII range, and single
   // quotes (because that's our string terminator).
   return value.replace(/\p{Control}|\P{ASCII}|"/gu, ch => {
-    let code = ch.charCodeAt(0);
-    code     = code.toString(16);
-    if (code.length == 1) {
-      code = "0" + code;
-    }
-    return "\\x" + code;
+    var code = ch.charCodeAt(0).toString(8)
+    return "\\" +
+        "0".repeat(3 - code.length) + code;
   });
 }
 

diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
diff --git a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h