8000 Merge pull request #6 from andrewmains12/cs194_master · maxdjohnson/ruby@d0f1be1 · GitHub
[go: up one dir, main page]

Skip to content

Commit d0f1be1

Browse files
committed
Merge pull request kevints#6 from andrewmains12/cs194_master
Cs194 master
2 parents 67857fa + 9fd035e commit d0f1be1

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

gc.c

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -427,86 +427,86 @@ static void initial_expand_heap(rb_objspace_t *objspace);
427427

428428
#define LOCAL_GC_STACK_SIZE 16
429429
#define GC_STACK_EMPTY -1
430-
typedef struct deck_struct {
430+
typedef struct deque_struct {
431431
VALUE buffer[LOCAL_GC_STACK_SIZE];
432432
int max_length; //Should be the same size as buffer
433433
int length;
434434
int head;
435435
int tail;
436-
} deck_t;
436+
} deque_t;
437437

438438

439-
static void deck_init(deck_t* deck, int max_length);
439+
static void deque_init(deque_t* deque, int max_length);
440440

10000 441-
/* Push val onto the front of deck. Returns 1 if successful, 0 if the stack is
441+
/* Push val onto the front of deque. Returns 1 if successful, 0 if the stack is
442442
already full.
443443
*/
444-
static int deck_push(deck_t* deck, VALUE val);
445-
static VALUE deck_pop(deck_t* deck);
446-
static VALUE deck_pop_back(deck_t* deck);
447-
static int deck_empty_p(deck_t* deck);
448-
static int deck_full_p(deck_t* deck);
444+
static int deque_push(deque_t* deque, VALUE val);
445+
static VALUE deque_pop(deque_t* deque);
446+
static VALUE deque_pop_back(deque_t* deque);
447+
static int deque_empty_p(deque_t* deque);
448+
static int deque_full_p(deque_t* deque);
449449

450-
static void deck_init(deck_t* deck, int max_length) {
451-
deck->max_length = max_length;
452-
deck->length = 0;
453-
deck->head = deck->tail = -1;
450+
static void deque_init(deque_t* deque, int max_length) {
451+
deque->max_length = max_length;
452+
deque->length = 0;
453+
deque->head = deque->tail = -1;
454454
}
455455

456-
static int deck_push(deck_t* deck, VALUE val) {
457-
if (deck_full_p(deck))
456+
static int deque_push(deque_t* deque, VALUE val) {
457+
if (deque_full_p(deque))
458458
return 0;
459459

460-
if (deck_empty_p(deck))
461-
deck->head = 0;
460+
if (deque_empty_p(deque))
461+
deque->head = 0;
462462

463-
deck->tail = (deck->tail + 1) % deck->max_length;
464-
deck->buffer[deck->tail] = val;
465-
deck->length++;
463+
deque->tail = (deque->tail + 1) % deque->max_length;
464+
deque->buffer[deque->tail] = val;
465+
deque->length++;
466466
return 1;
467467
}
468468

469-
static int deck_empty_p(deck_t* deck) {
470-
return deck->length == 0;
469+
static int deque_empty_p(deque_t* deque) {
470+
return deque->length == 0;
471471
}
472472

473-
static int deck_full_p(deck_t* deck) {
474-
return deck->length == deck->max_length;
473+
static int deque_full_p(deque_t* deque) {
474+
return deque->length == deque->max_length;
475475
}
476476

477477

478-
static VALUE deck_pop(deck_t* deck) {
478+
static VALUE deque_pop(deque_t* deque) {
479479
VALUE rtn;
480-
if (deck_empty_p(deck))
480+
if (deque_empty_p(deque))
481481
return GC_STACK_EMPTY;
482482

483-
rtn = deck->buffer[deck->tail];
484-
if (deck->length - 1 == 0) {
483+
rtn = deque->buffer[deque->tail];
484+
if (deque->length - 1 == 0) {
485485
//Reset head and tail to beginning
486-
deck->head = deck->tail = -1;
486+
deque->head = deque->tail = -1;
487487
}
488488
else {
489-
deck->tail = (deck->tail - 1) % deck->max_length;
489+
deque->tail = (deque->tail - 1) % deque->max_length;
490490
}
491-
deck->length--;
491+
deque->length--;
492492
return rtn;
493493
}
494494

495-
static VALUE deck_pop_back(deck_t* deck) {
495+
static VALUE deque_pop_back(deque_t* deque) {
496496
VALUE rtn;
497497

498-
if (deck_empty_p(deck))
498+
if (deque_empty_p(deque))
499499
return GC_STACK_EMPTY;
500500

501-
rtn = deck->buffer[deck->head];
502-
if (deck->length - 1 == 0) {
503-
//Reset head and tail to beginning if this call empties the deck
504-
deck->head = deck->tail = -1;
501+
rtn = deque->buffer[deque->head];
502+
if (deque->length - 1 == 0) {
503+
//Reset head and tail to beginning if this call empties the deque
504+
deque->head = deque->tail = -1;
505505
}
506506
else {
507-
deck->head = (deck->head - 1) % deck->max_length;
507+
deque->head = (deque->head - 1) % deque->max_length;
508508
}
509-
deck->length--;
509+
deque->length--;
510510
return rtn;
511511
}
512512

0 commit comments

Comments
 (0)
0