correct implemented of cip68 struct eq and neq operators

HeliosLang · Sep 17, 2024 · 62f580f · 62f580f
1 parent 3154e7c
commit 62f580f
Show file tree

Hide file tree

Showing 6 changed files with 470 additions and 159 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@helios-lang/compiler",
-    "version": "0.17.0-85",
+    "version": "0.17.0-86",
     "description": "Helios is a Domain Specific Language that compiles to Plutus-Core (i.e. Cardano on-chain validator scripts). Helios is a non-Haskell alternative to Plutus. With this library you can compile Helios scripts and build Cardano transactions, all you need to build 100% client-side dApps for Cardano.",
     "main": "src/index.js",
     "types": "types/index.d.ts",

diff --git a/src/codegen/makeRawFuncs.js b/src/codegen/makeRawFuncs.js
@@ -683,13 +683,21 @@ export function makeRawFunctions(simplify, isTestnet) {
 	}`
         )
     )
-    // TODO: inline __core__sndPair(head)
     add(
         new RawFunc(
             "__helios__common__cip68_field",
             `(self, name) -> {
-		name_data = __core__bData(name);
 		map = __core__unMapData(__core__headList(__core__sndPair(__core__unConstrData(self))));
+		__helios__common__cip68_field_internal(map, name)
+	}`
+        )
+    )
+    // map is expected to already have been extracted
+    add(
+        new RawFunc(
+            "__helios__common__cip68_field_internal",
+            `(map, name) -> {
+		name_data = __core__bData(name);
 		recurse = (recurse, map) -> {
 			__core__chooseList(
 				map,

diff --git a/src/program/version.js b/src/program/version.js
@@ -1 +1 @@
-export const VERSION = "0.17.0-85"
+export const VERSION = "0.17.0-86"
diff --git a/src/statements/DataDefinition.js b/src/statements/DataDefinition.js
@@ -64,6 +64,13 @@ export class DataDefinition {
         return this.#fields.slice()
     }
 
+    /**
+     * @type {string[]}
+     */
+    get fieldNames() {
+        return this.#fields.map((f) => f.name.value)
+    }
+
     hasTags() {
         return this.#fields.some((f) => f.hasTag())
     }
@@ -88,13 +95,6 @@ export class DataDefinition {
         return found
     }
 
-    /**
-     * @type {string[]}
-     */
-    get fieldNames() {
-        return this.#fields.map((f) => f.name.value)
-    }
-
     /**
      * @param {Word} name
      * @returns {boolean}
@@ -598,6 +598,74 @@ export class DataDefinition {
         }
     }
 
+    /**
+     * @param {Site} site
+     * @returns {SourceMappedString}
+     */
+    toIR_withTagsEq(site) {
+        // the expected fields must exist in both
+        let irInner = $`true`
+
+        for (let i = 0; i < this.#fields.length; i++) {
+            const f = this.#fields[i]
+
+            irInner = $`__core__ifThenElse(
+                __core__equalsData(
+                    __helios__common__cip68_field_internal(aFields, #${bytesToHex(encodeUtf8(f.tag))}),
+                    __helios__common__cip68_field_internal(bFields, #${bytesToHex(encodeUtf8(f.tag))})
+                ),
+                () -> {${irInner}},
+                () -> {false}
+            )()`
+        }
+
+        let irOuter = $(
+            `(a, b) -> {
+            aFields = __core__unMapData(__core__headList(__core__sndPair(__core__unConstrData(a))));
+            bFields = __core__unMapData(__core__headList(__core__sndPair(__core__unConstrData(b))));
+
+            ${irInner}
+        }`,
+            site
+        )
+
+        return irOuter
+    }
+
+    /**
+     * @param {Site} site
+     * @returns {SourceMappedString}
+     */
+    toIR_withTagsNeq(site) {
+        // the expected fields must exist in both
+        let irInner = $`false`
+
+        for (let i = 0; i < this.#fields.length; i++) {
+            const f = this.#fields[i]
+
+            irInner = $`__core__ifThenElse(
+                __core__equalsData(
+                    __helios__common__cip68_field_internal(aFields, #${bytesToHex(encodeUtf8(f.tag))}),
+                    __helios__common__cip68_field_internal(bFields, #${bytesToHex(encodeUtf8(f.tag))})
+                ),
+                () -> {${irInner}},
+                () -> {true}
+            )()`
+        }
+
+        let irOuter = $(
+            `(a, b) -> {
+            aFields = __core__unMapData(__core__headList(__core__sndPair(__core__unConstrData(a))));
+            bFields = __core__unMapData(__core__headList(__core__sndPair(__core__unConstrData(b))));
+
+            ${irInner}
+        }`,
+            site
+        )
+
+        return irOuter
+    }
+
     /**
      * @param {string} path
      * @returns {SourceMappedString}