- PQ+ 'within' supported again
- PQ+ 'meta' deactivated in favour of virtual collections
diff --git a/src/main/antlr/poliqarpplus/PoliqarpPlusLexer.g4 b/src/main/antlr/poliqarpplus/PoliqarpPlusLexer.g4
index d34475a..af9b644 100644
--- a/src/main/antlr/poliqarpplus/PoliqarpPlusLexer.g4
+++ b/src/main/antlr/poliqarpplus/PoliqarpPlusLexer.g4
@@ -35,6 +35,7 @@
RELATION_OP : ('dominates' | 'relatesTo');
MATCH_OP : ('focus' | 'shrink' | 'split'); // submatch and shrink are deprecated!
SUBMATCH_OP : 'submatch';
+WITHIN : 'within';
META : 'meta';
/*
diff --git a/src/main/antlr/poliqarpplus/PoliqarpPlusParser.g4 b/src/main/antlr/poliqarpplus/PoliqarpPlusParser.g4
index dc876d9..0d08192 100644
--- a/src/main/antlr/poliqarpplus/PoliqarpPlusParser.g4
+++ b/src/main/antlr/poliqarpplus/PoliqarpPlusParser.g4
@@ -212,6 +212,9 @@
: segment | sequence | disjunction
;
+within
+: WITHIN WORD
+;
/**
=== META section ===
@@ -225,4 +228,4 @@
Entry point for all requests. Linguistic query is obligatory, metadata filtering
is optional.
*/
-request : query meta? EOF;
\ No newline at end of file
+request : query within? meta? EOF;
\ No newline at end of file