Fail gracefully and continue parsing when using 'this' keyword.

Author: marsupial

src/liboslcomp/ast.cpp

@@ -324,14 +324,20 @@ ASTnamed_symbol::ASTnamed_symbol (NodeType node_type, OSLCompilerImpl *comp,
 
 
 
-void
+bool
 ASTnamed_symbol::check_reserved (ustring name, OSLCompilerImpl *comp)
 {
     if (Strutil::starts_with(name, "___")) {
         comp->error (comp->filename(), comp->lineno(),
                      "'%s' : sorry, can't start with three underscores",
                      name);
+        return false;
+    } else if (name == "this") {
+        comp->error (comp->filename(), comp->lineno(),
+                     "'this' not allowed in this context");
+        return false;
     }
+    return true;
 }
 
 
@@ -597,6 +603,9 @@ ASTvariable_declaration::ASTvariable_declaration (OSLCompilerImpl *comp,
       m_isparam(isparam), m_isoutput(isoutput), m_ismetadata(ismeta),
       m_initlist(initlist)
 {
+    if (! check_reserved ())
+        return;
+
     if (m_initlist && init) {
         // Typecheck the init list early.
         ASSERT (init->nodetype() == compound_initializer_node);
@@ -606,8 +615,6 @@ ASTvariable_declaration::ASTvariable_declaration (OSLCompilerImpl *comp,
     m_typespec = type;
     if (! m_ismetadata)
         validate (warn_function_clash);
-    else
-        check_reserved ();
 
     SymType symtype = isparam ? (isoutput ? SymTypeOutputParam : SymTypeParam)
                               : SymTypeLocal;

src/liboslcomp/ast.h

@@ -423,16 +423,16 @@ class ASTnamed_symbol : public ASTNode
     };
 
     /// Validate that m_name is a legal name.
-    static void check_reserved (ustring name, OSLCompilerImpl *comp);
+    static bool check_reserved (ustring name, OSLCompilerImpl *comp);
 
     /// Validate that m_name is a legal name, and doesn't conflict with rules
     /// given in vflags allowing duplicate symbol if its SymType matches allowed.
     static Symbol* validate (ustring name, OSLCompilerImpl *comp,
                              Validation vflags, int allowed = -1);
 
 protected:
-    void check_reserved () {
-        ASTnamed_symbol::check_reserved (m_name, m_compiler);
+    bool check_reserved () {
+        return ASTnamed_symbol::check_reserved (m_name, m_compiler);
     }
 
     Symbol* validate (Validation vflags, int allowed = -1) {

src/liboslcomp/osllex.l

@@ -179,7 +179,7 @@ void preprocess (const char *yytext);
 "bool"|"case"|"char"|"class"|"const"|"default"|"double" |    \
 "enum"|"extern"|"false"|"friend"|"inline"|"long"|"private" | \
 "protected"|"short"|"signed"|"sizeof"|"static"|"struct" |    \
-"switch"|"template"|"this"|"true"|"typedef"|"uniform" |      \
+"switch"|"template"|"true"|"typedef"|"uniform" |      \
 "union"|"unsigned"|"varying"|"virtual" {
                             oslcompiler->error (oslcompiler->filename(),
                                                 oslcompiler->lineno(),

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

@@ -11,4 +11,18 @@ test.osl:21: error: '___threeunderscores' : sorry, can't start with three unders
 test.osl:23: error: '___invalid' : sorry, can't start with three underscores
 test.osl:24: error: '___invalidfield' : sorry, can't start with three underscores
 test.osl:25: error: '___invalidarray' : sorry, can't start with three underscores
+test.osl:29: error: 'this' not allowed in this context
+test.osl:34: error: 'this' not allowed in this context
+test.osl:35: error: 'this' not allowed in this context
+test.osl:35: error: 'this' was not declared in this scope
+test.osl:36: error: 'this' not allowed in this context
+test.osl:36: error: 'this' was not declared in this scope
+test.osl:36: error: type 'unknown' does not have a member 'obj'
+test.osl:37: error: 'this' not allowed in this context
+test.osl:38: error: 'this' not allowed in this context
+test.osl:40: error: 'this' not allowed in this context
+test.osl:41: error: 'this' not allowed in this context
+test.osl:42: error: 'this' not allowed in this context
+test.osl:43: error: 'this' not allowed in this context
+test.osl:45: error: 'this' not allowed in this context
 FAILED test.osl

testsuite/oslc-err-names/test.osl

@@ -25,6 +25,24 @@ struct ___invalid {
     float ___invalidarray[3];
 };
 
-shader test ()
+struct sthis {
+    float this;
+};
+
+struct A { float f; };
+
+void this(float this) {
+    this;
+    this.obj;
+    float this;
+    float this[5];
+
+    float this = 5;
+    float this[2] = { 1, 1 };
+    A this = { 5 };
+}
+
+shader test (output int this = 5)
 {
 }
+