[translation] Switch to pyj8::WriteString()

More spec-cpp tests now pass, e.g. in spec/ysh-json.
oilshell · Jan 12, 2024 · 4cb78d6 · 4cb78d6
1 parent 4791caa
commit 4cb78d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/cpp/data_lang.cc b/cpp/data_lang.cc
@@ -36,7 +36,6 @@ void WriteBString(BigStr* s, mylib::BufWriter* buf, int capacity) {
   // Set up pointers after writing opening quote
   uint8_t* out = buf->LengthPointer();  // mutated
   uint8_t* out_end = buf->CapacityPointer();
-  uint8_t** p_out = &out;
 
   while (true) {
     J8EncodeChunk(&in, in_end, &out, out_end, true);  // Fill as much as we can
@@ -54,7 +53,6 @@ void WriteBString(BigStr* s, mylib::BufWriter* buf, int capacity) {
     // Recompute pointers
     out = buf->LengthPointer();
     out_end = buf->CapacityPointer();
-    p_out = &out;
   }
 
   buf->WriteConst("'");
@@ -81,7 +79,6 @@ void WriteString(BigStr* s, int options, mylib::BufWriter* buf) {
   // Set up pointers after writing opening quote
   uint8_t* out = buf->LengthPointer();  // mutated
   uint8_t* out_end = buf->CapacityPointer();
-  uint8_t** p_out = &out;
 
   while (true) {
     // Fill in as much as we can
@@ -111,7 +108,6 @@ void WriteString(BigStr* s, int options, mylib::BufWriter* buf) {
     // Recompute pointers
     out = buf->LengthPointer();  // mutated
     out_end = buf->CapacityPointer();
-    p_out = &out;
     // printf("[1] out %p out_end %p\n", out, out_end);
   }
 

diff --git a/data_lang/j8.py b/data_lang/j8.py
@@ -223,17 +223,6 @@ def _GetIndent(self, num_spaces):
             self.spaces[num_spaces] = ' ' * num_spaces
         return self.spaces[num_spaces]
 
-    def _StringToBuf(self, s):
-        # type: (str) -> None
-
-        if mylib.PYTHON:
-            # TODO: port this to C++
-            pyj8.WriteString(s, self.options, self.buf)
-        else:
-            self.buf.write('"')
-            qsn.EncodeRunes(s, qsn.BIT8_UTF8, self.buf)
-            self.buf.write('"')
-
     def Print(self, val, level=0):
         # type: (value_t, int) -> None
 
@@ -278,8 +267,7 @@ def Print(self, val, level=0):
             elif case(value_e.Str):
                 val = cast(value.Str, UP_val)
 
-                # TODO: pyj8.WriteString(val.s, self.buf)
-                self._StringToBuf(val.s)
+                pyj8.WriteString(val.s, self.options, self.buf)
 
             elif case(value_e.List):
                 val = cast(value.List, UP_val)
@@ -339,7 +327,7 @@ def Print(self, val, level=0):
 
                     self.buf.write(item_indent)
 
-                    self._StringToBuf(k)
+                    pyj8.WriteString(k, self.options, self.buf)
 
                     self.buf.write(':')
                     self.buf.write(maybe_space)
@@ -373,7 +361,7 @@ def Print(self, val, level=0):
                     if s is None:
                         self.buf.write('null')
                     else:
-                        self._StringToBuf(s)
+                        pyj8.WriteString(s, self.options, self.buf)
 
                 self.buf.write(maybe_newline)
 
@@ -393,12 +381,12 @@ def Print(self, val, level=0):
 
                     self.buf.write(item_indent)
 
-                    self._StringToBuf(k2)
+                    pyj8.WriteString(k2, self.options, self.buf)
 
                     self.buf.write(':')
                     self.buf.write(maybe_space)
 
-                    self._StringToBuf(v2)
+                    pyj8.WriteString(v2, self.options, self.buf)
 
                     i += 1