From 090686bb2e79ed05fef594c3a578d265e10d7101 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 10 Feb 2014 17:53:13 +0400
Subject: [PATCH] block terminator now working...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 Slang/slang.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Slang/slang.js b/Slang/slang.js
index 2e43fb9..1b162b2 100755
--- a/Slang/slang.js
+++ b/Slang/slang.js
@@ -110,22 +110,26 @@ var PRE_NAMESPACE = {
 		var block = []
 		var code = context.code
 		var cur = code.splice(0, 1)[0]
-		//while(cur != ']' && cur != ']]' && code.length > 0){
-		while(cur != ']' && code.length > 0){
+		while(cur != ']' && cur != ']]' && code.length > 0){
+		//while(cur != ']' && code.length > 0){
 			if(cur == '['){
 				cur = this['['](context)
 			}
 			block.push(cur)
 			cur = code.splice(0, 1)[0]
 		}
-		//if(code.length == 0 && cur != ']' && cur != ']]'){
-		if(code.length == 0 && cur != ']'){
+		// we need this to be able to jump out of all the nested blocks...
+		if(cur == ']]'){
+			code.splice(0, 0, cur)
+		}
+		if(code.length == 0 && cur != ']' && cur != ']]'){
 			console.error('Did not find expected "]".')
 		} 
 		return block
 	},
+	// drop the closing words...
+	']]': function(context){},
 	']': function(context){ console.error('Unexpected "]".') },
-	']]': function(context){ console.error('Unexpected "]]".') },
 
 	// XXX macros are not recursive...
 	'macro:': function(context){
@@ -719,7 +723,7 @@ var BOOTSTRAP = [
 '	dup [ -1 eq ] ?',
 '		[ . push ]',
 '	else',
-'		[ inc before ] ]',
+'		[ inc before ]]',
 '',
 '-- push element to tail of block...',
 ':: push ( b e -- b ) [ swap len rot swap tor to ]',
@@ -750,7 +754,7 @@ var BOOTSTRAP = [
 '		[ drop ]',
 '	-- dec push new and continue...',
 '	else',
-'		[ 1 sub 0 before range ] ]',
+'		[ 1 sub 0 before range ]]',
 '',
 '-- Sum up the elements of a block...',
 ':: sum ( L -- s ) [',
@@ -763,7 +767,7 @@ var BOOTSTRAP = [
 '		[ pop swap . ]',
 '	-- and now recursively sum up elements till the list is 1 in length...',
 '	else',
-'		[ pop rot pop tor add push sum ] ] ]',
+'		[ pop rot pop tor add push sum ]]',
 '',
 '',
 '',