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

Merge branch 'master' into features/patterns

Browse source 
# Conflicts:
#	Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
#	Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
This commit is contained in:
Alexander Zakharenko 2018-05-17 00:16:13 +03:00
parent 97e73db7a6 bf8316cfb2
commit 43ee820329
8 changed files with 3312 additions and 3065 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
InstallerSamples/Graphics/GraphWPF/DrawCircleByMouse.pas Normal file
View file

@ -0,0 +1,16 @@
uses GraphWPF;
begin
var x1,y1: real;
var c: Color;
OnMouseDown := procedure(x,y,mb) -> begin
(x1,y1) := (x,y);
c := RandomColor;
end;
OnMouseMove := procedure(x,y,mb) -> if mb=1 then
begin
var r := Sqrt(Sqr(x1-x)+Sqr(y1-y));
Window.Clear;
Circle(x1,y1,r,c);
end;
end.

2
Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
View file

@ -2,7 +2,7 @@
// This CSharp output file generated by Gardens Point LEX
// Version: 1.1.3.301
// Machine: ALEXANDER-PC
// DateTime: 17.05.2018 0:11:00
// DateTime: 17.05.2018 0:16:03
// UserName: Alexander
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>

4
Parsers/PascalABCParserNewSaushkin/ABCPascal.y
View file

@ -865,7 +865,7 @@ const_variable
{ $$ = $1; }
| typeof_expr
{ $$ = $1; }
| tkRoundOpen const_expr tkRoundClose
/* | tkRoundOpen const_expr tkRoundClose
{
if (!parsertools.build_tree_for_formatter)
{
@ -873,7 +873,7 @@ const_variable
$$ = $2;
}
else $$ = new bracket_expr($2, @$);
}
}*/
| const_variable const_variable_2
{
$$ = NewConstVariable($1, $2, @$);

4553
Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
View file

File diff suppressed because it is too large Load diff

2
TestSuite/CompilationSamples/GraphWPFBase.pas
View file

@ -62,7 +62,7 @@ procedure InvokeP(p: procedure(r: real); r: real) := Invoke(p,r);
procedure Invoke(d: ()->()) := app.Dispatcher.Invoke(d);
function Invoke<T>(d: Func0<T>): T := app.Dispatcher.Invoke&<T>(d);
function Invoke<T>(d: Func0<T>): T := T(app.Dispatcher.Invoke(d));
function InvokeReal(f: ()->real): real := Invoke&<Real>(f);
function InvokeString(f: ()->string): string := Invoke&<string>(f);
function InvokeBoolean(d: Func0<boolean>): boolean := Invoke&<boolean>(d);

899
TestSuite/CompilationSamples/graph3d.pas
View file

File diff suppressed because it is too large Load diff

899
bin/Lib/Graph3D.pas
View file

File diff suppressed because it is too large Load diff

2
bin/Lib/GraphWPFBase.pas
View file

@ -62,7 +62,7 @@ procedure InvokeP(p: procedure(r: real); r: real) := Invoke(p,r);
procedure Invoke(d: ()->()) := app.Dispatcher.Invoke(d);
function Invoke<T>(d: Func0<T>): T := app.Dispatcher.Invoke&<T>(d);
function Invoke<T>(d: Func0<T>): T := T(app.Dispatcher.Invoke(d));
function InvokeReal(f: ()->real): real := Invoke&<Real>(f);
function InvokeString(f: ()->string): string := Invoke&<string>(f);
function InvokeBoolean(d: Func0<boolean>): boolean := Invoke&<boolean>(d);