Fix PDM Parser when it encounters multiple OR lines (#1523)

* initial changes and testing

* fix test file

* identified the true failing cases

* use the right foldl

* fix formatting

Author: zlav

src/Strategy/Python/Util.hs

@@ -15,6 +15,7 @@ import Control.Monad (join)
 import Control.Monad.Identity (Identity)
 import Data.Char qualified as C
 import Data.Foldable (asum, find, for_)
+import Data.List (foldl')
 import Data.Map.Strict qualified as Map
 import Data.String.Conversion (toText)
 import Data.Text (Text)
@@ -257,21 +258,23 @@ requirementParser = specification
           ]
     marker_var :: Parser Text
     marker_var = label "marker_var" $ whitespace *> (env_var <|> fmap toText python_str)
+    marker_expr :: Parser Marker
     marker_expr =
       label "marker_expr" $
         MarkerExpr <$> marker_var <*> marker_op <*> marker_var
           <|> whitespace *> char '(' *> marker_or <* char ')'
 
-    marker_and =
-      label "marker_and" $
-        try (MarkerAnd <$> marker_expr <* whitespace <* string "and" <*> marker_expr)
-          <|> marker_expr
+    marker_and :: Parser Marker
+    marker_and = label "marker_and" $ do
+      first <- marker_expr
+      rest <- many (try $ whitespace *> string "and" *> whitespace *> marker_expr)
+      pure $ foldl' MarkerAnd first rest
 
     marker_or :: Parser Marker
-    marker_or =
-      label "marker_or" $
-        try (MarkerOr <$> marker_and <* whitespace <* string "or" <*> marker_and)
-          <|> marker_and
+    marker_or = label "marker_or" $ do
+      first <- marker_and
+      rest <- many (try $ whitespace *> string "or" *> whitespace *> marker_and)
+      pure $ foldl' MarkerOr first rest
 
     marker = label "marker" marker_or
     quoted_marker = label "quoted_marker" $ char ';' *> whitespace *> marker

test/Pdm/PdmSpec.hs

@@ -71,6 +71,7 @@ spec = do
       -- > └── pluggy 1.0.0 [ required: <2.0,>=0.12 ]
       -- > requests 2.25.1 [ required: ==2.25.1 ]
       -- > ├── certifi 2023.5.7 [ required: >=2017.4.17 ]
+      -- > ├── greenlet 3.1.1 [ required: !=0.4.17 ]
       -- > ├── chardet 4.0.0 [ required: <5,>=3.0.2 ]
       -- > ├── idna 2.10 [ required: <3,>=2.5 ]
       -- > └── urllib3 1.26.16 [ required: <1.27,>=1.21.1 ]
@@ -92,6 +93,7 @@ spec = do
         , iniconfig
         , packaging
         , pluggy
+        , greenlet
         , requests
         , certifi
         , chardet
@@ -104,8 +106,9 @@ spec = do
         , (pytest, iniconfig)
         , (pytest, packaging)
         , (pytest, pluggy)
-        , (requests, certifi)
         , (requests, chardet)
+        , (requests, greenlet)
+        , (requests, certifi)
         , (requests, idna)
         , (requests, urllib3)
         ]
@@ -176,3 +179,6 @@ urllib3 = mkPipProdDep "urllib3@1.26.16"
 
 colorama :: Dependency
 colorama = mkPipDevDep "colorama@0.4.6"
+
+greenlet :: Dependency
+greenlet = mkPipProdDep "greenlet@3.1.1"

test/Pdm/testdata/basic/pdm.lock

@@ -30,6 +30,8 @@ examples =
   , "name; os_name=='a' or os_name=='b'"
   , "name; os_name=='a' and os_name=='b' or os_name=='c'"
   , "name; os_name=='a' and (os_name=='b' or os_name=='c')"
+  , "name; os_name=='a' and (os_name=='b' or os_name=='c' and os_name=='d')"
+  , "name; (os_name=='b' or os_name=='c' and os_name=='d') and os_name=='a'"
   , "name; os_name=='a' or os_name=='b' and os_name=='c'"
   , "name; (os_name=='a' or os_name=='b') and os_name=='c'"
   ]