Use replace_wl_with_unicode and replace_unicode_with_wl from mathics

Author: GarkGarcia

mathicsscript/__main__.py

@@ -11,12 +11,11 @@
 from mathicsscript.termshell import (
     ShellEscapeException,
     TerminalShell,
-    wl_replace_dict_esc,
-    wl_replace_pattern,
 )
 
 from mathicsscript.format import format_output
 
+from mathics import replace_wl_with_unicode
 from mathics.core.parser import FileLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.expression import Symbol, SymbolTrue, SymbolFalse
@@ -33,16 +32,6 @@
 from mathicsscript.version import __version__
 
 
-def replace_wl_to_unicode(wl_input: str) -> str:
-    """WL uses some non-unicode character for various things.
-    Replace them with the unicode equivalent.
-    Two known items are directed arrow and undirected arrow.
-    """
-    return wl_replace_pattern.sub(
-        lambda m: wl_replace_dict_esc[re.escape(m.group(0))], wl_input
-    )
-
-
 def ensure_settings():
     home = Path.home()
     base_config_dir = home / ".config"
@@ -339,7 +328,7 @@ def main(
                 current_pos = GNU_readline.get_current_history_length()
                 for pos in range(last_pos, current_pos - 1):
                     GNU_readline.remove_history_item(pos)
-                wl_input = replace_wl_to_unicode(source_code.rstrip())
+                wl_input = replace_wl_with_unicode(source_code.rstrip())
                 GNU_readline.add_history(wl_input)
 
             if query is None:

mathicsscript/termshell.py

@@ -73,40 +73,10 @@
 RL_COMPLETER_DELIMS_WITH_BRACE = " \t\n_~!@#%^&*()-=+{]}|;:'\",<>/?"
 RL_COMPLETER_DELIMS = " \t\n_~!@#%^&*()-=+[{]}\\|;:'\",<>/?"
 
-wl_replace_dict = {
-    "": "Ạ",
-    "": "ạ",
-    "": "Ḅ",
-    "": "ḅ",
-    # ...
-    "": "→",
-    "": "↔",
-    "": "𝑑",
-}
-
-wl_replace_dict_esc = dict((re.escape(k), v) for k, v in wl_replace_dict.items())
-wl_replace_pattern = re.compile("|".join(wl_replace_dict_esc.keys()))
-
-unicode_replace_dict = {v: k for k, v in wl_replace_dict.items()}
-unicode_replace_dict_esc = dict(
-    (re.escape(k), v) for k, v in unicode_replace_dict.items()
-)
-unicode_replace_pattern = re.compile("|".join(unicode_replace_dict_esc.keys()))
-
 
 from mathics.core.parser import LineFeeder
 
 
-def replace_unicode_to_wl(unicode_input: str) -> str:
-    """WL uses some non-unicode character for various things.
-    Replace the unicode equivalent with the WL equivalent.
-    Formal values like FormalA are like this.
-    """
-    return unicode_replace_pattern.sub(
-        lambda m: unicode_replace_dict_esc[re.escape(m.group(0))], unicode_input
-    )
-
-
 def is_pygments_style(style):
     if style not in ALL_PYGMENTS_STYLES:
         print("Pygments style name '%s' not found." % style)
@@ -278,7 +248,7 @@ def read_line(self, prompt):
             line = input(prompt)
         if line.startswith("!") and self.lineno == 0:
             raise ShellEscapeException(line)
-        return replace_unicode_to_wl(line)
+        return replace_unicode_with_wl(line)
 
     def print_result(self, result, output_style=""):
         if result is None: