prefscript 1.1__tar.gz → 1.2__tar.gz

{prefscript-1.1 → prefscript-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: prefscript
-Version: 1.1
+Version: 1.2
 Summary: Partial Recursive Functions for Scripting
 Author-email: José Luis Balcázar <jose.luis.balcazar@upc.edu>
 Project-URL: Homepage, https://github.com/balqui/prefscript
@@ -12,15 +12,16 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pytokr>=1.0
+Dynamic: license-file
 
 # PReFScript: 
 ## Partial Recursive Functions for Scripting
 
-Author: Jose L Balcazar, ORCID 0000-0003-4248-4528
+Author: Jose Luis Balcazar, ORCID 0000-0003-4248-4528
 
 Project started: mid Germinal 2003.
 
-Current version: 1.1, late Thermidor 2024.
+Current version: 1.2, mid Messidor 2026.
 
 Copyleft: MIT License (https://en.wikipedia.org/wiki/MIT_License)
 
@@ -54,7 +55,6 @@ Thus, you have available two main ways of programming in PReFScript.
 
 ### Installation and ways to use PReFScript functions
 
-See [doc.md](https://github.com/balqui/prefscript/blob/main/docs/doc.md) 
-for all the details (somewhat incomplete as of today).
+See [doc.md](https://github.com/balqui/prefscript/blob/main/docs/doc.md).
 
 

{prefscript-1.1 → prefscript-1.2}/README.md

@@ -1,11 +1,11 @@
 # PReFScript: 
 ## Partial Recursive Functions for Scripting
 
-Author: Jose L Balcazar, ORCID 0000-0003-4248-4528
+Author: Jose Luis Balcazar, ORCID 0000-0003-4248-4528
 
 Project started: mid Germinal 2003.
 
-Current version: 1.1, late Thermidor 2024.
+Current version: 1.2, mid Messidor 2026.
 
 Copyleft: MIT License (https://en.wikipedia.org/wiki/MIT_License)
 
@@ -39,7 +39,6 @@ Thus, you have available two main ways of programming in PReFScript.
 
 ### Installation and ways to use PReFScript functions
 
-See [doc.md](https://github.com/balqui/prefscript/blob/main/docs/doc.md) 
-for all the details (somewhat incomplete as of today).
+See [doc.md](https://github.com/balqui/prefscript/blob/main/docs/doc.md).
 
 

{prefscript-1.1 → prefscript-1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "prefscript"
-version = "1.1"
+version = "1.2"
 authors = [ { name = "José Luis Balcázar", email = "jose.luis.balcazar@upc.edu" }, ]
 description = "Partial Recursive Functions for Scripting"
 readme = "README.md"

{prefscript-1.1 → prefscript-1.2}/src/ascii7io.py

@@ -1,5 +1,14 @@
 '''
+Project started mid Germinal 2023:
+PReFScript: A Partial Recursive Functions Lab
+
+Ancillary module, early Thermidor 2024:
 Single-integer encoding and decoding of (printable) 7-bit ASCII strings
+Currently employed for versions up to 1.2, this docstring expanded 
+by mid Messidor 2026 with no change to code.
+
+Author: Jose L Balcazar, ORCID 0000-0003-4248-4528
+Copyleft: MIT License (https://en.wikipedia.org/wiki/MIT_License)
 '''
 
 TWO_pow_7 = 1 << 7

prefscript-1.2/src/fundata.py

@@ -0,0 +1,44 @@
+'''
+Project started mid Germinal 2003:
+PReFScript: A Partial Recursive Functions Lab
+
+Module version mid Messidor 2026:
+fundata: class FunData storing all necessary information about 
+one function, includes as well ancillary algorithms mu and prim_rec
+(file distribution slight refactoring on the monolithic design of Thermidor 2004)
+
+Author: Jose L Balcazar, ORCID 0000-0003-4248-4528, april 2023 onwards 
+Copyleft: MIT License (https://en.wikipedia.org/wiki/MIT_License)
+
+Each function in a script has: associated Gödel number, nickname, 
+comments, and code (string); also, the last operation used to 
+construct it. Then, in a separate dict at script level (and used 
+as namespace for eval calls), a runnable version of the code.
+
+Nicknames are alphanum strings not starting with a number (no surprise).
+'''
+
+import cantorpairs as cp
+
+__version__ = "1.2"
+
+class FunData(dict):
+    'Simple class for PReFScript functions data'
+
+    def __init__(self, nick = None, comment = None, how_def = None, def_on = None):
+        dict.__init__(self)
+        self["nick"] = nick # function name
+        self["comment"] = comment
+        self["how_def"] = how_def
+        self["def_on"] = def_on
+
+    def __str__(self):
+        return self["nick"] + "\n " + self["comment"] 
+
+    def how_def(self):
+        if self["how_def"] == "basic":
+            return "basic"
+        return self["how_def"] + ": " + ' '.join(on_what for on_what in self["def_on"])
+
+
+# ~ Should add unit testing here

{prefscript-1.1 → prefscript-1.2}/src/prefscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: prefscript
-Version: 1.1
+Version: 1.2
 Summary: Partial Recursive Functions for Scripting
 Author-email: José Luis Balcázar <jose.luis.balcazar@upc.edu>
 Project-URL: Homepage, https://github.com/balqui/prefscript
@@ -12,15 +12,16 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pytokr>=1.0
+Dynamic: license-file
 
 # PReFScript: 
 ## Partial Recursive Functions for Scripting
 
-Author: Jose L Balcazar, ORCID 0000-0003-4248-4528
+Author: Jose Luis Balcazar, ORCID 0000-0003-4248-4528
 
 Project started: mid Germinal 2003.
 
-Current version: 1.1, late Thermidor 2024.
+Current version: 1.2, mid Messidor 2026.
 
 Copyleft: MIT License (https://en.wikipedia.org/wiki/MIT_License)
 
@@ -54,7 +55,6 @@ Thus, you have available two main ways of programming in PReFScript.
 
 ### Installation and ways to use PReFScript functions
 
-See [doc.md](https://github.com/balqui/prefscript/blob/main/docs/doc.md) 
-for all the details (somewhat incomplete as of today).
+See [doc.md](https://github.com/balqui/prefscript/blob/main/docs/doc.md).
 
 

{prefscript-1.1 → prefscript-1.2}/src/prefscript.egg-info/SOURCES.txt

@@ -2,7 +2,9 @@ LICENSE
 README.md
 pyproject.toml
 src/ascii7io.py
+src/fundata.py
 src/prefscript.py
+src/v1parser.py
 src/cantorpairs/__init__.py
 src/cantorpairs/src/cantorpairs.py
 src/cantorpairs/src/cp_ex.py
@@ -11,6 +13,4 @@ src/prefscript.egg-info/SOURCES.txt
 src/prefscript.egg-info/dependency_links.txt
 src/prefscript.egg-info/entry_points.txt
 src/prefscript.egg-info/requires.txt
-src/prefscript.egg-info/top_level.txt
-tests/test.py
-tests/test_fact.py
+src/prefscript.egg-info/top_level.txt

{prefscript-1.1 → prefscript-1.2}/src/prefscript.egg-info/top_level.txt

@@ -1,3 +1,5 @@
 ascii7io
 cantorpairs
+fundata
 prefscript
+v1parser

{prefscript-1.1 → prefscript-1.2}/src/prefscript.py

@@ -1,57 +1,39 @@
 '''
+Project started mid Germinal 2023:
 PReFScript: A Partial Recursive Functions Lab
 
-Rather: Towards a Partial Recursive Functions lab.
+Module version mid Messidor 2026:
+prefscript with main class PReFScript and run entrypoint only
+(file distribution slight refactoring on the monolithic design of Thermidor 2024)
 
-Author: Jose L Balcazar, ORCID 0000-0003-4248-4528, april 2023 onwards 
+Author: Jose L Balcazar, ORCID 0000-0003-4248-4528
 Copyleft: MIT License (https://en.wikipedia.org/wiki/MIT_License)
 
-Project started: mid Germinal 2003.
-Current version: 0.5, mid Thermidor 2024.
-
 A Python-based environment to explore and experiment with partial 
 recursive functions; naturally doubles as a (purely functional) 
 programming language, but it is not intended to be used as such.
 
-Each function in a script has: associated Gödel number, nickname, 
-comments, and code (string); also, the last operation used to 
-construct it. Then, in a separate dict (used as namespace for 
+Functions are stored in FunData instances.
+Then, in a separate dict (used as namespace for 
 eval calls), a runnable version of the code.
-
-Nicknames are alphanum strings not starting with a number (no surprise).
 '''
 
 from collections import defaultdict as ddict
-from re import compile as re_compile, finditer as re_finditer
-from ascii7io import int2str, str2int, int2raw_str # users are not expected to need int2raw_str
-import cantorpairs
-cp = cantorpairs
+from ascii7io import int2str, str2int
+import cantorpairs as cp
+
+from v1parser import Parser, SyntErr
+from fundata import FunData
 
-__version__ = "1.1"
+__version__ = "1.2"
 
 # ~ In order to omit Gödel numbers too high, around 300 decimal digits,
 # ~ LIMIT_GNUM set to 2**1000 but computed much faster via bit shift
 
 LIMIT_GNUM = 2 << 999
 
-class FunData(dict):
-    'Simple class for PReFScript functions data'
-
-    def __init__(self, nick = None, comment = None, how_def = None, def_on = None):
-        dict.__init__(self)
-        self["nick"] = nick # function name
-        self["comment"] = comment
-        self["how_def"] = how_def
-        self["def_on"] = def_on
-
-    def __str__(self):
-        return self["nick"] + "\n " + self["comment"] 
-
-    def how_def(self):
-        if self["how_def"] == "basic":
-            return "basic"
-        return self["how_def"] + ": " + ' '.join(on_what for on_what in self["def_on"])
-
+# ~ Ancillary functions to implement mu-linear search and parameterized
+# ~ and unparameterized primitive recursion.
 
 def mu(x, test):
     "ancillary linear search function for implementing mu-minimization"
@@ -75,62 +57,19 @@ def prim_rec(is_base, base, recurse):
 	return lambda x: cp.pr_L(c_of_v(x))
 
 
-class Parser:
-    '''Prepare an re-based parser to be used upon reading scripts
-    The single Parser with single parse generator is likely to mess up
-    the recursive imports, I bet it does not work yet.
-    '''
-
-    def __init__(self):
-        "group names require Python >= 3.11"
-        from re import compile as re_compile, finditer as re_finditer
-        about = r"\s*\.about(?P<about>.*)\n"                           # arbitrary documentation
-        pragma = r"\s*\.pragma\s+(?P<which>\w+):?\s+(?P<what>\w+)\s*"  # compilation directives
-        importing = r"\s*\.import\s+(?P<to_import>[\w._-]+)\s*"        # additional external script
-        a7str = r'''(?P<quote>['"])(?P<a7str>.*)(?P=quote)'''
-        startdef = r"\d+\s+define\:\s*"
-        group1_nick = r"(?P<nick>\w+)\s+"
-        group2_comment = r"\[\s*(?P<comment>(\w|\s|[.,:;<>=)(?!/+*-])+)\]\s+" 
-        group4_how = r"(?P<how>pair|comp|mu|compair|primrec|ascii_const)\s+" 
-        group5_on_what = r"((?P<on_what>([a-zA-Z_]\w*\s+)+)|" + a7str + ")"  # nick args required not to start with a number
-        define = (startdef +  
-              group1_nick + 
-              group2_comment + 
-              group4_how +
-              group5_on_what)
-        self.the_parser = re_compile(define + '|' + about + '|' + pragma + '|' + importing)
-
-    def parse(self, source):
-        for thing in re_finditer(self.the_parser, source):
-            "can one find out non-matched portions to message the user about?"
-            things = thing.groupdict(default = '')
-            if about := things['about']:
-                yield 'about', about
-            if which := things['which']:
-                yield 'pragma', (which, things['what'])
-            if to_import := things['to_import']:
-                yield 'import', to_import
-            if nick := things['nick']:
-                if things['how'] == "ascii_const":
-                    on_what = [things['a7str']]
-                else:
-                    on_what = things['on_what'].split()
-                yield "define", FunData(nick, things['comment'], things['how'], on_what)
-
-
-class SyntErr:
-    "handle syntactic errors in the script - VERY PRIMITIVE for the time being"
+def par_prim_rec(is_base, base, recurse):
+	"primitive recursion with parameters - careful, names swapped from the course notes in Spanish"
 
-    def __init__(self):
-        from sys import stderr
-        self.e = stderr
-
-    def report(self, nonfatal = False, info = ''):
-        "return value to be given to the valid field / alt: fatal here and nonvalid at script"
-        p = 'Nonf' if nonfatal else 'F'
-        print(p + 'atal error in PReFScript:', info, sep = '\n  ', file = self.e)
-        return nonfatal
+	def c_of_v(z):
+		"create the adequate course of values, not full anymore"
+		x = cp.pr_R(z)
+		sq = 0 # empty sequence
+		for y in range(x + 1):
+			new = base(z) if is_base(y) else recurse(cp.dp(z, sq))
+			sq = cp.dp(new, sq)
+		return sq
 
+	return lambda x: cp.pr_L(c_of_v(x))
 
 
 class PReFScript:
@@ -138,17 +77,17 @@ class PReFScript:
     def __init__(self, store_goedel_numbers = ""):
         '''
         Dicts for storing the functions:
-          main for the function data,
+          nicks to retrieve FunData from nick,
           gnums for Gödel numbers,
           pycode for Python runnable code, 
           key is always nick for all of them;
         include here the basic functions;
         their implementation assumes 'import cantorpairs as cp'
         '''
-        self.valid = True   # program is correct until proven wrong
-        self.main = dict()  # RENAME some day, as I am using also 'main' for the main function to be called
+        self.valid = True     # program is correct until proven wrong
+        self.nicks = dict()   # maps nick to FunData which includes nick
         self.strcode = dict()
-        self.pycode = dict()
+        self.pycode = dict()  # doubles as 'checked' set in former check_names
         self.gnums = dict()
         self.abouts = list()
         self.pragmas = ddict(str)
@@ -177,7 +116,7 @@ class PReFScript:
         data["def_on"] = tuple()
         if self.store_gnums:
             self.gnums[nick] = cp.dp(0, num)
-        self.main[nick] = data
+        self.nicks[nick] = data
         self.strcode[nick] = code
         self.pycode[nick] = eval(code, globals() | self.pycode)
 
@@ -190,10 +129,10 @@ class PReFScript:
         Gödel number printed depending on self.store_gnums and how big it is
         '''
         def list_one(nick, w_code):
-            print("\n" + str(self.main[nick]))
+            print("\n" + str(self.nicks[nick]))
             if w_code:
                 'print how it is defined'
-                print(" " + self.main[nick].how_def())
+                print(" " + self.nicks[nick].how_def())
             if w_code == 2:
                 'print also the Python code in this case only'
                 print(" " + self.strcode[nick])
@@ -208,21 +147,21 @@ class PReFScript:
         if what is not None:
             list_one(what, w_code)
         else:
-            for nick in self.main:
+            for nick in self.nicks:
                 list_one(nick, w_code)
 
 
     def define(self, new_funct):
         'here comes a new function to add to the collection'
 
-        if (nick := new_funct['nick']) in self.main:
+        if (nick := new_funct['nick']) in self.nicks:
             'repeated nick, check for consistency'
-            if (self.main[nick]["how_def"] != new_funct['how_def'] or
-                self.main[nick]["def_on"] != new_funct['def_on']):
+            if (self.nicks[nick]["how_def"] != new_funct['how_def'] or
+                self.nicks[nick]["def_on"] != new_funct['def_on']):
                     self.valid &= self.synt_err_handler.report(nonfatal = False, 
                         info = f"Repeated, inconsistent definitions for function '{nick}' found.")
         else:
-            self.main[nick] = new_funct
+            self.nicks[nick] = new_funct
             on_what = new_funct['def_on']
 
             if new_funct['how_def'] == "comp":
@@ -286,6 +225,21 @@ class PReFScript:
                         self.valid &= self.synt_err_handler.report(nonfatal = False, 
                             info = f"Gödel number for '{nick}' too large, omitted.")
 
+            elif new_funct['how_def'] == "parprimrec":
+                if not self.pragmas['extended']:
+                    self.valid &= self.synt_err_handler.report(nonfatal = True, 
+                                  info = "Use of parprimrec requires '.pragma extended: True', changed.")
+                self.pragmas['extended'] = 'True'
+                self.strcode[nick] = "par_prim_rec(" + on_what[0] + ", " + on_what[1] + ", " + on_what[2] + ")"
+                if (self.store_gnums and on_what[1] in self.gnums and on_what[2] in self.gnums):
+                    gnum = cp.dp(5, cp.dp(int(on_what[0]),
+                               cp.dp(self.gnums[on_what[1]], self.gnums[on_what[2]])))
+                    if gnum < LIMIT_GNUM:
+                        self.gnums[nick] = gnum
+                    else:
+                        self.valid &= self.synt_err_handler.report(nonfatal = False, 
+                            info = f"Gödel number for '{nick}' too large, omitted.")
+
             else:
                 "ascii_const, as no other 'how' captured by parser - kept out of the Goedel numbering for the time being"
                 if not self.pragmas['extended']:
@@ -293,17 +247,18 @@ class PReFScript:
                                   info = "Use of ascii constants requires '.pragma extended: True', changed.")
                 self.pragmas['extended'] = 'True'
                 self.strcode[nick] = "lambda x: str2int( '" + on_what[0] + "' )"
+                # ~ self.pycode[nick] = eval(self.strcode[nick]) 
 
-            self.pycode[nick] = eval(self.strcode[nick], globals() | self.pycode)
+            # ~ if new_funct['how_def'] != "ascii_const":
+                # ~ self.pycode[nick] = eval(self.strcode[nick], globals() | self.pycode)
 
 
     def to_python(self, what):
         'returns the Python-runnable version of the function'
         if what not in self.pycode:
-            self.valid &= self.synt_err_handler.report(nonfatal = False, 
-                info = f"No Python code for function '{what}' found.")
-            return None
-        return self.pycode[what]
+            self.gen_py(what)
+        if self.valid:
+            return self.pycode[what]
 
 
     def find_script_in_file(self, filename, main):
@@ -319,12 +274,14 @@ class PReFScript:
                               info = f"Imported script {filename} not found.")
 
 
-    def load(self, filename, main = True):
+    def load(self, filename, main = False):
         'load in definitions from .prfs file(s) - use .import to recurse into further loading'
-        if filename.endswith('.prfs'):
-            self.valid &= self.synt_err_handler.report(nonfatal = True, 
-                          info = f"File name {filename} NOT expected to include the '.prfs' extension.")
-        else:
+        # ~ if filename.endswith('.prfs'):
+            # ~ self.valid &= self.synt_err_handler.report(nonfatal = True, 
+                          # ~ info = f"File name {filename} NOT expected to include the '.prfs' extension.")
+        # ~ else:
+            # ~ filename += '.prfs'
+        if not filename.endswith('.prfs'):
             filename += '.prfs'
         script = self.find_script_in_file(filename, main)
         if not script:
@@ -337,10 +294,17 @@ class PReFScript:
                     "pragmas in main file are stored"
                     self.pragmas[what[0]] = what[1]
                 elif what[0] == 'extended' and what[1] == 'True':
-                    "pragmas in imported files are ignored except extended when set to True"
-                    if self.pragmas['extended'] != 'True':
-                        self.valid &= self.synt_err_handler.report(nonfatal = True, 
-                            info = f"Warning: the .pragma extended declaration found in {filename} affects globally.")
+                    '''
+                    pragmas in imported files are ignored except extended when set to True - 
+                    v1.2: now this is done with no warning, while v1.1 would warn about it,
+                    but it was ugly to get the warning when calling PReFScript.load from
+                    inside the interpreter, also the message is not that useful and the
+                    current plan is that for 2.0 onwards "extended" will be the default
+                    and expressed in a different way
+                    '''
+                    # ~ if self.pragmas['extended'] != 'True':
+                        # ~ self.valid &= self.synt_err_handler.report(nonfatal = True, 
+                            # ~ info = f"Warning: the .pragma extended declaration found in {filename} affects globally.")
                     self.pragmas[what[0]] = what[1]
             if label == 'about':
                 self.abouts.append('about ' + filename + ': ' + what) 
@@ -371,23 +335,45 @@ class PReFScript:
         self.define(FunData(nick.strip(), comment.strip(), how.strip(), tuple(on_what.split())))
 
 
-    def check_names(self):
-        "checks that all function names needed to run main have been defined"
+    def gen_py(self, name, need = 'pragma main'):
+        if name not in self.pycode:
+            "make sure never to loop on it"
+            self.pycode[name] = "None"
+            if name in self.nicks:
+                if self.nicks[name]['how_def'] != "ascii_const":
+                    "the def_on part of an ascii_const is a mere string already handled"
+                    for nname in self.nicks[name]['def_on']:
+                        "we need first the recursive calls"
+                        self.gen_py(nname, name)
+                self.pycode[name] = eval(self.strcode[name], globals() | self.pycode)
+            else:
+                "newly found undefined name"
+                self.valid &= self.synt_err_handler.report(nonfatal = False, 
+                    info = f"Function '{name}' not found but needed by {need}.")
+        elif self.pycode[name] == "None":
+            "already attempted, make sure not to fall in a definition loop"
+            self.valid &= self.synt_err_handler.report(nonfatal = False, 
+                info = f"Function '{name}' belongs to a disallowed definition loop.")
 
-        def check_name(self, name, need = 'pragma main'):
-            if name not in checked:
-                checked.add(name)
-                if name in self.main:
-                    if self.main[name]['how_def'] != "ascii_const":
-                        for nname in self.main[name]['def_on']:
-                            check_name(self, nname, f"'{name}'")
-                else:
-                    "newly found undefined name"
-                    self.valid &= self.synt_err_handler.report(nonfatal = False, 
-                        info = f"Function '{name}' not found but needed by {need}.")
 
-        checked = set()
-        check_name(self, self.pragmas['main'])
+# ~ Process moved to gen_py
+    # ~ def check_names(self):
+        # ~ "checks that all function names needed to run main have been defined"
+
+        # ~ def check_name(self, name, need = 'pragma main'):
+            # ~ if name not in checked:
+                # ~ checked.add(name)
+                # ~ if name in self.nicks:
+                    # ~ if self.nicks[name]['how_def'] != "ascii_const":
+                        # ~ for nname in self.nicks[name]['def_on']:
+                            # ~ check_name(self, nname, f"'{name}'")
+                # ~ else:
+                    # ~ "newly found undefined name"
+                    # ~ self.valid &= self.synt_err_handler.report(nonfatal = False, 
+                        # ~ info = f"Function '{name}' not found but needed by {need}.")
+
+        # ~ checked = set()
+        # ~ check_name(self, self.pragmas['main'])
 
 
 def run():
@@ -405,9 +391,9 @@ def run():
             action = "version", version = f'{__version__}')
     args = aparser.parse_args()
     f = PReFScript()
-    f.load(args.filename)
+    f.load(args.filename, main = True)
     if f.valid:
-        f.check_names()
+        f.gen_py(f.pragmas['main'])
     if f.valid:
         'run it on data from stdin according to input/output/main pragmas'
         if args.about:
@@ -425,7 +411,7 @@ def run():
         if f.pragmas["input"] in ('', "int"):
             arg = int(input()) 
         elif f.pragmas["input"] == "none":
-            arg = 666 # for one
+            arg = 42 # for one
         elif f.pragmas["input"] == "intseq":
             arg = cp.tup_i(map(int, loop()))
 

prefscript-1.2/src/v1parser.py

@@ -0,0 +1,76 @@
+'''
+Project started mid Germinal 2003:
+PReFScript: A Partial Recursive Functions Lab
+
+Module version mid Messidor 2026:
+v1parser: re-based parser for versions up to 1.2
+(file distribution slight refactoring on the monolithic design of Thermidor 2004)
+
+Author: Jose L Balcazar, ORCID 0000-0003-4248-4528, april 2023 onwards 
+Copyleft: MIT License (https://en.wikipedia.org/wiki/MIT_License)
+'''
+
+from re import compile as re_compile, finditer as re_finditer
+
+from fundata import FunData
+
+__version__ = "1.2"
+
+class Parser:
+    '''Prepare an re-based parser to be used upon reading scripts
+    The single Parser with single parse generator is likely to mess up
+    the recursive imports, I bet it does not work yet.
+    '''
+
+    def __init__(self):
+        "group names require Python >= 3.11"
+        from re import compile as re_compile, finditer as re_finditer
+        about = r"\s*\.about(?P<about>.*)\n"                           # arbitrary documentation
+        pragma = r"\s*\.pragma\s+(?P<which>\w+):?\s+(?P<what>\w+)\s*"  # compilation directives
+        importing = r"\s*\.import\s+(?P<to_import>[\w._-]+)\s*"        # additional external script
+        a7str = r'''(?P<quote>['"])(?P<a7str>.*)(?P=quote)'''
+        startdef = r"\d+\s+define\:\s*"
+        group1_nick = r"(?P<nick>\w+)\s+"
+        group2_comment = r"\[\s*(?P<comment>(\w|\s|[.,:;<>=)(?!/+*-])+)\]\s+" 
+        group4_how = r"(?P<how>pair|comp|mu|compair|primrec|ascii_const|parprimrec)\s+" 
+        group5_on_what = r"((?P<on_what>([a-zA-Z_]\w*\s+)+)|" + a7str + ")"  # nick args required not to start with a number
+        define = (startdef +  
+              group1_nick + 
+              group2_comment + 
+              group4_how +
+              group5_on_what)
+        self.the_parser = re_compile(define + '|' + about + '|' + pragma + '|' + importing)
+
+    def parse(self, source):
+        for thing in re_finditer(self.the_parser, source):
+            "can one find out non-matched portions to message the user about?"
+            things = thing.groupdict(default = '')
+            if about := things['about']:
+                yield 'about', about
+            if which := things['which']:
+                yield 'pragma', (which, things['what'])
+            if to_import := things['to_import']:
+                yield 'import', to_import
+            if nick := things['nick']:
+                if things['how'] == "ascii_const":
+                    on_what = [things['a7str']]
+                else:
+                    on_what = things['on_what'].split()
+                yield "define", FunData(nick, things['comment'], things['how'], on_what)
+
+
+class SyntErr:
+    "handle syntactic errors in the script - VERY PRIMITIVE for the time being"
+
+    def __init__(self):
+        from sys import stderr
+        self.e = stderr
+
+    def report(self, nonfatal = False, info = ''):
+        "return value to be given to the valid field / alt: fatal here and nonvalid at script"
+        p = 'Nonf' if nonfatal else 'F'
+        print(p + 'atal error in PReFScript:', info, sep = '\n  ', file = self.e)
+        return nonfatal
+
+
+# ~ Should add unit testing here

prefscript-1.1/tests/test.py

@@ -1,17 +0,0 @@
-# ~ import scaff.cantorpairs as cp
-# ~ from prefscript import PReFScript
-from prefscript import PReFScript, cp
-my_fs = PReFScript()
-# ~ my_fs = PReFScript("Store Gödel numbers")
-my_fs.load("script_sign.prfs")
-my_fs.list(w_code = 1)
-my_fs.load("script_proj.prfs")
-my_fs.load("script_bool.prfs")
-my_fs.load("script_compar.prfs")
-my_fs.load("script_division.prfs")
-my_fs.list()
-d = my_fs.to_python("div")
-print(d(cp.dp(14, 5)))
-print(d(cp.dp(15, 5)))
-my_fs.list("swap", w_code = 1)
-my_fs.list("sign", w_code = 2)

prefscript-1.1/tests/test_fact.py

@@ -1,20 +0,0 @@
-from time import process_time
-from prefscript import PReFScript
-import scaff.cantorpairs as cp
-
-ff = PReFScript()
-ff.load("fact_00.prfs")
-f = ff.to_python("fact")
-
-def t(n):
-	try:
-		start = process_time()
-		r = f(n)
-		tm = process_time() - start
-	except:
-		print(f"Stopped; time: {1000*(process_time() - start):3.6f} ms")
-	print(f"Outcome: {r}; time: {1000*(tm):3.6f} ms")
-
-t(int(input("n: ")))
-
-