ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3014 from lioncash/cpath 

ExpressionParser: Make all control paths return a value in operator std::string
This commit is contained in:
Scott Mansell 2015-09-10 14:48:30 +12:00
parent 38d05cd70f 88c9c6d086
commit f2771695a2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
View File

@ -63,8 +63,6 @@ public:
{ {
switch (type) switch (type)
{ {
case TOK_INVALID:
return "Invalid";
case TOK_DISCARD: case TOK_DISCARD:
return "Discard"; return "Discard";
case TOK_EOF: case TOK_EOF:
@ -83,7 +81,11 @@ public:
return "+"; return "+";
case TOK_CONTROL: case TOK_CONTROL:
return "Device(" + (std::string)qualifier + ")"; return "Device(" + (std::string)qualifier + ")";
case TOK_INVALID:
break;
} }
return "Invalid";
} }
}; };