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

fix #896

Browse source
This commit is contained in:
Бондарев Иван 2018-06-07 20:30:28 +02:00
parent ecc9a5e544
commit 154ecc1533
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Parsers/PascalABCParserNewSaushkin/SemanticRules.cs
View file

@ -421,12 +421,22 @@ namespace GPPGParserScanner
List<string> vars = new List<string>();
//Dictionary<string, int> var_offsets = new Dictionary<string, int>();
List<int> var_offsets = new List<int>();
Dictionary<int, string> var_formats = new Dictionary<int, string>();
int ind = 0;
while (match.Success)
{
string s = match.Value.Replace("{", "").Replace("}", "");
int colon_pos = s.IndexOf(':');
if (colon_pos != -1)
{
var_formats.Add(ind, s.Substring(colon_pos));
s = s.Substring(0, colon_pos);
}
vars.Add(s);
var_offsets.Add(match.Index);
match = match.NextMatch();
ind++;
}
if (vars.Count == 0)
{
@ -439,7 +449,16 @@ namespace GPPGParserScanner
{
sb.Append(arr[i].Replace("![&", "{{").Replace("&]!", "}}"));
if (i < arr.Length - 1)
sb.Append("{" + i + "}");
{
sb.Append("{" + i);
string fmt;
if (var_formats.TryGetValue(i, out fmt))
{
sb.Append(fmt);
}
sb.Append("}");
}
}
mc.parameters.Add(new string_const(sb.ToString(), str.source_context), str.source_context);
for (int i = 0; i < vars.Count; i++)

6
TestSuite/formatstring5.pas Normal file
View file

@ -0,0 +1,6 @@
begin
var t := System.DateTime.Now;
var s1 := string.Format('date is {0:dd.MM.yy}',t);
var s2 := $'date is {t:dd.MM.yy}';
assert(s1 = s2);
end.