Macintosh-Tools
/
Retro68
mirror of https://github.com/autc04/Retro68.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merging and solving conflicts.

This commit is contained in:
DarwinNE 2020-01-12 22:20:26 +01:00
parent f6fa98c8dd 8391611859
commit 7b176b3d9b
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Console/retro/InitConsole.cc
View File

@ -17,8 +17,8 @@
permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
You should have received a copy of the GNU General Public License
along with Retro68. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License
along with Retro68. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string>

19
Rez/Test/UnitTests.cc
View File

@ -12,17 +12,22 @@
BOOST_AUTO_TEST_SUITE(LexSuite)
int tokenToType(RezParser::token::yytokentype tok)
{
return RezParser::by_type(tok).type_get();
}
#define CHECKSYM(TOKEN, TYPE, VAL) \
do { \
RezSymbol t = lex.nextToken(); \
BOOST_CHECK_EQUAL(t.token(), TOKEN); \
if(t.token() == TOKEN) \
BOOST_CHECK_EQUAL(t.type_get(), tokenToType(TOKEN)); \
if(t.type_get() == tokenToType(TOKEN)) \
BOOST_CHECK_EQUAL(t.value.as<TYPE>(), VAL); \
} while(0)
#define CHECKSYM_(TOKEN) \
do { \
RezSymbol t = lex.nextToken(); \
BOOST_CHECK_EQUAL(t.token(), TOKEN); \
BOOST_CHECK_EQUAL(t.type_get(), tokenToType(TOKEN)); \
} while(0)
BOOST_AUTO_TEST_CASE(moveBisonSymbol)
@ -55,7 +60,7 @@ BOOST_AUTO_TEST_CASE(basicInt)
CHECKSYM(RezParser::token::INTLIT, int, 123);
CHECKSYM(RezParser::token::INTLIT, int, 0x456);
CHECKSYM(RezParser::token::INTLIT, int, 0xabcd9);
CHECKSYM_(0);
CHECKSYM_((RezParser::token::yytokentype)0);
}
BOOST_AUTO_TEST_CASE(alternateHex)
@ -65,7 +70,7 @@ BOOST_AUTO_TEST_CASE(alternateHex)
CHECKSYM(RezParser::token::INTLIT, int, 0x456);
CHECKSYM(RezParser::token::INTLIT, int, 0xabcd9);
CHECKSYM_(0);
CHECKSYM_((RezParser::token::yytokentype)0);
}
BOOST_AUTO_TEST_CASE(noNewlineAtEOF)
@ -74,7 +79,7 @@ BOOST_AUTO_TEST_CASE(noNewlineAtEOF)
RezLexer lex(world, "test", "123 456");
CHECKSYM(RezParser::token::INTLIT, int, 123);
CHECKSYM(RezParser::token::INTLIT, int, 456);
CHECKSYM_(0);
CHECKSYM_((RezParser::token::yytokentype)0);
}
BOOST_AUTO_TEST_CASE(strings)
@ -94,7 +99,7 @@ BOOST_AUTO_TEST_CASE(strings)
CHECKSYM(RezParser::token::STRINGLIT, std::string, "\001\002\003");
CHECKSYM(RezParser::token::STRINGLIT, std::string, "\x42\x43");
CHECKSYM(RezParser::token::STRINGLIT, std::string, "Blah \x5F");
CHECKSYM_(0);
CHECKSYM_((RezParser::token::yytokentype)0);
}
BOOST_AUTO_TEST_SUITE_END()