flynx/types.js
1
0
Fork 0
mirror of https://github.com/flynx/types.js.git synced 2025-12-19 09:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

more work on .iter(..), now mostly uniform, still needs more testing and possibly unification...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-06-24 05:50:10 +03:00
parent c804028d9f
commit 2def3e2749
2 changed files with 75 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Array.js
View File

@ -489,8 +489,18 @@ object.Mixin('ArrayProtoMixin', 'soft', {
// -> iterator
//
// XXX should this take an argument and be like map??
iter: function*(){
yield* this },
iter: function*(handler=undefined){
if(handler){
var i = 0
for(var e of this){
var res = handler.call(this, e, i++)
if(typeof(res) == 'object'
&& Symbol.iterator in res){
yield* res
} else {
yield res } }
} else {
yield* this }},
// Stoppable iteration...

117
generator.js
View File

@ -84,6 +84,53 @@ var ITERATOR_PROTOTYPES = [
//---------------------------------------------------------------------
var stoppable =
module.stoppable =
function(func){
return Object.assign(
func instanceof Generator ?
// NOTE: the only difference between Generator/AsyncGenerator
// versions of this is the async keyword -- keep them
// in sync...
function*(){
try{
yield* func.call(this, ...arguments)
} catch(err){
if(err === STOP){
return
} else if(err instanceof STOP){
yield err.value
return }
throw err } }
: func instanceof AsyncGenerator ?
// NOTE: the only difference between Generator/AsyncGenerator
// versions of this is the async keyword -- keep them
// in sync...
async function*(){
try{
yield* func.call(this, ...arguments)
} catch(err){
if(err === STOP){
return
} else if(err instanceof STOP){
yield err.value
return }
throw err } }
: function(){
try{
return func.call(this, ...arguments)
} catch(err){
if(err === STOP){
return
} else if(err instanceof STOP){
return err.value }
throw err } },
{ toString: function(){
return func.toString() }, }) }
//---------------------------------------------------------------------
// generic generator wrapper...
@ -91,7 +138,8 @@ var ITERATOR_PROTOTYPES = [
var __iter =
module.__iter =
function*(lst=[]){
if(typeof(lst) == 'object' && Symbol.iterator in lst){
if(typeof(lst) == 'object'
&& Symbol.iterator in lst){
yield* lst
} else {
yield lst } }
@ -101,7 +149,7 @@ function*(lst=[]){
var iter =
module.iter =
Generator.iter =
function(lst=[]){
stoppable(function(lst=[]){
// handler -> generator-constructor...
if(typeof(lst) == 'function'){
// we need to be callable...
@ -112,7 +160,7 @@ Generator.iter =
return function*(){
yield* that(...arguments).iter(lst) } }
// no handler -> generator instance...
return module.__iter(lst) }
return module.__iter(lst) })
// NOTE: we need .iter(..) to both return generators if passed an iterable
// and genereator constructos if passed a function...
@ -201,51 +249,6 @@ var makePromise = function(name){
return that(...arguments)[name](func) } } }
var stoppable =
module.stoppable =
function(func){
return Object.assign(
func instanceof Generator ?
// NOTE: the only difference between Generator/AsyncGenerator
// versions of this is the async keyword -- keep them
// in sync...
function*(){
try{
yield* func.call(this, ...arguments)
} catch(err){
if(err === STOP){
return
} else if(err instanceof STOP){
yield err.value
return }
throw err } }
: func instanceof AsyncGenerator ?
// NOTE: the only difference between Generator/AsyncGenerator
// versions of this is the async keyword -- keep them
// in sync...
async function*(){
try{
yield* func.call(this, ...arguments)
} catch(err){
if(err === STOP){
return
} else if(err instanceof STOP){
yield err.value
return }
throw err } }
: function(){
try{
return func.call(this, ...arguments)
} catch(err){
if(err === STOP){
return
} else if(err instanceof STOP){
return err.value }
throw err } },
{ toString: function(){
return func.toString() }, }) }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
var GeneratorMixin =
@ -332,7 +335,7 @@ var GeneratorProtoMixin =
module.GeneratorProtoMixin =
object.Mixin('GeneratorProtoMixin', 'soft', {
// XXX use module.iter(..) ???
iter: function*(handler){
iter: stoppable(function*(handler){
if(handler){
var i = 0
for(var elem of this){
@ -346,7 +349,7 @@ object.Mixin('GeneratorProtoMixin', 'soft', {
yield res }}
// no handler...
} else {
yield* this } },
yield* this } }),
//*/
at: function(i){
@ -546,10 +549,16 @@ object.Mixin('AsyncGeneratorProtoMixin', 'soft', {
// XXX might be a good idea to use this approach above...
iter: stoppable(async function*(handler=undefined){
var i = 0
for await(var e of this){
yield* handler ?
handler.call(this, e, i++)
: [e] } }),
if(handler){
for await(var e of this){
var res = handler.call(this, e, i++)
if(typeof(res) == 'object'
&& Symbol.iterator in res){
yield* res
} else {
yield res } }
} else {
yield* this } }),
map: async function*(func){
yield* this.iter(function(elem, i){