Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/express/hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,12 @@ HASHcreate( unsigned count ) {
/*
** Allocate initial 'i' segments of buckets
*/
for( i = 0; i < count; i++ )
for( i = 0; i < count; i++ ) {
CALLOC( table->Directory[i], SEGMENT_SIZE, Element )
/*, "segment in HASHcreate");*/
}

table->SegmentCount = count;
table->SegmentCount = count;
table->maxp = MUL( count, SEGMENT_SIZE_SHIFT );
table->MinLoadFactor = 1;
table->MaxLoadFactor = MAX_LOAD_FACTOR;
Expand Down
22 changes: 11 additions & 11 deletions src/express/resolve.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,16 +310,16 @@ Refinement collect_refinements_from_conjunction( Expression expr, Scope scope )
}

/* Create a refinement */
Refinement ref = ( Refinement ) malloc( sizeof( struct Refinement_ ) );
if( !ref ) {
Refinement refinement = ( Refinement ) malloc( sizeof( struct Refinement_ ) );
if( !refinement ) {
/* Memory allocation failed */
return NULL;
}
ref->variable = var;
ref->refined_type = target_type;
ref->next = NULL;
refinement->variable = var;
refinement->refined_type = target_type;
refinement->next = NULL;

return ref;
return refinement;
}

/* Not an AND node and not a matching pattern - don't recurse further */
Expand Down Expand Up @@ -347,12 +347,12 @@ static Type lookup_refinement( Variable var ) {
return NULL;
}

Refinement ref = active_refinements->refinements;
while( ref ) {
if( ref->variable == var ) {
return ref->refined_type;
Refinement refinement = active_refinements->refinements;
while( refinement ) {
if( refinement->variable == var ) {
return refinement->refined_type;
}
ref = ref->next;
refinement = refinement->next;
}

return NULL;
Expand Down
Loading