From fdd89d0259d35d76c56770c74f6ffee8b5ebf239 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Sun, 1 Sep 2019 11:02:25 +0200 Subject: vhdl: renames Conditional_Expression to Conditional_Expression_Chain. --- python/libghdl/thin/vhdl/nodes.py | 4 ++-- python/libghdl/thin/vhdl/nodes_meta.py | 6 +++--- src/vhdl/vhdl-canon.adb | 2 +- src/vhdl/vhdl-nodes.adb | 18 +++++++++--------- src/vhdl/vhdl-nodes.ads | 7 ++++--- src/vhdl/vhdl-nodes_meta.adb | 22 +++++++++++----------- src/vhdl/vhdl-nodes_meta.ads | 4 ++-- src/vhdl/vhdl-parse.adb | 8 ++++---- src/vhdl/vhdl-prints.adb | 7 ++++--- src/vhdl/vhdl-sem_stmts.adb | 9 +++++---- 10 files changed, 45 insertions(+), 42 deletions(-) diff --git a/python/libghdl/thin/vhdl/nodes.py b/python/libghdl/thin/vhdl/nodes.py index 3b99fafc4..580c543c1 100644 --- a/python/libghdl/thin/vhdl/nodes.py +++ b/python/libghdl/thin/vhdl/nodes.py @@ -2021,9 +2021,9 @@ Get_Expression = libghdl.vhdl__nodes__get_expression Set_Expression = libghdl.vhdl__nodes__set_expression -Get_Conditional_Expression = libghdl.vhdl__nodes__get_conditional_expression +Get_Conditional_Expression_Chain = libghdl.vhdl__nodes__get_conditional_expression_chain -Set_Conditional_Expression = libghdl.vhdl__nodes__set_conditional_expression +Set_Conditional_Expression_Chain = libghdl.vhdl__nodes__set_conditional_expression_chain Get_Allocator_Designated_Type = libghdl.vhdl__nodes__get_allocator_designated_type diff --git a/python/libghdl/thin/vhdl/nodes_meta.py b/python/libghdl/thin/vhdl/nodes_meta.py index 7e45ba28e..ec2cf03a8 100644 --- a/python/libghdl/thin/vhdl/nodes_meta.py +++ b/python/libghdl/thin/vhdl/nodes_meta.py @@ -273,7 +273,7 @@ class fields: Default_Binding_Indication = 209 Default_Configuration_Declaration = 210 Expression = 211 - Conditional_Expression = 212 + Conditional_Expression_Chain = 212 Allocator_Designated_Type = 213 Selected_Waveform_Chain = 214 Conditional_Waveform_Chain = 215 @@ -1092,8 +1092,8 @@ Has_Default_Configuration_Declaration =\ Has_Expression =\ libghdl.vhdl__nodes_meta__has_expression -Has_Conditional_Expression =\ - libghdl.vhdl__nodes_meta__has_conditional_expression +Has_Conditional_Expression_Chain =\ + libghdl.vhdl__nodes_meta__has_conditional_expression_chain Has_Allocator_Designated_Type =\ libghdl.vhdl__nodes_meta__has_allocator_designated_type diff --git a/src/vhdl/vhdl-canon.adb b/src/vhdl/vhdl-canon.adb index 487edfb44..1a4b99d40 100644 --- a/src/vhdl/vhdl-canon.adb +++ b/src/vhdl/vhdl-canon.adb @@ -1107,7 +1107,7 @@ package body Vhdl.Canon is Res : Iir; El, N_El : Iir; begin - Cond_Expr := Get_Conditional_Expression (Stmt); + Cond_Expr := Get_Conditional_Expression_Chain (Stmt); Res := Create_Iir (Iir_Kind_If_Statement); Set_Label (Res, Get_Label (Stmt)); Set_Suspend_Flag (Res, False); diff --git a/src/vhdl/vhdl-nodes.adb b/src/vhdl/vhdl-nodes.adb index 223654976..1a43a24c7 100644 --- a/src/vhdl/vhdl-nodes.adb +++ b/src/vhdl/vhdl-nodes.adb @@ -4746,21 +4746,21 @@ package body Vhdl.Nodes is Set_Field5 (Target, Expr); end Set_Expression; - function Get_Conditional_Expression (Target : Iir) return Iir is + function Get_Conditional_Expression_Chain (Target : Iir) return Iir is begin pragma Assert (Target /= Null_Iir); - pragma Assert (Has_Conditional_Expression (Get_Kind (Target)), - "no field Conditional_Expression"); + pragma Assert (Has_Conditional_Expression_Chain (Get_Kind (Target)), + "no field Conditional_Expression_Chain"); return Get_Field5 (Target); - end Get_Conditional_Expression; + end Get_Conditional_Expression_Chain; - procedure Set_Conditional_Expression (Target : Iir; Expr : Iir) is + procedure Set_Conditional_Expression_Chain (Target : Iir; Chain : Iir) is begin pragma Assert (Target /= Null_Iir); - pragma Assert (Has_Conditional_Expression (Get_Kind (Target)), - "no field Conditional_Expression"); - Set_Field5 (Target, Expr); - end Set_Conditional_Expression; + pragma Assert (Has_Conditional_Expression_Chain (Get_Kind (Target)), + "no field Conditional_Expression_Chain"); + Set_Field5 (Target, Chain); + end Set_Conditional_Expression_Chain; function Get_Allocator_Designated_Type (Target : Iir) return Iir is begin diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads index fe7b89066..64eea3a3c 100644 --- a/src/vhdl/vhdl-nodes.ads +++ b/src/vhdl/vhdl-nodes.ads @@ -3412,7 +3412,8 @@ package Vhdl.Nodes is -- Get/Set_Label (Field3) -- Get/Set_Identifier (Alias Field3) -- - -- Get/Set_Conditional_Expression (Field5) + -- Chain of conditional_expressions. + -- Get/Set_Conditional_Expression_Chain (Field5) -- -- Get/Set_Visible_Flag (Flag4) -- @@ -7250,8 +7251,8 @@ package Vhdl.Nodes is -- A conditional expression. -- Node kind is a Iir_Kind_Conditional_Expression. -- Field: Field5 Chain - function Get_Conditional_Expression (Target : Iir) return Iir; - procedure Set_Conditional_Expression (Target : Iir; Expr : Iir); + function Get_Conditional_Expression_Chain (Target : Iir) return Iir; + procedure Set_Conditional_Expression_Chain (Target : Iir; Chain : Iir); -- Set to the designated type (either the type of the expression or the -- subtype) when the expression is analyzed. diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb index 8d9cc4057..05920a131 100644 --- a/src/vhdl/vhdl-nodes_meta.adb +++ b/src/vhdl/vhdl-nodes_meta.adb @@ -231,7 +231,7 @@ package body Vhdl.Nodes_Meta is Field_Default_Binding_Indication => Type_Iir, Field_Default_Configuration_Declaration => Type_Iir, Field_Expression => Type_Iir, - Field_Conditional_Expression => Type_Iir, + Field_Conditional_Expression_Chain => Type_Iir, Field_Allocator_Designated_Type => Type_Iir, Field_Selected_Waveform_Chain => Type_Iir, Field_Conditional_Waveform_Chain => Type_Iir, @@ -783,8 +783,8 @@ package body Vhdl.Nodes_Meta is return "default_configuration_declaration"; when Field_Expression => return "expression"; - when Field_Conditional_Expression => - return "conditional_expression"; + when Field_Conditional_Expression_Chain => + return "conditional_expression_chain"; when Field_Allocator_Designated_Type => return "allocator_designated_type"; when Field_Selected_Waveform_Chain => @@ -2007,7 +2007,7 @@ package body Vhdl.Nodes_Meta is return Attr_None; when Field_Expression => return Attr_None; - when Field_Conditional_Expression => + when Field_Conditional_Expression_Chain => return Attr_Chain; when Field_Allocator_Designated_Type => return Attr_Ref; @@ -4075,7 +4075,7 @@ package body Vhdl.Nodes_Meta is Field_Parent, Field_Target, Field_Chain, - Field_Conditional_Expression, + Field_Conditional_Expression_Chain, -- Iir_Kind_Return_Statement Field_Label, Field_Visible_Flag, @@ -5452,8 +5452,8 @@ package body Vhdl.Nodes_Meta is return Get_Default_Configuration_Declaration (N); when Field_Expression => return Get_Expression (N); - when Field_Conditional_Expression => - return Get_Conditional_Expression (N); + when Field_Conditional_Expression_Chain => + return Get_Conditional_Expression_Chain (N); when Field_Allocator_Designated_Type => return Get_Allocator_Designated_Type (N); when Field_Selected_Waveform_Chain => @@ -5854,8 +5854,8 @@ package body Vhdl.Nodes_Meta is Set_Default_Configuration_Declaration (N, V); when Field_Expression => Set_Expression (N, V); - when Field_Conditional_Expression => - Set_Conditional_Expression (N, V); + when Field_Conditional_Expression_Chain => + Set_Conditional_Expression_Chain (N, V); when Field_Allocator_Designated_Type => Set_Allocator_Designated_Type (N, V); when Field_Selected_Waveform_Chain => @@ -9283,10 +9283,10 @@ package body Vhdl.Nodes_Meta is end case; end Has_Expression; - function Has_Conditional_Expression (K : Iir_Kind) return Boolean is + function Has_Conditional_Expression_Chain (K : Iir_Kind) return Boolean is begin return K = Iir_Kind_Conditional_Variable_Assignment_Statement; - end Has_Conditional_Expression; + end Has_Conditional_Expression_Chain; function Has_Allocator_Designated_Type (K : Iir_Kind) return Boolean is begin diff --git a/src/vhdl/vhdl-nodes_meta.ads b/src/vhdl/vhdl-nodes_meta.ads index 47817c7d8..c9b5f7c30 100644 --- a/src/vhdl/vhdl-nodes_meta.ads +++ b/src/vhdl/vhdl-nodes_meta.ads @@ -273,7 +273,7 @@ package Vhdl.Nodes_Meta is Field_Default_Binding_Indication, Field_Default_Configuration_Declaration, Field_Expression, - Field_Conditional_Expression, + Field_Conditional_Expression_Chain, Field_Allocator_Designated_Type, Field_Selected_Waveform_Chain, Field_Conditional_Waveform_Chain, @@ -809,7 +809,7 @@ package Vhdl.Nodes_Meta is function Has_Default_Configuration_Declaration (K : Iir_Kind) return Boolean; function Has_Expression (K : Iir_Kind) return Boolean; - function Has_Conditional_Expression (K : Iir_Kind) return Boolean; + function Has_Conditional_Expression_Chain (K : Iir_Kind) return Boolean; function Has_Allocator_Designated_Type (K : Iir_Kind) return Boolean; function Has_Selected_Waveform_Chain (K : Iir_Kind) return Boolean; function Has_Conditional_Waveform_Chain (K : Iir_Kind) return Boolean; diff --git a/src/vhdl/vhdl-parse.adb b/src/vhdl/vhdl-parse.adb index e79f31526..094889e28 100644 --- a/src/vhdl/vhdl-parse.adb +++ b/src/vhdl/vhdl-parse.adb @@ -6758,7 +6758,7 @@ package body Vhdl.Parse is -- expression WHEN condition -- { ELSE expression WHEN condition } -- [ ELSE expression ] - function Parse_Conditional_Expression (Expr : Iir) return Iir + function Parse_Conditional_Expression_Chain (Expr : Iir) return Iir is Res : Iir; El, N_El : Iir; @@ -6790,7 +6790,7 @@ package body Vhdl.Parse is end loop; return Res; - end Parse_Conditional_Expression; + end Parse_Conditional_Expression_Chain; -- precond: ':=' -- postcond: next token @@ -6820,8 +6820,8 @@ package body Vhdl.Parse is Create_Iir (Iir_Kind_Conditional_Variable_Assignment_Statement); Set_Location (Stmt, Loc); Set_Target (Stmt, Target); - Set_Conditional_Expression - (Stmt, Parse_Conditional_Expression (Expr)); + Set_Conditional_Expression_Chain + (Stmt, Parse_Conditional_Expression_Chain (Expr)); else Stmt := Create_Iir (Iir_Kind_Variable_Assignment_Statement); Set_Location (Stmt, Loc); diff --git a/src/vhdl/vhdl-prints.adb b/src/vhdl/vhdl-prints.adb index 2ce6c3aac..e24e00dbf 100644 --- a/src/vhdl/vhdl-prints.adb +++ b/src/vhdl/vhdl-prints.adb @@ -2397,7 +2397,7 @@ package body Vhdl.Prints is Close_Hbox (Ctxt); end Disp_Variable_Assignment; - procedure Disp_Conditional_Expression + procedure Disp_Conditional_Expression_Chain (Ctxt : in out Ctxt_Class; Exprs : Iir) is Expr : Iir; @@ -2415,7 +2415,7 @@ package body Vhdl.Prints is exit when Expr = Null_Iir; Disp_Token (Ctxt, Tok_Else); end loop; - end Disp_Conditional_Expression; + end Disp_Conditional_Expression_Chain; procedure Disp_Conditional_Variable_Assignment (Ctxt : in out Ctxt_Class; Stmt: Iir) is @@ -2424,7 +2424,8 @@ package body Vhdl.Prints is Disp_Label (Ctxt, Stmt); Print (Ctxt, Get_Target (Stmt)); Disp_Token (Ctxt, Tok_Assign); - Disp_Conditional_Expression (Ctxt, Get_Conditional_Expression (Stmt)); + Disp_Conditional_Expression_Chain + (Ctxt, Get_Conditional_Expression_Chain (Stmt)); Disp_Token (Ctxt, Tok_Semi_Colon); Close_Hbox (Ctxt); end Disp_Conditional_Variable_Assignment; diff --git a/src/vhdl/vhdl-sem_stmts.adb b/src/vhdl/vhdl-sem_stmts.adb index 96c23ac8b..ca02e505f 100644 --- a/src/vhdl/vhdl-sem_stmts.adb +++ b/src/vhdl/vhdl-sem_stmts.adb @@ -780,7 +780,8 @@ package body Vhdl.Sem_Stmts is end case; end Sem_Signal_Assignment; - procedure Sem_Conditional_Expression (Cond_Expr : Iir; Atype : in out Iir) + procedure Sem_Conditional_Expression_Chain + (Cond_Expr : Iir; Atype : in out Iir) is El : Iir; Expr : Iir; @@ -812,7 +813,7 @@ package body Vhdl.Sem_Stmts is El := Get_Chain (El); end loop; - end Sem_Conditional_Expression; + end Sem_Conditional_Expression_Chain; procedure Sem_Variable_Assignment (Stmt: Iir) is @@ -874,8 +875,8 @@ package body Vhdl.Sem_Stmts is end if; when Iir_Kind_Conditional_Variable_Assignment_Statement => - Expr := Get_Conditional_Expression (Stmt); - Sem_Conditional_Expression (Expr, Stmt_Type); + Expr := Get_Conditional_Expression_Chain (Stmt); + Sem_Conditional_Expression_Chain (Expr, Stmt_Type); end case; exit when Done; -- cgit v1.2.3