zune/ZuneUIXTools
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneUIXTools.git synced 2026-07-27 13:11:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Report line and column numbers for imports

Browse Source
This commit is contained in:
Yoshi Askharoun
2024-07-07 15:35:44 -05:00
parent 2dcf2fa069
commit f074577d6f
2 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/UIX.Asm/Lexer.Imports.cs
+28 -5
View File
@@ -28,6 +28,9 @@ partial class Lexer
if (!importTypeResult.WasSuccessful) if (!importTypeResult.WasSuccessful)
return Result.Failure<IImportDirective>(input, "Invalid import type", ["Expected 'ns'"]); return Result.Failure<IImportDirective>(input, "Invalid import type", ["Expected 'ns'"]);
var line = input.Line;
var col = input.Column;
IImportDirective import; IImportDirective import;
switch (importTypeResult.Value.ToUpperInvariant()) switch (importTypeResult.Value.ToUpperInvariant())
{ {
@@ -44,7 +47,11 @@ partial class Lexer
if (!nameResult.WasSuccessful) if (!nameResult.WasSuccessful)
return Result.Failure<IImportDirective>(input, "Invalid namespace alias", ["Expected a valid namespace alias"]); return Result.Failure<IImportDirective>(input, "Invalid namespace alias", ["Expected a valid namespace alias"]);
import = new NamespaceImport(uriResult.Value, nameResult.Value); import = new NamespaceImport(uriResult.Value, nameResult.Value)
{
Line = line,
Column = col,
};
break; break;
case "TYPE": case "TYPE":
@@ -55,7 +62,11 @@ partial class Lexer
if (!typeNameResult.WasSuccessful) if (!typeNameResult.WasSuccessful)
return Result.Failure<IImportDirective>(input, "Invalid type import", ["Expected qualified type name"]); return Result.Failure<IImportDirective>(input, "Invalid type import", ["Expected qualified type name"]);
import = new TypeImport(typeNameResult.Value); import = new TypeImport(typeNameResult.Value)
{
Line = line,
Column = col,
};
break; break;
case "MBRS": case "MBRS":
@@ -75,7 +86,11 @@ partial class Lexer
input = Parse.Char('}')(input).Remainder; input = Parse.Char('}')(input).Remainder;
import = new NamedMemberImport(memberTypeNameResult.Value, memberNamesResult.Value); import = new NamedMemberImport(memberTypeNameResult.Value, memberNamesResult.Value)
{
Line = line,
Column = col,
};
break; break;
case "CTOR": case "CTOR":
@@ -95,7 +110,11 @@ partial class Lexer
input = Parse.Char(')')(input).Remainder; input = Parse.Char(')')(input).Remainder;
import = new ConstructorImport(ctorMemberTypeNameResult.Value, ctorParameterTypesResult.Value); import = new ConstructorImport(ctorMemberTypeNameResult.Value, ctorParameterTypesResult.Value)
{
Line = line,
Column = col,
};
break; break;
case "MTHD": case "MTHD":
@@ -122,7 +141,11 @@ partial class Lexer
input = Parse.Char(')')(input).Remainder; input = Parse.Char(')')(input).Remainder;
import = new MethodImport(mthdMemberTypeNameResult.Value, mthdNameResult.Value, mthdParameterTypesResult.Value); import = new MethodImport(mthdMemberTypeNameResult.Value, mthdNameResult.Value, mthdParameterTypesResult.Value)
{
Line = line,
Column = col,
};
break; break;
default: default:
libs/UIX.Asm/Lexer.cs
+9 -1
View File
@@ -34,6 +34,9 @@ public static partial class Lexer
private static IResult<QualifiedTypeName> ParseQualifiedTypeName(IInput input) private static IResult<QualifiedTypeName> ParseQualifiedTypeName(IInput input)
{ {
var line = input.Line;
var col = input.Column;
var typePrefixResult = Identifier(input); var typePrefixResult = Identifier(input);
input = typePrefixResult.Remainder; input = typePrefixResult.Remainder;
if (!typePrefixResult.WasSuccessful) if (!typePrefixResult.WasSuccessful)
@@ -59,7 +62,12 @@ public static partial class Lexer
typeName = typePrefixResult.Value; typeName = typePrefixResult.Value;
} }
QualifiedTypeName qualifiedName = new(typePrefix, typeName); QualifiedTypeName qualifiedName = new(typePrefix, typeName)
{
Line = line,
Column = col,
};
return Result.Success(qualifiedName, input); return Result.Success(qualifiedName, input);
} }
} }