Merge branch 'master' into using_modified_stopit_for_timeconstrained

Author: mmatera

mathics/builtin/atomic/atomic.py

@@ -3,8 +3,8 @@
 Atomic Primitives
 """
 
-from mathics.core.atoms import Atom
 from mathics.core.builtin import Builtin, Test
+from mathics.core.symbols import Atom
 
 
 class AtomQ(Test):

mathics/builtin/distance/stringdata.py

@@ -6,11 +6,11 @@
 import unicodedata
 from typing import Callable
 
-from mathics.core.atoms import Integer, String, Symbol
+from mathics.core.atoms import Integer, String
 from mathics.core.builtin import Builtin
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
-from mathics.core.symbols import SymbolTrue
+from mathics.core.symbols import Symbol, SymbolTrue
 
 SymbolEditDistance = Symbol("EditDistance")
 

mathics/builtin/image/base.py

@@ -8,12 +8,12 @@
 
 from mathics.builtin.box.image import ImageBox
 from mathics.builtin.colors.color_internals import convert_color
-from mathics.core.atoms import Atom
 from mathics.core.builtin import AtomBuiltin, String
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
 from mathics.core.keycomparable import IMAGE_EXPRESSION_ELT_ORDER
 from mathics.core.list import ListExpression
+from mathics.core.symbols import Atom
 from mathics.core.systemsymbols import SymbolImage, SymbolRule
 from mathics.eval.image import image_pixels, pixels_as_float, pixels_as_ubyte
 

mathics/builtin/numbers/calculus.py

@@ -18,7 +18,6 @@
 import mathics.eval.tracing as tracing
 from mathics.builtin.scoping import dynamic_scoping
 from mathics.core.atoms import (
-    Atom,
     Integer,
     Integer0,
     Integer1,
@@ -48,7 +47,7 @@
 from mathics.core.number import MACHINE_EPSILON, dps
 from mathics.core.rules import BasePattern
 from mathics.core.symbols import (
-    SYMPY_SYMBOL_PREFIX,
+    Atom,
     BaseElement,
     Symbol,
     SymbolFalse,

mathics/builtin/statistics/orderstats.py

@@ -17,12 +17,12 @@
 
 from mathics.algorithm.introselect import introselect
 from mathics.builtin.list.math import _RankedTakeLargest, _RankedTakeSmallest
-from mathics.core.atoms import Atom, Integer, Integer1, SymbolTrue
+from mathics.core.atoms import Integer, Integer1
 from mathics.core.attributes import A_PROTECTED, A_READ_PROTECTED
 from mathics.core.builtin import Builtin
 from mathics.core.expression import Evaluation, Expression
 from mathics.core.list import ListExpression
-from mathics.core.symbols import SymbolFloor, SymbolPlus, SymbolTimes
+from mathics.core.symbols import Atom, SymbolFloor, SymbolPlus, SymbolTimes, SymbolTrue
 from mathics.core.systemsymbols import (
     SymbolRankedMax,
     SymbolRankedMin,

mathics/core/assignment.py

@@ -7,7 +7,6 @@
 
 from typing import Callable, List, Optional, Tuple
 
-from mathics.core.atoms import Atom
 from mathics.core.attributes import A_PROTECTED
 from mathics.core.builtin import Builtin
 from mathics.core.definitions import Definitions
@@ -16,7 +15,7 @@
 from mathics.core.expression import Expression
 from mathics.core.list import ListExpression
 from mathics.core.rules import Rule
-from mathics.core.symbols import Symbol, SymbolList
+from mathics.core.symbols import Atom, Symbol, SymbolList
 from mathics.core.systemsymbols import (
     SymbolAnd,
     SymbolBlank,

mathics/core/atoms/__init__.py

@@ -0,0 +1,70 @@
+"""
+Mathics3 Atoms from which compound Mathics3 compound Expressions are made of.
+"""
+from mathics.core.atoms.arrays import ByteArray, NumericArray
+from mathics.core.atoms.numerics import (
+    COMPARE_PREC,
+    FP_MANTISA_BINARY_DIGITS,
+    MATHICS3_COMPLEX_I,
+    MATHICS3_COMPLEX_I_NEG,
+    NUMERICAL_CONSTANTS,
+    Complex,
+    Integer,
+    Integer0,
+    Integer1,
+    Integer2,
+    Integer3,
+    Integer4,
+    Integer10,
+    Integer310,
+    IntegerM1,
+    MachineReal,
+    MachineReal0,
+    MachineReal1,
+    Number,
+    PrecisionReal,
+    Rational,
+    RationalMinusOneHalf,
+    RationalOneHalf,
+    Real,
+    SymbolI,
+    is_integer_rational_or_real,
+    min_prec,
+)
+from mathics.core.atoms.strings import String, StringFromPython, SymbolString
+
+__all__ = [
+    "ByteArray",
+    "COMPARE_PREC",
+    "Complex",
+    "FP_MANTISA_BINARY_DIGITS",
+    "MATHICS3_COMPLEX_I",
+    "MATHICS3_COMPLEX_I_NEG",
+    "NUMERICAL_CONSTANTS",
+    "Integer",
+    "Integer0",
+    "Integer1",
+    "Integer2",
+    "Integer3",
+    "Integer4",
+    "Integer310",
+    "Integer10",
+    "IntegerM1",
+    "Integer1",
+    "MachineReal",
+    "MachineReal0",
+    "MachineReal1",
+    "Number",
+    "NumericArray",
+    "PrecisionReal",
+    "Rational",
+    "RationalMinusOneHalf",
+    "RationalOneHalf",
+    "Real",
+    "String",
+    "StringFromPython",
+    "SymbolI",
+    "SymbolString",
+    "is_integer_rational_or_real",
+    "min_prec",
+]