Replace ParamList with Group

rdflib/plugins/sparql/parser.py

@@ -27,7 +27,7 @@
 from rdflib.compat import decodeUnicodeEscape
 
 from . import operators as op
-from .parserutils import Comp, Param, ParamList
+from .parserutils import Comp, Param
 
 # from pyparsing import Keyword as CaseSensitiveKeyword
 
@@ -427,9 +427,9 @@ def expandCollection(terms):
 )
 
 # [45] GraphOrDefault ::= 'DEFAULT' | 'GRAPH'? iri
-GraphOrDefault = ParamList("graph", Keyword("DEFAULT")) | Optional(
+GraphOrDefault = Group(Param("graph", Keyword("DEFAULT"))) | Optional(
     Keyword("GRAPH")
-) + ParamList("graph", iri)
+) + Group(Param("graph", iri))
 
 # [65] DataBlockValue ::= iri | RDFLiteral | NumericLiteral | BooleanLiteral | 'UNDEF'
 DataBlockValue = iri | RDFLiteral | NumericLiteral | BooleanLiteral | Keyword("UNDEF")
@@ -466,11 +466,11 @@ def expandCollection(terms):
 # [95] PathNegatedPropertySet ::= PathOneInPropertySet | '(' ( PathOneInPropertySet ( '|' PathOneInPropertySet )* )? ')'
 PathNegatedPropertySet = Comp(
     "PathNegatedPropertySet",
-    ParamList("part", PathOneInPropertySet)
+    Group(Param("part", PathOneInPropertySet))
     | "("
     + Optional(
-        ParamList("part", PathOneInPropertySet)
-        + ZeroOrMore("|" + ParamList("part", PathOneInPropertySet))
+        Group(Param("part", PathOneInPropertySet))
+        + ZeroOrMore("|" + Group(Param("part", PathOneInPropertySet)))
     )
     + ")",
 )
@@ -498,15 +498,16 @@ def expandCollection(terms):
 # [90] PathSequence ::= PathEltOrInverse ( '/' PathEltOrInverse )*
 PathSequence = Comp(
     "PathSequence",
-    ParamList("part", PathEltOrInverse)
-    + ZeroOrMore("/" + ParamList("part", PathEltOrInverse)),
+    Group(Param("part", PathEltOrInverse))
+    + ZeroOrMore("/" + Group(Param("part", PathEltOrInverse))),
 )
 
 
 # [89] PathAlternative ::= PathSequence ( '|' PathSequence )*
 PathAlternative = Comp(
     "PathAlternative",
-    ParamList("part", PathSequence) + ZeroOrMore("|" + ParamList("part", PathSequence)),
+    Group(Param("part", PathSequence))
+    + ZeroOrMore("|" + Group(Param("part", PathSequence))),
 )
 
 # [88] Path ::= PathAlternative
@@ -583,8 +584,8 @@ def expandCollection(terms):
 # To accommodate arbitrary amounts of triples this rule is rewritten to not be
 # recursive:
 # [52*] TriplesTemplate ::= TriplesSameSubject ( '.' TriplesSameSubject? )*
-TriplesTemplate = ParamList("triples", TriplesSameSubject) + ZeroOrMore(
-    Suppress(".") + Optional(ParamList("triples", TriplesSameSubject))
+TriplesTemplate = Group(Param("triples", TriplesSameSubject)) + ZeroOrMore(
+    Suppress(".") + Optional(Group(Param("triples", TriplesSameSubject)))
 )
 
 # [51] QuadsNotTriples ::= 'GRAPH' VarOrIri '{' Optional(TriplesTemplate) '}'
@@ -598,7 +599,7 @@ def expandCollection(terms):
     "Quads",
     Optional(TriplesTemplate)
     + ZeroOrMore(
-        ParamList("quadsNotTriples", QuadsNotTriples)
+        Group(Param("quadsNotTriples", QuadsNotTriples))
         + Optional(Suppress("."))
         + Optional(TriplesTemplate)
     ),
@@ -618,7 +619,7 @@ def expandCollection(terms):
 
 # [55] TriplesBlock ::= TriplesSameSubjectPath ( '.' Optional(TriplesBlock) )?
 TriplesBlock = Forward()
-TriplesBlock <<= ParamList("triples", TriplesSameSubjectPath) + Optional(
+TriplesBlock <<= Group(Param("triples", TriplesSameSubjectPath)) + Optional(
     Suppress(".") + Optional(TriplesBlock)
 )
 
@@ -631,8 +632,8 @@ def expandCollection(terms):
 # [67] GroupOrUnionGraphPattern ::= GroupGraphPattern ( 'UNION' GroupGraphPattern )*
 GroupOrUnionGraphPattern = Comp(
     "GroupOrUnionGraphPattern",
-    ParamList("graph", GroupGraphPattern)
-    + ZeroOrMore(Keyword("UNION") + ParamList("graph", GroupGraphPattern)),
+    Group(Param("graph", GroupGraphPattern))
+    + ZeroOrMore(Keyword("UNION") + Group(Param("graph", GroupGraphPattern))),
 )
 
 
@@ -1000,7 +1001,7 @@ def expandCollection(terms):
     NIL
     | "("
     + Param("distinct", _Distinct)
-    + delimitedList(ParamList("expr", Expression))
+    + delimitedList(Group(Param("expr", Expression)))
     + ")"
 )
 
@@ -1045,8 +1046,8 @@ def expandCollection(terms):
     "MultiplicativeExpression",
     Param("expr", UnaryExpression)
     + ZeroOrMore(
-        ParamList("op", "*") + ParamList("other", UnaryExpression)
-        | ParamList("op", "/") + ParamList("other", UnaryExpression)
+        Group(Param("op", "*")) + Group(Param("other", UnaryExpression))
+        | Group(Param("op", "/")) + Group(Param("other", UnaryExpression))
     ),
 ).setEvalFn(op.MultiplicativeExpression)
 
@@ -1063,8 +1064,8 @@ def expandCollection(terms):
     "AdditiveExpression",
     Param("expr", MultiplicativeExpression)
     + ZeroOrMore(
-        ParamList("op", "+") + ParamList("other", MultiplicativeExpression)
-        | ParamList("op", "-") + ParamList("other", MultiplicativeExpression)
+        Group(Param("op", "+")) + Group(Param("other", MultiplicativeExpression))
+        | Group(Param("op", "-")) + Group(Param("other", MultiplicativeExpression))
     ),
 ).setEvalFn(op.AdditiveExpression)
 
@@ -1099,14 +1100,15 @@ def expandCollection(terms):
 # [112] ConditionalAndExpression ::= ValueLogical ( '&&' ValueLogical )*
 ConditionalAndExpression = Comp(
     "ConditionalAndExpression",
-    Param("expr", ValueLogical) + ZeroOrMore("&&" + ParamList("other", ValueLogical)),
+    Param("expr", ValueLogical)
+    + ZeroOrMore("&&" + Group(Param("other", ValueLogical))),
 ).setEvalFn(op.ConditionalAndExpression)
 
 # [111] ConditionalOrExpression ::= ConditionalAndExpression ( '||' ConditionalAndExpression )*
 ConditionalOrExpression = Comp(
     "ConditionalOrExpression",
     Param("expr", ConditionalAndExpression)
-    + ZeroOrMore("||" + ParamList("other", ConditionalAndExpression)),
+    + ZeroOrMore("||" + Group(Param("other", ConditionalAndExpression))),
 ).setEvalFn(op.ConditionalOrExpression)
 
 # [110] Expression ::= ConditionalOrExpression
@@ -1154,7 +1156,7 @@ def expandCollection(terms):
     "GroupClause",
     Keyword("GROUP")
     + Keyword("BY")
-    + OneOrMore(ParamList("condition", GroupCondition)),
+    + OneOrMore(Group(Param("condition", GroupCondition))),
 )
 
 
@@ -1222,7 +1224,7 @@ def expandCollection(terms):
         Param("delete", DeleteClause) + Optional(Param("insert", InsertClause))
         | Param("insert", InsertClause)
     )
-    + ZeroOrMore(ParamList("using", UsingClause))
+    + ZeroOrMore(Group(Param("using", UsingClause)))
     + Keyword("WHERE")
     + Param("where", GroupGraphPattern),
 )
@@ -1246,17 +1248,22 @@ def expandCollection(terms):
 
 # [63] InlineDataOneVar ::= Var '{' ZeroOrMore(DataBlockValue) '}'
 InlineDataOneVar = (
-    ParamList("var", Var) + "{" + ZeroOrMore(ParamList("value", DataBlockValue)) + "}"
+    Group(Param("var", Var))
+    + "{"
+    + ZeroOrMore(Group(Param("value", DataBlockValue)))
+    + "}"
 )
 
 # [64] InlineDataFull ::= ( NIL | '(' ZeroOrMore(Var) ')' ) '{' ( '(' ZeroOrMore(DataBlockValue) ')' | NIL )* '}'
 InlineDataFull = (
-    (NIL | "(" + ZeroOrMore(ParamList("var", Var)) + ")")
+    (NIL | "(" + ZeroOrMore(Group(Param("var", Var))) + ")")
     + "{"
     + ZeroOrMore(
-        ParamList(
-            "value",
-            Group(Suppress("(") + ZeroOrMore(DataBlockValue) + Suppress(")") | NIL),
+        Group(
+            Param(
+                "value",
+                Group(Suppress("(") + ZeroOrMore(DataBlockValue) + Suppress(")") | NIL),
+            )
         )
     )
     + "}"
@@ -1274,7 +1281,7 @@ def expandCollection(terms):
 
 # [74] ConstructTriples ::= TriplesSameSubject ( '.' Optional(ConstructTriples) )?
 ConstructTriples = Forward()
-ConstructTriples <<= ParamList("template", TriplesSameSubject) + Optional(
+ConstructTriples <<= Group(Param("template", TriplesSameSubject)) + Optional(
     Suppress(".") + Optional(ConstructTriples)
 )
 
@@ -1331,11 +1338,11 @@ def expandCollection(terms):
 # [54] GroupGraphPatternSub ::= Optional(TriplesBlock) ( GraphPatternNotTriples '.'? Optional(TriplesBlock) )*
 GroupGraphPatternSub = Comp(
     "GroupGraphPatternSub",
-    Optional(ParamList("part", Comp("TriplesBlock", TriplesBlock)))
+    Optional(Group(Param("part", Comp("TriplesBlock", TriplesBlock))))
     + ZeroOrMore(
-        ParamList("part", GraphPatternNotTriples)
+        Group(Param("part", GraphPatternNotTriples))
         + Optional(".")
-        + Optional(ParamList("part", Comp("TriplesBlock", TriplesBlock)))
+        + Optional(Group(Param("part", Comp("TriplesBlock", TriplesBlock))))
     ),
 )
 
@@ -1347,7 +1354,7 @@ def expandCollection(terms):
 # [21] HavingClause ::= 'HAVING' HavingCondition+
 HavingClause = Comp(
     "HavingClause",
-    Keyword("HAVING") + OneOrMore(ParamList("condition", HavingCondition)),
+    Keyword("HAVING") + OneOrMore(Group(Param("condition", HavingCondition))),
 )
 
 # [24] OrderCondition ::= ( ( 'ASC' | 'DESC' ) BrackettedExpression )
@@ -1364,7 +1371,7 @@ def expandCollection(terms):
     "OrderClause",
     Keyword("ORDER")
     + Keyword("BY")
-    + OneOrMore(ParamList("condition", OrderCondition)),
+    + OneOrMore(Group(Param("condition", OrderCondition))),
 )
 
 # [26] LimitClause ::= 'LIMIT' INTEGER
@@ -1394,19 +1401,21 @@ def expandCollection(terms):
     + Optional(Param("modifier", Keyword("DISTINCT") | Keyword("REDUCED")))
     + (
         OneOrMore(
-            ParamList(
-                "projection",
-                Comp(
-                    "vars",
-                    Param("var", Var)
-                    | (
-                        Literal("(")
-                        + Param("expr", Expression)
-                        + Keyword("AS")
-                        + Param("evar", Var)
-                        + ")"
+            Group(
+                Param(
+                    "projection",
+                    Comp(
+                        "vars",
+                        Param("var", Var)
+                        | (
+                            Literal("(")
+                            + Param("expr", Expression)
+                            + Keyword("AS")
+                            + Param("evar", Var)
+                            + ")"
+                        ),
                     ),
-                ),
+                )
             )
         )
         | "*"
@@ -1428,7 +1437,7 @@ def expandCollection(terms):
 SelectQuery = Comp(
     "SelectQuery",
     SelectClause
-    + ZeroOrMore(ParamList("datasetClause", DatasetClause))
+    + ZeroOrMore(Group(Param("datasetClause", DatasetClause)))
     + WhereClause
     + SolutionModifier
     + ValuesClause,
@@ -1442,19 +1451,19 @@ def expandCollection(terms):
     Keyword("CONSTRUCT")
     + (
         ConstructTemplate
-        + ZeroOrMore(ParamList("datasetClause", DatasetClause))
+        + ZeroOrMore(Group(Param("datasetClause", DatasetClause)))
         + WhereClause
         + SolutionModifier
         + ValuesClause
-        | ZeroOrMore(ParamList("datasetClause", DatasetClause))
+        | ZeroOrMore(Group(Param("datasetClause", DatasetClause)))
         + Keyword("WHERE")
         + "{"
         + Optional(
             Param(
                 "where",
                 Comp(
                     "FakeGroupGraphPatten",
-                    ParamList("part", Comp("TriplesBlock", TriplesTemplate)),
+                    Group(Param("part", Comp("TriplesBlock", TriplesTemplate))),
                 ),
             )
         )
@@ -1478,7 +1487,7 @@ def expandCollection(terms):
 DescribeQuery = Comp(
     "DescribeQuery",
     Keyword("DESCRIBE")
-    + (OneOrMore(ParamList("var", VarOrIri)) | "*")
+    + (OneOrMore(Group(Param("var", VarOrIri))) | "*")
     + Param("datasetClause", ZeroOrMore(DatasetClause))
     + Optional(WhereClause)
     + SolutionModifier
@@ -1487,8 +1496,8 @@ def expandCollection(terms):
 
 # [29] Update ::= Prologue ( Update1 ( ';' Update )? )?
 Update = Forward()
-Update <<= ParamList("prologue", Prologue) + Optional(
-    ParamList("request", Update1) + Optional(";" + Update)
+Update <<= Group(Param("prologue", Prologue)) + Optional(
+    Group(Param("request", Update1)) + Optional(";" + Update)
 )
 
 

rdflib/plugins/sparql/parserutils.py

@@ -94,8 +94,7 @@ class ParamValue(object):
     All cleverness is in the CompValue
     """
 
-    def __init__(self, name, tokenList, isList):
-        self.isList = isList
+    def __init__(self, name, tokenList):
         self.name = name
         if isinstance(tokenList, (list, ParseResults)) and len(tokenList) == 1:
             tokenList = tokenList[0]
@@ -109,27 +108,15 @@ def __str__(self):
 class Param(TokenConverter):
     """
     A pyparsing token for labelling a part of the parse-tree
-    if isList is true repeat occurrences of ParamList have
-    their values merged in a list
     """
 
-    def __init__(self, name, expr, isList=False):
-        self.isList = isList
+    def __init__(self, name, expr):
         TokenConverter.__init__(self, expr)
         self.setName(name)
         self.addParseAction(self.postParse2)
 
     def postParse2(self, tokenList):
-        return ParamValue(self.name, tokenList, self.isList)
-
-
-class ParamList(Param):
-    """
-    A shortcut for a Param with isList=True
-    """
-
-    def __init__(self, name, expr):
-        Param.__init__(self, name, expr, True)
+        return ParamValue(self.name, tokenList)
 
 
 class CompValue(OrderedDict):
@@ -235,16 +222,14 @@ def postParse(self, instring, loc, tokenList):
                 res["service_string"] = service_string
 
         for t in tokenList:
-            if isinstance(t, ParamValue):
-                if t.isList:
-                    if t.name not in res:
-                        res[t.name] = []
-                    res[t.name].append(t.tokenList)
-                else:
-                    res[t.name] = t.tokenList
-                # res.append(t.tokenList)
-            # if isinstance(t,CompValue):
-            #    res.update(t)
+            if isinstance(t, ParseResults):
+                for i in t:
+                    if isinstance(i, ParamValue):
+                        if i.name not in res:
+                            res[i.name] = []
+                        res[i.name].append(i.tokenList)
+            elif isinstance(t, ParamValue):
+                res[t.name] = t.tokenList
         return res
 
     def setEvalFn(self, evalfn):