Changeset 5

Timestamp:

02/07/05 01:14:52 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

1041

Message:

* ingy's patch re: building on osx.
* juerd reported that only \' should escapes in .

Files:

• Makefile.PL (modified) (1 diff)
• src/Lexer.hs (modified) (1 diff)

Makefile.PL

@@ -22 +22 @@
 $has_readline = 0 if $^O eq 'MSWin32';
 
-if ($^O =~ /darwin/i and not -e "/usr/local/readline/readline.h") {
-    die << '.';
-*** /usr/local/readline/readline.h not found.
+if ($^O =~ /darwin/i and not -e "/usr/local/include/readline/readline.h") {
+    warn << '.';
+*** /usr/local/include/readline/readline.h not found.
 *** Readline support disabled.  If you want readling support,
     please install Readline from the URL below and try again:
     http://p4.elixus.org/snap/pugs/macosx-readline-5.0.005.pkg.tar.gz
 .
+    $has_readline = 0;
 }
 

src/Lexer.hs

@@ -141 +141 @@
                       <?> "literal string")
 
-singleStrChar = quotedQuote <|> noneOf "'"
+singleStrChar = try quotedQuote <|> noneOf "'"
 
 quotedQuote = do
-    char '\\'
-    anyChar
+    string "\\'"
+    return '\''