godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Many fallthrough switch cases now have the FALLTHROUGH macro to tell the compiler that this is intended. 

(cherry picked from commit 9f0c6a6009)
This commit is contained in:
hbina085 2019-06-28 23:09:59 -04:00 committed by Rémi Verschelde
parent fc18d637a8
commit 8c2e10c393
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/packed_data_container.cpp
View File

@ -224,7 +224,8 @@ uint32_t PackedDataContainer::_pack(const Variant &p_data, Vector<uint8_t> &tmpd
string_cache[s] = tmpdata.size(); string_cache[s] = tmpdata.size();
}; //fallthrough FALLTHROUGH;
};
case Variant::NIL: case Variant::NIL:
case Variant::BOOL: case Variant::BOOL:
case Variant::INT: case Variant::INT:

4
editor/plugins/tile_map_editor_plugin.cpp
View File

@ -61,8 +61,8 @@ void TileMapEditor::_notification(int p_what) {
if (is_visible_in_tree()) { if (is_visible_in_tree()) {
_update_palette(); _update_palette();
} }
FALLTHROUGH;
} // fallthrough }
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {

12
modules/gdscript/gdscript_editor.cpp
View File

@ -2491,7 +2491,8 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base
} break; } break;
case GDScriptParser::COMPLETION_FUNCTION: { case GDScriptParser::COMPLETION_FUNCTION: {
is_function = true; is_function = true;
} // fallthrough FALLTHROUGH;
}
case GDScriptParser::COMPLETION_IDENTIFIER: { case GDScriptParser::COMPLETION_IDENTIFIER: {
_find_identifiers(context, is_function, options); _find_identifiers(context, is_function, options);
} break; } break;
@ -2530,7 +2531,8 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base
} break; } break;
case GDScriptParser::COMPLETION_METHOD: { case GDScriptParser::COMPLETION_METHOD: {
is_function = true; is_function = true;
} // fallthrough FALLTHROUGH;
}
case GDScriptParser::COMPLETION_INDEX: { case GDScriptParser::COMPLETION_INDEX: {
const GDScriptParser::Node *node = parser.get_completion_node(); const GDScriptParser::Node *node = parser.get_completion_node();
if (node->type != GDScriptParser::Node::TYPE_OPERATOR) { if (node->type != GDScriptParser::Node::TYPE_OPERATOR) {
@ -3227,7 +3229,8 @@ Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol
case GDScriptParser::COMPLETION_PARENT_FUNCTION: case GDScriptParser::COMPLETION_PARENT_FUNCTION:
case GDScriptParser::COMPLETION_FUNCTION: { case GDScriptParser::COMPLETION_FUNCTION: {
is_function = true; is_function = true;
} // fallthrough FALLTHROUGH;
}
case GDScriptParser::COMPLETION_IDENTIFIER: { case GDScriptParser::COMPLETION_IDENTIFIER: {
if (!is_function) { if (!is_function) {
@ -3358,7 +3361,8 @@ Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol
} break; } break;
case GDScriptParser::COMPLETION_METHOD: { case GDScriptParser::COMPLETION_METHOD: {
is_function = true; is_function = true;
} // fallthrough FALLTHROUGH;
}
case GDScriptParser::COMPLETION_INDEX: { case GDScriptParser::COMPLETION_INDEX: {
const GDScriptParser::Node *node = parser.get_completion_node(); const GDScriptParser::Node *node = parser.get_completion_node();
if (node->type != GDScriptParser::Node::TYPE_OPERATOR) { if (node->type != GDScriptParser::Node::TYPE_OPERATOR) {

4
platform/windows/os_windows.cpp
View File

@ -827,8 +827,8 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (wParam==VK_WIN) TODO wtf is this? if (wParam==VK_WIN) TODO wtf is this?
meta_mem=uMsg==WM_KEYDOWN; meta_mem=uMsg==WM_KEYDOWN;
*/ */
FALLTHROUGH;
} //fallthrough }
case WM_CHAR: { case WM_CHAR: {
ERR_BREAK(key_event_pos >= KEY_EVENT_BUFFER_SIZE); ERR_BREAK(key_event_pos >= KEY_EVENT_BUFFER_SIZE);

3
scene/resources/particles_material.cpp
View File

@ -184,7 +184,8 @@ void ParticlesMaterial::_update_shader() {
} break; } break;
case EMISSION_SHAPE_DIRECTED_POINTS: { case EMISSION_SHAPE_DIRECTED_POINTS: {
code += "uniform sampler2D emission_texture_normal : hint_black;\n"; code += "uniform sampler2D emission_texture_normal : hint_black;\n";
} //fallthrough FALLTHROUGH;
}
case EMISSION_SHAPE_POINTS: { case EMISSION_SHAPE_POINTS: {
code += "uniform sampler2D emission_texture_points : hint_black;\n"; code += "uniform sampler2D emission_texture_points : hint_black;\n";
code += "uniform int emission_texture_point_count;\n"; code += "uniform int emission_texture_point_count;\n";