functionalscript 0.0.471 → 0.0.472

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/com/cpp/module.f.cjs +11 -5
  2. package/com/cpp/{com.hpp → nanocom.hpp} +7 -15
  3. package/com/cpp/test.f.cjs +12 -12
  4. package/com/test/cpp/main.cpp +12 -12
  5. package/package.json +1 -1
package/com/cpp/module.f.cjs CHANGED
@@ -34,7 +34,7 @@ const resultVoid = types.result('void')
34
34
  const namespace = text.curly('namespace')
35
35
 
36
36
  /** @type {(id: string) => string} */
37
- const comRef = id => `::com::ref<${id}>`
37
+ const comRef = id => `::nanocom::ref<${id}>`
38
38
 
39
39
  /** @type {(id: string) => string} */
40
40
  const ptr = id => `${id} const*`
@@ -92,7 +92,7 @@ const cpp = name => lib => {
92
92
 
93
93
  /** @type {(result: string) => (paramArrayStr: string) => (name: string) => text.Item} */
94
94
  const methodHeader = result => paramArrayStr => name =>
95
- `virtual ${result} COM_STDCALL ${name}${paramArrayStr} const noexcept = 0;`
95
+ `virtual ${result} ${name}${paramArrayStr} const noexcept = 0;`
96
96
 
97
97
  /** @type {(m: types.Method) => readonly text.Item[]} */
98
98
  const method = ([name, paramArray]) => {
@@ -108,7 +108,7 @@ const cpp = name => lib => {
108
108
  m(`${name}_`),
109
109
  `${comRef(resultName)} ${name}${paramArrayStr} const noexcept`,
110
110
  '{',
111
- [`return ::com::move_to_ref(${name}_(${joinComma(mapParamName(paramL))}));`],
111
+ [`return ::nanocom::move_to_ref(${name}_(${joinComma(mapParamName(paramL))}));`],
112
112
  '}',
113
113
  ]
114
114
  }
@@ -121,7 +121,7 @@ const cpp = name => lib => {
121
121
  const lo = g.substring(0, 16);
122
122
  const hi = g.substring(16);
123
123
  return flat([
124
- [`constexpr static ::com::GUID const guid = ::com::GUID(0x${lo}, 0x${hi});`],
124
+ [`constexpr static ::nanocom::GUID const guid = ::nanocom::GUID(0x${lo}, 0x${hi});`],
125
125
  mapMethod(entries(i))
126
126
  ])
127
127
  }
@@ -129,7 +129,13 @@ const cpp = name => lib => {
129
129
  /** @type {(kv: obj.Entry<types.Definition>) => text.Block} */
130
130
  const def = ([name, d]) => d.interface === undefined
131
131
  ? struct(name)(defStruct(d))
132
- : [`class ${name} : public ::com::IUnknown`, '{', 'public:', defInterface(d), '};']
132
+ : [
133
+ `class ${name} : public ::nanocom::IUnknown`,
134
+ '{',
135
+ 'public:',
136
+ defInterface(d),
137
+ '};'
138
+ ]
133
139
 
134
140
  /** @type {(kv: obj.Entry<types.Definition>) => text.Block} */
135
141
  const forward = ([name]) => [`struct ${name};`]
package/com/cpp/{com.hpp → nanocom.hpp} RENAMED
@@ -5,17 +5,9 @@
5
5
  #include <atomic>
6
6
  #include <iostream>
7
7
 
8
- #if defined(__aarch64__) || defined(__amd64__)
9
- #define COM_STDCALL
10
- #elif defined(__clang__)
11
- #define COM_STDCALL __attribute__((stdcall))
12
- #else
13
- #define COM_STDCALL __stdcall
14
- #endif
15
-
16
8
  static_assert(sizeof(bool) == 1);
17
9
 
18
- namespace com
10
+ namespace nanocom
19
11
  {
20
12
  constexpr uint64_t byteswap(uint64_t v) noexcept
21
13
  {
@@ -80,9 +72,9 @@ namespace com
80
72
  class IUnknown
81
73
  {
82
74
  public:
83
- virtual HRESULT COM_STDCALL QueryInterface(GUID const &riid, IUnknown const **ppvObject) const noexcept = 0;
84
- virtual ULONG COM_STDCALL AddRef() const noexcept = 0;
85
- virtual ULONG COM_STDCALL Release() const noexcept = 0;
75
+ virtual HRESULT QueryInterface(GUID const &riid, IUnknown const **ppvObject) const noexcept = 0;
76
+ virtual ULONG AddRef() const noexcept = 0;
77
+ virtual ULONG Release() const noexcept = 0;
86
78
  };
87
79
 
88
80
  template <class I>
@@ -155,7 +147,7 @@ namespace com
155
147
  }
156
148
 
157
149
  private:
158
- HRESULT COM_STDCALL QueryInterface(GUID const &riid, IUnknown const **const ppvObject) const noexcept override
150
+ HRESULT QueryInterface(GUID const &riid, IUnknown const **const ppvObject) const noexcept override
159
151
  {
160
152
  // std::cout << "riid: " << riid << std::endl;
161
153
  // std::cout << "iunknown: " << iunknown_guid << std::endl;
@@ -175,12 +167,12 @@ namespace com
175
167
  return counter.fetch_add(1);
176
168
  }
177
169
 
178
- ULONG COM_STDCALL AddRef() const noexcept override
170
+ ULONG AddRef() const noexcept override
179
171
  {
180
172
  return add_ref() + 1;
181
173
  }
182
174
 
183
- ULONG COM_STDCALL Release() const noexcept override
175
+ ULONG Release() const noexcept override
184
176
  {
185
177
  auto const c = counter.fetch_sub(1) - 1;
186
178
  if (c == 0)
package/com/cpp/test.f.cjs CHANGED
@@ -17,23 +17,23 @@ const f = () =>
17
17
  ' };\n' +
18
18
  ' struct ManagedStruct\n' +
19
19
  ' {\n' +
20
- ' ::com::ref<IMy> M;\n' +
20
+ ' ::nanocom::ref<IMy> M;\n' +
21
21
  ' };\n' +
22
- ' class IMy : public ::com::IUnknown\n' +
22
+ ' class IMy : public ::nanocom::IUnknown\n' +
23
23
  ' {\n' +
24
24
  ' public:\n' +
25
- ' constexpr static ::com::GUID const guid = ::com::GUID(0xC66FB2702D8049AD, 0xBB6E88C1F90B805D);\n' +
26
- ' virtual Slice COM_STDCALL GetSlice() const noexcept = 0;\n' +
27
- ' virtual void COM_STDCALL SetSlice(Slice slice) const noexcept = 0;\n' +
28
- ' virtual bool const* COM_STDCALL GetUnsafe() const noexcept = 0;\n' +
29
- ' virtual void COM_STDCALL SetUnsafe(Slice const* p, uint32_t size) const noexcept = 0;\n' +
30
- ' virtual bool COM_STDCALL Some(IMy const& p) const noexcept = 0;\n' +
31
- ' virtual IMy const* COM_STDCALL GetIMy_(uint16_t a, int16_t b) const noexcept = 0;\n' +
32
- ' ::com::ref<IMy> GetIMy(uint16_t a, int16_t b) const noexcept\n' +
25
+ ' constexpr static ::nanocom::GUID const guid = ::nanocom::GUID(0xC66FB2702D8049AD, 0xBB6E88C1F90B805D);\n' +
26
+ ' virtual Slice GetSlice() const noexcept = 0;\n' +
27
+ ' virtual void SetSlice(Slice slice) const noexcept = 0;\n' +
28
+ ' virtual bool const* GetUnsafe() const noexcept = 0;\n' +
29
+ ' virtual void SetUnsafe(Slice const* p, uint32_t size) const noexcept = 0;\n' +
30
+ ' virtual bool Some(IMy const& p) const noexcept = 0;\n' +
31
+ ' virtual IMy const* GetIMy_(uint16_t a, int16_t b) const noexcept = 0;\n' +
32
+ ' ::nanocom::ref<IMy> GetIMy(uint16_t a, int16_t b) const noexcept\n' +
33
33
  ' {\n' +
34
- ' return ::com::move_to_ref(GetIMy_(a, b));\n' +
34
+ ' return ::nanocom::move_to_ref(GetIMy_(a, b));\n' +
35
35
  ' }\n' +
36
- ' virtual void COM_STDCALL SetManagedStruct(ManagedStruct a) const noexcept = 0;\n' +
36
+ ' virtual void SetManagedStruct(ManagedStruct a) const noexcept = 0;\n' +
37
37
  ' };\n' +
38
38
  '}'
39
39
  if (cpp !== e) { throw cpp }
package/com/test/cpp/main.cpp CHANGED
@@ -1,4 +1,4 @@
1
- #include "../../cpp/com.hpp"
1
+ #include "../../cpp/nanocom.hpp"
2
2
  #include "_result.hpp"
3
3
 
4
4
  #ifdef _WIN32
@@ -16,10 +16,10 @@ extern "C" int c_get()
16
16
  class Impl : public My::IMy
17
17
  {
18
18
  public:
19
- My::Slice COM_STDCALL GetSlice() const noexcept override
19
+ My::Slice GetSlice() const noexcept override
20
20
  {
21
21
  }
22
- void COM_STDCALL SetSlice(My::Slice slice) const noexcept override
22
+ void SetSlice(My::Slice slice) const noexcept override
23
23
  {
24
24
  std::cout
25
25
  << "SetSlice: "
@@ -28,20 +28,20 @@ public:
28
28
  << slice.Size
29
29
  << std::endl;
30
30
  }
31
- bool const *COM_STDCALL GetUnsafe() const noexcept override
31
+ bool const *GetUnsafe() const noexcept override
32
32
  {
33
33
  }
34
- void COM_STDCALL SetUnsafe(My::Slice const *p, uint32_t size) const noexcept override
34
+ void SetUnsafe(My::Slice const *p, uint32_t size) const noexcept override
35
35
  {
36
36
  }
37
- bool COM_STDCALL Some(My::IMy const &p) const noexcept override
37
+ bool Some(My::IMy const &p) const noexcept override
38
38
  {
39
39
  }
40
- My::IMy const *COM_STDCALL GetIMy_(uint16_t a, int16_t b) const noexcept override
40
+ My::IMy const *GetIMy_(uint16_t a, int16_t b) const noexcept override
41
41
  {
42
- return ::com::to_ref(*this).copy_to_raw();
42
+ return ::nanocom::to_ref(*this).copy_to_raw();
43
43
  }
44
- void COM_STDCALL SetManagedStruct(My::ManagedStruct a) const noexcept override
44
+ void SetManagedStruct(My::ManagedStruct a) const noexcept override
45
45
  {
46
46
  }
47
47
  ~Impl()
@@ -54,12 +54,12 @@ DLL_EXPORT
54
54
  extern "C" My::IMy const *c_my_create()
55
55
  {
56
56
  {
57
- auto const x = ::com::implementation<Impl>::create().copy_to_raw();
57
+ auto const x = ::nanocom::implementation<Impl>::create().copy_to_raw();
58
58
  x->Release();
59
59
  }
60
60
  {
61
- auto const x = ::com::implementation<Impl>::create().upcast<My::IMy>();
61
+ auto const x = ::nanocom::implementation<Impl>::create().upcast<My::IMy>();
62
62
  x->SetSlice(My::Slice());
63
63
  }
64
- return ::com::implementation<Impl>::create().copy_to_raw();
64
+ return ::nanocom::implementation<Impl>::create().copy_to_raw();
65
65
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "functionalscript",
3
- "version": "0.0.471",
3
+ "version": "0.0.472",
4
4
  "description": "FunctionalScript is a functional subset of JavaScript",
5
5
  "main": "module.f.cjs",
6
6
  "scripts": {