games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Fix some warnings, Add headers to the solution

Browse Source
This commit is contained in:
Dmitry Orlov 2021-09-05 15:23:36 +03:00 committed by Andrii Danylchenko
parent 093076c6d0
commit ec7453ae85
6 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripting/erm/CMakeLists.txt
View File

@ -7,7 +7,14 @@ set(lib_SRCS
ERMScriptModule.cpp
)
add_library(vcmiERM SHARED ${lib_SRCS})
set(lib_HDRS
StdInc.h
ERMParser.h
ERMInterpreter.h
ERMScriptModule.h
)
add_library(vcmiERM SHARED ${lib_SRCS} ${lib_HDRS})
target_link_libraries(vcmiERM ${Boost_LIBRARIES} vcmi)
vcmi_set_output_dir(vcmiERM "scripting")

8
scripting/erm/ERMInterpreter.cpp
View File

@ -1282,7 +1282,7 @@ namespace ERMConverter
ERM::Tidentifier tid = trig.identifier.get();
if(tid.size() == 0)
if(tid.empty())
throw EInterpreterError("Function must have identifier");
Variable v = boost::apply_visitor(LVL1IexpToVar(), tid[0]);
@ -1432,7 +1432,7 @@ bool ERMInterpreter::isATrigger( const ERM::TLine & line )
case 0: //v-exp
{
TVExp vexp = boost::get<TVExp>(line);
if(vexp.children.size() == 0)
if(vexp.children.empty())
return false;
switch (getExpType(vexp.children[0]))
@ -1614,7 +1614,7 @@ namespace VERMInterpreter
if(asSymbol)
{
children.resize(children.size()+1);
for(int i=children.size()-1; i >0; i--)
for(auto i=children.size()-1; i >0; i--)
{
children[i] = children[i-1];
}
@ -1718,7 +1718,7 @@ namespace VERMInterpreter
}
VOption OptionConverterVisitor::operator()( ERM::TSymbol const& cmd ) const
{
if(cmd.symModifier.size() == 0)
if(cmd.symModifier.empty())
return VSymbol(cmd.sym);
else
return VNode(cmd);

3
scripting/erm/ERMParser.cpp
View File

@ -187,7 +187,8 @@ std::vector<LineInfo> ERMParser::parseFile(CERMPreprocessor & preproc)
}
catch (ParseErrorException & e)
{
logGlobal->error("Stopped parsing file.");
logGlobal->error("ERM Parser Error. File: '%s' Line: %d Exception: '%s'"
, preproc.getCurFileName(), preproc.getCurLineNo(), e.what());
throw;
}
return ret;

5
scripting/erm/ERMParser.h
View File

@ -37,6 +37,11 @@ public:
{
return lineNo;
}
const std::string& getCurFileName() const
{
return fname;
}
};
//various classes that represent ERM/VERM AST

2
test/CMakeLists.txt
View File

@ -40,9 +40,11 @@ set(test_SRCS
erm/ERM_MF.cpp
erm/ERM_TM_T.cpp
erm/ERM_VR.cpp
erm/ERM_UN.cpp
erm/ERMPersistenceTest.cpp
erm/ExamplesTest.cpp
erm/interpretter/ERM_VR.cpp
erm/interpretter/ERM_UN.cpp
erm/interpretter/ErmRunner.cpp
events/ApplyDamageTest.cpp

28
test/erm/interpretter/ERM_UN.cpp Normal file
View File

@ -0,0 +1,28 @@
/*
* ERM_UN.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
#include "ErmRunner.h"
namespace test
{
namespace scripting
{
using namespace ::testing;
TEST(ERM_UN_B, AnyInteger_ShouldGenerateIntToStringConversionAndSetStatement)
{
LuaStrings lua = ErmRunner::convertErmToLua({ "!#UN:B;" });
ASSERT_EQ(lua.lines.size(), 9) << lua.text;
EXPECT_EQ(lua.lines[ErmRunner::REGULAR_INSTRUCTION_FIRST_LINE], "ERM.UN():B(x)");
}
}
}