preparse 1.0.12__tar.gz → 1.0.14.dev0__tar.gz

{preparse-1.0.12/src/preparse.egg-info → preparse-1.0.14.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: preparse
-Version: 1.0.12
+Version: 1.0.14.dev0
 Summary: This project preparses args for further parsing later on.
 Author-email: Johannes <johannes.programming@gmail.com>
 License: The MIT License (MIT)
@@ -28,7 +28,7 @@ Project-URL: Download, https://pypi.org/project/preparse/#files
 Project-URL: Index, https://pypi.org/project/preparse/
 Project-URL: Source, https://github.com/johannes-programming/preparse/
 Project-URL: Website, https://preparse.johannes-programming.online/
-Classifier: Development Status :: 5 - Production/Stable
+Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent

{preparse-1.0.12 → preparse-1.0.14.dev0}/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
     { email = "johannes.programming@gmail.com", name = "Johannes" },
 ]
 classifiers = [
-    "Development Status :: 5 - Production/Stable",
+    "Development Status :: 3 - Alpha",
     "License :: OSI Approved :: MIT License",
     "Natural Language :: English",
     "Operating System :: OS Independent",
@@ -34,7 +34,7 @@ keywords = []
 name = "preparse"
 readme = "README.rst"
 requires-python = ">=3.11"
-version = "1.0.12"
+version = "1.0.14.dev0"
 
 [project.license]
 file = "LICENSE.txt"

{preparse-1.0.12 → preparse-1.0.14.dev0}/src/preparse/_processing/digesting.py

@@ -2,7 +2,6 @@ from typing import *
 
 from preparse._items.Bundle import Bundle
 from preparse._items.Item import Item
-from preparse._items.Long import Long
 from preparse._items.Option import Option
 from preparse._items.Positional import Positional
 from preparse._items.Special import Special
@@ -17,17 +16,13 @@ def digest(
     *,
     allowslong: bool,
     bundling: Tuning,
-    expandsabbr: bool,
     expectsposix: bool,
     reconcilesorders: bool,
     special: Tuning,
 ) -> list[Item]:
     ans: list[Item]
     ans = list(items)
-    ans = digest_abbr(
-        ans,
-        expandsabbr=expandsabbr,
-    )
+
     ans = digest_special(
         ans,
         expectsposix=expectsposix,
@@ -47,22 +42,6 @@ def digest(
     return ans
 
 
-def digest_abbr(
-    items: list[Item],
-    *,
-    expandsabbr: bool,
-) -> list[Item]:
-    ans: list[Item]
-    item: Item
-    ans = list(items)
-    if not expandsabbr:
-        return ans
-    for item in ans:
-        if isinstance(item, Long):
-            item.abbrlen = None
-    return ans
-
-
 def digest_bundling(
     items: list[Item],
     *,

{preparse-1.0.12 → preparse-1.0.14.dev0}/src/preparse/_processing/parsing.py

@@ -66,6 +66,7 @@ def parse_generator(
     *,
     allowslong: bool,
     allowsshort: bool,
+    expandsabbr: bool,
     expectsabbr: bool,
     expectsposix: bool,
     optdict: dict,
@@ -105,6 +106,7 @@ def parse_generator(
             allowslong=allowslong,
             allowsshort=allowsshort,
             cause=cause,
+            expandsabbr=expandsabbr,
             expectsabbr=expectsabbr,
             optdict=optdict,
         )
@@ -137,6 +139,7 @@ def parse_long(
     arg: str,
     *,
     cause: FunctionType,
+    expandsabbr: bool,
     expectsabbr: bool,
     optdict: dict,
 ) -> Long:
@@ -149,11 +152,8 @@ def parse_long(
         ans.right = parts.pop()
     ans.abbrlen = len(ans.fullkey)
     if ans.fullkey in optdict.keys():
-        ans.nargs = optdict[ans.fullkey]
-        if (ans.nargs == Nargs.NO_ARGUMENT) and (ans.right is not None):
-            cause(PUAW, option=ans.fullkey)
-        return ans
-    if expectsabbr:
+        parts = [ans.fullkey]
+    elif expectsabbr:
         parts = parse_long_startswith(ans.abbr, keys=optdict.keys())
     else:
         parts = list()  # can be assumed
@@ -166,6 +166,8 @@ def parse_long(
         cause(PAOW, option=arg, possibilities=parts)
         return ans
     (ans.fullkey,) = parts
+    if expandsabbr:
+        ans.abbrlen = len(ans.fullkey)
     ans.nargs = optdict[ans.fullkey]
     if (ans.nargs == Nargs.NO_ARGUMENT) and (ans.right is not None):
         cause(PUAW, option=ans.fullkey)
@@ -190,6 +192,7 @@ def parse_option(
     arg: str,
     *,
     cause: FunctionType,
+    expandsabbr: bool,
     expectsabbr: bool,
     optdict: dict,
     **kwargs: Any,
@@ -198,6 +201,7 @@ def parse_option(
         return parse_long(
             arg,
             cause=cause,
+            expandsabbr=expandsabbr,
             expectsabbr=expectsabbr,
             optdict=optdict,
         )

{preparse-1.0.12 → preparse-1.0.14.dev0/src/preparse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: preparse
-Version: 1.0.12
+Version: 1.0.14.dev0
 Summary: This project preparses args for further parsing later on.
 Author-email: Johannes <johannes.programming@gmail.com>
 License: The MIT License (MIT)
@@ -28,7 +28,7 @@ Project-URL: Download, https://pypi.org/project/preparse/#files
 Project-URL: Index, https://pypi.org/project/preparse/
 Project-URL: Source, https://github.com/johannes-programming/preparse/
 Project-URL: Website, https://preparse.johannes-programming.online/
-Classifier: Development Status :: 5 - Production/Stable
+Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent

{preparse-1.0.12 → preparse-1.0.14.dev0}/src/preparse/_processing/__init__.py

@@ -34,6 +34,7 @@ def process(
         items,
         allowslong=allowslong,
         allowsshort=allowsshort,
+        expandsabbr=expandsabbr,
         expectsabbr=expectsabbr,
         expectsposix=expectsposix,
         optdict=optdict,
@@ -44,7 +45,6 @@ def process(
         items,
         allowslong=allowslong,
         bundling=bundling,
-        expandsabbr=expandsabbr,
         expectsposix=expectsposix,
         reconcilesorders=reconcilesorders,
         special=special,