tcl, yorick: fix read-string of raw newline.

diff --git a/tcl/reader.tcl b/tcl/reader.tcl
index c1c7072..6812335 100644 (file)
--- a/tcl/reader.tcl
+++ b/tcl/reader.tcl
@@ -18,9 +18,9 @@ oo::class create Reader {
 }
 
 proc tokenize str {
-    set re {[\s,]*(~@|[\[\]\{\}()'`~^@]|\"(?:\\.|[^\\\"])*\"?|;.*|[^\s\[\]\{\}('\"`~^@,;)]*)}
+    set re {[\s,]*(~@|[\[\]\{\}()'`~^@]|\"(?:\\.|[^\\\"])*\"?|;[^\n]*|[^\s\[\]\{\}('\"`~^@,;)]*)}
     set tokens {}
-    foreach {_ capture} [regexp -line -all -inline $re $str] {
+    foreach {_ capture} [regexp -all -inline $re $str] {
         if {[string length $capture] > 0 && [string range $capture 0 0] != ";"} {
             lappend tokens $capture
         }

diff --git a/yorick/reader.i b/yorick/reader.i
index f102a41..92adfd0 100644 (file)
--- a/yorick/reader.i
+++ b/yorick/reader.i
@@ -1,7 +1,7 @@
 #include "yeti_regex.i"
 require, "types.i"
 
-TOKENIZER_REGEXP = regcomp("[[:space:],]*(~@|[][{}()'`~@]|\"([\\].|[^\\\"])*\"?|;.*|[^][[:space:]{}()'\"`~@,;]*)", newline=1)
+TOKENIZER_REGEXP = regcomp("[[:space:],]*(~@|[][{}()'`~@]|\"([\\].|[^\\\"])*\"?|;[^\n]*|[^][[:space:]{}()'\"`~@,;]*)")
 
 func tokenize(str)
 {