outputdatum constructors can be called anywhere

Hyperion-BT · Mar 27, 2023 · db43db3 · db43db3
1 parent ac82fc6
commit db43db3
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 38 deletions.
diff --git a/helios.d.ts b/helios.d.ts
@@ -185,7 +185,7 @@ export function highlight(src: string): Uint8Array;
 /**
  * Version of the Helios library.
  */
-export const VERSION: "0.13.5";
+export const VERSION: "0.13.6";
 /**
  * Modifiable config vars
  * @type {{

diff --git a/helios.js b/helios.js
@@ -7,7 +7,7 @@
 // Email:         cschmitz398@gmail.com
 // Website:       https://www.hyperion-bt.org
 // Repository:    https://github.com/hyperion-bt/helios
-// Version:       0.13.5
+// Version:       0.13.6
 // Last update:   March 2023
 // License:       Unlicense
 //
@@ -219,7 +219,7 @@
 /**
  * Version of the Helios library.
  */
-export const VERSION = "0.13.5";
+export const VERSION = "0.13.6";
 
 /**
  * A tab used for indenting of the IR.
@@ -16783,23 +16783,26 @@ class OutputDatumType extends BuiltinType {
 	getTypeMember(name) {
 		switch (name.value) {
 			case "new_none":
-				if (this.macrosAllowed) {
-					return Instance.new(new FuncType([], new NoOutputDatumType()));
-				} else {
-					throw name.referenceError("'OutputDatum::new_none' only allowed after 'main'");
-				}
+				return Instance.new(new FuncType([], new NoOutputDatumType()));
 			case "new_hash":
-				if (this.macrosAllowed) {
-					return Instance.new(new FuncType([new DatumHashType()], new HashedOutputDatumType()));
-				} else {
-					throw name.referenceError("'OutputDatum::new_hash' only allowed after 'main'");
-				}
-			case "new_inline":
-				if (this.macrosAllowed) {
-					return Instance.new(new FuncType([new AnyDataType()], new InlineOutputDatumType()));
-				} else {
-					throw name.referenceError("'OutputDatum::new_inline' only allowed after 'main'");
-				}
+				return Instance.new(new FuncType([new DatumHashType()], new HashedOutputDatumType()));
+			case "new_inline": {
+				let a = new ParamType("a");
+				return new ParamFuncValue([a], new FuncType([a], new InlineOutputDatumType()), () => {
+					let type = a.type;
+					if (type === null) {
+						throw new Error("should've been inferred by now");
+					} else {
+						if (a.type instanceof FuncType) {
+							throw name.site.typeError("can't use function as argument to OutputDatum::new_inline()");
+						} else if ((new BoolType()).isBaseOf(Site.dummy(), type)) {
+							return "new_inline_from_bool";
+						} else {
+							return "new_inline";
+						}
+					}
+				});
+			}
 			case "None":
 				return new NoOutputDatumType();
 			case "Hash":
@@ -28062,6 +28065,10 @@ function makeRawFunctions() {
 	`(data) -> {
 		__core__constrData(2, __helios__common__list_1(data))
 	}`));
+	add(new RawFunc("__helios__outputdatum__new_inline_from_bool",
+	`(b) -> {
+		__helios__outputdatum__new_inline(_helios__common__boolData(b))
+	}`));
 	add(new RawFunc("__helios__outputdatum__get_inline_data",
 	`(self) -> {
 		() -> {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hyperionbt/helios",
   "type": "module",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "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": "helios.js",
   "types": "helios.d.ts",

diff --git a/src/helios-eval-entities.js b/src/helios-eval-entities.js
@@ -4379,23 +4379,26 @@ export class OutputDatumType extends BuiltinType {
 	getTypeMember(name) {
 		switch (name.value) {
 			case "new_none":
-				if (this.macrosAllowed) {
-					return Instance.new(new FuncType([], new NoOutputDatumType()));
-				} else {
-					throw name.referenceError("'OutputDatum::new_none' only allowed after 'main'");
-				}
+				return Instance.new(new FuncType([], new NoOutputDatumType()));
 			case "new_hash":
-				if (this.macrosAllowed) {
-					return Instance.new(new FuncType([new DatumHashType()], new HashedOutputDatumType()));
-				} else {
-					throw name.referenceError("'OutputDatum::new_hash' only allowed after 'main'");
-				}
-			case "new_inline":
-				if (this.macrosAllowed) {
-					return Instance.new(new FuncType([new AnyDataType()], new InlineOutputDatumType()));
-				} else {
-					throw name.referenceError("'OutputDatum::new_inline' only allowed after 'main'");
-				}
+				return Instance.new(new FuncType([new DatumHashType()], new HashedOutputDatumType()));
+			case "new_inline": {
+				let a = new ParamType("a");
+				return new ParamFuncValue([a], new FuncType([a], new InlineOutputDatumType()), () => {
+					let type = a.type;
+					if (type === null) {
+						throw new Error("should've been inferred by now");
+					} else {
+						if (a.type instanceof FuncType) {
+							throw name.site.typeError("can't use function as argument to OutputDatum::new_inline()");
+						} else if ((new BoolType()).isBaseOf(Site.dummy(), type)) {
+							return "new_inline_from_bool";
+						} else {
+							return "new_inline";
+						}
+					}
+				});
+			}
 			case "None":
 				return new NoOutputDatumType();
 			case "Hash":

diff --git a/src/ir-defs.js b/src/ir-defs.js
@@ -2912,6 +2912,10 @@ function makeRawFunctions() {
 	`(data) -> {
 		__core__constrData(2, __helios__common__list_1(data))
 	}`));
+	add(new RawFunc("__helios__outputdatum__new_inline_from_bool",
+	`(b) -> {
+		__helios__outputdatum__new_inline(_helios__common__boolData(b))
+	}`));
 	add(new RawFunc("__helios__outputdatum__get_inline_data",
 	`(self) -> {
 		() -> {