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

Author: marsupial

src/liboslcomp/ast.cpp

@@ -284,14 +284,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;
 }
 
 
@@ -531,11 +537,12 @@ ASTvariable_declaration::ASTvariable_declaration (OSLCompilerImpl *comp,
       m_isparam(isparam), m_isoutput(isoutput), m_ismetadata(ismeta),
       m_initlist(initlist)
 {
+    if (! check_reserved ())
+        return;
+
     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

@@ -18,4 +18,18 @@ test.osl:35: error: redefinition of function: int redclfunc (int).
 test.osl:40: error: redefinition of builtin function: string concat (string, string).
 test.osl:43: error: redefinition of function: void redclfunc ().
 		previous declaration was at test.osl:42
+test.osl:46: error: 'this' not allowed in this context
+test.osl:51: error: 'this' not allowed in this context
+test.osl:52: error: 'this' not allowed in this context
+test.osl:52: error: 'this' was not declared in this scope
+test.osl:53: error: 'this' not allowed in this context
+test.osl:53: error: 'this' was not declared in this scope
+test.osl:53: error: type 'unknown' does not have a member 'obj'
+test.osl:54: error: 'this' not allowed in this context
+test.osl:55: error: 'this' not allowed in this context
+test.osl:57: error: 'this' not allowed in this context
+test.osl:58: error: 'this' not allowed in this context
+test.osl:59: error: 'this' not allowed in this context
+test.osl:60: error: 'this' not allowed in this context
+test.osl:62: error: 'this' not allowed in this context
 FAILED test.osl

testsuite/oslc-err-names/test.osl

@@ -39,11 +39,29 @@ float redclfunc (float f) { return 0.0; } // ok
 
 string concat (string a, string b) { return ""; }  // fail
 
-void redclfunc () { int a = 10; }
-void redclfunc () { int a = 10; }
+void redclfunc () { int a = 10; } // ok
+void redclfunc () { int a = 10; } // fail
 
-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)
 {
     redclfunc(5);
     concat("a", "b");
 }
+