ref: ceded833e958aa9f7c0c0642f09cd7942b02158b
parent: 4709d4ebd8b07e4a568726af17478c9d9cb66d71
author: Ori Bernstein <[email protected]>
date: Thu Oct 18 10:36:21 EDT 2012
Allow labels as leaf nodes in exprs.
--- a/6/simp.c
+++ b/6/simp.c
@@ -1108,7 +1108,7 @@
break;
case Olit:
switch (args[0]->lit.littype) {- case Lchr: case Lbool: case Lint:
+ case Lchr: case Lbool: case Lint: case Llbl:
r = n;
break;
case Lstr: case Lseq: case Lflt:
@@ -1116,9 +1116,6 @@
break;
case Lfunc:
r = simplit(s, n, &file->file.stmts, &file->file.nstmts);
- break;
- case Llbl:
- die("Don't support labels in expressions yet");break;
}
break;
--- a/libstd/Makefile
+++ b/libstd/Makefile
@@ -4,14 +4,12 @@
chartype.myr \
die.myr \
fmt.myr \
+ option.myr \
rand.myr \
sys.myr \
types.myr \
utf.myr \
varargs.myr \
-
- # FIXME: Temporarily disabled due to compiler bug.
- # option.myr \
ASMSRC= \
start.s \