functionalscript 0.0.466 → 0.0.468

package/com/cpp/com.hpp

@@ -15,7 +15,7 @@
 
 namespace com
 {
-    constexpr uint64_t byteswap(uint64_t v)
+    constexpr uint64_t byteswap(uint64_t v) noexcept
     {
         v = v >>  8 & 0x00FF00FF00FF00FF |
             v <<  8 & 0xFF00FF00FF00FF00;
@@ -97,19 +97,49 @@ namespace com
             p.Release();
         }
 
+        template<class U>
+        ref<U> upcast() const noexcept
+        {
+            return ref<U>(p);
+        }
+
+        I* operator->() const noexcept
+        {
+            return &p;
+        }
+
+        I* unsafe_result() const noexcept
+        {
+            p.AddRef();
+            return &p;
+        }
     private:
         I &p;
     };
 
+    template<class I>
+    ref<I> to_ref(I& p) noexcept
+    {
+        return ref<I>(p);
+    }
+
     constexpr static GUID const iunknown_guid =
         GUID(0x00000000'0000'0000, 0xC000'000000000046);
 
-    template <class I>
-    constexpr GUID interface_guid();
-
     template <class T>
     class implementation : public T
     {
+    public:
+        template<class ...U>
+        static T* create_raw(U... u)
+        {
+            return new implementation(u...);
+        }
+        template<class ...U>
+        static ref<T> create(U... u)
+        {
+            return to_ref(*create_raw(u...));
+        }
     private:
         HRESULT COM_STDCALL QueryInterface(GUID const &riid, IUnknown **const ppvObject) noexcept override
         {
@@ -142,6 +172,9 @@ namespace com
             return c;
         }
 
+        template<class ...U>
+        explicit implementation(U... u): T(u...) {}
+
         std::atomic<ULONG> counter;
     };
 }

package/com/cpp/module.f.cjs

@@ -47,6 +47,8 @@ const cpp = name => lib => {
 
     const type = objectType(id => `::com::ref<${id}>`)
 
+    const resultType = objectType(id => `${id}*`)
+
     /** @type {(s: types.Field) => text.Item} */
     const field = ([name, t]) => `${type(t)} ${name};`
 
@@ -56,7 +58,7 @@ const cpp = name => lib => {
     const defStruct = s => mapField(entries(s.struct))
 
     /** @type {(fa: types.FieldArray) => string} */
-    const cppResult = resultVoid(type)
+    const cppResult = resultVoid(resultType)
 
     /** @type {(p: types.Field) => string} */
     const param = ([name, t]) => `${objectType(id => `${id}&`)(t)} ${name}`

package/com/cpp/test.f.cjs

@@ -27,7 +27,7 @@ const f = () =>
         '        virtual ::com::BOOL* COM_STDCALL GetUnsafe() noexcept = 0;\n' +
         '        virtual void COM_STDCALL SetUnsafe(Slice* p, uint32_t size) noexcept = 0;\n' +
         '        virtual ::com::BOOL COM_STDCALL Some(IMy& p) noexcept = 0;\n' +
-        '        virtual ::com::ref<IMy> COM_STDCALL GetIMy() noexcept = 0;\n' +
+        '        virtual IMy* COM_STDCALL GetIMy() noexcept = 0;\n' +
         '        virtual void COM_STDCALL SetManagedStruct(ManagedStruct a) noexcept = 0;\n' +
         '    };\n' +
         '}'

package/com/test/build.f.cjs

@@ -71,8 +71,8 @@ const cpp = ({dirname, platform}) => ({
         flat([
             ['clang', '-shared', '-o', output(platform)('testc')],
             flags(platform),
-            [`${dirname}/cpp/main.cpp`]]
-        ),
+            [`${dirname}/cpp/main.cpp`],
+        ]),
     ],
 })
 
@@ -85,7 +85,7 @@ const cs = ({dirname, platform}) => ({
     line: [
         platform === 'win32'
             ? ['dotnet', 'run', '--project', `${dirname}/cs/cs.csproj`]
-        // .Net on Linux and Windows doesn't properly support COM object marshalling
+        // .Net on Linux and MacOS doesn't properly support COM object marshalling
             : ['dotnet', 'build', `${dirname}/cs/cs.csproj`]
     ],
 })

package/com/test/cpp/main.cpp

@@ -15,11 +15,18 @@ extern "C" int c_get()
 
 class Impl: public My::IMy
 {
+public:
     My::Slice COM_STDCALL GetSlice() noexcept override
     {
     }
     void COM_STDCALL SetSlice(My::Slice slice) noexcept override
     {
+        std::cout
+            << "SetSlice: "
+            << (slice.Start - static_cast<uint8_t*>(nullptr))
+            << ", "
+            << slice.Size
+            << std::endl;
     }
     ::com::BOOL *COM_STDCALL GetUnsafe() noexcept override
     {
@@ -30,16 +37,29 @@ class Impl: public My::IMy
     ::com::BOOL COM_STDCALL Some(My::IMy &p) noexcept override
     {
     }
-    ::com::ref<My::IMy> COM_STDCALL GetIMy() noexcept override
+    My::IMy* COM_STDCALL GetIMy() noexcept override
     {
+        return ::com::to_ref(*this).unsafe_result();
     }
     void COM_STDCALL SetManagedStruct(My::ManagedStruct a) noexcept override
     {
     }
+    ~Impl()
+    {
+        ::std::cout << "done" << std::endl;
+    }
 };
 
 DLL_EXPORT
 extern "C" My::IMy* c_my_create()
 {
-    return new ::com::implementation<Impl>();
+    {
+        auto const x = ::com::implementation<Impl>::create().unsafe_result();
+        x->Release();
+    }
+    {
+        auto const x = ::com::implementation<Impl>::create().upcast<My::IMy>();
+        x->SetSlice(My::Slice());
+    }
+    return ::com::implementation<Impl>::create().unsafe_result();
 }

package/com/test/cs/Program.cs

@@ -21,4 +21,11 @@ Console.WriteLine(c_get());
 var x = rust_my_create();
 x.SetSlice(new Slice { Start = null, Size = (UIntPtr)44 });
 
-var y = c_my_create();
+{
+    var y = c_my_create();
+    y.SetSlice(new Slice { Start = null, Size = (UIntPtr)45 });
+    var t = y.GetIMy();
+}
+
+GC.Collect();
+Console.WriteLine("ok");

package/fsm/module.f.cjs

@@ -1,21 +1,64 @@
-const { todo } = require('../dev/module.f.cjs')
 const list = require('../types/list/module.f.cjs')
+const { equal, isEmpty, fold, toArray, scan } = list
 const byteSet = require('../types/byte_set/module.f.cjs')
+const { toRangeMap } = byteSet
+const sortedSet = require('../types/sorted_set/module.f.cjs')
+const { intersect, union } = sortedSet
+const rangeMap = require('../types/range_map/module.f.cjs')
+const { merge } = rangeMap
+const { unsafeCmp } = require('../types/function/compare/module.f.cjs')
+const operator = require("../types/function/operator/module.f.cjs")
+const { strictEqual } = operator
+const { stringify } = require('../json/module.f.cjs')
+const { identity } = require('../types/function/module.f.cjs')
 
 /** @typedef {readonly[string, byteSet.ByteSet, string]} Rule */
 
 /** @typedef {list.List<Rule>} Grammar */
 
-/** @typedef {readonly string[]} ByteMap */
-
 /**
  * @typedef {{
- *  readonly[state in string]: ByteMap
+ *  readonly[state in string]: rangeMap.RangeMapArray<string>
  * }} Dfa
  */
 
+const stringifyIdentity = stringify(identity)
+
+/** @type {rangeMap.Operators<sortedSet.SortedSet<string>>} */
+const mergeOp = { union: union(unsafeCmp), equal: equal(strictEqual) }
+
+/** @type {(s: string) => (set: sortedSet.SortedSet<string>) => boolean} */
+const hasState = s => set => !isEmpty(intersect(unsafeCmp)([s])(set))
+
+/** @type {(set: sortedSet.SortedSet<string>) => operator.Fold<Rule, rangeMap.RangeMap<sortedSet.SortedSet<string>>>} */
+const foldOp = set => ([ruleIn, bs, ruleOut]) => rm => {
+    if (hasState(ruleIn)(set)) { return merge(mergeOp)(rm)(toRangeMap(bs)(ruleOut)) }
+    return rm
+}
+
+/** @type {operator.Scan<rangeMap.Entry<sortedSet.SortedSet<string>>, rangeMap.Entry<string>>} */
+const stringifyOp = ([sortedSet, max]) => [[stringifyIdentity(sortedSet), max], stringifyOp]
+
+const scanStringify = scan(stringifyOp)
+
+/** @type {operator.Scan<rangeMap.Entry<sortedSet.SortedSet<string>>, sortedSet.SortedSet<string>>} */
+const fetchOp = ([item, _]) => [item, fetchOp]
+
+const scanFetch = scan(fetchOp)
+
+/** @type {(grammar: Grammar) => operator.Fold<sortedSet.SortedSet<string>, Dfa>} */
+const addEntry = grammar => set => dfa => {
+    const s = stringifyIdentity(set)
+    if (s in dfa) { return dfa }
+    const setMap = fold(foldOp(set))(undefined)(grammar)
+    const stringMap = toArray(scanStringify(setMap))
+    const newDfa = { ...dfa, [s]: stringMap }
+    const newStates = scanFetch(setMap)
+    return fold(addEntry(grammar))(newDfa)(newStates)
+}
+
 /** @type {(grammar: Grammar) => Dfa} */
-const dfa = grammar => todo()
+const dfa = grammar => addEntry(grammar)([''])({})
 
 module.exports = {
     /** @readonly */

package/fsm/test.f.cjs

@@ -1,5 +1,79 @@
 const _ = require('./module.f.cjs')
+const byteSet = require('../types/byte_set/module.f.cjs')
+const { sort, fromEntries } = require('../types/object/module.f.cjs')
+const json = require('../json/module.f.cjs')
+const { identity } = require('../types/function/module.f.cjs')
+
+/** @type {(c: string) => number} */
+const toCharCode = c => c.charCodeAt(0)
 
 module.exports = {
+    dfa: () => {
+        const lowercaseAlpha = byteSet.range([toCharCode('a'), toCharCode('z')])
+        const uppercaseAlpha = byteSet.range([toCharCode('A'), toCharCode('Z')])
+        const alpha = byteSet.union(lowercaseAlpha)(uppercaseAlpha)
+        const idSymbol = byteSet.union(byteSet.one(toCharCode('_')))(byteSet.one(toCharCode('$')))
+        const idBegin = byteSet.union(alpha)(idSymbol)
+        const digit = byteSet.range([toCharCode('0'), toCharCode('9')])
+        const idNext = byteSet.union(idBegin)(digit)
+        const dot = byteSet.one(toCharCode('.'))
+
+        /** @type {_.Grammar} */
+        const grammar = [
+            ['', digit, 'int'],
+            ['int', digit, 'int'],
+            ['', digit, 'floatBegin'],
+            ['floatBegin', digit, 'floatBegin'],
+            ['floatBegin', dot, 'floatDot'],
+            ['floatDot', digit, 'float'],
+            ['float', digit, 'float'],
+            ['', idBegin, 'id'],
+            ['id', idNext, 'id']
+        ]
+
+        const dfa = _.dfa(grammar)
+        const entries = Object.entries(dfa)
+        const sortedEntries = sort(entries)
+        const obj = fromEntries(sortedEntries)
+        const result = json.stringify(identity)(obj)
+
+        const expectedObj = {
+            '[""]': [
+                [ '[]', 35 ],
+                [ '["id"]', 36 ],
+                [ '[]', 47 ],
+                [ '["floatBegin","int"]', 57 ],
+                [ '[]', 64 ],
+                [ '["id"]', 90 ],
+                [ '[]', 94 ],
+                [ '["id"]', 95 ],
+                [ '[]', 96 ],
+                [ '["id"]', 122 ]
+            ],
+            '["float"]': [ [ '[]', 47 ], [ '["float"]', 57 ] ],
+            '["floatBegin","int"]': [
+                [ '[]', 45 ],
+                [ '["floatDot"]', 46 ],
+                [ '[]', 47 ],
+                [ '["floatBegin","int"]', 57 ]
+            ],
+            '["floatDot"]': [ [ '[]', 47 ], [ '["float"]', 57 ] ],
+            '["id"]': [
+                [ '[]', 35 ],
+                [ '["id"]', 36 ],
+                [ '[]', 47 ],
+                [ '["id"]', 57 ],
+                [ '[]', 64 ],
+                [ '["id"]', 90 ],
+                [ '[]', 94 ],
+                [ '["id"]', 95 ],
+                [ '[]', 96 ],
+                [ '["id"]', 122 ]
+            ],
+            '[]': []
+        };
+        const expectedResult = json.stringify(identity)(expectedObj)
 
+        if (result !== expectedResult) {throw result }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.466",
+  "version": "0.0.468",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {

package/sha2/module.f.cjs

@@ -22,15 +22,15 @@ const padding = input => bitsCount => {
     const appendBlockIndex = (bitsCount / 32) | 0
     const length = (bitsCount + mod(447 - bitsCount)(512) + 65) / 32
     /** @type {(i: number) => number} */
-    const f = i =>
-        i < appendBlockIndex ?
-            input[i] :
-        i === appendBlockIndex ?
-            (appendBlockIndex >= input.length ? 0x8000_0000 : appendOneWithZeros(input[appendBlockIndex])(31 - bitsCount % 32)) :
-        i === length - 2 ?
-            (bitsCount / 0x1_0000_0000) | 0 :
-        i === length - 1 ?
-            bitsCount % 0x1_0000_0000 : 0
+    const f = i => {
+        if (i < appendBlockIndex) { return input[i] }
+        if (i === appendBlockIndex) {
+            return appendBlockIndex >= input.length ? 0x8000_0000 : appendOneWithZeros(input[appendBlockIndex])(31 - bitsCount % 32)
+        }
+        if (i === length - 2) { return (bitsCount / 0x1_0000_0000) | 0 }
+        if (i === length - 1) { return bitsCount % 0x1_0000_0000 }
+        return 0
+    }
     return ({ f, length })
 }
 
@@ -97,6 +97,25 @@ const nextW = ([w0, w1, w2, w3, w4, w5, w6, w7, w8, w9, wA, wB, wC, wD, wE, wF])
     return [w0, w1, w2, w3, w4, w5, w6, w7, w8, w9, wA, wB, wC, wD, wE, wF]
 }
 
+const k = [
+    [
+        0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+        0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+    ],
+    [
+        0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+        0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+    ],
+    [
+        0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+        0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+    ],
+    [
+        0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+        0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
+    ],
+];
+
 /** @type {(init: Hash8) => (data: Array16) => Hash8} */
 const compress = ([a0, b0, c0, d0, e0, f0, g0, h0]) => data => {
     let w = data
@@ -165,21 +184,6 @@ const computeSha256 = compute(init256)
 /** @type {Hash8} */
 const init224 = [0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4]
 
-const k = [
-    [
-        0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-        0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174],
-    [
-        0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-        0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967],
-    [
-        0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-        0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070],
-    [
-        0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-        0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2],
-];
-
 /** @type {(input: readonly number[]) => (bitsCount: number) => Hash8} */
 const computeSha224 = compute(init224)
 

package/types/byte_set/module.f.cjs

@@ -72,6 +72,8 @@ module.exports = {
     /** @readonly */
     unset,
     /** @readonly */
+    one,
+    /** @readonly */
     union,
     /** @readonly */
     setRange,

package/types/range_map/module.f.cjs

@@ -15,6 +15,11 @@ const operator = require("../function/operator/module.f.cjs")
  * @typedef {sortedList.SortedList<Entry<T>>} RangeMap
  */
 
+/**
+ * @template T
+ * @typedef {readonly Entry<T>[]} RangeMapArray
+ */
+
 /**
  * @template T
  * @typedef {{