Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit01eb6b1

Browse files
committed
[PySDK] Remove redundant definitions of enums
* Suggestions fromWasmEdge#633 (comment)Signed-off-by: Shreyas Atre <shreyasatre16@gmail.com>
1 parentcf9f1e8 commit01eb6b1

File tree

4 files changed

+47
-57
lines changed

4 files changed

+47
-57
lines changed

‎bindings/python/docs/commands/auto_generated.md‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,27 @@ CLASSES
3131
|
3232
| __reduce__ = <unnamed Boost.Python function>(...)
3333
|
34-
| __str__(...)
35-
| __str__( (Configure)arg1) -> str :
36-
|
37-
| C++ signature :
38-
| char const* __str__(pysdk::Configure {lvalue})
39-
|
4034
| add(...)
4135
| add( (Configure)arg1, (Proposal)arg2) -> None :
4236
|
4337
| C++ signature :
44-
| void add(pysdk::Configure {lvalue},pysdk::WasmEdge_Proposal)
38+
| void add(pysdk::Configure {lvalue},WasmEdge_Proposal)
4539
|
4640
| add( (Configure)arg1, (Host)arg2) -> None :
4741
|
4842
| C++ signature :
49-
| void add(pysdk::Configure {lvalue},pysdk::WasmEdge_HostRegistration)
43+
| void add(pysdk::Configure {lvalue},WasmEdge_HostRegistration)
5044
|
5145
| remove(...)
5246
| remove( (Configure)arg1, (Proposal)arg2) -> None :
5347
|
5448
| C++ signature :
55-
| void remove(pysdk::Configure {lvalue},pysdk::WasmEdge_Proposal)
49+
| void remove(pysdk::Configure {lvalue},WasmEdge_Proposal)
5650
|
5751
| remove( (Configure)arg1, (Host)arg2) -> None :
5852
|
5953
| C++ signature :
60-
| void remove(pysdk::Configure {lvalue},pysdk::WasmEdge_HostRegistration)
54+
| void remove(pysdk::Configure {lvalue},WasmEdge_HostRegistration)
6155
|
6256
| ----------------------------------------------------------------------
6357
| Data and other attributes defined here:
@@ -441,6 +435,8 @@ CLASSES
441435
|
442436
| Memory64 = WasmEdge.Proposal.Memory64
443437
|
438+
| NonTrapFloatToIntConversions = WasmEdge.Proposal.NonTrapFloatToIntConv...
439+
|
444440
| ReferenceTypes = WasmEdge.Proposal.ReferenceTypes
445441
|
446442
| SIMD = WasmEdge.Proposal.SIMD
@@ -721,6 +717,12 @@ CLASSES
721717
|
722718
| __reduce__ = <unnamed Boost.Python function>(...)
723719
|
720+
| __str__(...)
721+
| __str__( (Result)arg1) -> str :
722+
|
723+
| C++ signature :
724+
| char const* __str__(pysdk::result {lvalue})
725+
|
724726
| code(...)
725727
| code( (Result)arg1) -> int :
726728
|
@@ -865,6 +867,7 @@ DATA
865867
ExceptionHandling = WasmEdge.Proposal.ExceptionHandling
866868
FunctionReferences = WasmEdge.Proposal.FunctionReferences
867869
Memory64 = WasmEdge.Proposal.Memory64
870+
NonTrapFloatToIntConversions = WasmEdge.Proposal.NonTrapFloatToIntConv...
868871
ReferenceTypes = WasmEdge.Proposal.ReferenceTypes
869872
SIMD = WasmEdge.Proposal.SIMD
870873
TailCall = WasmEdge.Proposal.TailCall
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
PYTHON_ADD_MODULE(WasmEdge src/WasmEdge.cpp)
22
INCLUDE_DIRECTORIES("include/")
3+
set_target_properties(WasmEdge PROPERTIES
4+
CXX_STANDARD 17
5+
)
36
# FILE(COPY classes.py DESTINATION .)
47
# ADD_TEST(NAME 02-ExposingClasses COMMAND ${PYTHON_EXECUTABLE} classes.py)

‎bindings/python/pywasmedge/include/WasmEdge.hpp‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#include<sstream>
1010
#include<string>
1111
#include<vector>
12-
#include<wasmedge.h>
12+
#include<wasmedge/enum_configure.h>
13+
#include<wasmedge/wasmedge.h>
1314

1415
namespacepysdk {
1516

@@ -29,25 +30,6 @@ struct logging {
2930

3031
std::string logging::_str ="logging: Level not set";
3132

32-
enum WasmEdge_Proposal {
33-
WasmEdge_Proposal_BulkMemoryOperations =0,
34-
WasmEdge_Proposal_ReferenceTypes,
35-
WasmEdge_Proposal_SIMD,
36-
WasmEdge_Proposal_TailCall,
37-
WasmEdge_Proposal_Annotations,
38-
WasmEdge_Proposal_Memory64,
39-
WasmEdge_Proposal_Threads,
40-
WasmEdge_Proposal_ExceptionHandling,
41-
WasmEdge_Proposal_FunctionReferences
42-
};
43-
44-
/*This configuration is used for the VM context to turn on the WASI or
45-
* wasmedge_process supports and only effective in VM contexts.*/
46-
enum WasmEdge_HostRegistration {
47-
WasmEdge_HostRegistration_Wasi =0,
48-
WasmEdge_HostRegistration_WasmEdge_Process
49-
};
50-
5133
classConfigure {
5234
private:
5335
WasmEdge_ConfigureContext *ConfCxt;
@@ -57,10 +39,10 @@ class Configure {
5739
~Configure();
5840
constchar *doc() {return pysdk::Configure_doc; }
5941
WasmEdge_ConfigureContext *get();
60-
voidadd(pysdk::WasmEdge_Proposal);
61-
voidadd(pysdk::WasmEdge_HostRegistration);
62-
voidremove(pysdk::WasmEdge_Proposal);
63-
voidremove(pysdk::WasmEdge_HostRegistration);
42+
voidadd(WasmEdge_Proposal);
43+
voidadd(WasmEdge_HostRegistration);
44+
voidremove(WasmEdge_Proposal);
45+
voidremove(WasmEdge_HostRegistration);
6446
};
6547

6648
classStore {
@@ -97,7 +79,7 @@ class VM {
9779
public:
9880
VM();
9981
VM(Store &);
100-
VM(Configure &);
82+
VM(Configure &);
10183
VM(Configure &, Store &);
10284
~VM();
10385
constchar *doc() {return pysdk::vm_doc; };

‎bindings/python/pywasmedge/src/WasmEdge.cpp‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,20 @@ pysdk::Configure::~Configure() { WasmEdge_ConfigureDelete(ConfCxt); }
9898

9999
WasmEdge_ConfigureContext *pysdk::Configure::get() {returnthis->ConfCxt; }
100100

101-
voidpysdk::Configure::add(pysdk::WasmEdge_Proposal prop) {
101+
voidpysdk::Configure::add(WasmEdge_Proposal prop) {
102102
WasmEdge_ConfigureAddProposal(ConfCxt, (::WasmEdge_Proposal)prop);
103103
}
104104

105-
voidpysdk::Configure::remove(pysdk::WasmEdge_Proposal prop) {
105+
voidpysdk::Configure::remove(WasmEdge_Proposal prop) {
106106
WasmEdge_ConfigureRemoveProposal(ConfCxt, (::WasmEdge_Proposal)prop);
107107
}
108108

109-
voidpysdk::Configure::add(pysdk::WasmEdge_HostRegistration hr) {
109+
voidpysdk::Configure::add(WasmEdge_HostRegistration hr) {
110110
WasmEdge_ConfigureAddHostRegistration(ConfCxt,
111111
(::WasmEdge_HostRegistration)hr);
112112
}
113113

114-
voidpysdk::Configure::remove(pysdk::WasmEdge_HostRegistration hr) {
114+
voidpysdk::Configure::remove(WasmEdge_HostRegistration hr) {
115115
WasmEdge_ConfigureRemoveHostRegistration(ConfCxt,
116116
(::WasmEdge_HostRegistration)hr);
117117
}
@@ -148,13 +148,13 @@ BOOST_PYTHON_MODULE(WasmEdge) {
148148

149149
/*Overloading Python add and remove functions for Configure class*/
150150

151-
void (pysdk::Configure::*add_prop)(pysdk::WasmEdge_Proposal) =
151+
void (pysdk::Configure::*add_prop)(WasmEdge_Proposal) =
152152
&pysdk::Configure::add;
153-
void (pysdk::Configure::*remove_prop)(pysdk::WasmEdge_Proposal) =
153+
void (pysdk::Configure::*remove_prop)(WasmEdge_Proposal) =
154154
&pysdk::Configure::remove;
155-
void (pysdk::Configure::*add_host)(pysdk::WasmEdge_HostRegistration) =
155+
void (pysdk::Configure::*add_host)(WasmEdge_HostRegistration) =
156156
&pysdk::Configure::add;
157-
void (pysdk::Configure::*remove_host)(pysdk::WasmEdge_HostRegistration) =
157+
void (pysdk::Configure::*remove_host)(WasmEdge_HostRegistration) =
158158
&pysdk::Configure::remove;
159159

160160
class_<pysdk::Configure>("Configure", init<>())
@@ -171,22 +171,24 @@ BOOST_PYTHON_MODULE(WasmEdge) {
171171
.def("message", &pysdk::result::message)
172172
.def("code", &pysdk::result::get_code);
173173

174-
enum_<pysdk::WasmEdge_Proposal>("Proposal")
175-
.value("BulkMemoryOperations",
176-
pysdk::WasmEdge_Proposal_BulkMemoryOperations)
177-
.value("ReferenceTypes", pysdk::WasmEdge_Proposal_ReferenceTypes)
178-
.value("SIMD", pysdk::WasmEdge_Proposal_SIMD)
179-
.value("TailCall", pysdk::WasmEdge_Proposal_TailCall)
180-
.value("Annotations", pysdk::WasmEdge_Proposal_Annotations)
181-
.value("Memory64", pysdk::WasmEdge_Proposal_Memory64)
182-
.value("Threads", pysdk::WasmEdge_Proposal_Threads)
183-
.value("ExceptionHandling", pysdk::WasmEdge_Proposal_ExceptionHandling)
184-
.value("FunctionReferences", pysdk::WasmEdge_Proposal_FunctionReferences)
174+
enum_<WasmEdge_Proposal>("Proposal")
175+
.value("BulkMemoryOperations", WasmEdge_Proposal_ImportExportMutGlobals)
176+
.value("NonTrapFloatToIntConversions",
177+
WasmEdge_Proposal_NonTrapFloatToIntConversions)
178+
.value("BulkMemoryOperations", WasmEdge_Proposal_BulkMemoryOperations)
179+
.value("ReferenceTypes", WasmEdge_Proposal_ReferenceTypes)
180+
.value("SIMD", WasmEdge_Proposal_SIMD)
181+
.value("TailCall", WasmEdge_Proposal_TailCall)
182+
.value("Annotations", WasmEdge_Proposal_Annotations)
183+
.value("Memory64", WasmEdge_Proposal_Memory64)
184+
.value("Threads", WasmEdge_Proposal_Threads)
185+
.value("ExceptionHandling", WasmEdge_Proposal_ExceptionHandling)
186+
.value("FunctionReferences", WasmEdge_Proposal_FunctionReferences)
185187
.export_values();
186188

187-
enum_<pysdk::WasmEdge_HostRegistration>("Host")
188-
.value("Wasi",pysdk::WasmEdge_HostRegistration_Wasi)
189-
.value("WasmEdge",pysdk::WasmEdge_HostRegistration_WasmEdge_Process)
189+
enum_<WasmEdge_HostRegistration>("Host")
190+
.value("Wasi", WasmEdge_HostRegistration_Wasi)
191+
.value("WasmEdge", WasmEdge_HostRegistration_WasmEdge_Process)
190192
.export_values();
191193

192194
class_<pysdk::Store>("Store", init<>())

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp