Merge branch 'main' into pragma

Author: Yoorkin

bool/bool.mbt

@@ -19,3 +19,23 @@ pub trait Boolean {
 pub fn Bool::to_bool(self : Bool) -> Bool {
   self
 }
+
+pub fn to_int(self : Bool) -> Int {
+  if self {
+    1
+  } else {
+    0
+  }
+}
+
+pub fn to_int64(self : Bool) -> Int64 {
+  if self {
+    1L
+  } else {
+    0L
+  }
+}
+
+pub fn hash(self : Bool) -> Int {
+  self.to_int()
+}

builtin/console.mbt

@@ -85,43 +85,6 @@ pub fn to_string(self : Int) -> String {
   buf.to_string()
 }
 
-pub fn to_int(self : Bool) -> Int {
-  if self {
-    1
-  } else {
-    0
-  }
-}
-
-pub fn to_int64(self : Bool) -> Int64 {
-  if self {
-    1L
-  } else {
-    0L
-  }
-}
-
-fn to_bool(self : Int) -> Bool {
-  if self == 0 {
-    false
-  } else {
-    true
-  }
-}
-
-fn to_bool(self : Int64) -> Bool {
-  if self == 0L {
-    false
-  } else {
-    true
-  }
-}
-
-/// @intrinsic %f64.to_string
-pub fn to_string(self : Double) -> String {
-  double_to_string(self)
-}
-
 pub fn op_lt[T : Compare](self_ : T, other : T) -> Bool {
   self_.compare(other).is_neg()
 }
@@ -171,13 +134,6 @@ pub fn String::make(length : Int, value : Char) -> String {
   }
 }
 
-/// Convert Char to String
-pub fn to_string(self : Char) -> String {
-  let bytes = Bytes::make(4, 0)
-  let len = bytes.set_utf16_char(0, self)
-  bytes.sub_string(0, len)
-}
-
 pub fn inspect(
   obj : Show,
   ~content : String = "",

builtin/debug.mbt

@@ -41,10 +41,6 @@ pub fn debug_write(self : Int64, buf : Buffer) -> Unit {
   buf.write_string(self.to_string())
 }
 
-pub fn debug_write(self : Double, buf : Buffer) -> Unit {
-  buf.write_string(self.to_string())
-}
-
 fn should_escape(ch : Char) -> Bool {
   match ch {
     '"' | '\'' | '\\' | '\n' | '\r' | '\b' | '\t' => true
@@ -85,12 +81,6 @@ fn escape_write_char(ch : Char, buf : Buffer) -> Unit {
   }
 }
 
-pub fn debug_write(self : Char, buf : Buffer) -> Unit {
-  buf.write_char('\'')
-  escape_write_char(self, buf)
-  buf.write_char('\'')
-}
-
 pub fn debug_write[X : Debug](self : Option[X], buf : Buffer) -> Unit {
   match self {
     None => buf.write_string("None")
@@ -157,56 +147,3 @@ pub fn debug_write(self : String, buf : Buffer) -> Unit {
   flush_segment(self.length())
   buf.write_char('"')
 }
-
-pub fn debug_write[X : Debug, Y : Debug](self : (X, Y), buf : Buffer) -> Unit {
-  buf.write_char('(')
-  self.0.debug_write(buf)
-  buf.write_string(", ")
-  self.1.debug_write(buf)
-  buf.write_char(')')
-}
-
-pub fn debug_write[X : Debug, Y : Debug, Z : Debug](
-  self : (X, Y, Z),
-  buf : Buffer
-) -> Unit {
-  buf.write_char('(')
-  self.0.debug_write(buf)
-  buf.write_string(", ")
-  self.1.debug_write(buf)
-  buf.write_string(", ")
-  self.2.debug_write(buf)
-  buf.write_char(')')
-}
-
-pub fn debug_write[X : Debug, Y : Debug, Z : Debug, W : Debug](
-  self : (X, Y, Z, W),
-  buf : Buffer
-) -> Unit {
-  buf.write_char('(')
-  self.0.debug_write(buf)
-  buf.write_string(", ")
-  self.1.debug_write(buf)
-  buf.write_string(", ")
-  self.2.debug_write(buf)
-  buf.write_string(", ")
-  self.3.debug_write(buf)
-  buf.write_char(')')
-}
-
-pub fn debug_write[X1 : Debug, X2 : Debug, X3 : Debug, X4 : Debug, X5 : Debug](
-  self : (X1, X2, X3, X4, X5),
-  buf : Buffer
-) -> Unit {
-  buf.write_char('(')
-  self.0.debug_write(buf)
-  buf.write_string(", ")
-  self.1.debug_write(buf)
-  buf.write_string(", ")
-  self.2.debug_write(buf)
-  buf.write_string(", ")
-  self.3.debug_write(buf)
-  buf.write_string(", ")
-  self.4.debug_write(buf)
-  buf.write_char(')')
-}

builtin/list.mbt

@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub fn List::default[X]() -> List[X] {
-  Nil
-}
-
 pub fn List::op_equal[X : Eq](xs : List[X], ys : List[X]) -> Bool {
   match (xs, ys) {
     (Nil, Nil) => true

builtin/option.mbt

@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub fn Option::default[X]() -> Option[X] {
-  None
-}
-
 pub fn op_equal[X : Eq](self : Option[X], other : Option[X]) -> Bool {
   match (self, other) {
     (None, None) => true
@@ -24,28 +20,6 @@ pub fn op_equal[X : Eq](self : Option[X], other : Option[X]) -> Bool {
   }
 }
 
-pub fn compare[X : Compare](self : Option[X], other : Option[X]) -> Int {
-  match self {
-    None =>
-      match other {
-        None => 0
-        Some(_) => -1
-      }
-    Some(x) =>
-      match other {
-        None => 1
-        Some(y) => x.compare(y)
-      }
-  }
-}
-
-pub fn unwrap[X](self : Option[X]) -> X {
-  match self {
-    None => abort("called `Option::unwrap()` on a `None` value")
-    Some(x) => x
-  }
-}
-
 pub fn to_string[X : Show](self : Option[X]) -> String {
   match self {
     None => "None"

builtin/result.mbt

@@ -22,22 +22,3 @@ pub fn op_equal[T : Eq, E : Eq](
     _ => false
   }
 }
-
-pub fn compare[T : Compare, E : Compare](
-  self : Result[T, E],
-  other : Result[T, E]
-) -> Int {
-  match (self, other) {
-    (Ok(x), Ok(y)) => x.compare(y)
-    (Ok(_), Err(_)) => -1
-    (Err(_), Ok(_)) => 1
-    (Err(x), Err(y)) => x.compare(y)
-  }
-}
-
-pub fn unwrap[T, E](self : Result[T, E]) -> T {
-  match self {
-    Ok(x) => x
-    Err(_) => abort("called `Result::unwrap()` on an `Err` value")
-  }
-}

builtin/string.mbt

@@ -29,41 +29,6 @@ fn xxhash32(input : Bytes, seed : Int) -> Int {
   finalize(h, input, len.land(-16), len.land(0xF))
 }
 
-pub fn to_bytes(self : String) -> Bytes {
-  let len = self.length()
-  let buf = Bytes::make(len, 0)
-  for i = 0; i < len; i = i + 1 {
-    buf[i] = self[i].to_int()
-  }
-  buf
-}
-
-pub fn hash(self : Bool) -> Int {
-  self.to_int()
-}
-
-pub fn hash(self : Char) -> Int {
-  self.to_int()
-}
-
-pub fn hash(self : Int) -> Int {
-  self
-}
-
-pub fn hash(self : Int64) -> Int {
-  let lo = self.to_int()
-  let hi = self.lsr(32).to_int()
-  lo.lxor(hi)
-}
-
-pub fn hash(self : Double) -> Int {
-  self.reinterpret_as_i64().hash()
-}
-
-pub fn hash(self : String) -> Int {
-  xxhash32(self.to_bytes(), 0)
-}
-
 pub fn hash(self : Bytes) -> Int {
   xxhash32(self, 0)
 }

builtin/xxhash.mbt renamed to bytes/xxhash.mbt

@@ -11,3 +11,70 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+/// Convert Char to String
+pub fn to_string(self : Char) -> String {
+  let bytes = Bytes::make(4, 0)
+  let len = bytes.set_utf16_char(0, self)
+  bytes.sub_string(0, len)
+}
+
+test "to_string" {
+  @assertion.assert_eq('a'.to_string(), "a")?
+}
+
+/// Write a valid MoonBit syntax representation of a character to a buffer,
+/// with quotes added and special characters escaped.
+pub fn debug_write(self : Char, buf : Buffer) -> Unit {
+  fn to_hex_digit(i : Int) -> Char {
+    if i < 10 {
+      Char::from_int('0'.to_int() + i)
+    } else {
+      Char::from_int('a'.to_int() + (i - 10))
+    }
+  }
+  buf.write_char('\'')
+  match self {
+    '\'' | '\\' => {
+      buf.write_char('\\')
+      buf.write_char(self)
+    }
+    '\n' => buf.write_string("\\n")
+    '\r' => buf.write_string("\\r")
+    '\b' => buf.write_string("\\b")
+    '\t' => buf.write_string("\\t")
+    _ => {
+      let code = self.to_int()
+      if code < 0x20 {
+        buf.write_char('\\')
+        buf.write_char('x')
+        buf.write_char(to_hex_digit(code / 16))
+        buf.write_char(to_hex_digit(code % 16))
+      } else {
+        buf.write_char(self)
+      }
+    }
+  }
+  buf.write_char('\'')
+}
+
+test "debug_write" {
+  fn repr(chr) {
+    let buf = Buffer::make(0)
+    debug_write(chr, buf)
+    buf.to_string()
+  }
+  @assertion.assert_eq(repr('a'), "'a'")?
+  @assertion.assert_eq(repr('\''), "'\\''")?
+  @assertion.assert_eq(repr('"'), "'\"'")?
+  @assertion.assert_eq(repr('\\'), "'\\\\'")?
+  @assertion.assert_eq(repr('\n'), "'\\n'")?
+  @assertion.assert_eq(repr('\r'), "'\\r'")?
+  @assertion.assert_eq(repr('\b'), "'\\b'")?
+  @assertion.assert_eq(repr('\t'), "'\\t'")?
+  @assertion.assert_eq(repr(Char::from_int(0)), "'\\x00'")?
+}
+
+pub fn hash(self : Char) -> Int {
+  self.to_int()
+}

char/char.mbt

@@ -1,6 +1,7 @@
 {
     "import": [
         "moonbitlang/core/builtin",
+        "moonbitlang/core/assertion",
         "moonbitlang/core/coverage"
     ]
 }