administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2100 from AIexandrKotov/metadatafix

Browse source 
Metadata fix
This commit is contained in:
Mikhalkovich Stanislav 2019-09-13 07:35:54 +03:00 committed by GitHub
parent fe6196c6bb d342175349
commit 8f10872499
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ParserTools/ParserTools/DefaultLanguageInformation.cs
View file

@ -1525,8 +1525,9 @@ namespace PascalABCCompiler.Parsers
}
else
{
sb.Append("const " + fi.Name + " : " + GetFullTypeName(fi.FieldType));
sb.Append(" = " + fi.GetRawConstantValue().ToString());
var fitype = GetFullTypeName(fi.FieldType);
sb.Append("const " + fi.Name + " : " + fitype);
sb.Append(" = " + (fitype == "string" ? $"'{fi.GetRawConstantValue().ToString()}'" : fi.GetRawConstantValue().ToString()));
}
sb.Append(";");
return sb.ToString();
@ -1750,7 +1751,15 @@ namespace PascalABCCompiler.Parsers
{
sb.Append(GetFullTypeName(pis[i].ParameterType));
if (pis[i].IsOptional)
sb.Append(":=" + (pis[i].DefaultValue != null ? pis[i].DefaultValue.ToString() : "nil"));
{
sb.Append(" := ");
if (pis[i].DefaultValue != null)
{
if (pis[i].DefaultValue is string) sb.Append($"'{pis[i].DefaultValue.ToString()}'");
else sb.Append(pis[i].DefaultValue.ToString());
}
else sb.Append("nil");
}
}
else
{
@ -1924,7 +1933,15 @@ namespace PascalABCCompiler.Parsers
else
sb.Append(inst_type);
if (pis[i].IsOptional)
sb.Append(":=" + (pis[i].DefaultValue != null ? pis[i].DefaultValue.ToString() : "nil"));
{
sb.Append(" := ");
if (pis[i].DefaultValue != null)
{
if (pis[i].DefaultValue is string) sb.Append($"'{pis[i].DefaultValue.ToString()}'");
else sb.Append(pis[i].DefaultValue.ToString());
}
else sb.Append("nil");
}
}
else
{