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

fix pascalabcnet/pascalabcnetide#51

Browse source
This commit is contained in:
Бондарев Иван 2019-12-25 11:36:18 +01:00
parent 5923b9c8de
commit 179d86528e
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
CodeCompletion/Testing.cs
View file

@ -629,6 +629,11 @@ namespace CodeCompletion
s = parser.LanguageInformation.FindExpressionForMethod(off, test_str, line, col, '(', ref num_param);
assert(s.Trim('\n', ' ', '\t') == "seq1.Where(i ->(i = 1) or (i = 2)).JoinIntoString");
test_str = "seq1.Where(i ->(i = '1') or (i = '2')).JoinIntoString";
off = test_str.Length;
s = parser.LanguageInformation.FindExpressionForMethod(off, test_str, line, col, '(', ref num_param);
assert(s.Trim('\n', ' ', '\t') == "seq1.Where(i ->(i = '1') or (i = '2')).JoinIntoString");
test_str = "f1&<array of byte>";
off = test_str.Length;
s = parser.LanguageInformation.FindExpressionForMethod(off, test_str, line, col, '(', ref num_param);
@ -654,6 +659,33 @@ namespace CodeCompletion
s = parser.LanguageInformation.FindExpressionForMethod(off, test_str, line, col, '(', ref num_param);
assert(s.Trim('\n', ' ', '\t') == "f1&<byte>\n.ToString");
test_str = "begin ''.PadLeft";
off = test_str.Length;
s = parser.LanguageInformation.FindExpressionForMethod(off, test_str, line, col, '(', ref num_param);
assert(s.Trim('\n', ' ', '\t') == "''.PadLeft");
test_str = "begin var s := ''.PadLeft";
off = test_str.Length;
s = parser.LanguageInformation.FindExpressionForMethod(off, test_str, line, col, '(', ref num_param);
assert(s.Trim('\n', ' ', '\t') == "''.PadLeft");
test_str = "begin \n var s := ''.PadLeft";
off = test_str.Length;
s = parser.LanguageInformation.FindExpressionForMethod(off, test_str, line, col, '(', ref num_param);
assert(s.Trim('\n', ' ', '\t') == "''.PadLeft");
test_str = "writeln(23);\n ''.PadLeft";
off = test_str.Length;
s = parser.LanguageInformation.FindExpressionForMethod(off, test_str, line, col, '(', ref num_param);
assert(s.Trim('\n', ' ', '\t') == "''.PadLeft");
test_str = "writeln(23);\n ''.PadLeft(2).ToString";
off = test_str.Length;
s = parser.LanguageInformation.FindExpressionForMethod(off, test_str, line, col, '(', ref num_param);
assert(s.Trim('\n', ' ', '\t') == "''.PadLeft(2).ToString");
//testirovanie nazhatija zapjatoj
test_str = ";test(3,aa.bb";
off = test_str.Length;

2
ParserTools/ParserTools/DefaultLanguageInformation.cs
View file

@ -3534,6 +3534,8 @@ namespace PascalABCCompiler.Parsers
else
kav.Pop();
sb.Insert(0, ch);
if (kav.Count == 0 && tokens.Count == 0)
end = true;
break;
default:
if (!(ch == ' ' || char.IsControl(ch)))