functionalscript 0.0.471 → 0.0.473

package/com/cpp/README.md

@@ -0,0 +1,80 @@
+# COM C++ library
+
+## Example
+
+### `nanocom` library
+
+```cpp
+class IUnknown
+{
+public:
+    virtual HRESULT QueryInterface(GUID const &riid, IUnknown const **ppvObject) const noexcept = 0;
+    virtual ULONG AddRef() const noexcept = 0;
+    virtual ULONG Release() const noexcept = 0;
+protected:
+    IUnknown() {}
+private:
+    IUnknown(IUnknown const&);
+    IUnknown& operator=(IUnknown const &);
+};
+
+template<class I>
+class base: public I
+{
+public:
+    HRESULT QueryInterface(GUID const &riid, IUnknown const **ppvObject) const noexcept override { ... }
+    ULONG AddRef() const noexcept override { ... }
+    ULONG Release() const noexcept override { ... }
+};
+
+template<class I, class T>
+class impl;
+```
+
+### Generated
+
+```cpp
+class IAbc : public IUnknown
+{
+public:
+    constexpr static GUID const guid = GUID(...);
+    virtual IAbc* GetIAbc_() const noexcept = 0;
+    ref<IAbc> GetIAbc() const noexcept
+    {
+        return move_to_ref(GetIAbc_());
+    }
+protected:
+    IAbc() {}
+};
+
+template<class T>
+class impl<IAbc, T> : public base<IAbc>
+{
+public:
+    T value;
+    IAbc* GetIAbc_() const noexcept override
+    {
+        return IAbc_GetIAbc(*this).copy_to_ref();
+    }
+    template <class... U>
+    static ref<T> create(U... u)
+    {
+        T const *const p = new implementation(u...);
+        return to_ref(*p);
+    }
+private:
+    template <class... U>
+    explicit implementation(U... u) : value(u...) {}
+};
+```
+
+### Manually Written Code
+
+```cpp
+struct Abc {};
+
+ref<IAbc> IAbc_GetIAbc(impl<IAbc, Abc> const & self)
+{
+    return to_ref(self);
+}
+```

package/com/cpp/module.f.cjs

@@ -34,7 +34,7 @@ const resultVoid = types.result('void')
 const namespace = text.curly('namespace')
 
 /** @type {(id: string) => string} */
-const comRef = id => `::com::ref<${id}>`
+const comRef = id => `::nanocom::ref<${id}>`
 
 /** @type {(id: string) => string} */
 const ptr = id => `${id} const*`
@@ -92,7 +92,7 @@ const cpp = name => lib => {
 
     /** @type {(result: string) => (paramArrayStr: string) => (name: string) => text.Item} */
     const methodHeader = result => paramArrayStr => name =>
-        `virtual ${result} COM_STDCALL ${name}${paramArrayStr} const noexcept = 0;`
+        `virtual ${result} ${name}${paramArrayStr} const noexcept = 0;`
 
     /** @type {(m: types.Method) => readonly text.Item[]} */
     const method = ([name, paramArray]) => {
@@ -108,7 +108,7 @@ const cpp = name => lib => {
             m(`${name}_`),
             `${comRef(resultName)} ${name}${paramArrayStr} const noexcept`,
             '{',
-            [`return ::com::move_to_ref(${name}_(${joinComma(mapParamName(paramL))}));`],
+            [`return ::nanocom::move_to_ref(${name}_(${joinComma(mapParamName(paramL))}));`],
             '}',
         ]
     }
@@ -121,7 +121,7 @@ const cpp = name => lib => {
         const lo = g.substring(0, 16);
         const hi = g.substring(16);
         return flat([
-            [`constexpr static ::com::GUID const guid = ::com::GUID(0x${lo}, 0x${hi});`],
+            [`constexpr static ::nanocom::GUID const guid = ::nanocom::GUID(0x${lo}, 0x${hi});`],
             mapMethod(entries(i))
         ])
     }
@@ -129,7 +129,13 @@ const cpp = name => lib => {
     /** @type {(kv: obj.Entry<types.Definition>) => text.Block} */
     const def = ([name, d]) => d.interface === undefined
         ? struct(name)(defStruct(d))
-        : [`class ${name} : public ::com::IUnknown`, '{', 'public:', defInterface(d), '};']
+        : [
+            `class ${name} : public ::nanocom::IUnknown`,
+            '{',
+            'public:',
+            defInterface(d),
+            '};'
+        ]
 
     /** @type {(kv: obj.Entry<types.Definition>) => text.Block} */
     const forward = ([name]) => [`struct ${name};`]

package/com/cpp/{com.hpp → nanocom.hpp}

@@ -5,17 +5,9 @@
 #include <atomic>
 #include <iostream>
 
-#if defined(__aarch64__) || defined(__amd64__)
-#define COM_STDCALL
-#elif defined(__clang__)
-#define COM_STDCALL __attribute__((stdcall))
-#else
-#define COM_STDCALL __stdcall
-#endif
-
 static_assert(sizeof(bool) == 1);
 
-namespace com
+namespace nanocom
 {
     constexpr uint64_t byteswap(uint64_t v) noexcept
     {
@@ -80,9 +72,14 @@ namespace com
     class IUnknown
     {
     public:
-        virtual HRESULT COM_STDCALL QueryInterface(GUID const &riid, IUnknown const **ppvObject) const noexcept = 0;
-        virtual ULONG COM_STDCALL AddRef() const noexcept = 0;
-        virtual ULONG COM_STDCALL Release() const noexcept = 0;
+        virtual HRESULT QueryInterface(GUID const &riid, IUnknown const **ppvObject) const noexcept = 0;
+        virtual ULONG AddRef() const noexcept = 0;
+        virtual ULONG Release() const noexcept = 0;
+    protected:
+        IUnknown() = default;
+    private:
+        IUnknown(IUnknown const&);
+        IUnknown& operator=(IUnknown const&);
     };
 
     template <class I>
@@ -155,7 +152,7 @@ namespace com
         }
 
     private:
-        HRESULT COM_STDCALL QueryInterface(GUID const &riid, IUnknown const **const ppvObject) const noexcept override
+        HRESULT QueryInterface(GUID const &riid, IUnknown const **const ppvObject) const noexcept override
         {
             // std::cout << "riid:     " << riid << std::endl;
             // std::cout << "iunknown: " << iunknown_guid << std::endl;
@@ -175,12 +172,12 @@ namespace com
             return counter.fetch_add(1);
         }
 
-        ULONG COM_STDCALL AddRef() const noexcept override
+        ULONG AddRef() const noexcept override
         {
             return add_ref() + 1;
         }
 
-        ULONG COM_STDCALL Release() const noexcept override
+        ULONG Release() const noexcept override
         {
             auto const c = counter.fetch_sub(1) - 1;
             if (c == 0)

package/com/cpp/test.f.cjs

@@ -17,23 +17,23 @@ const f = () =>
         '    };\n' +
         '    struct ManagedStruct\n' +
         '    {\n' +
-        '        ::com::ref<IMy> M;\n' +
+        '        ::nanocom::ref<IMy> M;\n' +
         '    };\n' +
-        '    class IMy : public ::com::IUnknown\n' +
+        '    class IMy : public ::nanocom::IUnknown\n' +
         '    {\n' +
         '    public:\n' +
-        '        constexpr static ::com::GUID const guid = ::com::GUID(0xC66FB2702D8049AD, 0xBB6E88C1F90B805D);\n' +
-        '        virtual Slice COM_STDCALL GetSlice() const noexcept = 0;\n' +
-        '        virtual void COM_STDCALL SetSlice(Slice slice) const noexcept = 0;\n' +
-        '        virtual bool const* COM_STDCALL GetUnsafe() const noexcept = 0;\n' +
-        '        virtual void COM_STDCALL SetUnsafe(Slice const* p, uint32_t size) const noexcept = 0;\n' +
-        '        virtual bool COM_STDCALL Some(IMy const& p) const noexcept = 0;\n' +
-        '        virtual IMy const* COM_STDCALL GetIMy_(uint16_t a, int16_t b) const noexcept = 0;\n' +
-        '        ::com::ref<IMy> GetIMy(uint16_t a, int16_t b) const noexcept\n' +
+        '        constexpr static ::nanocom::GUID const guid = ::nanocom::GUID(0xC66FB2702D8049AD, 0xBB6E88C1F90B805D);\n' +
+        '        virtual Slice GetSlice() const noexcept = 0;\n' +
+        '        virtual void SetSlice(Slice slice) const noexcept = 0;\n' +
+        '        virtual bool const* GetUnsafe() const noexcept = 0;\n' +
+        '        virtual void SetUnsafe(Slice const* p, uint32_t size) const noexcept = 0;\n' +
+        '        virtual bool Some(IMy const& p) const noexcept = 0;\n' +
+        '        virtual IMy const* GetIMy_(uint16_t a, int16_t b) const noexcept = 0;\n' +
+        '        ::nanocom::ref<IMy> GetIMy(uint16_t a, int16_t b) const noexcept\n' +
         '        {\n' +
-        '            return ::com::move_to_ref(GetIMy_(a, b));\n' +
+        '            return ::nanocom::move_to_ref(GetIMy_(a, b));\n' +
         '        }\n' +
-        '        virtual void COM_STDCALL SetManagedStruct(ManagedStruct a) const noexcept = 0;\n' +
+        '        virtual void SetManagedStruct(ManagedStruct a) const noexcept = 0;\n' +
         '    };\n' +
         '}'
     if (cpp !== e) { throw cpp }

package/com/test/cpp/main.cpp

@@ -1,4 +1,4 @@
-#include "../../cpp/com.hpp"
+#include "../../cpp/nanocom.hpp"
 #include "_result.hpp"
 
 #ifdef _WIN32
@@ -16,10 +16,10 @@ extern "C" int c_get()
 class Impl : public My::IMy
 {
 public:
-    My::Slice COM_STDCALL GetSlice() const noexcept override
+    My::Slice GetSlice() const noexcept override
     {
     }
-    void COM_STDCALL SetSlice(My::Slice slice) const noexcept override
+    void SetSlice(My::Slice slice) const noexcept override
     {
         std::cout
             << "SetSlice: "
@@ -28,20 +28,20 @@ public:
             << slice.Size
             << std::endl;
     }
-    bool const *COM_STDCALL GetUnsafe() const noexcept override
+    bool const *GetUnsafe() const noexcept override
     {
     }
-    void COM_STDCALL SetUnsafe(My::Slice const *p, uint32_t size) const noexcept override
+    void SetUnsafe(My::Slice const *p, uint32_t size) const noexcept override
     {
     }
-    bool COM_STDCALL Some(My::IMy const &p) const noexcept override
+    bool Some(My::IMy const &p) const noexcept override
     {
     }
-    My::IMy const *COM_STDCALL GetIMy_(uint16_t a, int16_t b) const noexcept override
+    My::IMy const *GetIMy_(uint16_t a, int16_t b) const noexcept override
     {
-        return ::com::to_ref(*this).copy_to_raw();
+        return ::nanocom::to_ref(*this).copy_to_raw();
     }
-    void COM_STDCALL SetManagedStruct(My::ManagedStruct a) const noexcept override
+    void SetManagedStruct(My::ManagedStruct a) const noexcept override
     {
     }
     ~Impl()
@@ -54,12 +54,21 @@ DLL_EXPORT
 extern "C" My::IMy const *c_my_create()
 {
     {
-        auto const x = ::com::implementation<Impl>::create().copy_to_raw();
+        auto const a = ::nanocom::implementation<Impl>::create().copy_to_raw();
+        // auto const c = *x; // no copy constructor
+        Impl *b;
+        b = const_cast<Impl*>(::nanocom::implementation<Impl>::create().copy_to_raw());
+        // *b = *a; // no assignment operator
+        b->Release();
+        a->Release();
+    }
+    {
+        auto const x = ::nanocom::implementation<Impl>::create().copy_to_raw();
         x->Release();
     }
     {
-        auto const x = ::com::implementation<Impl>::create().upcast<My::IMy>();
+        auto const x = ::nanocom::implementation<Impl>::create().upcast<My::IMy>();
         x->SetSlice(My::Slice());
     }
-    return ::com::implementation<Impl>::create().copy_to_raw();
+    return ::nanocom::implementation<Impl>::create().copy_to_raw();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.471",
+  "version": "0.0.473",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
@@ -31,6 +31,6 @@
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
     "@types/node": "^18.11.9",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.3"
   }
 }

package/.vscode/launch.json

@@ -1,17 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "pwa-node",
-            "request": "launch",
-            "name": "Launch Program",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}\\test.js"
-        }
-    ]
-}

package/.vscode/tasks.json

@@ -1,41 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/com/cs/test/test.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/com/cs/test/test.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "--project",
-                "${workspaceFolder}/com/cs/test/test.csproj"
-            ],
-            "problemMatcher": "$msCompile"
-        }
-    ]
-}