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

fix #1109

Browse source
This commit is contained in:
Бондарев Иван 2018-10-04 15:27:05 +02:00
parent 979f8db563
commit 1ac993bc58
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CodeCompletion/Testing.cs
View file

@ -394,7 +394,9 @@ namespace CodeCompletion
off = test_str.Length - 3; off = test_str.Length - 3;
s = parser.LanguageInformation.FindExpression(off, test_str, line, col, out keyw); s = parser.LanguageInformation.FindExpression(off, test_str, line, col, out keyw);
assert(s.Trim('\n', ' ', '\t') == "s0"); assert(s.Trim('\n', ' ', '\t') == "s0");
int num_param = 0; int num_param = 0;
//testirovanie nazhatija skobki //testirovanie nazhatija skobki
test_str = "writeln"; test_str = "writeln";
@ -778,6 +780,21 @@ namespace CodeCompletion
s = parser.LanguageInformation.FindExpressionFromAnyPosition(off,test_str,line,col,out keyw,out str); s = parser.LanguageInformation.FindExpressionFromAnyPosition(off,test_str,line,col,out keyw,out str);
assert(s.Trim('\n',' ','\t')==test_str); assert(s.Trim('\n',' ','\t')==test_str);
test_str = "new t1<byte>(2)";
off = 5;
s = parser.LanguageInformation.FindExpressionFromAnyPosition(off, test_str, line, col, out keyw, out str);
assert(s.Trim('\n', ' ', '\t') == "new t1<byte>(2)");
test_str = "new t1<List<byte>>(2)";
off = 5;
s = parser.LanguageInformation.FindExpressionFromAnyPosition(off, test_str, line, col, out keyw, out str);
assert(s.Trim('\n', ' ', '\t') == "new t1<List<byte>>(2)");
test_str = "t1&<byte>.x";
off = test_str.Length;
s = parser.LanguageInformation.FindExpressionFromAnyPosition(off, test_str, line, col, out keyw, out str);
assert(s.Trim('\n', ' ', '\t') == "t1&<byte>.x");
//---- //----
Type[] types = typeof(int).Assembly.GetExportedTypes(); Type[] types = typeof(int).Assembly.GetExportedTypes();
int i = 0; int i = 0;

2
ParserTools/ParserTools/DefaultLanguageInformation.cs
View file

@ -3068,7 +3068,7 @@ namespace PascalABCCompiler.Parsers
} }
if (generic) if (generic)
{ {
break; //break;
} }
} }
else if (c == '[' && !in_comment) else if (c == '[' && !in_comment)