Commit c14c961a authored by Russ Cox's avatar Russ Cox

Automated g4 rollback of changelist 17815.

*** Reason for rollback ***

  now it's comparing function parameter names...

*** Original change description ***

fix method function type compare bug

R=ken
OCL=17816
CL=17816
parent 0be746d5
......@@ -279,10 +279,8 @@ addmethod(Node *n, Type *t, int local)
d = f;
continue;
}
if(!eqtype(t, f->type, 0)) {
if(!eqtype(t, f->type, 0))
yyerror("method redeclared: %S of type %S", sf, st);
print("\t%T\n\t%T\n", f->type, t);
}
return;
}
......@@ -342,8 +340,7 @@ funchdr(Node *n)
if(!eqargs(n->type, on->type))
yyerror("forward declarations not the same: %S", s);
} else {
yyerror("function redeclared: %S", s);
print("\t%T\n\t%T\n", on->type, n->type);
yyerror("redeclare of function: %S", s);
on = N;
}
}
......
......@@ -1773,7 +1773,7 @@ eqtype(Type *t1, Type *t2, int d)
if(t1->etype != TSTRUCT || t2->etype != TSTRUCT)
return 0;
if(!eqtype(t1, t2, 0))
if(!eqtype(t1->type, t2->type, 0))
return 0;
t1 = t1->down;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment