CHANGES.rst tweak

Author: rocky

CHANGES.rst

@@ -22,15 +22,16 @@ Enhancements
 * The Mathics version is checked for builtin modules at load time. A message is given when a builtin doesn't load.
 * Automatic detection for the best strategy to numeric evaluation of constants.
 * ``FileNameJoin`` now implements ``OperatingSystem`` option
-* Mathics functions are accepted by ``Compile[]``. The return value or type will be
-  ``Compile[] and CompiledFunction[]``  every expression can have a compiled form,
-  as a Python function.
+* Mathics functions are accepted by ``Compile[]``. The return value or
+  type will be ``Compile[] and CompiledFunction[]``.  Every Mathics
+  Expression can have a compiled form, which may be implemented as a
+  Python function.
 * ``Equal[]`` now compares complex against other numbers properly.
 * Improvements in handling products with infinite factors: ``0 Infinity``-> ``Indeterminate``, and ``expr Infinity``-> ``DirectedInfinite[expr]``
-* ``$Path`` is now Unprotected by default
-* Improving the reading of expressions from files.
-* ``StringSplit`` now accepts a list in the first argument.
-* ``SetDelayed`` now accepts several conditions imposed both at LHS as well as RHS.
+* ``$Path`` is now ``Unprotected`` by default
+* ``Read[]`` handles expressions better.
+* ``StringSplit[]`` now accepts a list in the first argument.
+* ``SetDelayed[]`` now accepts several conditions imposed both at LHS as well as RHS.
 
 
 Bug fixes

mathics/builtin/compilation.py

@@ -163,6 +163,12 @@ def __str__(self):
             return "-PythonizedCode-"
         return "-CompiledCode-"
 
+    def boxes_to_text(self, leaves=None, **options):
+        from trepan.api import debug; debug()
+        if not leaves:
+            leaves = self._leaves
+        return "-CompiledCode-"
+
     def do_copy(self):
         return CompiledCode(self.cfunc, self.args)
 

mathics/builtin/files.py

@@ -796,7 +796,7 @@ def reader(stream, word_separators, accepted=None):
                         if word == "":
                             continue
                         if stream.seekable():
-                             # stream.seek(-1, 1) #Python3
+                            # stream.seek(-1, 1) #Python3
                             stream.seek(stream.tell() - 1)
                         last_word = word
                         word = ""
@@ -2597,19 +2597,22 @@ class ToFileName(Builtin):
 
 class FileNameJoin(Builtin):
     """
-    <dl>
-    <dt>'FileNameJoin[{"$dir_1$", "$dir_2$", ...}]'
-      <dd>joins the $dir_i$ togeather into one path.
-    </dl>
+        <dl>
+          <dt>'FileNameJoin[{"$dir_1$", "$dir_2$", ...}]'
+          <dd>joins the $dir_i$ together into one path.
 
-    >> FileNameJoin[{"dir1", "dir2", "dir3"}]
-     = ...
+          <dt>'FileNameJoin[..., OperatingSystem->"os"]'
+          <dd>yields a file name in the format for the specified operating system. Possible choices are "Windows", "MacOSX", and "Unix".
+        </dl>
+
+        >> FileNameJoin[{"dir1", "dir2", "dir3"}]
+         = ...
 
-    >> FileNameJoin[{"dir1", "dir2", "dir3"}, OperatingSystem -> "Unix"]
-     = dir1/dir2/dir3
+        >> FileNameJoin[{"dir1", "dir2", "dir3"}, OperatingSystem -> "Unix"]
+         = dir1/dir2/dir3
 
-    >> FileNameJoin[{"dir1", "dir2", "dir3"}, OperatingSystem -> "Windows"]
-     = dir1\\dir2\\dir3
+        >> FileNameJoin[{"dir1", "dir2", "dir3"}, OperatingSystem -> "Windows"]
+         = dir1\\dir2\\dir3
     """
 
     attributes = "Protected"

mathics/builtin/numeric.py

@@ -418,33 +418,37 @@ def ff(*z):
 class NIntegrate(Builtin):
     """
     <dl>
-    <dt>'NIntegrate[$expr$, $interval$]'
-        <dd>evaluates the definite integral of $expr$ numerically
-            with a precision of $prec$ digits.
+       <dt>'NIntegrate[$expr$, $interval$]'
+       <dd>returns a numeric approximation to the definite integral of $expr$ with limits $iterval and with a precision of $prec$ digits.
+
+        <dt>'NIntegrate[$expr$, $interval1$, $interval2$, ...]'
+        <dd>returns a numeric approximation to the multiple integral of $expr$ with limits $interval1$, $interval2$ and with a precision of $prec$ digits.
     </dl>
 
-    >> Table[1./NIntegrate[x^k,{x,0,1},Tolerance->1*^-6], {k,0,6}]
-     : The especified method failed to return a number. Falling back into the internal evaluator.
-     = {1., 2., 3., 4., 5., 6., 7.}
     >> NIntegrate[Exp[-x],{x,0,Infinity},Tolerance->1*^-6]
      = 1.
     >> NIntegrate[Exp[x],{x,-Infinity, 0},Tolerance->1*^-6]
      = 1.
     >> NIntegrate[Exp[-x^2/2.],{x,-Infinity, Infinity},Tolerance->1*^-6]
      = 2.50663
 
+    >> Table[1./NIntegrate[x^k,{x,0,1},Tolerance->1*^-6], {k,0,6}]
+     : The especified method failed to return a number. Falling back into the internal evaluator.
+     = {1., 2., 3., 4., 5., 6., 7.}
+
     >> NIntegrate[1 / z, {z, -1 - I, 1 - I, 1 + I, -1 + I, -1 - I}, Tolerance->1.*^-4]
      : Integration over a complex domain is not implemented yet
      = NIntegrate[1 / z, {z, -1 - I, 1 - I, 1 + I, -1 + I, -1 - I}, Tolerance -> 0.0001]
      ## = 6.2832 I
 
     Integrate singularities with weak divergences:
-    >> Table[NIntegrate[x^(1./k-1.),{x,0,1.},Tolerance->1*^-6], {k,1,7.}]
+    >> Table[ NIntegrate[x^(1./k-1.), {x,0,1.}, Tolerance->1*^-6], {k,1,7.} ]
      = {1., 2., 3., 4., 5., 6., 7.}
 
-    Iterated Integral:
-    >> NIntegrate[x * y,{x, 0, 1},{y, 0, 1}]
+    Mutiple Integrals :
+    >> NIntegrate[x * y,{x, 0, 1}, {y, 0, 1}]
      = 0.25
+
     """
 
     messages = {
@@ -457,7 +461,7 @@ class NIntegrate(Builtin):
         "nlim": "`1` = `2` is not a valid limit of integration.",
         "ilim": "Invalid integration variable or limit(s) in `1`.",
         "mtdfail": (
-            "The especified method failed to return a "
+            "The specified method failed to return a "
             + "number. Falling back into the internal "
             + "evaluator."
         ),
@@ -1807,7 +1811,7 @@ class Hash(Builtin):
       <dd>returns an integer hash of the specified $type$ for the given $expr$.</dd>
       <dd>The types supported are "MD5", "Adler32", "CRC32", "SHA", "SHA224", "SHA256", "SHA384", and "SHA512".</dd>
     <dt>'Hash[$expr$, $type$, $format$]'
-      <dd>Returns the hash in the  especified format.</dd>
+      <dd>Returns the hash in the specified format.</dd>
     </dl>
 
     > Hash["The Adventures of Huckleberry Finn"]

mathics/core/expression.py

@@ -2032,7 +2032,7 @@ def __getnewargs__(self):
 SymbolMakeBoxes = Symbol("MakeBoxes")
 SymbolN = Symbol("N")
 SymbolRule = Symbol("Rule")
-SymbolSequence = Symbol("Sequence") 
+SymbolSequence = Symbol("Sequence")
 
 
 @lru_cache(maxsize=1024)