functionalscript 0.0.435 → 0.0.437

package/com/cpp/module.f.cjs

@@ -3,7 +3,7 @@ const { paramList } = types
 const text = require('../../text/module.f.cjs')
 const obj = require('../../types/object/module.f.cjs')
 const list = require('../../types/list/module.f.cjs')
-const { map, flatMap } = list
+const { map, flatMap, flat } = list
 const { join } = require('../../types/string/module.f.cjs')
 const { entries } =  Object
 
@@ -77,9 +77,14 @@ const cpp = name => lib => {
         ? struct(name)(defStruct(d))
         : struct(`${name}: ::com::IUnknown`)(defInterface(d))
 
+    /** @type {(kv: obj.Entry<types.Definition>) => text.Block} */
+    const forward = ([name]) => [`struct ${name};`]
+
+    const e = entries(lib)
+
     return list.flat([
         ['#pragma once', ''],
-        namespace(name)(flatMap(def)(entries(lib)))
+        namespace(name)(flat([flatMap(forward)(e), flatMap(def)(e)]))
     ])
 }
 

package/com/cpp/test.f.cjs

@@ -11,10 +11,16 @@ const f = () =>
         '\n' +
         'namespace My\n' +
         '{\n' +
+        '    struct Slice;\n' +
+        '    struct ManagedStruct;\n' +
+        '    struct IMy;\n' +
         '    struct Slice\n' +
         '    {\n' +
         '        uint8_t* Start;\n' +
         '        size_t Size;\n' +
+        '    };\n' +
+        '    struct ManagedStruct\n' +
+        '    {\n' +
         '        ::com::ref<IMy> M;\n' +
         '    };\n' +
         '    struct IMy: ::com::IUnknown\n' +
@@ -25,6 +31,7 @@ const f = () =>
         '        virtual void COM_STDCALL SetUnsafe(Slice* p, uint32_t size) = 0;\n' +
         '        virtual ::com::BOOL COM_STDCALL Some(IMy& p) = 0;\n' +
         '        virtual ::com::ref<IMy> COM_STDCALL GetIMy() = 0;\n' +
+        '        virtual void COM_STDCALL SetManagedStruct(ManagedStruct a) = 0;\n' +
         '    };\n' +
         '}'
     if (r !== e) { throw r }

package/com/cs/test.f.cjs

@@ -17,6 +17,10 @@ const f = () =>
         '    {\n' +
         '        public unsafe byte* Start;\n' +
         '        public UIntPtr Size;\n' +
+        '    }\n' +
+        '    [StructLayout(LayoutKind.Sequential)]\n' +
+        '    public struct ManagedStruct\n' +
+        '    {\n' +
         '        public IMy M;\n' +
         '    }\n' +
         '    [Guid("C66FB270-2D80-49AD-BB6E-88C1F90B805D")]\n' +
@@ -35,9 +39,11 @@ const f = () =>
         '        bool Some(IMy p);\n' +
         '        [PreserveSig]\n' +
         '        IMy GetIMy();\n' +
+        '        [PreserveSig]\n' +
+        '        void SetManagedStruct(ManagedStruct a);\n' +
         '    }\n' +
         '}'
-    if (cs !== e) { throw [cs,e] }
+    if (cs !== e) { throw cs }
     return cs
 }
 

package/com/rust/test.f.cjs

@@ -11,6 +11,9 @@ module.exports = {
             'pub struct Slice {\n' +
             '    pub Start: *const u8,\n' +
             '    pub Size: usize,\n' +
+            '}\n' +
+            '#[repr(C)]\n' +
+            'pub struct ManagedStruct {\n' +
             '    pub M: IMy::Ref,\n' +
             '}\n' +
             'pub mod IMy {\n' +
@@ -25,6 +28,7 @@ module.exports = {
             '        pub SetUnsafe: unsafe extern "system" fn(this: &Object, p: *const super::Slice, size: u32),\n' +
             '        pub Some: unsafe extern "system" fn(this: &Object, p: &super::IMy::Object) -> bool,\n' +
             '        pub GetIMy: unsafe extern "system" fn(this: &Object) -> super::IMy::Ref,\n' +
+            '        pub SetManagedStruct: unsafe extern "system" fn(this: &Object, a: super::ManagedStruct),\n' +
             '    }\n' +
             '    impl nanocom::Interface for Interface {\n' +
             '        const GUID: nanocom::GUID = 0xC66FB270_2D80_49AD_BB6E_88C1F90B805D;\n' +
@@ -36,6 +40,7 @@ module.exports = {
             '        fn SetUnsafe(&self, p: *const super::Slice, size: u32);\n' +
             '        fn Some(&self, p: &super::IMy::Object) -> bool;\n' +
             '        fn GetIMy(&self) -> super::IMy::Ref;\n' +
+            '        fn SetManagedStruct(&self, a: super::ManagedStruct);\n' +
             '    }\n' +
             '    impl Ex for Object {\n' +
             '        fn GetSlice(&self) -> super::Slice {\n' +
@@ -56,6 +61,9 @@ module.exports = {
             '        fn GetIMy(&self) -> super::IMy::Ref {\n' +
             '            unsafe { (self.interface().GetIMy)(self) }\n' +
             '        }\n' +
+            '        fn SetManagedStruct(&self, a: super::ManagedStruct) {\n' +
+            '            unsafe { (self.interface().SetManagedStruct)(self, a) }\n' +
+            '        }\n' +
             '    }\n' +
             '    pub trait ClassEx\n' +
             '    where\n' +
@@ -69,6 +77,7 @@ module.exports = {
             '            SetUnsafe: Self::SetUnsafe,\n' +
             '            Some: Self::Some,\n' +
             '            GetIMy: Self::GetIMy,\n' +
+            '            SetManagedStruct: Self::SetManagedStruct,\n' +
             '        };\n' +
             '    }\n' +
             '    impl<T> ClassEx for T\n' +
@@ -100,6 +109,9 @@ module.exports = {
             '        extern "system" fn GetIMy(this: &Object) -> super::IMy::Ref {\n' +
             '            unsafe { Self::to_cobject(this) }.GetIMy()\n' +
             '        }\n' +
+            '        extern "system" fn SetManagedStruct(this: &Object, a: super::ManagedStruct) {\n' +
+            '            unsafe { Self::to_cobject(this) }.SetManagedStruct(a)\n' +
+            '        }\n' +
             '    }\n' +
             '    impl<T> PrivateClassEx for T\n' +
             '    where\n' +
@@ -109,7 +121,7 @@ module.exports = {
             '    }\n' +
             '}'
         const r = join('\n')(flat('    ')(rust(library)))
-        if (r !== e) { throw [e, r] }
+        if (r !== e) { throw r }
         return r
     }
 }

package/com/test/build.cjs

@@ -0,0 +1,37 @@
+const fs = require('node:fs')
+const cp = require('node:child_process')
+const os = require('node:os');
+const cpp = require('../cpp/test.f.cjs').result
+const { string: { join }, list: { flat } } = require('../../types/module.f.cjs')
+
+const dirname = __dirname
+
+fs.writeFileSync(`${dirname}/cpp/_result.hpp`, cpp)
+try {
+    const flags = os.platform() === 'win32' ? [] : ['-std=c++11', '-lc++']
+    const line = join(' ')(flat([['clang'], flags, [dirname + '/cpp/main.cpp']]))
+    console.log(cp.execSync(line).toString())
+} catch (e) {
+    // @ts-ignore
+    console.error(e.output.toString())
+}
+
+const cs = require('../cs/test.f.cjs').result
+
+fs.writeFileSync(`${dirname}/cs/_result.cs`, cs)
+try {
+    console.log(cp.execSync(`dotnet build ${dirname}/cs/cs.csproj`).toString())
+} catch (e) {
+    // @ts-ignore
+    console.error(e.output.toString())
+}
+
+const rust = require("../rust/test.f.cjs").result();
+
+fs.writeFileSync(`${dirname}/rust/src/_result.rs`, rust);
+try {
+    console.log(cp.execSync("cargo build").toString());
+} catch (e) {
+    // @ts-ignore
+    console.error(e.output.toString());
+}

package/com/test/cpp/main.cpp

@@ -1,4 +1,4 @@
-#include "../com.hpp"
+#include "../../cpp/com.hpp"
 #include "_result.hpp"
 
 #include <iostream>

package/com/types/testlib.f.cjs

@@ -6,9 +6,13 @@ module.exports = {
         struct: {
             Start: ['*', 'u8'],
             Size: 'usize',
-            M: ['IMy'],
         },
     },
+    ManagedStruct: {
+        struct: {
+            M: ['IMy']
+        }
+    },
     IMy: {
         guid: 'C66FB270-2D80-49AD-BB6E-88C1F90B805D',
         interface: {
@@ -20,7 +24,8 @@ module.exports = {
                 size: 'u32'
             },
             Some: { p: ['IMy'], _: 'bool' },
-            GetIMy: { _: ['IMy'] }
+            GetIMy: { _: ['IMy'] },
+            SetManagedStruct: { a: ['ManagedStruct'] },
         },
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.435",
+  "version": "0.0.437",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^18.7.18",
-    "typescript": "^4.8.3"
+    "@types/node": "^18.8.3",
+    "typescript": "^4.8.4"
   }
 }

package/types/sorted_list/module.f.cjs

@@ -1,6 +1,7 @@
 const compare = require("../function/compare/module.f.cjs")
 const list = require("../list/module.f.cjs")
-const { next, toArray } = list
+const option = require("../option/module.f.cjs")
+const { next } = list
 
 /**
  * @template T
@@ -19,20 +20,52 @@ const { next, toArray } = list
  * @typedef {SortedList<[Byte, readonly string[]]>} RangeMap
  */
 
+/**
+ * @template S
+ * @template T
+ * @typedef {(state: S) => (a: T) => (b: T) => readonly[option.Option<T>, compare.Sign, S]} ReduceOp
+ */
+
+/**
+ * @template S
+ * @template T
+ * @typedef {(state: S) => (tail: list.List<T>) => list.List<T>} TailReduce
+ */
+
+/**
+ * @template S
+ * @template T
+ * @typedef {(init: S) => (reduce: ReduceOp<S,T>) => (tailReduce: TailReduce<S, T>) => (a: list.List<T>) => (b: list.List<T>) => list.List<T>} GenericMerge
+ */
+
 /** @type {<T>(cmp: Cmp<T>) => (a: SortedList<T>) => (b: SortedList<T>) => SortedList<T>} */
-const merge = cmp => a => b => () => {
+const merge = cmp => genericMerge(undefined)(cmpReduce(cmp))(mergeTail)
+
+/** @type {<S,T>(cmp: Cmp<T>) => ReduceOp<S, T>} */
+const cmpReduce = cmp => state => a => b => {
+    const sign = cmp(a)(b)
+    return [sign === 1 ? b : a, sign, state]
+}
+
+/** @type {<S,T>(state: S) => (tail: list.List<T>) => list.List<T>} */
+const mergeTail = s => input => input
+
+/** @type {<S,T>(init: S) => (reduce: ReduceOp<S,T>) => (tailReduce: TailReduce<S, T>) => (a: list.List<T>) => (b: list.List<T>) => list.List<T>} */
+const genericMerge = init => reduce => tailReduce => a => b => () => {
     const aResult = next(a)
-    if (aResult === undefined) { return b }
+    if (aResult === undefined) { return tailReduce(init)(b) }
     const bResult = next(b)
-    if (bResult === undefined) { return a }
-    switch (cmp(aResult.first)(bResult.first)) {
-        case -1: return { first: aResult.first, tail: merge(cmp)(aResult.tail)(b) }
-        case 0: return { first: aResult.first, tail: merge(cmp)(aResult.tail)(bResult.tail) }
-        case 1: return { first: bResult.first, tail: merge(cmp)(a)(bResult.tail) }
-    }
+    if (bResult === undefined) { return tailReduce(init)(a) }
+    const [result, sign, state] = reduce(init)(aResult.first)(bResult.first)
+    const aNext = sign === 1 ? a : aResult.tail
+    const bNext = sign === -1 ? b : bResult.tail
+    const mergeNext = genericMerge(state)(reduce)(tailReduce)(aNext)(bNext)
+    return result === undefined ? mergeNext : { first: result, tail: mergeNext }
 }
 
 module.exports = {
     /** @readonly */
-    merge
+    merge,
+    /** @readonly */
+    genericMerge
 }

package/types/sorted_set/module.f.cjs

@@ -0,0 +1,43 @@
+const compare = require("../function/compare/module.f.cjs")
+const { toArray } = require("../list/module.f.cjs")
+const sortedList = require("../sorted_list/module.f.cjs")
+const { merge, genericMerge } = sortedList
+const list = require("../list/module.f.cjs")
+const option = require("../option/module.f.cjs")
+
+/**
+ * @template T
+ * @typedef {readonly T[]} SortedSet
+ */
+
+/**
+ * @template T
+ * @typedef {(a: T) => (b: T) => compare.Sign} Cmp
+ */
+
+/** @typedef {number} Byte */
+
+/** @type {<T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>} */
+const union = cmp => a => b => toArray(merge(cmp)(a)(b))
+
+/** @type {<T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>} */
+const intersect = cmp => a => b => toArray(intersectMerge(cmp)(a)(b))
+
+/** @type {<T>(cmp: Cmp<T>) => (a: sortedList.SortedList<T>) => (b: sortedList.SortedList<T>) => sortedList.SortedList<T>} */
+const intersectMerge = cmp => genericMerge(undefined)(intersectReduce(cmp))(intersectTail)
+
+/** @type {<S,T>(cmp: Cmp<T>) => sortedList.ReduceOp<S, T>} */
+const intersectReduce = cmp => state => a => b => {
+    const sign = cmp(a)(b)
+    return [sign === 0 ? a : undefined, sign, state]
+}
+
+/** @type {<S,T>(state: S) => (tail: list.List<T>) => list.List<T>} */
+const intersectTail = s => input => undefined
+
+module.exports = {
+    /** @readonly */
+    union,
+    /** @readonly */
+    intersect
+}

package/types/sorted_set/test.f.cjs

@@ -0,0 +1,44 @@
+const _ = require('./module.f.cjs')
+const { unsafeCmp } = require('../function/compare/module.f.cjs')
+const json = require('../../json/module.f.cjs')
+const { sort } = require('../../types/object/module.f.cjs')
+const { toArray, countdown, length } = require('../list/module.f.cjs')
+const map = require('../map/module.f.cjs')
+const { flip } = require('../function/module.f.cjs')
+
+/** @type {(a: readonly json.Unknown[]) => string} */
+const stringify = a => json.stringify(sort)(a)
+
+/** @type {<T>(a: T) => (b: T) => map.Sign} */
+const reverseCmp = flip(unsafeCmp)
+
+module.exports = {
+    union: [
+        () => {
+            const result = stringify(toArray(_.union(unsafeCmp)([2, 3, 4])([1, 3, 5])))
+            if (result !== '[1,2,3,4,5]') { throw result }
+        },
+        () => {
+            const result = stringify(toArray(_.union(unsafeCmp)([1, 2, 3])([])))
+            if (result !== '[1,2,3]') { throw result }
+        },
+        () => {
+            const n = 10_000
+            const sortedSet = toArray(countdown(n))
+            const result = _.union(reverseCmp)(sortedSet)(sortedSet)
+            const len = length(result)
+            if (len != n) { throw result }
+        }
+    ],
+    intersect: [
+        () => {
+            const result = stringify(toArray(_.intersect(unsafeCmp)([2, 3, 4])([1, 3, 5])))
+            console.log(result)
+            if (result !== '[3]') { throw result }
+        },
+        () => {
+            const result = stringify(toArray(_.intersect(unsafeCmp)([1, 2, 3])([])))
+            if (result !== '[]') { throw result }
+        }
+    ]
+}

package/com/test/cpp/build.cjs

@@ -1,15 +0,0 @@
-const fs = require('node:fs')
-const cp = require('node:child_process')
-const os = require('node:os');
-const cpp = require('../../cpp/test.f.cjs').result
-const { string: { join }, list: { flat } } = require('../../../types/module.f.cjs')
-
-fs.writeFileSync('_result.hpp', cpp)
-try {
-    const flags = os.platform() === 'win32' ? [] : ['-std=c++11', '-lc++']
-    const line = join(' ')(flat([['clang'], flags, ['main.cpp']]))
-    console.log(cp.execSync(line).toString())
-} catch (e) {
-    // @ts-ignore
-    console.error(e.output.toString())
-}

package/com/test/cs/build.cjs

@@ -1,11 +0,0 @@
-const fs = require('node:fs')
-const cp = require('node:child_process')
-const cs = require('../../cs/test.f.cjs').result
-
-fs.writeFileSync('_result.cs', cs)
-try {
-    console.log(cp.execSync('dotnet build').toString())
-} catch (e) {
-    // @ts-ignore
-    console.error(e.output.toString())
-}