Update to support savonet/liquidsoap#3498

savonet · Oct 31, 2023 · 29ff9e3 · 29ff9e3
1 parent 6831896
commit 29ff9e3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -15,6 +15,7 @@ export const LiquidsoapLanguage = LRLanguage.define({
         "LabeledArgument/...": t.labelName,
         Integer: t.integer,
         Float: t.float,
+        Minus: t.integer,
         Regexp: t.regexp,
         EscapedChar: t.escape,
         Op: t.operatorKeyword,

diff --git a/src/liquidsoap.grammar b/src/liquidsoap.grammar
@@ -1,6 +1,7 @@
 @context noUminus from "./tokens.js"
 
 @precedence {
+  uminus,
   blockComment @right
   include @left
   stringInterpolation @right
@@ -37,14 +38,6 @@ cop<term> { ControlOperator { Op { term } } }
 aop<term> { ArithmeticOperator { Op { term } } }
 defined<term> { Defined { term } }
 
-Integer {
-  uminus? integer
-}
-
-Float {
-  uminus? float
-}
-
 Var {
   var
 }
@@ -649,7 +642,7 @@ op {
 Infix { expr op expr }
 
 Minus {
-  uminus "(" expr ")"
+  !uminus uminus expr
 }
 
 expr {
@@ -704,7 +697,7 @@ BlockComment {
 }
 
 @external tokens varTok from "./tokens" { var, varLpar, varLbra }
-@external tokens floatTok from "./tokens" { float }
+@external tokens floatTok from "./tokens" { Float }
 @external tokens uminusTok from "./tokens" { uminus }
 
 @tokens {
@@ -719,8 +712,8 @@ BlockComment {
   @precedence { "%include", encoderName }
   @precedence { "%include_extra", encoderName }
   @precedence { encoderName, bin2 }
-  @precedence { Version, integer }
-  @precedence { TimePredicate, integer }
+  @precedence { Version, Integer }
+  @precedence { TimePredicate, Integer }
   @precedence { regexpContentToken, RegexpEnd }
   @precedence { "\"", doubleQuoteStringContentToken }
   @precedence { "#{", doubleQuoteStringContentToken } 
@@ -767,7 +760,7 @@ BlockComment {
   bin3 {
     "/" | "*." | "/." | "*" | "mod"
   }
-  integer {
+  Integer {
     $[0-9] $[0-9_]* | "0" $[xX] $[0-9a-fA-F_]+ | "0" $[oO] $[0-7_]+
   }
   Version {

diff --git a/src/tokens.js b/src/tokens.js
@@ -1,5 +1,5 @@
 import { ExternalTokenizer, ContextTracker } from "@lezer/lr";
-import { _var, varLpar, varLbra, uminus, float } from "./parser.terms.js";
+import { _var, varLpar, varLbra, uminus, Float } from "./parser.terms.js";
 
 const whiteSpace = /[ \t]/;
 
@@ -29,7 +29,7 @@ const keywords = [
   "or",
   "mod",
   "true",
-  "false"
+  "false",
 ];
 
 export const noUminus = new ContextTracker({
@@ -152,7 +152,7 @@ export const floatTok = new ExternalTokenizer((input, stack) => {
 
   if (hasPrefix && whiteSpace.test(String.fromCharCode(input.peek(1)))) {
     stack.context.disabled = true;
-    input.acceptToken(float);
+    input.acceptToken(Float);
     return;
   }
 
@@ -175,7 +175,7 @@ export const floatTok = new ExternalTokenizer((input, stack) => {
   }
 
   stack.context.disabled = true;
-  input.acceptToken(float);
+  input.acceptToken(Float);
   return;
 });
 
@@ -188,8 +188,11 @@ export const uminusTok = new ExternalTokenizer(
       prev = input.peek(pos);
     }
 
-    if (String.fromCharCode(prev) === ")") stack.context.disabled = true;
-    if (/[,=(]/.test(String.fromCharCode(prev))) stack.context.disabled = false;
+    if (["}", ")"].includes(String.fromCharCode(prev)))
+      stack.context.disabled = true;
+    if (/[0-9]/.test(String.fromCharCode(prev))) stack.context.disabled = true;
+    if (/[,=(.+-/*]/.test(String.fromCharCode(prev)))
+      stack.context.disabled = false;
     if (keywords.includes(previousKeyword(input, 0)))
       stack.context.disabled = false;