Skip to content

Commit

Permalink
[Mod] tapapi: change encoding into GBK.
Browse files Browse the repository at this point in the history
  • Loading branch information
nanoric committed Aug 7, 2019
1 parent 1a82f6c commit e4336b6
Show file tree
Hide file tree
Showing 45 changed files with 4,884 additions and 2,895 deletions.
42 changes: 23 additions & 19 deletions vnpy/api/tap/generate_tap.sh
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
#!/usr/bin/env bash
# autocxxpy version: 0.3.4b
python -m autocxxpy \
vntap \
iTapTradeAPI.h TapQuoteAPI.h TapAPIError.h iTapAPIError.h \
-I vntap/include \
-A custom/custom_wrappers.hpp\
--output-dir vntap/generated_files \
--copy-autocxxpy-includes vntap/include \
--pyi-output-dir . \
\
--no-clear-pyi-output-dir \
\
--output-arg-pattern \
"(.*API::.*(sessionID$|.*ClientBuyOrderNo$|.*ClientSellOrderNo$|.*ClientOrderNo$))|(.*Result)" \
\
--no-callback-pattern \
".*API::.*" \
--no-transform-pattern \
".*Notify::On.*"
c2py generate \
vntap \
iTapTradeAPI.h TapQuoteAPI.h TapAPIError.h iTapAPIError.h \
-I vntap/include \
-A custom/custom_wrappers.hpp\
--output-dir vntap/generated_files \
--copy-c2py-includes vntap/include \
--pyi-output-dir . \
\
--no-clear-pyi-output-dir \
\
--output-arg-pattern \
"(.*API::.*(sessionID$|.*ClientBuyOrderNo$|.*ClientSellOrderNo$|.*ClientOrderNo$))|(.*Result)" \
\
--no-callback-pattern \
".*API::.*" \
--no-transform-pattern \
".*Notify::On.*" \
\
--string-encoding-windows .936 \
--string-encoding-linux zh_CN.GB18030 \
\
--enforce-version 0.5.4

# python generate_error_map.py
Binary file modified vnpy/api/tap/vntap.pyd
Binary file not shown.
4 changes: 2 additions & 2 deletions vnpy/api/tap/vntap/custom/custom_wrappers.hpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include <autocxxpy/callback_wrapper.hpp>
#include <c2py/callback_wrapper.hpp>

#include "iTapTradeAPI.h"

namespace autocxxpy
namespace c2py
{
// TapAPIOrderInfoNotice
struct FixedTapAPIOrderInfoNotice : ITapTrade::TapAPIOrderInfoNotice
Expand Down
4 changes: 3 additions & 1 deletion vnpy/api/tap/vntap/generated_files/config.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#pragma once

#define AUTOCXXPY_ENCODING_UTF8
#define AUTOCXXPY_ENCODING_CUSTOM
#define AUTOCXXPY_ENCODING_CUSTOM_WINDOWS ".936"
#define AUTOCXXPY_ENCODING_CUSTOM_LINUX "zh_CN.GB18030"



Expand Down
18 changes: 17 additions & 1 deletion vnpy/api/tap/vntap/generated_files/generated_functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "config.h"

#include <pybind11/pybind11.h>
#include <autocxxpy/autocxxpy.hpp>
#include <c2py/c2py.hpp>

#include "iTapTradeAPI.h"
#include "TapQuoteAPI.h"
Expand All @@ -13,6 +13,7 @@

void generate_vntap(pybind11::module & parent);
void generate_sub_namespace_ITapTrade(pybind11::module & parent);
void generate_ITapTrade_sub_namespace(pybind11::module & parent);
void generate_class_ITapTrade_TapAPIApplicationInfo(pybind11::object & parent);
void generate_class_ITapTrade_TapAPICommodity(pybind11::object & parent);
void generate_class_ITapTrade_TapAPIContract(pybind11::object & parent);
Expand Down Expand Up @@ -79,7 +80,15 @@ void generate_class_ITapTrade_TapAPIFillLocalRemoveReq(pybind11::object & parent
void generate_class_ITapTrade_TapAPITradingCalendarQryRsp(pybind11::object & parent);
void generate_class_ITapTrade_ITapTradeAPINotify(pybind11::object & parent);
void generate_class_ITapTrade_ITapTradeAPI(pybind11::object & parent);
void generate_ITapTrade_classes(pybind11::module & parent);
void generate_ITapTrade_enums(pybind11::module & parent);
void generate_ITapTrade_functions_0(pybind11::module & parent);
void generate_ITapTrade_functions(pybind11::module & parent);
void generate_ITapTrade_variables(pybind11::module & parent);
void generate_ITapTrade_typedefs(pybind11::module & parent);
void generate_caster_ITapTrade(pybind11::object & parent);
void generate_ITapTrade_caster(pybind11::module & parent);
void generate_vntap_sub_namespace(pybind11::module & parent);
void generate_class_TapAPIApplicationInfo(pybind11::object & parent);
void generate_class_TapAPICommodity(pybind11::object & parent);
void generate_class_TapAPIContract(pybind11::object & parent);
Expand All @@ -92,6 +101,13 @@ void generate_class_TapAPIQuoteContractInfo(pybind11::object & parent);
void generate_class_TapAPIQuoteWhole(pybind11::object & parent);
void generate_class_ITapQuoteAPINotify(pybind11::object & parent);
void generate_class_ITapQuoteAPI(pybind11::object & parent);
void generate_vntap_classes(pybind11::module & parent);
void generate_vntap_enums(pybind11::module & parent);
void generate_vntap_functions_0(pybind11::module & parent);
void generate_vntap_functions(pybind11::module & parent);
void generate_vntap_variables(pybind11::module & parent);
void generate_vntap_typedefs(pybind11::module & parent);
void generate_caster_(pybind11::object & parent);
void generate_vntap_caster(pybind11::module & parent);


1,293 changes: 496 additions & 797 deletions vnpy/api/tap/vntap/generated_files/generated_functions_0.cpp

Large diffs are not rendered by default.

488 changes: 188 additions & 300 deletions vnpy/api/tap/vntap/generated_files/generated_functions_1.cpp

Large diffs are not rendered by default.

500 changes: 500 additions & 0 deletions vnpy/api/tap/vntap/generated_files/generated_functions_10.cpp

Large diffs are not rendered by default.

492 changes: 200 additions & 292 deletions vnpy/api/tap/vntap/generated_files/generated_functions_2.cpp

Large diffs are not rendered by default.

1,334 changes: 461 additions & 873 deletions vnpy/api/tap/vntap/generated_files/generated_functions_3.cpp

Large diffs are not rendered by default.

690 changes: 213 additions & 477 deletions vnpy/api/tap/vntap/generated_files/generated_functions_4.cpp

Large diffs are not rendered by default.

Loading

0 comments on commit e4336b6

Please sign in to comment.