From 34224fcdcdf3086c67ca4b81f3ffe157ea3a2d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Sat, 18 Apr 1998 00:21:04 -0700
Subject: [PATCH] alpha-related bugs fixed
Rev: src/language.yacc:1.83
Rev: src/program.c:1.84
---
src/language.yacc | 4 ++--
src/program.c | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/language.yacc b/src/language.yacc
index 9ec5ed70a9..2e57900758 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -171,7 +171,7 @@
/* This is the grammar definition of Pike. */
#include "global.h"
-RCSID("$Id: language.yacc,v 1.82 1998/04/17 17:13:37 hubbe Exp $");
+RCSID("$Id: language.yacc,v 1.83 1998/04/18 07:21:03 hubbe Exp $");
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
@@ -741,7 +741,7 @@ identifier_type: idents
resolv_program($1);
if((p=program_from_svalue(sp-1)))
{
- push_type_int(sp[-1].u.program->id);
+ push_type_int(p->id);
}else{
push_type_int(0);
}
diff --git a/src/program.c b/src/program.c
index 25bd202592..2543cc5ea9 100644
--- a/src/program.c
+++ b/src/program.c
@@ -4,7 +4,7 @@
||| See the files COPYING and DISCLAIMER for more information.
\*/
#include "global.h"
-RCSID("$Id: program.c,v 1.83 1998/04/16 21:32:03 hubbe Exp $");
+RCSID("$Id: program.c,v 1.84 1998/04/18 07:21:04 hubbe Exp $");
#include "program.h"
#include "object.h"
#include "dynamic_buffer.h"
@@ -757,10 +757,13 @@ void check_program(struct program *p)
if(p->inherits[e].storage_offset < 0)
fatal("Inherit->storage_offset is wrong.\n");
+#if 0
+ /* This test doesn't really work... */
if(p->inherits[e].storage_offset & (ALIGN_BOUND-1))
{
- fatal("inherit[%d].storage_offset is not properly aligned.\n",e);
+ fatal("inherit[%d].storage_offset is not properly aligned (%d).\n",e,p->inherits[e].storage_offset);
}
+#endif
}
}
#endif
--
GitLab