Skip to content

Enhance metadata generation and update project settings #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PTKu merged 1 commit into from
Dec 8, 2025
Merged

Enhance metadata generation and update project settings #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 99 additions & 6 deletions src/AXSharp.compiler/src/AXSharp.Compiler/AXSharpProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,15 @@ public void Generate()

var compilationResult = Compilation.Create(toCompile, new List<ISemanticAnalyzer>(), Compilation.Settings.Default).Result;



//compilationResult.Compilation.GetDiagnostics()
// .Where(d => d.Severity == AX.Text.Diagnostics.DiagnosticSeverity.Error)
// .ToList()
// .ForEach(d =>
// {
// Log.Logger.Error(d.ToString());
// });

this.CleanOutput(this.OutputFolder);

foreach (var origin in projectSources)
Expand Down Expand Up @@ -194,7 +202,7 @@ public void Generate()
}

//TargetProject.ProvisionProjectStructure();
GenerateMetadata(compilationResult.Compilation);
GenerateMetadata(compilationResult.Compilation, projectSources);
TargetProject.GenerateResources();
TargetProject.GenerateCompanionData();
Log.Logger.Information($"Compilation of project '{AxProject.SrcFolder}' done.");
Expand Down Expand Up @@ -368,9 +376,18 @@ private string GetApaxFolderFromProjectReference(IReference projectReference)
return string.Empty;
}

private void GenerateMetadata(Compilation compilation)
private void GenerateMetadata(Compilation compilation, IEnumerable<(ISyntaxTree parseTree, SourceFileText source)> sources)
{
var meta = compilation.GetSemanticTree().Types.Where(p => p.AccessModifier == AccessModifier.Public)
var projectSourceFiles = sources.Select(s => s.source.Filename).ToHashSet();

var meta = compilation.GetSemanticTree().Types
.Where(p => true)//p.AccessModifier == AccessModifier.Public | p.AccessModifier == AccessModifier.Internal)
.Where(p => {
var typeLocation = p.Location;
if (typeLocation == null) return false;
var lineSpan = typeLocation.GetLineSpan();
return projectSourceFiles.Contains(lineSpan.Filename);
})
.Select(p => CreateMetaType(p));

using (var swr = new StreamWriter(Path.Combine(EnsureFolder(TargetProject.GetMetaDataFolder), "meta.json")))
Expand Down Expand Up @@ -417,13 +434,29 @@ private static string CreateMetaType(ITypeDeclaration type)
sb.Append($"TYPE {type.Name} : STRUCT ; END_STRUCT\n");
break;
case DeclarationKind.Class:
sb.Append($"CLASS {type.Name} \nEND_CLASS\n");
sb.Append($"CLASS {type.Name}\n");
if (type is IClassDeclaration classDecl)
{
foreach (var method in classDecl.Methods)
{
sb.Append(CreateMetaMethod(method));
}
}
sb.Append("END_CLASS\n");
break;
case DeclarationKind.Enumeration:
sb.Append($"TYPE {type.Name} : (item0); \nEND_TYPE\n");
break;
case DeclarationKind.Interface:
sb.Append($"INTERFACE {type.Name} \nEND_INTERFACE\n");
sb.Append($"INTERFACE {type.Name}\n");
if (type is IInterfaceDeclaration interfaceDecl)
{
foreach (var method in interfaceDecl.Methods)
{
sb.Append(CreateMetaMethodPrototype(method));
}
}
sb.Append("END_INTERFACE\n");
break;
case DeclarationKind.NamedValueType:
sb.Append($"TYPE {type.Name} : INT (item0 := 0); \nEND_TYPE\n");
Expand All @@ -434,4 +467,64 @@ private static string CreateMetaType(ITypeDeclaration type)

return sb.ToString();
}

private static string CreateMetaMethod(IMethodDeclaration method)
{
var sb = new StringBuilder();

// Get return type
var returnVariable = method.Variables.FirstOrDefault(v => v.Section == Section.Return);
var returnType = returnVariable != null ? $" : {returnVariable.Type.Name}" : string.Empty;

// Build method signature with access modifier
var accessModifier = method.AccessModifier.ToString().ToUpperInvariant();

sb.Append($"METHOD {accessModifier} {method.Name}{returnType}\n");

// Add VAR_INPUT section if there are input parameters
var inputVars = method.Variables.Where(v => v.Section == Section.Input).ToList();
if (inputVars.Any())
{
sb.Append("VAR_INPUT\n");
foreach (var inputVar in inputVars)
{
sb.Append($"{inputVar.Name} : {inputVar.Type.Name};\n");
}
sb.Append("END_VAR\n");
}

// Add at least one statement (semicolon) to method body
sb.Append(";\n");

sb.Append("END_METHOD\n");

return sb.ToString();
}

private static string CreateMetaMethodPrototype(IMethodPrototypeDeclaration method)
{
var sb = new StringBuilder();

// Get return type
var returnVariable = method.Variables.FirstOrDefault(v => v.Section == Section.Return);
var returnType = returnVariable != null ? $" : {returnVariable.Type.Name}" : string.Empty;

sb.Append($"METHOD {method.Name}{returnType}\n");

// Add VAR_INPUT section if there are input parameters
var inputVars = method.Variables.Where(v => v.Section == Section.Input).ToList();
if (inputVars.Any())
{
sb.Append("VAR_INPUT\n");
foreach (var inputVar in inputVars)
{
sb.Append($"{inputVar.Name} : {inputVar.Type.Name};\n");
}
sb.Append("END_VAR\n");
}

sb.Append("END_METHOD\n");

return sb.ToString();
}
}
8 changes: 6 additions & 2 deletions src/AXSharp.compiler/src/ixc/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"ixc-tom": {
"commandName": "Project",
"workingDirectory": "D:\\github\\Inxton\\axopen\\src\\components.elements\\app"
},
},
"integration_plc": {
"commandName": "Project",
"workingDirectory": "c:\\W\\Develop\\gh\\inxton\\axopen\\src\\integrations\\ctrl\\"
Expand Down Expand Up @@ -51,11 +51,15 @@
"commandLineArgs": "--source-project-folder C:\\W\\Develop\\gh\\inxton\\ax\\TiaAxTools\\Sandbox\\src\\Connectors\\plc1\\ax --output-project-folder C:\\W\\Develop\\gh\\inxton\\ax\\TiaAxTools\\Sandbox\\src\\Connectors\\plc1\\ix --project-file plc1.csproj --target-platform-moniker tia",
"workingDirectory": "C:\\W\\Develop\\gh\\inxton\\ax\\TiaAxTools\\Sandbox\\"
},

"tiax-rooted": {
"commandName": "Project",
"commandLineArgs": "-v Verbose",
"workingDirectory": "C:\\W\\Develop\\gh\\inxton\\ax\\TiaAxTools\\Sandbox\\src\\Connectors\\plc1\\ax"
},
"rangarok": {
"commandName": "Project",
"commandLineArgs": "--verbosity Information",
"workingDirectory": "c:\\W\\Develop\\gh\\inxton\\simatic-ax\\RANGAROK\\ST20\\ax\\"
}
}
}