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

fix #2248

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2020-06-08 21:30:03 +03:00
parent 0c5abc56fe
commit 67f5b8c00e
9 changed files with 2129 additions and 2101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
View file

@ -1,9 +1,9 @@
//
// This CSharp output file generated by Gardens Point LEX
// Version: 1.1.3.301
// Machine: DESKTOP-P4NLNB1
// DateTime: 5/5/2020 6:55:25 PM
// UserName: fatco
// Machine: DESKTOP-G8V08V4
// DateTime: 08.06.2020 21:28:01
// UserName: ?????????
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>
//

63
Parsers/PascalABCParserNewSaushkin/ABCPascal.lst
View file

@ -1,11 +1,11 @@
// ==========================================================================
// GPPG error listing for yacc source file <ABCPascal.y>
// GPPG error listing for yacc source file <D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y>
// ==========================================================================
// Version: 1.3.6
// Machine: DESKTOP-P4NLNB1
// DateTime: 4/20/2020 4:00:49 PM
// UserName: fatco
// Machine: DESKTOP-G8V08V4
// DateTime: 08.06.2020 21:09:20
// UserName: Станислав
// ==========================================================================
@ -90,13 +90,13 @@
%type <stn> exception_handler
%type <stn> exception_handler_list
%type <stn> exception_identifier
%type <stn> typed_const_list1 typed_const_list optional_expr_list elem_list optional_expr_list_with_bracket expr_list const_elem_list1 /*const_func_expr_list*/ case_label_list const_elem_list optional_const_func_expr_list elem_list1
%type <stn> typed_const_list1 typed_const_list optional_expr_list elem_list optional_expr_list_with_bracket expr_list const_elem_list1 const_expr_list case_label_list const_elem_list optional_const_func_expr_list elem_list1
%type <stn> enumeration_id expr_l1_list
%type <stn> enumeration_id_list
%type <ex> const_simple_expr term term1 simple_term typed_const typed_const_plus typed_var_init_expression expr expr_with_func_decl_lambda const_expr elem range_expr const_elem array_const factor relop_expr expr_dq expr_l1 expr_l1_func_decl_lambda expr_l1_for_lambda simple_expr range_term range_factor
%type <ex> external_directive_ident init_const_expr case_label variable var_reference /*optional_write_expr*/ optional_read_expr simple_expr_or_nothing var_question_point expr_l1_for_question_expr expr_l1_for_new_question_expr
%type <ob> for_cycle_type
%type <ex> format_expr format_const_expr const_expr_or_nothing simple_expr_with_deref_or_nothing simple_expr_with_deref /*expr_l1_for_indexer*/
%type <ex> format_expr format_const_expr const_expr_or_nothing /* simple_expr_with_deref_or_nothing simple_expr_with_deref expr_l1_for_indexer*/
%type <stn> foreach_stmt
%type <stn> for_stmt loop_stmt yield_stmt yield_sequence_stmt
%type <stn> fp_list fp_sect_list
@ -191,17 +191,8 @@
%type <ob> pattern_out_param_list pattern_out_param_list_optional_var collection_pattern_expr_list tuple_pattern_item_list const_pattern_expr_list
%%
// Error: NonTerminal symbol "simple_expr_with_deref_or_nothing" has no productions
// Warning: NonTerminal symbol "simple_expr_with_deref" is unreachable
// Error: NonTerminal symbol "simple_expr_with_deref" has no productions
// Warning: NonTerminal symbol "simple_expr_with_deref_or_nothing" is unreachable
// Error: There are 2 non-terminating NonTerminal Symbols
// {simple_expr_with_deref_or_nothing, simple_expr_with_deref}
// Warning: Terminating simple_expr_with_deref_or_nothing fixes the following size-1 NonTerminal set
// {simple_expr_with_deref_or_nothing}
// Warning: Terminating simple_expr_with_deref fixes the following size-1 NonTerminal set
// {simple_expr_with_deref}
// -------------------------------------------------------------------------------------------------
// Warning: NonTerminal symbol "const_expr_list" is unreachable
// ------------------------------------------------------------
parse_goal
: program_file
@ -961,9 +952,7 @@ const_variable
if (fe.format1 == null)
fe.format1 = new int32_const(int.MaxValue,@3);
}
var from = fe.expr is index ? fe.expr : new index(fe.expr, false, fe.expr.source_context);
var to = fe.format1 is index ? fe.format1 : new index(fe.format1, false, fe.format1.source_context);
$$ = new slice_expr($1 as addressed_value,from,to,fe.format2,@$);
$$ = new slice_expr($1 as addressed_value,fe.expr,fe.format1,fe.format2,@$);
}
;
@ -994,16 +983,16 @@ optional_const_func_expr_list
{ $$ = null; }
;
/*const_func_expr_list
const_expr_list
: const_expr
{
$$ = new expression_list($1, @$);
}
| const_func_expr_list tkComma const_expr
| const_expr_list tkComma const_expr
{
$$ = ($1 as expression_list).Add($3, @$);
}
;*/
;
const_elem_list
: const_elem_list1
@ -2734,9 +2723,7 @@ assignment
if (fe.format1 == null)
fe.format1 = new int32_const(int.MaxValue,@3);
}
var from = fe.expr is index ? fe.expr : new index(fe.expr, false, fe.expr.source_context);
var to = fe.format1 is index ? fe.format1 : new index(fe.format1, false, fe.format1.source_context);
var left = new slice_expr_question($1 as addressed_value,from.to,fe.format2,@$);
var left = new slice_expr_question($1 as addressed_value,fe.expr,fe.format1,fe.format2,@$);
$$ = new assign(left, $6, $5.type, @$);
}
;
@ -3145,16 +3132,12 @@ expr_with_func_decl_lambda
expr
: expr_l1
{ $$ = $1; }
| tkDeref expr_l1
{ $$ = new simple_expr_with_deref($2, true); }
| format_expr
{ $$ = $1; }
;
/*
expr_l1_for_indexer
: tkDeref expr_l1
{ $$ = new simple_expr_with_deref($2, true); }
| expr_l1
: expr_l1
{ $$ = $1; }
| format_expr
{ $$ = $1; }
@ -3385,6 +3368,10 @@ relop_expr
{
$$ = new bin_expr($1, $3, $2.type, @$);
}
| relop_expr relop new_question_expr
{
$$ = new bin_expr($1, $3, $2.type, @$);
}
| is_type_expr tkRoundOpen pattern_out_param_list tkRoundClose
{
var isTypeCheck = $1 as typecast_node;
@ -3803,6 +3790,10 @@ term1
{
$$ = new bin_expr($1, $3, $2.type, @$);
}
| term1 addop new_question_expr
{
$$ = new bin_expr($1, $3, $2.type, @$);
}
;
addop
@ -3871,6 +3862,8 @@ term
{ $$ = new bin_expr($1,$3,($2).type, @$); }
| term mulop power_expr
{ $$ = new bin_expr($1,$3,($2).type, @$); }
| term mulop new_question_expr
{ $$ = new bin_expr($1,$3,($2).type, @$); }
| as_is_expr
{ $$ = $1; }
;
@ -4080,9 +4073,7 @@ variable
if (fe.format1 == null)
fe.format1 = new int32_const(int.MaxValue,@3);
}
var from = fe.expr is index ? fe.expr : new index(fe.expr, false, fe.expr.source_context);
var to = fe.format1 is index ? fe.format1 : new index(fe.format1, false, fe.format1.source_context);
$$ = new slice_expr($1 as addressed_value,from,to,fe.format2,@$);
$$ = new slice_expr($1 as addressed_value,fe.expr,fe.format1,fe.format2,@$);
}
else $$ = new indexer($1 as addressed_value, el, @$);
}
@ -4096,9 +4087,7 @@ variable
if (fe.format1 == null)
fe.format1 = new int32_const(int.MaxValue,@3);
}
var from = fe.expr is index ? fe.expr : new index(fe.expr, false, fe.expr.source_context);
var to = fe.format1 is index ? fe.format1 : new index(fe.format1, false, fe.format1.source_context);
$$ = new slice_expr_question($1 as addressed_value,from,to,fe.format2,@$);
$$ = new slice_expr_question($1 as addressed_value,fe.expr,fe.format1,fe.format2,@$);
}
| variable tkRoundOpen optional_expr_list tkRoundClose
{

20
Parsers/PascalABCParserNewSaushkin/ABCPascal.y
View file

@ -79,7 +79,7 @@
%type <stn> exception_handler
%type <stn> exception_handler_list
%type <stn> exception_identifier
%type <stn> typed_const_list1 typed_const_list optional_expr_list elem_list optional_expr_list_with_bracket expr_list const_elem_list1 /*const_func_expr_list*/ case_label_list const_elem_list optional_const_func_expr_list elem_list1
%type <stn> typed_const_list1 typed_const_list optional_expr_list elem_list optional_expr_list_with_bracket expr_list const_elem_list1 /*const_expr_list*/ case_label_list const_elem_list optional_const_func_expr_list elem_list1
%type <stn> enumeration_id expr_l1_list
%type <stn> enumeration_id_list
%type <ex> const_simple_expr term term1 simple_term typed_const typed_const_plus typed_var_init_expression expr expr_with_func_decl_lambda const_expr elem range_expr const_elem array_const factor relop_expr expr_dq expr_l1 expr_l1_func_decl_lambda expr_l1_for_lambda simple_expr range_term range_factor
@ -970,12 +970,12 @@ optional_const_func_expr_list
{ $$ = null; }
;
/*const_func_expr_list
/*const_expr_list
: const_expr
{
$$ = new expression_list($1, @$);
}
| const_func_expr_list tkComma const_expr
| const_expr_list tkComma const_expr
{
$$ = ($1 as expression_list).Add($3, @$);
}
@ -3512,6 +3512,10 @@ tuple_pattern_item
{
$$ = new const_pattern_parameter($1, @$);
}
| sign literal_or_number
{
$$ = new const_pattern_parameter(new un_expr($2, $1.type, @$), @$);
}
| tkVar identifier
{
$$ = new tuple_pattern_var_parameter($2, null, @$);
@ -3624,6 +3628,10 @@ pattern_out_param_optional_var
{
$$ = new const_pattern_parameter($1, @$);
}
| sign literal_or_number
{
$$ = new const_pattern_parameter(new un_expr($2, $1.type, @$), @$);
}
| identifier tkColon type_ref
{
$$ = new var_deconstructor_parameter($1, $3, false, @$);
@ -3953,7 +3961,11 @@ literal_or_number
{ $$ = $1; }
| unsigned_number
{ $$ = $1; }
;
/* | sign unsigned_number
{
$$ = new un_expr($2, $1.type, @$);
}*/
;
var_question_point

4094
Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
View file

File diff suppressed because it is too large Load diff

3
Parsers/PascalABCParserNewSaushkin/PABC.ymc
View file

@ -263,6 +263,9 @@ script=

2
TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs
View file

@ -647,7 +647,7 @@ namespace PascalABCCompiler.TreeConverter
//TODO: А если наследование?
possible_type_convertions pct =type_table.get_convertions(en.type,to);
possible_type_convertions pct = type_table.get_convertions(en.type,to);
if (pct.second!=null)
{

16
TreeConverter/TreeRealization/type_table.cs
View file

@ -904,21 +904,22 @@ namespace PascalABCCompiler.TreeRealization
wrapped_type ctn_to = to as wrapped_type;
wrapped_type ctn_from = from as wrapped_type;
function_node fnode1 = null; // SSM вынес чтобы посмотреть значения 02.06.20
function_node fnode1_1 = null;
if (ctn_to != null)
{
function_node fnode1 = null;
fnode1 = ctn_to.get_implicit_conversion_from(from);
add_conversion(ret, fnode1, from, to);
if (ret.second != null)
{
return ret;
}
fnode1 = null;
fnode1_1 = null;
if (!is_implicit)
{
fnode1 = ctn_to.get_explicit_conversion_from(from);
fnode1_1 = ctn_to.get_explicit_conversion_from(from);
}
add_conversion(ret, fnode1, from, to);
add_conversion(ret, fnode1_1, from, to);
if (ret.second != null)
{
return ret;
@ -931,14 +932,15 @@ namespace PascalABCCompiler.TreeRealization
add_conversion(ret, fnode2, from, to);
if (ret.second != null)
{
var a = ret.first == ret.second;
return ret;
}
fnode2 = null;
function_node fnode2_1 = null;
if (!is_implicit)
{
fnode2 = ctn_from.get_explicit_conversion_to(to);
fnode2_1 = ctn_from.get_explicit_conversion_to(to);
}
add_conversion(ret, fnode2, from, to);
add_conversion(ret, fnode2_1, from, to);
if (ret.second != null)
{
return ret;

18
bin/Lib/GraphWPF.pas
View file

@ -722,15 +722,18 @@ begin
Result := visual.RenderOpen();
end;
procedure HostToRenderBitmap;
begin
rtBmap.Render(host);
rtbmapIsCleared := False;
host.Children.Clear;
end;
procedure ReleaseDC(dc: DrawingContext);
begin
dc.Close;
if host.Children.Count > 1000 then
begin
rtBmap.Render(host);
rtbmapIsCleared := False;
host.Children.Clear;
end;
HostToRenderBitmap
end;
procedure FastDraw(d: DrawingContext->());
@ -1612,6 +1615,7 @@ function GraphWindowType.GetHeight := InvokeReal(GraphWindowTypeGetHeightP);
procedure SaveWindowP(canvas: FrameworkElement; filename: string);
begin
HostToRenderBitmap;
var (scalex,scaley) := ScaleToDevice;
var (dpiX,dpiY) := (scalex * 96, scaley * 96);
@ -1625,7 +1629,9 @@ begin
var mm := (canvas as MyVisualHost).RenderTransform.Value;
mm.Invert;
r.Transform(mm);
dc.DrawRectangle(Brush.BrushConstruct,nil,r);
dc.DrawRectangle(Brushes.White,nil,r);
var rr := Rect(0,0,rtbmap.Width,rtbmap.Height);
dc.DrawImage(rtbmap,rr);
dc.Close;
(canvas as MyVisualHost).children.Insert(0,myvis);

8
bin/Lib/GraphWPFBase.pas
View file

@ -278,10 +278,10 @@ function operator implicit(Self: (integer, real)): Size; extensionmethod := new
function operator implicit(Self: (real, integer)): Size; extensionmethod := new Size(Self[0], Self[1]);
function operator implicit(Self: (real, real)): Size; extensionmethod := new Size(Self[0], Self[1]);
//function operator implicit(Self: array of (real, real)): array of Point; extensionmethod :=
// Self.Select(t->new Point(t[0],t[1])).ToArray;
//function operator implicit(Self: array of (integer, integer)): array of Point; extensionmethod :=
// Self.Select(t->new Point(t[0],t[1])).ToArray;
function operator implicit(Self: array of (real, real)): array of Point; extensionmethod :=
Self.Select(t->new Point(t[0],t[1])).ToArray;
function operator implicit(Self: array of (integer, integer)): array of Point; extensionmethod :=
Self.Select(t->new Point(t[0],t[1])).ToArray;
procedure SetLeft(Self: UIElement; l: real); extensionmethod := Canvas.SetLeft(Self,l);