plpgsql, scala, vimscript, yorick: Detect more unterminated strings.

This is achieved by tightening the regexp used to detect valid strings.

diff --git a/plpgsql/reader.sql b/plpgsql/reader.sql
index 4210961..1ac54b3 100644 (file)
--- a/plpgsql/reader.sql
+++ b/plpgsql/reader.sql
@@ -36,7 +36,7 @@ BEGIN
         INSERT INTO types.value (type_id, val_int)
             VALUES (3, CAST(token AS integer))
             RETURNING value_id INTO result;
-    ELSIF token ~ '^".*"' THEN  -- string
+    ELSIF token ~ '^"(?:[\\\\].|[^\\\\"])*"' THEN  -- string
         -- string
         str := substring(token FROM 2 FOR (char_length(token)-2));
         str := replace(str, '\\', chr(CAST(x'7f' AS integer)));

diff --git a/scala/reader.scala b/scala/reader.scala
index cbd9ec5..d4913f8 100644 (file)
--- a/scala/reader.scala
+++ b/scala/reader.scala
@@ -37,7 +37,7 @@ object reader {
     val token = rdr.next()
     val re_int = """^(-?[0-9]+)$""".r
     val re_flt = """^(-?[0-9][0-9.]*)$""".r
-    val re_str =  """^"(.*)"$""".r
+    val re_str =  """^"((?:\\.|[^\\"])*)"$""".r
     val re_str_bad =  """^"(.*)$""".r
     val re_key = """^:(.*)$""".r
     return token match {

diff --git a/vimscript/reader.vim b/vimscript/reader.vim
index ed1a694..5d86dec 100644 (file)
--- a/vimscript/reader.vim
+++ b/vimscript/reader.vim
@@ -65,7 +65,7 @@ function ReadAtom(rdr)
     return IntegerNew(str2nr(token))
   elseif token =~ "^-\\?[0-9][0-9.]*$"
     return FloatNew(str2float(token))
-  elseif token =~ "^\".*\"$"
+  elseif token =~ "^\"\\%(\\\\.\\|[^\\\\\"]\\)*\"$"
     return StringNew(ParseString(token))
   elseif token =~ "^\".*$"
     throw "expected '\"', got EOF"

diff --git a/yorick/reader.i b/yorick/reader.i
index 571192e..f102a41 100644 (file)
--- a/yorick/reader.i
+++ b/yorick/reader.i
@@ -45,7 +45,7 @@ func reader_next(rdr)
 }
 
 NUMBER_REGEXP = regcomp("^-?[0-9]+$")
-STR_REGEXP = regcomp("^\".*\"$")
+STR_REGEXP = regcomp("^\"([\\].|[^\\\"])*\"$")
 STR_BAD_REGEXP = regcomp("^\".*$")
 
 func unescape(s)