phrase-extract: add syntax-common sub-library

And remove some (near-)duplicate code from pcfg-common and score-stsg.

6 files changed, 44 insertions, 42 deletions

diff --git a/phrase-extract/pcfg-score/main.cc b/phrase-extract/pcfg-score/main.cc
index da5392add..5ce19f797 100644
--- a/phrase-extract/pcfg-score/main.cc
+++ b/phrase-extract/pcfg-score/main.cc
@@ -20,6 +20,6 @@
 #include "pcfg_score.h"
 
 int main(int argc, char *argv[]) {
-  Moses::PCFG::PcfgScore tool;
+  MosesTraining::Syntax::PCFG::PcfgScore tool;
   return tool.Main(argc, argv);
 }
diff --git a/phrase-extract/pcfg-score/options.h b/phrase-extract/pcfg-score/options.h
index fd54b4b6b..bbd56d6d0 100644
--- a/phrase-extract/pcfg-score/options.h
+++ b/phrase-extract/pcfg-score/options.h
@@ -23,16 +23,16 @@
 
 #include <string>
 
-namespace Moses
-{
-namespace PCFG
-{
+namespace MosesTraining {
+namespace Syntax {
+namespace PCFG {
 
 struct Options {
   std::string pcfg_file;
 };
 
 }  // namespace PCFG
-}  // namespace Moses
+}  // namespace Syntax
+}  // namespace MosesTraining
 
 #endif
diff --git a/phrase-extract/pcfg-score/pcfg_score.cc b/phrase-extract/pcfg-score/pcfg_score.cc
index 345d7fc60..a561c18ed 100644
--- a/phrase-extract/pcfg-score/pcfg_score.cc
+++ b/phrase-extract/pcfg-score/pcfg_score.cc
@@ -19,18 +19,6 @@
 
 #include "pcfg_score.h"
 
-#include "options.h"
-#include "tree_scorer.h"
-
-#include "pcfg-common/exception.h"
-#include "pcfg-common/pcfg.h"
-#include "pcfg-common/pcfg_tree.h"
-#include "pcfg-common/syntax_tree.h"
-#include "pcfg-common/typedef.h"
-#include "pcfg-common/xml_tree_parser.h"
-
-#include <boost/program_options.hpp>
-
 #include <cassert>
 #include <cstdlib>
 #include <fstream>
@@ -40,8 +28,21 @@
 #include <set>
 #include <string>
 #include <vector>
+#include "options.h"
+#include "tree_scorer.h"
+
+#include <boost/program_options.hpp>
+
+#include "syntax-common/exception.h"
+
+#include "pcfg-common/pcfg.h"
+#include "pcfg-common/pcfg_tree.h"
+#include "pcfg-common/syntax_tree.h"
+#include "pcfg-common/typedef.h"
+#include "pcfg-common/xml_tree_parser.h"
 
-namespace Moses {
+namespace MosesTraining {
+namespace Syntax {
 namespace PCFG {
 
 int PcfgScore::Main(int argc, char *argv[]) {
@@ -149,4 +150,5 @@ void PcfgScore::ProcessOptions(int argc, char *argv[], Options &options) const {
 }
 
 }  // namespace PCFG
-}  // namespace Moses
+}  // namespace Syntax
+}  // namespace MosesTraining
diff --git a/phrase-extract/pcfg-score/pcfg_score.h b/phrase-extract/pcfg-score/pcfg_score.h
index f49c9a0be..fb9971c35 100644
--- a/phrase-extract/pcfg-score/pcfg_score.h
+++ b/phrase-extract/pcfg-score/pcfg_score.h
@@ -23,23 +23,22 @@
 
 #include "pcfg-common/tool.h"
 
-namespace Moses
-{
-namespace PCFG
-{
+namespace MosesTraining {
+namespace Syntax {
+namespace PCFG {
 
-class Options;
+struct Options;
 
-class PcfgScore : public Tool
-{
-public:
+class PcfgScore : public Tool {
+ public:
   PcfgScore() : Tool("pcfg-score") {}
   virtual int Main(int, char *[]);
-private:
+ private:
   void ProcessOptions(int, char *[], Options &) const;
 };
 
 }  // namespace PCFG
-}  // namespace Moses
+}  // namespace Syntax
+}  // namespace MosesTraining
 
 #endif
diff --git a/phrase-extract/pcfg-score/tree_scorer.cc b/phrase-extract/pcfg-score/tree_scorer.cc
index f9ce97ae0..53b6aaccf 100644
--- a/phrase-extract/pcfg-score/tree_scorer.cc
+++ b/phrase-extract/pcfg-score/tree_scorer.cc
@@ -21,7 +21,8 @@
 
 #include <cassert>
 
-namespace Moses {
+namespace MosesTraining {
+namespace Syntax {
 namespace PCFG {
 
 TreeScorer::TreeScorer(const Pcfg &pcfg, const Vocabulary &non_term_vocab)
@@ -65,4 +66,5 @@ bool TreeScorer::Score(PcfgTree &root) const {
 }
 
 }  // namespace PCFG
-}  // namespace Moses
+}  // namespace Syntax
+}  // namespace MosesTraining
diff --git a/phrase-extract/pcfg-score/tree_scorer.h b/phrase-extract/pcfg-score/tree_scorer.h
index 8cb59c0c2..3cf4693a6 100644
--- a/phrase-extract/pcfg-score/tree_scorer.h
+++ b/phrase-extract/pcfg-score/tree_scorer.h
@@ -25,26 +25,25 @@
 #include "pcfg-common/pcfg_tree.h"
 #include "pcfg-common/typedef.h"
 
-namespace Moses
-{
-namespace PCFG
-{
-
-class TreeScorer
-{
-public:
+namespace MosesTraining {
+namespace Syntax {
+namespace PCFG {
+
+class TreeScorer {
+ public:
   TreeScorer(const Pcfg &, const Vocabulary &);
 
   // Score tree according to PCFG.  Returns false if unsuccessful (due to
   // missing rule).
   bool Score(PcfgTree &) const;
 
-private:
+ private:
   const Pcfg &pcfg_;
   const Vocabulary &non_term_vocab_;
 };
 
 }  // namespace PCFG
-}  // namespace Moses
+}  // namespace Syntax
+}  // namespace MosesTraining
 
 #endif