Revert "CQL: accept relations "within", "encloses""

This reverts commit e4e5f0bfaa1fcb5eb12cc37df216352df226b01e.

diff --git a/src/cql.y b/src/cql.y
index ea828dc..d1d5d1b 100644 (file)
--- a/src/cql.y
+++ b/src/cql.y
@@ -390,10 +390,6 @@ int yylex(YYSTYPE *lval, void *vp)
            relation_like = 1;
        if (!cql_strcmp(lval->buf, "adj"))
            relation_like = 1;
            relation_like = 1;
        if (!cql_strcmp(lval->buf, "adj"))
            relation_like = 1;

-       if (!cql_strcmp(lval->buf, "within"))
-           relation_like = 1;
-       if (!cql_strcmp(lval->buf, "encloses"))
-           relation_like = 1;

        if (relation_like)
            return PREFIX_NAME;
     }
        if (relation_like)
            return PREFIX_NAME;
     }