move cli.h to include/mecab

Author: jeongukjae

extensions/python/mecab/_C/cli.h

@@ -1,9 +1,37 @@
 #include <iostream>
 
 #include "PythonCommon.h"
-#include "cli.h"
+#include "mecab/cli.h"
 #include "tagger.h"
 
+#define ADD_MECAB_CLI(function_name, function_to_run) \
+ static PyObject* function_name(PyObject* self, PyObject* args) { \
+ PyObject* list = NULL; \
+ if (!PyArg_UnpackTuple(args, "args", 1, 1, &list)) { \
+ PyErr_SetString(PyExc_ValueError, "#function_name takes only 1 argument"); \
+ return NULL; \
+ } \
+ if (!PyList_Check(list)) { \
+ PyErr_SetString(PyExc_TypeError, "argument must be list of str"); \
+ return NULL; \
+ } \
+ size_t argc = PyList_Size(list); \
+ char** argv = new char*[argc]; \
+ for (size_t i = 0; i < argc; ++i) { \
+ PyObject* item = PyList_GetItem(list, i); \
+ if (!PyUnicode_Check(item)) { \
+ PyErr_SetString(PyExc_ValueError, "argument must be list of str"); \
+ return NULL; \
+ } \
+ item = PyUnicode_AsUTF8String(item); \
+ argv[i] = PyBytes_AsString(item); \
+ } \
+ function_to_run(argc, argv); \
+ delete[] argv; \
+ Py_INCREF(Py_None); \
+ return Py_None; \
+ }
+
 ADD_MECAB_CLI(mecab_main_python, mecab_main);
 ADD_MECAB_CLI(mecab_dict_index_python, mecab_dict_index);
 ADD_MECAB_CLI(mecab_dict_gen_python, mecab_dict_gen);

extensions/python/mecab/_C/mecab.cc

@@ -26,7 +26,7 @@ def get_coverage_args_for_ld():
 
 mecab = Extension(
  "mecab._C",
- sources=["mecab/_C/mecab.cc", "mecab/_C/tagger.cc", "mecab/_C/cli.cc",],
+ sources=["mecab/_C/mecab.cc", "mecab/_C/tagger.cc"],
  libraries=get_libraries(),
  include_dirs=["../../include"],
  extra_compile_args=["-std=c++11"] + get_coverage_args_for_cc(),

extensions/python/setup.py

@@ -1,4 +1,5 @@
-#include "cli.h"
+#ifndef __MECAB_CLI_H__
+#define __MECAB_CLI_H__
 
 #include "mecab/cost_trainer.h"
 #include "mecab/dictionary_compiler.h"
@@ -176,3 +177,5 @@ int mecab_dict_index(int argc, char** argv) {
 int mecab_cost_train(int argc, char** argv) {
  return MeCab::Learner::run(argc, argv);
 }
+
+#endif // __MECAB_CLI_H__