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

Merge branch 'master' of https://github.com/pascalabcnet/pascalabcnet

Browse source 
# Conflicts:
#	bin/Lib/PABCRtl.dll
This commit is contained in:
miks1965 2017-02-15 08:56:06 +03:00
parent faeedd04d8 11408f3042
commit f97978eaac
7 changed files with 191 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CodeCompletion/DomConverter.cs
View file

@ -516,23 +516,6 @@ namespace CodeCompletion
string s = CodeCompletionController.CurrentParser.LanguageInformation.GetSimpleDescriptionWithoutNamespace((si as ElementScope).sc as PascalABCCompiler.Parsers.ITypeScope);
if (s != out_si.name)
out_si.addit_name = s;
// if (((si as ElementScope).sc as TypeScope).TemplateArguments != null)
// {
// SymInfo tmp_si = new SymInfo(null,elems[i].kind,elems[i].describe);
// StringBuilder sb = new StringBuilder();
// string[] template_args = ((si as ElementScope).sc as TypeScope).TemplateArguments;
// sb.Append(elems[i].name);
// sb.Append('<');
// for (int j=0; j<template_args.Length; j++)
// {
// sb.Append(template_args[j]);
// if (j<template_args.Length-1)
// sb.Append(',');
// }
// sb.Append('>');
// elems[i] = tmp_si;
// out_si = tmp_si;
// }
}
result_names.Add(elems[i]);
}

6
CodeCompletion/SymTable.cs
View file

@ -1743,7 +1743,7 @@ namespace CodeCompletion
this.name = name;
this.topScope = topScope;
this.si = new SymInfo(name, SymbolKind.Method, name);
this.si.name = CodeCompletionController.CurrentParser.LanguageInformation.GetShortName(this);
//this.si.name = CodeCompletionController.CurrentParser.LanguageInformation.GetShortName(this);
parameters = new List<ElementScope>();
members = new List<SymScope>();
//UnitDocCache.AddDescribeToComplete(this);
@ -1755,7 +1755,7 @@ namespace CodeCompletion
this.name = name;
this.topScope = topScope;
this.si = new SymInfo(name, SymbolKind.Method, name);
this.si.name = CodeCompletionController.CurrentParser.LanguageInformation.GetShortName(this);
//this.si.name = CodeCompletionController.CurrentParser.LanguageInformation.GetShortName(this);
parameters = new List<ElementScope>();
members = new List<SymScope>();
this.is_constructor = is_constructor;
@ -1935,7 +1935,7 @@ namespace CodeCompletion
{
if (documentation != null && documentation.Length > 0 && documentation[0] == '-') return;
this.si.description = this.ToString();
this.si.name = CodeCompletionController.CurrentParser.LanguageInformation.GetShortName(this);
this.si.addit_name = CodeCompletionController.CurrentParser.LanguageInformation.GetShortName(this);
if (documentation != null) this.si.description += "\n" + this.documentation;
}

8
SyntaxTree/tree/SyntaxTemplates/SyntaxWithListMethods.txt
View file

@ -31,22 +31,22 @@ private int FindIndexInList(<#ListElementType#> el)
public void InsertAfter(<#ListElementType#> el, <#ListElementType#> newel)
{
<#ListName#>.Insert(FindIndex(el) + 1, newel);
<#ListName#>.Insert(FindIndexInList(el) + 1, newel);
}
public void InsertAfter(<#ListElementType#> el, IEnumerable<<#ListElementType#>> newels)
{
<#ListName#>.InsertRange(FindIndex(el) + 1, newels);
<#ListName#>.InsertRange(FindIndexInList(el) + 1, newels);
}
public void InsertBefore(<#ListElementType#> el, <#ListElementType#> newel)
{
<#ListName#>.Insert(FindIndex(el), newel);
<#ListName#>.Insert(FindIndexInList(el), newel);
}
public void InsertBefore(<#ListElementType#> el, IEnumerable<<#ListElementType#>> newels)
{
<#ListName#>.InsertRange(FindIndex(el), newels);
<#ListName#>.InsertRange(FindIndexInList(el), newels);
}
public bool Remove(<#ListElementType#> el)

344
SyntaxTree/tree/Tree.cs
View file

File diff suppressed because it is too large Load diff

2
TreeConverter/LambdaExpressions/Closure/CapturedVariablesSubstitutor.cs
View file

@ -332,6 +332,8 @@ namespace TreeConverter.LambdaExpressions.Closure
else
{
var si = forScope.SymbolInfoLoopVar;
if (!_capturedVarsTreeNodesDictionary.ContainsKey(si.scope.ScopeNum))
return;
var scopeWhereVarDefined = _capturedVarsTreeNodesDictionary[si.scope.ScopeNum];
var idRef = scopeWhereVarDefined
.VariablesDefinedInScope

2
VisualPascalABCNET/AboutBox.Designer.cs generated
View file

@ -168,7 +168,7 @@
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(311, 13);
this.label12.TabIndex = 17;
this.label12.Text = "Copyright (c) 2005, 2016 Ivan Bondarev, Stanislav Mihalkovich";
this.label12.Text = "Copyright (c) 2005, 2017 Ivan Bondarev, Stanislav Mihalkovich";
this.label12.Click += new System.EventHandler(this.label12_Click);
//
// label9

11
VisualPascalABCNET/IB/CodeCompletion/CodeCompletionHelpers.cs
View file

@ -68,16 +68,19 @@ namespace VisualPascalABC
public class DefaultDispatcher : CodeCompletion.AbstractDispatcher
{
private Dictionary<PascalABCCompiler.Parsers.SymInfo, ICompletionData> dict = new Dictionary<PascalABCCompiler.Parsers.SymInfo, ICompletionData>();
private Dictionary<string, ICompletionData> dict2 = new Dictionary<string, ICompletionData>();
public void Reset()
{
dict.Clear();
dict2.Clear();
}
public void Add(PascalABCCompiler.Parsers.SymInfo si, ICompletionData data)
{
if (!dict.ContainsKey(si))
dict[si] = data;
dict[si] = data;
if (!dict2.ContainsKey(si.description))
dict2[si.description] = data;
}
public override void Update(PascalABCCompiler.Parsers.SymInfo si)
@ -87,6 +90,10 @@ namespace VisualPascalABC
{
val.Description = si.description;
}
else if (si.description != null && dict2.TryGetValue(si.description.Split('\n')[0], out val))
{
val.Description = si.description;
}
}
}
}