verify value expressions in strings on compilation

Author: Elektryk-Andrzej

Code/TokenSystem/Tokens/ValueTokens/TextToken.cs

@@ -14,7 +14,18 @@ protected override IParseResult InternalParse(Script scr)
         {
             return new Ignore();
         }
-        
+
+        if (!TextValue.HasExpression(Slice.Value))
+        {
+            Value = new StaticTextValue(Slice.Value);
+            return new Success();
+        }
+
+        if (TextValue.Lint(Slice.Value, scr).HasErrored(out var error))
+        {
+            return new Error(error);
+        }
+
         Value = new DynamicTextValue(Slice.Value, scr);
         return new Success();
     }

Code/ValueSystem/LiteralValue.cs

@@ -12,7 +12,12 @@ public abstract class LiteralValue : Value
 
     private static Type[]? _subclasses;
     public static Type[] Subclasses => _subclasses ??= typeof(LiteralValue).Assembly.GetTypes()
-        .Where(t => t.IsClass && t is { IsAbstract: false, IsGenericTypeDefinition: false } && typeof(LiteralValue).IsAssignableFrom(t) && typeof(IValueWithProperties).IsAssignableFrom(t))
+        .Where(t => 
+            t.IsClass 
+            && t is { IsAbstract: false, IsGenericTypeDefinition: false } 
+            && typeof(LiteralValue).IsAssignableFrom(t) 
+            && typeof(IValueWithProperties).IsAssignableFrom(t)
+        )
         .ToArray();
 
     /// <summary>

Code/ValueSystem/TextValue.cs

@@ -37,37 +37,56 @@ public static implicit operator string(TextValue value)
 
     [UsedImplicitly]
     public new static string FriendlyName = "text value";
-    
-    public static string ParseValue(string text, Script script) => ExpressionRegex.Replace(text, match =>
+
+    public static TryGet<ExpressionToken?> ParseExpression(string text, Script script)
     {
-        if (match.Value.StartsWith("~")) return match.Value[1..];
+        if (text.StartsWith("~")) return null as ExpressionToken;
 
-        if (Tokenizer.SliceLine(match.Value).HasErrored(out var error, out var slices))
+        if (Tokenizer.SliceLine(text).HasErrored(out var error, out var enumSlices))
         {
-            Log.ScriptWarn(script, error);
-            return "<error>";
+            return error;
         }
 
-        if (slices.FirstOrDefault() is not CollectionSlice { Type: CollectionBrackets.Curly } collection)
+        if (enumSlices.ToArray() is not [CollectionSlice { Type: CollectionBrackets.Curly } collection])
         {
-            throw new AndrzejFuckedUpException();
+            return "Parsing failed";
         }
 
         // ReSharper disable once DuplicatedSequentialIfBodies
         if (ExpressionToken.TryParse(collection, script).HasErrored(out error, out var token))
         {
-            Log.ScriptWarn(script, error);
-            return "<error>";
+            return error;
         }
 
-        if (((BaseToken)token).TryGet<LiteralValue>().HasErrored(out error, out var value))
+        return token;
+    }
+    
+    public static bool HasExpression(string text) => ExpressionRegex.IsMatch(text);
+    
+    public static string ParseValue(string text, Script script) => ExpressionRegex.Replace(text, match =>
+    {
+        if (ParseExpression(match.Value, script).HasErrored(out var error, out var token) 
+            || ((BaseToken)token).TryGet<LiteralValue>().HasErrored(out error, out var value))
         {
             Log.ScriptWarn(script, error);
             return "<error>";
         }
-            
+
         return value.StringRep;
     });
+    
+    public static Result Lint(string text, Script script)
+    {
+        foreach (var match in ExpressionRegex.Matches(text).Cast<Match>())
+        {
+            if (ParseExpression(match.Value, script).HasErrored(out var error, out var token))
+            {
+                return error;
+            }
+        }
+
+        return true;
+    }
 
     private class Prop<T>(Func<TextValue, T> handler, string? description)
         : IValueWithProperties.PropInfo<TextValue, T>(handler, description) where T : Value;

Example Scripts/chaosCoin.ser

@@ -178,10 +178,10 @@ if $effect is 9
 
     # we can teleport @swapPlayer directly to @evPlayer
     TPPlayer @swapPlayer @evPlayer 
-    Broadcast @swapPlayer 5s "{$baseText}You have swapped places with {@evPlayer name}"
+    Broadcast @swapPlayer 5s "{$baseText}You have swapped places with {@evPlayer -> name}"
 
     # because @swapPlayer is in the same place as @evPlayer, we need to use the saved values to teleport
     TPPosition @evPlayer $swapX $swapY $swapZ
-    Broadcast @evPlayer 5s "{$baseText}You have swapped places with {@swapPlayer name}"
+    Broadcast @evPlayer 5s "{$baseText}You have swapped places with {@swapPlayer -> name}"
     stop
 end

Example Scripts/killStreak.ser

@@ -13,9 +13,9 @@ if {VarExists @evAttacker} is true
 
     # announce milestone
     if $new is 5
-        Broadcast @all 5s "{@evAttacker name} is on a KILLING SPREE (5 Kills)!"
+        Broadcast @all 5s "{@evAttacker -> name} is on a KILLING SPREE (5 Kills)!"
     elif $new is 10
-        Broadcast @all 5s "{@evAttacker name} is UNSTOPPABLE (10 Kills)!"
+        Broadcast @all 5s "{@evAttacker -> name} is UNSTOPPABLE (10 Kills)!"
     end
 end