merge fixPymathicsContext

Author: mmatera

mathics/builtin/assignment.py

@@ -1749,8 +1749,8 @@ def apply(self, module, evaluation):
             evaluation.message(self.get_name(), 'notfound', module)
             return SymbolFailed
 
-        # Add PyMathics` to $ContextPath so that when user don't
-        # have to qualify PyMathics variables and functions,
+        # Add Pymathics` to $ContextPath so that when user don't
+        # have to qualify Pymathics variables and functions,
         # as the those in the module just loaded.
         # Following the example of $ContextPath in the WL
         # reference manual where PackletManager appears first in

mathics/builtin/base.py

@@ -91,6 +91,7 @@ def contribute(self, definitions, is_pymodule=False):
         name = self.get_name()
         options = {}
         option_syntax = "Warn"
+
         for option, value in self.options.items():
             if option == "$OptionSyntax":
                 option_syntax = value
@@ -147,7 +148,7 @@ def check_options(options_to_check, evaluation):
         for pattern, function in self.get_functions(is_pymodule=is_pymodule):
             rules.append(
                 BuiltinRule(
-                    name, pattern, function, check_options, system=not is_pymodule
+                    name, pattern, function, check_options, system=True
                 )
             )
         for pattern, replace in self.rules.items():
@@ -260,6 +261,7 @@ def contextify_form_name(f):
                 pattern = Expression("Default", Symbol(name), Integer(spec))
             if pattern is not None:
                 defaults.append(Rule(pattern, value, system=True))
+
         definition = Definition(
             name=name,
             rules=rules,
@@ -312,11 +314,10 @@ def get_functions(self, prefix="apply", is_pymodule=False):
                     pattern = m.group(2)
                 else:
                     attrs = []
-                if is_pymodule:
-                    name = ensure_context(self.get_name(short=True), "Pymathics")
-                else:
-                    name = self.get_name()
-
+                # if is_pymodule:
+                #    name = ensure_context(self.get_name(short=True), "Pymathics")
+                # else:
+                name = self.get_name()
                 pattern = pattern % {"name": name}
                 definition_class = (
                     PyMathicsDefinitions() if is_pymodule else SystemDefinitions()

mathics/core/definitions.py

@@ -152,17 +152,12 @@ def load_pymathics_module(self, module, remove_on_quit=True):
                     if not var.context:
                         var.context = "Pymathics`"
                     symbol_name = instance.get_name()
-                    print("loading symbol name ", symbol_name )
-                    builtins[symbol_name] = instance
                     builtins_by_module[loaded_module.__name__].append(instance)
                     newsymbols[symbol_name] = instance
 
         for name in newsymbols:
             luname = self.lookup_name(name)
             self.user.pop(name, None)
-            if remove_on_quit and name not in self.pymathics:
-                self.pymathics[name] = self.builtin.get(name, None)
-        self.builtin.update(newsymbols)
 
         for name, item in newsymbols.items():
             if name != "System`MakeBoxes":
@@ -178,25 +173,9 @@ def clear_pymathics_modules(self):
             if not key.startswith("mathics."):
                 print(f'removing module "{key}" not in mathics.')
                 del builtins_by_module[key]
-        # print("reloading symbols from current builtins.")
-        for s in self.pymathics:
-            if s in self.builtin:
-                # If there was a true built-in definition for the symbol, restore it, else, remove he symbol.
-                if self.pymathics[s]:
-                    self.builtin[s] = self.pymathics[s]
-                    builtins[s] = None
-                    for key, val in builtins_by_module.items():
-                        for simb in val:
-                            if simb.get_name() == s:
-                                builtins[s] = simb
-                                break
-                        if builtins[s] is not None:
-                            break
-                    if builtins[s] is None:
-                        builtins.__delitem__(s)
-                else:
-                    self.builtin.__delitem__(s)
-                    builtins.__delitem__(s)
+        for key in pymathics:
+            del self.pymathics[key]
+            
         self.pymathics = {}
         # print("everything is clean")
         return None

mathics/core/parser/util.py

@@ -72,12 +72,12 @@ def lookup_name(self, name):
 class PyMathicsDefinitions(object):
     """
     Dummy Definitions object that puts every unqualified symbol in
-    PyMathics`.
+    Pymathics`.
     """
 
     def lookup_name(self, name):
         assert isinstance(name, str)
-        context = "System`" if name in SYSTEM_LIST else "PyMathics`"
+        context = "System`" if name in SYSTEM_LIST else "Pymathics`"
         # print("XXX", name, context)
         return ensure_context(name, context)