SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add capital literal parsing and tests

Browse Source
This commit is contained in:
Vasily
2019-05-25 18:49:42 +02:00
committed by username223
parent d5cb19cea1
commit f72e1b2541
2 changed files with 200 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/keyboard_input/input_parser.cpp
+106 -6
View File
@@ -57,7 +57,97 @@ std::optional<Token> getFunctionNumber( const char& character )
}
}
std::optional<Token> checkIfLegalCapitalLiteral( std::string input ) {}
std::optional<Token> checkIfLegalCapitalLiteral( std::string input )
{
// C++ can't do string comparisons in switches. :(
if ( input == "BACKSPACE" )
{
return Token::KEY_BACKSPACE;
}
if ( input == "SPACE" )
{
return Token::KEY_SPACE;
}
if ( input == "TAB" )
{
return Token::KEY_TAB;
}
if ( input == "ESC" )
{
return Token::KEY_ESC;
}
if ( input == "INS" )
{
return Token::KEY_INS;
}
if ( input == "DEL" )
{
return Token::KEY_DEL;
}
if ( input == "END" )
{
return Token::KEY_END;
}
if ( input == "PGDN" )
{
return Token::KEY_PGDN;
}
if ( input == "PGUP" )
{
return Token::KEY_PGUP;
}
if ( input == "CAPS" )
{
return Token::KEY_CAPS;
}
if ( input == "PRNSCRN" )
{
return Token::KEY_PRNSCRN;
}
if ( input == "PAUSE" )
{
return Token::KEY_PAUSE;
}
if ( input == "SCRLOCK" )
{
return Token::KEY_SCRLOCK;
}
if ( input == "LEFTARROW" )
{
return Token::KEY_LEFTARROW;
}
if ( input == "RIGHTARROW" )
{
return Token::KEY_RIGHTARROW;
}
if ( input == "UPARROW" )
{
return Token::KEY_UPARROW;
}
if ( input == "DOWNARROW" )
{
return Token::KEY_DOWNARROW;
}
if ( input == "KPSLASH" )
{
return Token::KEY_KPSLASH;
}
if ( input == "KPSTAR" )
{
return Token::KEY_KPSTAR;
}
if ( input == "KPMINUS" )
{
return Token::KEY_KPMINUS;
}
if ( input == "KPPLUS" )
{
return Token::KEY_KPPLUS;
}
// LOG incorrect character
return std::nullopt;
}
std::vector<Token> ParseKeyboardInputsToTokens( const std::string inputs )
{
@@ -111,13 +201,23 @@ std::vector<Token> ParseKeyboardInputsToTokens( const std::string inputs )
std::string characters = "";
characters.push_back( *ch );
while ( auto a = checkIfLegalCapitalLiteral( characters ) )
while ( ch + 1 != end )
{
++ch;
characters.push_back( *ch );
if ( auto c = checkIfLegalCapitalLiteral( characters );
c.has_value() )
{
tokens.push_back( *c );
characters.clear();
// break out of the while
break;
}
}
if ( ch == end )
{
break;
}
// while not recognized character
// ++ch
// if end break
// add token
}
return tokens;
test/keyboard_input/tst_parsertest.cpp
+94 -3
View File
@@ -2,8 +2,6 @@
#include <QDebug>
#include "input_parser.h"
// add necessary includes here
class ParserTest : public QObject
{
Q_OBJECT
@@ -30,6 +28,14 @@ private slots:
void releaseHeldKeys();
void capitalLiterals();
void abortedCapitalLiterals();
void multipleCapitalLiterals();
void sixtyfourBackspacesBenchmarked();
void sixtyfourAsBenchmarked();
};
const std::string alphabet = "abcdefghijklmnopqrstuvxyz";
@@ -284,6 +290,91 @@ void ParserTest::capitalLiterals()
QVERIFY( t == e );
}
void ParserTest::abortedCapitalLiterals()
{
auto t = ParseKeyboardInputsToTokens( "aKPPL" );
auto e = std::vector<Token>( { Token::KEY_a } );
QVERIFY( t == e );
t = ParseKeyboardInputsToTokens( "aKPPLasd" );
e = std::vector<Token>( { Token::KEY_a } );
QVERIFY( t == e );
t = ParseKeyboardInputsToTokens( "aDOESNTEXIST" );
e = std::vector<Token>( { Token::KEY_a } );
QVERIFY( t == e );
t = ParseKeyboardInputsToTokens( "aBACKSPACEBACK" );
e = std::vector<Token>( { Token::KEY_a, Token::KEY_BACKSPACE } );
QVERIFY( t == e );
}
void ParserTest::multipleCapitalLiterals()
{
auto t = ParseKeyboardInputsToTokens( "BACKSPACEa" );
auto e = std::vector<Token>( { Token::KEY_BACKSPACE, Token::KEY_a } );
QCOMPARE( t, e );
t = ParseKeyboardInputsToTokens( "BACKSPACEBACKSPACE" );
e = std::vector<Token>( { Token::KEY_BACKSPACE, Token::KEY_BACKSPACE } );
QVERIFY( t == e );
t = ParseKeyboardInputsToTokens( "BACKSPACEaBACKSPACE" );
e = std::vector<Token>(
{ Token::KEY_BACKSPACE, Token::KEY_a, Token::KEY_BACKSPACE } );
QVERIFY( t == e );
t = ParseKeyboardInputsToTokens( "F1BACKSPACEaBACKSPACE" );
e = std::vector<Token>( { Token::KEY_F1,
Token::KEY_BACKSPACE,
Token::KEY_a,
Token::KEY_BACKSPACE } );
QVERIFY( t == e );
t = ParseKeyboardInputsToTokens( "F1BACKSPACEaBACKSPACe" );
e = std::vector<Token>(
{ Token::KEY_F1, Token::KEY_BACKSPACE, Token::KEY_a } );
QVERIFY( t == e );
}
void ParserTest::sixtyfourBackspacesBenchmarked()
{
constexpr auto sixtyfourBackspaces
= "BACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKS"
"PACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEB"
"ACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSP"
"ACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBA"
"CKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPA"
"CEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBAC"
"KSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPAC"
"EBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACKSPACEBACK"
"SPACEBACKSPACEBACKSPACEBACKSPACE";
auto t = ParseKeyboardInputsToTokens( sixtyfourBackspaces );
std::vector<Token> e( 64, Token::KEY_BACKSPACE );
QVERIFY( t == e );
QBENCHMARK
{
auto t = ParseKeyboardInputsToTokens( sixtyfourBackspaces );
}
}
void ParserTest::sixtyfourAsBenchmarked()
{
constexpr auto sixtyfourBackspaces
= "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
auto t = ParseKeyboardInputsToTokens( sixtyfourBackspaces );
std::vector<Token> e( 64, Token::KEY_a );
QVERIFY( t == e );
QBENCHMARK
{
auto t = ParseKeyboardInputsToTokens( sixtyfourBackspaces );
}
}
QTEST_APPLESS_MAIN( ParserTest )
#include "tst_parsertest.moc"
#include "./release/tst_parsertest.moc"