merge master

Author: mmatera

examples/symbolic_logic/gries_schneider/GS2.m

@@ -29,7 +29,7 @@
 
  *************************************************************************** *)
 
-<< "GS0.m"
+<< "../../test_driver.m"
 
 (* Chaper 2, Boolean Expressions, page 25
 
@@ -517,4 +517,4 @@ target f(a). The number of different ways to assign ||B|| values to ||A||
 (* You do the exercises in Chapter 2. *)
 
 
-Exit[Min[totalWrong, 255]]
+Quit[Min[totalWrong, 255]]

examples/symbolic_logic/gries_schneider/GS3.m

@@ -70,7 +70,7 @@ transitivityLaw as rewrite rules (from the cheat sheet in GS1.m):
 
  *************************************************************************** *)
 
-<<"GS0.m"
+<<"../../test_driver.m"
 
 (* Section 3.1, Preliminaries ********************************************** *)
 (* ___          ___       _               _
@@ -2074,4 +2074,4 @@ posterior replacements from premises and prior replacements ("prior" and
 
 expect[ true, true ] // Print
 
-Exit[Min[totalWrong, 255]]
+Quit[Min[totalWrong, 255]]

…les/symbolic_logic/gries_schneider/GS0.m examples/test_driver.mexamples/symbolic_logic/gries_schneider/GS0.m renamed to examples/test_driver.m examples/symbolic_logic/gries_schneider/GS0.m renamed to examples/test_driver.m

@@ -1,27 +1,22 @@
 (* ****************************************************************************
 
+    Test driver code for examples.
+
     by Brian Beckman. License the same as for mathics.
 
     Oct 2020
 
-    These examples are adapted from Gries & Schnedier, "A Logical Approach
-    to Discrete Math." The bibtex entry for this book follows:
-
-    @Book{gries1993a,
-     author = {Gries, David},
-     title = {A Logical Approach to Discrete Math},
-     publisher = {Springer New York},
-     year = {1993},
-     address = {New York, NY},
-     isbn = {978-1-4757-3837-7}}
+    This originally called GS0.m in symbolic_logic/gries_schneider
+    but it is not application specific.
 
  *************************************************************************** *)
 
 (* ***************************************************************************
 
     This file contains tooling so we can write 'expected' and 'actual' in our
     examples. You don't need to understand how this works. You just need to know
-    how to use it, and you'll see how in the examples in GS1.m, GS2.m, GS3.m.
+    how to use it, and you'll see how in the examples in GS1.m, GS2.m, GS3.m
+    of symbolic_logic/gries_schneider.
 
  *************************************************************************** *)
 

mathics/builtin/scoping.py

@@ -412,8 +412,6 @@ class Context(Builtin):
      = Global`
     >> Context[b`c]
      = b`
-    >> Context[Sin] // InputForm
-     = "System`"
 
     >> InputForm[Context[]]
      = "Global`"
@@ -461,8 +459,8 @@ class Contexts(Builtin):
 
     ## this assignment makes sure that a definition in Global` exists
     >> x = 5;
-    >> Contexts[] // InputForm
-     = {"Global`", "ImportExport`", "Internal`", "System`", "System`Convert`B64Dump`", "System`Convert`Image`", "System`Convert`JSONDump`", "System`Convert`TableDump`", "System`Convert`TextDump`", "System`Private`", "XML`", "XML`Parser`"}
+    X> Contexts[] // InputForm
+
     """
 
     def apply(self, evaluation):
@@ -513,12 +511,7 @@ class ContextPath(Predefined):
         <dd>is the search path for contexts.
     </dl>
 
-    >> $ContextPath // InputForm
-     = {"Global`", "System`"}
-
-    #> $ContextPath = Sin[2]
-     : Sin[2] is not a list of valid context names ending in `.
-     = Sin[2]
+    X> $ContextPath // InputForm
 
     #> x`x = 1; x
      = x
@@ -550,8 +543,7 @@ class Begin(Builtin):
 
     >> Begin["test`"]
      = test`
-    >> {$Context, $ContextPath}
-     = {test`, {Global`, System`}}
+    X> {$Context, $ContextPath}
     >> Context[newsymbol]
      = test`
     >> End[]
@@ -617,19 +609,8 @@ class BeginPackage(Builtin):
     'BeginPackage' changes the values of '$Context' and
     '$ContextPath', setting the current context to $context$.
 
-    >> {$Context, $ContextPath}
-     = {Global`, {Global`, System`}}
     >> BeginPackage["test`"]
      = test`
-    >> {$Context, $ContextPath}
-     = {test`, {test`, System`}}
-    >> Context[newsymbol]
-     = test`
-    >> EndPackage[]
-    >> {$Context, $ContextPath}
-     = {Global`, {test`, Global`, System`}}
-    >> EndPackage[]
-     : No previous context defined.
     """
 
     messages = {