From 5f833feb2a256db055ac9dd2b867cfce9cb8e081 Mon Sep 17 00:00:00 2001 From: Bartosz Broda <bartosz.broda@gmail.com> Date: Fri, 10 Jun 2011 14:29:12 +0200 Subject: [PATCH] add stubs for mwe implementation --- libmwereader/CMakeLists.txt | 2 +- libmwereader/mwe.cpp | 0 libmwereader/mwe.h | 29 +++++++++++++++++++++++++++++ libmwereader/mweparser.cpp | 14 ++++++++------ libmwereader/mweparser.h | 7 ++++++- 5 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 libmwereader/mwe.cpp create mode 100644 libmwereader/mwe.h diff --git a/libmwereader/CMakeLists.txt b/libmwereader/CMakeLists.txt index f1cd0ac..706c765 100644 --- a/libmwereader/CMakeLists.txt +++ b/libmwereader/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(${LibXML++_INCLUDE_DIRS}) link_directories(${LibXML++_LIBRARY_DIRS}) set(LIBS ${LIBS} ${LibXML++_LIBRARIES}) -add_library(corpus2_mwereader SHARED mwereader.cpp ) +add_library(corpus2_mwereader SHARED mwereader.cpp mwe.cpp ) target_link_libraries(corpus2_mwereader corpus2) diff --git a/libmwereader/mwe.cpp b/libmwereader/mwe.cpp new file mode 100644 index 0000000..e69de29 diff --git a/libmwereader/mwe.h b/libmwereader/mwe.h new file mode 100644 index 0000000..2527d4b --- /dev/null +++ b/libmwereader/mwe.h @@ -0,0 +1,29 @@ +#ifndef LIBMWEREADER_MWE_H +#define LIBMWEREADER_MWE_H + +#include <libcorpus2/io/reader.h> + +namespace Corpus2 { + +class LexicalUnit +{ + +}; + +class FixedLU : public LexicalUnit +{ + +}; + +class FlexLU : public LexicalUnit +{ + +}; + +class MWEIndex // lub base -> vector<LexicalUnit> +{ +}; + +}// ns Corpus2 + +#endif //LIBMWEREADER_MWE_H diff --git a/libmwereader/mweparser.cpp b/libmwereader/mweparser.cpp index 60ccdb0..6cedc52 100644 --- a/libmwereader/mweparser.cpp +++ b/libmwereader/mweparser.cpp @@ -103,16 +103,16 @@ namespace Corpus2 { } } - void MWEParser::print_current_mwe(bool with_condition) + void MWEParser::print_current_mwe(bool with_condition, std::ostream &out) { - std::cout << "Forma podstawowa: " << mwe_base_ << "\nZmienne: "; + out << "Forma podstawowa: " << mwe_base_ << "\nZmienne: "; foreach(str_map::value_type &i, variables_) - std::cout << i.first << ": " << i.second << ", "; - std::cout << "\nWarunek głowy: " << head_cond_ << "\n"; + out << i.first << ": " << i.second << ", "; + out << "\nWarunek głowy: " << head_cond_ << "\n"; if(with_condition){ - std::cout << "Grupa jednostek: " << group_name_ << std::endl; - std::cout << "Operator: " << wccl_operator_ << std::endl; + out << "Grupa jednostek: " << group_name_ << std::endl; + out << "Operator: " << wccl_operator_ << std::endl; } @@ -124,6 +124,8 @@ namespace Corpus2 { boost::algorithm::trim(str); grab_characters_ = false; return str; + + //std::pair<wcclptr, wcclptr, map<string,string>, string, type> } } // ns Corpus2 diff --git a/libmwereader/mweparser.h b/libmwereader/mweparser.h index 4ccdaf3..81313e5 100644 --- a/libmwereader/mweparser.h +++ b/libmwereader/mweparser.h @@ -6,6 +6,10 @@ namespace Corpus2 { +class MWEBuilder +{ + +}; class MWEParser : public BasicSaxParser { @@ -20,7 +24,8 @@ protected: void on_end_element(const Glib::ustring &name); std::string finish_get_text(); - void print_current_mwe(bool with_condition = false); + void print_current_mwe(bool with_condition = false, + std::ostream& out = std::cout); /// retrives tagset= attribute -- GitLab