libdash 0.5.0__tar.gz → 0.5.2__tar.gz

{libdash-0.5.0/libdash.egg-info → libdash-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libdash
-Version: 0.5.0
+Version: 0.5.2
 Summary: Bindings for the dash shell as a library
 Author: PaSh contributors
 Author-email: Michael Greenberg <michael@greenberg.science>

{libdash-0.5.0 → libdash-0.5.2}/libdash/_dash.py

@@ -223,8 +223,8 @@ class strpush (Structure):
 #     struct alias *ap;   /* if push was associated with an alias */
 #     char *string;       /* remember the string since it may change */
 #
-#     /* Remember last two characters for pungetc. */
-#     int lastc[2];
+#     /* Delay freeing so we can stop nested aliases. */
+#     struct strpush *spfree;
 #
 #     /* Number of outstanding calls to pungetc. */
 #     int unget;
@@ -234,7 +234,7 @@ strpush._fields_ = [("prev", POINTER (strpush)),
                     ("prevnleft", c_int),
                     ("ap", c_void_p),
                     ("string", c_char_p),
-                    ("lastc", 2 * c_int),
+                    ("spfree", POINTER (strpush)),
                     ("unget", c_int)];
 
 class parsefile (Structure):
@@ -245,14 +245,18 @@ class parsefile (Structure):
 #     int linno;      /* current line */
 #     int fd;         /* file descriptor (or -1 if string) */
 #     int nleft;      /* number of chars left in this line */
-#     int lleft;      /* number of chars left in this buffer */
+#     int eof;        /* do not read again once we hit EOF */
 #     char *nextc;        /* next char in buffer */
 #     char *buf;      /* input buffer */
 #     struct strpush *strpush; /* for pushing strings at this level */
 #     struct strpush basestrpush; /* so pushing one is fast */
 #
-#     /* Remember last two characters for pungetc. */
-#     int lastc[2];
+#     /* Delay freeing so we can stop nested aliases. */
+#     struct strpush *spfree;
+#
+# #ifndef SMALL
+#     int lleft;      /* number of chars left in this buffer */
+# #endif
 #
 #     /* Number of outstanding calls to pungetc. */
 #     int unget;
@@ -261,12 +265,13 @@ parsefile._fields_ = [("prev",        POINTER (parsefile)),
                       ("linno",       c_int),
                       ("fd",          c_int),
                       ("nleft",       c_int),
-                      ("lleft",       c_int),
+                      ("eof",         c_int),
                       ("nextc",       POINTER (c_char)), # NOT c_char_p!
                       ("buf",         c_char_p),
                       ("strpush",     POINTER (strpush)),
                       ("basestrpush", strpush),
-                      ("lastc",       2 * c_int),
+                      ("spfree",      POINTER (strpush)),
+                      ("lleft",       c_int),
                       ("unget",       c_int)];
 
 

{libdash-0.5.0 → libdash-0.5.2}/libdash/parser.py

@@ -16,7 +16,8 @@ def libdash_library_path():
     LIBDASH_LIBRARY_PATH = os.path.join(FILE_PATH, "libdash.so")
     return LIBDASH_LIBRARY_PATH
 
-EOF_NLEFT = -99; # libdash/src/input.c
+# parsefile->eof bit 1: set by preadbuffer at EOF, never cleared by pungetc.
+PARSEFILE_EOF = 2;
 
 class ParsingException(Exception):
     def __init__(self, message='ParseError'):
@@ -64,7 +65,7 @@ def parse(inputPath, init=True):
         n_ptr_C = parsecmd_safe (libdash, False)
 
         linno_after = parsefile_var.contents.linno - 1; # libdash is 1-indexed
-        nleft_after = parsefile_var.contents.nleft
+        eof_after = parsefile_var.contents.eof
 
         if (n_ptr_C == None): # Dash.Null
             pass
@@ -73,19 +74,18 @@ def parse(inputPath, init=True):
         elif (n_ptr_C == NERR): # Dash.Error
             raise ParsingException()
         else:
-            if (nleft_after == EOF_NLEFT):
-                linno_after = linno_after + 1; # The last line wasn't counted
-
-                if (inputPath != "-"):
-                    ## Both of these assertions check "our" assumption with respect to the final parser state
-                    ## and are therefore not necessary if they become an issue.
-                    assert ((linno_after == len (lines)) or (linno_after == len (lines) + 1))
-
-                    # Last line did not have a newline
-                    assert (len (lines [-1]) > 0 and (lines [-1][-1] != '\n'))
-            elif nleft_after != 0:
-                # we formerly asserted that `nleft_after != 0`, but this no longer holds
-                linno_after = linno_after + 1; # The last line wasn't counted
+            ## dash bumps `linno` on newline, so an unterminated last line is
+            ## never counted. Only adjust at EOF; otherwise every node would
+            ## swallow the next one's first line.
+            if (eof_after & PARSEFILE_EOF):
+                if (inputPath == "-"):
+                    ## no lines to check against; trust the flag
+                    linno_after = linno_after + 1
+                elif (lines and (lines [-1][-1:] != '\n')):
+                    linno_after = len (lines)
+
+            if (inputPath != "-"):
+                linno_after = min (linno_after, len (lines))
 
             n_ptr = cast (n_ptr_C, POINTER (union_node))
             new_ast = of_node (n_ptr)

{libdash-0.5.0 → libdash-0.5.2/libdash.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libdash
-Version: 0.5.0
+Version: 0.5.2
 Summary: Bindings for the dash shell as a library
 Author: PaSh contributors
 Author-email: Michael Greenberg <michael@greenberg.science>

{libdash-0.5.0 → libdash-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "libdash"
-version = "0.5.0"
+version = "0.5.2"
 authors = [
   { name="Michael Greenberg", email="michael@greenberg.science" },
   { name="PaSh contributors" },

{libdash-0.5.0 → libdash-0.5.2}/setup.py

@@ -22,8 +22,6 @@ class libdash_build_py(build_py):
         build_py.run(self)
 
         if sys.platform == 'darwin':
-            libtoolize = "glibtoolize"
-
             target_arch = os.environ.get("ARCHFLAGS")
             build_arch = platform.machine()
             if not target_arch:
@@ -38,19 +36,13 @@ class libdash_build_py(build_py):
             os.environ["LDFLAGS"] = f'{os.environ.get("LDFLAGS", "")} {target_arch}'.strip()
 
             print(f'ARCHFLAGS: {target_arch} MACOSX_DEPLOYMENT_TARGET: {os.environ.get("MACOSX_DEPLOYMENT_TARGET", "")} CFLAGS: {os.environ.get("CFLAGS")} LDFLAGS: {os.environ.get("LDFLAGS")}')
-        else:
-            libtoolize = "libtoolize"
 
         # cibuildwheel builds every wheel in the same source tree; objects
         # left over from a previous build may target a different arch
         if os.path.exists('Makefile'):
             subprocess.run(['make', 'distclean'])
 
-        try_exec(libtoolize)
-        try_exec('aclocal')
-        try_exec('autoheader')
-        try_exec('automake', '--add-missing')
-        try_exec('autoconf')
+        try_exec('autoreconf', '--install', '--force')
         try_exec('./configure')
         try_exec('make')
 
@@ -61,7 +53,7 @@ class libdash_build_py(build_py):
 setup(name='libdash',
       packages=['libdash'],
       cmdclass={'build_py': libdash_build_py},
-      version='0.5.0',
+      version='0.5.2',
       long_description=long_description,
       long_description_content_type='text/markdown',
       include_package_data=True,