Declarator -> symbol conversion to match C implementation

Still missing: attribute-weak parsing

Author: tautschnig

src/cpp/cpp_declarator_converter.cpp

@@ -436,58 +436,50 @@ symbolt &cpp_declarator_convertert::convert_new_symbol(
   symbol.base_name=base_name;
   symbol.value=declarator.value();
   symbol.location=declarator.name().source_location();
+  symbol.is_extern = storage_spec.is_extern();
   symbol.is_parameter = declarator.get_is_parameter();
+  symbol.is_weak = storage_spec.is_weak();
   symbol.mode=linkage_spec==ID_auto?ID_cpp:linkage_spec;
   symbol.module=cpp_typecheck.module;
   symbol.type=final_type;
   symbol.is_type=is_typedef;
   symbol.is_macro=is_typedef && !is_template_parameter;
   symbol.pretty_name=pretty_name;
 
+  if(is_code && !symbol.is_type)
+  {
+    // it is a function
+    symbol.is_static_lifetime = false;
+    symbol.is_thread_local = false;
 
-  if(member_spec.is_inline())
-    symbol.type.set(ID_C_inlined, true);
+    symbol.is_file_local = storage_spec.is_static();
 
-  if(!symbol.is_type)
+    if(member_spec.is_inline())
+      symbol.type.set(ID_C_inlined, true);
+  }
+  else
   {
-    if(is_code)
-    {
-      // it is a function
-      if(storage_spec.is_static())
-        symbol.is_file_local=true;
-    }
-    else
-    {
-      // it is a variable
-      symbol.is_state_var=true;
-      symbol.is_lvalue = !is_reference(symbol.type) &&
-                         !(symbol.type.get_bool(ID_C_constant) &&
-                         is_number(symbol.type) &&
-                         symbol.value.id() == ID_constant);
-
-      if(cpp_typecheck.cpp_scopes.current_scope().is_global_scope())
-      {
-        symbol.is_static_lifetime=true;
-
-        if(storage_spec.is_extern())
-          symbol.is_extern=true;
-      }
-      else
-      {
-        if(storage_spec.is_static())
-        {
-          symbol.is_static_lifetime=true;
-          symbol.is_file_local=true;
-        }
-        else if(storage_spec.is_extern())
-        {
-          cpp_typecheck.error().source_location=storage_spec.location();
-          cpp_typecheck.error() << "external storage not permitted here"
-                                << messaget::eom;
-          throw 0;
-        }
-      }
-    }
+    symbol.is_lvalue = !is_reference(symbol.type) &&
+                       !(symbol.type.get_bool(ID_C_constant) &&
+                       is_number(symbol.type) &&
+                       symbol.value.id() == ID_constant);
+
+    symbol.is_static_lifetime =
+      !symbol.is_macro && !symbol.is_type &&
+      (cpp_typecheck.cpp_scopes.current_scope().is_global_scope() ||
+       storage_spec.is_static());
+
+    symbol.is_thread_local =
+      (!symbol.is_static_lifetime && !storage_spec.is_extern()) ||
+      storage_spec.is_thread_local();
+
+    symbol.is_file_local =
+      symbol.is_macro ||
+      (!cpp_typecheck.cpp_scopes.current_scope().is_global_scope() &&
+       !storage_spec.is_extern()) ||
+      (cpp_typecheck.cpp_scopes.current_scope().is_global_scope() &&
+       storage_spec.is_static()) ||
+      symbol.is_parameter;
   }
 
   if(symbol.is_static_lifetime)

src/cpp/cpp_storage_spec.h

@@ -36,6 +36,7 @@ class cpp_storage_spect:public irept
   bool is_mutable()      const { return get_bool(ID_mutable); }
   bool is_thread_local() const { return get_bool(ID_thread_local); }
   bool is_asm()          const { return get_bool(ID_asm); }
+  bool is_weak()         const { return get_bool(ID_weak); }
 
   void set_static()       { set(ID_static, true); }
   void set_extern()       { set(ID_extern, true); }
@@ -44,12 +45,13 @@ class cpp_storage_spect:public irept
   void set_mutable()      { set(ID_mutable, true); }
   void set_thread_local() { set(ID_thread_local, true); }
   void set_asm()          { set(ID_asm, true); }
+  void set_weak()         { set(ID_weak, true); }
 
   bool is_empty() const
   {
     return !is_static() && !is_extern() && !is_auto() &&
            !is_register() && !is_mutable() && !is_thread_local() &&
-           !is_asm();
+           !is_asm() && !is_weak();
   }
 };