So far, the validator was missing some of the function words when checking that they are leaves.

dan-zeman · dan-zeman · commit 1e4debded55e · 2024-09-29T19:09:39.000+02:00
diff --git a/validate.py b/validate.py
@@ -1669,18 +1669,16 @@ def validate_functional_leaves(id, tree):
     """
     Most of the time, function-word nodes should be leaves. This function
     checks for known exceptions and warns in the other cases.
+    (https://universaldependencies.org/u/overview/syntax.html#function-word-modifiers)
     """
     testlevel = 3
     testclass = 'Syntax'
     # This is a level 3 test, we will check only the universal part of the relation.
     deprel = lspec2ud(tree['nodes'][id][DEPREL])
-    if re.match(r"^(case|mark|cc|aux|cop|det|fixed|goeswith|punct)$", deprel):
+    if re.match(r"^(case|mark|cc|aux|cop|det|clf|fixed|goeswith|punct)$", deprel):
         idparent = id
+        pdeprel = deprel
         for idchild in tree['children'][id]:
-            # This is a level 3 test, we will check only the universal part of the relation.
-            pdeprel = lspec2ud(tree['nodes'][idparent][DEPREL])
-            ###!!! We should also check that 'det' does not have children except for a limited set of exceptions!
-            ###!!! (see https://universaldependencies.org/u/overview/syntax.html#function-word-modifiers)
             cdeprel = lspec2ud(tree['nodes'][idchild][DEPREL])
             # The guidelines explicitly say that negation can modify any function word
             # (see https://universaldependencies.org/u/overview/syntax.html#function-word-modifiers).
@@ -1729,14 +1727,14 @@ def validate_functional_leaves(id, tree):
                 testid = 'leaf-mark-case'
                 testmessage = "'%s' not expected to have children (%s:%s:%s --> %s:%s:%s)" % (pdeprel, idparent, tree['nodes'][idparent][FORM], pdeprel, idchild, tree['nodes'][idchild][FORM], cdeprel)
                 warn(testmessage, testclass, testlevel, testid, nodeid=id, lineno=tree['linenos'][idchild])
-            ###!!! The pdeprel regex in the following test should probably include "det".
-            ###!!! I forgot to add it well in advance of release 2.4, so I am leaving it
-            ###!!! out for now, so that people don't have to deal with additional load
-            ###!!! of errors.
             if re.match(r"^(aux|cop)$", pdeprel) and not re.match(r"^(goeswith|fixed|reparandum|conj|cc|punct)$", cdeprel):
                 testid = 'leaf-aux-cop'
                 testmessage = "'%s' not expected to have children (%s:%s:%s --> %s:%s:%s)" % (pdeprel, idparent, tree['nodes'][idparent][FORM], pdeprel, idchild, tree['nodes'][idchild][FORM], cdeprel)
                 warn(testmessage, testclass, testlevel, testid, nodeid=id, lineno=tree['linenos'][idchild])
+            if re.match(r"^(det|clf)$", pdeprel) and not re.match(r"^(goeswith|fixed|reparandum|conj|cc|punct)$", cdeprel):
+                testid = 'leaf-det-clf'
+                testmessage = "'%s' not expected to have children (%s:%s:%s --> %s:%s:%s)" % (pdeprel, idparent, tree['nodes'][idparent][FORM], pdeprel, idchild, tree['nodes'][idchild][FORM], cdeprel)
+                warn(testmessage, testclass, testlevel, testid, nodeid=id, lineno=tree['linenos'][idchild])
             if re.match(r"^(cc)$", pdeprel) and not re.match(r"^(goeswith|fixed|reparandum|conj|punct)$", cdeprel):
                 testid = 'leaf-cc'
                 testmessage = "'%s' not expected to have children (%s:%s:%s --> %s:%s:%s)" % (pdeprel, idparent, tree['nodes'][idparent][FORM], pdeprel, idchild, tree['nodes'][idchild][FORM], cdeprel)
