Merge pull request #1149 from mathics/rc1

Release candidate 1

Author: rocky

CHANGES.rst

@@ -37,6 +37,10 @@ build:
 develop:
 	$(PIP) install -e .
 
+#: Make distirbution: wheels, eggs, tarball
+dist:
+	./admin-tools/make-dist.sh
+
 #: Install mathics
 install:
 	$(PYTHON) setup.py install

Makefile

@@ -46,8 +46,8 @@ Mathics is released under the GNU General Public License Version 3 (GPL3).
 .. |Travis| image:: https://secure.travis-ci.org/mathics/Mathics.svg?branch=master
 .. _Travis: https://travis-ci.org/mathics/Mathics
 .. _PyPI: https://pypi.org/project/Mathics/
-.. |mathicsscript| image:: https://mathics.org/screenshots/mathicsscript.png
-.. |mathicssserver| image:: https://mathics.org/screenshots/mathicsserver.png
+.. |mathicsscript| image:: https://github.com/Mathics3/mathicsscript/blob/master/screenshots/mathicsscript1.gif
+.. |mathicssserver| image:: https://mathics.org/images/mathicsserver.png
 .. |Latest Version| image:: https://badge.fury.io/py/Mathics3.svg
 		 :target: https://badge.fury.io/py/Mathics3
 .. |Pypi Installs| image:: https://pepy.tech/badge/Mathics3

README.rst

@@ -1,3 +1,4 @@
+#!/bin/bash
 PACKAGE=mathics3
 
 # FIXME put some of the below in a common routine
@@ -15,7 +16,7 @@ fi
 
 
 cd ..
-source $PACKAGE/version.py
+source mathics/version.py
 echo $__version__
 
 for pyversion in $PYVERSIONS; do

admin-tools/make-dist.sh

@@ -49,7 +49,7 @@
     version_string += f", cython {version_info['cython']}"
 
 license_string = """\
-Copyright (C) 2011-2020 The Mathics Team.
+Copyright (C) 2011-2021 The Mathics Team.
 This program comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
 under certain conditions.

mathics/__init__.py

@@ -5,7 +5,7 @@
 import mathics.builtin
 from mathics.builtin.base import (
     Builtin, BinaryOperator, PostfixOperator, PrefixOperator)
-from mathics.core.expression import (Expression, Symbol, SymbolFailed, valid_context_name,
+from mathics.core.expression import (Expression, Symbol, SymbolFailed, SymbolNull, valid_context_name,
                                      system_symbols, String)
 from mathics.core.rules import Rule, BuiltinRule
 from mathics.builtin.patterns import RuleDelayed
@@ -833,23 +833,34 @@ def _get_usage_string(symbol, evaluation, htmlout=False):
     definition = evaluation.definitions.get_definition(symbol.name)
     ruleusage = definition.get_values_list('messages')
     usagetext = None
-    from mathics.builtin import builtins
     import re
-    bio = builtins.get(definition.name)
-
+    # First look at user definitions:
+    for rulemsg in ruleusage:
+        if rulemsg.pattern.expr.leaves[1].__str__() == "\"usage\"":
+            usagetext = rulemsg.replace.value
+    if usagetext is not None:
+        # Maybe, if htmltout is True, we should convert
+        # the value to a HTML form...
+        return usagetext
+    # Otherwise, look at the pymathics, and builtin docstrings:
+    builtins = evaluation.definitions.builtin
+    pymathics = evaluation.definitions.pymathics
+    bio = pymathics.get(definition.name)
+    if bio is None:
+        bio = builtins.get(definition.name)
+    
     if bio is not None:
         from mathics.doc.doc import Doc
+        docstr = bio.builtin.__class__.__doc__
+        if docstr is None:
+            return None
         if htmlout:
-            usagetext = Doc(bio.__class__.__doc__).text(0)
+            usagetext = Doc(docstr).html()
         else:
-            usagetext = Doc(bio.__class__.__doc__).text(0)
+            usagetext = Doc(docstr).text(0)
         usagetext = re.sub(r'\$([0-9a-zA-Z]*)\$', r'\1', usagetext)
-    # For built-in symbols, looks for a docstring.
-    # Looks for the "usage" message. For built-in symbols, if there is an "usage" chain, overwrite the __doc__ information.
-    for rulemsg in ruleusage:
-        if rulemsg.pattern.expr.leaves[1].__str__() == "\"usage\"":
-            usagetext = rulemsg.replace.value
-    return usagetext
+        return usagetext
+    return None
 
 
 class Information(PrefixOperator):
@@ -861,20 +872,27 @@ class Information(PrefixOperator):
     'Information' does not print information for 'ReadProtected' symbols.
     'Information' uses 'InputForm' to format values.
 
+    #> a = 2;
+    #> Information[a]
+     | a = 2
+     .
+     = Null
 
-    >> a = 2;
-    >> Information[a]
-     = a = 2
-
+    #> f[x_] := x ^ 2;
+    #> g[f] ^:= 2;
+    #> f::usage = "f[x] returns the square of x";
+    #> Information[f]
+     | f[x] returns the square of x
+     .
+     . f[x_] = x ^ 2
+     .
+     . g[f] ^= 2
+     .
+     = Null
 
-    >> f[x_] := x ^ 2
-    >> g[f] ^:= 2
-    >> f::usage = "f[x] returns the square of x";
-    X> Information[f]
-     = f[x] returns the square of x
 
-    >> ? Table
-     = 
+    #> ? Table
+     | 
      .   'Table[expr, {i, n}]'
      .     evaluates expr with i ranging from 1 to n, returning
      . a list of the results.
@@ -885,9 +903,10 @@ class Information(PrefixOperator):
      .     evaluates expr with i taking on the values e1, e2,
      . ..., ei.
      .
+     = Null
 
-    >> Information[Table]
-     = 
+    #> Information[Table]
+     | 
      .   'Table[expr, {i, n}]'
      .     evaluates expr with i ranging from 1 to n, returning
      . a list of the results.
@@ -900,6 +919,7 @@ class Information(PrefixOperator):
      .
      . Attributes[Table] = {HoldAll, Protected}
      .
+     = Null
     """
 
     operator = "??"
@@ -910,15 +930,14 @@ class Information(PrefixOperator):
 
     def format_definition(self, symbol, evaluation, options, grid=True):
         'StandardForm,TraditionalForm,OutputForm: Information[symbol_, OptionsPattern[Information]]'
-        from mathics.core.expression import from_python
+        ret = SymbolNull
         lines = []
         if isinstance(symbol, String):
             evaluation.print_out(symbol)
-            evaluation.evaluate(Expression('Information', Symbol('System`String')))
-            return
+            return ret
         if not isinstance(symbol, Symbol):
             evaluation.message('Information', 'notfound', symbol)
-            return Symbol('Null')
+            return ret
         # Print the "usage" message if available.
         usagetext = _get_usage_string(symbol, evaluation)
         if usagetext is not None:
@@ -929,17 +948,16 @@ def format_definition(self, symbol, evaluation, options, grid=True):
 
         if grid:
             if lines:
-                return Expression(
+                infoshow = Expression(
                     'Grid', Expression(
                         'List', *(Expression('List', line) for line in lines)),
                     Expression(
                         'Rule', Symbol('ColumnAlignments'), Symbol('Left')))
-            else:
-                return Symbol('Null')
+                evaluation.print_out(infoshow)
         else:
             for line in lines:
                 evaluation.print_out(Expression('InputForm', line))
-            return Symbol('Null')
+        return ret
 
         # It would be deserable to call here the routine inside Definition, but for some reason it fails...
         # Instead, I just copy the code from Definition
@@ -1006,7 +1024,9 @@ def rhs(expr):
 
     def format_definition_input(self, symbol, evaluation, options):
         'InputForm: Information[symbol_, OptionsPattern[Information]]'
-        return self.format_definition(symbol, evaluation, options, grid=False)
+        self.format_definition(symbol, evaluation, options, grid=False)
+        ret = SymbolNull
+        return ret
 
 
 class Clear(Builtin):
@@ -1748,17 +1768,19 @@ def apply(self, module, evaluation):
         except ImportError as e:
             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,
+        except PyMathicsLoadException as e:
+            evaluation.message(self.get_name(), 'notmathicslib', module)
+            return SymbolFailed
+        else:
+        # 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
         # the list, it seems to be preferable to add this PyMathics
         # at the beginning.
-        context_path = evaluation.definitions.get_context_path()
-        if "Pymathics`" not in context_path:
-            context_path.insert(0, "Pymathics`")
-        evaluation.definitions.set_context_path(context_path)
-        
+            context_path = evaluation.definitions.get_context_path()
+            if "Pymathics`" not in context_path:
+                context_path.insert(0, "Pymathics`")
+                evaluation.definitions.set_context_path(context_path)
         return module

mathics/builtin/assignment.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,
@@ -268,6 +270,7 @@ def contextify_form_name(f):
             attributes=attributes,
             options=options,
             defaultvalues=defaults,
+            builtin=self
         )
         if is_pymodule:
             definitions.pymathics[name] = definition
@@ -312,11 +315,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()
@@ -764,4 +766,3 @@ def from_expression(expr):
                             return CountableInteger(0, upper_limit=True)
 
         return None  # leave original expression unevaluated
-

mathics/builtin/base.py

@@ -1897,6 +1897,9 @@ class Print(Builtin):
      | μ
     #> Print["μ"]
      | μ
+    #> Print["-Hola\\n-Qué tal?"]
+     | -Hola
+     . -Qué tal?
     """
 
     def apply(self, expr, evaluation):

mathics/builtin/inout.py

@@ -19,7 +19,7 @@
     fully_qualified_symbol_name,
     strip_context,
 )
-from mathics_scanner.tokeniser import base_names_pattern, full_names_pattern
+from mathics_scanner.tokeniser import full_names_pattern
 
 type_compiled_pattern = type(re.compile("a.a"))
 
@@ -152,17 +152,13 @@ def load_pymathics_module(self, module, remove_on_quit=True):
                     if not var.context:
                         var.context = "Pymathics`"
                     symbol_name = instance.get_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":
                 item.contribute(self, is_pymodule=True)
@@ -177,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
@@ -447,7 +427,7 @@ def get_definition(self, name, only_if_exists=False) -> "Definition":
                 pymathics.attributes if pymathics else
                 (builtin.attributes if builtin else set())
             )
-            upvalues = [], 
+            upvalues = [],
             messages = [],
             nvalues = [],
             defaultvalues = [],
@@ -754,7 +734,7 @@ def __init__(
         options=None,
         nvalues=None,
         defaultvalues=None,
-        builtin=None,
+        builtin=None
     ) -> None:
 
         super(Definition, self).__init__()

mathics/core/definitions.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)