summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-04-05 16:17:32 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-04-05 16:17:32 -0400
commit84bbd76f640d3e7718c090e229bb05d5f5e49eac (patch)
tree8ad97a4f06d9ca9987b23c38c3907354a316eb1f /src
parentb60bc069e6300f40792a237db491284ed5372429 (diff)
Fixing some regressions and other bugs
Diffstat (limited to 'src')
-rw-r--r--src/c/driver.c3
-rw-r--r--src/jscomp.sml8
2 files changed, 7 insertions, 4 deletions
diff --git a/src/c/driver.c b/src/c/driver.c
index c5e1ba33..712de2de 100644
--- a/src/c/driver.c
+++ b/src/c/driver.c
@@ -182,6 +182,9 @@ static void *worker(void *data) {
dont_close = 1;
fprintf(stderr, "Processed request for messages by client %u\n\n", idn);
}
+ else {
+ fprintf(stderr, "Missing fields in .msgs request: %s, %s\n\n", id, pass);
+ }
break;
}
diff --git a/src/jscomp.sml b/src/jscomp.sml
index 9cefc60f..9a621906 100644
--- a/src/jscomp.sml
+++ b/src/jscomp.sml
@@ -364,7 +364,7 @@ fun process file =
else
e
in
- ("(uu=t[i++],uu==\"Some\"?" ^ e ^ ":null)", st)
+ ("(t[i++]==\"Some\"?" ^ e ^ ":null)", st)
end
| TDatatype (n, ref (dk, cs)) =>
@@ -861,7 +861,7 @@ fun process file =
let
val (e, st) = jsE inner (e, st)
in
- (strcat [str "alert(\"ERROR: \"+", e, str ")"],
+ (strcat [str "alert(cat(\"ERROR: \",", e, str "))"],
st)
end
@@ -952,9 +952,9 @@ fun process file =
val (ek, st) = jsE inner (ek, st)
val (unurl, st) = unurlifyExp loc (t, st)
in
- (strcat [str ("rc(\"" ^ !Monoize.urlPrefix ^ "\"+"),
+ (strcat [str ("rc(cat(\"" ^ !Monoize.urlPrefix ^ "\","),
e,
- str (", function(s){var t=s.split(\"/\");var i=0;return "
+ str ("), function(s){var t=s.split(\"/\");var i=0;return "
^ unurl ^ "},"),
ek,
str ")"],