Merge pull request #2 from oboard/feat/overloaded_literal

Feat/overloaded_literal

Author: oboard

src/interpreter/array.mbt

@@ -57,22 +57,22 @@ let array_zip_fn : RuntimeFunction = ctx => match ctx.args {
 ///|
 /// 数组make操作
 let array_make_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Int(len), .. }, { val, .. }] => Array(Array::make(len, val))
+  [{ val: Int(len, ..), .. }, { val, .. }] => Array(Array::make(len, val))
   _ => Unit
 }
 
 ///|
 /// 数组new操作
 let array_new_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Int(len), kind: LabelledOption("capacity") }] =>
+  [{ val: Int(len, ..), kind: LabelledOption("capacity") }] =>
     Array(Array::new(capacity=len))
   _ => Array(Array::new())
 }
 
 ///|
 /// 数组长度
 let array_length_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Array(arr), .. }] => Int(arr.length())
+  [{ val: Array(arr), .. }] => Int(arr.length(), raw=None)
   _ => Unit
 }
 
@@ -128,7 +128,7 @@ let array_join_fn : RuntimeFunction = ctx => match ctx.args {
 ///|
 /// 数组swap操作
 let array_swap_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Array(arr), .. }, { val: Int(i), .. }, { val: Int(j), .. }] => {
+  [{ val: Array(arr), .. }, { val: Int(i, ..), .. }, { val: Int(j, ..), .. }] => {
     arr.swap(i, j)
     Unit
   }
@@ -138,7 +138,7 @@ let array_swap_fn : RuntimeFunction = ctx => match ctx.args {
 ///|
 /// 数组get操作
 let array_get_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Array(arr), .. }, { val: Int(i), .. }] =>
+  [{ val: Array(arr), .. }, { val: Int(i, ..), .. }] =>
     RuntimeValue::from_option(arr.get(i))
   _ => Unit
 }
@@ -156,7 +156,7 @@ let array_append_fn : RuntimeFunction = ctx => match ctx.args {
 ///|
 /// 数组set操作
 let array_set_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Array(arr), .. }, { val: Int(i), .. }, { val, .. }] => {
+  [{ val: Array(arr), .. }, { val: Int(i, ..), .. }, { val, .. }] => {
     arr[i] = val
     Unit
   }
@@ -173,7 +173,7 @@ let array_pop_fn : RuntimeFunction = ctx => match ctx.args {
 ///|
 /// 数组insert操作
 let array_insert_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Array(arr), .. }, { val: Int(i), .. }, { val, .. }] => {
+  [{ val: Array(arr), .. }, { val: Int(i, ..), .. }, { val, .. }] => {
     arr.insert(i, val)
     Unit
   }
@@ -183,7 +183,7 @@ let array_insert_fn : RuntimeFunction = ctx => match ctx.args {
 ///|
 /// 数组remove操作
 let array_remove_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Array(arr), .. }, { val: Int(i), .. }] => arr.remove(i)
+  [{ val: Array(arr), .. }, { val: Int(i, ..), .. }] => arr.remove(i)
   _ => Unit
 }
 
@@ -198,14 +198,14 @@ let array_contains_fn : RuntimeFunction = ctx => match ctx.args {
 /// 数组search操作
 let array_search_fn : RuntimeFunction = ctx => match ctx.args {
   [{ val: Array(arr), .. }, { val, .. }] =>
-    RuntimeValue::from_option(arr.search(val).map(fn(i) { Int(i) }))
+    RuntimeValue::from_option(arr.search(val).map(fn(i) { Int(i, raw=None) }))
   _ => Unit
 }
 
 ///|
 /// 数组capacity操作
 let array_capacity_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Array(arr), .. }] => Int(arr.capacity())
+  [{ val: Array(arr), .. }] => Int(arr.capacity(), raw=None)
   _ => Unit
 }
 
@@ -214,7 +214,7 @@ let array_capacity_fn : RuntimeFunction = ctx => match ctx.args {
 let array_resize_fn : RuntimeFunction = ctx => match ctx.args {
   [
     { val: Array(arr), .. },
-    { val: Int(new_size), .. },
+    { val: Int(new_size, ..), .. },
     { val: fill_val, .. },
     ..,
   ] => {
@@ -227,7 +227,7 @@ let array_resize_fn : RuntimeFunction = ctx => match ctx.args {
 ///|
 /// 数组truncate操作
 let array_truncate_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Array(arr), .. }, { val: Int(len), .. }] => {
+  [{ val: Array(arr), .. }, { val: Int(len, ..), .. }] => {
     arr.truncate(len)
     Unit
   }
@@ -237,7 +237,7 @@ let array_truncate_fn : RuntimeFunction = ctx => match ctx.args {
 ///|
 /// 数组reserve_capacity操作
 let array_reserve_capacity_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: Array(arr), .. }, { val: Int(additional), .. }] => {
+  [{ val: Array(arr), .. }, { val: Int(additional, ..), .. }] => {
     arr.reserve_capacity(additional)
     Unit
   }
@@ -262,7 +262,7 @@ let array_eachi_fn : RuntimeFunction = ctx => match ctx.args {
   [{ val: Array(arr), .. }, { val: Fn(f), .. }] => {
     arr.eachi(fn(i, val) {
       ctx.context.call(f.val, ctx.pkg, [
-        { val: Int(i), kind: Positional },
+        { val: Int(i, raw=None), kind: Positional },
         { val, kind: Positional },
       ])
       |> ignore
@@ -290,7 +290,7 @@ let array_mapi_fn : RuntimeFunction = ctx => match ctx.args {
   [{ val: Array(arr), .. }, { val: Fn(f), .. }] => {
     let new_arr = arr.mapi(fn(i, val) {
       ctx.context.call(f.val, ctx.pkg, [
-        { val: Int(i), kind: Positional },
+        { val: Int(i, raw=None), kind: Positional },
         { val, kind: Positional },
       ])
     })
@@ -333,7 +333,7 @@ let array_search_by_fn : RuntimeFunction = ctx => match ctx.args {
         { val, kind: Positional },
       ]))
       is Ok(Bool(true)))
-    RuntimeValue::from_option(index.map(Int(_)))
+    RuntimeValue::from_option(index.map(Int(_, raw=None)))
   }
   _ => Unit
 }
@@ -350,7 +350,7 @@ let array_iter2_fn : RuntimeFunction = ctx => match ctx.args {
   [{ val: Array(arr), .. }] =>
     Iter2(
       Iter2::new(yield_ => for i, v in arr {
-        guard yield_(Int(i), v) is IterContinue else { break IterEnd }
+        guard yield_(Int(i, raw=None), v) is IterContinue else { break IterEnd }
       } else {
         IterContinue
       }),

src/interpreter/array_view.mbt

@@ -29,7 +29,7 @@ pub let array_view_methods : Map[String, RuntimeFunction] = {
 ///|
 /// 数组长度
 let array_view_length_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: ArrayView(arr), .. }] => Int(arr.length())
+  [{ val: ArrayView(arr), .. }] => Int(arr.length(), raw=None)
   _ => Unit
 }
 
@@ -52,14 +52,14 @@ let array_view_buf_fn : RuntimeFunction = ctx => match ctx.args {
 ///|
 /// ArrayView start 方法 - 返回起始索引
 let array_view_start_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: ArrayView(arr), .. }] => Int(arr.start())
+  [{ val: ArrayView(arr), .. }] => Int(arr.start(), raw=None)
   _ => Unit
 }
 
 ///|
 /// ArrayView len 方法
 let array_view_len_fn : RuntimeFunction = ctx => match ctx.args {
-  [{ val: ArrayView(arr), .. }] => Int(arr.len())
+  [{ val: ArrayView(arr), .. }] => Int(arr.len(), raw=None)
   _ => Unit
 }
 
@@ -114,7 +114,7 @@ let array_view_each_fn : RuntimeFunction = ctx => match ctx.args {
 let array_view_eachi_fn : RuntimeFunction = ctx => match ctx.args {
   [{ val: ArrayView(arr), .. }, { val: Fn(f), .. }] => {
     arr.eachi((i, elem) => ctx.context.call(f.val, ctx.pkg, [
-        { val: Int(i), kind: Positional },
+        { val: Int(i, raw=None), kind: Positional },
         { val: elem, kind: Positional },
       ])
       |> ignore)
@@ -155,7 +155,7 @@ let array_view_foldi_fn : RuntimeFunction = ctx => match ctx.args {
   [{ val: ArrayView(arr), .. }, { val: init, .. }, { val: Fn(f), .. }] =>
     arr.foldi(init~, fn(i, acc, elem) {
       ctx.context.call(f.val, ctx.pkg, [
-        { val: Int(i), kind: Positional },
+        { val: Int(i, raw=None), kind: Positional },
         { val: acc, kind: Positional },
         { val: elem, kind: Positional },
       ])
@@ -176,7 +176,7 @@ let array_view_iter2_fn : RuntimeFunction = ctx => match ctx.args {
   [{ val: ArrayView(self), .. }] =>
     Iter2(
       Iter2::new(yield_ => for i, v in self {
-        guard yield_(Int(i), v) is IterContinue else { break IterEnd }
+        guard yield_(Int(i, raw=None), v) is IterContinue else { break IterEnd }
       } else {
         IterContinue
       }),
@@ -210,7 +210,7 @@ let array_view_mapi_fn : RuntimeFunction = ctx => match ctx.args {
   [{ val: ArrayView(arr), .. }, { val: Fn(f), .. }] =>
     Array(
       arr.mapi((i, elem) => ctx.context.call(f.val, ctx.pkg, [
-        { val: Int(i), kind: Positional },
+        { val: Int(i, raw=None), kind: Positional },
         { val: elem, kind: Positional },
       ])),
     )
@@ -236,7 +236,7 @@ let array_view_rev_foldi_fn : RuntimeFunction = ctx => match ctx.args {
   [{ val: ArrayView(arr), .. }, { val: init, .. }, { val: Fn(f), .. }] =>
     arr.rev_foldi(init~, fn(i, acc, elem) {
       ctx.context.call(f.val, ctx.pkg, [
-        { val: Int(i), kind: Positional },
+        { val: Int(i, raw=None), kind: Positional },
         { val: acc, kind: Positional },
         { val: elem, kind: Positional },
       ])

src/interpreter/assignment_operations.mbt

@@ -40,14 +40,16 @@ fn ClosureInterpreter::visit_field_augmented_assignment(
     Object(refer) =>
       match accessor {
         Label(label) => {
-          let current_val = refer.val.get(label.name).unwrap_or(Int(0))
+          let current_val = refer.val
+            .get(label.name)
+            .unwrap_or(Int(0, raw=None))
           let new_val = runtime_value_infix(base_op, current_val, right_val)
           refer.val.set(label.name, new_val)
         }
         Index(tuple_index~, ..) => {
           let current_val = refer.val
             .get(tuple_index.to_string())
-            .unwrap_or(Int(0))
+            .unwrap_or(Int(0, raw=None))
           let new_val = runtime_value_infix(base_op, current_val, right_val)
           refer.val.set(tuple_index.to_string(), new_val)
         }
@@ -92,7 +94,7 @@ fn ClosureInterpreter::visit_array_set(
     Array(arr) => {
       let index = self.visit(index)
       match index {
-        Int(index) => {
+        Int(index, ..) => {
           let value = self.visit(value)
           arr[index] = value
         }