experimenting...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

pwiki/parser.js

@@ -436,60 +436,44 @@ module.BaseParser = {
 	// XXX macros: we are mixing up ast state and parse state...
 	// 		one should only be used for parsing and be forgotten after 
 	// 		the ast is constructed the other should be part of the ast...
-	// XXX ASYNC...
+	// XXX ASYNC this does not yet work as a replacement for .expand(..), not sure why...
-	_expand: function*(page, ast, state={}){
+	_expand: function(page, ast, state={}){
 		var that = this
-		try{
+		ast = ast == null ?
-			ast = ast == null ?
+				Promise.awaitOrRun(
-					Promise.awaitOrRun(
+					page.raw,
-						page.raw,
+					function(raw){
-						function(raw){
+						return that.group(page, raw ?? '') })
-							return that.group(page, raw ?? '') })
+			: typeof(ast) != 'object' ?
-				: typeof(ast) != 'object' ?
+				this.group(page, ast)
-					this.group(page, ast)
+			: ast instanceof types.Generator ?
-				: ast instanceof types.Generator ?
+				ast
-					ast
+			: ast.iter()
-				: ast.iter()
-
-			Promise.sync
-				.resolve(ast)
-				.then(function(ast){
-				})
-
-			// XXX SYNC need to optionally await for ast...
-			while(true){
-				var {value, done} = ast.next()
-				if(done){
-					return }
 
+		return Promise.iter(ast, 
+			function(value){
 				// text block...
 				if(typeof(value) == 'string'){
-					yield value 
+					return value }
-					continue }
-
 				// macro...
 				var {name, args, body} = value
 				// nested macro -- skip...
 				if(typeof(page.macros[name]) != 'function'){
-					yield {...value, skip: true}
+					return {...value, skip: true} }
-					continue }
+				// macro call...
-
+				return Promise.awaitOrRun(
-				// XXX
+					that.callMacro(page, name, args, body, state),
-				var res = 
+					function(res){
-					await this.callMacro(page, name, args, body, state) 
+						res = res ?? ''
-						?? ''
+						// result...
-
+						if(res instanceof Array 
-				// result...
+								|| page.macros[name] instanceof types.Generator){
-				if(res instanceof Array 
+							return res
-						|| page.macros[name] instanceof types.Generator){
+						} else {
-					yield* res
+							return [res] } }) },
-				} else {
+			function(err){
-					yield res } } 
-
-			// error...
-			}catch(err){
 				console.error(err)
-				yield page.parse(
+				return page.parse(
 					// XXX add line number and page path...
 					'@include("./ParseError'
 						+':path='
@@ -506,7 +490,9 @@ module.BaseParser = {
 									return '%'+ c.charCodeAt().toString(16) })
 								.replace(/:/g, ':')
 								.replace(/=/g, '=')
-						+'")') } },
+						+'")') })
+			.sync() },
+	//*/
 	expand: async function*(page, ast, state={}){
 		try{
 			ast = ast == null ?
@@ -566,6 +552,7 @@ module.BaseParser = {
 								.replace(/:/g, ':')
 								.replace(/=/g, '=')
 						+'")') } },
+	//*/
 
 	// recursively resolve and enumerate the ast...
 	//