From 0743ead8ef4aab702cc983e0abe85754e1cad33b Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 30 Dec 2013 05:07:53 +0400
Subject: [PATCH] minor fixes and a better Slang to string conversion
 (non-formal)...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 Slang/slang.html | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/Slang/slang.html b/Slang/slang.html
index f740724..e26b9f9 100755
--- a/Slang/slang.html
+++ b/Slang/slang.html
@@ -55,6 +55,9 @@
 	color: blue;
 }
 
+#words {
+	font-family: monospace;
+}
 
 #stack {
 	opacity: 0.8;
@@ -66,13 +69,10 @@
 <script>
 
 function stringifySlangCode(code){
-	if(code.constructor.name == 'Array'){
-		return '[ '+code.map(function(c){
-			if(c.constructor.name == 'Array'){
-				return stringifySlangCode(c)
-			}
-			return c
-		}).join(' ')+' ]'
+	if(typeof(code) == typeof('str') && /\s/.test(code)){
+		return '\''+code+'\''
+	} else if(code.constructor.name == 'Array'){
+		return '[ '+code.map(stringifySlangCode).join(' ')+' ]'
 	}
 	return code
 }
@@ -95,7 +95,7 @@ function runCommand(){
 		stack.innerText = 'stack: ' + stringifySlangCode(slang(command.innerText))
 
 	} catch(e) {
-		stack.innerText = 'stack: ' + CONTEXT.stack
+		stack.innerText = 'stack: ' + stringifySlangCode(CONTEXT.stack)
 		var err = document.createElement('div')
 		err.classList.add('error')
 		if(e.message != null){
@@ -152,19 +152,23 @@ function toggleBootstrapCode(){
 }
 
 function showAvailableWords(){
-	document.getElementById('words').innerHTML = Object.keys(NAMESPACE).filter(function(e){
-		// skip words starting with '_'...
-		if(e[0] == '_'){
-			return false
-		}
-		return true
-	}).map(function(e){
-		var code = NAMESPACE[e]
-		if(code.constructor.name == 'Array'){
-			code = stringifySlangCode(code)
-		}
-		return '<span title="'+code+'">'+e+'</span>'
-	}).join(', ')
+	document.getElementById('words').innerHTML = Object.keys(NAMESPACE)
+		.sort()
+		.filter(function(e){
+			// skip words starting with '_'...
+			if(e[0] == '_'){
+				return false
+			}
+			return true
+		})
+		.map(function(e){
+			var code = NAMESPACE[e]
+			if(code.constructor.name == 'Array'){
+				code = stringifySlangCode(code)
+			}
+			return '<span title="'+code+'">'+e+'</span>'
+		})
+		.join(', ')
 }