Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ internal void CreateAssignment(ITypeDeclaration typeDeclaration, IDeclaration de
case IStringTypeDeclaration stringTypeDeclaration:
AddToSource($" plain.{declaration.Name} = {declaration.Name}.LastValue;");
break;
default:
AddToSource($"#pragma warning disable CS0612\n");
AddToSource($" plain.{declaration.Name} = await {declaration.Name}.{MethodNameNoac}Async();");
AddToSource($"#pragma warning restore CS0612\n");
break;

}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ private void CreateAssignment(ITypeDeclaration typeDeclaration, IDeclaration dec
AddToSource($" {declaration.Name}.LethargicWrite(plain.{declaration.Name});");
AddToSource($"#pragma warning restore CS0612\n");
break;
default:
AddToSource($"#pragma warning disable CS0612\n");
AddToSource($" await this.{declaration.Name}.{MethodNameNoac}Async(plain.{declaration.Name});");
AddToSource($"#pragma warning restore CS0612\n");
break;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ private void CreateAssignment(ITypeDeclaration typeDeclaration, IDeclaration dec
case IStringTypeDeclaration stringTypeDeclaration:
AddToSource($" {declaration.Name}.Shadow = plain.{declaration.Name};");
break;
default:
AddToSource($" await this.{declaration.Name}.{MethodName}Async(plain.{declaration.Name});");
break;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ internal void CreateAssignment(ITypeDeclaration typeDeclaration, IDeclaration de
case IStringTypeDeclaration stringTypeDeclaration:
AddToSource($" plain.{declaration.Name} = {declaration.Name}.Shadow;");
break;
default:
AddToSource($" plain.{declaration.Name} = await {declaration.Name}.{MethodName}Async();");
break;
}
}

Expand Down
4 changes: 4 additions & 0 deletions src/AXSharp.compiler/src/ixd/AXSharp.ixd.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
<HintPath>..\..\..\apax\stc\bin\AX.Text.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AX.ST.Compiler.PluginAbstractions">
<HintPath>..\..\..\apax\stc\bin\AX.ST.Compiler.PluginAbstractions.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

<ItemGroup>
Expand Down
19 changes: 10 additions & 9 deletions src/AXSharp.compiler/src/ixd/Program.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
// See https://aka.ms/new-console-template for more information
using AX.ST.Semantic;
using AX.ST.Semantic.Analyzer;
using AX.ST.Syntax.Parser;
using AX.ST.Syntax.Tree;
using AX.Text;
using AX.Text.Diagnostics;
using AXSharp.Compiler;
using AXSharp.ixc_doc;
using AXSharp.ixc_doc.Interfaces;
using AXSharp.ixc_doc.Schemas;
using AXSharp.ixc_doc.Visitors;
using System;
using CliWrap;
using CommandLine;
using AXSharp.ixc_doc.Schemas;
using NuGet.Packaging;
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
using CliWrap;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Collections.Generic;
using NuGet.Packaging;
using System.Runtime.InteropServices;
using System.Text;

const string Logo =
@"| \ /
Expand Down Expand Up @@ -75,9 +76,9 @@ void GenerateYamls(Options o)
//Console.WriteLine($"Compiling project {axProject.ProjectInfo.Name}...");
//var projectSources = axProject.Sources.Select(p => (parseTree: STParser.ParseTextAsync(p).Result, source: p));

var toCompile = projectSources.Select(p => p.parseTree);
var toCompile = projectSources.Select(p => p.parseTree).ToList();

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

var semanticTree = compilation.Compilation.GetSemanticTree();

Expand Down
3 changes: 2 additions & 1 deletion src/AXSharp.compiler/src/ixd/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"profiles": {
"ixd": {
"commandName": "Project",
"commandLineArgs": "ixd -x C:\\MTS\\ix\\axsharp\\src\\AXSharp.compiler\\src\\ixd\\tests\\samples\\ax\\ -o C:\\MTS\\ix\\axsharp\\src\\AXSharp.compiler\\src\\ixd\\tests\\docfx\\docfx_project\\api\\"
"commandLineArgs": "ixd -x .\\src\\abstractions\\ctrl -o .\\docfx\\apictrl\\",
"workingDirectory": "c:\\W\\Develop\\gh\\inxton\\simatic-ax\\axopen.templates\\axopen\\"
},
"ixd-2": {
"commandName": "Project",
Expand Down