Changeset 6815 for FCS-QL

Timestamp:

11/17/15 12:20:15 (9 years ago)

Author:

Leif-Jöran

Message:

Reverted some temporary test code in lexer/grammar.

Location:

FCS-QL/trunk/src/main/antlr4/eu/clarin/sru/fcs/qlparser

Files:

• FCSLexer.g4 (modified) (2 diffs)
• FCSParser.g4 (modified) (1 diff)

FCS-QL/trunk/src/main/antlr4/eu/clarin/sru/fcs/qlparser/FCSLexer.g4

@@ -29 +29 @@
 AND: '&';
 NOT: '!';
+FWD_SLASH: '/';
 
 OPERATOR
@@ -44 +45 @@
     ;   
 
-FLAGGED_REGEXP
-    : REGEXP '/' REGEXP_FLAG+
-    ;
-
 REGEXP
     : QUOTED_STRING
     ;
 
-fragment REGEXP_FLAG
+REGEXP_FLAG
     : 'i'  /* case-insensitive; Poliqarp/Perl compat */
     | 'I'  /* case-sensitive; Poliqarp compat */

FCS-QL/trunk/src/main/antlr4/eu/clarin/sru/fcs/qlparser/FCSParser.g4

@@ -94 +94 @@
 flagged_regexp
     : REGEXP         # regexp
-    | FLAGGED_REGEXP # flaggedRegexp 
+    | REGEXP FWD_SLASH REGEXP_FLAG+ # flaggedRegexp 
     ;