Skip to content

Commit

Permalink
flixel.input.gamepad.mappings: fix dead code in getID() functions
Browse files Browse the repository at this point in the history 
The if-statements were not in the return path of the block, as NONE was the last expression in it. Since the ifs are side-effect-free, they were simply DCE'd by Haxe's analyzer.
Using guards fixes this and also makes the code nicer.
  • Loading branch information
@Gama11
Gama11 committed Aug 26, 2016
1 parent 5442d02 commit c04ce96
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 81 deletions.
19 changes: 9 additions & 10 deletions flixel/input/gamepad/mappings/LogitechMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,15 @@ class LogitechMapping extends FlxGamepadMapping
case LogitechID.DPAD_RIGHT: DPAD_RIGHT;
case LogitechID.DPAD_UP: DPAD_UP;
case LogitechID.LOGITECH: GUIDE;
default:
if (rawID == LogitechID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == LogitechID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == LogitechID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == LogitechID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
if (rawID == LogitechID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP;
if (rawID == LogitechID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN;
if (rawID == LogitechID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT;
if (rawID == LogitechID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN;
case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT;
case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP;
case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN;
case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT;
case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT;
case _: NONE;
}
}

Expand Down
19 changes: 9 additions & 10 deletions flixel/input/gamepad/mappings/MFiMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,15 @@ class MFiMapping extends FlxGamepadMapping
case MFiID.DPAD_DOWN: DPAD_DOWN;
case MFiID.DPAD_LEFT: DPAD_LEFT;
case MFiID.DPAD_RIGHT: DPAD_RIGHT;
default:
if (rawID == MFiID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == MFiID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == MFiID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == MFiID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
if (rawID == MFiID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP;
if (rawID == MFiID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN;
if (rawID == MFiID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT;
if (rawID == MFiID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN;
case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT;
case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP;
case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN;
case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT;
case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT;
case _: NONE;
}
}

Expand Down
21 changes: 10 additions & 11 deletions flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class MayflashWiiRemoteMapping extends FlxGamepadMapping

override function initValues():Void
{
//But you'll only get non-zero values for it when the Nunchuk is attached
// but you'll only get non-zero values for it when the Nunchuk is attached
supportsPointer = true;
}

Expand Down Expand Up @@ -51,16 +51,15 @@ class MayflashWiiRemoteMapping extends FlxGamepadMapping
case MayflashWiiRemoteID.CLASSIC_DPAD_DOWN: DPAD_DOWN;
case MayflashWiiRemoteID.CLASSIC_DPAD_LEFT: DPAD_LEFT;
case MayflashWiiRemoteID.CLASSIC_DPAD_RIGHT: DPAD_RIGHT;
default:
if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
if (rawID == MayflashWiiRemoteID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP;
if (rawID == MayflashWiiRemoteID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN;
if (rawID == MayflashWiiRemoteID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT;
if (rawID == MayflashWiiRemoteID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN;
case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT;
case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP;
case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN;
case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT;
case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT;
case _: NONE;
}
}

Expand Down
19 changes: 9 additions & 10 deletions flixel/input/gamepad/mappings/OUYAMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,15 @@ class OUYAMapping extends FlxGamepadMapping
case OUYAID.DPAD_DOWN: DPAD_DOWN;
case OUYAID.DPAD_LEFT: DPAD_LEFT;
case OUYAID.DPAD_RIGHT: DPAD_RIGHT;
default:
if (rawID == OUYAID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == OUYAID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == OUYAID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == OUYAID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
if (rawID == OUYAID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP;
if (rawID == OUYAID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN;
if (rawID == OUYAID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT;
if (rawID == OUYAID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN;
case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT;
case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP;
case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN;
case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT;
case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT;
case _: NONE;
}
}

Expand Down
19 changes: 9 additions & 10 deletions flixel/input/gamepad/mappings/PS4Mapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,15 @@ class PS4Mapping extends FlxGamepadMapping
case PS4ID.DPAD_UP: DPAD_UP;
case PS4ID.DPAD_LEFT: DPAD_LEFT;
case PS4ID.DPAD_RIGHT: DPAD_RIGHT;
default:
if (rawID == PS4ID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == PS4ID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == PS4ID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == PS4ID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
if (rawID == PS4ID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP;
if (rawID == PS4ID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN;
if (rawID == PS4ID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT;
if (rawID == PS4ID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN;
case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT;
case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP;
case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN;
case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT;
case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT;
case _: NONE;
}
}

Expand Down
19 changes: 9 additions & 10 deletions flixel/input/gamepad/mappings/PSVitaMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,15 @@ class PSVitaMapping extends FlxGamepadMapping
case PSVitaID.DPAD_UP: DPAD_UP;
case PSVitaID.DPAD_LEFT: DPAD_LEFT;
case PSVitaID.DPAD_RIGHT: DPAD_RIGHT;
default:
if (rawID == PSVitaID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == PSVitaID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == PSVitaID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == PSVitaID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
if (rawID == PSVitaID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP;
if (rawID == PSVitaID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN;
if (rawID == PSVitaID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT;
if (rawID == PSVitaID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_UP;
case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT;
case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP;
case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN;
case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT;
case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT;
case _: NONE;
}
}

Expand Down
19 changes: 9 additions & 10 deletions flixel/input/gamepad/mappings/WiiRemoteMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,15 @@ class WiiRemoteMapping extends FlxGamepadMapping
case WiiRemoteID.CLASSIC_DPAD_RIGHT: DPAD_RIGHT;
case WiiRemoteID.CLASSIC_ONE: EXTRA_0;
case WiiRemoteID.CLASSIC_TWO: EXTRA_1;
default:
if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
if (rawID == WiiRemoteID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP;
if (rawID == WiiRemoteID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN;
if (rawID == WiiRemoteID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT;
if (rawID == WiiRemoteID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN;
case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT;
case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP;
case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN;
case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT;
case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT;
case _: NONE;
}
}

Expand Down
19 changes: 9 additions & 10 deletions flixel/input/gamepad/mappings/XInputMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,15 @@ class XInputMapping extends FlxGamepadMapping
case XInputID.DPAD_DOWN: DPAD_DOWN;
case XInputID.DPAD_LEFT: DPAD_LEFT;
case XInputID.DPAD_RIGHT: DPAD_RIGHT;
default:
if (rawID == XInputID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == XInputID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == XInputID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == XInputID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
if (rawID == XInputID.RIGHT_ANALOG_STICK.rawUp) RIGHT_STICK_DIGITAL_UP;
if (rawID == XInputID.RIGHT_ANALOG_STICK.rawDown) RIGHT_STICK_DIGITAL_DOWN;
if (rawID == XInputID.RIGHT_ANALOG_STICK.rawLeft) RIGHT_STICK_DIGITAL_LEFT;
if (rawID == XInputID.RIGHT_ANALOG_STICK.rawRight) RIGHT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == leftStick.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == leftStick.rawDown): LEFT_STICK_DIGITAL_DOWN;
case id if (id == leftStick.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == leftStick.rawRight): LEFT_STICK_DIGITAL_RIGHT;
case id if (id == rightStick.rawUp): RIGHT_STICK_DIGITAL_UP;
case id if (id == rightStick.rawDown): RIGHT_STICK_DIGITAL_DOWN;
case id if (id == rightStick.rawLeft): RIGHT_STICK_DIGITAL_LEFT;
case id if (id == rightStick.rawRight): RIGHT_STICK_DIGITAL_RIGHT;
case _: NONE;
}
}

Expand Down

0 comments on commit c04ce96

Please sign in to comment.