Merge pull request #21982 from luzpaz/misc-typos

Misc. typos
This commit is contained in:
Rémi Verschelde 2018-09-13 10:59:00 +02:00 committed by GitHub
commit 1a16dabfb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
81 changed files with 123 additions and 123 deletions

View file

@ -2478,7 +2478,7 @@ void GDScriptParser::_generate_pattern(PatternNode *p_pattern, Node *p_node_to_m
Node *condition = NULL;
// chech for has, then for pattern
// check for has, then for pattern
IdentifierNode *has = alloc_node<IdentifierNode>();
has->name = "has";
@ -4535,14 +4535,14 @@ void GDScriptParser::_parse_class(ClassNode *p_class) {
member.rpc_mode = rpc_mode;
if (current_class->constant_expressions.has(member.identifier)) {
_set_error("A constant named '" + String(member.identifier) + "' alread exists in this class (at line: " +
_set_error("A constant named '" + String(member.identifier) + "' already exists in this class (at line: " +
itos(current_class->constant_expressions[member.identifier].expression->line) + ").");
return;
}
for (int i = 0; i < current_class->variables.size(); i++) {
if (current_class->variables[i].identifier == member.identifier) {
_set_error("Variable '" + String(member.identifier) + "' alread exists in this class (at line: " +
_set_error("Variable '" + String(member.identifier) + "' already exists in this class (at line: " +
itos(current_class->variables[i].line) + ").");
return;
}
@ -4749,14 +4749,14 @@ void GDScriptParser::_parse_class(ClassNode *p_class) {
int line = tokenizer->get_token_line();
if (current_class->constant_expressions.has(const_id)) {
_set_error("Constant '" + String(const_id) + "' alread exists in this class (at line: " +
_set_error("Constant '" + String(const_id) + "' already exists in this class (at line: " +
itos(current_class->constant_expressions[const_id].expression->line) + ").");
return;
}
for (int i = 0; i < current_class->variables.size(); i++) {
if (current_class->variables[i].identifier == const_id) {
_set_error("A variable named '" + String(const_id) + "' alread exists in this class (at line: " +
_set_error("A variable named '" + String(const_id) + "' already exists in this class (at line: " +
itos(current_class->variables[i].line) + ").");
return;
}
@ -4810,7 +4810,7 @@ void GDScriptParser::_parse_class(ClassNode *p_class) {
case GDScriptTokenizer::TK_PR_ENUM: {
//multiple constant declarations..
int last_assign = -1; // Incremented by 1 right before the assingment.
int last_assign = -1; // Incremented by 1 right before the assignment.
String enum_name;
Dictionary enum_dict;
@ -7242,7 +7242,7 @@ void GDScriptParser::_check_class_level_types(ClassNode *p_class) {
return;
}
// Replace assigment with implict conversion
// Replace assignment with implict conversion
BuiltInFunctionNode *convert = alloc_node<BuiltInFunctionNode>();
convert->line = v.line;
convert->function = GDScriptFunctions::TYPE_CONVERT;
@ -7620,7 +7620,7 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) {
lv->line);
return;
}
// Replace assigment with implict conversion
// Replace assignment with implict conversion
BuiltInFunctionNode *convert = alloc_node<BuiltInFunctionNode>();
convert->line = lv->line;
convert->function = GDScriptFunctions::TYPE_CONVERT;
@ -7748,7 +7748,7 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) {
op->line);
return;
}
// Replace assigment with implict conversion
// Replace assignment with implict conversion
BuiltInFunctionNode *convert = alloc_node<BuiltInFunctionNode>();
convert->line = op->line;
convert->function = GDScriptFunctions::TYPE_CONVERT;