Changed filename.

KN4CK3R · KN4CK3R · commit d2ccf63f6832 · 2019-04-16T09:54:14.000+02:00
Changed class name.
diff --git a/ReClass.NET/AddressParser/Parser.cs b/ReClass.NET/AddressParser/Parser.cs
@@ -3,11 +3,11 @@
 
 namespace ReClassNET.AddressParser
 {
-	public class ExpressionParser
+	public class Parser
 	{
 		private readonly Tokenizer tokenizer;
 
-		public ExpressionParser(Tokenizer tokenizer)
+		public Parser(Tokenizer tokenizer)
 		{
 			this.tokenizer = tokenizer;
 		}
@@ -190,7 +190,7 @@ public static IExpression Parse(string str)
 
 		public static IExpression Parse(Tokenizer tokenizer)
 		{
-			var parser = new ExpressionParser(tokenizer);
+			var parser = new Parser(tokenizer);
 			return parser.ParseExpression();
 		}
 
diff --git a/ReClass.NET/AddressParser/Tokenizer.cs b/ReClass.NET/AddressParser/Tokenizer.cs
@@ -71,6 +71,8 @@ public void ReadNextToken()
 			{
 				return;
 			}
+
+			throw new ParseException($"Invalid character '{currentCharacter}'.");
 		}
 
 		private void ReadNextCharacter()
diff --git a/ReClass.NET/Memory/RemoteProcess.cs b/ReClass.NET/Memory/RemoteProcess.cs
@@ -720,7 +720,7 @@ public IntPtr ParseAddress(string addressFormula)
 
 			if (!formulaCache.TryGetValue(addressFormula, out var func))
 			{
-				var expression = ExpressionParser.Parse(addressFormula);
+				var expression = Parser.Parse(addressFormula);
 
 				func = DynamicCompiler.CompileAddressFormula(expression);
 
diff --git a/ReClass.NET/ReClass.NET.csproj b/ReClass.NET/ReClass.NET.csproj
@@ -140,9 +140,9 @@
     <Compile Include="AddressParser\Interpreter.cs" />
     <Compile Include="AddressParser\Expressions.cs" />
     <Compile Include="AddressParser\ParseException.cs" />
-    <Compile Include="AddressParser\ExpressionParser.cs" />
+    <Compile Include="AddressParser\Parser.cs" />
     <Compile Include="AddressParser\Token.cs" />
-    <Compile Include="AddressParser\TokenReader.cs" />
+    <Compile Include="AddressParser\Tokenizer.cs" />
     <Compile Include="CodeGenerator\Language.cs" />
     <Compile Include="Core\CoreFunctionsManager.cs" />
     <Compile Include="Core\DataExchange.cs" />

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@`
`3`	`3`
`4`	`4`	`namespace ReClassNET.AddressParser`
`5`	`5`	`{`
`6`		`- public class ExpressionParser`
	`6`	`+ public class Parser`
`7`	`7`	`{`
`8`	`8`	`private readonly Tokenizer tokenizer;`
`9`	`9`
`10`		`- public ExpressionParser(Tokenizer tokenizer)`
	`10`	`+ public Parser(Tokenizer tokenizer)`
`11`	`11`	`{`
`12`	`12`	`this.tokenizer = tokenizer;`
`13`	`13`	`}`
`@@ -190,7 +190,7 @@ public static IExpression Parse(string str)`
`190`	`190`
`191`	`191`	`public static IExpression Parse(Tokenizer tokenizer)`
`192`	`192`	`{`
`193`		`- var parser = new ExpressionParser(tokenizer);`
	`193`	`+ var parser = new Parser(tokenizer);`
`194`	`194`	`return parser.ParseExpression();`
`195`	`195`	`}`
`196`	`196`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ public void ReadNextToken()`
`71`	`71`	`{`
`72`	`72`	`return;`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+ throw new ParseException($"Invalid character '{currentCharacter}'.");`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`private void ReadNextCharacter()`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ public IntPtr ParseAddress(string addressFormula)`
`720`	`720`
`721`	`721`	`if (!formulaCache.TryGetValue(addressFormula, out var func))`
`722`	`722`	`{`
`723`		`- var expression = ExpressionParser.Parse(addressFormula);`
	`723`	`+ var expression = Parser.Parse(addressFormula);`
`724`	`724`
`725`	`725`	`func = DynamicCompiler.CompileAddressFormula(expression);`
`726`	`726`