From 269fcf7bd8ca5bdd347d38018805578653d4e500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E7=81=AF?= Date: Mon, 24 Feb 2025 22:27:20 +0800 Subject: [PATCH] adapt new syntax --- src/js/async.mbt | 2 +- src/js/cast.mbt | 16 ++++++++++++---- src/js/js.mbti | 4 ++-- src/js/null.mbt | 2 +- src/js/optional.mbt | 2 +- src/js/symbol.mbt | 2 +- src/js/union.mbt | 14 +++++++------- src/js/value.mbt | 2 +- 8 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/js/async.mbt b/src/js/async.mbt index 65cd1b7..6ce3f23 100644 --- a/src/js/async.mbt +++ b/src/js/async.mbt @@ -7,7 +7,7 @@ pub async fn suspend[T, E : Error]( pub fn async_run(f : async () -> Unit) -> Unit = "%async.run" ///| -pub type Promise +pub extern type Promise ///| pub typealias AsyncOp = () -> Promise diff --git a/src/js/cast.mbt b/src/js/cast.mbt index 3630e4e..eebf440 100644 --- a/src/js/cast.mbt +++ b/src/js/cast.mbt @@ -45,7 +45,9 @@ pub impl Cast for String with into(value) { } ///| -pub impl Cast for String with from(value) { Value::cast_from(value) } +pub impl Cast for String with from(value) { + Value::cast_from(value) +} ///| pub impl Cast for Int with into(value) { @@ -53,7 +55,9 @@ pub impl Cast for Int with into(value) { } ///| -pub impl Cast for Int with from(value) { Value::cast_from(value) } +pub impl Cast for Int with from(value) { + Value::cast_from(value) +} ///| pub impl Cast for Double with into(value) { @@ -61,7 +65,9 @@ pub impl Cast for Double with into(value) { } ///| -pub impl Cast for Double with from(value) { Value::cast_from(value) } +pub impl Cast for Double with from(value) { + Value::cast_from(value) +} ///| pub impl Cast for Bool with into(value) { @@ -69,7 +75,9 @@ pub impl Cast for Bool with into(value) { } ///| -pub impl Cast for Bool with from(value) { Value::cast_from(value) } +pub impl Cast for Bool with from(value) { + Value::cast_from(value) +} ///| pub impl[A : Cast] Cast for Array[A] with into(value) { diff --git a/src/js/js.mbti b/src/js/js.mbti index 41b75a0..20c0886 100644 --- a/src/js/js.mbti +++ b/src/js/js.mbti @@ -60,7 +60,7 @@ impl Optional { undefined[T]() -> Self[T] } -pub type Promise +pub extern type Promise type Symbol impl Symbol { @@ -168,7 +168,7 @@ impl Union8 { to7[A, B, C, D, E, F, G, H : Cast](Self[A, B, C, D, E, F, G, H]) -> H? } -pub type Value +pub extern type Value impl Value { apply[Arg, Result](Self, Array[Arg]) -> Result apply_with_index[Arg, Result](Self, Int, Array[Arg]) -> Result diff --git a/src/js/null.mbt b/src/js/null.mbt index 1892f7a..59b44e7 100644 --- a/src/js/null.mbt +++ b/src/js/null.mbt @@ -1,5 +1,5 @@ ///| -type Nullable[_] +extern type Nullable[_] ///| pub fn Nullable::is_null[T](self : Nullable[T]) -> Bool { diff --git a/src/js/optional.mbt b/src/js/optional.mbt index 841829b..767085d 100644 --- a/src/js/optional.mbt +++ b/src/js/optional.mbt @@ -1,5 +1,5 @@ ///| -type Optional[_] +extern type Optional[_] ///| pub fn Optional::is_undefined[T](self : Optional[T]) -> Bool { diff --git a/src/js/symbol.mbt b/src/js/symbol.mbt index 12b21a5..f4fd347 100644 --- a/src/js/symbol.mbt +++ b/src/js/symbol.mbt @@ -1,5 +1,5 @@ ///| -type Symbol +extern type Symbol ///| pub fn Symbol::make() -> Symbol { diff --git a/src/js/union.mbt b/src/js/union.mbt index aeee702..a0cd86a 100644 --- a/src/js/union.mbt +++ b/src/js/union.mbt @@ -1,5 +1,5 @@ ///| Union type `A | B` for JavaScript values. -type Union2[_, _] +extern type Union2[_, _] ///| pub fn Union2::to0[A : Cast, B](self : Union2[A, B]) -> A? { @@ -22,7 +22,7 @@ pub fn Union2::from1[A, B : Cast](value : B) -> Union2[A, B] { } ///| Union type `A | B | C` for JavaScript values. -type Union3[_, _, _] +extern type Union3[_, _, _] ///| pub fn Union3::to0[A : Cast, B, C](self : Union3[A, B, C]) -> A? { @@ -55,7 +55,7 @@ pub fn Union3::from2[A, B, C : Cast](value : C) -> Union3[A, B, C] { } ///| Union type `A | B | C | D` for JavaScript values. -type Union4[_, _, _, _] +extern type Union4[_, _, _, _] ///| pub fn Union4::to0[A : Cast, B, C, D](self : Union4[A, B, C, D]) -> A? { @@ -98,7 +98,7 @@ pub fn Union4::from3[A, B, C, D : Cast](value : D) -> Union4[A, B, C, D] { } ///| Union type `A | B | C | D | E` for JavaScript values. -type Union5[_, _, _, _, _] +extern type Union5[_, _, _, _, _] ///| pub fn Union5::to0[A : Cast, B, C, D, E](self : Union5[A, B, C, D, E]) -> A? { @@ -151,7 +151,7 @@ pub fn Union5::from4[A, B, C, D, E : Cast](value : E) -> Union5[A, B, C, D, E] { } ///| Union type `A | B | C | D | E | F` for JavaScript values. -type Union6[_, _, _, _, _, _] +extern type Union6[_, _, _, _, _, _] ///| pub fn Union6::to0[A : Cast, B, C, D, E, F]( @@ -238,7 +238,7 @@ pub fn Union6::from5[A, B, C, D, E, F : Cast]( } ///| Union type `A | B | C | D | E | F | G` for JavaScript values. -type Union7[_, _, _, _, _, _, _] +extern type Union7[_, _, _, _, _, _, _] ///| pub fn Union7::to0[A : Cast, B, C, D, E, F, G]( @@ -339,7 +339,7 @@ pub fn Union7::from6[A, B, C, D, E, F, G : Cast]( } ///| Union type `A | B | C | D | E | F | G | H` for JavaScript values. -type Union8[_, _, _, _, _, _, _, _] +extern type Union8[_, _, _, _, _, _, _, _] ///| pub fn Union8::to0[A : Cast, B, C, D, E, F, G, H]( diff --git a/src/js/value.mbt b/src/js/value.mbt index d251620..244eeaa 100644 --- a/src/js/value.mbt +++ b/src/js/value.mbt @@ -1,5 +1,5 @@ ///| -pub type Value +pub extern type Value ///| pub fn Value::cast_from[T](value : T) -> Value = "%identity"