Updating: very very minorly

githwxi · Sep 13, 2024 · b3e630d · b3e630d
1 parent 7a9cbf8
commit b3e630d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/prelude/DATS/gseq001.dats b/prelude/DATS/gseq001.dats
@@ -1615,7 +1615,7 @@ strm_vt_filter0<x0>
 where
 {
 #impltmp
-filter$test0<x0> = filter$test<x0>
+filter$test1<x0> = filter$test<x0>
 }
 #impltmp
 < xs:t0 >
@@ -1628,7 +1628,7 @@ strq_vt_filter0<x0>
 where
 {
 #impltmp
-filter$test0<x0> = filter$test<x0>
+filter$test1<x0> = filter$test<x0>
 }
 //
 #impltmp

diff --git a/prelude/SATS/VT/strm000_vt.sats b/prelude/SATS/VT/strm000_vt.sats
@@ -84,7 +84,7 @@ strm_vt_head0
 fun
 <x0:vt>
 strm_vt_tail0
-(xs: strm_vt(x0)): strm_vt(x0))
+(xs: strm_vt(x0)): strm_vt(x0)
 //
 #symload head0 with strm_vt_head0
 #symload tail0 with strm_vt_tail0

diff --git a/srcgen1/prelude/DATS/gbas000.dats b/srcgen1/prelude/DATS/gbas000.dats
@@ -117,7 +117,7 @@ else
 <x0><y0>
 mapoptn$fopr0(x0) =
 if
-filter$test0<x0>(x0)
+filter$test1<x0>(x0)
 then
 (
   optn_vt_cons(y0)

diff --git a/srcgen1/prelude/DATS/gseq000.dats b/srcgen1/prelude/DATS/gseq000.dats
@@ -1026,7 +1026,7 @@ strm_vt_mapopt0<x0><y0>(xs)
 map$fopr0
 <x0><y0> = map$fopr<x0><y0>
 #impltmp
-filter$test0<x0> = filter$test<x0> }
+filter$test1<x0> = filter$test<x0> }
 end // end-of(impltmp)
 //end-(gseq_mapopt_lstrm/strmize(...))
 //
@@ -1141,7 +1141,7 @@ strm_vt_filter0
 ) where
 {
 #impltmp
-filter$test0<x0> = filter$test<x0>
+filter$test1<x0> = filter$test<x0>
 }(*where*)//end-of[gseq_filter_lstrm(xs)]
 
 (* ****** ****** *)
@@ -2329,7 +2329,7 @@ strm_vt_imapopt0<x0><y0>(xs)
 imap$fopr0
 <x0><y0> = imap$fopr<x0><y0>
 #impltmp
-ifilter$test0<x0> = ifilter$test<x0>
+ifilter$test1<x0> = ifilter$test<x0>
 }
 end//end-of-(gseq_imap_lstrm/strmize(xs))
 

diff --git a/srcgen1/prelude/DATS/list000.dats b/srcgen1/prelude/DATS/list000.dats
@@ -1371,7 +1371,7 @@ For gmap-operations
 {k0:t0}
 {x0:t0}
 gmap_make_nil
-<list@(k0,x0)><k0,x0>
+<list@(k0,x0)><k0><x0>
   ((*void*)) =
 (
   list_nil((*void*)) )
@@ -1382,7 +1382,7 @@ gmap_make_nil
 {k0:t0}
 {x0:t0}
 gmap_keyq
-<list@(k0,x0)><k0,x0>
+<list@(k0,x0)><k0><x0>
   (kxs, key) =
 (
   loop(kxs)) where
@@ -1409,7 +1409,7 @@ g_equal<k0>
 {k0:t0}
 {x0:t0}
 gmap_search$opt
-<list@(k0,x0)><k0,x0>
+<list@(k0,x0)><k0><x0>
 (kxs, key) =
 (
   loop(kxs)) where
@@ -1438,7 +1438,7 @@ then optn_vt_cons(kx1.1) else loop(kxs)
 {k0:t0}
 {x0:t0}
 gmap_insert$opt
-<list@(k0,x0)><k0,x0>
+<list@(k0,x0)><k0><x0>
 (kxs, key, itm) =
 optn_vt_nil(*void*) where
 {
@@ -1453,14 +1453,14 @@ val () =
 {x0:t0}
 gmap_strmize
 <
-list@(k0,x0)><k0,x0>(*0*) =
-list_strmize<(k0,x0)>(*0*)
+list@(k0,x0)><k0><x0>(*0*) =
+list_strmize<(k0, x0)>(*0*)
 //
 #impltmp
 {k0:t0}
 {x0:t0}
 gmap_strmize_key
-<list@(k0,x0)><k0,x0>(kxs) =
+<list@(k0,x0)><k0><x0>(kxs) =
 (
 gseq_map_lstrm<kxs><k0>(kxs)
 ) where
@@ -1472,7 +1472,7 @@ gseq_map_lstrm<kxs><k0>(kxs)
 {k0:t0}
 {x0:t0}
 gmap_strmize_itm
-<list@(k0,x0)><k0,x0>(kxs) =
+<list@(k0,x0)><k0><x0>(kxs) =
 (
 gseq_map_lstrm<kxs><x0>(kxs)
 ) where

diff --git a/srcgen1/prelude/SATS/gbas000.sats b/srcgen1/prelude/SATS/gbas000.sats
@@ -275,9 +275,11 @@ takeif$test1(x0: !x0): bool
 fun
 <x0:t0>
 filter$test(x0: x0): bool
+(*
 fun
 <x0:vt>
-filter$test0(x0: !x0): bool
+filter$test0(x0: ~x0): bool
+*)
 fun
 <x0:vt>
 filter$test1(x0: !x0): bool
@@ -598,9 +600,11 @@ itakeif$test1(nint, !x0): bool
 fun
 <x0:t0>
 ifilter$test(nint, x0): bool
+(*
 fun
 <x0:vt>
 ifilter$test0(nint, !x0): bool
+*)
 fun
 <x0:vt>
 ifilter$test1(nint, !x0): bool