Added missing arithmetic expressions and tokens.

Author: TiLied

CSharpToJavaScript/CSTOJS.cs

@@ -177,7 +177,7 @@ public StringBuilder GenerateOneFromString(string csstring, List<MetadataReferen
 
 			Assembly? assembly = Assembly.GetEntryAssembly();
 
-			SyntaxTree? _tree = CSharpSyntaxTree.ParseText(csstring);
+			SyntaxTree _tree = CSharpSyntaxTree.ParseText(csstring);
 
 			if(references != null)
 				Generate(_tree, assembly, references);
@@ -204,7 +204,7 @@ public async Task GenerateOneFromStringAsync(string csstring, string? filename =
 
 			Assembly? assembly = Assembly.GetEntryAssembly();
 
-			SyntaxTree? _tree = CSharpSyntaxTree.ParseText(csstring);
+			SyntaxTree _tree = CSharpSyntaxTree.ParseText(csstring);
 
 			if (references != null)
 				Generate(_tree, assembly, references);
@@ -227,7 +227,7 @@ public async Task GenerateOneFromStringAsync(string csstring, string? filename =
 		}
 
 
-		private void Generate(SyntaxTree? tree, Assembly? assembly, List<MetadataReference>? refs = null) 
+		private void Generate(SyntaxTree tree, Assembly? assembly, List<MetadataReference>? refs = null) 
 		{
 			if(_Options.Debug) 
 			{
@@ -510,6 +510,9 @@ private void Generate(SyntaxTree? tree, Assembly? assembly, List<MetadataReferen
 				bool found = false;
 				foreach (MetadataReference resultItem in trueReferences)
 				{
+					if (item.Display == null)
+						continue;
+
 					if (resultItem.Display == item.Display) 
 						found = true;
 				}

CSharpToJavaScript/Walker.cs

@@ -158,7 +158,9 @@ public override void VisitToken(SyntaxToken token)
 				case SyntaxKind.TryKeyword:
 				case SyntaxKind.ThrowKeyword:
 				case SyntaxKind.FinallyKeyword:
-					{
+				case SyntaxKind.CaretToken:
+				case SyntaxKind.CharacterLiteralToken:
+				{
 						VisitLeadingTrivia(token);
 
 						JSSB.Append(token.Text);
@@ -219,31 +221,35 @@ public override void Visit(SyntaxNode? node)
 					case SyntaxKind.UsingDirective:
 						return;
 					case SyntaxKind.FileScopedNamespaceDeclaration:
-						_NameSpaceStr = (node as FileScopedNamespaceDeclarationSyntax).Name.ToString();
-						foreach (MemberDeclarationSyntax member in (node as FileScopedNamespaceDeclarationSyntax).Members)
-						{
-							Visit(member);
-						}
-						if (_Options.Debug)
 						{
-							JSSB.Append("/*");
-							JSSB.Append(node.ToFullString().Replace("*/", ""));
-							JSSB.Append("*/");
+							_NameSpaceStr = (node as FileScopedNamespaceDeclarationSyntax).Name.ToString();
+							foreach (MemberDeclarationSyntax member in (node as FileScopedNamespaceDeclarationSyntax).Members)
+							{
+								Visit(member);
+							}
+							if (_Options.Debug)
+							{
+								JSSB.Append("/*");
+								JSSB.Append(node.ToFullString().Replace("*/", ""));
+								JSSB.Append("*/");
+							}
+							return;
 						}
-						return;
 					case SyntaxKind.NamespaceDeclaration:
-						_NameSpaceStr = (node as NamespaceDeclarationSyntax).Name.ToString();
-						foreach (MemberDeclarationSyntax member in (node as NamespaceDeclarationSyntax).Members)
 						{
-							Visit(member);
-						}
-						if (_Options.Debug)
-						{
-							JSSB.Append("/*");
-							JSSB.Append(node.ToFullString().Replace("*/", ""));
-							JSSB.Append("*/");
+							_NameSpaceStr = (node as NamespaceDeclarationSyntax).Name.ToString();
+							foreach (MemberDeclarationSyntax member in (node as NamespaceDeclarationSyntax).Members)
+							{
+								Visit(member);
+							}
+							if (_Options.Debug)
+							{
+								JSSB.Append("/*");
+								JSSB.Append(node.ToFullString().Replace("*/", ""));
+								JSSB.Append("*/");
+							}
+							return;
 						}
-						return;
 					default:
 						//CSTOJS.Log($"{syntaxKind}");
 						break;
@@ -653,6 +659,7 @@ public override void VisitExpressionStatement(ExpressionStatementSyntax node)
 						case SyntaxKind.MultiplyAssignmentExpression:
 						case SyntaxKind.DivideAssignmentExpression:
 						case SyntaxKind.AwaitExpression:
+						case SyntaxKind.ModuloAssignmentExpression:
 							Visit(asNode);
 							break;
 						default:
@@ -710,6 +717,11 @@ public override void VisitArgument(ArgumentSyntax node)
 						case SyntaxKind.TrueLiteralExpression:
 						case SyntaxKind.StringLiteralExpression:
 						case SyntaxKind.InterpolatedStringExpression:
+						case SyntaxKind.AddAssignmentExpression:
+						case SyntaxKind.SubtractAssignmentExpression:
+						case SyntaxKind.MultiplyAssignmentExpression:
+						case SyntaxKind.DivideAssignmentExpression:
+						case SyntaxKind.ModuloAssignmentExpression:
 							Visit(asNode);
 							break;
 						case SyntaxKind.ObjectCreationExpression:
@@ -2096,6 +2108,14 @@ public override void VisitParenthesizedExpression(ParenthesizedExpressionSyntax
 						case SyntaxKind.CoalesceExpression:
 						case SyntaxKind.LogicalOrExpression:
 						case SyntaxKind.AddExpression:
+						case SyntaxKind.DivideExpression:
+						case SyntaxKind.ModuloExpression:
+						case SyntaxKind.EqualsExpression:
+						case SyntaxKind.GreaterThanExpression:
+						case SyntaxKind.LessThanExpression:
+						case SyntaxKind.GreaterThanOrEqualExpression:
+						case SyntaxKind.LessThanOrEqualExpression:
+						case SyntaxKind.NotEqualsExpression:
 							Visit(asNode);
 							break;
 						case SyntaxKind.AsExpression:
@@ -2134,12 +2154,9 @@ public override void VisitParenthesizedExpression(ParenthesizedExpressionSyntax
 							}
 						case SyntaxKind.CloseParenToken:
 							{
-								if (_IgnoreAsParenthesis) 
-								{
-								
-								}
-								else
+								if (!_IgnoreAsParenthesis)
 									VisitToken(asToken);
+
 								break;
 							}
 						//case SyntaxKind.StringLiteralToken: