Have SymbolTable track and retrieve the currently opened struct.

Author: marsupial

src/liboslcomp/oslgram.y

@@ -350,6 +350,7 @@ struct_declaration
                 }
           field_declarations '}' ';'
                 {
+                    oslcompiler->symtab().end_struct ();
                     $$ = 0;
                 }
         ;

src/liboslcomp/symtab.cpp

@@ -237,17 +237,25 @@ SymbolTable::insert (Symbol *sym)
 int
 SymbolTable::new_struct (ustring name)
 {
-    int structid = TypeSpec::new_struct (new StructSpec (name, scopeid()));
-    insert (new Symbol (name, TypeSpec ("",structid), SymTypeType));
-    return structid;
+    m_structid = TypeSpec::new_struct (new StructSpec (name, scopeid()));
+    insert (new Symbol (name, TypeSpec ("", m_structid), SymTypeType));
+    return m_structid;
+}
+
+
+
+void
+SymbolTable::end_struct ()
+{
+    m_structid = 0;
 }
 
 
 
 StructSpec *
 SymbolTable::current_struct ()
 {
-    return TypeSpec::struct_list().back().get();
+    return m_structid ? TypeSpec::struct_list().back().get() : nullptr;
 }
 
 

src/liboslcomp/symtab.h

@@ -208,7 +208,7 @@ class SymbolTable {
     typedef SymbolPtrVec::const_iterator const_iterator;
 
     SymbolTable (OSLCompilerImpl &comp)
-        : m_comp(comp), m_scopeid(-1), m_nextscopeid(0)
+        : m_comp(comp), m_scopeid(-1), m_nextscopeid(0), m_structid(0)
     {
         m_scopetables.reserve (20);  // So unlikely to ever copy tables
         push ();                     // Create scope 0 -- global scope
@@ -246,6 +246,8 @@ class SymbolTable {
 
     StructSpec *current_struct ();
 
+    void end_struct ();
+
     /// Return the current scope ID
     ///
     int scopeid () const {
@@ -283,6 +285,7 @@ class SymbolTable {
     ScopeTable m_allmangled;         ///< All syms, mangled, in a hash table
     int m_scopeid;                   ///< Current scope ID
     int m_nextscopeid;               ///< Next unique scope ID
+    int m_structid;                  ///< Currently declaring a struct
 };