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

extensionoperators2 test fix

Browse source
This commit is contained in:
andrewlord607 2017-05-22 20:53:52 +03:00
parent 5afd8d05da
commit c697c95f81
11 changed files with 69 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Compiler/PCU/PCUReader.cs
View file

@ -467,8 +467,10 @@ namespace PascalABCCompiler.PCU
{
//PCUReturner.AddPCUReader((wrapped_definition_node)si.sym_info, this);
//si.access_level = access_level.al_public;
/*SymbolInfoList si2 = (cun.scope as WrappedUnitInterfaceScope).FindWithoutCreation(names[i].name);
si.Add(si2);*/
/*TODO: AddSymbol(SymbolInfoList)
* SymbolInfoList si2 = (cun.scope as WrappedUnitInterfaceScope).FindWithoutCreation(names[i].name);
si.Add(si2);*/
Scope.AddSymbol(names[i].name, si);
}
else
@ -484,7 +486,11 @@ namespace PascalABCCompiler.PCU
else if (tn is generic_instance_type_node)
tn.Scope.AddSymbol(names[i].name, si);
else if (tn is common_type_node)
{
(tn as common_type_node).scope.AddSymbol(names[i].name, si);
if (tn.IsDelegate)
SystemLibrary.SystemLibrary.system_delegate_type.Scope.AddSymbol(names[i].name, si);
}
else
throw new NotSupportedException();
}

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "2";
public const string Build = "0";
public const string Revision = "1438";
public const string Revision = "1439";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=2
%REVISION%=1438
%COREVERSION%=0
%REVISION%=1439
%MINOR%=2
%MAJOR%=3

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.2.0.1438'
!define VERSION '3.2.0.1439'

2
TreeConverter/NetWrappers/NetHelper.cs
View file

@ -1467,7 +1467,7 @@ namespace PascalABCCompiler.NetHelper
//в список.
//TODO: проанализировать и изменить алгоритмы, использующие поиск.
List<SymbolInfo> si_list = new List<SymbolInfo>();
//List<SymbolInfo> si_list = new List<SymbolInfo>();
foreach (MemberInfo mi in mis)
{
if (mi.DeclaringType != null && PABCSystemType != null && mi.DeclaringType.Assembly == PABCSystemType.Assembly && !UsePABCRtl)

100
TreeConverter/SymbolTable/symbol_information.cs
View file

@ -88,7 +88,7 @@ namespace PascalABCCompiler.TreeConverter
}
}
public class SymbolInfo
/*public class SymbolInfo
{
//private readonly name_information_type _name_information_type;
private definition_node _sym_info;
@ -129,13 +129,13 @@ namespace PascalABCCompiler.TreeConverter
}
}
/*public name_information_type name_information_type
{
get
{
return _name_information_type;
}
}*/
//public name_information_type name_information_type
//{
// get
// {
// return _name_information_type;
// }
//}
public definition_node sym_info
{
@ -446,7 +446,7 @@ namespace PascalABCCompiler.TreeConverter
_symbol_kind = skind;
}
}
}*/
public class SymbolInfoList
{
//private readonly name_information_type _name_information_type;
@ -468,7 +468,7 @@ namespace PascalABCCompiler.TreeConverter
InfoUnitList.Add(inf);
}
public SymbolInfoList(SymbolInfo inf)
/*public SymbolInfoList(SymbolInfo inf)
{
if (inf == null)
{
@ -481,7 +481,7 @@ namespace PascalABCCompiler.TreeConverter
InfoUnitList.Add(temp);
inf = inf.Next;
}
}
}*/
public SymbolInfoList copy()
@ -526,7 +526,7 @@ namespace PascalABCCompiler.TreeConverter
return -1;
}
public SymbolInfo ToSymbolInfo()
/*public SymbolInfo ToSymbolInfo()
{
SymbolInfo first_temp = new SymbolInfo();
SymbolInfo temp = first_temp;
@ -536,7 +536,7 @@ namespace PascalABCCompiler.TreeConverter
temp = temp.Next;
}
return first_temp.Next;
}
}*/
public static bool operator ==(SymbolInfoList a, SymbolInfoList b)
{
@ -574,7 +574,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolTable.Scope scope;
public SymbolInfo reference;
//public SymbolInfo reference;
public access_level access_level
@ -623,7 +623,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit()
{
reference = new SymbolInfo();
//reference = new SymbolInfo();
}
public SymbolInfoUnit copy()
@ -636,7 +636,7 @@ namespace PascalABCCompiler.TreeConverter
return si;
}
public SymbolInfo ToSymbolInfo()
/*public SymbolInfo ToSymbolInfo()
{
reference.Next = null;
reference.access_level = _access_level;
@ -644,16 +644,16 @@ namespace PascalABCCompiler.TreeConverter
reference.sym_info = _sym_info;
reference.scope = scope;
return reference;
}
}*/
public SymbolInfoUnit(SymbolInfo inf)
/*public SymbolInfoUnit(SymbolInfo inf)
{
reference = inf;
//reference = inf;
_access_level = inf.access_level;
_symbol_kind = inf.symbol_kind;
_sym_info = inf.sym_info;
scope = inf.scope;
}
}*/
private symbol_kind get_function_kind(function_node fn, bool is_overload)
{
@ -708,7 +708,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(template_class tc)
{
reference = new SymbolInfo(tc);
//reference = new SymbolInfo(tc);
_sym_info = tc;
_access_level = access_level.al_public;
_symbol_kind = symbol_kind.sk_none;
@ -716,7 +716,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(label_node lab)
{
reference = new SymbolInfo(lab);
//reference = new SymbolInfo(lab);
_sym_info = lab;
_access_level = access_level.al_public;
_symbol_kind = symbol_kind.sk_none;
@ -724,7 +724,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(compiled_event ce)
{
reference = new SymbolInfo(ce);
//reference = new SymbolInfo(ce);
_sym_info = ce;
_access_level = access_level.al_public;
_symbol_kind = symbol_kind.sk_none;
@ -732,7 +732,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(compiled_type_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_compiled_type;
_sym_info = value;
_access_level = access_level.al_public;
@ -741,7 +741,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(common_event value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
_sym_info = value;
_access_level = get_class_member_access_level(value);
_symbol_kind = symbol_kind.sk_none;
@ -749,7 +749,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(common_namespace_event value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
_sym_info = value;
_access_level = access_level.al_public;
_symbol_kind = symbol_kind.sk_none;
@ -757,7 +757,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(function_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
_sym_info = value;
_access_level = access_level.al_public;
_symbol_kind = symbol_kind.sk_none;
@ -765,7 +765,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(compiled_function_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_compiled_function;
_sym_info = value;
_access_level = get_class_member_access_level(value);
@ -774,7 +774,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(compiled_constructor_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_compiled_function;
_sym_info = value;
_access_level = get_class_member_access_level(value);
@ -783,7 +783,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(compiled_property_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_compiled_property;
_sym_info = value;
_access_level = get_class_member_access_level(value);
@ -792,7 +792,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(compiled_variable_definition value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_compiled_variable;
_sym_info = value;
_access_level = get_class_member_access_level(value);
@ -801,7 +801,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(compiled_class_constant_definition value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
_sym_info = value;
_access_level = get_class_member_access_level(value);
_symbol_kind = symbol_kind.sk_none;
@ -809,7 +809,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(compiled_namespace_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_compiled_namespace;
_sym_info = value;
_access_level = access_level.al_public;
@ -818,7 +818,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(common_type_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_common_type;
_sym_info = value;
_access_level = access_level.al_public;
@ -827,7 +827,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(basic_function_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_basic_function;
_sym_info = value;
_access_level = access_level.al_public;
@ -836,7 +836,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(common_namespace_function_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_common_namespace_function;
_sym_info = value;
_access_level = access_level.al_public;
@ -845,7 +845,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(common_in_function_function_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_common_in_function_function;
_sym_info = value;
_access_level = access_level.al_public;
@ -854,7 +854,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(common_method_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_common_method;
_sym_info = value;
_access_level = get_class_member_access_level(value);
@ -863,7 +863,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(common_namespace_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_common_namespace;
_sym_info = value;
_access_level = access_level.al_public;
@ -872,7 +872,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(unit_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_unit;
_sym_info = value;
_access_level = access_level.al_public;
@ -881,7 +881,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(local_variable value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_local_variable;
_sym_info = value;
_access_level = access_level.al_public;
@ -890,7 +890,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(local_block_variable value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_local_variable;
_sym_info = value;
_access_level = access_level.al_public;
@ -899,7 +899,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(namespace_variable value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_namespace_variable;
_sym_info = value;
_access_level = access_level.al_public;
@ -908,7 +908,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(class_field value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_class_field;
_sym_info = value;
_access_level = get_class_member_access_level(value);
@ -917,7 +917,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(common_parameter value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_common_parameter;
_sym_info = value;
_access_level = access_level.al_public;
@ -926,7 +926,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(basic_parameter value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_basic_parameter;
_sym_info = value;
_access_level = access_level.al_public;
@ -935,7 +935,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(constant_definition_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_constant_defnition;
_sym_info = value;
_access_level = access_level.al_public;
@ -944,7 +944,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(common_property_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
//_name_information_type=name_information_type.nit_common_property;
_sym_info = value;
_access_level = get_class_member_access_level(value);
@ -953,7 +953,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(type_node value)
{
reference = new SymbolInfo(value);
//reference = new SymbolInfo(value);
_sym_info = value;
_access_level = access_level.al_public;
_symbol_kind = symbol_kind.sk_none;
@ -961,7 +961,7 @@ namespace PascalABCCompiler.TreeConverter
public SymbolInfoUnit(definition_node value, access_level alevel, symbol_kind skind)
{
reference = new SymbolInfo(value, alevel, skind);
//reference = new SymbolInfo(value, alevel, skind);
_sym_info = value;
_access_level = alevel;
_symbol_kind = skind;

19
TreeConverter/SystemLib/SystemLibInitializer.cs
View file

@ -164,25 +164,6 @@ namespace PascalABCCompiler.SystemLibrary
return symbolInfo;
}
}
public bool Equal(TreeConverter.SymbolInfo si)
{
if (dnu == null)
return notCreatedSymbolInfo == new TreeConverter.SymbolInfoList(si);
else
{
TreeConverter.SymbolInfo si2 = si;
while (si != null)
if (notCreatedSymbolInfo.First().sym_info == si.sym_info)
return true;
else
si = si.Next;
si = si2;
foreach(TreeConverter.SymbolInfoUnit tmp_si in notCreatedSymbolInfo.InfoUnitList)
if (tmp_si.sym_info == si.sym_info)
return true;
return false;
}
}
public bool Equal(TreeConverter.SymbolInfoList si)
{
if (dnu == null)

4
TreeConverter/TreeConversion/LambdaHelper.cs
View file

@ -163,7 +163,7 @@ namespace PascalABCCompiler.TreeConverter
public static void Reset()
{
CurrentLambdaScopeNum = -1;
capturedVariables = new List<SymbolInfo>();
capturedVariables = new List<SymbolInfoUnit>();
captureCheck = false;
processingLambdaParametersForTypeInference = 0;
StatementListStackStack.Clear();
@ -172,7 +172,7 @@ namespace PascalABCCompiler.TreeConverter
auxVarCounter = 0;
}
public static bool captureCheck = false;
public static List<SymbolInfo> capturedVariables = new List<SymbolInfo>();
public static List<SymbolInfoUnit> capturedVariables = new List<SymbolInfoUnit>();
public static int CurrentLambdaScopeNum = -1;
/// <summary>
/// Фиктивный блок, представляющий лямбда-выражение. Используется для обхода с целью получения списка захватываемых переменных

1
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -1260,7 +1260,6 @@ namespace PascalABCCompiler.TreeConverter
else
ThrowCompilationError = tmp_throw_error;
//function_node fnsel=convertion_data_and_alghoritms.select_function(pars,si,loc);
si.ToSymbolInfo();//notCtreatedSymbolInfo problem
CheckSpecialFunctionCall(si, pars,loc);
//TODO: А это зачем? Можно передать в create_simple_function_call pars.
left = pars[0];

9
_RebuildReleaseAndRunTests.bat
View file

@ -1,12 +1,12 @@
if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" (
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release /p:Platform="Any CPU" C:\pascalabcnet\PascalABCNET.sln
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release /p:Platform="Any CPU" PascalABCNET.sln
) else (
"%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release /p:Platform="Any CPU" PascalABCNET.sln
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release /p:Platform="Any CPU" PascalABCNET.sln
)
@IF %ERRORLEVEL% NEQ 0 GOTO ERROR
cd C:\pascalabcnet\ReleaseGenerators
cd ReleaseGenerators
..\bin\pabcnetc RebuildStandartModules.pas /rebuild
@IF %ERRORLEVEL% NEQ 0 GOTO ERROR
@ -40,5 +40,4 @@ GOTO EXIT
:ERROR
PAUSE
:EXIT
PAUSE
:EXIT

BIN
bin/Lib/PABCRtl.dll
View file

Binary file not shown.