Update rst_to_pxd scripts after directory move

Author: oscarbenjamin

bin/all_rst_to_pxd.sh

@@ -84,5 +84,7 @@ modules=(
 
 for module in ${modules[@]}; do
     echo "Processing $module"
-    bin/rst_to_pxd.py flint/$module --flint-doc-dir=$FLINT_DOC_DIR > src/flint/flintlib/$module.pxd
+    bin/rst_to_pxd.py flint/$module \
+        --flint-doc-dir=$FLINT_DOC_DIR \
+        > src/flint/flintlib/functions/$module.pxd
 done

bin/rst_to_pxd.py

@@ -78,19 +78,19 @@ def fill_import_dict(pyflintlibdir):
     """
     Get a map from cython structs to the pxd that defines them
     """
-    with os.scandir(pyflintlibdir) as entry:
+    with os.scandir(pyflintlibdir + '/types') as entry:
         for f in entry:
             if fnmatch.fnmatch(f.name, "*.pxd"):
                 with open(f.path) as pxd:
                     for t in get_cython_struct_types(pxd):
-                        import_dict[t] = f.name.split('.')[0]
+                        import_dict[t] = 'types.' + f.name.split('.')[0]
 
-    with os.scandir(pyflintlibdir + '/types') as entry:
+    with os.scandir(pyflintlibdir + '/functions') as entry:
         for f in entry:
             if fnmatch.fnmatch(f.name, "*.pxd"):
                 with open(f.path) as pxd:
                     for t in get_cython_struct_types(pxd):
-                        import_dict[t] = 'types.' + f.name.split('.')[0]
+                        import_dict[t] = 'functions.' + f.name.split('.')[0]
 
 def undecorate(str):
     """