X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tool%2Ftool.cpp;h=a82d5875f2a40630cfc1252f5a99ac920bdfc60c;hb=29fafaa2c570b0cf92f41eeb534cfb65a841a892;hp=5f9febeedda26d87a749551de4035d7ee6e07a30;hpb=19179a622c1de88de5ed7047643eec79f285bf2a;p=libs%2Fdatafile.git

diff --git a/tool/tool.cpp b/tool/tool.cpp
index 5f9febe..a82d587 100644
--- a/tool/tool.cpp
+++ b/tool/tool.cpp
@@ -4,79 +4,126 @@
 #include <msp/io/file.h>
 #include <msp/datafile/parser.h>
 #include <msp/datafile/statement.h>
-#include <msp/datafile/writer.h>
 #include "compiler.h"
+#include "packer.h"
 #include "tool.h"
 
 using namespace std;
 using namespace Msp;
 
 DataTool::DataTool(int argc, char **argv):
-	in_fn("-"),
 	out_fn("-"),
 	binary(false),
 	compile(false),
-	float_size(0)
+	float_size(0),
+	compress(false),
+	pack(false),
+	debug(false)
 {
 	GetOpt getopt;
 	getopt.add_option('b', "binary", binary, GetOpt::NO_ARG);
 	getopt.add_option('c', "compile", compile, GetOpt::NO_ARG);
 	getopt.add_option('f', "float-size", float_size, GetOpt::REQUIRED_ARG);
+	getopt.add_option('g', "debug", debug, GetOpt::NO_ARG);
 	getopt.add_option('o', "output", out_fn, GetOpt::REQUIRED_ARG);
+	getopt.add_option('p', "pack", pack, GetOpt::NO_ARG);
+	getopt.add_option('z', "compress", compress, GetOpt::NO_ARG);
 	getopt(argc, argv);
 
-	const vector<string> &args = getopt.get_args();
-	if(!args.empty())
-		in_fn = args[0];
+	in_fns = getopt.get_args();
+	if(in_fns.empty())
+		in_fns.push_back("-");
+
+	if(pack && out_fn=="-")
+		throw usage_error("Can't write pack to stdout");
 }
 
 int DataTool::main()
 {
-	IO::Base *in;
-	if(in_fn=="-")
-		in = &IO::cin;
+	if(pack)
+		do_pack();
+	else if(compile)
+		do_compile();
 	else
-		in = new IO::File(in_fn);
+		do_transfer();
 
-	IO::Base *out;
-	if(out_fn=="-")
-		out = &IO::cout;
-	else
-		out = new IO::File(out_fn, IO::M_WRITE);
+	return 0;
+}
 
+void DataTool::do_transfer()
+{
+	IO::Base *out = open_output(out_fn);
+	DataFile::Writer *writer = create_writer(*out);
+
+	for(vector<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
 	{
-		IO::Buffered in_buf(*in);
-		DataFile::Parser parser(in_buf, in_fn);
-		IO::Buffered out_buf(*out);
-		DataFile::Writer writer(out_buf);
-		if(binary)
-			writer.set_binary(true);
-		if(float_size)
-			writer.set_float_precision(float_size);
-
-		if(compile)
-		{
-			Compiler compiler(writer);
-			compiler.load(parser);
-		}
-		else
+		IO::Base *in = open_input(*i);
+		DataFile::Parser parser(*in, *i);
+
+		while(parser)
 		{
-			while(parser)
-			{
-				DataFile::Statement st = parser.parse();
-				if(st.valid)
-				{
-					writer.write(st);
-					out_buf.flush();
-				}
-			}
+			DataFile::Statement st = parser.parse(true);
+			if(st.valid && (!st.control || st.keyword=="__src" || debug))
+				writer->write(st);
 		}
+
+		delete in;
 	}
 
-	if(in!=&IO::cin)
+	delete writer;
+	delete out;
+}
+
+void DataTool::do_compile()
+{
+	IO::Base *out = open_output(out_fn);
+	DataFile::Writer *writer = create_writer(*out);
+
+	Compiler compiler(*writer);
+	for(vector<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
+	{
+		IO::Base *in = open_input(*i);
+		DataFile::Parser parser(*in, *i);
+		compiler.load(parser);
 		delete in;
-	if(out!=&IO::cout)
-		delete out;
+	}
 
-	return 0;
+	delete writer;
+	delete out;
+}
+
+void DataTool::do_pack()
+{
+	Packer packer(*this);
+	for(vector<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
+		packer.pack_file(*i);
+	packer.create_pack(out_fn);
+}
+
+IO::Base *DataTool::open_output(const string &fn)
+{
+	if(fn=="-")
+		return new IO::Buffered(IO::cout);
+	else
+		return new IO::BufferedFile(fn, IO::M_WRITE);
+}
+
+IO::Base *DataTool::open_input(const string &fn)
+{
+	if(fn=="-")
+		return new IO::Buffered(IO::cin);
+	else
+		return new IO::BufferedFile(fn, IO::M_READ);
+}
+
+DataFile::Writer *DataTool::create_writer(IO::Base &out)
+{
+	DataFile::Writer *writer = new DataFile::Writer(out);
+	if(compress)
+		writer->set_compressed();
+	if(binary)
+		writer->set_binary(true);
+	if(float_size)
+		writer->set_float_precision(float_size);
+	return writer;
 }