From c199f978020ccb9793d9c408fb312a58b7bbceb8 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Wed, 13 Apr 2022 20:24:08 +0300
Subject: [PATCH] added macro nested blocks (still experimenting)...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 pwiki2.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pwiki2.js b/pwiki2.js
index 9b176d0..db2ea79 100755
--- a/pwiki2.js
+++ b/pwiki2.js
@@ -377,13 +377,16 @@ function*(str){
 // 			type: 'inline'
 // 				| 'element'
 // 				| 'block',
-// 			block: [ .. ],
+// 			block: [
+// 				<item>,
+// 				...
+// 			],
 //
 //			// rest of items are the same as for lex(..)
 // 			...
 // 		}
 //
-// XXX normalize lex to be a generator???
+// XXX normalize lex to be a generator (???)
 var group = 
 module.group =
 function*(lex, to=false){
@@ -391,15 +394,27 @@ function*(lex, to=false){
 	// 		generator even if the end is not reached...
 	while(true){
 		var {value, done} = lex.next()
+		// check if unclosed blocks remaining...
 		if(done){
 			if(to){
-				throw new Error('Premature end of unpit: Expected closing "'+ to +'"') }
+				throw new Error(
+					'Premature end of unpit: Expected closing "'+ to +'"') }
 			return }
+		// assert nesting rules...
+		if(macros[value.name] instanceof Array
+				&& macros[value.name].includes(to)){
+			throw new Error(
+				'Unexpected "'+ value.name +'" macro' 
+					+(to ? 
+						' in "'+to+'"' 
+						: '')) }
+		// open block...
 		if(value.type == 'opening'){
 			value.body = [...group(lex, value.name)]
 			value.type = 'block'
 			yield value
 			continue
+		// close block...
 		} else if(value.type == 'closing'){
 			if(value.name != to){
 				throw new Error('Unexpected closing "'+ value.name +'"') }
@@ -409,6 +424,7 @@ function*(lex, to=false){
 
 
 var parse = 
+module.parse =
 function*(str){
 	yield* group(lex(str)) }
 
@@ -442,6 +458,9 @@ var macros = {
 	quote: function(){},
 	macro: function(){},
 	slot: function(){},
+
+	// nesting rules...
+	'else': ['macro'],
 }