Removed distances. Empty tokens are treated as normal tokens.
Change-Id: I15d3b8b9bc92f6ffd92fbc545ac371dffc965ef1
diff --git a/src/main/antlr/poliqarpplus/PoliqarpPlusParser.g4 b/src/main/antlr/poliqarpplus/PoliqarpPlusParser.g4
index 571cf12..9a597ca 100644
--- a/src/main/antlr/poliqarpplus/PoliqarpPlusParser.g4
+++ b/src/main/antlr/poliqarpplus/PoliqarpPlusParser.g4
@@ -9,7 +9,9 @@
}
/*
-- author: Joachim Bingel
- -- date: 14-06-27
+ -- date: 06-27-06-2014
+
+ -- updated: 26-10-2016 (margaretha)
Poliqarp Query Language parser
@@ -191,18 +193,16 @@
| submatch
| relation
| LRPAREN segment RRPAREN
+ | emptyTokenSequence
+ | emptyTokenSequenceClass
)
repetition?
;
sequence
-: segment* (emptyTokenSequence|emptyTokenSequenceClass) // ordering important! this subrule must precede any 'distance'-subrules to give precedence to repetition-interpretation of numbers in braces (could be mistaken for number tokens in spanclass), e.g. {2}.
-| (emptyTokenSequence|emptyTokenSequenceClass) (segment+ | sequence) (emptyTokenSequence|emptyTokenSequenceClass)?
-| alignment segment* // give precedence to this subrule over the next to make sure preceding segments come into 'alignment'
+: alignment segment* // give precedence to this subrule over the next to make sure preceding segments come into 'alignment'
| segment+ alignment segment*
-| segment segment+
-| segment (distance|emptyTokenSequenceClass) segment
-| segment (distance|emptyTokenSequenceClass)? sequence
+| segment segment+
//| alignment (segment|sequence) alignment?
;