[j8 refactor] Rename options

Prepare to add options for NON_DATA_IS_NULL and NON_DATA_IS_ERROR

Author: Andy C

data_lang/j8.py

@@ -136,12 +136,16 @@ def Utf8Encode(code):
 
 
 SHOW_CYCLES = 1 << 1  # show as [...] or {...} or (...), with object ID
-SHOW_NON_DATA = 1 << 2  # non-data objects like Eggex can be <Eggex 0xff>
-LOSSY_JSON = 1 << 3  # JSON may lose data about strings
-INF_NAN_ARE_NULL = 1 << 4  # for JSON
+NON_DATA_PRETTY_PRINT = 1 << 2  # non-data objects like Eggex can be <Eggex 0xff>
+LOSSY_JSON_STRINGS = 1 << 3  # JSON may lose data about strings
+INF_NAN_ARE_NULL = 1 << 4  # another lossy json issue
+
+# TODO:
+# - default is NON_DATA_PRETTY_PRINT
+# - opt into either NON_DATA_IS_ERROR or NON_DATA_IS_NULL
 
 # Hack until we fully translate
-assert pyj8.LOSSY_JSON == LOSSY_JSON
+assert pyj8.LOSSY_JSON_STRINGS == LOSSY_JSON_STRINGS
 
 
 def _Print(val, buf, indent, options=0):
@@ -170,35 +174,22 @@ def PrintJsonMessage(val, buf, indent):
     Caller must handle error.Encode()
     Doesn't decay to b'' strings - will use Unicode replacement char.
     """
-    _Print(val, buf, indent, options=LOSSY_JSON | INF_NAN_ARE_NULL)
+    _Print(val, buf, indent, options=LOSSY_JSON_STRINGS | INF_NAN_ARE_NULL)
 
 
 def PrintLine(val, f):
     # type: (value_t, mylib.Writer) -> None
-    """ For pp line (x) """
+    """ For pp test_ (x) """
 
     # error.Encode should be impossible - we show cycles and non-data
     buf = mylib.BufWriter()
 
-    _Print(val, buf, -1, options=SHOW_CYCLES | SHOW_NON_DATA)
+    _Print(val, buf, -1, options=SHOW_CYCLES | NON_DATA_PRETTY_PRINT)
 
     f.write(buf.getvalue())
     f.write('\n')
 
 
-if 0:
-
-    def Repr(val):
-        # type: (value_t) -> str
-        """ Unused
-        This is like Python's repr
-        """
-        # error.Encode should be impossible - we show cycles and non-data
-        buf = mylib.BufWriter()
-        _Print(val, buf, -1, options=SHOW_CYCLES | SHOW_NON_DATA)
-        return buf.getvalue()
-
-
 def EncodeString(s, buf, unquoted_ok=False):
     # type: (str, mylib.BufWriter, bool) -> None
     """ For pp proc, etc."""
@@ -229,7 +220,7 @@ def MaybeEncodeJsonString(s):
     # TODO: add unquoted_ok here?
     # /usr/local/foo-bar/x.y/a_b
     buf = mylib.BufWriter()
-    _Print(value.Str(s), buf, -1, options=LOSSY_JSON)
+    _Print(value.Str(s), buf, -1, options=LOSSY_JSON_STRINGS)
     return buf.getvalue()
 
 
@@ -575,7 +566,7 @@ def Print(self, val, level=0):
             elif case(value_e.Obj):
                 val = cast(Obj, UP_val)
 
-                if not (self.options & SHOW_NON_DATA):
+                if not (self.options & NON_DATA_PRETTY_PRINT):
                     raise error.Encode("Can't encode value of type Obj")
 
                 # Cycle detection, only for containers that can be in cycles
@@ -609,7 +600,7 @@ def Print(self, val, level=0):
 
             else:
                 pass  # mycpp workaround
-                if self.options & SHOW_NON_DATA:
+                if self.options & NON_DATA_PRETTY_PRINT:
                     # Similar to = operator, ui.DebugPrint()
                     # TODO: that prints value.Range in a special way
                     ysh_type = ValType(val)

data_lang/pyj8.py

@@ -8,7 +8,7 @@
 
 _ = log
 
-LOSSY_JSON = 1 << 3
+LOSSY_JSON_STRINGS = 1 << 3
 
 
 def WriteString(s, options, buf):
@@ -17,7 +17,7 @@ def WriteString(s, options, buf):
 
     The C++ version is optimized to avoid the intermediate string.
     """
-    j8_fallback = not (options & LOSSY_JSON)
+    j8_fallback = not (options & LOSSY_JSON_STRINGS)
     #print('j8_fallback %d' % j8_fallback)
     buf.write(fastfunc.J8EncodeString(s, j8_fallback))