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

AsmMarkupLoader cleanup

Browse Source
This commit is contained in:
Yoshi Askharoun
2025-01-29 15:21:01 -06:00
parent 0904702679
commit 3285afd06f
1 changed files with 59 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/UIX.Asm/AsmMarkupLoader.cs
+59 -68
View File
@@ -142,8 +142,10 @@ internal class AsmMarkupLoader
_loadResult.SetDependenciesTable(_binaryDataTable.SharedDependenciesTableWithBinaryDataTable); _loadResult.SetDependenciesTable(_binaryDataTable.SharedDependenciesTableWithBinaryDataTable);
} }
else else
{
MarkHasErrors(); MarkHasErrors();
} }
}
else else
{ {
_binaryDataTable = new MarkupBinaryDataTable(_loadResult.Uri); _binaryDataTable = new MarkupBinaryDataTable(_loadResult.Uri);
@@ -156,7 +158,6 @@ internal class AsmMarkupLoader
if (_currentValidationPass == LoadPass.DeclareTypes) if (_currentValidationPass == LoadPass.DeclareTypes)
{ {
foreach (var nsImport in Program.Directives.OfType<NamespaceImport>()) foreach (var nsImport in Program.Directives.OfType<NamespaceImport>())
{ {
LoadResult loadResult; LoadResult loadResult;
@@ -190,72 +191,9 @@ internal class AsmMarkupLoader
} }
} }
if (Program != null && currentPass != LoadPass.Done) if (Program != null && _currentValidationPass == LoadPass.Full)
{ {
//foreach (ValidateClass validateClass in _program.ClassList) TrackImports();
// validateClass.Validate(_currentValidationPass);
//foreach (ValidateDataMapping dataMapping in _program.DataMappingList)
// dataMapping.Validate(_currentValidationPass);
//foreach (ValidateAlias alias in _program.AliasList)
// alias.Validate(_currentValidationPass);
if (_currentValidationPass == LoadPass.Full)
{
foreach (var import in Program.Imports)
{
if (import is TypeImport typeImport)
{
var typeSchema = ResolveTypeFromQualifiedName(typeImport.QualifiedName);
TrackImportedType(typeSchema);
}
else if (import is NamespaceImport nsImport)
{
if (!_referencedNamespaces.Contains(nsImport.Name))
ErrorManager.ReportWarning(nsImport.Line, nsImport.Column, $"Unreferenced namespace '{nsImport.Name}'");
}
else if (import is ConstructorImport ctorImport)
{
var typeSchema = ResolveTypeFromQualifiedName(ctorImport.QualifiedName);
var ctorParamTypes = ctorImport.ParameterTypes.Select(ResolveTypeFromQualifiedName).ToArray();
var ctorSchema = typeSchema.FindConstructor(ctorParamTypes);
TrackImportedConstructor(ctorSchema);
}
else if (import is MethodImport mthdImport)
{
var typeSchema = ResolveTypeFromQualifiedName(mthdImport.QualifiedName);
var mthdParamTypes = mthdImport.ParameterTypes.Select(ResolveTypeFromQualifiedName).ToArray();
var mthdSchema = typeSchema.FindMethod(mthdImport.MethodName, mthdParamTypes);
TrackImportedMethod(mthdSchema);
}
else if (import is NamedMemberImport mbrsImport)
{
var typeSchema = ResolveTypeFromQualifiedName(mbrsImport.QualifiedName);
foreach (var memberName in mbrsImport.MemberNames)
{
var propMember = typeSchema.FindProperty(memberName);
if (propMember is not null)
{
TrackImportedProperty(propMember);
continue;
}
var eventMember = typeSchema.FindEvent(memberName);
if (eventMember is not null)
{
TrackImportedEvent(eventMember);
continue;
}
}
}
}
}
} }
if (_currentValidationPass == LoadPass.DeclareTypes) if (_currentValidationPass == LoadPass.DeclareTypes)
@@ -386,9 +324,62 @@ internal class AsmMarkupLoader
if (!MarkupSystem.TrackAdditionalMetadata) if (!MarkupSystem.TrackAdditionalMetadata)
Program = null; Program = null;
}
}
//foreach (DisposableObject validateObject in _validateObjects) private void TrackImports()
// validateObject.Dispose(this); {
foreach (var import in Program.Imports)
{
if (import is TypeImport typeImport)
{
var typeSchema = ResolveTypeFromQualifiedName(typeImport.QualifiedName);
TrackImportedType(typeSchema);
}
else if (import is NamespaceImport nsImport)
{
if (!_referencedNamespaces.Contains(nsImport.Name))
ErrorManager.ReportWarning(nsImport.Line, nsImport.Column, $"Unreferenced namespace '{nsImport.Name}'");
}
else if (import is ConstructorImport ctorImport)
{
var typeSchema = ResolveTypeFromQualifiedName(ctorImport.QualifiedName);
var ctorParamTypes = ctorImport.ParameterTypes.Select(ResolveTypeFromQualifiedName).ToArray();
var ctorSchema = typeSchema.FindConstructor(ctorParamTypes);
TrackImportedConstructor(ctorSchema);
}
else if (import is MethodImport mthdImport)
{
var typeSchema = ResolveTypeFromQualifiedName(mthdImport.QualifiedName);
var mthdParamTypes = mthdImport.ParameterTypes.Select(ResolveTypeFromQualifiedName).ToArray();
var mthdSchema = typeSchema.FindMethod(mthdImport.MethodName, mthdParamTypes);
TrackImportedMethod(mthdSchema);
}
else if (import is NamedMemberImport mbrsImport)
{
var typeSchema = ResolveTypeFromQualifiedName(mbrsImport.QualifiedName);
foreach (var memberName in mbrsImport.MemberNames)
{
var propMember = typeSchema.FindProperty(memberName);
if (propMember is not null)
{
TrackImportedProperty(propMember);
continue;
}
var eventMember = typeSchema.FindEvent(memberName);
if (eventMember is not null)
{
TrackImportedEvent(eventMember);
continue;
}
}
}
} }
} }