Skip to content

Commit

Permalink
Merge branch 'pascalabcnet:master' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
@spectatorBH
spectatorBH authored Dec 10, 2023
2 parents 485af80 + be62347 commit 0d2d7fb
Show file tree
Hide file tree
Showing 13 changed files with 2,445 additions and 2,351 deletions.
67 changes: 32 additions & 35 deletions NETGenerator/AppConfigUtil.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,57 +95,54 @@ private static bool CreateOrUpdateDependentAssembly(this XContainer assemblyBind
if (string.IsNullOrEmpty(culture)) culture = "neutral";

if (name == assemblyName.Name
&& PublicKeyTokenCorresponds(publicKeyToken)
&& publicKeyToken.Equals(publicKeyTokenString, StringComparison.CurrentCultureIgnoreCase)
&& assemblyCulture == culture)
{
var bindingRedirect = dependentAssembly.GetOrCreateElement(Elements.BindingRedirect);
{
return UpdateBindingRedirect(bindingRedirect);
return UpdateBindingRedirect(assemblyName, bindingRedirect);
}
}
}

var newAssembly = new XElement(
Elements.DependentAssembly,
CreateIdentityElement(),
CreateBindingRedirect());
CreateIdentityElement(assemblyName, publicKeyTokenString, assemblyCulture),
CreateBindingRedirect(assemblyName));
assemblyBinding.Add(newAssembly);
return true;

bool PublicKeyTokenCorresponds(string publicKeyToken)
{
return publicKeyToken.Equals(publicKeyTokenString, StringComparison.CurrentCultureIgnoreCase);
}

}

bool UpdateBindingRedirect(XElement bindingRedirect)
{
var newVersion = assemblyName.Version.ToString(4);
var oldVersionRange = $"0.0.0.0-{newVersion}";
var hasChanges =
bindingRedirect.Attribute("oldVersion")?.Value != oldVersionRange
|| bindingRedirect.Attribute("newVersion")?.Value != newVersion;
if (!hasChanges) return false;

bindingRedirect.SetAttributeValue("oldVersion", oldVersionRange);
bindingRedirect.SetAttributeValue("newVersion", newVersion);
return true;
}
static bool UpdateBindingRedirect(AssemblyName assemblyName, XElement bindingRedirect)
{
var newVersion = assemblyName.Version.ToString(4);
var oldVersionRange = $"0.0.0.0-{newVersion}";
var hasChanges =
bindingRedirect.Attribute("oldVersion")?.Value != oldVersionRange
|| bindingRedirect.Attribute("newVersion")?.Value != newVersion;
if (!hasChanges) return false;

bindingRedirect.SetAttributeValue("oldVersion", oldVersionRange);
bindingRedirect.SetAttributeValue("newVersion", newVersion);
return true;
}

XElement CreateIdentityElement()
{
var element = new XElement(Elements.AssemblyIdentity);
element.SetAttributeValue("name", assemblyName.Name);
element.SetAttributeValue("publicKeyToken", publicKeyTokenString);
element.SetAttributeValue("culture", assemblyCulture);
return element;
}
static XElement CreateIdentityElement(AssemblyName assemblyName, string publicKeyTokenString, string assemblyCulture)
{
var element = new XElement(Elements.AssemblyIdentity);
element.SetAttributeValue("name", assemblyName.Name);
element.SetAttributeValue("publicKeyToken", publicKeyTokenString);
element.SetAttributeValue("culture", assemblyCulture);
return element;
}

XElement CreateBindingRedirect()
{
var element = new XElement(Elements.BindingRedirect);
UpdateBindingRedirect(element);
return element;
}
static XElement CreateBindingRedirect(AssemblyName assemblyName)
{
var element = new XElement(Elements.BindingRedirect);
UpdateBindingRedirect(assemblyName, element);
return element;
}
}
}
84 changes: 74 additions & 10 deletions NETGenerator/NETGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,18 +549,25 @@ private void BuildDotnet5(string orig_dir, string dir, string publish_dir)
File.Copy(file, Path.Combine(orig_dir, Path.GetFileName(file)), true);
}

private void BuildDotnetNative(string orig_dir, string dir, string publish_dir, string SourceFileName)
private void BuildDotnetNative(SemanticTree.IProgramNode pn, string orig_dir, string dir, string publish_dir, string SourceFileName)
{
if (Directory.Exists(publish_dir))
Directory.Delete(publish_dir, true);
Directory.CreateDirectory(publish_dir);
StringBuilder sb = new StringBuilder();
string framework = "net7.0";
string framework = "net8.0";
if (comp_opt.target == TargetType.WinExe)
{
framework = "net7.0-windows";
framework = "net8.0-windows";
sb.AppendLine("<Project Sdk=\"Microsoft.NET.Sdk.WindowsDesktop\">");
sb.AppendLine("<PropertyGroup><PublishAot>true</PublishAot><PublishTrimmed>false</PublishTrimmed><OutputType>WinExe</OutputType><TargetFramework>" + framework + "</TargetFramework><UseWindowsForms>true</UseWindowsForms></PropertyGroup>");
sb.AppendLine("<PropertyGroup><PublishAot>true</PublishAot><PublishTrimmed>true</PublishTrimmed><OutputType>WinExe</OutputType><TargetFramework>" + framework + "</TargetFramework><UseWindowsForms>true</UseWindowsForms></PropertyGroup>");
sb.AppendLine("<ItemGroup><Reference Include = \"" + an.Name + "\"><HintPath>" + Path.Combine(dir, an.Name) + ".dll" + "</HintPath></Reference></ItemGroup>");
sb.AppendLine("</Project>");
}
else if (comp_opt.target == TargetType.Dll)
{
sb.AppendLine("<Project Sdk=\"Microsoft.NET.Sdk\">");
sb.AppendLine("<PropertyGroup><PublishAot>true</PublishAot><PublishTrimmed>true</PublishTrimmed><OutputType>Library</OutputType><TargetFramework>" + framework + "</TargetFramework></PropertyGroup>");
sb.AppendLine("<ItemGroup><Reference Include = \"" + an.Name + "\"><HintPath>" + Path.Combine(dir, an.Name) + ".dll" + "</HintPath></Reference></ItemGroup>");
sb.AppendLine("</Project>");
}
Expand All @@ -576,14 +583,66 @@ private void BuildDotnetNative(string orig_dir, string dir, string publish_dir,
File.WriteAllText(csproj, sb.ToString());
sb = new StringBuilder();
sb.AppendLine("using System;");
sb.AppendLine("using System.Runtime.InteropServices;");
sb.AppendLine("namespace StartApp");
sb.AppendLine("{");
sb.AppendLine("class StartProgram");
sb.AppendLine("{");
sb.AppendLine("static void Main(string[] args)");
sb.AppendLine("{");
sb.AppendLine(entry_meth.DeclaringType.FullName + "." + entry_meth.Name + "();");
sb.AppendLine("}");
if (comp_opt.target == TargetType.Dll)
{
List<ICommonNamespaceFunctionNode> dll_export_methods = new List<ICommonNamespaceFunctionNode>();
foreach (ICommonNamespaceFunctionNode cnfn in pn.namespaces[pn.namespaces.Length-2].functions)
{
if (cnfn.Attributes != null)
foreach (IAttributeNode attr in cnfn.Attributes)
{
if (attr.AttributeType.name == "DllExportAttribute")
{
dll_export_methods.Add(cnfn);
break;
}
}
}
foreach (ICommonNamespaceFunctionNode cnfn in dll_export_methods)
{
sb.AppendLine("[UnmanagedCallersOnly(EntryPoint = \""+cnfn.name+"\")]");
sb.Append("public static ");
sb.Append(helper.GetTypeReference(cnfn.return_value_type).tp);
sb.Append(" ");
sb.Append(cnfn.name);
sb.Append("(");
for (int i=0; i<cnfn.parameters.Length; i++)
{
if (i > 0)
sb.Append(",");
var tp = helper.GetTypeReference(cnfn.parameters[i].type).tp;
sb.Append(tp.FullName);
sb.Append(" ");
sb.Append(cnfn.parameters[i].name);
}
sb.AppendLine(")");
sb.AppendLine("{");
sb.AppendLine("return "+cnfn.comprehensive_namespace.namespace_name + "." + cnfn.comprehensive_namespace.namespace_name + "." + cnfn.name);
sb.Append("(");
for (int i = 0; i < cnfn.parameters.Length; i++)
{
if (i > 0)
sb.Append(",");
sb.Append(cnfn.parameters[i].name);
}
sb.AppendLine(");");
sb.AppendLine("}");
}

}
else
{
sb.AppendLine("static void Main(string[] args)");
sb.AppendLine("{");
sb.AppendLine(entry_meth.DeclaringType.FullName + "." + entry_meth.Name + "();");
sb.AppendLine("}");
}

sb.AppendLine("}");
sb.AppendLine("}");
File.WriteAllText(Path.Combine(dir, "Program.cs"), sb.ToString());
Expand All @@ -600,7 +659,10 @@ private void BuildDotnetNative(string orig_dir, string dir, string publish_dir,
conf = "Release";
p.StartInfo.CreateNoWindow = false;
p.StartInfo.UseShellExecute = true;
p.StartInfo.Arguments = "publish -f " + framework + " --runtime " + runtime + " -c " + conf + " --self-contained true " + csproj;
if (comp_opt.target == TargetType.Dll)
p.StartInfo.Arguments = "publish -f " + framework + " --runtime " + runtime + " -c " + conf + " /p:NativeLib=Shared --self-contained true " + csproj;
else
p.StartInfo.Arguments = "publish -f " + framework + " --runtime " + runtime + " -c " + conf + " --self-contained true " + csproj;
p.Start();
p.WaitForExit();
try
Expand Down Expand Up @@ -1201,7 +1263,7 @@ public void ConvertFromTree(SemanticTree.IProgramNode p, string TargetFileName,
if (IsDotnet5())
BuildDotnet5(orig_dir, dir, dotnet_publish_dir);
else if (IsDotnetNative())
BuildDotnetNative(orig_dir, dir, dotnet_publish_dir, SourceFileName);
BuildDotnetNative(p, orig_dir, dir, dotnet_publish_dir, SourceFileName);
}
else
{
Expand All @@ -1210,6 +1272,8 @@ public void ConvertFromTree(SemanticTree.IProgramNode p, string TargetFileName,
//else if (comp_opt.platformtarget == NETGenerator.CompilerOptions.PlatformTarget.x64)
// ab.Save(an.Name + ".dll", PortableExecutableKinds.PE32Plus, ImageFileMachine.IA64);
else ab.Save(an.Name + ".dll");
if (IsDotnetNative())
BuildDotnetNative(p, orig_dir, dir, dotnet_publish_dir, SourceFileName);
}
not_done = false;
}
Expand Down
2 changes: 1 addition & 1 deletion Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This CSharp output file generated by Gardens Point LEX
// Version: 1.1.3.301
// Machine: DESKTOP-G8V08V4
// DateTime: 08.12.2023 20:55:33
// DateTime: 08.12.2023 22:21:31
// UserName: ?????????
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>
Expand Down
2 changes: 2 additions & 0 deletions Parsers/PascalABCParserNewSaushkin/ABCPascal.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3383,6 +3383,8 @@ expr_l1_for_lambda
expr_dq
: relop_expr
{ $$ = $1; }
| tkAwait relop_expr
{ $$ = $2; }
| expr_dq tkDoubleQuestion relop_expr
{ $$ = new double_question_node($1 as expression, $3 as expression, @$);}
;
Expand Down
Loading

0 comments on commit 0d2d7fb

Please sign in to comment.