Skip to content

Commit a778c40

Browse files
mpictormpictor
committed
unused parameter
1 parent cc05257 commit a778c40

2 files changed

Lines changed: 13 additions & 14 deletions

File tree

‎include/express/resolve.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ extern SC_EXPRESS_EXPORT Error WARNING_fn_skip_branch;
6464

6565
/* cheaper doing the check here, then inside the function call. Return */
6666
/* immediately for RESOLVED, FAILED_TO_RESOLVE, and RESOLVE_IN_PROGRESS */
67-
#define TYPEresolve(t,s) if (is_resolvable((*(t)))) TYPE_resolve((t))
68-
#define VARresolve_types(v,s) if (is_resolvable((v)->name)) VAR_resolve_types((v),(s))
67+
#define TYPEresolve(t) if (is_resolvable((*(t)))) TYPE_resolve((t))
68+
#define VARresolve_types(v) if (is_resolvable((v)->name)) VAR_resolve_types((v))
6969
#define VARresolve_expressions(v,s) if (is_resolvable((v)->name)) VAR_resolve_expressions((v),(s))
7070
#define EXPresolve(expr,scope,type) if (!is_resolved(expr)) EXP_resolve(expr,scope,type)
7171

‎src/express/resolve.c‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static bool found_self; /**< remember whether we've seen a SELF in a WHERE clau
115115

116116
static int WHEREresolve PROTO( ( Linked_List, Scope, int ) );
117117
extern void VAR_resolve_expressions PROTO( ( Variable, Entity ) );
118-
extern void VAR_resolve_types PROTO( ( Variable, Entity ) );
118+
extern void VAR_resolve_types PROTO( ( Variable v ) );
119119

120120
/** Initialize the Fed-X second pass. */
121121
void RESOLVEinitialize( void ) {
@@ -676,13 +676,13 @@ void TYPE_resolve( Type * typeaddr /*, Scope scope*/ ) {
676676
resolve_in_progress( type );
677677

678678
if( TYPEis_aggregate( type ) ) {
679-
TYPEresolve( &body->base, scope );
679+
TYPEresolve( &body->base );
680680
/* only really critical failure point for future use */
681681
/* of this type is the base type, ignore others (above) */
682682
type->symbol.resolved = body->base->symbol.resolved;
683683
} else if( TYPEis_select( type ) ) {
684684
LISTdo_links( body->list, link )
685-
TYPEresolve( ( Type * )&link->data, scope );
685+
TYPEresolve( ( Type * )&link->data );
686686
if( is_resolve_failed( ( Type )link->data ) ) {
687687
resolve_failed( type );
688688
break;
@@ -693,7 +693,7 @@ void TYPE_resolve( Type * typeaddr /*, Scope scope*/ ) {
693693
/* simple type definition such as "TYPE T = U" */
694694
resolve_in_progress( type );
695695

696-
TYPEresolve( &type->u.type->head, scope );
696+
TYPEresolve( &type->u.type->head );
697697

698698
if( !is_resolve_failed( type->u.type->head ) ) {
699699
if( ERRORis_enabled( ERROR_type_is_entity ) ) {
@@ -727,7 +727,7 @@ void TYPE_resolve( Type * typeaddr /*, Scope scope*/ ) {
727727
/* if (type->refcount--) TYPE_destroy(type); */
728728

729729
type = *typeaddr = ref_type;
730-
TYPEresolve( typeaddr, scope ); /* addr doesn't matter here */
730+
TYPEresolve( typeaddr ); /* addr doesn't matter here */
731731
/* it will not be written through */
732732
} else if( DICT_type == OBJ_ENTITY ) {
733733
/* if (type->refcount--) TYPE_destroy(type); see above */
@@ -766,14 +766,13 @@ void VAR_resolve_expressions( Variable v, Entity entity /* was scope */ ) {
766766

767767
/**
768768
** \param v variable to resolve
769-
** \param entity entity in which to resolve
770769
**
771770
** Resolve all references in a variable definition.
772771
*/
773-
void VAR_resolve_types( Variable v, Entity entity /* was scope */ ) {
772+
void VAR_resolve_types( Variable v ) {
774773
int failed = 0;
775774

776-
TYPEresolve( &v->type, entity );
775+
TYPEresolve( &v->type );
777776
failed = is_resolve_failed( v->type );
778777

779778
if( v->inverse_symbol && ( !v->inverse_attribute ) ) {
@@ -1153,7 +1152,7 @@ void SCOPEresolve_types( Scope s ) {
11531152
case OBJ_VARIABLE: /* really constants */
11541153
var = ( Variable )x;
11551154
/* before OBJ_BITS hack, we looked in s->superscope */
1156-
TYPEresolve( &var->type, s );
1155+
TYPEresolve( &var->type );
11571156
if( is_resolve_failed( var->type ) ) {
11581157
resolve_failed( var->name );
11591158
resolve_failed( s );
@@ -1188,7 +1187,7 @@ void SCOPEresolve_types( Scope s ) {
11881187
}
11891188
}
11901189
if( s->type == OBJ_FUNCTION ) {
1191-
TYPEresolve( &s->u.func->return_type, s->superscope );
1190+
TYPEresolve( &s->u.func->return_type );
11921191
}
11931192
}
11941193

@@ -1223,7 +1222,7 @@ void SCOPEresolve_subsupers( Scope scope ) {
12231222
break;
12241223
case OBJ_TYPE:
12251224
t = ( Type )x;
1226-
TYPEresolve( &t, scope );
1225+
TYPEresolve( &t );
12271226
break;
12281227
default:
12291228
/* ignored everything else */
@@ -1321,7 +1320,7 @@ void ENTITYresolve_types( Entity e ) {
13211320

13221321
LISTdo( e->u.entity->attributes, att, Variable ) {
13231322
/* resolve in context of superscope to allow "X : X;" */
1324-
VARresolve_types( att, e );
1323+
VARresolve_types( att );
13251324
failed |= is_resolve_failed( att->name );
13261325
} LISTod;
13271326

0 commit comments

Comments
 (0)