aboutsummaryrefslogtreecommitdiffstats
path: root/translate/translation.adb
diff options
context:
space:
mode:
authorgingold <gingold@b72b5c32-5f01-0410-b925-b5c7b92870f7>2008-01-15 05:53:39 +0000
committergingold <gingold@b72b5c32-5f01-0410-b925-b5c7b92870f7>2008-01-15 05:53:39 +0000
commiteb4d862a6b8ac3991dac9a8bc2fb0b9d9830e951 (patch)
tree3944b708fedbc9f955f09f947cd4377c286a9127 /translate/translation.adb
parent861828b455955858709dfda217af0188cfdef799 (diff)
downloadghdl-eb4d862a6b8ac3991dac9a8bc2fb0b9d9830e951.tar.gz
ghdl-eb4d862a6b8ac3991dac9a8bc2fb0b9d9830e951.tar.bz2
ghdl-eb4d862a6b8ac3991dac9a8bc2fb0b9d9830e951.zip
synchronize: add support for MacOSX, fix bogus type conversion
Diffstat (limited to 'translate/translation.adb')
-rw-r--r--translate/translation.adb26
1 files changed, 15 insertions, 11 deletions
diff --git a/translate/translation.adb b/translate/translation.adb
index 90f961f0a..8ce7e0f4d 100644
--- a/translate/translation.adb
+++ b/translate/translation.adb
@@ -11794,15 +11794,16 @@ package body Translation is
begin
Obj := Sem_Names.Name_To_Object (Expr);
if Obj /= Null_Iir then
- case Get_Kind (Get_Base_Name (Obj)) is
- when Iir_Kind_Signal_Declaration
- | Iir_Kind_Signal_Interface_Declaration
- | Iir_Kind_Guard_Signal_Declaration
- | Iir_Kinds_Signal_Attribute =>
- return True;
- when others =>
- return False;
- end case;
+ return Is_Signal_Object (Obj);
+-- case Get_Kind (Get_Base_Name (Obj)) is
+-- when Iir_Kind_Signal_Declaration
+-- | Iir_Kind_Signal_Interface_Declaration
+-- | Iir_Kind_Guard_Signal_Declaration
+-- | Iir_Kinds_Signal_Attribute =>
+-- return True;
+-- when others =>
+-- return False;
+-- end case;
else
return False;
end if;
@@ -26794,9 +26795,9 @@ package body Translation is
(Mark, Name_Table.Get_Identifier ("DEFAULT_CONFIG"));
Chap1.Translate_Configuration_Declaration (El);
Pop_Identifier_Prefix (Mark);
- Pop_Identifier_Prefix (Mark_Entity);
- Pop_Identifier_Prefix (Mark_Sep);
Pop_Identifier_Prefix (Mark_Arch);
+ Pop_Identifier_Prefix (Mark_Sep);
+ Pop_Identifier_Prefix (Mark_Entity);
end;
else
Chap1.Translate_Configuration_Declaration (El);
@@ -28308,6 +28309,7 @@ package body Translation is
Assoc : O_Assoc_List;
Instance : O_Dnode;
Arch_Instance : O_Dnode;
+ Mark : Id_Mark_Type;
begin
Arch_Info := Get_Info (Arch);
Entity_Info := Get_Info (Entity);
@@ -28376,6 +28378,7 @@ package body Translation is
-- init instance
Push_Scope (Entity_Info.Block_Decls_Type, Instance);
+ Push_Identifier_Prefix (Mark, "");
Chap1.Translate_Entity_Init (Entity);
-- elab instance
@@ -28390,6 +28393,7 @@ package body Translation is
New_Association (Assoc, New_Obj_Value (Arch_Instance));
New_Procedure_Call (Assoc);
+ Pop_Identifier_Prefix (Mark);
Pop_Scope (Entity_Info.Block_Decls_Type);
Finish_Subprogram_Body;