enable scaling

This commit is contained in:
Stefan Tröger
2013-06-08 16:17:05 +02:00
committed by Stefan Tröger
parent 8dabdf2eaf
commit 35783e778a
30 changed files with 819 additions and 206 deletions

View File

@@ -20,6 +20,10 @@
#ifndef DCM_PARSER_H
#define DCM_PARSER_H
#ifndef BOOST_SPIRIT_USE_PHOENIX_V3
#define BOOST_SPIRIT_USE_PHOENIX_V3
#endif
#include <iosfwd>
#include <boost/spirit/include/qi.hpp>
@@ -55,13 +59,13 @@ static void print(std::string s) {
};
template<typename Sys>
struct parser : qi::grammar<IIterator, typename Sys::Cluster*(Sys*), qi::locals<int>, qi::space_type> {
struct parser : qi::grammar<IIterator, typename Sys::Cluster*(Sys*), qi::locals<int, std::vector<typename Sys::Cluster*> >, qi::space_type> {
typedef typename Sys::Cluster graph;
parser();
qi::rule<IIterator, graph*(Sys*), qi::locals<int>, qi::space_type> cluster;
qi::rule<IIterator, graph*(Sys*), qi::locals<int, std::vector<graph*> >, qi::space_type> cluster;
details::cluster_prop_par<Sys> cluster_prop;
details::obj_par<Sys> objects;