Add expectations to lexer

This commit is contained in:
Yoshi Askharoun
2024-02-04 18:51:17 -06:00
parent 1b1148bd58
commit 88ec3a0ccf
+6 -6
View File
@@ -33,7 +33,7 @@ public static class Lexer
var identifierResult = Parse.Letter.AtLeastOnce().Text().Invoke(input); var identifierResult = Parse.Letter.AtLeastOnce().Text().Invoke(input);
if (!identifierResult.WasSuccessful) if (!identifierResult.WasSuccessful)
return Result.Failure<Instruction>(input, "Invalid code", System.Array.Empty<string>()); return Result.Failure<Instruction>(input, "Invalid code", []);
input = identifierResult.Remainder; input = identifierResult.Remainder;
var identifier = identifierResult.Value; var identifier = identifierResult.Value;
@@ -73,12 +73,12 @@ public static class Lexer
var importDirectiveResult = Parse.String(".import-")(input); var importDirectiveResult = Parse.String(".import-")(input);
input = importDirectiveResult.Remainder; input = importDirectiveResult.Remainder;
if (!importDirectiveResult.WasSuccessful) if (!importDirectiveResult.WasSuccessful)
return Result.Failure<IImport>(input, "Invalid import directive", null); return Result.Failure<IImport>(input, "Invalid import directive", ["Expected '.import'"]);
var importTypeResult = Parse.Letter.AtLeastOnce().Text()(input); var importTypeResult = Parse.Letter.AtLeastOnce().Text()(input);
input = importTypeResult.Remainder; input = importTypeResult.Remainder;
if (!importTypeResult.WasSuccessful) if (!importTypeResult.WasSuccessful)
return Result.Failure<IImport>(input, "Invalid import type", null); return Result.Failure<IImport>(input, "Invalid import type", ["Expected 'ns'"]);
IImport import; IImport import;
switch (importTypeResult.Value.ToUpperInvariant()) switch (importTypeResult.Value.ToUpperInvariant())
@@ -87,20 +87,20 @@ public static class Lexer
var uriResult = Uri.Token()(input); var uriResult = Uri.Token()(input);
input = uriResult.Remainder; input = uriResult.Remainder;
if (!uriResult.WasSuccessful) if (!uriResult.WasSuccessful)
return Result.Failure<IImport>(input, "Invalid URI", null); return Result.Failure<IImport>(input, "Invalid URI", ["Expected a valid URI"]);
input = Parse.String("as").Token()(input).Remainder; input = Parse.String("as").Token()(input).Remainder;
var nameResult = AlphanumericText(input); var nameResult = AlphanumericText(input);
input = nameResult.Remainder; input = nameResult.Remainder;
if (!nameResult.WasSuccessful) if (!nameResult.WasSuccessful)
return Result.Failure<IImport>(input, "Invalid namespace alias", null); return Result.Failure<IImport>(input, "Invalid namespace alias", ["Expected a valid namespace alias"]);
import = new NamespaceImport(uriResult.Value, nameResult.Value); import = new NamespaceImport(uriResult.Value, nameResult.Value);
break; break;
default: default:
return Result.Failure<IImport>(input, $"Unknown import type '{importTypeResult.Value}'", null); return Result.Failure<IImport>(input, $"Unknown import type '{importTypeResult.Value}'", ["Expected 'ns'"]);
} }
return Result.Success(import, input); return Result.Success(import, input);