summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles.Forsyth <devnull@localhost>2008-01-30 09:43:09 +0000
committerCharles.Forsyth <devnull@localhost>2008-01-30 09:43:09 +0000
commit279831cd5663f49afc0f72634e6e022b45cb9877 (patch)
treefe8dd16956571b87c7658a89a7b19df178810dfa
parentad01d857a3ec149074830330005eb4c786d3330c (diff)
20080130-0949
-rw-r--r--CHANGES3
-rw-r--r--appl/lib/json.b1
-rw-r--r--appl/lib/ubfa.b1
-rw-r--r--dis/lib/json.disbin7400 -> 7401 bytes
-rw-r--r--dis/lib/ubfa.disbin8083 -> 8088 bytes
-rw-r--r--include/version.h2
-rw-r--r--man/1/INDEX1
7 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 7c054819..2d7bb40e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+20080130
+ failed to return nil from Jvalue.get in appl/lib/json.b if member name didn't match
+ similar problem in appl/lib/ubfa.b
20080124
fix emu/port/devssl.c os/port/devssl.c not to keep the directory numbers(!)
20080122
diff --git a/appl/lib/json.b b/appl/lib/json.b
index 3e86fa4c..09947a7d 100644
--- a/appl/lib/json.b
+++ b/appl/lib/json.b
@@ -534,6 +534,7 @@ JValue.get(v: self ref JValue, mem: string): ref JValue
for(l := r.mem; l != nil; l = tl l)
if((hd l).t0 == mem)
return (hd l).t1;
+ return nil;
* =>
return nil;
}
diff --git a/appl/lib/ubfa.b b/appl/lib/ubfa.b
index bfbf21ca..8de0a8f3 100644
--- a/appl/lib/ubfa.b
+++ b/appl/lib/ubfa.b
@@ -349,6 +349,7 @@ UValue.eq(o: self ref UValue, v: ref UValue): int
Int =>
return r.value == s.value;
}
+ return 0;
Tuple =>
pick s := v {
Tuple =>
diff --git a/dis/lib/json.dis b/dis/lib/json.dis
index 60d7b043..3467efaf 100644
--- a/dis/lib/json.dis
+++ b/dis/lib/json.dis
Binary files differ
diff --git a/dis/lib/ubfa.dis b/dis/lib/ubfa.dis
index c53dacaf..23d82f7a 100644
--- a/dis/lib/ubfa.dis
+++ b/dis/lib/ubfa.dis
Binary files differ
diff --git a/include/version.h b/include/version.h
index 7fbfec41..6472d09a 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20080124)"
+#define VERSION "Fourth Edition (20080130)"
diff --git a/man/1/INDEX b/man/1/INDEX
index ac03fdad..3a3fe459 100644
--- a/man/1/INDEX
+++ b/man/1/INDEX
@@ -262,6 +262,7 @@ sort sort
join spree-join
spree-join spree-join
stack stack
+stackv stack
stream stream
strings strings
md5sum sum