Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/rxm.git

Made strings a lexer rule to avoid skipping spaces within.

AuthorDave Jarvis <email>
Date2015-03-16 09:49:40 GMT-0700
Commit3766403e96d1792f97a3a72554fe16db892484a8
Parent4a83eac
source/grammar/Query.g
T_NULL : 'null' ;
+T_STRING: '\'' (~'\'' | '\'\'')* '\'' ;
+
/* Define skippable tokens. */
T_WS: [ \t\r\n]+ -> skip ;
exprParameter : T_EXPR_PARAMETER T_ID ;
-literal : literalNull | literalString | literalFloat ;
-
-literalNull : T_NULL ;
-literalString : '\'' (~'\'' | '\'\'')* '\'' ;
-literalFloat : T_FLOAT ;
+literal : T_NULL | T_STRING | T_FLOAT ;
test/where.rxm
.id > @pk,
;
-(person.id = $id) ||
+((person.id = $id) ||
(person.id <> $id) ||
(person.id = {$id, 42}) ||
(person.id <> {$id, 42}) ||
(person.id = null) ||
(person.id <> null) ||
-(person.id = 'text') &&
-(person.id = -42.0) ||
+(person.id = '"string test"')) &&
+((person.id = -42.0) ||
(person.id < 42) ||
(person.id > 42) ||
(person.id <= 42) ||
-(person.id >= 42)
+(person.id >= 42))
Delta7 lines added, 9 lines removed, 2-line decrease