X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tool%2Ftool.cpp;h=d0499cb663970c818f3f2d8dfeced6bdf31d48e0;hb=8955db30f9cd1c1566b349da29e669f065f84e36;hp=ca415d30a0d9dc7d996d84b62021be90bc054f9e;hpb=db9c49893c2a9475cb5efa4a53bc481a5f66231f;p=libs%2Fdatafile.git

diff --git a/tool/tool.cpp b/tool/tool.cpp
index ca415d3..d0499cb 100644
--- a/tool/tool.cpp
+++ b/tool/tool.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/core/getopt.h>
 #include <msp/io/buffered.h>
 #include <msp/io/console.h>
@@ -12,64 +5,106 @@ Distributed under the LGPL
 #include <msp/datafile/parser.h>
 #include <msp/datafile/statement.h>
 #include <msp/datafile/writer.h>
+#include "compiler.h"
 #include "tool.h"
 
 using namespace std;
 using namespace Msp;
 
 DataTool::DataTool(int argc, char **argv):
-	in_fn("-"),
-	out_fn("-")
+	out_fn("-"),
+	binary(false),
+	compile(false),
+	float_size(0),
+	compress(false)
 {
 	GetOpt getopt;
-	getopt.add_option('o', "output", out_fn, GetOpt::REQUIRED_ARG);
 	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('o', "output", out_fn, GetOpt::REQUIRED_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("-");
 }
 
 int DataTool::main()
 {
-	IO::Base *in;
-	if(in_fn=="-")
-		in=&IO::cin;
+	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(*out);
+	set_writer_parameters(writer);
+
+	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);
+		IO::Base *in = open_input(*i);
+		DataFile::Parser parser(*in, *i);
 
 		while(parser)
 		{
-			DataFile::Statement st=parser.parse();
+			DataFile::Statement st = parser.parse();
 			if(st.valid)
-			{
 				writer.write(st);
-				out_buf.flush();
-			}
 		}
+
+		delete in;
 	}
 
-	if(in!=&IO::cin)
+	delete out;
+}
+
+void DataTool::do_compile()
+{
+	IO::Base *out = open_output(out_fn);
+	DataFile::Writer writer(*out);
+	set_writer_parameters(writer);
+
+	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 out;
+}
+
+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);
 }
 
-Application::RegApp<DataTool> DataTool::reg;
+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);
+}
+
+void DataTool::set_writer_parameters(DataFile::Writer &writer)
+{
+	if(compress)
+		writer.set_compressed();
+	if(binary)
+		writer.set_binary(true);
+	if(float_size)
+		writer.set_float_precision(float_size);
+}