TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

interrogate: fix regression with setter of MAKE_PROPERTY2

Browse Source 
See also tobspr/RenderPipeline#86
This commit is contained in:
rdb 2017-10-17 21:18:51 +02:00
parent bb60e8c373
commit dee8d83998
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/src/cppparser/cppBison.cxx.prebuilt
View File

@ -4420,9 +4420,9 @@ yyreduce:
make_property->_has_function = hasser->as_function_group(); make_property->_has_function = hasser->as_function_group();
} }
CPPDeclaration *setter = (yyvsp[-6].u.identifier)->find_symbol(current_scope, global_scope, current_lexer); CPPDeclaration *setter = (yyvsp[-4].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
if (setter == nullptr || setter->get_subtype() != CPPDeclaration::ST_function_group) { if (setter == nullptr || setter->get_subtype() != CPPDeclaration::ST_function_group) {
yyerror("reference to non-existent or invalid setter: " + (yyvsp[-6].u.identifier)->get_fully_scoped_name(), (yylsp[-6])); yyerror("reference to non-existent or invalid setter: " + (yyvsp[-4].u.identifier)->get_fully_scoped_name(), (yylsp[-4]));
} else { } else {
make_property->_set_function = setter->as_function_group(); make_property->_set_function = setter->as_function_group();
} }

4
dtool/src/cppparser/cppBison.yxx
View File

@ -793,9 +793,9 @@ declaration:
make_property->_has_function = hasser->as_function_group(); make_property->_has_function = hasser->as_function_group();
} }
CPPDeclaration *setter = $7->find_symbol(current_scope, global_scope, current_lexer); CPPDeclaration *setter = $9->find_symbol(current_scope, global_scope, current_lexer);
if (setter == nullptr || setter->get_subtype() != CPPDeclaration::ST_function_group) { if (setter == nullptr || setter->get_subtype() != CPPDeclaration::ST_function_group) {
yyerror("reference to non-existent or invalid setter: " + $7->get_fully_scoped_name(), @7); yyerror("reference to non-existent or invalid setter: " + $9->get_fully_scoped_name(), @9);
} else { } else {
make_property->_set_function = setter->as_function_group(); make_property->_set_function = setter->as_function_group();
} }