summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles.Forsyth <devnull@localhost>2008-05-29 18:50:41 +0000
committerCharles.Forsyth <devnull@localhost>2008-05-29 18:50:41 +0000
commit0ba3f162322e6c878bc6b31c30f9e5c18b7570ef (patch)
tree98006dd1de82a9160d7641ed58e42a291e73c1c4
parent5d814502697ac4bec68abcc2cf615e4f5444c629 (diff)
20080529-1950
-rw-r--r--CHANGES2
-rw-r--r--appl/cmd/limbo/stubs.b2
-rw-r--r--dis/limbo.disbin343278 -> 343321 bytes
-rw-r--r--include/version.h2
-rw-r--r--limbo/stubs.c2
5 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 02b7a314..b5500e6f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20080529
+ limbo/stubs.c: allow pick adt types
20080528
emu/port/win-x11a.c screen depth checks from drawterm via tim@nop.cx
20080524
diff --git a/appl/cmd/limbo/stubs.b b/appl/cmd/limbo/stubs.b
index acb24b81..cafd6ff7 100644
--- a/appl/cmd/limbo/stubs.b
+++ b/appl/cmd/limbo/stubs.b
@@ -481,6 +481,8 @@ ctypeconv(t: ref Type): string
Tfix or
Tpoly =>
return ckindname[t.kind];
+ Tadtpick =>
+ return ctypeconv(t.decl.dot.ty);
Tadt or
Ttuple =>
if(t.decl.sym != anontupsym)
diff --git a/dis/limbo.dis b/dis/limbo.dis
index e455128c..8abc6333 100644
--- a/dis/limbo.dis
+++ b/dis/limbo.dis
Binary files differ
diff --git a/include/version.h b/include/version.h
index 8436b644..7d9fa0c9 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20080528)"
+#define VERSION "Fourth Edition (20080529)"
diff --git a/limbo/stubs.c b/limbo/stubs.c
index 3c174e4a..7d951c63 100644
--- a/limbo/stubs.c
+++ b/limbo/stubs.c
@@ -493,6 +493,8 @@ ctprint(char *buf, char *end, Type *t)
case Tfix:
case Tpoly:
return seprint(buf, end, "%s", ckindname[t->kind]);
+ case Tadtpick:
+ return ctprint(buf, end, t->decl->dot->ty);
case Tadt:
case Ttuple:
if(t->decl->sym != anontupsym)