Merge pull request #296 from asteroid-lang/dev-2.0.1

Dev 2.0.1

Author: lutzhamel

.github/workflows/generate_documentation.yml

@@ -1,12 +1,16 @@
+# this script throws an error when trying to commit the generated documentation
+# right now set to 'none' branch that will not match anything in this repo
 name: Documentation Generation
 on:
     pull_request:
         branches:
-           - 'dev-**'
+           #- 'dev-**'
+           - 'none'
 
     push:
         branches:
-            - 'dev-**'
+            #- 'dev-**'
+            - 'none'
 env:
     PYTHONPATH: ${{ github.workspace }}
 jobs:

README.md

@@ -4,6 +4,31 @@ be found at the website [asteroid-lang.org](https://asteroid-lang.org).
 Documentation on Asteroid can be found at
 [asteroid-lang.readthedocs.io](https://asteroid-lang.readthedocs.io).
 
+## New in Release 2.0.1
+
+* We now support the ASTEROIDPATH environment variable which is expected to have a colon seperated list of directories to search for user defined modules.
+
+* The logical operators 'and' and 'or' are now evaluated in short-circuit fashion.
+
+* Files loaded with the 'load' statement are now considered modules and work similarly to Python modules.
+
+* Added the 'toplevel' function which returns true if control is in the module originally loaded by the interpreter.
+
+* Added the match statement similar to the match statement in Python.
+
+* No longer supports type hierarchies for the primitive types.  The functions in the 'type' module are now considered builtins. The 'type' module itself has been eliminated.
+
+* The Minimal Asteroid Debugger (MAD) replaces ADB in this release.
+
+* The shorthand conditional pattern can now be applied to arbitrary patterns. E.g. The pattern 
+  ```
+  (a,b,c):(%integer,%integer,%integer)
+  ```
+  constrains the triple `(a,b,c)` to be a triple of integers.  The above shorthand conditional pattern is equivalent to the conditional pattern,
+  ```
+  (a,b,c) if (a,b,c) is (%integer,%integer,%integer)
+  ```
+  
 ## New in Release 1.1.4
 
 * Allows pattern constraint operator to map certain variables that a pattern 

asteroid/__init__.py

@@ -12,44 +12,45 @@
 from asteroid.interp import interp
 from asteroid.repl import repl
 from asteroid.version import VERSION
-from asteroid.adb import adb
+from asteroid.mad import MAD
 
 def display_help():
-    print("** Asteroid Version {} **".format(VERSION))
+    print("Asteroid {}".format(VERSION))
     print("(c) University of Rhode Island")
-    print("usage: asteroid [-<switch>] <input file>")
+    print("usage: asteroid [<switch>] <input file>")
     print("")
-    print("command line flags:")
+    print("command line switches:")
+    print(" -d             run program through debugger")
+    print(" -e             show Python exceptions")
+    print(" -F             functional mode")
+    print(" -h, --help     display help")
+    print(" -p             disable prologue")
+    print(" -r             disable redundant pattern detector")
     print(" -s             enable symbol table dump")
     print(" -t             AST dump")
     print(" -v, --version  version")
     print(" -w             disable tree walk")
+    print(" -W             disable warnings")
     print(" -z             generate pstats")
-    print(" -p             disable prologue")
-    print(" -h, --help     display help")
-    print(" -r             disable redundant pattern detector")
-    print(" -e             show Python exceptions")
-    print(" -F             functional mode")
-    print(" -g, --adb      run program through debugger")
 
 def main():
-    # defaults for the flags - when the flag is set on the command line
+    # defaults for the switches or flags - when the flag is set on the command line
     # it simply toggles the default value in this table.
     flags = {
+        '-d' : False,    # Short debugger flag
+        '-e' : False,  # show full exceptions
+        '-F' : False,  # functional mode
+        '--help' : False,  # display help flag
+        '-h' : False,  # display help flag
+        '-p' : True,   # prologue flag
+        '-r' : True,   # redundant pattern dectector
         '-s' : False,  # symbol table dump flag
         '-t' : False,  # AST dump flag
         '--version' : False,  # version flag
         '-v' : False,  # version flag
         '-w' : True,   # tree walk flag
+        '-W' : True,   # warnings
         '-z' : False,  # generate pstats flag
-        '-p' : True,   # prologue flag
-        '--help' : False,  # display help flag
-        '-h' : False,  # display help flag
-        '-r' : True,   # redundant pattern dectector
-        '-e' : False,  # show full exceptions
-        '-F' : False,  # functional mode
-        '--adb': False, # debugger flag
-        '-g': False    # Short debugger flag
     }
 
     flag_names = list(flags.keys())
@@ -80,10 +81,10 @@ def main():
         sys.exit(0)
 
     if flags['--version'] or flags['-v']:
-        print("** Asteroid Version {} **".format(VERSION))
+        print("Asteroid {}".format(VERSION))
         sys.exit(0)
 
-    debug_flag = flags['--adb'] or flags['-g']
+    debug_flag = flags['-d']
 
     # determine if we are starting in interactive mode or not
     # Note: first non-switch argument has to be an Asteroid source file
@@ -108,22 +109,11 @@ def main():
         print("error: unknown file '{}'".format(input_file))
         sys.exit(1)
 
-    # run the debugger
     if debug_flag:
-        if input_ext == '':
-            print("error: please provide a file to debug")
-            sys.exit(1)
         # Create a new debugger
-        db = adb.ADB()
-        # Set the debugger's internal interpretation options
-        db.interp_options = {
-            'redundancy': flags['-r'],
-            'prologue': flags['-p'],
-            'functional_mode': flags['-F'],
-            'exceptions': flags['-e'],
-        }
-        db.run(input_file)
-        sys.exit(0)
+        db = MAD()
+    else:
+        db = None
 
     # execute the interpreter
     f = open(input_file, 'r')
@@ -134,18 +124,21 @@ def main():
     interp_object = \
     '''interp(program=input_stream,
            program_name = input_file,
-           tree_dump=flags['-t'],
-           do_walk=flags['-w'],
-           symtab_dump=flags['-s'],
            exceptions=flags['-e'],
-           redundancy=flags['-r'],
+           functional_mode=flags['-F'],
            prologue=flags['-p'],
-           functional_mode=flags['-F'])'''
+           redundancy=flags['-r'],
+           symtab_dump=flags['-s'],
+           tree_dump=flags['-t'],
+           do_walk=flags['-w'],
+           warnings=flags['-W'],
+           debugger=db
+           )'''
 
     if flags['-z']:
         # generates pstats into the file 'pstats'
         # see https://docs.python.org/3/library/profile.html
-        cProfile.run(interp_object, 'pstats')
+        cProfile.runctx(interp_object, globals(), locals(), filename='pstats')
     else:
         exec(interp_object)