Add ASTfieldselect base class in preparation for color/vector rgb selectors.

Author: marsupial

src/liboslcomp/ast.cpp

@@ -694,12 +694,12 @@ ASTindex::childname (size_t i) const
 
 ASTstructselect::ASTstructselect (OSLCompilerImpl *comp, ASTNode *expr,
                                   ustring field)
-    : ASTNode (structselect_node, comp, 0, expr), m_field(field),
+    : ASTfieldselect (structselect_node, comp, expr, field),
       m_structid(-1), m_fieldid(-1), m_fieldsym(NULL)
 {
     m_fieldsym = find_fieldsym (m_structid, m_fieldid);
     if (m_fieldsym) {
-        m_fieldname = m_fieldsym->name();
+        m_fullname = m_fieldsym->name();
         m_typespec = m_fieldsym->typespec();
     }
 }
@@ -712,12 +712,7 @@ ASTstructselect::ASTstructselect (OSLCompilerImpl *comp, ASTNode *expr,
 Symbol *
 ASTstructselect::find_fieldsym (int &structid, int &fieldid)
 {
-    if (! lvalue()->typespec().is_structure() &&
-        ! lvalue()->typespec().is_structure_array()) {
-        error ("type '%s' does not have a member '%s'",
-               type_c_str(lvalue()->typespec()), m_field);
-        return NULL;
-    }
+    ASSERT (lvalue()->typespec().is_structure_based());
 
     ustring structsymname;
     TypeSpec structtype;
@@ -763,8 +758,7 @@ ASTstructselect::find_structsym (ASTNode *structnode, ustring &structname,
     // or array of structs) down to a symbol that represents the
     // particular field.  In the process, we set structname and its
     // type structtype.
-    ASSERT (structnode->typespec().is_structure() ||
-            structnode->typespec().is_structure_array());
+    ASSERT (structnode->typespec().is_structure_based());
     if (structnode->nodetype() == variable_ref_node) {
         // The structnode is a top-level struct variable
         ASTvariable_ref *var = (ASTvariable_ref *) structnode;
@@ -811,6 +805,21 @@ ASTstructselect::print (std::ostream &out, int indentlevel) const
 
 
 
+ASTfieldselect* ASTfieldselect::create (OSLCompilerImpl *comp, ASTNode *expr,
+                                        ustring field) {
+    if (expr->typespec().is_structure_based())
+        return new ASTstructselect (comp, expr, field);
+
+    comp->error (comp->filename(), comp->lineno(),
+                 "type '%s' does not have a member '%s'",
+                 comp->type_c_str(expr->typespec()), field);
+
+    // Don't leak expr node
+    delete expr;
+    return nullptr;
+}
+
+
 const char *
 ASTconditional_statement::childname (size_t i) const
 {

src/liboslcomp/ast.h

@@ -588,7 +588,28 @@ class ASTindex : public ASTNode
 
 
 
-class ASTstructselect : public ASTNode
+class ASTfieldselect : public ASTNode
+{
+protected:
+    ASTfieldselect (NodeType type, OSLCompilerImpl *comp, ASTNode *expr,
+                    ustring field) :
+        ASTNode(type, comp, Nothing, expr), m_field(field) {}
+
+    ustring m_field;          ///< Name of the field
+    ustring m_fullname;       ///< Full name of variable and field
+
+public:
+    static ASTfieldselect* create (OSLCompilerImpl *comp, ASTNode *expr,
+                                   ustring field);
+
+    ustring field () const { return m_field; }
+    ustring fullname () const { return m_fullname; }
+    ref lvalue () const { return child (0); }
+};
+
+
+
+class ASTstructselect : public ASTfieldselect
 {
 public:
     ASTstructselect (OSLCompilerImpl *comp, ASTNode *expr, ustring field);
@@ -602,9 +623,7 @@ class ASTstructselect : public ASTNode
     /// field.
     void codegen_assign (Symbol *dest, Symbol *src);
 
-    ref lvalue () const { return child (0); }
-    ustring field () const { return m_field; }
-    ustring fieldname () const { return m_fieldname; }
+    ustring fieldname () const { return fullname(); }
     Symbol *fieldsym () const { return m_fieldsym; }
 
 private:
@@ -613,10 +632,8 @@ class ASTstructselect : public ASTNode
                                  TypeSpec &structtype);
     Symbol *codegen_index ();
 
-    ustring m_field;         ///< Name of the field
     int m_structid;          ///< index of the structure
     int m_fieldid;           ///< index of the field within the structure
-    ustring m_fieldname;     ///< Name of the field variable
     Symbol *m_fieldsym;      ///< Symbol of the field variable
 };
 

src/liboslcomp/oslgram.y

@@ -780,7 +780,7 @@ id_or_field
                 }
         | variable_lvalue '.' IDENTIFIER
                 {
-                    $$ = new ASTstructselect (oslcompiler, $1, ustring($3));
+                    $$ = ASTfieldselect::create (oslcompiler, $1, ustring($3));
                 }
         ;
 

testsuite/oslc-err-field/ref/out.txt

@@ -1,3 +1,6 @@
-test.osl:8: error: type 'color' does not have a member 'nope'
-test.osl:11: error: struct type 'custom' does not have a member 'bad'
+test.osl:11: error: type 'color' does not have a member 'invalid'
+test.osl:12: error: type 'color' does not have a member 'nope'
+test.osl:15: error: struct type 'custom' does not have a member 'bad'
+test.osl:18: error: type 'color' does not have a member 'sinvalid'
+test.osl:19: error: type 'color' does not have a member 'error'
 FAILED test.osl

testsuite/oslc-err-field/test.osl

@@ -1,12 +1,20 @@
 // Test invalid field selections in function calls
 
 struct custom { float field; };
+struct A { color valid; };
+struct B { A a; };
+struct C { B b; };
 
 shader test ()
 {
     color c = color(4,3,2);
+    c.invalid = 45;
     printf("c.nope: %g\n", c.nope);
 
     custom cc = { 1 };
     printf("cc.bad: %g\n", cc.bad);
+
+    C nested;
+    nested.b.a.valid.sinvalid = color(1);
+    printf("nested.b.a.valid.error: %g\n", nested.b.a.valid.error);
 }