Fixed issues with special chars in labels

Author: AtomCrafty

src/Yuka.Cli/Yuka.Cli.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>-vw unpack "S:\Games\Visual Novels\AkaSaka\data01.ykc"</StartArguments>
+    <StartArguments>-vw pack "S:\Games\Visual Novels\AkaSaka\data01"</StartArguments>
   </PropertyGroup>
 </Project>

src/Yuka.Core/Script/Data/DataElement.cs

@@ -62,7 +62,7 @@ public Ctrl(ScriptValue.Str name) : base(DataElementType.Ctrl) {
 			public override string DisplayInfo => $"{base.DisplayInfo} [{Name}]";
 
 			// the # is interpreted as a comment, so replace it with _
-			public override string ToString() => ':' + Name.StringValue.Replace('#', '_');
+			public override string ToString() => ':' + Name.StringValue.EscapeIdentifier();
 		}
 
 		public sealed class CInt : DataElement {

src/Yuka.Core/Script/Data/ScriptValue.cs

@@ -1,4 +1,6 @@
-namespace Yuka.Script.Data {
+using System.Linq;
+
+namespace Yuka.Script.Data {
 	public abstract class ScriptValue {
 		public class Int : ScriptValue {
 			public int IntValue;
@@ -19,6 +21,7 @@ public class Str : ScriptValue {
 			public Str(string value) {
 				StringValue = value;
 			}
+
 			public override string ToString() => StringValue;
 		}
 	}

src/Yuka.Core/Script/Decompiler.cs

@@ -8,6 +8,7 @@
 using Yuka.Script.Syntax;
 using Yuka.Script.Syntax.Expr;
 using Yuka.Script.Syntax.Stmt;
+using Yuka.Util;
 
 namespace Yuka.Script {
 
@@ -143,7 +144,7 @@ protected Expression ToExpression(DataElement element) {
 			switch(element) {
 
 				case DataElement.Ctrl ctrl:
-					return new JumpLabelExpr { LabelStmt = new JumpLabelStmt { Name = ctrl.Name.StringValue } };
+					return new JumpLabelExpr { LabelStmt = new JumpLabelStmt { Name = ctrl.Name.StringValue.EscapeIdentifier() } };
 
 				case DataElement.CInt cint when cint.Value.IsPointer:
 					return new PointerLiteral { PointerId = cint.Value.PointerId };
@@ -228,7 +229,7 @@ protected Statement ReadStatement() {
 					if(label.Name == "{") {
 						return ReadBlockStatement();
 					}
-					return new JumpLabelStmt { Name = label.Name };
+					return new JumpLabelStmt { Name = label.Name.EscapeIdentifier() };
 
 				case CallInstruction func:
 

src/Yuka.Core/Script/Source/Lexer.cs

@@ -8,7 +8,7 @@
 namespace Yuka.Script.Source {
 	public class Lexer : IDisposable {
 
-		protected static readonly char[] OperatorChars = { '+', '-', '*', '/', '=', '<', '>' };
+		protected static readonly char[] OperatorChars = { '+', '-', '*', '/', '%', '=', '<', '>' };
 		protected static readonly Dictionary<char, TokenKind> SingleCharTokens = new Dictionary<char, TokenKind> {
 			{ '$', TokenKind.Dollar       },
 			{ '&', TokenKind.Ampersand    },

src/Yuka.Core/Script/Source/Parser.cs

@@ -94,7 +94,7 @@ public BlockStmt ParseBlockStatement() {
 
 		public JumpLabelStmt ParseJumpLabelStatement() {
 			return new JumpLabelStmt {
-				Name = ConsumeToken(TokenKind.LabelLiteral).Source.TrimStart(':')
+				Name = ConsumeToken(TokenKind.LabelLiteral).Source.TrimStart(':').EscapeIdentifier()
 			};
 		}
 

src/Yuka.Core/Script/Syntax/Stmt/JumpLabelStmt.cs

@@ -1,10 +1,11 @@
 using System.Diagnostics;
+using Yuka.Util;
 
 namespace Yuka.Script.Syntax.Stmt {
 	public class JumpLabelStmt : Statement {
 		public string Name;
 
-		public override string ToString() => $"\n:{Name}";
+		public override string ToString() => $"\n:{Name.EscapeIdentifier()}";
 
 		[DebuggerStepThrough]
 		public override void Accept<T>(ISyntaxVisitor<T> visitor) => visitor.Visit(this);

src/Yuka.Core/Util/Helpers.cs

@@ -137,6 +137,10 @@ public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T> {
 			return val.CompareTo(min) < 0 ? min : val.CompareTo(max) > 0 ? max : val;
 		}
 
+		public static string EscapeIdentifier(this string value) {
+			return string.Concat(value.Select(ch => char.IsLetterOrDigit(ch) ? ch : '_'));
+		}
+
 		public static string Escape(this string value) {
 			return value.Replace(@"\", @"\\").Replace(@"""", @"\""").Replace("\n", @"\n").Replace("\r", @"\r").Replace("\t", @"\t");
 		}