Merge pull request #1369 from mathics/general-autoload

General autoload

Author: rocky

CHANGES.rst

@@ -41,6 +41,7 @@ Enhancements
 * ``FileNames`` returns a sorted list (#1250).
 * ``FindRoot`` now receives several optional parameters like ``Method`` and ``MaxIterations``.
 * ``FixedPoint`` now supports the ``SameTest`` option.
+* ``mathics`` CLI now uses its own Mathics ``settings.m`` file
 * ``Prepend`` works with ``DownValues`` Issue #1251
 * ``Prime`` and ``PrimePi`` now accept a list parameter and have the ``NumericFunction`` attribute.
 * ``Read`` with ``Hold[Expression]`` now supported. (#1242)
@@ -66,10 +67,16 @@ Bug fixes
 * Functions gone over to ensure the ``Listable`` and ``NumericFunction`` properties are correct.
 
 
+Incompatible changes
+--------------------
+
+``System`$UseSansSerif`` moved from core and is sent front-ends using ``Settings`$UseSansSerif``.
+
 Internal changes
 ----------------
 
-* doctest  accepts the option `-d` to show how long it takes to parse, evaluate and compare each individual test.
+* doctest  accepts the option ``-d`` to show how long it takes to parse, evaluate and compare each individual test.
+  ``-x`` option (akin to ``pytests -x`` is a short-hand for stop on first error
 
 
 2.1.0

mathics/autoload-cli/settings.m

@@ -0,0 +1,6 @@
+(***********************************)
+(* Settings for Mathics CLI script *)
+(***********************************)
+
+System`$Notebooks::usage = "Set True if the Mathics is being used with a notebook-based front end.";
+System`$Notebooks = False;

mathics/autoload/settings.m

@@ -11,6 +11,7 @@
 Settings`$PreferredBackendMethod = "sympy"
 Unprotect[Settings`$PreferredBackendMethod]
 
+(* FIXME: remove this when all front-ends are adjusted to set this. *)
 (* Some packages like Feyncalc, test for whether a they are being used
 inside a notbook. *)
 System`$Notebooks::usage = "Set True if the Mathics is being used with a notebook-based front end.";

mathics/builtin/inout.py

@@ -18,7 +18,6 @@
     BoxConstruct,
     BoxConstructError,
     Operator,
-    Predefined,
 )
 from mathics.builtin.tensors import get_dimensions
 from mathics.builtin.comparison import expr_min
@@ -51,35 +50,6 @@
 MULTI_NEWLINE_RE = re.compile(r"\n{2,}")
 
 
-class UseSansSerif(Predefined):
-    """
-    <dl>
-      <dt>'$UseSansSerif'
-      <dd>controls whether the Web interfaces use a Sans-Serif font.
-    </dl>
-
-    When set True, the output in MathMLForm uses SansSerif fonts instead
-    of the standard fonts.
-
-    X> $UseSansSerif
-     = True
-    X> $UseSansSerif = False
-
-    """
-
-    context = "System`"
-    name = "$UseSansSerif"
-    attributes = ("Unprotected",)
-    value = True
-
-    rules = {"$UseSansSerif": str(value)}
-
-    messages = {}
-
-    def evaluate(self, evaluation):
-        return Integer(self.value)
-
-
 class Format(Builtin):
     """
     <dl>
@@ -2105,10 +2075,10 @@ def apply_mathml(self, expr, evaluation) -> Expression:
 
         # mathml = '<math><mstyle displaystyle="true">%s</mstyle></math>' % xml
         # #convert_box(boxes)
-        query = evaluation.parse("System`$UseSansSerif")
+        query = evaluation.parse("Settings`$UseSansSerif")
         usesansserif = query.evaluate(evaluation).to_python()
         if not is_a_picture:
-            if usesansserif:
+            if isinstance(usesansserif, bool) and usesansserif:
                 xml = '<mstyle mathvariant="sans-serif">%s</mstyle>' % xml
 
         mathml = '<math display="block">%s</math>' % xml  # convert_box(boxes)

mathics/core/definitions.py

@@ -41,6 +41,27 @@ def valuesname(name) -> str:
         return name[7:-6].lower()
 
 
+def autoload_files(defs, root_dir_path: str, autoload_dir):
+    from mathics.core.evaluation import Evaluation
+
+    # Load symbols from the autoload folder
+    for root, dirs, files in os.walk(os.path.join(root_dir_path, autoload_dir)):
+        for path in [os.path.join(root, f) for f in files if f.endswith(".m")]:
+            Expression("Get", String(path)).evaluate(Evaluation(defs))
+
+    # Move any user definitions created by autoloaded files to
+    # builtins, and clear out the user definitions list. This
+    # means that any autoloaded definitions become shared
+    # between users and no longer disappear after a Quit[].
+    #
+    # Autoloads that accidentally define a name in Global`
+    # could cause confusion, so check for this.
+    #
+    for name in defs.user:
+        if name.startswith("Global`"):
+            raise ValueError("autoload defined %s." % name)
+
+
 class PyMathicsLoadException(Exception):
     def __init__(self, module):
         self.name = module + " is not a valid pymathics module"
@@ -78,22 +99,17 @@ def __init__(
                 contribute(self)
                 for module in extension_modules:
                     try:
-                        loaded_module = self.load_pymathics_module(
-                            module, remove_on_quit=False
-                        )
-                    except PyMathicsLoadException as e:
+                        self.load_pymathics_module(module, remove_on_quit=False)
+                    except PyMathicsLoadException:
                         raise
-                    except ImportError as e:
+                    except ImportError:
                         raise
 
                 if builtin_filename is not None:
                     builtin_file = open(builtin_filename, "wb")
                     pickle.dump(self.builtin, builtin_file, -1)
 
-            # Load symbols from the autoload folder
-            for root, dirs, files in os.walk(os.path.join(ROOT_DIR, "autoload")):
-                for path in [os.path.join(root, f) for f in files if f.endswith(".m")]:
-                    Expression("Get", String(path)).evaluate(Evaluation(self))
+            autoload_files(self, ROOT_DIR, "autoload")
 
             # Move any user definitions created by autoloaded files to
             # builtins, and clear out the user definitions list. This
@@ -106,6 +122,7 @@ def __init__(
             for name in self.user:
                 if name.startswith("Global`"):
                     raise ValueError("autoload defined %s." % name)
+
             self.builtin.update(self.user)
             self.user = {}
             self.clear_cache()
@@ -475,7 +492,7 @@ def get_definition(self, name, only_if_exists=False) -> "Definition":
             self.lookup_cache[original_name] = name
         elif not only_if_exists:
             definition = Definition(name=name)
-            if name[-1] != '`':
+            if name[-1] != "`":
                 self.user[name] = definition
 
         return definition

mathics/main.py

@@ -8,14 +8,18 @@
 import subprocess
 import sys
 
+import os.path as osp
 from mathics.core.parser import MathicsFileLineFeeder, MathicsLineFeeder
 
-from mathics.core.definitions import Definitions, Symbol
+from mathics.core.definitions import autoload_files, Definitions, Symbol
 from mathics.core.expression import strip_context
 from mathics.core.evaluation import Evaluation, Output
 from mathics import version_string, license_string, __version__
 from mathics import settings
 
+def get_srcdir():
+    filename = osp.normcase(osp.dirname(osp.abspath(__file__)))
+    return osp.realpath(filename)
 
 class TerminalShell(MathicsLineFeeder):
     def __init__(self, definitions, colors, want_readline, want_completion):
@@ -82,6 +86,7 @@ def __init__(self, definitions, colors, want_readline, want_completion):
 
         self.incolors, self.outcolors = term_colors
         self.definitions = definitions
+        autoload_files(definitions, get_srcdir(), "autoload-cli")
 
     def get_last_line_number(self):
         return self.definitions.get_line_no()

setup.py

@@ -144,6 +144,7 @@ def subdirs(root, file="*.*", depth=10):
             "doc/xml/data",
             "doc/tex/data",
             "autoload/*.m",
+            "autoload-cli/*.m",
             "autoload/formats/*/Import.m",
             "autoload/formats/*/Export.m",
             "packages/*/*.m",