Fix a %bull bug.

This commit is contained in:
C. Guy Yarvin 2014-01-04 12:19:59 -08:00
parent 10ce9fc5a9
commit d4ebecde86
4 changed files with 10 additions and 8 deletions

View File

@ -34,7 +34,7 @@ LIB=$(PWD)/lib
RM=rm -f
CC=gcc
CLD=gcc -O3 -L/usr/local/lib -L/opt/local/lib
CLD=gcc -g -L/usr/local/lib -L/opt/local/lib
YACC=bison -v -b$(GENERATED)/y
LEX=lex
@ -56,7 +56,7 @@ INCLUDE=include
GENERATED=generated
DEFINES=-DU2_OS_$(OS) -DU2_OS_ENDIAN_$(ENDIAN) -D U2_LIB=\"$(LIB)\"
CFLAGS=-O3 \
CFLAGS=-g \
-I/usr/local/include \
-I/opt/local/include \
-I$(INCLUDE) \

View File

@ -365,7 +365,7 @@
u2_noun cog,
u2_noun gil)
{
u2_noun p_sut, q_sut, pp_sut, qp_sut, rp_sut;
u2_noun p_sut, q_sut, pp_sut, qp_sut, rp_sut, sp_sut;
if ( u2_yes == u2_stud(sut) ) {
return u2_bc(wir_r, u2_rx(wir_r, dep), u2_nul);
@ -375,7 +375,7 @@
case c3__bull: {
if ( (u2_no == u2_as_trel(sut, 0, &p_sut, &q_sut)) ||
(u2_no == u2_as_trel(p_sut, &pp_sut, &qp_sut, &rp_sut)) )
(u2_no == u2_as_qual(p_sut, &pp_sut, &qp_sut, &rp_sut, &sp_sut)) )
{
return u2_bl_bail(wir_r, c3__fail);
}
@ -390,9 +390,9 @@
(wir_r, 0,
u2_bq(wir_r,
u2_nul,
u2_rx(wir_r, qp_sut),
u2_rx(wir_r, rp_sut),
u2_yes,
u2_rx(wir_r, rp_sut)));
u2_rx(wir_r, sp_sut)));
} else {
return _find_in
(wir_r,

View File

@ -329,7 +329,8 @@
return u2_cm_bail(c3__exit);
}
else {
u2_noun ret = u2_bc(wir_r, u2_rx(wir_r, p_zar), u2_rx(wir_r, u2t(q_zar)));
u2_noun ret = u2_bc(wir_r, u2_rx(wir_r, p_zar),
u2_rx(wir_r, u2t(q_zar)));
u2_rz(wir_r, zar);
return ret;

View File

@ -24,6 +24,7 @@
# define c3__bac c3_s3('b','a','c')
# define c3__bach c3_s4('b','a','c','h')
# define c3__bag c3_s3('b','a','g')
# define c3__bar c3_s3('b','a','r')
# define c3__bail c3_s4('b','a','i','l')
# define c3__ball c3_s4('b','a','l','l')
# define c3__band c3_s4('b','a','n','d')