From a4cfa53675aac53107a8eac45b41e159e6add805 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Mon, 4 Jul 2016 04:01:17 +0200 Subject: Fix indentation and English mistakes. --- src/ghdldrv/ghdllocal.adb | 2 +- src/libraries.adb | 4 ++-- src/libraries.ads | 2 +- src/vhdl/iirs.ads | 6 ++--- src/vhdl/iirs_utils.ads | 2 +- src/vhdl/post_sems.adb | 5 ++-- src/vhdl/post_sems.ads | 6 ++--- src/vhdl/sem.adb | 2 +- src/vhdl/sem.ads | 2 +- src/vhdl/sem_assocs.adb | 16 ++++++------- src/vhdl/sem_assocs.ads | 4 ++-- src/vhdl/sem_decls.adb | 2 +- src/vhdl/sem_decls.ads | 2 +- src/vhdl/sem_expr.adb | 12 +++++----- src/vhdl/sem_expr.ads | 48 +++++++++++++++++++------------------- src/vhdl/sem_names.adb | 16 ++++++------- src/vhdl/sem_names.ads | 2 +- src/vhdl/sem_psl.adb | 4 ++-- src/vhdl/sem_specs.adb | 4 ++-- src/vhdl/sem_specs.ads | 4 ++-- src/vhdl/sem_stmts.adb | 19 +++++++-------- src/vhdl/sem_stmts.ads | 8 +++---- src/vhdl/sem_types.adb | 6 ++--- src/vhdl/sem_types.ads | 4 ++-- src/vhdl/simulate/sim_be.adb | 6 ++--- src/vhdl/translate/ortho_front.adb | 2 +- src/vhdl/translate/trans_be.adb | 11 ++------- 27 files changed, 96 insertions(+), 105 deletions(-) (limited to 'src') diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb index 8468d77fd..15facb867 100644 --- a/src/ghdldrv/ghdllocal.adb +++ b/src/ghdldrv/ghdllocal.adb @@ -60,7 +60,7 @@ package body Ghdllocal is end if; if Flags.Verbose then - Put_Line ("semantize " & Disp_Node (Get_Library_Unit (Unit))); + Put_Line ("analyze " & Disp_Node (Get_Library_Unit (Unit))); end if; Sem.Semantic (Unit); diff --git a/src/libraries.adb b/src/libraries.adb index d3d19c860..d3bf84cdb 100644 --- a/src/libraries.adb +++ b/src/libraries.adb @@ -1429,7 +1429,7 @@ package body Libraries is -- parse a file. -- Return a design_file without putting it into the library - -- (because it was not semantized). + -- (because it was not analyzed). function Load_File (File_Name: Name_Id) return Iir_Design_File is Fe : Source_File_Entry; @@ -1578,7 +1578,7 @@ package body Libraries is Free_Iir (Res); end Load_Parse_Design_Unit; - -- Load, parse, semantize, back-end a design_unit if necessary. + -- Load, parse, analyze, back-end a design_unit if necessary. procedure Load_Design_Unit (Design_Unit: Iir_Design_Unit; Loc : Iir) is begin if Get_Date_State (Design_Unit) = Date_Disk then diff --git a/src/libraries.ads b/src/libraries.ads index ecb048c94..a9920d359 100644 --- a/src/libraries.ads +++ b/src/libraries.ads @@ -98,7 +98,7 @@ package Libraries is function Load_File (File_Name: Name_Id) return Iir_Design_File; function Load_File (File : Source_File_Entry) return Iir_Design_File; - -- Load, parse, semantize, back-end a design_unit if necessary. + -- Load, parse, analyze, back-end a design_unit if necessary. -- Check Design_Unit is not obsolete. -- LOC is the location where the design unit was needed, in case of error. procedure Load_Design_Unit (Design_Unit: Iir_Design_Unit; Loc : Iir); diff --git a/src/vhdl/iirs.ads b/src/vhdl/iirs.ads index 7e8c4133f..557b9a785 100644 --- a/src/vhdl/iirs.ads +++ b/src/vhdl/iirs.ads @@ -1055,7 +1055,7 @@ package Iirs is -- point). -- The parser set this field to null_iir for an incomplete type -- declaration. This field is set to an incomplete_type_definition node - -- when first semantized. + -- when first analyzed. -- Get/Set_Type_Definition (Field1) -- Get/Set_Type (Alias Field1) -- @@ -2079,8 +2079,8 @@ package Iirs is -- -- Get/Set_Incomplete_Type_List (Field2) -- - -- Set to the incomplete type declaration when semantized, and set to the - -- complete type declaration when the latter one is semantized. + -- Set to the incomplete type declaration when analyzed, and set to the + -- complete type declaration when the latter one is analyzed. -- Get/Set_Type_Declarator (Field3) -- -- Get/Set_Base_Type (Field4) diff --git a/src/vhdl/iirs_utils.ads b/src/vhdl/iirs_utils.ads index c8ab9174d..11ee628c3 100644 --- a/src/vhdl/iirs_utils.ads +++ b/src/vhdl/iirs_utils.ads @@ -235,7 +235,7 @@ package Iirs_Utils is -- Return TRUE iff type/subtype definition A_TYPE is an undim array. function Is_One_Dimensional_Array_Type (A_Type : Iir) return Boolean; - -- Return TRUE iff unsemantized EXPR is a range attribute. + -- Return TRUE iff unanalyzed EXPR is a range attribute. function Is_Range_Attribute_Name (Expr : Iir) return Boolean; -- Create an array subtype from array_type or array_subtype ARR_TYPE. diff --git a/src/vhdl/post_sems.adb b/src/vhdl/post_sems.adb index 69e40f92e..145d50a14 100644 --- a/src/vhdl/post_sems.adb +++ b/src/vhdl/post_sems.adb @@ -1,5 +1,5 @@ --- Global checks after semantization pass. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Global checks after analyze pass. +-- Copyright (C) 2002 - 2016 Tristan Gingold -- -- GHDL is free software; you can redistribute it and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -74,4 +74,3 @@ package body Post_Sems is end if; end Post_Sem_Checks; end Post_Sems; - diff --git a/src/vhdl/post_sems.ads b/src/vhdl/post_sems.ads index ed042264e..f70bad85a 100644 --- a/src/vhdl/post_sems.ads +++ b/src/vhdl/post_sems.ads @@ -1,5 +1,5 @@ --- Global checks after semantization pass. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Global checks after analyze pass. +-- Copyright (C) 2002 - 2016 Tristan Gingold -- -- GHDL is free software; you can redistribute it and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -18,7 +18,7 @@ with Iirs; use Iirs; package Post_Sems is - -- Do post semantization checks, such as VITAL checks. + -- Do post analyze checks, such as VITAL checks. -- This procedure is also used to extract declarations from ieee -- packages. procedure Post_Sem_Checks (Unit : Iir_Design_Unit); diff --git a/src/vhdl/sem.adb b/src/vhdl/sem.adb index aefb13900..ef9a677a6 100644 --- a/src/vhdl/sem.adb +++ b/src/vhdl/sem.adb @@ -1906,7 +1906,7 @@ package body Sem is Compute_Subprogram_Hash (Subprg); - -- The specification has been semantized, close the declarative region + -- The specification has been analyzed, close the declarative region -- now. Close_Declarative_Region; diff --git a/src/vhdl/sem.ads b/src/vhdl/sem.ads index 5586483a1..21bf89328 100644 --- a/src/vhdl/sem.ads +++ b/src/vhdl/sem.ads @@ -57,7 +57,7 @@ package Sem is -- aliases are checked. procedure Check_Operator_Requirements (Id : Name_Id; Subprg : Iir); - -- Semantize an use clause. + -- Analyze an use clause. -- This may adds use clauses to the chain. procedure Sem_Use_Clause (Clauses : Iir_Use_Clause); diff --git a/src/vhdl/sem_assocs.adb b/src/vhdl/sem_assocs.adb index f97ced4dd..b17a71f93 100644 --- a/src/vhdl/sem_assocs.adb +++ b/src/vhdl/sem_assocs.adb @@ -116,7 +116,7 @@ package body Sem_Assocs is end loop; end Extract_Non_Object_Association; - -- Semantize all arguments of ASSOC_CHAIN + -- Analyze all arguments of ASSOC_CHAIN -- Return TRUE if no error. function Sem_Actual_Of_Association_Chain (Assoc_Chain : Iir) return Boolean @@ -127,9 +127,9 @@ package body Sem_Assocs is Res : Iir; Formal : Iir; begin - -- Semantize all arguments - -- OK is false if there is an error during semantic of one of the - -- argument, but continue semantisation. + -- Analyze all arguments. + -- OK is false if there is an error during semantic of one of the + -- argument, but continue analyze. Has_Named := False; Ok := True; Assoc := Assoc_Chain; @@ -781,7 +781,7 @@ package body Sem_Assocs is Set_Actual_Type (Assoc, Atype); end Finish_Individual_Assoc_Record; - -- Called by sem_individual_association to finish the semantization of + -- Called by sem_individual_association to finish the analyze of -- individual association ASSOC: compute bounds, detect missing elements. procedure Finish_Individual_Association (Assoc : Iir) is @@ -953,7 +953,7 @@ package body Sem_Assocs is end if; end Extract_Type_Of_Conversions; - -- ASSOC is an association element not semantized and whose formal is a + -- ASSOC is an association element not analyzed and whose formal is a -- parenthesis name. Try to extract a conversion function/type. In case -- of success, return a new association element. In case of failure, -- return NULL_IIR. @@ -1008,7 +1008,7 @@ package body Sem_Assocs is -- NAME is the formal name of an association, without any conversion -- function or type. - -- Try to semantize NAME with INTERFACE. + -- Try to analyze NAME with INTERFACE. -- In case of success, set PREFIX to the most prefix of NAME and NAME_TYPE -- to the type of NAME. -- In case of failure, set NAME_TYPE to NULL_IIR. @@ -1107,7 +1107,7 @@ package body Sem_Assocs is -- * FORMAL is a function call, whose only argument is an -- association_element_by_expression, whose actual is a name -- whose prefix is the same identifier as INTERFACE (note, since FORMAL - -- is not semantized, this is parenthesis name), CONV_TYPE is set to + -- is not analyzed, this is parenthesis name), CONV_TYPE is set to -- the type or list of type of return type of conversion functions and -- FORMAL_TYPE is set to the type of the name. -- * otherwise, FORMAL cannot match INTERFACE and both FORMAL_TYPE and diff --git a/src/vhdl/sem_assocs.ads b/src/vhdl/sem_assocs.ads index 450e9cdad..8157f8c34 100644 --- a/src/vhdl/sem_assocs.ads +++ b/src/vhdl/sem_assocs.ads @@ -24,12 +24,12 @@ package Sem_Assocs is function Extract_Non_Object_Association (Assoc_Chain : Iir; Inter_Chain : Iir) return Iir; - -- Semantize actuals of ASSOC_CHAIN. + -- Analyze actuals of ASSOC_CHAIN. -- Check all named associations are after positionnal one. -- Return TRUE if no error. function Sem_Actual_Of_Association_Chain (Assoc_Chain : Iir) return Boolean; - -- Semantize association chain ASSOC_CHAIN with interfaces from + -- Analyze association chain ASSOC_CHAIN with interfaces from -- INTERFACE_CHAIN. -- Return the level of compatibility between the two chains in LEVEL. -- If FINISH is true, then ASSOC_CHAIN may be modifies (individual assoc diff --git a/src/vhdl/sem_decls.adb b/src/vhdl/sem_decls.adb index c0fec32c0..e05f2c552 100644 --- a/src/vhdl/sem_decls.adb +++ b/src/vhdl/sem_decls.adb @@ -1632,7 +1632,7 @@ package body Sem_Decls is Xref_Ref (Decl, Deferred_Const); end if; - -- Semantize type and default value: + -- Analyze type and default value: Atype := Get_Subtype_Indication (Decl); if Atype /= Null_Iir then Atype := Sem_Subtype_Indication (Atype); diff --git a/src/vhdl/sem_decls.ads b/src/vhdl/sem_decls.ads index 659e80b2f..d29b1a49d 100644 --- a/src/vhdl/sem_decls.ads +++ b/src/vhdl/sem_decls.ads @@ -26,7 +26,7 @@ package Sem_Decls is procedure Create_Implicit_Operations (Decl : Iir; Is_Std_Standard : Boolean := False); - -- Semantize declarations of PARENT. + -- Analyze declarations of PARENT. procedure Sem_Declaration_Chain (Parent : Iir); -- Check all declarations of DECLS_PARENT are complete diff --git a/src/vhdl/sem_expr.adb b/src/vhdl/sem_expr.adb index f36132407..a66e99c1d 100644 --- a/src/vhdl/sem_expr.adb +++ b/src/vhdl/sem_expr.adb @@ -3567,7 +3567,7 @@ package body Sem_Expr is return Aggr; end Sem_Array_Aggregate_Type; - -- Semantize aggregate EXPR whose type is expected to be A_TYPE. + -- Analyze aggregate EXPR whose type is expected to be A_TYPE. -- A_TYPE cannot be null_iir (this case is handled in sem_expression_ov) function Sem_Aggregate (Expr: Iir_Aggregate; A_Type: Iir) return Iir_Aggregate is @@ -3598,7 +3598,7 @@ package body Sem_Expr is end Sem_Aggregate; -- Transform LIT into a physical_literal. - -- LIT can be either a not semantized physical literal or + -- LIT can be either a not analyzed physical literal or -- a simple name that is a physical unit. In the later case, a physical -- literal is created. function Sem_Physical_Literal (Lit: Iir) return Iir @@ -3646,7 +3646,7 @@ package body Sem_Expr is return Res; end Sem_Physical_Literal; - -- Semantize an allocator by expression or an allocator by subtype. + -- Analyze an allocator by expression or an allocator by subtype. function Sem_Allocator (Expr : Iir; A_Type : Iir) return Iir is Arg: Iir; @@ -4001,10 +4001,10 @@ package body Sem_Expr is is A_Type: Iir; begin --- -- Avoid to run sem_expression_ov when a node was already semantized +-- -- Avoid to run sem_expression_ov when a node was already analyzed -- -- except to resolve overload. -- if Get_Type (Expr) /= Null_Iir then --- -- EXPR was already semantized. +-- -- EXPR was already analyzed. -- if A_Type1 = null or else not Is_Overload_List (Get_Type (Expr)) then -- -- This call to sem_expression_ov do not add any informations. -- Check_Restrictions (Expr, Restriction); @@ -4523,7 +4523,7 @@ package body Sem_Expr is return Null_Iir; end if; - -- Can't try to run sem_expression_ov when a node was already semantized + -- Can't try to run sem_expression_ov when a node was already analyzed Expr_Type := Get_Type (Expr); if Expr_Type /= Null_Iir and then not Is_Overload_List (Expr_Type) then -- Checks types. diff --git a/src/vhdl/sem_expr.ads b/src/vhdl/sem_expr.ads index 4c4f004a1..b06ca3de7 100644 --- a/src/vhdl/sem_expr.ads +++ b/src/vhdl/sem_expr.ads @@ -26,29 +26,29 @@ package Sem_Expr is Deferred_Constant_Allowed : Boolean := False; - -- Semantize an expression (other than a range) with a possible overloading. - -- Sem_expression_ov (and therefore sem_expression) must be called *once* - -- for each expression node with A_TYPE1 not null and at most *once* with - -- A_TYPE1 null. + -- Analyze an expression (other than a range) with a possible overloading. + -- Sem_expression_ov (and therefore sem_expression) must be called *once* + -- for each expression node with A_TYPE1 not null and at most *once* with + -- A_TYPE1 null. -- - -- When A_TYPE1 is null, sem_expression_ov find all possible types - -- of the expression. If there is only one possible type (ie, overloading - -- is non-existant or solved), then the type of the expression is set, - -- and the node is completly semantized. Sem_expression_ov must not - -- be called for such a node. - -- If there is several possible types (ie overloaded), then the type is - -- set with a list of overload. To finishes the semantisation, - -- sem_expression_ov must be called again with A_TYPE1 set to the - -- expected type. + -- When A_TYPE1 is null, sem_expression_ov find all possible types + -- of the expression. If there is only one possible type (ie, overloading + -- is non-existant or solved), then the type of the expression is set, + -- and the node is completly analyzed. Sem_expression_ov must not + -- be called for such a node. + -- If there is several possible types (ie overloaded), then the type is + -- set with a list of overload. To finishes the semantisation, + -- sem_expression_ov must be called again with A_TYPE1 set to the + -- expected type. -- - -- If A_TYPE1 is set, sem_expression_ov must finishes the semantisation - -- of the expression, and set its type, which is not necessary a base type. - -- A_TYPE1 must be a base type. + -- If A_TYPE1 is set, sem_expression_ov must finishes the analyze of the + -- expression, and set its type, which is not necessary a base type. + -- A_TYPE1 must be a base type. -- - -- In case of error, it displays a message and return null. - -- In case of success, it returns the semantized expression, which can - -- be different from EXPR (eg, a character literal is transformed into an - -- enumeration literal). + -- In case of error, it displays a message and return null. + -- In case of success, it returns the analyzed expression, which can + -- be different from EXPR (eg, a character literal is transformed into an + -- enumeration literal). function Sem_Expression_Ov (Expr: Iir; A_Type1: Iir) return Iir; -- If A_TYPE is not null, then EXPR must be of type A_TYPE. @@ -107,7 +107,7 @@ package Sem_Expr is -- If EXPR is NULL_IIR, NULL_IIR is silently returned. function Check_Is_Expression (Expr : Iir; Loc : Iir) return Iir; - -- Semantize a procedure_call or a concurrent_procedure_call_statement. + -- Analyze a procedure_call or a concurrent_procedure_call_statement. -- A procedure call is not an expression but because most of the code -- for procedure call is common with function call, procedure calls are -- handled in this package. @@ -127,12 +127,12 @@ package Sem_Expr is function Sem_Discrete_Range_Expression (Expr: Iir; A_Type: Iir; Any_Dir: Boolean) return Iir; - -- Semantize a discrete range and convert to integer if both bounds are + -- Analyze a discrete range and convert to integer if both bounds are -- universal integer types, according to rules of LRM 3.2.1.1 function Sem_Discrete_Range_Integer (Expr: Iir) return Iir; -- Transform LIT into a physical_literal. - -- LIT can be either a not semantized physical literal or + -- LIT can be either a not analyzed physical literal or -- a simple name that is a physical unit. In the later case, a physical -- literal is created. function Sem_Physical_Literal (Lit: Iir) return Iir; @@ -180,7 +180,7 @@ package Sem_Expr is Low : out Iir; High : out Iir); - -- Semantize CHOICE_LIST when the choice expression SEL is of a + -- Analyze CHOICE_LIST when the choice expression SEL is of a -- one-dimensional character array type. procedure Sem_String_Choices_Range (Choice_Chain : Iir; Sel : Iir); diff --git a/src/vhdl/sem_names.adb b/src/vhdl/sem_names.adb index 421eaeb11..fdb6c4fbc 100644 --- a/src/vhdl/sem_names.adb +++ b/src/vhdl/sem_names.adb @@ -37,8 +37,8 @@ with Sem_Psl; with Xrefs; use Xrefs; package body Sem_Names is - -- Finish the semantization of NAME using RES as named entity. - -- This is called when the semantization is finished and an uniq + -- Finish the analyze of NAME using RES as named entity. + -- This is called when the analyze is finished and an uniq -- interpretation has been determined (RES). -- -- Error messages are emitted here. @@ -1714,7 +1714,7 @@ package body Sem_Names is end if; -- Even if a named entity was found, return an error_mark. -- Indeed, the named entity found is certainly the one being - -- semantized, and the semantization may be uncomplete. + -- analyzed, and the analyze may be uncomplete. Res := Error_Mark; end if; end if; @@ -1771,7 +1771,7 @@ package body Sem_Names is Prefix: Iir; Res : Iir; - -- Semantize SUB_NAME.NAME as an expanded name (ie, NAME is declared + -- Analyze SUB_NAME.NAME as an expanded name (ie, NAME is declared -- within SUB_NAME). This is possible only if the expanded name is -- analyzed within the context of SUB_NAME. procedure Sem_As_Expanded_Name (Sub_Name : Iir) @@ -1792,7 +1792,7 @@ package body Sem_Names is -- record object or value. The prefix must be appropriate for the -- type of this object or value. -- - -- Semantize SUB_NAME.NAME as a selected element. + -- Analyze SUB_NAME.NAME as a selected element. procedure Sem_As_Selected_Element (Sub_Name : Iir) is Base_Type : Iir; @@ -2141,7 +2141,7 @@ package body Sem_Names is | Iir_Kind_Selected_Name => Sem_Name (Actual); Kind := Slice_Or_Index (Get_Named_Entity (Actual)); - -- FIXME: semantization to be finished. + -- FIXME: analyze to be finished. --Maybe_Finish_Sem_Name (Actual); when others => Kind := Slice_Or_Index (Actual); @@ -3490,7 +3490,7 @@ package body Sem_Names is -- LRM93 §6 procedure Sem_Name (Name : Iir; Keep_Alias : Boolean := False) is begin - -- Exit now if NAME was already semantized. + -- Exit now if NAME was already analyzed. if Get_Named_Entity (Name) /= Null_Iir then return; end if; @@ -3517,7 +3517,7 @@ package body Sem_Names is procedure Sem_Name_Soft (Name : Iir) is begin - -- Exit now if NAME was already semantized. + -- Exit now if NAME was already analyzed. if Get_Named_Entity (Name) /= Null_Iir then return; end if; diff --git a/src/vhdl/sem_names.ads b/src/vhdl/sem_names.ads index afd2b97ab..812d5d6e2 100644 --- a/src/vhdl/sem_names.ads +++ b/src/vhdl/sem_names.ads @@ -72,7 +72,7 @@ package Sem_Names is -- Remove every named_entity of NAME. -- If NAME is Null_Iir then this is no op. - -- To be used only for names (weakly) semantized by sem_name_soft. + -- To be used only for names (weakly) analyzed by sem_name_soft. procedure Sem_Name_Clean (Name : Iir); -- If NAME is a selected name whose prefix is a protected variable, set diff --git a/src/vhdl/sem_psl.adb b/src/vhdl/sem_psl.adb index 445b89d68..841a0dca7 100644 --- a/src/vhdl/sem_psl.adb +++ b/src/vhdl/sem_psl.adb @@ -135,7 +135,7 @@ package body Sem_Psl is return PSL.Hash.Get_PSL_Node (HDL_Node (Expr)); end Convert_Bool; - -- Semantize an HDL expression. This may mostly a wrapper except in the + -- Analyze an HDL expression. This may mostly a wrapper except in the -- case when the expression is in fact a PSL expression. function Sem_Hdl_Expr (N : Node) return Node is @@ -756,7 +756,7 @@ package body Sem_Psl is return Res2; end Sem_Psl_Instance_Name; - -- Called by sem_names to semantize a psl name. + -- Called by sem_names to analyze a psl name. function Sem_Psl_Name (Name : Iir) return Iir is begin case Get_Kind (Name) is diff --git a/src/vhdl/sem_specs.adb b/src/vhdl/sem_specs.adb index d7280a819..bdcf64563 100644 --- a/src/vhdl/sem_specs.adb +++ b/src/vhdl/sem_specs.adb @@ -1029,7 +1029,7 @@ package body Sem_Specs is end if; end Sem_Disconnection_Specification; - -- Semantize entity aspect ASPECT and return the entity declaration. + -- Analyze entity aspect ASPECT and return the entity declaration. -- Return NULL_IIR if not found. function Sem_Entity_Aspect (Aspect : Iir) return Iir is begin @@ -1266,7 +1266,7 @@ package body Sem_Specs is Set_Component_Configuration (Comp, Spec); end Apply_Configuration_Specification; - -- Semantize component_configuration or configuration_specification SPEC. + -- Analyze component_configuration or configuration_specification SPEC. -- STMTS is the concurrent statement list related to SPEC. procedure Sem_Component_Specification (Parent_Stmts : Iir; Spec : Iir; Primary_Entity_Aspect : out Iir) diff --git a/src/vhdl/sem_specs.ads b/src/vhdl/sem_specs.ads index ba5c95fbd..0a175da34 100644 --- a/src/vhdl/sem_specs.ads +++ b/src/vhdl/sem_specs.ads @@ -55,11 +55,11 @@ package Sem_Specs is Parent : Iir; Primary_Entity_Aspect : Iir); - -- Semantize entity aspect ASPECT and return the entity declaration. + -- Analyze entity aspect ASPECT and return the entity declaration. -- Return NULL_IIR if not found. function Sem_Entity_Aspect (Aspect : Iir) return Iir; - -- Semantize component_configuration or configuration_specification SPEC. + -- Analyze component_configuration or configuration_specification SPEC. -- STMTS is the concurrent statement list related to SPEC. procedure Sem_Component_Specification (Parent_Stmts : Iir; Spec : Iir; Primary_Entity_Aspect : out Iir); diff --git a/src/vhdl/sem_stmts.adb b/src/vhdl/sem_stmts.adb index c6bbcb332..00b8be27b 100644 --- a/src/vhdl/sem_stmts.adb +++ b/src/vhdl/sem_stmts.adb @@ -453,11 +453,10 @@ package body Sem_Stmts is end if; end Sem_Signal_Assignment_Target_And_Option; - -- Semantize a waveform_list WAVEFORM_LIST that is assigned via statement - -- ASSIGN_STMT to a subelement or a slice of a signal SIGNAL_DECL. - procedure Sem_Waveform_Chain - (Waveform_Chain : Iir_Waveform_Element; - Waveform_Type : in out Iir) + -- Analyze a waveform_list WAVEFORM_LIST that is assigned via statement + -- ASSIGN_STMT to a subelement or a slice of a signal SIGNAL_DECL. + procedure Sem_Waveform_Chain (Waveform_Chain : Iir_Waveform_Element; + Waveform_Type : in out Iir) is Expr: Iir; We: Iir_Waveform_Element; @@ -573,8 +572,8 @@ package body Sem_Stmts is end loop; end Sem_Waveform_Chain; - -- Semantize a waveform chain WAVEFORM_CHAIN that is assigned via statement - -- ASSIGN_STMT to a subelement or a slice of a signal SIGNAL_DECL. + -- Analyze a waveform chain WAVEFORM_CHAIN that is assigned via statement + -- ASSIGN_STMT to a subelement or a slice of a signal SIGNAL_DECL. procedure Sem_Check_Waveform_Chain (Assign_Stmt: Iir; Waveform_Chain: Iir_Waveform_Element) is @@ -924,7 +923,7 @@ package body Sem_Stmts is Sem_Report_Statement (Stmt); end Sem_Assertion_Statement; - -- Semantize a list of case choice LIST, and check for correct CHOICE type. + -- Analyze a list of case choice LIST, and check for correct CHOICE type. procedure Sem_Case_Choices (Choice : Iir; Chain : in out Iir; Loc : Location_Type) is @@ -1443,7 +1442,7 @@ package body Sem_Stmts is if Get_Kind (Inst) in Iir_Kinds_Denoting_Name then Comp := Get_Named_Entity (Inst); if Comp /= Null_Iir then - -- Already semantized before, while trying to separate + -- Already analyzed before, while trying to separate -- concurrent procedure calls from instantiation stmts. pragma Assert (Get_Kind (Comp) = Iir_Kind_Component_Declaration); return Comp; @@ -1629,7 +1628,7 @@ package body Sem_Stmts is if Guard /= Null_Iir then -- LRM93 9.1 -- The type of the guard expression must be type BOOLEAN. - -- GHDL: guard expression must be semantized before creating the + -- GHDL: guard expression must be analyzed before creating the -- implicit GUARD signal, since the expression may reference GUARD. Set_Expr_Staticness (Guard, None); Set_Name_Staticness (Guard, Locally); diff --git a/src/vhdl/sem_stmts.ads b/src/vhdl/sem_stmts.ads index 5c4b7cf9b..8fbbef617 100644 --- a/src/vhdl/sem_stmts.ads +++ b/src/vhdl/sem_stmts.ads @@ -18,20 +18,20 @@ with Iirs; use Iirs; package Sem_Stmts is - -- Semantize declarations and concurrent statements of BLK, which is + -- Analyze declarations and concurrent statements of BLK, which is -- either an architecture_declaration, and entity_declaration or -- a block_statement. - -- If SEM_DECLS is true, then semantize the declarations of BLK. + -- If SEM_DECLS is true, then analyze the declarations of BLK. procedure Sem_Block (Blk: Iir; Sem_Decls : Boolean); -- Analyze the concurrent statements of PARENT. procedure Sem_Concurrent_Statement_Chain (Parent : Iir); - -- Semantize declaration chain and sequential statement chain + -- Analyze declaration chain and sequential statement chain -- of BODY_PARENT. -- DECL is the declaration for these chains (DECL is the declaration, which -- is different from the bodies). - -- This is used by processes and subprograms semantization. + -- This is used by processes and subprograms analyze. procedure Sem_Sequential_Statements (Decl : Iir; Body_Parent : Iir); -- Sem for concurrent and sequential assertion statements. diff --git a/src/vhdl/sem_types.adb b/src/vhdl/sem_types.adb index 47559c354..4b033ddfb 100644 --- a/src/vhdl/sem_types.adb +++ b/src/vhdl/sem_types.adb @@ -493,7 +493,7 @@ package body Sem_Types is end case; end Check_No_File_Type; - -- Semantize the array_element type of array type DEF. + -- Analyze the array_element type of array type DEF. -- Set resolved_flag of DEF. procedure Sem_Array_Element (Def : Iir) is @@ -823,7 +823,7 @@ package body Sem_Types is function Sem_Record_Type_Definition (Def: Iir) return Iir is - -- Semantized type of previous element + -- Analyzed type of previous element Last_Type : Iir; El_List : constant Iir_List := Get_Elements_Declaration_List (Def); @@ -2107,7 +2107,7 @@ package body Sem_Types is return Type_Mark; end if; - -- Semantize the type mark. + -- Analyze the type mark. Type_Mark_Name := Get_Subtype_Type_Mark (Def); Type_Mark_Name := Sem_Type_Mark (Type_Mark_Name); Set_Subtype_Type_Mark (Def, Type_Mark_Name); diff --git a/src/vhdl/sem_types.ads b/src/vhdl/sem_types.ads index 8eb7de108..d701d5a81 100644 --- a/src/vhdl/sem_types.ads +++ b/src/vhdl/sem_types.ads @@ -18,9 +18,9 @@ with Iirs; use Iirs; package Sem_Types is - -- Semantization of types (LRM93 3 / LRM08 5) + -- Analyze of types (LRM93 3 / LRM08 5) - -- Semantize subtype indication DEF. + -- Analyze subtype indication DEF. -- If INCOMPLETE is TRUE, then DEF may designate an incomplete type -- definition. Return either a name (denoting a type) or an anonymous -- subtype definition. diff --git a/src/vhdl/simulate/sim_be.adb b/src/vhdl/simulate/sim_be.adb index 49a146879..59eacc814 100644 --- a/src/vhdl/simulate/sim_be.adb +++ b/src/vhdl/simulate/sim_be.adb @@ -30,12 +30,12 @@ package body Sim_Be is procedure Finish_Compilation (Unit: Iir_Design_Unit; Main: Boolean := False) is use Ada.Text_IO; - Lib_Unit : Iir; + Lib_Unit : constant Iir := Get_Library_Unit (Unit); begin - Lib_Unit := Get_Library_Unit (Unit); -- Semantic analysis. + if Flags.Verbose then - Put_Line ("semantize " & Disp_Node (Lib_Unit)); + Put_Line ("analyze " & Disp_Node (Lib_Unit)); end if; Sem.Semantic (Unit); diff --git a/src/vhdl/translate/ortho_front.adb b/src/vhdl/translate/ortho_front.adb index 35a756011..55f076659 100644 --- a/src/vhdl/translate/ortho_front.adb +++ b/src/vhdl/translate/ortho_front.adb @@ -363,7 +363,7 @@ package body Ortho_Front is raise Compilation_Error; end if; - -- Semantize all design units. + -- Analyze all design units. -- FIXME: outdate the design file? New_Design_File := Null_Iir; Design := Get_First_Design_Unit (Res); diff --git a/src/vhdl/translate/trans_be.adb b/src/vhdl/translate/trans_be.adb index dd1b6c338..8a8fa63ee 100644 --- a/src/vhdl/translate/trans_be.adb +++ b/src/vhdl/translate/trans_be.adb @@ -32,22 +32,15 @@ package body Trans_Be is (Unit : Iir_Design_Unit; Main : Boolean := False) is use Ada.Text_IO; - Lib : Iir; + Lib : constant Iir := Get_Library_Unit (Unit); begin - -- No need to semantize during elaboration. - --if Flags.Will_Elaborate then - -- return; - --end if; - - Lib := Get_Library_Unit (Unit); - if (Main or Flags.Dump_All) and then Flags.Dump_Parse then Disp_Tree.Disp_Tree (Unit); end if; -- Semantic analysis. if Flags.Verbose then - Put_Line ("semantize " & Disp_Node (Lib)); + Put_Line ("analyze " & Disp_Node (Lib)); end if; Sem.Semantic (Unit); -- cgit v1.2.3