kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix typos.

Browse source 
* rememberd -> remembered
  * refered -> referred

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2018-01-18 11:44:10 +00:00
parent 37f0d53290
commit ef9bc609db
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gc.c
View file

@ -1105,7 +1105,7 @@ check_rvalue_consistency(const VALUE obj)
rb_bug("check_rvalue_consistency: %s is uncollectible, but not old (age: %d) and not WB unprotected.", obj_info(obj), age); rb_bug("check_rvalue_consistency: %s is uncollectible, but not old (age: %d) and not WB unprotected.", obj_info(obj), age);
} }
if (remembered_bit && age != RVALUE_OLD_AGE) { if (remembered_bit && age != RVALUE_OLD_AGE) {
rb_bug("check_rvalue_consistency: %s is rememberd, but not old (age: %d).", obj_info(obj), age); rb_bug("check_rvalue_consistency: %s is remembered, but not old (age: %d).", obj_info(obj), age);
} }
} }
@ -4928,7 +4928,7 @@ reflist_dump(struct reflist *refs)
} }
static int static int
reflist_refered_from_machine_context(struct reflist *refs) reflist_referred_from_machine_context(struct reflist *refs)
{ {
int i; int i;
for (i=0; i<refs->pos; i++) { for (i=0; i<refs->pos; i++) {
@ -5071,7 +5071,7 @@ gc_check_after_marks_i(st_data_t k, st_data_t v, void *ptr)
fprintf(stderr, "gc_check_after_marks_i: %p is referred from ", (void *)obj); fprintf(stderr, "gc_check_after_marks_i: %p is referred from ", (void *)obj);
reflist_dump(refs); reflist_dump(refs);
if (reflist_refered_from_machine_context(refs)) { if (reflist_referred_from_machine_context(refs)) {
fprintf(stderr, " (marked from machine stack).\n"); fprintf(stderr, " (marked from machine stack).\n");
/* marked from machine context can be false positive */ /* marked from machine context can be false positive */
} }
@ -5222,7 +5222,7 @@ gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
int i; int i;
unsigned int has_remembered_shady = FALSE; unsigned int has_remembered_shady = FALSE;
unsigned int has_remembered_old = FALSE; unsigned int has_remembered_old = FALSE;
int rememberd_old_objects = 0; int remembered_old_objects = 0;
int free_objects = 0; int free_objects = 0;
int zombie_objects = 0; int zombie_objects = 0;
@ -5235,7 +5235,7 @@ gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
} }
if (RVALUE_PAGE_MARKING(page, val)) { if (RVALUE_PAGE_MARKING(page, val)) {
has_remembered_old = TRUE; has_remembered_old = TRUE;
rememberd_old_objects++; remembered_old_objects++;
} }
} }
@ -5249,7 +5249,7 @@ gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
} }
} }
rb_bug("page %p's has_remembered_objects should be false, but there are remembered old objects (%d). %s", rb_bug("page %p's has_remembered_objects should be false, but there are remembered old objects (%d). %s",
(void *)page, rememberd_old_objects, obj ? obj_info(obj) : ""); (void *)page, remembered_old_objects, obj ? obj_info(obj) : "");
} }
if (page->flags.has_uncollectible_shady_objects == FALSE && has_remembered_shady == TRUE) { if (page->flags.has_uncollectible_shady_objects == FALSE && has_remembered_shady == TRUE) {
@ -5267,7 +5267,7 @@ gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
rb_bug("page %p's final_slots should be %d, but %d\n", (void *)page, (int)page->final_slots, zombie_objects); rb_bug("page %p's final_slots should be %d, but %d\n", (void *)page, (int)page->final_slots, zombie_objects);
} }
return rememberd_old_objects; return remembered_old_objects;
#else #else
return 0; return 0;
#endif #endif
@ -5276,25 +5276,25 @@ gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
static int static int
gc_verify_heap_pages_(rb_objspace_t *objspace, struct heap_page *page) gc_verify_heap_pages_(rb_objspace_t *objspace, struct heap_page *page)
{ {
int rememberd_old_objects = 0; int remembered_old_objects = 0;
while (page) { while (page) {
if (page->flags.has_remembered_objects == FALSE) { if (page->flags.has_remembered_objects == FALSE) {
rememberd_old_objects += gc_verify_heap_page(objspace, page, Qfalse); remembered_old_objects += gc_verify_heap_page(objspace, page, Qfalse);
} }
page = page->next; page = page->next;
} }
return rememberd_old_objects; return remembered_old_objects;
} }
static int static int
gc_verify_heap_pages(rb_objspace_t *objspace) gc_verify_heap_pages(rb_objspace_t *objspace)
{ {
int rememberd_old_objects = 0; int remembered_old_objects = 0;
rememberd_old_objects = gc_verify_heap_pages_(objspace, heap_eden->pages); remembered_old_objects = gc_verify_heap_pages_(objspace, heap_eden->pages);
rememberd_old_objects = gc_verify_heap_pages_(objspace, heap_tomb->pages); remembered_old_objects = gc_verify_heap_pages_(objspace, heap_tomb->pages);
return rememberd_old_objects; return remembered_old_objects;
} }
/* /*

10
regcomp.c
View file

@ -772,7 +772,7 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
} }
} }
else if (qn->upper == 0) { else if (qn->upper == 0) {
if (qn->is_refered != 0) /* /(?<n>..){0}/ */ if (qn->is_referred != 0) /* /(?<n>..){0}/ */
len = SIZE_OP_JUMP + tlen; len = SIZE_OP_JUMP + tlen;
else else
len = 0; len = 0;
@ -901,7 +901,7 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg)
} }
} }
else if (qn->upper == 0) { else if (qn->upper == 0) {
if (qn->is_refered != 0) { /* /(?<n>..){0}/ */ if (qn->is_referred != 0) { /* /(?<n>..){0}/ */
r = add_opcode_rel_addr(reg, OP_JUMP, tlen); r = add_opcode_rel_addr(reg, OP_JUMP, tlen);
if (r) return r; if (r) return r;
r = compile_tree(qn->target, reg); r = compile_tree(qn->target, reg);
@ -1005,7 +1005,7 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
else else
len += SIZE_OP_JUMP + mod_tlen + SIZE_OP_PUSH; len += SIZE_OP_JUMP + mod_tlen + SIZE_OP_PUSH;
} }
else if (qn->upper == 0 && qn->is_refered != 0) { /* /(?<n>..){0}/ */ else if (qn->upper == 0 && qn->is_referred != 0) { /* /(?<n>..){0}/ */
len = SIZE_OP_JUMP + tlen; len = SIZE_OP_JUMP + tlen;
} }
else if (!infinite && qn->greedy && else if (!infinite && qn->greedy &&
@ -1124,7 +1124,7 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg)
r = add_opcode_rel_addr(reg, OP_PUSH, -(mod_tlen + (int )SIZE_OP_PUSH)); r = add_opcode_rel_addr(reg, OP_PUSH, -(mod_tlen + (int )SIZE_OP_PUSH));
} }
} }
else if (qn->upper == 0 && qn->is_refered != 0) { /* /(?<n>..){0}/ */ else if (qn->upper == 0 && qn->is_referred != 0) { /* /(?<n>..){0}/ */
r = add_opcode_rel_addr(reg, OP_JUMP, tlen); r = add_opcode_rel_addr(reg, OP_JUMP, tlen);
if (r) return r; if (r) return r;
r = compile_tree(qn->target, reg); r = compile_tree(qn->target, reg);
@ -3106,7 +3106,7 @@ subexp_recursive_check_trav(Node* node, ScanEnv* env)
r = subexp_recursive_check_trav(NQTFR(node)->target, env); r = subexp_recursive_check_trav(NQTFR(node)->target, env);
if (NQTFR(node)->upper == 0) { if (NQTFR(node)->upper == 0) {
if (r == FOUND_CALLED_NODE) if (r == FOUND_CALLED_NODE)
NQTFR(node)->is_refered = 1; NQTFR(node)->is_referred = 1;
} }
break; break;

2
regparse.c
View file

@ -1315,7 +1315,7 @@ node_new_quantifier(int lower, int upper, int by_number)
NQTFR(node)->target_empty_info = NQ_TARGET_ISNOT_EMPTY; NQTFR(node)->target_empty_info = NQ_TARGET_ISNOT_EMPTY;
NQTFR(node)->head_exact = NULL_NODE; NQTFR(node)->head_exact = NULL_NODE;
NQTFR(node)->next_head_exact = NULL_NODE; NQTFR(node)->next_head_exact = NULL_NODE;
NQTFR(node)->is_refered = 0; NQTFR(node)->is_referred = 0;
if (by_number != 0) if (by_number != 0)
NQTFR(node)->state |= NST_BY_NUMBER; NQTFR(node)->state |= NST_BY_NUMBER;

2
regparse.h
View file

@ -186,7 +186,7 @@ typedef struct {
int target_empty_info; int target_empty_info;
struct _Node* head_exact; struct _Node* head_exact;
struct _Node* next_head_exact; struct _Node* next_head_exact;
int is_refered; /* include called node. don't eliminate even if {0} */ int is_referred; /* include called node. don't eliminate even if {0} */
#ifdef USE_COMBINATION_EXPLOSION_CHECK #ifdef USE_COMBINATION_EXPLOSION_CHECK
int comb_exp_check_num; /* 1,2,3...: check, 0: no check */ int comb_exp_check_num; /* 1,2,3...: check, 0: no check */
#endif #endif