Version 0.1.2

yuchi · Jun 18, 2012 · c3d5cba · c3d5cba
1 parent e273eef
commit c3d5cba
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -168,18 +168,20 @@ Decrements an integer.
 
 Adds up all the strings.
 
-    (var title "TITLE")
+    (var title "My Home Page")
     (console.log
-      (str
-        "<!DOCTYPE html>\n"
-        "<html>\n"
-        "<head>\n"
-        "  <title>" title "</title>\n"     
-        "</head>\n"
-        "<body>\n"
-          "Hello World\n"
-        "</body>\n"
-        "</html>\n"))
+      (str "<!DOCTYPE html>
+    <html>
+    <head>
+      <title>" title "</title>
+    </head>
+    <body class=\"test\">
+    Hello World
+    </body>
+    </html>"))
+
+In LispyScript double quoted strings are multiline strings. As you can see above they span multiple lines.
+If you need a double quote inside the string, escape it with \".
 
 ### (if <condition> <true expression> <false expression>)
 

diff --git a/lib/ls.js b/lib/ls.js
@@ -30,6 +30,7 @@ templates["try"] = _.template("(function () {try {\n<%= trypart %><%= indent %>}
 templates["if"] = _.template("<%= condition %> ?\n<%= indent %><%= trueexpr %> : <%= falseexpr %>");
 templates["get"] = _.template("<%= list %>[<%= key %>]");
 templates["operator"] = _.template("(<%= loperand %> <%= operator %> <%= roperand %>)");
+templates["str"] = _.template("[<%= elems %>].join('')");
 
 var parse = function(code, filename) {
     code = "(" + code + ")";
@@ -64,12 +65,19 @@ var parse = function(code, filename) {
             }
             if (isComment) continue;
             if (c == '"') {
+                if (isString && token[token.length - 1] === "\\") {
+                    token += c;
+                    continue;
+                }
                 isString = !isString;
                 token += c;
                 continue;
             }
             if (isString) {
-                token += c;
+                if (c === "\n")
+                    token += "\\n";
+                else
+                    token += c;
                 continue;
             }
             if (c == "'") {
@@ -323,6 +331,12 @@ keywords["get"] = function(arr) {
     return templates["get"]({key: arr[1], list: arr[2]});
 };
 
+keywords["str"] = function(arr) {
+    if (arr.length < 2) throw handleError(0, arr._line, arr._filename);
+    handleSubExpressions(arr);
+    return templates["str"]({elems: arr.slice(1).join(",")});
+};
+
 keywords["macro"] = function(arr) {
     if (arr.length != 4)  throw handleError(0, arr._line, arr._filename);
     macros[arr[1]] = {template: arr[2], code: arr[3]};

diff --git a/src/macros.ls b/src/macros.ls
@@ -40,9 +40,9 @@
 (macro unless (cond rest...)
   (when (! ~cond) (do ~rest...)))
 
-(macro str (rest...)
-  ((function ()
-    ((.join (Array.prototype.slice.call arguments)) "")) ~rest...))
+#(macro str (rest...)
+#  ((function ()
+#    ((.join (Array.prototype.slice.call arguments)) "")) ~rest...))
 
 (macro each (rest...)
   (Array.prototype.forEach.call ~rest...))