[Scummvm-git-logs] scummvm master -> 4e3b2557da21f293ae328850d44bd0f55d043dbd

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4e3b2557da GLK: ARCHETYPE: Suppress Fallthrough Compiler Warnings


Commit: 4e3b2557da21f293ae328850d44bd0f55d043dbd
    https://github.com/scummvm/scummvm/commit/4e3b2557da21f293ae328850d44bd0f55d043dbd
Author: D G Turner (digitall at scummvm.org)
Date: 2019-11-12T05:16:09Z

Commit Message:
GLK: ARCHETYPE: Suppress Fallthrough Compiler Warnings

Not sure if these fallthroughs are intended, so marked with FIXME comments.

Changed paths:
    engines/glk/archetype/semantic.cpp
    engines/glk/archetype/token.cpp


diff --git a/engines/glk/archetype/semantic.cpp b/engines/glk/archetype/semantic.cpp
index c7ed368..c13b770 100644
--- a/engines/glk/archetype/semantic.cpp
+++ b/engines/glk/archetype/semantic.cpp
@@ -188,6 +188,8 @@ bool verify_expr(progfile &f, ExprTree the_expr) {
 			the_expr->_data._oper.right->_data._ident.ident_kind = ATTRIBUTE_ID;
 			if (the_expr->_data._oper.right->_data._ident.ident_int == 0)
 				success = false;
+			// fallthrough
+			// FIXME: is this fallthrough intentional?
 
 		case OP_ASSIGN:
 		case OP_C_CONCAT:
diff --git a/engines/glk/archetype/token.cpp b/engines/glk/archetype/token.cpp
index 060dd1d..baeb7b7 100644
--- a/engines/glk/archetype/token.cpp
+++ b/engines/glk/archetype/token.cpp
@@ -185,6 +185,8 @@ bool get_token(progfile &f) {
 				switch (next_ch) {
 				case '#':
 					state = COMMENT;
+				// fallthrough
+				// FIXME: is this fallthrough intentional?
 				case ';':
 					if (!f.newlines) {
 						state = START;
@@ -193,12 +195,14 @@ bool get_token(progfile &f) {
 						f.tnum = (int)NEWLINE_CH;
 						state = STOP;
 					}
+					// fallthrough
+					// FIXME: is this fallthrough intentional?
 				default:
 					f.ttype = PUNCTUATION;
 					f.tnum = (int)next_ch;
 					state = STOP;
+					break;
 				}
-				break;
 			}
 			break;