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

bug fix #618

Browse source
This commit is contained in:
Бондарев Иван 2017-12-28 11:31:05 +01:00
parent f3035d459e
commit c3041fd6f1
4 changed files with 28 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -104,6 +104,9 @@ type
/// Представляет произвольно большое целое число
BigInteger = System.Numerics.BigInteger;
/// Представляет дату и время
DateTime = System.DateTime;
/// Представляет комплексное число
Complex = System.Numerics.Complex;
@ -3251,7 +3254,7 @@ begin
end;
//------------------------------------------------------------------------------
// Operations for String
// Операции для string и char
//------------------------------------------------------------------------------
procedure string.operator+=(var left: string; right: string);
begin
@ -3344,6 +3347,13 @@ end;
function string.operator in(substr: string; str: string) := str.Contains(substr);
procedure operator+=(var left: StringBuilder; right: string); extensionmethod := left.Append(right);
function operator implicit(s: string): StringBuilder; extensionmethod;
begin
Result := new StringBuilder(s);
end;
//------------------------------------------------------------------------------
// Операции для array of T
//------------------------------------------------------------------------------
@ -3663,50 +3673,23 @@ function BigInteger.operator-(p: BigInteger) := BigInteger.Negate(p);
//------------------------------------------------------------------------------
// Операции для Complex
//------------------------------------------------------------------------------
function operator-(Self: Complex): Complex; extensionmethod;
begin
Result := Complex.Negate(Self);
end;
function operator-(Self: Complex): Complex; extensionmethod := Complex.Negate(Self);
function operator implicit(c: (real,real)): Complex; extensionmethod;
begin
Result := Cplx(c[0],c[1]);
end;
function operator implicit(c: (real,real)): Complex; extensionmethod := Cplx(c[0],c[1]);
function operator implicit(c: (real,integer)): Complex; extensionmethod;
begin
Result := Cplx(c[0],c[1]);
end;
function operator implicit(c: (real,integer)): Complex; extensionmethod := Cplx(c[0],c[1]);
function operator implicit(c: (integer,real)): Complex; extensionmethod;
begin
Result := Cplx(c[0],c[1]);
end;
function operator implicit(c: (integer,real)): Complex; extensionmethod := Cplx(c[0],c[1]);
function operator implicit(c: (integer,integer)): Complex; extensionmethod;
begin
Result := Cplx(c[0],c[1]);
end;
function operator implicit(c: (integer,integer)): Complex; extensionmethod := Cplx(c[0],c[1]);
procedure operator+=(var c: Complex; x: Complex); extensionmethod;
begin
c := c + x;
end;
procedure operator+=(var c: Complex; x: Complex); extensionmethod := c := c + x;
procedure operator*=(var c: Complex; x: Complex); extensionmethod;
begin
c := c * x;
end;
procedure operator*=(var c: Complex; x: Complex); extensionmethod := c := c * x;
procedure operator-=(var c: Complex; x: Complex); extensionmethod;
begin
c := c - x;
end;
procedure operator-=(var c: Complex; x: Complex); extensionmethod := c := c - x;
procedure operator/=(var c: Complex; x: Complex); extensionmethod;
begin
c := c / x;
end;
procedure operator/=(var c: Complex; x: Complex); extensionmethod := c := c / x;
//------------------------------------------------------------------------------
// Операции для sequence of T

4
TestSuite/implicitexplicit4.pas Normal file
View file

@ -0,0 +1,4 @@
begin
var sb: StringBuilder := 'abc';
assert(sb.ToString() = 'abc');
end.

3
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -13619,6 +13619,9 @@ namespace PascalABCCompiler.TreeConverter
case semantic_node_type.basic_function_call:
constant = new basic_function_call_as_constant(exprc as basic_function_call, loc);
break;
case semantic_node_type.common_namespace_function_call:
constant = new common_namespace_function_call_as_constant(exprc as common_namespace_function_call, loc);
break;
default:
constant = exprc as constant_node;
break;

3
bin/Lib/PABCSystem.pas
View file

@ -3352,8 +3352,7 @@ procedure operator+=(var left: StringBuilder; right: string); extensionmethod :=
function operator implicit(s: string): StringBuilder; extensionmethod;
begin
Result := new StringBuilder(s);
end;
end;
//------------------------------------------------------------------------------
// Операции для array of T