added operators != and 'not between'

martin-pabst · martin-pabst · commit 941409111b15 · 2025-10-22T08:09:29.000+02:00
diff --git a/src/client/compiler/lexer/Lexer.ts b/src/client/compiler/lexer/Lexer.ts
@@ -41,6 +41,7 @@ export class Lexer {
 
     tokenTypesToMerge: { first: TokenType, second: TokenType, merged: TokenType }[] = [
         { first: TokenType.keywordNotIn, second: TokenType.keywordIn, merged: TokenType.keywordNotIn },
+        { first: TokenType.keywordNot, second: TokenType.keywordBetween, merged: TokenType.keywordNotBetween },
         { first: TokenType.keywordIs, second: TokenType.keywordNot, merged: TokenType.isNot },
         { first: TokenType.isNot, second: TokenType.keywordNull, merged: TokenType.isNotNull },
         { first: TokenType.keywordIs, second: TokenType.keywordNull, merged: TokenType.isNull },
@@ -135,6 +136,17 @@ export class Lexer {
 
         if (specialCharToken != null) {
             switch (specialCharToken) {
+                case TokenType.exclamationMark:
+                    if (this.nextChar == "=") {
+                        this.pushToken(TokenType.notEqual, '!=');
+                        this.next();
+                        this.next();
+                        return;
+                    } else {
+                        this.pushToken(TokenType.exclamationMark, '!');
+                        this.next();
+                        return;
+                    }
                 case TokenType.leftSquareBracket:
                     if (this.nextChar == "]") {
                         this.pushToken(TokenType.leftRightSquareBracket, "[]");
diff --git a/src/client/compiler/lexer/Token.ts b/src/client/compiler/lexer/Token.ts
@@ -60,6 +60,7 @@ export enum TokenType {
     keywordView,
     keywordEnum,
     keywordBetween,
+    keywordNotBetween,
 
     keywordOr,
     keywordAnd,
@@ -152,6 +153,8 @@ export enum TokenType {
     // Comment
     comment,
 
+    exclamationMark, // !
+
     endofSourcecode, // will be generated after sourcecode end
     
     // Program statement types:
@@ -235,6 +238,7 @@ export var TokenTypeReadable: {[tt: number]: string} = {
     [TokenType.keywordView]: "view",
     [TokenType.keywordEnum]: "enum",
     [TokenType.keywordBetween]: "between",
+    [TokenType.keywordNotBetween]: "not between",
 
 
     [TokenType.keywordAnd]: "and",
@@ -339,6 +343,8 @@ export var specialCharList: {[keyword: string]:TokenType} = {
     '{': TokenType.leftCurlyBracket, // {}
     '}': TokenType.rightCurlyBracket,
     
+    '!': TokenType.exclamationMark, // !
+
     // operators
     '.': TokenType.dot, //.
     ',': TokenType.comma, //.
@@ -442,6 +448,7 @@ export var keywordList: {[keyword: string]:TokenType} = {
     "offset": TokenType.keywordOffset,
     "in": TokenType.keywordIn,
     "not in": TokenType.keywordNotIn,
+    "not between": TokenType.keywordNotBetween,
     "like": TokenType.keywordLike,
     "collate": TokenType.keywordCollate,
     "default": TokenType.keywordDefault,
diff --git a/src/client/compiler/parser/Parser.ts b/src/client/compiler/parser/Parser.ts
@@ -21,7 +21,7 @@ export class Parser {
 
     static operatorPrecedence: TokenType[][] = [
         [TokenType.keywordOr], [TokenType.keywordAnd],
-        [TokenType.keywordBetween],
+        [TokenType.keywordBetween, TokenType.keywordNotBetween],
         [TokenType.lower, TokenType.lowerOrEqual, TokenType.greater, TokenType.greaterOrEqual, TokenType.equal, TokenType.notEqual, TokenType.keywordLike],
         [TokenType.concatenation, TokenType.plus, TokenType.minus], [TokenType.multiplication, TokenType.division, TokenType.modulo],
         [TokenType.keywordIn, TokenType.keywordNotIn]
@@ -2103,8 +2103,8 @@ export class Parser {
 
         let first = true;
 
-        if(this.tt == TokenType.keywordBetween){
-            return this.parseBetween(left);
+        if(this.tt == TokenType.keywordBetween || this.tt == TokenType.keywordNotBetween){
+            return this.parseBetween(left, this.tt);
         }
 
         while (first || operators.indexOf(this.tt) >= 0) {
@@ -2137,7 +2137,7 @@ export class Parser {
 
     }
     
-    parseBetween(left: TermNode): TermNode {
+    parseBetween(left: TermNode, tt: TokenType.keywordBetween | TokenType.keywordNotBetween): TermNode {
         let position = this.getCurrentPosition();
         this.nextToken(); // skip "between"
         let secondOperand = this.parseTermBinary(2);
