Привел в соответствие копирайты в окне About

This commit is contained in:
Бондарев Иван 2016-01-06 11:34:18 +01:00
parent feefafefe9
commit b64dc75b94
33 changed files with 26 additions and 166 deletions

View file

@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CodeCompletion")]
[assembly: AssemblyCopyright("Copyright © 2005-2015 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyCopyright("Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View file

@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("PascalABC.NET Compiler")]
[assembly: AssemblyCopyright("(c) PascalABCCompilerTeam")]
[assembly: AssemblyCopyright("Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion(RevisionClass.FullVersion)]

View file

@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Localization")]
[assembly: AssemblyCopyright("Copyright © 2005-2015 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyCopyright("Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View file

@ -2330,13 +2330,11 @@ namespace PascalABCCompiler.NETGenerator
num_scope++; //увеличиваем глубину обл. видимости
TypeBuilder tb = null, tmp_type = cur_type;
Frame frm = null;
bool nested = false;
//func.functions_nodes.Length > 0 - имеет вложенные
//funcs.Count > 0 - сама вложенная
if (func.functions_nodes.Length > 0 || funcs.Count > 0)
{
nested = true;
frm = MakeAuxType(func);//создаем запись активации
tb = frm.tb;
cur_type = tb;
@ -6633,7 +6631,6 @@ namespace PascalABCCompiler.NETGenerator
MethInfo mi = null;
mi = helper.AddConstructor(value, cnstr);
mi.num_scope = num_scope + 1;
ParameterBuilder pb = null;
if (save_debug_info)
{
if (value.function_code is IStatementsListNode)
@ -7053,7 +7050,6 @@ namespace PascalABCCompiler.NETGenerator
bool tmp_dot = is_dot_expr;
is_dot_expr = false;
bool is_comp_gen = false;
bool need_fee = false;
IParameterNode[] parameters = value.static_method.parameters;
for (int i = 0; i < real_parameters.Length; i++)
{
@ -7075,7 +7071,6 @@ namespace PascalABCCompiler.NETGenerator
is_dot_expr = true;
is_comp_gen = CheckForCompilerGenerated(real_parameters[i]);
//if (save_debug_info) MarkSequencePoint(il, 0xFeeFee, 1, 0xFeeFee, 1);
need_fee = true;
//вызов фактического параметра
real_parameters[i].visit(this);
@ -7280,7 +7275,6 @@ namespace PascalABCCompiler.NETGenerator
}
}
bool is_comp_gen = false;
bool need_fee = false;
IParameterNode[] parameters = value.common_function.parameters;
for (int i = 0; i < real_parameters.Length; i++)
{
@ -7301,7 +7295,6 @@ namespace PascalABCCompiler.NETGenerator
if (ti.clone_meth != null && ti.tp != null && ti.tp.IsValueType && !box_awaited && !parameters[i].is_const)
is_dot_expr = true;
is_comp_gen = CheckForCompilerGenerated(real_parameters[i]);
if (is_comp_gen) need_fee = true;
real_parameters[i].visit(this);
is_dot_expr = false;
CallCloneIfNeed(il, parameters[i], real_parameters[i]);
@ -7561,7 +7554,6 @@ namespace PascalABCCompiler.NETGenerator
bool tmp_dot = is_dot_expr;
is_dot_expr = false;
bool is_comp_gen = false;
bool need_fee = false;
MethodInfo mi = meth.mi;
IParameterNode[] parameters = value.namespace_function.parameters;
for (int i = 0; i < real_parameters.Length; i++)
@ -7587,7 +7579,6 @@ namespace PascalABCCompiler.NETGenerator
}
//if (is_comp_gen == false)
is_comp_gen = CheckForCompilerGenerated(real_parameters[i]);
if (is_comp_gen) need_fee = true;
real_parameters[i].visit(this);
is_dot_expr = false;
CallCloneIfNeed(il, parameters[i], real_parameters[i]);
@ -9840,7 +9831,6 @@ namespace PascalABCCompiler.NETGenerator
}
else
elem_type = ti.tp.GetElementType();
MethodInfo get_meth = null;
MethodInfo addr_meth = null;
if (indices == null)
{

View file

@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Optimizer")]
[assembly: AssemblyCopyright("Copyright © 2005-2015 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyCopyright("Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View file

@ -29,7 +29,7 @@ namespace PascalABCCompiler
public string Copyright
{
get { return "(c) Ivan Bondarev 2007"; }
get { return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich"; }
}
public PascalABCCompiler.SemanticTreeConverters.ConverterType ConverterType

View file

@ -191,7 +191,7 @@ namespace PascalABCCompiler.DocTagsParser
{
get
{
return "(c) Ткачук А.В. 2007";
return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich";
}
}

View file

@ -107,7 +107,7 @@ namespace PascalABCCompiler.PascalABCNewParser
//public Preprocessor2.Preprocessor2 preprocessor2 = new PascalABCCompiler.Preprocessor2.Preprocessor2(null);
public PascalABCNewLanguageParser()
: base("PascalABC.NET", "1.2", "(c) Mikhalkovich S.S., Saushkin R., 2012-13", false, new string[] { ".pas" })
: base("PascalABC.NET", "1.2", "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich", false, new string[] { ".pas" })
{
}

View file

@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("VBNETParser")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyCopyright("Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View file

@ -505,11 +505,9 @@ namespace PascalABCCompiler.NetHelper
List<MethodInfo> mths = null;
List<MethodInfo> mths2 = null;
Type tmp = prms[0].ParameterType;
bool generic_type = false;
if (tmp.IsGenericType)
{
tmp = tmp.GetGenericTypeDefinition();
generic_type = true;
}
if (!type_extensions.TryGetValue(tmp, out mths))
{
@ -1145,7 +1143,6 @@ namespace PascalABCCompiler.NetHelper
}
//(ssyy) DarkStar, что за предупреждение по следующей строке?
var ht = new Dictionary<string,List<MemberInfo>>(StringComparer.CurrentCultureIgnoreCase);
List<MemberInfo> memb_lst = null;
//(ssyy) DarkStar, может быть эффективнее слить следующие 2 цикла в один?
foreach (MemberInfo mi2 in mis)
{

View file

@ -400,15 +400,6 @@ namespace PascalABCCompiler.SystemLibrary
private static basic_function_node _ulong_shr;
//float
private static basic_function_node _float_to_byte;
private static basic_function_node _float_to_sbyte;
private static basic_function_node _float_to_short;
private static basic_function_node _float_to_ushort;
private static basic_function_node _float_to_int;
private static basic_function_node _float_to_uint;
private static basic_function_node _float_to_long;
private static basic_function_node _float_to_ulong;
private static basic_function_node _float_to_char;
private static basic_function_node _float_to_double;
private static basic_function_node _float_assign;
private static basic_function_node _float_unmin;
@ -4742,77 +4733,7 @@ namespace PascalABCCompiler.SystemLibrary
//float
public static function_node float_to_byte
{
get
{
return _float_to_byte;
}
}
public static function_node float_to_sbyte
{
get
{
return _float_to_sbyte;
}
}
public static function_node float_to_short
{
get
{
return _float_to_short;
}
}
public static function_node float_to_ushort
{
get
{
return _float_to_ushort;
}
}
public static function_node float_to_int_bfn
{
get
{
return _float_to_int;
}
}
public static function_node float_to_uint
{
get
{
return _float_to_uint;
}
}
public static function_node float_to_long
{
get
{
return _float_to_long;
}
}
public static function_node float_to_ulong
{
get
{
return _float_to_ulong;
}
}
public static function_node float_to_char
{
get
{
return _float_to_char;
}
}
public static function_node float_to_double
{

View file

@ -1324,8 +1324,6 @@ namespace PascalABCCompiler.TreeRealization
}
}
private bool _last_result_function_call;
//\ssyy
private function_node _overrided_method;

View file

@ -86,7 +86,6 @@ namespace PascalABCCompiler.TreeRealization
public class local_block_variable_reference : variable_reference, SemanticTree.ILocalBlockVariableReferenceNode
{
private local_block_variable _var;
private int _static_depth;
public local_block_variable_reference(local_block_variable var, location loc)
: base(var.type, loc)

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, 2015 Ivan Bondarev, Stanislav Mihalkovich";
this.label12.Text = "Copyright (c) 2005, 2016 Ivan Bondarev, Stanislav Mihalkovich";
this.label12.Click += new System.EventHandler(this.label12_Click);
//
// label9

View file

@ -130,7 +130,7 @@ namespace VisualPascalABC
if (comp != null)
{
Assembly a = Assembly.GetAssembly(comp.GetType());
dgvModules.Items.Add(MakeItem("Core", "PascalABCCompiler.Core", a.GetName().Version.ToString(), "(c) Ivan Bondarev, Stanislav Mihalkovich 2005,2015"));
dgvModules.Items.Add(MakeItem("Core", "PascalABCCompiler.Core", a.GetName().Version.ToString(), "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich"));
foreach (PascalABCCompiler.Parsers.IParser parser in comp.ParsersController.Parsers)
dgvModules.Items.Add(MakeItem("Parser",parser.Name, parser.Version, parser.Copyright));
foreach (PascalABCCompiler.SemanticTreeConverters.ISemanticTreeConverter conv in comp.SemanticTreeConvertersController.SemanticTreeConverters)

View file

@ -134,10 +134,6 @@ namespace VisualPascalABC
//даем команду на завершение и ждем завершения
StartingThread.Join();
}
private AppDomain ad = null;
private System.Reflection.Assembly comp_assm=null;
private PascalABCCompiler.Compiler rem_comp;
private void CreateCompiler()
{
@ -533,11 +529,6 @@ namespace VisualPascalABC
{
LoadRemoteCompiler();
}
else
{
//remoteCompiler.Free();
//remoteCompiler = null;
}
}
}

View file

@ -346,7 +346,6 @@ namespace VisualPascalABC
mis = dconv.GetNameByPattern(null, line, col, true, VisualPABCSingleton.MainForm.UserOptions.CodeCompletionNamespaceVisibleRange);
}
Hashtable cache = new Hashtable();
int num = 0;
if (mis != null)
{
bool stop = false;

View file

@ -96,7 +96,6 @@ namespace VisualPascalABC
{
bool closeDataProvider = textArea.Caret.Offset <= initialOffset;
int brackets = 0;
int curlyBrackets = 0;
if (!closeDataProvider) {
bool insideChar = false;
bool insideString = false;

View file

@ -104,33 +104,6 @@ namespace VisualPascalABC
else if (pos.end_line != lineNumber+1 && pos.column <= columnNumber+1) return true;
else if (pos.line != lineNumber+1 && pos.end_column >= columnNumber+1) return true;
return false;
/*if (!isInCurrentPart)
return false;
IClass classItem = item as IClass;
if (classItem != null) {
if (classItem.Region.IsEmpty)
return false;
return classItem.Region.BeginLine - 1 <= lineNumber &&
classItem.Region.EndLine - 1 >= lineNumber;
}
IMember member = item as IMember;
if (member == null || member.Region.IsEmpty) {
return false;
}
bool isInside = member.Region.BeginLine - 1 <= lineNumber;
if (member is IMethodOrProperty) {
if (((IMethodOrProperty)member).BodyRegion.EndLine >= 0) {
isInside &= lineNumber <= ((IMethodOrProperty)member).BodyRegion.EndLine - 1;
} else {
return member.Region.BeginLine - 1 == lineNumber;
}
} else {
isInside &= lineNumber <= member.Region.EndLine - 1;
}
return isInside;*/
return false;
}
public int CompareItemTo(object obj)

View file

@ -5403,7 +5403,6 @@ namespace VisualPascalABC
{
return s.Substring(index - 1, s.Length - index + 1);
}
return "";
}
private System.Text.Encoding enc = System.Text.Encoding.GetEncoding(1251);
@ -5559,7 +5558,6 @@ namespace VisualPascalABC
arr[0] = Convert.ToByte(pars[0]);
return enc.GetChars(arr)[0];
}
break;
case "ord":
{
TypeCode tc = Type.GetTypeCode(pars[0].GetType());
@ -5580,7 +5578,6 @@ namespace VisualPascalABC
arr[0] = Convert.ToChar(pars[0]);
return enc.GetBytes(arr)[0];
}
break;
default:
throw new WrongTypeOfArgument(name);
}
@ -5688,7 +5685,6 @@ namespace VisualPascalABC
else
throw new WrongTypeOfArgument(name);
}
break;
case "eof":
if (pars[0] is Value)
return _eof(pars[0] as Value, name);
@ -5714,7 +5710,6 @@ namespace VisualPascalABC
case TypeCode.Char: return Convert.ToChar(Convert.ToInt32(Convert.ToChar(pars[0])) + 1);
default: throw new WrongTypeOfArgument(name);
}
break;
case "pred":
switch (Type.GetTypeCode(pars[0].GetType()))
{
@ -5730,7 +5725,6 @@ namespace VisualPascalABC
case TypeCode.Char: return Convert.ToChar(Convert.ToInt32(Convert.ToChar(pars[0])) - 1);
default: throw new WrongTypeOfArgument(name);
}
break;
case "low":
{
if (pars[0] is Value)
@ -5886,7 +5880,6 @@ namespace VisualPascalABC
by_dot = tmp;
RetValue rv = eval_stack.Pop();
List<object> indices = new List<object>();
Value _val = null;
names.Add("[");
for (int i = 0; i < _indexer.indexes.expressions.Count; i++)
{

View file

@ -32,7 +32,7 @@ namespace VisualPascalABCPlugins
{
get
{
return "(c) Òêà÷óê À.Â. 2006,2008";
return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich";
}
}

View file

@ -12,9 +12,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("HelpBuilder")]
[assembly: AssemblyDescription("Help Builder Plugin")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("IBS")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("HelpBuilder")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyCopyright("Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View file

@ -31,7 +31,7 @@ namespace VisualPascalABCPlugins
{
get
{
return "(c) Ivan Bondarev 2009";
return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich";
}
}

View file

@ -93,7 +93,7 @@ namespace VisualPascalABCPlugins
{
get
{
return "(c) Ткачук А.В. 2006,2008";
return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich";
}
}

View file

@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("ExtendedCompilerInformation")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("DSS")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ExtendedCompilerInformation")]
[assembly: AssemblyCopyright("Copyright © DSS 2006")]
[assembly: AssemblyCopyright("Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View file

@ -33,7 +33,7 @@ namespace VisualPascalABCPlugins
{
get
{
return "(c) 2008";
return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich";
}
}

View file

@ -35,7 +35,7 @@ namespace VisualPascalABCPlugins
{
get
{
return "(c) Ткачук А.В. 2007";
return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich";
}
}

View file

@ -27,7 +27,7 @@ namespace VisualPascalABCPlugins
{
get
{
return "(c) 2007";
return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich";
}
}

View file

@ -27,7 +27,7 @@ namespace VisualPascalABCPlugins
{
get
{
return "(c) Ткачук А.В. 2006,2008";
return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich";
}
}

View file

@ -29,7 +29,7 @@ namespace VisualPascalABCPlugins
{
get
{
return "(c) Ткачук А.В. 2009";
return "Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich";
}
}

View file

@ -13,7 +13,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("Copyright © 2005-2015 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyCopyright("Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View file

@ -360,7 +360,7 @@ namespace PascalABCCompiler
DateTime ldt = DateTime.Now;
Compiler = new PascalABCCompiler.Compiler(null,ChangeCompilerState);
//GC.Collect();
WriteColorText(Compiler.Banner + "\nCopyright (c) 2005,2015 PascalABCCompiler Team\n", ConsoleColor.Black, ConsoleColor.Green);
WriteColorText(Compiler.Banner + "\nCopyright Š 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich\n", ConsoleColor.Black, ConsoleColor.Green);
Console.WriteLine("OK {0}ms", (DateTime.Now - ldt).TotalMilliseconds);
if (Compiler.SupportedSourceFiles.Length == 0)
WriteColorText(StringResourcesGet("ERROR_PARSERS_NOT_FOUND")+Environment.NewLine,ConsoleColor.Black,ConsoleColor.Red);

View file

@ -13,7 +13,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("Copyright © 2005-2015 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyCopyright("Copyright © 2005-2016 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]