From: Jérémie Astor <fennecdjay@gmail.com>
Date: Mon, 22 Feb 2021 00:49:42 +0000 (+0100)
Subject: :art: Update Gwion
X-Git-Tag: nightly~928
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=0e6cee1c3979de4903256f451cdfffa19dac048f;p=gwion.git

:art: Update Gwion
---

diff --git a/plug b/plug
index ac1af5f2..2373e234 160000
--- a/plug
+++ b/plug
@@ -1 +1 @@
-Subproject commit ac1af5f272bc0884f7a644cf8c94e011794235b2
+Subproject commit 2373e234b176132692fc0f0b49845bc0821b1b63
diff --git a/src/lib/array.c b/src/lib/array.c
index 1998a89e..67d29e9c 100644
--- a/src/lib/array.c
+++ b/src/lib/array.c
@@ -172,6 +172,13 @@ static MFUN(vm_vector_cap) {
   *(m_uint*)RETURN = ARRAY_CAP(ARRAY(o));
 }
 
+static MFUN(vm_vector_random) {
+  const M_Vector array = ARRAY(o);
+  const m_uint sz = ARRAY_LEN(array);
+  const m_uint idx = (m_int)(sz) * (gw_rand(shred->info->vm->rand) / (UINT32_MAX + 1.0));
+  m_vector_get(array, idx, (void*)RETURN);
+}
+
 #define ARRAY_OPCK(a, b, pos)                  \
   const Type l = array_base(a->type);          \
   const Type r = array_base(b->type);          \
@@ -393,6 +400,7 @@ ANN static inline m_bool array_do(const  Emitter emit, const Array_Sub array, co
   array_finish(emit, array->depth, array->type->size, is_var);
   return GW_OK;
 }
+
 ANN static inline Exp emit_n_exp(const Emitter emit,  struct ArrayAccessInfo *const info) {
   const Exp e = take_exp(info->array.exp, info->array.depth);
   const Exp next = e->next;
@@ -457,6 +465,7 @@ static OP_CHECK(opck_array_scan) {
   builtin_func(env->gwion->mp, (Func)vector_at(&t->nspc->info->vtable, 2), vm_vector_size);
   builtin_func(env->gwion->mp, (Func)vector_at(&t->nspc->info->vtable, 3), vm_vector_depth);
   builtin_func(env->gwion->mp, (Func)vector_at(&t->nspc->info->vtable, 4), vm_vector_cap);
+  builtin_func(env->gwion->mp, (Func)vector_at(&t->nspc->info->vtable, 5), vm_vector_random);
   if(isa(base, env->gwion->type[et_compound]) > 0) {
     t->nspc->dtor = new_vmcode(env->gwion->mp, NULL, SZ_INT, 1, "array component dtor");
     set_tflag(t, tflag_dtor);
@@ -503,7 +512,11 @@ GWION_IMPORT(array) {
   GWI_BB(gwi_func_ini(gwi, "int", "cap"))
   GWI_BB(gwi_func_end(gwi, vm_vector_cap, ae_flag_none))
 
+  GWI_BB(gwi_func_ini(gwi, "T", "random"))
+  GWI_BB(gwi_func_end(gwi, vm_vector_random, ae_flag_none))
+
   GWI_BB(gwi_class_end(gwi))
+
   GWI_BB(gwi_oper_ini(gwi, "Array", "Array", NULL))
   GWI_BB(gwi_oper_add(gwi, opck_array_at))
   GWI_BB(gwi_oper_end(gwi, "=>", NULL))