#include "common/Script.h"
#include "common/Spell.h"
#include "common/Stats.h"
-#include "math/Fixed.h"
-#include "math/Vector.h"
#include "graphics/CharSelect.h"
#include "graphics/ComplexAnimation.h"
#include "graphics/Font.h"
#include "graphics/Sprite.h"
#include "graphics/Texture.h"
#include "loader/Caster.h"
+#include "loader/Compiler.h"
#include "loader/Interpreter.h"
+#include "loader/Loader.h"
#include "loader/ParsedSource.h"
#include "loader/Parser.h"
#include "loader/TypeDescription.h"
#include "map/MapState.h"
#include "map/Tile.h"
#include "map/Trigger.h"
+#include "math/Fixed.h"
+#include "math/Vector.h"
#include "menu/Resources.h"
#include "sdl/InitImage.h"
#include "sdl/InitScreen.h"
using common::GameState;
using common::Hero;
using common::Spell;
-using math::Fixed;
-using math::Vector;
using graphics::Texture;
using loader::Caster;
+using loader::Compiler;
using loader::Interpreter;
+using loader::Loader;
using loader::ParsedSource;
using loader::Parser;
using loader::TypeDescription;
using map::Entity;
using map::MapState;
+using math::Fixed;
+using math::Vector;
using sdl::InitImage;
using sdl::InitScreen;
using sdl::InitSDL;
ParsedSource source;
+ Loader ld;
+
for (vector<char *>::const_iterator i(args.Infiles().begin()), end(args.Infiles().end()); i != end; ++i) {
- Parser(*i, source).Parse();
+ string filePath(*i);
+ switch (filePath[filePath.size() - 1]) {
+ case 'o':
+ ld.Load(filePath);
+ break;
+ case 's':
+ Parser(filePath, source).Parse();
+ break;
+ default:
+ throw std::runtime_error("don't know what to do with " + filePath);
+ }
}
+ Interpreter intp(source);
+ intp.ReadSource();
+
switch (args.GetRunLevel()) {
case Arguments::WRITE:
{
source.WriteHeader(outstream);
break;
}
+ case 'o': {
+ std::fstream outstream(args.OutfilePath(), std::ios_base::out|std::ios_base::trunc);
+ outstream.flush();
+ outstream.close();
+ outstream.open(args.OutfilePath());
+ outstream.exceptions(std::ios_base::badbit|std::ios_base::failbit);
+ Compiler(intp).Write(outstream);
+ break;
+ }
default: {
throw std::runtime_error(string("don't know how to write file ") + args.OutfilePath());
}
return 0;
}
case Arguments::DUMP: {
- std::cout << source << std::endl;
+ std::cout << source << ld << std::endl;
return 0;
}
case Arguments::SOURCE_WIKI: {
break;
}
- Interpreter intp(source);
- intp.ReadSource();
-
if (intp.PostponedDefinitions().size() > 0) {
for (vector<Interpreter::PostponedDefinition>::const_iterator i(intp.PostponedDefinitions().begin()), end(intp.PostponedDefinitions().end()); i != end; ++i) {
std::cerr << "missing definition of " << TypeDescription::Get(i->type).TypeName() << " " << i->identifier << std::endl;
return 3;
}
- Caster caster(intp);
+ Caster caster(ld, intp);
GameState gameState;