Better.

savonet · May 19, 2024 · a10d5ea · a10d5ea
1 parent 243ed78
commit a10d5ea
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/src/liquidsoap.grammar b/src/liquidsoap.grammar
@@ -387,11 +387,9 @@ ContentArgType {
   String |
   Integer |
   Float |
-  ExpFloat |
   Var "=" Var |
   Var "=" String |
   Var "=" Integer |
-  Var "=" ExpFloat |
   Var "=" Float
 }
 
@@ -461,7 +459,7 @@ IfEncoder {
 }
 
 IfVersion {
-  kw<"%ifversion"> (cop<"=="> | cop<">="> | cop<"<="> | cop<">"> | cop<"<">) (Integer | ExpFloat | Float | Version) exprs (kw<"%else"> exprs)? kw<"%endif">
+  kw<"%ifversion"> (cop<"=="> | cop<">="> | cop<"<="> | cop<">"> | cop<"<">) (Integer | Float | Version) exprs (kw<"%else"> exprs)? kw<"%endif">
 }
 
 innerListSpread {
@@ -669,7 +667,6 @@ expr {
   Not |
   Bool |
   Float |
-  ExpFloat |
   Minus |
   String |
   Var |
@@ -728,7 +725,6 @@ BlockComment {
   @precedence { "%include_extra", encoderName }
   @precedence { encoderName, bin2 }
   @precedence { Version, Integer }
-  @precedence { ExpFloat, Integer }
   @precedence { TimePredicate, Integer }
   @precedence { TimeInterval, TimePredicate }
   @precedence { TimeInterval, Integer }
@@ -781,9 +777,6 @@ BlockComment {
   Integer {
     $[0-9] $[0-9_]* | "0" $[xX] $[0-9a-fA-F_]+ | "0" $[oO] $[0-7_]+
   }
-  ExpFloat {
-    $[0-9] $[eE] $[-+]? $[0-9] $[0-9_]*
-  }
   Version {
     $[0-9] $[0-9_]* "." $[0-9] $[0-9_]* "." $[0-9] $[0-9_]*
   }

diff --git a/src/tokens.js b/src/tokens.js
@@ -131,6 +131,22 @@ export const varTok = new ExternalTokenizer((input, stack) => {
   input.acceptToken(_var);
 });
 
+const floatOptExp = (input, stack) => {
+  let next = input.advance();
+  if (String.fromCharCode(next) === "-" || String.fromCharCode(next) === "+")
+    next = input.advance();
+
+  if (!/[0-9_]/.test(String.fromCharCode(next))) return;
+
+  next = input.advance();
+  while (/[0-9_]/.test(String.fromCharCode(next))) {
+    next = input.advance();
+  }
+
+  stack.context.disabled = true;
+  input.acceptToken(Float);
+};
+
 export const floatTok = new ExternalTokenizer((input, stack) => {
   let { next } = input;
   let hasPrefix = false;
@@ -146,6 +162,9 @@ export const floatTok = new ExternalTokenizer((input, stack) => {
     }
   }
 
+  if (String.fromCharCode(next) === "e" || String.fromCharCode(next) === "E")
+    return floatOptExp(input, stack);
+
   if (String.fromCharCode(next) !== ".") {
     return;
   }
@@ -164,6 +183,9 @@ export const floatTok = new ExternalTokenizer((input, stack) => {
     next = input.advance();
   }
 
+  if (String.fromCharCode(next) === "e" || String.fromCharCode(next) === "E")
+    return floatOptExp(input, stack);
+
   let pos = 0;
   next = input.peek(pos);