Merge branch 'master' of https://github.com/mathics/Mathics into useasyforxmlgraphics

mmatera · mmatera · commit 3ad44bca32cf · 2021-02-06T15:51:50.000-03:00
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -24,10 +24,9 @@ jobs:
         brew install llvm@9
         python -m pip install --upgrade pip
         LLVM_CONFIG=/usr/local/Cellar/llvm@9/9.0.1_2/bin/llvm-config pip install llvmlite
-        python -m pip install -e git://github.com/Mathics3/mathics-scanner.git#egg=Mathics_Scanner
     - name: Install Mathics
       run: |
-        make
+        make develop
     - name: Test Mathics
       run: |
         pip install pytest pexpect
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -22,11 +22,10 @@ jobs:
       run: |
         sudo apt-get update -qq && sudo apt-get install -qq liblapack-dev llvm-dev
         python -m pip install --upgrade pip
-        python -m pip install -e git://github.com/Mathics3/mathics-scanner.git#egg=Mathics_Scanner
     - name: Install Mathics
       run: |
         sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
-        make
+        make develop
     - name: Test Mathics
       run: |
         pip install pytest pexpect
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,6 @@ before_install:
   - pip install ipywidgets ipykernel requests IPython==5.0.0 langid pycountry pyenchant lxml matplotlib unittest2 pexpect
   - python travis.py
   - pip install cython
-  - pip install -e git://github.com/Mathics3/mathics-scanner.git#egg=Mathics_Scanner
 install:
   - sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
   - make develop
diff --git a/examples/symbolic_logic/gries_schneider/test_gs.py b/examples/symbolic_logic/gries_schneider/test_gs.py
@@ -6,14 +6,12 @@
 from mathics.core.expression import Expression, Integer, Rational, Symbol
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
-from mathics.core.parser import SingleLineFeeder, parse
+from mathics.core.parser import MathicsSingleLineFeeder, parse
 
 definitions = Definitions(add_builtin=True)
 
 for i in range(1, 4):
   evaluation = Evaluation(definitions=definitions, catch_interrupt=False)
 
-  expr = parse(definitions, SingleLineFeeder(f"<< GS{i}.m"))
+  expr = parse(definitions, MathicsSingleLineFeeder(f"<< GS{i}.m"))
   expr.evaluate(evaluation)
-
-
diff --git a/mathics/benchmark.py b/mathics/benchmark.py
@@ -15,7 +15,7 @@
 
 
 import mathics
-from mathics.core.parser import parse, MultiLineFeeder, SingleLineFeeder
+from mathics.core.parser import parse, MathicsMultiLineFeeder, MathicsSingleLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
 
@@ -126,7 +126,7 @@ def truncate_line(string):
 
 def benchmark_parse(expression_string):
     print("  '{0}'".format(truncate_line(expression_string)))
-    timeit(lambda: parse(definitions, SingleLineFeeder(expression_string)))
+    timeit(lambda: parse(definitions, MathicsSingleLineFeeder(expression_string)))
 
 
 def benchmark_parse_file(fname):
@@ -140,7 +140,7 @@ def benchmark_parse_file(fname):
         code = f.read().decode('utf-8')
 
     def do_parse():
-        feeder = MultiLineFeeder(code)
+        feeder = MathicsMultiLineFeeder(code)
         while not feeder.empty():
             parse(definitions, feeder)
     timeit(do_parse)
@@ -156,13 +156,13 @@ def benchmark_parser():
 
 def benchmark_format(expression_string):
     print("  '{0}'".format(expression_string))
-    expr = parse(definitions, SingleLineFeeder(expression_string))
+    expr = parse(definitions, MathicsSingleLineFeeder(expression_string))
     timeit(lambda: expr.default_format(evaluation, "FullForm"))
 
 
 def benchmark_expression(expression_string):
     print("  '{0}'".format(expression_string))
-    expr = parse(definitions, SingleLineFeeder(expression_string))
+    expr = parse(definitions, MathicsSingleLineFeeder(expression_string))
     timeit(lambda: expr.evaluate(evaluation))
 
 
diff --git a/mathics/builtin/arithmetic.py b/mathics/builtin/arithmetic.py
@@ -1309,19 +1309,19 @@ class PossibleZeroQ(SympyFunction):
       <dd>returns 'True' if basic symbolic and numerical methods suggest that expr has value zero, and 'False' otherwise.
     </dl>
 
-    Test whether a numeric expression is zero:
-    >> PossibleZeroQ[E^(I Pi/4) - (-1)^(1/4)]
-     = True
+    ## Test whether a numeric expression is zero:
+    ## >> PossibleZeroQ[E^(I Pi/4) - (-1)^(1/4)]
+    ##  = True
 
-    The determination is approximate.
+    ## The determination is approximate.
 
     Test whether a symbolic expression is likely to be identically zero:
     >> PossibleZeroQ[(x + 1) (x - 1) - x^2 + 1]
      = True
 
 
-    >> PossibleZeroQ[(E + Pi)^2 - E^2 - Pi^2 - 2 E Pi]
-     = True
+    ## >> PossibleZeroQ[(E + Pi)^2 - E^2 - Pi^2 - 2 E Pi]
+    ##  = True
 
     Show that a numeric expression is nonzero:
     >> PossibleZeroQ[E^Pi - Pi^E]
diff --git a/mathics/builtin/evaluation.py b/mathics/builtin/evaluation.py
@@ -110,11 +110,12 @@ class IterationLimit(Predefined):
      = $Aborted
     #> ClearAll[f];
 
-    #> ClearAll[f];
-    #> f[x_, 0] := x; f[x_, n_] := Module[{y = x + 1}, f[y, n - 1]];
-    #> Block[{$IterationLimit = 20}, f[0, 100]]
-     = 100
-    #> ClearAll[f];
+    # FIX Later
+    # #> ClearAll[f];
+    # #> f[x_, 0] := x; f[x_, n_] := Module[{y = x + 1}, f[y, n - 1]];
+    # #> Block[{$IterationLimit = 20}, f[0, 100]]
+    #  = 100
+    # #> ClearAll[f];
     """
 
     name = "$IterationLimit"
diff --git a/mathics/builtin/files.py b/mathics/builtin/files.py
@@ -23,7 +23,8 @@
 import os.path as osp
 from itertools import chain
 
-from mathics_scanner import TranslateError, FileLineFeeder
+from mathics_scanner import TranslateError
+from mathics.core.parser import MathicsFileLineFeeder
 
 from mathics.core.expression import (
     Expression,
@@ -2183,7 +2184,7 @@ def check_options(options):
             if trace_fn:
                 trace_fn(pypath)
             with mathics_open(pypath, "r") as f:
-                feeder = FileLineFeeder(f, trace_fn)
+                feeder = MathicsFileLineFeeder(f, trace_fn)
                 while not feeder.empty():
                     try:
                         query = parse(definitions, feeder)
diff --git a/mathics/core/evaluation.py b/mathics/core/evaluation.py
@@ -59,7 +59,6 @@ def __init__(self, value, tag=None):
         self.value = value
 
 
-
 def _thread_target(request, queue) -> None:
     try:
         result = request()
@@ -229,11 +228,7 @@ def display(self, data, metadata):
 
 class Evaluation(object):
     def __init__(
-            self,
-            definitions=None,
-            output=None,
-            format="text",
-            catch_interrupt=True
+        self, definitions=None, output=None, format="text", catch_interrupt=True
     ) -> None:
         from mathics.core.definitions import Definitions
         from mathics.core.expression import Symbol
@@ -263,9 +258,9 @@ def __init__(
 
     def parse(self, query):
         "Parse a single expression and print the messages."
-        from mathics.core.parser import SingleLineFeeder
+        from mathics.core.parser import MathicsSingleLineFeeder
 
-        return self.parse_feeder(SingleLineFeeder(query))
+        return self.parse_feeder(MathicsSingleLineFeeder(query))
 
     def parse_evaluate(self, query, timeout=None):
         expr = self.parse(query)
diff --git a/mathics/core/parser/__init__.py b/mathics/core/parser/__init__.py
@@ -1,13 +1,12 @@
-#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from mathics_scanner import (
-    FileLineFeeder,
-    LineFeeder,
-    MultiLineFeeder,
-    SingleLineFeeder,
-    is_symbol_name,
-)
+from mathics_scanner import is_symbol_name
 
+from mathics.core.parser.feed import (
+    MathicsFileLineFeeder,
+    MathicsLineFeeder,
+    MathicsMultiLineFeeder,
+    MathicsSingleLineFeeder,
+)
 from mathics.core.parser.util import parse, parse_builtin_rule
 from mathics.core.parser.operators import all_operator_names
diff --git a/mathics/core/parser/feed.py b/mathics/core/parser/feed.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from mathics_scanner import FileLineFeeder, LineFeeder, MultiLineFeeder, SingleLineFeeder
+
+
+class MathicsLineFeeder(LineFeeder):
+    def send_messages(self, evaluation):
+        for message in self.messages:
+            evaluation.message(*message)
+        self.messages = []
+
+class MathicsSingleLineFeeder(SingleLineFeeder, MathicsLineFeeder):
+    "A feeder that feeds lines from an open ``File`` object"
+
+
+class MathicsFileLineFeeder(FileLineFeeder, MathicsLineFeeder):
+    "A feeder that feeds lines from an open ``File`` object"
+
+
+class MathicsMultiLineFeeder(MultiLineFeeder, MathicsLineFeeder):
+    "A feeder that feeds lines from an open ``File`` object"
diff --git a/mathics/core/parser/util.py b/mathics/core/parser/util.py
@@ -3,9 +3,8 @@
 
 from typing import Any, FrozenSet, Tuple
 
-from mathics_scanner import SingleLineFeeder
-
 from mathics.core.parser.parser import Parser
+from mathics.core.parser.feed import MathicsSingleLineFeeder
 from mathics.core.parser.convert import convert
 from mathics.core.expression import ensure_context
 
@@ -88,4 +87,4 @@ def parse_builtin_rule(string, definitions=SystemDefinitions()):
     Parse rules specified in builtin docstrings/attributes. Every symbol
     in the input is created in the System` context.
     """
-    return parse(definitions, SingleLineFeeder(string, "<builtin_rules>"))
+    return parse(definitions, MathicsSingleLineFeeder(string, "<builtin_rules>"))
diff --git a/mathics/main.py b/mathics/main.py
@@ -8,7 +8,7 @@
 import subprocess
 import sys
 
-from mathics_scanner import FileLineFeeder, LineFeeder
+from mathics.core.parser import MathicsFileLineFeeder, MathicsLineFeeder
 
 from mathics.core.definitions import Definitions, Symbol
 from mathics.core.expression import strip_context
@@ -17,7 +17,7 @@
 from mathics import settings
 
 
-class TerminalShell(LineFeeder):
+class TerminalShell(MathicsLineFeeder):
     def __init__(self, definitions, colors, want_readline, want_completion):
         super(TerminalShell, self).__init__("<stdin>")
         self.input_encoding = locale.getpreferredencoding()
diff --git a/mathics/session.py b/mathics/session.py
@@ -1,4 +1,4 @@
-from mathics.core.parser import parse, SingleLineFeeder
+from mathics.core.parser import parse, MathicsSingleLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
 from mathics import settings
@@ -10,9 +10,9 @@ def __init__(self, add_builtin=True, catch_interrupt=False, form="InputForm"):
         self.evaluation = Evaluation(definitions=self.definitions, catch_interrupt=catch_interrupt)
         self.form = form
         self.last_result = None
-        
+
     def evaluate(self, str_expression, timeout = None, form=None):
-        expr = parse(self.definitions, SingleLineFeeder(str_expression))
+        expr = parse(self.definitions, MathicsSingleLineFeeder(str_expression))
         if form is None:
             form = self.form
         self.last_result = expr.evaluate(self.evaluation)
diff --git a/mathics/test.py b/mathics/test.py
@@ -12,7 +12,7 @@
 
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation, Output
-from mathics.core.parser import SingleLineFeeder
+from mathics.core.parser import MathicsSingleLineFeeder
 from mathics.builtin import builtins
 
 from mathics import version_string
@@ -73,7 +73,7 @@ def fail(why):
             print("%s %s / %s %s" % (stars, tests.chapter, section, stars))
         print("%4d (%2d): TEST %s" % (index, subindex, test))
 
-    feeder = SingleLineFeeder(test, "<test>")
+    feeder = MathicsSingleLineFeeder(test, "<test>")
     evaluation = Evaluation(definitions, catch_interrupt=False, output=TestOutput())
     try:
         query = evaluation.parse_feeder(feeder)
diff --git a/setup.py b/setup.py
@@ -80,7 +80,7 @@ def read(*rnames):
 
 # General Requirements
 INSTALL_REQUIRES += [
-    "Mathics_Scanner>=1.0.0.dev",
+    "Mathics_Scanner>=1.0.0,<1.1.0",
     "sympy>=1.7, <= 1.8dev",
     "mpmath>=1.1.0",
     "numpy",
diff --git a/test/helper.py b/test/helper.py
@@ -1,5 +1,5 @@
 import time
-from mathics.core.parser import parse, SingleLineFeeder
+from mathics.core.parser import parse, MathicsSingleLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
 from mathics.session import MathicsSession
diff --git a/test/test_file.py b/test/test_file.py
@@ -1,4 +1,4 @@
-from mathics.core.parser import parse, SingleLineFeeder
+from mathics.core.parser import parse, MathicsSingleLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
 import pytest
@@ -9,7 +9,7 @@
 
 
 def _evaluate(str_expression):
-    expr = parse(definitions, SingleLineFeeder(str_expression))
+    expr = parse(definitions, MathicsSingleLineFeeder(str_expression))
     return expr.evaluate(evaluation)
 
 
@@ -28,9 +28,3 @@ def test_get_and_put():
 
     result = _evaluate(f"DeleteFile[\"{temp_filename}\"]").to_python()
     assert result is None
-
-
-
-
-
-
diff --git a/test/test_to_python.py b/test/test_to_python.py
@@ -4,7 +4,6 @@
 import math
 import sympy
 import sys
-from mathics.core.parser import parse, SingleLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
 import pytest
