coffee, dart, elixir, elm: detect unclosed strings.

Detect more cases of strings being unterminated.

diff --git a/coffee/Makefile b/coffee/Makefile
index 74b3c96..4036473 100644 (file)
--- a/coffee/Makefile
+++ b/coffee/Makefile
@@ -3,11 +3,18 @@ SOURCES_BASE = node_readline.coffee types.coffee \
 SOURCES_LISP = env.coffee core.coffee stepA_mal.coffee
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
+STEPS = step0_repl.coffee step1_read_print.coffee \
+       step2_eval.coffee step3_env.coffee step4_if_fn_do.coffee \
+       step5_tco.coffee step6_file.coffee step7_quote.coffee \
+       step8_macros.coffee step9_try.coffee stepA_mal.coffee
+
 all: node_modules dist
 
 node_modules:
        npm install
 
+$(STEPS): node_modules
+
 dist: mal.coffee mal
 
 mal.coffee: $(SOURCES)

diff --git a/coffee/reader.coffee b/coffee/reader.coffee
index f0253eb..e551bec 100644 (file)
--- a/coffee/reader.coffee
+++ b/coffee/reader.coffee
@@ -22,10 +22,11 @@ read_atom = (rdr) ->
   token = rdr.next()
   if token.match /^-?[0-9]+$/ then parseInt token,10
   else if token.match /^-?[0-9][0-9.]*$/ then parseFloat token,10
-  else if token[0] == '"'
-    throw new Error "expected '\"', got EOF" if token[-1..-1] != '"'
+  else if token.match /^"(?:\\.|[^\\"])*"$/
     token.slice(1, token.length-1)
       .replace(/\\(.)/g, (_, c) -> if c == 'n' then '\n' else c)
+  else if token[0] == '"'
+    throw new Error "expected '\"', got EOF"
   else if token[0] == ':' then types._keyword(token[1..])
   else if token == "nil" then null
   else if token == "true" then true

diff --git a/dart/reader.dart b/dart/reader.dart
index fc6eb51..b746f70 100644 (file)
--- a/dart/reader.dart
+++ b/dart/reader.dart
@@ -2,6 +2,8 @@ import 'types.dart';
 
 final malRegExp = new RegExp(
     r"""[\s,]*(~@|[\[\]{}()'`~^@]|"(?:\\.|[^\\"])*"?|;.*|[^\s\[\]{}('"`,;)]*)""");
+final strRegExp = new RegExp(
+    r"""^"(?:\\.|[^\\"])*"$""");
 
 class Reader {
   final List<String> tokens;
@@ -114,10 +116,7 @@ MalType read_atom(Reader reader) {
     return new MalInt(intAtom);
   }
 
-  if (token[0] == '"') {
-    if (token[token.length -1 ] != '"') {
-      throw new ParseException("expected '\"', got EOF");
-    }
+  if (strRegExp.matchAsPrefix(token) != null) {
     var sanitizedToken = token
         // remove surrounding quotes
         .substring(1, token.length - 1)
@@ -126,6 +125,10 @@ MalType read_atom(Reader reader) {
     return new MalString(sanitizedToken);
   }
 
+  if (token[0] == '"') {
+    throw new ParseException("expected '\"', got EOF");
+  }
+
   if (token[0] == ':') {
     return new MalKeyword(token.substring(1));
   }

diff --git a/elixir/lib/mal/reader.ex b/elixir/lib/mal/reader.ex
index 8670429..07f3719 100644 (file)
--- a/elixir/lib/mal/reader.ex
+++ b/elixir/lib/mal/reader.ex
@@ -83,7 +83,7 @@ defmodule Mal.Reader do
   defp read_atom(":" <> rest), do: String.to_atom(rest)
   defp read_atom(token) do
     cond do
-      String.starts_with?(token, "\"") and String.ends_with?(token, "\"") ->
+      String.match?(token, ~r/^"(?:\\.|[^\\"])*"$/) ->
         token
           |> Code.string_to_quoted
           |> elem(1)

diff --git a/elm/Reader.elm b/elm/Reader.elm
index c770460..2016e8a 100644 (file)
--- a/elm/Reader.elm
+++ b/elm/Reader.elm
@@ -198,4 +198,4 @@ that's why it's down below. :)
 -}
 strString : Parser s String
 strString =
-    regex "\"(\\\\\"|[^\"])*\"" <?> "string"
+    regex "\"(\\\\.|[^\\\\\"])*\"" <?> "string"