add neural network primitives to library.wom

Aspidites/parser/reserved.py

@@ -57,7 +57,7 @@
 exponp = Literal("**")
 factop = Literal("!")
 bigf = oneOf("F ƒ").setParseAction(replaceWith('F()'))
-bitwiseop = Regex(r"<<|>>|&|\||~|^").setName("bitwise operator")
+bitwiseop = Regex(r"<<|>>|&|\||~|\^").setName("bitwise operator")
 andop = Literal('&&').setParseAction(replaceWith(' and '))
 orop = Literal('||').setParseAction(replaceWith(' or '))
 comparisonop = andop | orop | Regex(">=|<=|!=|>|<|==").setName("operator")

Aspidites/woma/__init__.py

@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from .gcutils import get_all
 from .fileutils import mkdir_p, atomic_save, iter_find_files, copytree
+from .pickleutils import pickle_loads
 from .guiutils import *
 from .mathutils import clamp, ceil, floor
 from contextlib import contextmanager

Aspidites/woma/pickleutils.py

@@ -24,6 +24,6 @@ def find_class(self, module, name):
                                      (module, name))
 
 
-def restricted_loads(s):
+def pickle_loads(s):
     """Helper function analogous to pickle.loads()."""
     return RestrictedUnpickler(io.BytesIO(s)).load()

setup.py

@@ -66,7 +66,6 @@
                 str(Path('Aspidites/__main__.py')),
                 str(Path('Aspidites/compiler.py')),
                 str(Path('Aspidites/woma/fileutils.py')),
-                str(Path('Aspidites/woma/setutils.py')),
                 str(Path('Aspidites/woma/gcutils.py')),
                 str(Path('Aspidites/woma/guiutils.py')),
                 str(Path('Aspidites/woma/mathutils.py'))