d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added use checking for types and constants, improved overflow checking

Browse source
This commit is contained in:
ceriel 1987-11-27 14:24:46 +00:00
parent 3e51d4f62f
commit 3627b9a16c
6 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lang/m2/comp/LLlex.c
View file

@ -493,7 +493,8 @@ lexwarning(W_ORDINARY, "character constant out of range");
} }
} }
else if (ch == 'D' && base == 10) { else if (ch == 'D' && base == 10) {
if (sgnswtch != 0) { if (sgnswtch != 0 ||
tk->TOK_INT > max_int[(int)long_size]) {
lexwarning(W_ORDINARY, "overflow in constant"); lexwarning(W_ORDINARY, "overflow in constant");
} }
toktype = longint_type; toktype = longint_type;
@ -502,6 +503,11 @@ lexwarning(W_ORDINARY, "overflow in constant");
tk->TOK_INT<=max_int[(int)word_size]) { tk->TOK_INT<=max_int[(int)word_size]) {
toktype = intorcard_type; toktype = intorcard_type;
} }
else if (! chk_bounds(tk->TOK_INT,
full_mask[(int)word_size],
T_CARDINAL)) {
lexwarning(W_ORDINARY, "overflow in constant");
}
return tk->tk_symb = INTEGER; return tk->tk_symb = INTEGER;
} }

3
lang/m2/comp/def.c
View file

@ -76,6 +76,9 @@ MkDef(id, scope, kind)
df->df_next = id->id_def; df->df_next = id->id_def;
id->id_def = df; id->id_def = df;
if (kind == D_ERROR || kind == D_FORWARD) df->df_type = error_type; if (kind == D_ERROR || kind == D_FORWARD) df->df_type = error_type;
if (kind & (D_TYPE|D_PROCEDURE|D_CONST)) {
df->df_flags = D_DEFINED;
}
/* enter the definition in the list of definitions in this scope /* enter the definition in the list of definitions in this scope
*/ */

1
lang/m2/comp/enter.c
View file

@ -129,7 +129,6 @@ EnterVarList(Idlist, type, local)
for (; idlist; idlist = idlist->nd_right) { for (; idlist; idlist = idlist->nd_right) {
df = define(idlist->nd_IDF, CurrentScope, D_VARIABLE); df = define(idlist->nd_IDF, CurrentScope, D_VARIABLE);
df->df_type = type; df->df_type = type;
/* df->df_flags &= ~(D_USED | D_DEFINED); */
if (idlist->nd_left) { if (idlist->nd_left) {
/* An address was supplied /* An address was supplied
*/ */

2
lang/m2/comp/scope.C
View file

@ -187,7 +187,7 @@ Reverse(pdf)
from this list. from this list.
*/ */
register t_def *df, *df1; register t_def *df, *df1;
#define INTERESTING (D_MODULE|D_PROCEDURE|D_PROCHEAD|D_VARIABLE|D_IMPORTED) #define INTERESTING (D_MODULE|D_PROCEDURE|D_PROCHEAD|D_VARIABLE|D_IMPORTED|D_TYPE|D_CONST)
df = 0; df = 0;
df1 = *pdf; df1 = *pdf;

1
lang/m2/comp/type.c
View file

@ -659,6 +659,7 @@ type_or_forward(ptp)
same scope. same scope.
*/ */
df = define(nd->nd_IDF, CurrentScope, D_FORWTYPE); df = define(nd->nd_IDF, CurrentScope, D_FORWTYPE);
df->df_flags |= D_USED | D_DEFINED;
if (df->df_kind == D_TYPE) { if (df->df_kind == D_TYPE) {
(*ptp)->tp_next = df->df_type; (*ptp)->tp_next = df->df_type;

4
lang/m2/comp/walk.c
View file

@ -858,7 +858,7 @@ UseWarnings(df)
register t_def *df; register t_def *df;
{ {
if (is_anon_idf(df->df_idf)) return; if (is_anon_idf(df->df_idf)) return;
if (df->df_kind & (D_IMPORTED | D_VARIABLE | D_PROCEDURE)) { if (df->df_kind & (D_IMPORTED | D_VARIABLE | D_PROCEDURE | D_CONST | D_TYPE)) {
struct node *nd; struct node *nd;
if (df->df_flags & (D_EXPORTED | D_QEXPORTED)) return; if (df->df_flags & (D_EXPORTED | D_QEXPORTED)) return;
@ -879,7 +879,7 @@ UseWarnings(df)
} }
df = df1; df = df1;
} }
if (! (df->df_kind & (D_VARIABLE|D_PROCEDURE))) return; if (! (df->df_kind & (D_VARIABLE|D_PROCEDURE|D_TYPE|D_CONST))) return;
nd = df->df_scope->sc_end; nd = df->df_scope->sc_end;
if (! (df->df_flags & D_DEFINED)) { if (! (df->df_flags & D_DEFINED)) {
node_warning(nd, node_warning(nd,