diff options
Diffstat (limited to 'src')
138 files changed, 2866 insertions, 2879 deletions
diff --git a/src/libs/3rdparty/cplusplus/AST.cpp b/src/libs/3rdparty/cplusplus/AST.cpp index 035c9baf73..3b91838eec 100644 --- a/src/libs/3rdparty/cplusplus/AST.cpp +++ b/src/libs/3rdparty/cplusplus/AST.cpp @@ -68,12 +68,12 @@ bool AST::match(AST *pattern, ASTMatcher *matcher) return match0(pattern, matcher); } -unsigned GnuAttributeSpecifierAST::firstToken() const +int GnuAttributeSpecifierAST::firstToken() const { return attribute_token; } -unsigned BaseSpecifierAST::firstToken() const +int BaseSpecifierAST::firstToken() const { if (virtual_token && access_specifier_token) return std::min(virtual_token, access_specifier_token); @@ -87,7 +87,7 @@ unsigned BaseSpecifierAST::firstToken() const return 0; } -unsigned BaseSpecifierAST::lastToken() const +int BaseSpecifierAST::lastToken() const { if (ellipsis_token) return ellipsis_token; @@ -104,7 +104,7 @@ unsigned BaseSpecifierAST::lastToken() const } /** \generated */ -unsigned AccessDeclarationAST::firstToken() const +int AccessDeclarationAST::firstToken() const { if (access_specifier_token) return access_specifier_token; @@ -116,7 +116,7 @@ unsigned AccessDeclarationAST::firstToken() const } /** \generated */ -unsigned AccessDeclarationAST::lastToken() const +int AccessDeclarationAST::lastToken() const { if (colon_token) return colon_token + 1; @@ -128,15 +128,15 @@ unsigned AccessDeclarationAST::lastToken() const } /** \generated */ -unsigned ArrayAccessAST::firstToken() const +int ArrayAccessAST::firstToken() const { if (base_expression) - if (unsigned candidate = base_expression->firstToken()) + if (int candidate = base_expression->firstToken()) return candidate; if (lbracket_token) return lbracket_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rbracket_token) return rbracket_token; @@ -144,28 +144,28 @@ unsigned ArrayAccessAST::firstToken() const } /** \generated */ -unsigned ArrayAccessAST::lastToken() const +int ArrayAccessAST::lastToken() const { if (rbracket_token) return rbracket_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lbracket_token) return lbracket_token + 1; if (base_expression) - if (unsigned candidate = base_expression->lastToken()) + if (int candidate = base_expression->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ArrayDeclaratorAST::firstToken() const +int ArrayDeclaratorAST::firstToken() const { if (lbracket_token) return lbracket_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rbracket_token) return rbracket_token; @@ -173,12 +173,12 @@ unsigned ArrayDeclaratorAST::firstToken() const } /** \generated */ -unsigned ArrayDeclaratorAST::lastToken() const +int ArrayDeclaratorAST::lastToken() const { if (rbracket_token) return rbracket_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lbracket_token) return lbracket_token + 1; @@ -186,12 +186,12 @@ unsigned ArrayDeclaratorAST::lastToken() const } /** \generated */ -unsigned ArrayInitializerAST::firstToken() const +int ArrayInitializerAST::firstToken() const { if (lbrace_token) return lbrace_token; if (expression_list) - if (unsigned candidate = expression_list->firstToken()) + if (int candidate = expression_list->firstToken()) return candidate; if (rbrace_token) return rbrace_token; @@ -199,12 +199,12 @@ unsigned ArrayInitializerAST::firstToken() const } /** \generated */ -unsigned ArrayInitializerAST::lastToken() const +int ArrayInitializerAST::lastToken() const { if (rbrace_token) return rbrace_token + 1; if (expression_list) - if (unsigned candidate = expression_list->lastToken()) + if (int candidate = expression_list->lastToken()) return candidate; if (lbrace_token) return lbrace_token + 1; @@ -212,7 +212,7 @@ unsigned ArrayInitializerAST::lastToken() const } /** \generated */ -unsigned AsmDefinitionAST::firstToken() const +int AsmDefinitionAST::firstToken() const { if (asm_token) return asm_token; @@ -228,7 +228,7 @@ unsigned AsmDefinitionAST::firstToken() const } /** \generated */ -unsigned AsmDefinitionAST::lastToken() const +int AsmDefinitionAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; @@ -244,7 +244,7 @@ unsigned AsmDefinitionAST::lastToken() const } /** \generated */ -unsigned GnuAttributeAST::firstToken() const +int GnuAttributeAST::firstToken() const { if (identifier_token) return identifier_token; @@ -253,7 +253,7 @@ unsigned GnuAttributeAST::firstToken() const if (tag_token) return tag_token; if (expression_list) - if (unsigned candidate = expression_list->firstToken()) + if (int candidate = expression_list->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -261,12 +261,12 @@ unsigned GnuAttributeAST::firstToken() const } /** \generated */ -unsigned GnuAttributeAST::lastToken() const +int GnuAttributeAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression_list) - if (unsigned candidate = expression_list->lastToken()) + if (int candidate = expression_list->lastToken()) return candidate; if (tag_token) return tag_token + 1; @@ -278,35 +278,35 @@ unsigned GnuAttributeAST::lastToken() const } /** \generated */ -unsigned BinaryExpressionAST::firstToken() const +int BinaryExpressionAST::firstToken() const { if (left_expression) - if (unsigned candidate = left_expression->firstToken()) + if (int candidate = left_expression->firstToken()) return candidate; if (binary_op_token) return binary_op_token; if (right_expression) - if (unsigned candidate = right_expression->firstToken()) + if (int candidate = right_expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned BinaryExpressionAST::lastToken() const +int BinaryExpressionAST::lastToken() const { if (right_expression) - if (unsigned candidate = right_expression->lastToken()) + if (int candidate = right_expression->lastToken()) return candidate; if (binary_op_token) return binary_op_token + 1; if (left_expression) - if (unsigned candidate = left_expression->lastToken()) + if (int candidate = left_expression->lastToken()) return candidate; return 1; } /** \generated */ -unsigned BoolLiteralAST::firstToken() const +int BoolLiteralAST::firstToken() const { if (literal_token) return literal_token; @@ -314,7 +314,7 @@ unsigned BoolLiteralAST::firstToken() const } /** \generated */ -unsigned BoolLiteralAST::lastToken() const +int BoolLiteralAST::lastToken() const { if (literal_token) return literal_token + 1; @@ -322,12 +322,12 @@ unsigned BoolLiteralAST::lastToken() const } /** \generated */ -unsigned BracedInitializerAST::firstToken() const +int BracedInitializerAST::firstToken() const { if (lbrace_token) return lbrace_token; if (expression_list) - if (unsigned candidate = expression_list->firstToken()) + if (int candidate = expression_list->firstToken()) return candidate; if (comma_token) return comma_token; @@ -337,14 +337,14 @@ unsigned BracedInitializerAST::firstToken() const } /** \generated */ -unsigned BracedInitializerAST::lastToken() const +int BracedInitializerAST::lastToken() const { if (rbrace_token) return rbrace_token + 1; if (comma_token) return comma_token + 1; if (expression_list) - if (unsigned candidate = expression_list->lastToken()) + if (int candidate = expression_list->lastToken()) return candidate; if (lbrace_token) return lbrace_token + 1; @@ -352,7 +352,7 @@ unsigned BracedInitializerAST::lastToken() const } /** \generated */ -unsigned BreakStatementAST::firstToken() const +int BreakStatementAST::firstToken() const { if (break_token) return break_token; @@ -362,7 +362,7 @@ unsigned BreakStatementAST::firstToken() const } /** \generated */ -unsigned BreakStatementAST::lastToken() const +int BreakStatementAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; @@ -372,15 +372,15 @@ unsigned BreakStatementAST::lastToken() const } /** \generated */ -unsigned CallAST::firstToken() const +int CallAST::firstToken() const { if (base_expression) - if (unsigned candidate = base_expression->firstToken()) + if (int candidate = base_expression->firstToken()) return candidate; if (lparen_token) return lparen_token; if (expression_list) - if (unsigned candidate = expression_list->firstToken()) + if (int candidate = expression_list->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -388,37 +388,37 @@ unsigned CallAST::firstToken() const } /** \generated */ -unsigned CallAST::lastToken() const +int CallAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression_list) - if (unsigned candidate = expression_list->lastToken()) + if (int candidate = expression_list->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; if (base_expression) - if (unsigned candidate = base_expression->lastToken()) + if (int candidate = base_expression->lastToken()) return candidate; return 1; } /** \generated */ -unsigned CaptureAST::firstToken() const +int CaptureAST::firstToken() const { if (amper_token) return amper_token; if (identifier) - if (unsigned candidate = identifier->firstToken()) + if (int candidate = identifier->firstToken()) return candidate; return 0; } /** \generated */ -unsigned CaptureAST::lastToken() const +int CaptureAST::lastToken() const { if (identifier) - if (unsigned candidate = identifier->lastToken()) + if (int candidate = identifier->lastToken()) return candidate; if (amper_token) return amper_token + 1; @@ -426,31 +426,31 @@ unsigned CaptureAST::lastToken() const } /** \generated */ -unsigned CaseStatementAST::firstToken() const +int CaseStatementAST::firstToken() const { if (case_token) return case_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (colon_token) return colon_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned CaseStatementAST::lastToken() const +int CaseStatementAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (colon_token) return colon_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (case_token) return case_token + 1; @@ -458,31 +458,31 @@ unsigned CaseStatementAST::lastToken() const } /** \generated */ -unsigned CastExpressionAST::firstToken() const +int CastExpressionAST::firstToken() const { if (lparen_token) return lparen_token; if (type_id) - if (unsigned candidate = type_id->firstToken()) + if (int candidate = type_id->firstToken()) return candidate; if (rparen_token) return rparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned CastExpressionAST::lastToken() const +int CastExpressionAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (type_id) - if (unsigned candidate = type_id->lastToken()) + if (int candidate = type_id->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -490,33 +490,33 @@ unsigned CastExpressionAST::lastToken() const } /** \generated */ -unsigned CatchClauseAST::firstToken() const +int CatchClauseAST::firstToken() const { if (catch_token) return catch_token; if (lparen_token) return lparen_token; if (exception_declaration) - if (unsigned candidate = exception_declaration->firstToken()) + if (int candidate = exception_declaration->firstToken()) return candidate; if (rparen_token) return rparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned CatchClauseAST::lastToken() const +int CatchClauseAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (exception_declaration) - if (unsigned candidate = exception_declaration->lastToken()) + if (int candidate = exception_declaration->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -526,29 +526,29 @@ unsigned CatchClauseAST::lastToken() const } /** \generated */ -unsigned ClassSpecifierAST::firstToken() const +int ClassSpecifierAST::firstToken() const { if (classkey_token) return classkey_token; if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (final_token) return final_token; if (colon_token) return colon_token; if (base_clause_list) - if (unsigned candidate = base_clause_list->firstToken()) + if (int candidate = base_clause_list->firstToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token; if (lbrace_token) return lbrace_token; if (member_specifier_list) - if (unsigned candidate = member_specifier_list->firstToken()) + if (int candidate = member_specifier_list->firstToken()) return candidate; if (rbrace_token) return rbrace_token; @@ -556,29 +556,29 @@ unsigned ClassSpecifierAST::firstToken() const } /** \generated */ -unsigned ClassSpecifierAST::lastToken() const +int ClassSpecifierAST::lastToken() const { if (rbrace_token) return rbrace_token + 1; if (member_specifier_list) - if (unsigned candidate = member_specifier_list->lastToken()) + if (int candidate = member_specifier_list->lastToken()) return candidate; if (lbrace_token) return lbrace_token + 1; if (dot_dot_dot_token) return dot_dot_dot_token + 1; if (base_clause_list) - if (unsigned candidate = base_clause_list->lastToken()) + if (int candidate = base_clause_list->lastToken()) return candidate; if (colon_token) return colon_token + 1; if (final_token) return final_token + 1; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; if (classkey_token) return classkey_token + 1; @@ -586,12 +586,12 @@ unsigned ClassSpecifierAST::lastToken() const } /** \generated */ -unsigned CompoundExpressionAST::firstToken() const +int CompoundExpressionAST::firstToken() const { if (lparen_token) return lparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -599,12 +599,12 @@ unsigned CompoundExpressionAST::firstToken() const } /** \generated */ -unsigned CompoundExpressionAST::lastToken() const +int CompoundExpressionAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -612,31 +612,31 @@ unsigned CompoundExpressionAST::lastToken() const } /** \generated */ -unsigned CompoundLiteralAST::firstToken() const +int CompoundLiteralAST::firstToken() const { if (lparen_token) return lparen_token; if (type_id) - if (unsigned candidate = type_id->firstToken()) + if (int candidate = type_id->firstToken()) return candidate; if (rparen_token) return rparen_token; if (initializer) - if (unsigned candidate = initializer->firstToken()) + if (int candidate = initializer->firstToken()) return candidate; return 0; } /** \generated */ -unsigned CompoundLiteralAST::lastToken() const +int CompoundLiteralAST::lastToken() const { if (initializer) - if (unsigned candidate = initializer->lastToken()) + if (int candidate = initializer->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (type_id) - if (unsigned candidate = type_id->lastToken()) + if (int candidate = type_id->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -644,12 +644,12 @@ unsigned CompoundLiteralAST::lastToken() const } /** \generated */ -unsigned CompoundStatementAST::firstToken() const +int CompoundStatementAST::firstToken() const { if (lbrace_token) return lbrace_token; if (statement_list) - if (unsigned candidate = statement_list->firstToken()) + if (int candidate = statement_list->firstToken()) return candidate; if (rbrace_token) return rbrace_token; @@ -657,12 +657,12 @@ unsigned CompoundStatementAST::firstToken() const } /** \generated */ -unsigned CompoundStatementAST::lastToken() const +int CompoundStatementAST::lastToken() const { if (rbrace_token) return rbrace_token + 1; if (statement_list) - if (unsigned candidate = statement_list->lastToken()) + if (int candidate = statement_list->lastToken()) return candidate; if (lbrace_token) return lbrace_token + 1; @@ -670,69 +670,69 @@ unsigned CompoundStatementAST::lastToken() const } /** \generated */ -unsigned ConditionAST::firstToken() const +int ConditionAST::firstToken() const { if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ConditionAST::lastToken() const +int ConditionAST::lastToken() const { if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ConditionalExpressionAST::firstToken() const +int ConditionalExpressionAST::firstToken() const { if (condition) - if (unsigned candidate = condition->firstToken()) + if (int candidate = condition->firstToken()) return candidate; if (question_token) return question_token; if (left_expression) - if (unsigned candidate = left_expression->firstToken()) + if (int candidate = left_expression->firstToken()) return candidate; if (colon_token) return colon_token; if (right_expression) - if (unsigned candidate = right_expression->firstToken()) + if (int candidate = right_expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ConditionalExpressionAST::lastToken() const +int ConditionalExpressionAST::lastToken() const { if (right_expression) - if (unsigned candidate = right_expression->lastToken()) + if (int candidate = right_expression->lastToken()) return candidate; if (colon_token) return colon_token + 1; if (left_expression) - if (unsigned candidate = left_expression->lastToken()) + if (int candidate = left_expression->lastToken()) return candidate; if (question_token) return question_token + 1; if (condition) - if (unsigned candidate = condition->lastToken()) + if (int candidate = condition->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ContinueStatementAST::firstToken() const +int ContinueStatementAST::firstToken() const { if (continue_token) return continue_token; @@ -742,7 +742,7 @@ unsigned ContinueStatementAST::firstToken() const } /** \generated */ -unsigned ContinueStatementAST::lastToken() const +int ContinueStatementAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; @@ -752,27 +752,27 @@ unsigned ContinueStatementAST::lastToken() const } /** \generated */ -unsigned ConversionFunctionIdAST::firstToken() const +int ConversionFunctionIdAST::firstToken() const { if (operator_token) return operator_token; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (ptr_operator_list) - if (unsigned candidate = ptr_operator_list->firstToken()) + if (int candidate = ptr_operator_list->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ConversionFunctionIdAST::lastToken() const +int ConversionFunctionIdAST::lastToken() const { if (ptr_operator_list) - if (unsigned candidate = ptr_operator_list->lastToken()) + if (int candidate = ptr_operator_list->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; if (operator_token) return operator_token + 1; @@ -780,21 +780,21 @@ unsigned ConversionFunctionIdAST::lastToken() const } /** \generated */ -unsigned CppCastExpressionAST::firstToken() const +int CppCastExpressionAST::firstToken() const { if (cast_token) return cast_token; if (less_token) return less_token; if (type_id) - if (unsigned candidate = type_id->firstToken()) + if (int candidate = type_id->firstToken()) return candidate; if (greater_token) return greater_token; if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -802,19 +802,19 @@ unsigned CppCastExpressionAST::firstToken() const } /** \generated */ -unsigned CppCastExpressionAST::lastToken() const +int CppCastExpressionAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; if (greater_token) return greater_token + 1; if (type_id) - if (unsigned candidate = type_id->lastToken()) + if (int candidate = type_id->lastToken()) return candidate; if (less_token) return less_token + 1; @@ -824,12 +824,12 @@ unsigned CppCastExpressionAST::lastToken() const } /** \generated */ -unsigned CtorInitializerAST::firstToken() const +int CtorInitializerAST::firstToken() const { if (colon_token) return colon_token; if (member_initializer_list) - if (unsigned candidate = member_initializer_list->firstToken()) + if (int candidate = member_initializer_list->firstToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token; @@ -837,12 +837,12 @@ unsigned CtorInitializerAST::firstToken() const } /** \generated */ -unsigned CtorInitializerAST::lastToken() const +int CtorInitializerAST::lastToken() const { if (dot_dot_dot_token) return dot_dot_dot_token + 1; if (member_initializer_list) - if (unsigned candidate = member_initializer_list->lastToken()) + if (int candidate = member_initializer_list->lastToken()) return candidate; if (colon_token) return colon_token + 1; @@ -850,91 +850,91 @@ unsigned CtorInitializerAST::lastToken() const } /** \generated */ -unsigned DeclarationStatementAST::firstToken() const +int DeclarationStatementAST::firstToken() const { if (declaration) - if (unsigned candidate = declaration->firstToken()) + if (int candidate = declaration->firstToken()) return candidate; return 0; } /** \generated */ -unsigned DeclarationStatementAST::lastToken() const +int DeclarationStatementAST::lastToken() const { if (declaration) - if (unsigned candidate = declaration->lastToken()) + if (int candidate = declaration->lastToken()) return candidate; return 1; } /** \generated */ -unsigned DeclaratorAST::firstToken() const +int DeclaratorAST::firstToken() const { if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (ptr_operator_list) - if (unsigned candidate = ptr_operator_list->firstToken()) + if (int candidate = ptr_operator_list->firstToken()) return candidate; if (core_declarator) - if (unsigned candidate = core_declarator->firstToken()) + if (int candidate = core_declarator->firstToken()) return candidate; if (postfix_declarator_list) - if (unsigned candidate = postfix_declarator_list->firstToken()) + if (int candidate = postfix_declarator_list->firstToken()) return candidate; if (post_attribute_list) - if (unsigned candidate = post_attribute_list->firstToken()) + if (int candidate = post_attribute_list->firstToken()) return candidate; if (equal_token) return equal_token; if (initializer) - if (unsigned candidate = initializer->firstToken()) + if (int candidate = initializer->firstToken()) return candidate; return 0; } /** \generated */ -unsigned DeclaratorAST::lastToken() const +int DeclaratorAST::lastToken() const { if (initializer) - if (unsigned candidate = initializer->lastToken()) + if (int candidate = initializer->lastToken()) return candidate; if (equal_token) return equal_token + 1; if (post_attribute_list) - if (unsigned candidate = post_attribute_list->lastToken()) + if (int candidate = post_attribute_list->lastToken()) return candidate; if (postfix_declarator_list) - if (unsigned candidate = postfix_declarator_list->lastToken()) + if (int candidate = postfix_declarator_list->lastToken()) return candidate; if (core_declarator) - if (unsigned candidate = core_declarator->lastToken()) + if (int candidate = core_declarator->lastToken()) return candidate; if (ptr_operator_list) - if (unsigned candidate = ptr_operator_list->lastToken()) + if (int candidate = ptr_operator_list->lastToken()) return candidate; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned DeclaratorIdAST::firstToken() const +int DeclaratorIdAST::firstToken() const { if (dot_dot_dot_token) return dot_dot_dot_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; return 0; } /** \generated */ -unsigned DeclaratorIdAST::lastToken() const +int DeclaratorIdAST::lastToken() const { if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token + 1; @@ -942,7 +942,7 @@ unsigned DeclaratorIdAST::lastToken() const } /** \generated */ -unsigned DeleteExpressionAST::firstToken() const +int DeleteExpressionAST::firstToken() const { if (scope_token) return scope_token; @@ -953,16 +953,16 @@ unsigned DeleteExpressionAST::firstToken() const if (rbracket_token) return rbracket_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned DeleteExpressionAST::lastToken() const +int DeleteExpressionAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (rbracket_token) return rbracket_token + 1; @@ -976,21 +976,21 @@ unsigned DeleteExpressionAST::lastToken() const } /** \generated */ -unsigned DestructorNameAST::firstToken() const +int DestructorNameAST::firstToken() const { if (tilde_token) return tilde_token; if (unqualified_name) - if (unsigned candidate = unqualified_name->firstToken()) + if (int candidate = unqualified_name->firstToken()) return candidate; return 0; } /** \generated */ -unsigned DestructorNameAST::lastToken() const +int DestructorNameAST::lastToken() const { if (unqualified_name) - if (unsigned candidate = unqualified_name->lastToken()) + if (int candidate = unqualified_name->lastToken()) return candidate; if (tilde_token) return tilde_token + 1; @@ -998,19 +998,19 @@ unsigned DestructorNameAST::lastToken() const } /** \generated */ -unsigned DoStatementAST::firstToken() const +int DoStatementAST::firstToken() const { if (do_token) return do_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; if (while_token) return while_token; if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -1020,21 +1020,21 @@ unsigned DoStatementAST::firstToken() const } /** \generated */ -unsigned DoStatementAST::lastToken() const +int DoStatementAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; if (while_token) return while_token + 1; if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (do_token) return do_token + 1; @@ -1042,27 +1042,27 @@ unsigned DoStatementAST::lastToken() const } /** \generated */ -unsigned ElaboratedTypeSpecifierAST::firstToken() const +int ElaboratedTypeSpecifierAST::firstToken() const { if (classkey_token) return classkey_token; if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ElaboratedTypeSpecifierAST::lastToken() const +int ElaboratedTypeSpecifierAST::lastToken() const { if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; if (classkey_token) return classkey_token + 1; @@ -1070,7 +1070,7 @@ unsigned ElaboratedTypeSpecifierAST::lastToken() const } /** \generated */ -unsigned EmptyDeclarationAST::firstToken() const +int EmptyDeclarationAST::firstToken() const { if (semicolon_token) return semicolon_token; @@ -1078,7 +1078,7 @@ unsigned EmptyDeclarationAST::firstToken() const } /** \generated */ -unsigned EmptyDeclarationAST::lastToken() const +int EmptyDeclarationAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; @@ -1086,24 +1086,24 @@ unsigned EmptyDeclarationAST::lastToken() const } /** \generated */ -unsigned EnumSpecifierAST::firstToken() const +int EnumSpecifierAST::firstToken() const { if (enum_token) return enum_token; if (key_token) return key_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (colon_token) return colon_token; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (lbrace_token) return lbrace_token; if (enumerator_list) - if (unsigned candidate = enumerator_list->firstToken()) + if (int candidate = enumerator_list->firstToken()) return candidate; if (stray_comma_token) return stray_comma_token; @@ -1113,24 +1113,24 @@ unsigned EnumSpecifierAST::firstToken() const } /** \generated */ -unsigned EnumSpecifierAST::lastToken() const +int EnumSpecifierAST::lastToken() const { if (rbrace_token) return rbrace_token + 1; if (stray_comma_token) return stray_comma_token + 1; if (enumerator_list) - if (unsigned candidate = enumerator_list->lastToken()) + if (int candidate = enumerator_list->lastToken()) return candidate; if (lbrace_token) return lbrace_token + 1; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; if (colon_token) return colon_token + 1; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (key_token) return key_token + 1; @@ -1140,23 +1140,23 @@ unsigned EnumSpecifierAST::lastToken() const } /** \generated */ -unsigned EnumeratorAST::firstToken() const +int EnumeratorAST::firstToken() const { if (identifier_token) return identifier_token; if (equal_token) return equal_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned EnumeratorAST::lastToken() const +int EnumeratorAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (equal_token) return equal_token + 1; @@ -1166,13 +1166,13 @@ unsigned EnumeratorAST::lastToken() const } /** \generated */ -unsigned ExceptionDeclarationAST::firstToken() const +int ExceptionDeclarationAST::firstToken() const { if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token; @@ -1180,21 +1180,21 @@ unsigned ExceptionDeclarationAST::firstToken() const } /** \generated */ -unsigned ExceptionDeclarationAST::lastToken() const +int ExceptionDeclarationAST::lastToken() const { if (dot_dot_dot_token) return dot_dot_dot_token + 1; if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned DynamicExceptionSpecificationAST::firstToken() const +int DynamicExceptionSpecificationAST::firstToken() const { if (throw_token) return throw_token; @@ -1203,7 +1203,7 @@ unsigned DynamicExceptionSpecificationAST::firstToken() const if (dot_dot_dot_token) return dot_dot_dot_token; if (type_id_list) - if (unsigned candidate = type_id_list->firstToken()) + if (int candidate = type_id_list->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -1211,12 +1211,12 @@ unsigned DynamicExceptionSpecificationAST::firstToken() const } /** \generated */ -unsigned DynamicExceptionSpecificationAST::lastToken() const +int DynamicExceptionSpecificationAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (type_id_list) - if (unsigned candidate = type_id_list->lastToken()) + if (int candidate = type_id_list->lastToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token + 1; @@ -1228,34 +1228,34 @@ unsigned DynamicExceptionSpecificationAST::lastToken() const } /** \generated */ -unsigned ExpressionOrDeclarationStatementAST::firstToken() const +int ExpressionOrDeclarationStatementAST::firstToken() const { if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (declaration) - if (unsigned candidate = declaration->firstToken()) + if (int candidate = declaration->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ExpressionOrDeclarationStatementAST::lastToken() const +int ExpressionOrDeclarationStatementAST::lastToken() const { if (declaration) - if (unsigned candidate = declaration->lastToken()) + if (int candidate = declaration->lastToken()) return candidate; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ExpressionStatementAST::firstToken() const +int ExpressionStatementAST::firstToken() const { if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -1263,60 +1263,60 @@ unsigned ExpressionStatementAST::firstToken() const } /** \generated */ -unsigned ExpressionStatementAST::lastToken() const +int ExpressionStatementAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ForStatementAST::firstToken() const +int ForStatementAST::firstToken() const { if (for_token) return for_token; if (lparen_token) return lparen_token; if (initializer) - if (unsigned candidate = initializer->firstToken()) + if (int candidate = initializer->firstToken()) return candidate; if (condition) - if (unsigned candidate = condition->firstToken()) + if (int candidate = condition->firstToken()) return candidate; if (semicolon_token) return semicolon_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ForStatementAST::lastToken() const +int ForStatementAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (semicolon_token) return semicolon_token + 1; if (condition) - if (unsigned candidate = condition->lastToken()) + if (int candidate = condition->lastToken()) return candidate; if (initializer) - if (unsigned candidate = initializer->lastToken()) + if (int candidate = initializer->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -1326,55 +1326,55 @@ unsigned ForStatementAST::lastToken() const } /** \generated */ -unsigned ForeachStatementAST::firstToken() const +int ForeachStatementAST::firstToken() const { if (foreach_token) return foreach_token; if (lparen_token) return lparen_token; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; if (initializer) - if (unsigned candidate = initializer->firstToken()) + if (int candidate = initializer->firstToken()) return candidate; if (comma_token) return comma_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ForeachStatementAST::lastToken() const +int ForeachStatementAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (comma_token) return comma_token + 1; if (initializer) - if (unsigned candidate = initializer->lastToken()) + if (int candidate = initializer->lastToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -1384,53 +1384,53 @@ unsigned ForeachStatementAST::lastToken() const } /** \generated */ -unsigned FunctionDeclaratorAST::firstToken() const +int FunctionDeclaratorAST::firstToken() const { if (lparen_token) return lparen_token; if (parameter_declaration_clause) - if (unsigned candidate = parameter_declaration_clause->firstToken()) + if (int candidate = parameter_declaration_clause->firstToken()) return candidate; if (rparen_token) return rparen_token; if (cv_qualifier_list) - if (unsigned candidate = cv_qualifier_list->firstToken()) + if (int candidate = cv_qualifier_list->firstToken()) return candidate; if (ref_qualifier_token) return ref_qualifier_token; if (exception_specification) - if (unsigned candidate = exception_specification->firstToken()) + if (int candidate = exception_specification->firstToken()) return candidate; if (trailing_return_type) - if (unsigned candidate = trailing_return_type->firstToken()) + if (int candidate = trailing_return_type->firstToken()) return candidate; if (as_cpp_initializer) - if (unsigned candidate = as_cpp_initializer->firstToken()) + if (int candidate = as_cpp_initializer->firstToken()) return candidate; return 0; } /** \generated */ -unsigned FunctionDeclaratorAST::lastToken() const +int FunctionDeclaratorAST::lastToken() const { if (as_cpp_initializer) - if (unsigned candidate = as_cpp_initializer->lastToken()) + if (int candidate = as_cpp_initializer->lastToken()) return candidate; if (trailing_return_type) - if (unsigned candidate = trailing_return_type->lastToken()) + if (int candidate = trailing_return_type->lastToken()) return candidate; if (exception_specification) - if (unsigned candidate = exception_specification->lastToken()) + if (int candidate = exception_specification->lastToken()) return candidate; if (ref_qualifier_token) return ref_qualifier_token + 1; if (cv_qualifier_list) - if (unsigned candidate = cv_qualifier_list->lastToken()) + if (int candidate = cv_qualifier_list->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (parameter_declaration_clause) - if (unsigned candidate = parameter_declaration_clause->lastToken()) + if (int candidate = parameter_declaration_clause->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -1438,39 +1438,39 @@ unsigned FunctionDeclaratorAST::lastToken() const } /** \generated */ -unsigned FunctionDefinitionAST::firstToken() const +int FunctionDefinitionAST::firstToken() const { if (qt_invokable_token) return qt_invokable_token; if (decl_specifier_list) - if (unsigned candidate = decl_specifier_list->firstToken()) + if (int candidate = decl_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; if (ctor_initializer) - if (unsigned candidate = ctor_initializer->firstToken()) + if (int candidate = ctor_initializer->firstToken()) return candidate; if (function_body) - if (unsigned candidate = function_body->firstToken()) + if (int candidate = function_body->firstToken()) return candidate; return 0; } /** \generated */ -unsigned FunctionDefinitionAST::lastToken() const +int FunctionDefinitionAST::lastToken() const { if (function_body) - if (unsigned candidate = function_body->lastToken()) + if (int candidate = function_body->lastToken()) return candidate; if (ctor_initializer) - if (unsigned candidate = ctor_initializer->lastToken()) + if (int candidate = ctor_initializer->lastToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (decl_specifier_list) - if (unsigned candidate = decl_specifier_list->lastToken()) + if (int candidate = decl_specifier_list->lastToken()) return candidate; if (qt_invokable_token) return qt_invokable_token + 1; @@ -1478,7 +1478,7 @@ unsigned FunctionDefinitionAST::lastToken() const } /** \generated */ -unsigned GotoStatementAST::firstToken() const +int GotoStatementAST::firstToken() const { if (goto_token) return goto_token; @@ -1490,7 +1490,7 @@ unsigned GotoStatementAST::firstToken() const } /** \generated */ -unsigned GotoStatementAST::lastToken() const +int GotoStatementAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; @@ -1502,61 +1502,61 @@ unsigned GotoStatementAST::lastToken() const } /** \generated */ -unsigned IdExpressionAST::firstToken() const +int IdExpressionAST::firstToken() const { if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; return 0; } /** \generated */ -unsigned IdExpressionAST::lastToken() const +int IdExpressionAST::lastToken() const { if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; return 1; } /** \generated */ -unsigned IfStatementAST::firstToken() const +int IfStatementAST::firstToken() const { if (if_token) return if_token; if (lparen_token) return lparen_token; if (condition) - if (unsigned candidate = condition->firstToken()) + if (int candidate = condition->firstToken()) return candidate; if (rparen_token) return rparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; if (else_token) return else_token; if (else_statement) - if (unsigned candidate = else_statement->firstToken()) + if (int candidate = else_statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned IfStatementAST::lastToken() const +int IfStatementAST::lastToken() const { if (else_statement) - if (unsigned candidate = else_statement->lastToken()) + if (int candidate = else_statement->lastToken()) return candidate; if (else_token) return else_token + 1; if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (condition) - if (unsigned candidate = condition->lastToken()) + if (int candidate = condition->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -1566,23 +1566,23 @@ unsigned IfStatementAST::lastToken() const } /** \generated */ -unsigned LabeledStatementAST::firstToken() const +int LabeledStatementAST::firstToken() const { if (label_token) return label_token; if (colon_token) return colon_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned LabeledStatementAST::lastToken() const +int LabeledStatementAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (colon_token) return colon_token + 1; @@ -1592,21 +1592,21 @@ unsigned LabeledStatementAST::lastToken() const } /** \generated */ -unsigned LambdaCaptureAST::firstToken() const +int LambdaCaptureAST::firstToken() const { if (default_capture_token) return default_capture_token; if (capture_list) - if (unsigned candidate = capture_list->firstToken()) + if (int candidate = capture_list->firstToken()) return candidate; return 0; } /** \generated */ -unsigned LambdaCaptureAST::lastToken() const +int LambdaCaptureAST::lastToken() const { if (capture_list) - if (unsigned candidate = capture_list->lastToken()) + if (int candidate = capture_list->lastToken()) return candidate; if (default_capture_token) return default_capture_token + 1; @@ -1614,47 +1614,47 @@ unsigned LambdaCaptureAST::lastToken() const } /** \generated */ -unsigned LambdaDeclaratorAST::firstToken() const +int LambdaDeclaratorAST::firstToken() const { if (lparen_token) return lparen_token; if (parameter_declaration_clause) - if (unsigned candidate = parameter_declaration_clause->firstToken()) + if (int candidate = parameter_declaration_clause->firstToken()) return candidate; if (rparen_token) return rparen_token; if (attributes) - if (unsigned candidate = attributes->firstToken()) + if (int candidate = attributes->firstToken()) return candidate; if (mutable_token) return mutable_token; if (exception_specification) - if (unsigned candidate = exception_specification->firstToken()) + if (int candidate = exception_specification->firstToken()) return candidate; if (trailing_return_type) - if (unsigned candidate = trailing_return_type->firstToken()) + if (int candidate = trailing_return_type->firstToken()) return candidate; return 0; } /** \generated */ -unsigned LambdaDeclaratorAST::lastToken() const +int LambdaDeclaratorAST::lastToken() const { if (trailing_return_type) - if (unsigned candidate = trailing_return_type->lastToken()) + if (int candidate = trailing_return_type->lastToken()) return candidate; if (exception_specification) - if (unsigned candidate = exception_specification->lastToken()) + if (int candidate = exception_specification->lastToken()) return candidate; if (mutable_token) return mutable_token + 1; if (attributes) - if (unsigned candidate = attributes->lastToken()) + if (int candidate = attributes->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (parameter_declaration_clause) - if (unsigned candidate = parameter_declaration_clause->lastToken()) + if (int candidate = parameter_declaration_clause->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -1662,42 +1662,42 @@ unsigned LambdaDeclaratorAST::lastToken() const } /** \generated */ -unsigned LambdaExpressionAST::firstToken() const +int LambdaExpressionAST::firstToken() const { if (lambda_introducer) - if (unsigned candidate = lambda_introducer->firstToken()) + if (int candidate = lambda_introducer->firstToken()) return candidate; if (lambda_declarator) - if (unsigned candidate = lambda_declarator->firstToken()) + if (int candidate = lambda_declarator->firstToken()) return candidate; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned LambdaExpressionAST::lastToken() const +int LambdaExpressionAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (lambda_declarator) - if (unsigned candidate = lambda_declarator->lastToken()) + if (int candidate = lambda_declarator->lastToken()) return candidate; if (lambda_introducer) - if (unsigned candidate = lambda_introducer->lastToken()) + if (int candidate = lambda_introducer->lastToken()) return candidate; return 1; } /** \generated */ -unsigned LambdaIntroducerAST::firstToken() const +int LambdaIntroducerAST::firstToken() const { if (lbracket_token) return lbracket_token; if (lambda_capture) - if (unsigned candidate = lambda_capture->firstToken()) + if (int candidate = lambda_capture->firstToken()) return candidate; if (rbracket_token) return rbracket_token; @@ -1705,12 +1705,12 @@ unsigned LambdaIntroducerAST::firstToken() const } /** \generated */ -unsigned LambdaIntroducerAST::lastToken() const +int LambdaIntroducerAST::lastToken() const { if (rbracket_token) return rbracket_token + 1; if (lambda_capture) - if (unsigned candidate = lambda_capture->lastToken()) + if (int candidate = lambda_capture->lastToken()) return candidate; if (lbracket_token) return lbracket_token + 1; @@ -1718,12 +1718,12 @@ unsigned LambdaIntroducerAST::lastToken() const } /** \generated */ -unsigned LinkageBodyAST::firstToken() const +int LinkageBodyAST::firstToken() const { if (lbrace_token) return lbrace_token; if (declaration_list) - if (unsigned candidate = declaration_list->firstToken()) + if (int candidate = declaration_list->firstToken()) return candidate; if (rbrace_token) return rbrace_token; @@ -1731,12 +1731,12 @@ unsigned LinkageBodyAST::firstToken() const } /** \generated */ -unsigned LinkageBodyAST::lastToken() const +int LinkageBodyAST::lastToken() const { if (rbrace_token) return rbrace_token + 1; if (declaration_list) - if (unsigned candidate = declaration_list->lastToken()) + if (int candidate = declaration_list->lastToken()) return candidate; if (lbrace_token) return lbrace_token + 1; @@ -1744,23 +1744,23 @@ unsigned LinkageBodyAST::lastToken() const } /** \generated */ -unsigned LinkageSpecificationAST::firstToken() const +int LinkageSpecificationAST::firstToken() const { if (extern_token) return extern_token; if (extern_type_token) return extern_type_token; if (declaration) - if (unsigned candidate = declaration->firstToken()) + if (int candidate = declaration->firstToken()) return candidate; return 0; } /** \generated */ -unsigned LinkageSpecificationAST::lastToken() const +int LinkageSpecificationAST::lastToken() const { if (declaration) - if (unsigned candidate = declaration->lastToken()) + if (int candidate = declaration->lastToken()) return candidate; if (extern_type_token) return extern_type_token + 1; @@ -1770,81 +1770,81 @@ unsigned LinkageSpecificationAST::lastToken() const } /** \generated */ -unsigned MemInitializerAST::firstToken() const +int MemInitializerAST::firstToken() const { if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned MemInitializerAST::lastToken() const +int MemInitializerAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; return 1; } /** \generated */ -unsigned MemberAccessAST::firstToken() const +int MemberAccessAST::firstToken() const { if (base_expression) - if (unsigned candidate = base_expression->firstToken()) + if (int candidate = base_expression->firstToken()) return candidate; if (access_token) return access_token; if (template_token) return template_token; if (member_name) - if (unsigned candidate = member_name->firstToken()) + if (int candidate = member_name->firstToken()) return candidate; return 0; } /** \generated */ -unsigned MemberAccessAST::lastToken() const +int MemberAccessAST::lastToken() const { if (member_name) - if (unsigned candidate = member_name->lastToken()) + if (int candidate = member_name->lastToken()) return candidate; if (template_token) return template_token + 1; if (access_token) return access_token + 1; if (base_expression) - if (unsigned candidate = base_expression->lastToken()) + if (int candidate = base_expression->lastToken()) return candidate; return 1; } /** \generated */ -unsigned NamedTypeSpecifierAST::firstToken() const +int NamedTypeSpecifierAST::firstToken() const { if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; return 0; } /** \generated */ -unsigned NamedTypeSpecifierAST::lastToken() const +int NamedTypeSpecifierAST::lastToken() const { if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; return 1; } /** \generated */ -unsigned NamespaceAST::firstToken() const +int NamespaceAST::firstToken() const { if (inline_token) return inline_token; @@ -1853,22 +1853,22 @@ unsigned NamespaceAST::firstToken() const if (identifier_token) return identifier_token; if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (linkage_body) - if (unsigned candidate = linkage_body->firstToken()) + if (int candidate = linkage_body->firstToken()) return candidate; return 0; } /** \generated */ -unsigned NamespaceAST::lastToken() const +int NamespaceAST::lastToken() const { if (linkage_body) - if (unsigned candidate = linkage_body->lastToken()) + if (int candidate = linkage_body->lastToken()) return candidate; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; if (identifier_token) return identifier_token + 1; @@ -1880,7 +1880,7 @@ unsigned NamespaceAST::lastToken() const } /** \generated */ -unsigned NamespaceAliasDefinitionAST::firstToken() const +int NamespaceAliasDefinitionAST::firstToken() const { if (namespace_token) return namespace_token; @@ -1889,7 +1889,7 @@ unsigned NamespaceAliasDefinitionAST::firstToken() const if (equal_token) return equal_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -1897,12 +1897,12 @@ unsigned NamespaceAliasDefinitionAST::firstToken() const } /** \generated */ -unsigned NamespaceAliasDefinitionAST::lastToken() const +int NamespaceAliasDefinitionAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (equal_token) return equal_token + 1; @@ -1914,12 +1914,12 @@ unsigned NamespaceAliasDefinitionAST::lastToken() const } /** \generated */ -unsigned NestedDeclaratorAST::firstToken() const +int NestedDeclaratorAST::firstToken() const { if (lparen_token) return lparen_token; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -1927,12 +1927,12 @@ unsigned NestedDeclaratorAST::firstToken() const } /** \generated */ -unsigned NestedDeclaratorAST::lastToken() const +int NestedDeclaratorAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -1940,12 +1940,12 @@ unsigned NestedDeclaratorAST::lastToken() const } /** \generated */ -unsigned NestedExpressionAST::firstToken() const +int NestedExpressionAST::firstToken() const { if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -1953,12 +1953,12 @@ unsigned NestedExpressionAST::firstToken() const } /** \generated */ -unsigned NestedExpressionAST::lastToken() const +int NestedExpressionAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -1966,10 +1966,10 @@ unsigned NestedExpressionAST::lastToken() const } /** \generated */ -unsigned NestedNameSpecifierAST::firstToken() const +int NestedNameSpecifierAST::firstToken() const { if (class_or_namespace_name) - if (unsigned candidate = class_or_namespace_name->firstToken()) + if (int candidate = class_or_namespace_name->firstToken()) return candidate; if (scope_token) return scope_token; @@ -1977,23 +1977,23 @@ unsigned NestedNameSpecifierAST::firstToken() const } /** \generated */ -unsigned NestedNameSpecifierAST::lastToken() const +int NestedNameSpecifierAST::lastToken() const { if (scope_token) return scope_token + 1; if (class_or_namespace_name) - if (unsigned candidate = class_or_namespace_name->lastToken()) + if (int candidate = class_or_namespace_name->lastToken()) return candidate; return 1; } /** \generated */ -unsigned NewArrayDeclaratorAST::firstToken() const +int NewArrayDeclaratorAST::firstToken() const { if (lbracket_token) return lbracket_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rbracket_token) return rbracket_token; @@ -2001,12 +2001,12 @@ unsigned NewArrayDeclaratorAST::firstToken() const } /** \generated */ -unsigned NewArrayDeclaratorAST::lastToken() const +int NewArrayDeclaratorAST::lastToken() const { if (rbracket_token) return rbracket_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lbracket_token) return lbracket_token + 1; @@ -2014,49 +2014,49 @@ unsigned NewArrayDeclaratorAST::lastToken() const } /** \generated */ -unsigned NewExpressionAST::firstToken() const +int NewExpressionAST::firstToken() const { if (scope_token) return scope_token; if (new_token) return new_token; if (new_placement) - if (unsigned candidate = new_placement->firstToken()) + if (int candidate = new_placement->firstToken()) return candidate; if (lparen_token) return lparen_token; if (type_id) - if (unsigned candidate = type_id->firstToken()) + if (int candidate = type_id->firstToken()) return candidate; if (rparen_token) return rparen_token; if (new_type_id) - if (unsigned candidate = new_type_id->firstToken()) + if (int candidate = new_type_id->firstToken()) return candidate; if (new_initializer) - if (unsigned candidate = new_initializer->firstToken()) + if (int candidate = new_initializer->firstToken()) return candidate; return 0; } /** \generated */ -unsigned NewExpressionAST::lastToken() const +int NewExpressionAST::lastToken() const { if (new_initializer) - if (unsigned candidate = new_initializer->lastToken()) + if (int candidate = new_initializer->lastToken()) return candidate; if (new_type_id) - if (unsigned candidate = new_type_id->lastToken()) + if (int candidate = new_type_id->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (type_id) - if (unsigned candidate = type_id->lastToken()) + if (int candidate = type_id->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; if (new_placement) - if (unsigned candidate = new_placement->lastToken()) + if (int candidate = new_placement->lastToken()) return candidate; if (new_token) return new_token + 1; @@ -2066,12 +2066,12 @@ unsigned NewExpressionAST::lastToken() const } /** \generated */ -unsigned ExpressionListParenAST::firstToken() const +int ExpressionListParenAST::firstToken() const { if (lparen_token) return lparen_token; if (expression_list) - if (unsigned candidate = expression_list->firstToken()) + if (int candidate = expression_list->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -2079,12 +2079,12 @@ unsigned ExpressionListParenAST::firstToken() const } /** \generated */ -unsigned ExpressionListParenAST::lastToken() const +int ExpressionListParenAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression_list) - if (unsigned candidate = expression_list->lastToken()) + if (int candidate = expression_list->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -2092,37 +2092,37 @@ unsigned ExpressionListParenAST::lastToken() const } /** \generated */ -unsigned NewTypeIdAST::firstToken() const +int NewTypeIdAST::firstToken() const { if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (ptr_operator_list) - if (unsigned candidate = ptr_operator_list->firstToken()) + if (int candidate = ptr_operator_list->firstToken()) return candidate; if (new_array_declarator_list) - if (unsigned candidate = new_array_declarator_list->firstToken()) + if (int candidate = new_array_declarator_list->firstToken()) return candidate; return 0; } /** \generated */ -unsigned NewTypeIdAST::lastToken() const +int NewTypeIdAST::lastToken() const { if (new_array_declarator_list) - if (unsigned candidate = new_array_declarator_list->lastToken()) + if (int candidate = new_array_declarator_list->lastToken()) return candidate; if (ptr_operator_list) - if (unsigned candidate = ptr_operator_list->lastToken()) + if (int candidate = ptr_operator_list->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned NumericLiteralAST::firstToken() const +int NumericLiteralAST::firstToken() const { if (literal_token) return literal_token; @@ -2130,7 +2130,7 @@ unsigned NumericLiteralAST::firstToken() const } /** \generated */ -unsigned NumericLiteralAST::lastToken() const +int NumericLiteralAST::lastToken() const { if (literal_token) return literal_token + 1; @@ -2138,38 +2138,38 @@ unsigned NumericLiteralAST::lastToken() const } /** \generated */ -unsigned ObjCClassDeclarationAST::firstToken() const +int ObjCClassDeclarationAST::firstToken() const { if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (interface_token) return interface_token; if (implementation_token) return implementation_token; if (class_name) - if (unsigned candidate = class_name->firstToken()) + if (int candidate = class_name->firstToken()) return candidate; if (lparen_token) return lparen_token; if (category_name) - if (unsigned candidate = category_name->firstToken()) + if (int candidate = category_name->firstToken()) return candidate; if (rparen_token) return rparen_token; if (colon_token) return colon_token; if (superclass) - if (unsigned candidate = superclass->firstToken()) + if (int candidate = superclass->firstToken()) return candidate; if (protocol_refs) - if (unsigned candidate = protocol_refs->firstToken()) + if (int candidate = protocol_refs->firstToken()) return candidate; if (inst_vars_decl) - if (unsigned candidate = inst_vars_decl->firstToken()) + if (int candidate = inst_vars_decl->firstToken()) return candidate; if (member_declaration_list) - if (unsigned candidate = member_declaration_list->firstToken()) + if (int candidate = member_declaration_list->firstToken()) return candidate; if (end_token) return end_token; @@ -2177,54 +2177,54 @@ unsigned ObjCClassDeclarationAST::firstToken() const } /** \generated */ -unsigned ObjCClassDeclarationAST::lastToken() const +int ObjCClassDeclarationAST::lastToken() const { if (end_token) return end_token + 1; if (member_declaration_list) - if (unsigned candidate = member_declaration_list->lastToken()) + if (int candidate = member_declaration_list->lastToken()) return candidate; if (inst_vars_decl) - if (unsigned candidate = inst_vars_decl->lastToken()) + if (int candidate = inst_vars_decl->lastToken()) return candidate; if (protocol_refs) - if (unsigned candidate = protocol_refs->lastToken()) + if (int candidate = protocol_refs->lastToken()) return candidate; if (superclass) - if (unsigned candidate = superclass->lastToken()) + if (int candidate = superclass->lastToken()) return candidate; if (colon_token) return colon_token + 1; if (rparen_token) return rparen_token + 1; if (category_name) - if (unsigned candidate = category_name->lastToken()) + if (int candidate = category_name->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; if (class_name) - if (unsigned candidate = class_name->lastToken()) + if (int candidate = class_name->lastToken()) return candidate; if (implementation_token) return implementation_token + 1; if (interface_token) return interface_token + 1; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ObjCClassForwardDeclarationAST::firstToken() const +int ObjCClassForwardDeclarationAST::firstToken() const { if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (class_token) return class_token; if (identifier_list) - if (unsigned candidate = identifier_list->firstToken()) + if (int candidate = identifier_list->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -2232,28 +2232,28 @@ unsigned ObjCClassForwardDeclarationAST::firstToken() const } /** \generated */ -unsigned ObjCClassForwardDeclarationAST::lastToken() const +int ObjCClassForwardDeclarationAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (identifier_list) - if (unsigned candidate = identifier_list->lastToken()) + if (int candidate = identifier_list->lastToken()) return candidate; if (class_token) return class_token + 1; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ObjCDynamicPropertiesDeclarationAST::firstToken() const +int ObjCDynamicPropertiesDeclarationAST::firstToken() const { if (dynamic_token) return dynamic_token; if (property_identifier_list) - if (unsigned candidate = property_identifier_list->firstToken()) + if (int candidate = property_identifier_list->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -2261,12 +2261,12 @@ unsigned ObjCDynamicPropertiesDeclarationAST::firstToken() const } /** \generated */ -unsigned ObjCDynamicPropertiesDeclarationAST::lastToken() const +int ObjCDynamicPropertiesDeclarationAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (property_identifier_list) - if (unsigned candidate = property_identifier_list->lastToken()) + if (int candidate = property_identifier_list->lastToken()) return candidate; if (dynamic_token) return dynamic_token + 1; @@ -2274,21 +2274,21 @@ unsigned ObjCDynamicPropertiesDeclarationAST::lastToken() const } /** \generated */ -unsigned ObjCEncodeExpressionAST::firstToken() const +int ObjCEncodeExpressionAST::firstToken() const { if (encode_token) return encode_token; if (type_name) - if (unsigned candidate = type_name->firstToken()) + if (int candidate = type_name->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ObjCEncodeExpressionAST::lastToken() const +int ObjCEncodeExpressionAST::lastToken() const { if (type_name) - if (unsigned candidate = type_name->lastToken()) + if (int candidate = type_name->lastToken()) return candidate; if (encode_token) return encode_token + 1; @@ -2296,55 +2296,55 @@ unsigned ObjCEncodeExpressionAST::lastToken() const } /** \generated */ -unsigned ObjCFastEnumerationAST::firstToken() const +int ObjCFastEnumerationAST::firstToken() const { if (for_token) return for_token; if (lparen_token) return lparen_token; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; if (initializer) - if (unsigned candidate = initializer->firstToken()) + if (int candidate = initializer->firstToken()) return candidate; if (in_token) return in_token; if (fast_enumeratable_expression) - if (unsigned candidate = fast_enumeratable_expression->firstToken()) + if (int candidate = fast_enumeratable_expression->firstToken()) return candidate; if (rparen_token) return rparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ObjCFastEnumerationAST::lastToken() const +int ObjCFastEnumerationAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (fast_enumeratable_expression) - if (unsigned candidate = fast_enumeratable_expression->lastToken()) + if (int candidate = fast_enumeratable_expression->lastToken()) return candidate; if (in_token) return in_token + 1; if (initializer) - if (unsigned candidate = initializer->lastToken()) + if (int candidate = initializer->lastToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -2354,12 +2354,12 @@ unsigned ObjCFastEnumerationAST::lastToken() const } /** \generated */ -unsigned ObjCInstanceVariablesDeclarationAST::firstToken() const +int ObjCInstanceVariablesDeclarationAST::firstToken() const { if (lbrace_token) return lbrace_token; if (instance_variable_list) - if (unsigned candidate = instance_variable_list->firstToken()) + if (int candidate = instance_variable_list->firstToken()) return candidate; if (rbrace_token) return rbrace_token; @@ -2367,12 +2367,12 @@ unsigned ObjCInstanceVariablesDeclarationAST::firstToken() const } /** \generated */ -unsigned ObjCInstanceVariablesDeclarationAST::lastToken() const +int ObjCInstanceVariablesDeclarationAST::lastToken() const { if (rbrace_token) return rbrace_token + 1; if (instance_variable_list) - if (unsigned candidate = instance_variable_list->lastToken()) + if (int candidate = instance_variable_list->lastToken()) return candidate; if (lbrace_token) return lbrace_token + 1; @@ -2380,66 +2380,66 @@ unsigned ObjCInstanceVariablesDeclarationAST::lastToken() const } /** \generated */ -unsigned ObjCMessageArgumentAST::firstToken() const +int ObjCMessageArgumentAST::firstToken() const { if (parameter_value_expression) - if (unsigned candidate = parameter_value_expression->firstToken()) + if (int candidate = parameter_value_expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ObjCMessageArgumentAST::lastToken() const +int ObjCMessageArgumentAST::lastToken() const { if (parameter_value_expression) - if (unsigned candidate = parameter_value_expression->lastToken()) + if (int candidate = parameter_value_expression->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ObjCMessageArgumentDeclarationAST::firstToken() const +int ObjCMessageArgumentDeclarationAST::firstToken() const { if (type_name) - if (unsigned candidate = type_name->firstToken()) + if (int candidate = type_name->firstToken()) return candidate; if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (param_name) - if (unsigned candidate = param_name->firstToken()) + if (int candidate = param_name->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ObjCMessageArgumentDeclarationAST::lastToken() const +int ObjCMessageArgumentDeclarationAST::lastToken() const { if (param_name) - if (unsigned candidate = param_name->lastToken()) + if (int candidate = param_name->lastToken()) return candidate; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; if (type_name) - if (unsigned candidate = type_name->lastToken()) + if (int candidate = type_name->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ObjCMessageExpressionAST::firstToken() const +int ObjCMessageExpressionAST::firstToken() const { if (lbracket_token) return lbracket_token; if (receiver_expression) - if (unsigned candidate = receiver_expression->firstToken()) + if (int candidate = receiver_expression->firstToken()) return candidate; if (selector) - if (unsigned candidate = selector->firstToken()) + if (int candidate = selector->firstToken()) return candidate; if (argument_list) - if (unsigned candidate = argument_list->firstToken()) + if (int candidate = argument_list->firstToken()) return candidate; if (rbracket_token) return rbracket_token; @@ -2447,18 +2447,18 @@ unsigned ObjCMessageExpressionAST::firstToken() const } /** \generated */ -unsigned ObjCMessageExpressionAST::lastToken() const +int ObjCMessageExpressionAST::lastToken() const { if (rbracket_token) return rbracket_token + 1; if (argument_list) - if (unsigned candidate = argument_list->lastToken()) + if (int candidate = argument_list->lastToken()) return candidate; if (selector) - if (unsigned candidate = selector->lastToken()) + if (int candidate = selector->lastToken()) return candidate; if (receiver_expression) - if (unsigned candidate = receiver_expression->lastToken()) + if (int candidate = receiver_expression->lastToken()) return candidate; if (lbracket_token) return lbracket_token + 1; @@ -2466,13 +2466,13 @@ unsigned ObjCMessageExpressionAST::lastToken() const } /** \generated */ -unsigned ObjCMethodDeclarationAST::firstToken() const +int ObjCMethodDeclarationAST::firstToken() const { if (method_prototype) - if (unsigned candidate = method_prototype->firstToken()) + if (int candidate = method_prototype->firstToken()) return candidate; if (function_body) - if (unsigned candidate = function_body->firstToken()) + if (int candidate = function_body->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -2480,57 +2480,57 @@ unsigned ObjCMethodDeclarationAST::firstToken() const } /** \generated */ -unsigned ObjCMethodDeclarationAST::lastToken() const +int ObjCMethodDeclarationAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (function_body) - if (unsigned candidate = function_body->lastToken()) + if (int candidate = function_body->lastToken()) return candidate; if (method_prototype) - if (unsigned candidate = method_prototype->lastToken()) + if (int candidate = method_prototype->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ObjCMethodPrototypeAST::firstToken() const +int ObjCMethodPrototypeAST::firstToken() const { if (method_type_token) return method_type_token; if (type_name) - if (unsigned candidate = type_name->firstToken()) + if (int candidate = type_name->firstToken()) return candidate; if (selector) - if (unsigned candidate = selector->firstToken()) + if (int candidate = selector->firstToken()) return candidate; if (argument_list) - if (unsigned candidate = argument_list->firstToken()) + if (int candidate = argument_list->firstToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token; if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ObjCMethodPrototypeAST::lastToken() const +int ObjCMethodPrototypeAST::lastToken() const { if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token + 1; if (argument_list) - if (unsigned candidate = argument_list->lastToken()) + if (int candidate = argument_list->lastToken()) return candidate; if (selector) - if (unsigned candidate = selector->lastToken()) + if (int candidate = selector->lastToken()) return candidate; if (type_name) - if (unsigned candidate = type_name->lastToken()) + if (int candidate = type_name->lastToken()) return candidate; if (method_type_token) return method_type_token + 1; @@ -2538,23 +2538,23 @@ unsigned ObjCMethodPrototypeAST::lastToken() const } /** \generated */ -unsigned ObjCPropertyAttributeAST::firstToken() const +int ObjCPropertyAttributeAST::firstToken() const { if (attribute_identifier_token) return attribute_identifier_token; if (equals_token) return equals_token; if (method_selector) - if (unsigned candidate = method_selector->firstToken()) + if (int candidate = method_selector->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ObjCPropertyAttributeAST::lastToken() const +int ObjCPropertyAttributeAST::lastToken() const { if (method_selector) - if (unsigned candidate = method_selector->lastToken()) + if (int candidate = method_selector->lastToken()) return candidate; if (equals_token) return equals_token + 1; @@ -2564,63 +2564,63 @@ unsigned ObjCPropertyAttributeAST::lastToken() const } /** \generated */ -unsigned ObjCPropertyDeclarationAST::firstToken() const +int ObjCPropertyDeclarationAST::firstToken() const { if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (property_token) return property_token; if (lparen_token) return lparen_token; if (property_attribute_list) - if (unsigned candidate = property_attribute_list->firstToken()) + if (int candidate = property_attribute_list->firstToken()) return candidate; if (rparen_token) return rparen_token; if (simple_declaration) - if (unsigned candidate = simple_declaration->firstToken()) + if (int candidate = simple_declaration->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ObjCPropertyDeclarationAST::lastToken() const +int ObjCPropertyDeclarationAST::lastToken() const { if (simple_declaration) - if (unsigned candidate = simple_declaration->lastToken()) + if (int candidate = simple_declaration->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (property_attribute_list) - if (unsigned candidate = property_attribute_list->lastToken()) + if (int candidate = property_attribute_list->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; if (property_token) return property_token + 1; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ObjCProtocolDeclarationAST::firstToken() const +int ObjCProtocolDeclarationAST::firstToken() const { if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (protocol_token) return protocol_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (protocol_refs) - if (unsigned candidate = protocol_refs->firstToken()) + if (int candidate = protocol_refs->firstToken()) return candidate; if (member_declaration_list) - if (unsigned candidate = member_declaration_list->firstToken()) + if (int candidate = member_declaration_list->firstToken()) return candidate; if (end_token) return end_token; @@ -2628,29 +2628,29 @@ unsigned ObjCProtocolDeclarationAST::firstToken() const } /** \generated */ -unsigned ObjCProtocolDeclarationAST::lastToken() const +int ObjCProtocolDeclarationAST::lastToken() const { if (end_token) return end_token + 1; if (member_declaration_list) - if (unsigned candidate = member_declaration_list->lastToken()) + if (int candidate = member_declaration_list->lastToken()) return candidate; if (protocol_refs) - if (unsigned candidate = protocol_refs->lastToken()) + if (int candidate = protocol_refs->lastToken()) return candidate; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (protocol_token) return protocol_token + 1; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ObjCProtocolExpressionAST::firstToken() const +int ObjCProtocolExpressionAST::firstToken() const { if (protocol_token) return protocol_token; @@ -2664,7 +2664,7 @@ unsigned ObjCProtocolExpressionAST::firstToken() const } /** \generated */ -unsigned ObjCProtocolExpressionAST::lastToken() const +int ObjCProtocolExpressionAST::lastToken() const { if (rparen_token) return rparen_token + 1; @@ -2678,15 +2678,15 @@ unsigned ObjCProtocolExpressionAST::lastToken() const } /** \generated */ -unsigned ObjCProtocolForwardDeclarationAST::firstToken() const +int ObjCProtocolForwardDeclarationAST::firstToken() const { if (attribute_list) - if (unsigned candidate = attribute_list->firstToken()) + if (int candidate = attribute_list->firstToken()) return candidate; if (protocol_token) return protocol_token; if (identifier_list) - if (unsigned candidate = identifier_list->firstToken()) + if (int candidate = identifier_list->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -2694,28 +2694,28 @@ unsigned ObjCProtocolForwardDeclarationAST::firstToken() const } /** \generated */ -unsigned ObjCProtocolForwardDeclarationAST::lastToken() const +int ObjCProtocolForwardDeclarationAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (identifier_list) - if (unsigned candidate = identifier_list->lastToken()) + if (int candidate = identifier_list->lastToken()) return candidate; if (protocol_token) return protocol_token + 1; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ObjCProtocolRefsAST::firstToken() const +int ObjCProtocolRefsAST::firstToken() const { if (less_token) return less_token; if (identifier_list) - if (unsigned candidate = identifier_list->firstToken()) + if (int candidate = identifier_list->firstToken()) return candidate; if (greater_token) return greater_token; @@ -2723,12 +2723,12 @@ unsigned ObjCProtocolRefsAST::firstToken() const } /** \generated */ -unsigned ObjCProtocolRefsAST::lastToken() const +int ObjCProtocolRefsAST::lastToken() const { if (greater_token) return greater_token + 1; if (identifier_list) - if (unsigned candidate = identifier_list->lastToken()) + if (int candidate = identifier_list->lastToken()) return candidate; if (less_token) return less_token + 1; @@ -2736,25 +2736,25 @@ unsigned ObjCProtocolRefsAST::lastToken() const } /** \generated */ -unsigned ObjCSelectorAST::firstToken() const +int ObjCSelectorAST::firstToken() const { if (selector_argument_list) - if (unsigned candidate = selector_argument_list->firstToken()) + if (int candidate = selector_argument_list->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ObjCSelectorAST::lastToken() const +int ObjCSelectorAST::lastToken() const { if (selector_argument_list) - if (unsigned candidate = selector_argument_list->lastToken()) + if (int candidate = selector_argument_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ObjCSelectorArgumentAST::firstToken() const +int ObjCSelectorArgumentAST::firstToken() const { if (name_token) return name_token; @@ -2764,7 +2764,7 @@ unsigned ObjCSelectorArgumentAST::firstToken() const } /** \generated */ -unsigned ObjCSelectorArgumentAST::lastToken() const +int ObjCSelectorArgumentAST::lastToken() const { if (colon_token) return colon_token + 1; @@ -2774,14 +2774,14 @@ unsigned ObjCSelectorArgumentAST::lastToken() const } /** \generated */ -unsigned ObjCSelectorExpressionAST::firstToken() const +int ObjCSelectorExpressionAST::firstToken() const { if (selector_token) return selector_token; if (lparen_token) return lparen_token; if (selector) - if (unsigned candidate = selector->firstToken()) + if (int candidate = selector->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -2789,12 +2789,12 @@ unsigned ObjCSelectorExpressionAST::firstToken() const } /** \generated */ -unsigned ObjCSelectorExpressionAST::lastToken() const +int ObjCSelectorExpressionAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (selector) - if (unsigned candidate = selector->lastToken()) + if (int candidate = selector->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -2804,33 +2804,33 @@ unsigned ObjCSelectorExpressionAST::lastToken() const } /** \generated */ -unsigned ObjCSynchronizedStatementAST::firstToken() const +int ObjCSynchronizedStatementAST::firstToken() const { if (synchronized_token) return synchronized_token; if (lparen_token) return lparen_token; if (synchronized_object) - if (unsigned candidate = synchronized_object->firstToken()) + if (int candidate = synchronized_object->firstToken()) return candidate; if (rparen_token) return rparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ObjCSynchronizedStatementAST::lastToken() const +int ObjCSynchronizedStatementAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (synchronized_object) - if (unsigned candidate = synchronized_object->lastToken()) + if (int candidate = synchronized_object->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -2840,12 +2840,12 @@ unsigned ObjCSynchronizedStatementAST::lastToken() const } /** \generated */ -unsigned ObjCSynthesizedPropertiesDeclarationAST::firstToken() const +int ObjCSynthesizedPropertiesDeclarationAST::firstToken() const { if (synthesized_token) return synthesized_token; if (property_identifier_list) - if (unsigned candidate = property_identifier_list->firstToken()) + if (int candidate = property_identifier_list->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -2853,12 +2853,12 @@ unsigned ObjCSynthesizedPropertiesDeclarationAST::firstToken() const } /** \generated */ -unsigned ObjCSynthesizedPropertiesDeclarationAST::lastToken() const +int ObjCSynthesizedPropertiesDeclarationAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (property_identifier_list) - if (unsigned candidate = property_identifier_list->lastToken()) + if (int candidate = property_identifier_list->lastToken()) return candidate; if (synthesized_token) return synthesized_token + 1; @@ -2866,7 +2866,7 @@ unsigned ObjCSynthesizedPropertiesDeclarationAST::lastToken() const } /** \generated */ -unsigned ObjCSynthesizedPropertyAST::firstToken() const +int ObjCSynthesizedPropertyAST::firstToken() const { if (property_identifier_token) return property_identifier_token; @@ -2878,7 +2878,7 @@ unsigned ObjCSynthesizedPropertyAST::firstToken() const } /** \generated */ -unsigned ObjCSynthesizedPropertyAST::lastToken() const +int ObjCSynthesizedPropertyAST::lastToken() const { if (alias_identifier_token) return alias_identifier_token + 1; @@ -2890,14 +2890,14 @@ unsigned ObjCSynthesizedPropertyAST::lastToken() const } /** \generated */ -unsigned ObjCTypeNameAST::firstToken() const +int ObjCTypeNameAST::firstToken() const { if (lparen_token) return lparen_token; if (type_qualifier_token) return type_qualifier_token; if (type_id) - if (unsigned candidate = type_id->firstToken()) + if (int candidate = type_id->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -2905,12 +2905,12 @@ unsigned ObjCTypeNameAST::firstToken() const } /** \generated */ -unsigned ObjCTypeNameAST::lastToken() const +int ObjCTypeNameAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (type_id) - if (unsigned candidate = type_id->lastToken()) + if (int candidate = type_id->lastToken()) return candidate; if (type_qualifier_token) return type_qualifier_token + 1; @@ -2920,7 +2920,7 @@ unsigned ObjCTypeNameAST::lastToken() const } /** \generated */ -unsigned ObjCVisibilityDeclarationAST::firstToken() const +int ObjCVisibilityDeclarationAST::firstToken() const { if (visibility_token) return visibility_token; @@ -2928,7 +2928,7 @@ unsigned ObjCVisibilityDeclarationAST::firstToken() const } /** \generated */ -unsigned ObjCVisibilityDeclarationAST::lastToken() const +int ObjCVisibilityDeclarationAST::lastToken() const { if (visibility_token) return visibility_token + 1; @@ -2936,7 +2936,7 @@ unsigned ObjCVisibilityDeclarationAST::lastToken() const } /** \generated */ -unsigned OperatorAST::firstToken() const +int OperatorAST::firstToken() const { if (op_token) return op_token; @@ -2948,7 +2948,7 @@ unsigned OperatorAST::firstToken() const } /** \generated */ -unsigned OperatorAST::lastToken() const +int OperatorAST::lastToken() const { if (close_token) return close_token + 1; @@ -2960,21 +2960,21 @@ unsigned OperatorAST::lastToken() const } /** \generated */ -unsigned OperatorFunctionIdAST::firstToken() const +int OperatorFunctionIdAST::firstToken() const { if (operator_token) return operator_token; if (op) - if (unsigned candidate = op->firstToken()) + if (int candidate = op->firstToken()) return candidate; return 0; } /** \generated */ -unsigned OperatorFunctionIdAST::lastToken() const +int OperatorFunctionIdAST::lastToken() const { if (op) - if (unsigned candidate = op->lastToken()) + if (int candidate = op->lastToken()) return candidate; if (operator_token) return operator_token + 1; @@ -2982,44 +2982,44 @@ unsigned OperatorFunctionIdAST::lastToken() const } /** \generated */ -unsigned ParameterDeclarationAST::firstToken() const +int ParameterDeclarationAST::firstToken() const { if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; if (equal_token) return equal_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ParameterDeclarationAST::lastToken() const +int ParameterDeclarationAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (equal_token) return equal_token + 1; if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned ParameterDeclarationClauseAST::firstToken() const +int ParameterDeclarationClauseAST::firstToken() const { if (parameter_declaration_list) - if (unsigned candidate = parameter_declaration_list->firstToken()) + if (int candidate = parameter_declaration_list->firstToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token; @@ -3027,32 +3027,32 @@ unsigned ParameterDeclarationClauseAST::firstToken() const } /** \generated */ -unsigned ParameterDeclarationClauseAST::lastToken() const +int ParameterDeclarationClauseAST::lastToken() const { if (dot_dot_dot_token) return dot_dot_dot_token + 1; if (parameter_declaration_list) - if (unsigned candidate = parameter_declaration_list->lastToken()) + if (int candidate = parameter_declaration_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned PointerAST::firstToken() const +int PointerAST::firstToken() const { if (star_token) return star_token; if (cv_qualifier_list) - if (unsigned candidate = cv_qualifier_list->firstToken()) + if (int candidate = cv_qualifier_list->firstToken()) return candidate; return 0; } /** \generated */ -unsigned PointerAST::lastToken() const +int PointerAST::lastToken() const { if (cv_qualifier_list) - if (unsigned candidate = cv_qualifier_list->lastToken()) + if (int candidate = cv_qualifier_list->lastToken()) return candidate; if (star_token) return star_token + 1; @@ -3060,17 +3060,17 @@ unsigned PointerAST::lastToken() const } /** \generated */ -unsigned PointerToMemberAST::firstToken() const +int PointerToMemberAST::firstToken() const { if (global_scope_token) return global_scope_token; if (nested_name_specifier_list) - if (unsigned candidate = nested_name_specifier_list->firstToken()) + if (int candidate = nested_name_specifier_list->firstToken()) return candidate; if (star_token) return star_token; if (cv_qualifier_list) - if (unsigned candidate = cv_qualifier_list->firstToken()) + if (int candidate = cv_qualifier_list->firstToken()) return candidate; if (ref_qualifier_token) return ref_qualifier_token; @@ -3078,17 +3078,17 @@ unsigned PointerToMemberAST::firstToken() const } /** \generated */ -unsigned PointerToMemberAST::lastToken() const +int PointerToMemberAST::lastToken() const { if (ref_qualifier_token) return ref_qualifier_token + 1; if (cv_qualifier_list) - if (unsigned candidate = cv_qualifier_list->lastToken()) + if (int candidate = cv_qualifier_list->lastToken()) return candidate; if (star_token) return star_token + 1; if (nested_name_specifier_list) - if (unsigned candidate = nested_name_specifier_list->lastToken()) + if (int candidate = nested_name_specifier_list->lastToken()) return candidate; if (global_scope_token) return global_scope_token + 1; @@ -3096,10 +3096,10 @@ unsigned PointerToMemberAST::lastToken() const } /** \generated */ -unsigned PostIncrDecrAST::firstToken() const +int PostIncrDecrAST::firstToken() const { if (base_expression) - if (unsigned candidate = base_expression->firstToken()) + if (int candidate = base_expression->firstToken()) return candidate; if (incr_decr_token) return incr_decr_token; @@ -3107,25 +3107,25 @@ unsigned PostIncrDecrAST::firstToken() const } /** \generated */ -unsigned PostIncrDecrAST::lastToken() const +int PostIncrDecrAST::lastToken() const { if (incr_decr_token) return incr_decr_token + 1; if (base_expression) - if (unsigned candidate = base_expression->lastToken()) + if (int candidate = base_expression->lastToken()) return candidate; return 1; } /** \generated */ -unsigned QtEnumDeclarationAST::firstToken() const +int QtEnumDeclarationAST::firstToken() const { if (enum_specifier_token) return enum_specifier_token; if (lparen_token) return lparen_token; if (enumerator_list) - if (unsigned candidate = enumerator_list->firstToken()) + if (int candidate = enumerator_list->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -3133,12 +3133,12 @@ unsigned QtEnumDeclarationAST::firstToken() const } /** \generated */ -unsigned QtEnumDeclarationAST::lastToken() const +int QtEnumDeclarationAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (enumerator_list) - if (unsigned candidate = enumerator_list->lastToken()) + if (int candidate = enumerator_list->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -3148,14 +3148,14 @@ unsigned QtEnumDeclarationAST::lastToken() const } /** \generated */ -unsigned QtFlagsDeclarationAST::firstToken() const +int QtFlagsDeclarationAST::firstToken() const { if (flags_specifier_token) return flags_specifier_token; if (lparen_token) return lparen_token; if (flag_enums_list) - if (unsigned candidate = flag_enums_list->firstToken()) + if (int candidate = flag_enums_list->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -3163,12 +3163,12 @@ unsigned QtFlagsDeclarationAST::firstToken() const } /** \generated */ -unsigned QtFlagsDeclarationAST::lastToken() const +int QtFlagsDeclarationAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (flag_enums_list) - if (unsigned candidate = flag_enums_list->lastToken()) + if (int candidate = flag_enums_list->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -3178,38 +3178,38 @@ unsigned QtFlagsDeclarationAST::lastToken() const } /** \generated */ -unsigned QtInterfaceNameAST::firstToken() const +int QtInterfaceNameAST::firstToken() const { if (interface_name) - if (unsigned candidate = interface_name->firstToken()) + if (int candidate = interface_name->firstToken()) return candidate; if (constraint_list) - if (unsigned candidate = constraint_list->firstToken()) + if (int candidate = constraint_list->firstToken()) return candidate; return 0; } /** \generated */ -unsigned QtInterfaceNameAST::lastToken() const +int QtInterfaceNameAST::lastToken() const { if (constraint_list) - if (unsigned candidate = constraint_list->lastToken()) + if (int candidate = constraint_list->lastToken()) return candidate; if (interface_name) - if (unsigned candidate = interface_name->lastToken()) + if (int candidate = interface_name->lastToken()) return candidate; return 1; } /** \generated */ -unsigned QtInterfacesDeclarationAST::firstToken() const +int QtInterfacesDeclarationAST::firstToken() const { if (interfaces_token) return interfaces_token; if (lparen_token) return lparen_token; if (interface_name_list) - if (unsigned candidate = interface_name_list->firstToken()) + if (int candidate = interface_name_list->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -3217,12 +3217,12 @@ unsigned QtInterfacesDeclarationAST::firstToken() const } /** \generated */ -unsigned QtInterfacesDeclarationAST::lastToken() const +int QtInterfacesDeclarationAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (interface_name_list) - if (unsigned candidate = interface_name_list->lastToken()) + if (int candidate = interface_name_list->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -3232,14 +3232,14 @@ unsigned QtInterfacesDeclarationAST::lastToken() const } /** \generated */ -unsigned QtMemberDeclarationAST::firstToken() const +int QtMemberDeclarationAST::firstToken() const { if (q_token) return q_token; if (lparen_token) return lparen_token; if (type_id) - if (unsigned candidate = type_id->firstToken()) + if (int candidate = type_id->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -3247,12 +3247,12 @@ unsigned QtMemberDeclarationAST::firstToken() const } /** \generated */ -unsigned QtMemberDeclarationAST::lastToken() const +int QtMemberDeclarationAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (type_id) - if (unsigned candidate = type_id->lastToken()) + if (int candidate = type_id->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -3262,14 +3262,14 @@ unsigned QtMemberDeclarationAST::lastToken() const } /** \generated */ -unsigned QtMethodAST::firstToken() const +int QtMethodAST::firstToken() const { if (method_token) return method_token; if (lparen_token) return lparen_token; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -3277,12 +3277,12 @@ unsigned QtMethodAST::firstToken() const } /** \generated */ -unsigned QtMethodAST::lastToken() const +int QtMethodAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -3292,7 +3292,7 @@ unsigned QtMethodAST::lastToken() const } /** \generated */ -unsigned QtObjectTagAST::firstToken() const +int QtObjectTagAST::firstToken() const { if (q_object_token) return q_object_token; @@ -3300,7 +3300,7 @@ unsigned QtObjectTagAST::firstToken() const } /** \generated */ -unsigned QtObjectTagAST::lastToken() const +int QtObjectTagAST::lastToken() const { if (q_object_token) return q_object_token + 1; @@ -3308,7 +3308,7 @@ unsigned QtObjectTagAST::lastToken() const } /** \generated */ -unsigned QtPrivateSlotAST::firstToken() const +int QtPrivateSlotAST::firstToken() const { if (q_private_slot_token) return q_private_slot_token; @@ -3323,10 +3323,10 @@ unsigned QtPrivateSlotAST::firstToken() const if (comma_token) return comma_token; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -3334,15 +3334,15 @@ unsigned QtPrivateSlotAST::firstToken() const } /** \generated */ -unsigned QtPrivateSlotAST::lastToken() const +int QtPrivateSlotAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; if (comma_token) return comma_token + 1; @@ -3360,25 +3360,25 @@ unsigned QtPrivateSlotAST::lastToken() const } /** \generated */ -unsigned QtPropertyDeclarationAST::firstToken() const +int QtPropertyDeclarationAST::firstToken() const { if (property_specifier_token) return property_specifier_token; if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (comma_token) return comma_token; if (type_id) - if (unsigned candidate = type_id->firstToken()) + if (int candidate = type_id->firstToken()) return candidate; if (property_name) - if (unsigned candidate = property_name->firstToken()) + if (int candidate = property_name->firstToken()) return candidate; if (property_declaration_item_list) - if (unsigned candidate = property_declaration_item_list->firstToken()) + if (int candidate = property_declaration_item_list->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -3386,23 +3386,23 @@ unsigned QtPropertyDeclarationAST::firstToken() const } /** \generated */ -unsigned QtPropertyDeclarationAST::lastToken() const +int QtPropertyDeclarationAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (property_declaration_item_list) - if (unsigned candidate = property_declaration_item_list->lastToken()) + if (int candidate = property_declaration_item_list->lastToken()) return candidate; if (property_name) - if (unsigned candidate = property_name->lastToken()) + if (int candidate = property_name->lastToken()) return candidate; if (type_id) - if (unsigned candidate = type_id->lastToken()) + if (int candidate = type_id->lastToken()) return candidate; if (comma_token) return comma_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -3412,21 +3412,21 @@ unsigned QtPropertyDeclarationAST::lastToken() const } /** \generated */ -unsigned QtPropertyDeclarationItemAST::firstToken() const +int QtPropertyDeclarationItemAST::firstToken() const { if (item_name_token) return item_name_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned QtPropertyDeclarationItemAST::lastToken() const +int QtPropertyDeclarationItemAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (item_name_token) return item_name_token + 1; @@ -3434,27 +3434,27 @@ unsigned QtPropertyDeclarationItemAST::lastToken() const } /** \generated */ -unsigned QualifiedNameAST::firstToken() const +int QualifiedNameAST::firstToken() const { if (global_scope_token) return global_scope_token; if (nested_name_specifier_list) - if (unsigned candidate = nested_name_specifier_list->firstToken()) + if (int candidate = nested_name_specifier_list->firstToken()) return candidate; if (unqualified_name) - if (unsigned candidate = unqualified_name->firstToken()) + if (int candidate = unqualified_name->firstToken()) return candidate; return 0; } /** \generated */ -unsigned QualifiedNameAST::lastToken() const +int QualifiedNameAST::lastToken() const { if (unqualified_name) - if (unsigned candidate = unqualified_name->lastToken()) + if (int candidate = unqualified_name->lastToken()) return candidate; if (nested_name_specifier_list) - if (unsigned candidate = nested_name_specifier_list->lastToken()) + if (int candidate = nested_name_specifier_list->lastToken()) return candidate; if (global_scope_token) return global_scope_token + 1; @@ -3462,7 +3462,7 @@ unsigned QualifiedNameAST::lastToken() const } /** \generated */ -unsigned ReferenceAST::firstToken() const +int ReferenceAST::firstToken() const { if (reference_token) return reference_token; @@ -3470,7 +3470,7 @@ unsigned ReferenceAST::firstToken() const } /** \generated */ -unsigned ReferenceAST::lastToken() const +int ReferenceAST::lastToken() const { if (reference_token) return reference_token + 1; @@ -3478,12 +3478,12 @@ unsigned ReferenceAST::lastToken() const } /** \generated */ -unsigned ReturnStatementAST::firstToken() const +int ReturnStatementAST::firstToken() const { if (return_token) return return_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -3491,12 +3491,12 @@ unsigned ReturnStatementAST::firstToken() const } /** \generated */ -unsigned ReturnStatementAST::lastToken() const +int ReturnStatementAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (return_token) return return_token + 1; @@ -3504,15 +3504,15 @@ unsigned ReturnStatementAST::lastToken() const } /** \generated */ -unsigned SimpleDeclarationAST::firstToken() const +int SimpleDeclarationAST::firstToken() const { if (qt_invokable_token) return qt_invokable_token; if (decl_specifier_list) - if (unsigned candidate = decl_specifier_list->firstToken()) + if (int candidate = decl_specifier_list->firstToken()) return candidate; if (declarator_list) - if (unsigned candidate = declarator_list->firstToken()) + if (int candidate = declarator_list->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -3520,15 +3520,15 @@ unsigned SimpleDeclarationAST::firstToken() const } /** \generated */ -unsigned SimpleDeclarationAST::lastToken() const +int SimpleDeclarationAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (declarator_list) - if (unsigned candidate = declarator_list->lastToken()) + if (int candidate = declarator_list->lastToken()) return candidate; if (decl_specifier_list) - if (unsigned candidate = decl_specifier_list->lastToken()) + if (int candidate = decl_specifier_list->lastToken()) return candidate; if (qt_invokable_token) return qt_invokable_token + 1; @@ -3536,7 +3536,7 @@ unsigned SimpleDeclarationAST::lastToken() const } /** \generated */ -unsigned SimpleNameAST::firstToken() const +int SimpleNameAST::firstToken() const { if (identifier_token) return identifier_token; @@ -3544,7 +3544,7 @@ unsigned SimpleNameAST::firstToken() const } /** \generated */ -unsigned SimpleNameAST::lastToken() const +int SimpleNameAST::lastToken() const { if (identifier_token) return identifier_token + 1; @@ -3552,7 +3552,7 @@ unsigned SimpleNameAST::lastToken() const } /** \generated */ -unsigned SimpleSpecifierAST::firstToken() const +int SimpleSpecifierAST::firstToken() const { if (specifier_token) return specifier_token; @@ -3560,7 +3560,7 @@ unsigned SimpleSpecifierAST::firstToken() const } /** \generated */ -unsigned SimpleSpecifierAST::lastToken() const +int SimpleSpecifierAST::lastToken() const { if (specifier_token) return specifier_token + 1; @@ -3568,7 +3568,7 @@ unsigned SimpleSpecifierAST::lastToken() const } /** \generated */ -unsigned SizeofExpressionAST::firstToken() const +int SizeofExpressionAST::firstToken() const { if (sizeof_token) return sizeof_token; @@ -3577,7 +3577,7 @@ unsigned SizeofExpressionAST::firstToken() const if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -3585,12 +3585,12 @@ unsigned SizeofExpressionAST::firstToken() const } /** \generated */ -unsigned SizeofExpressionAST::lastToken() const +int SizeofExpressionAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -3602,21 +3602,21 @@ unsigned SizeofExpressionAST::lastToken() const } /** \generated */ -unsigned StringLiteralAST::firstToken() const +int StringLiteralAST::firstToken() const { if (literal_token) return literal_token; if (next) - if (unsigned candidate = next->firstToken()) + if (int candidate = next->firstToken()) return candidate; return 0; } /** \generated */ -unsigned StringLiteralAST::lastToken() const +int StringLiteralAST::lastToken() const { if (next) - if (unsigned candidate = next->lastToken()) + if (int candidate = next->lastToken()) return candidate; if (literal_token) return literal_token + 1; @@ -3624,33 +3624,33 @@ unsigned StringLiteralAST::lastToken() const } /** \generated */ -unsigned SwitchStatementAST::firstToken() const +int SwitchStatementAST::firstToken() const { if (switch_token) return switch_token; if (lparen_token) return lparen_token; if (condition) - if (unsigned candidate = condition->firstToken()) + if (int candidate = condition->firstToken()) return candidate; if (rparen_token) return rparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned SwitchStatementAST::lastToken() const +int SwitchStatementAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (condition) - if (unsigned candidate = condition->lastToken()) + if (int candidate = condition->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -3660,7 +3660,7 @@ unsigned SwitchStatementAST::lastToken() const } /** \generated */ -unsigned TemplateDeclarationAST::firstToken() const +int TemplateDeclarationAST::firstToken() const { if (export_token) return export_token; @@ -3669,26 +3669,26 @@ unsigned TemplateDeclarationAST::firstToken() const if (less_token) return less_token; if (template_parameter_list) - if (unsigned candidate = template_parameter_list->firstToken()) + if (int candidate = template_parameter_list->firstToken()) return candidate; if (greater_token) return greater_token; if (declaration) - if (unsigned candidate = declaration->firstToken()) + if (int candidate = declaration->firstToken()) return candidate; return 0; } /** \generated */ -unsigned TemplateDeclarationAST::lastToken() const +int TemplateDeclarationAST::lastToken() const { if (declaration) - if (unsigned candidate = declaration->lastToken()) + if (int candidate = declaration->lastToken()) return candidate; if (greater_token) return greater_token + 1; if (template_parameter_list) - if (unsigned candidate = template_parameter_list->lastToken()) + if (int candidate = template_parameter_list->lastToken()) return candidate; if (less_token) return less_token + 1; @@ -3700,7 +3700,7 @@ unsigned TemplateDeclarationAST::lastToken() const } /** \generated */ -unsigned TemplateIdAST::firstToken() const +int TemplateIdAST::firstToken() const { if (template_token) return template_token; @@ -3709,7 +3709,7 @@ unsigned TemplateIdAST::firstToken() const if (less_token) return less_token; if (template_argument_list) - if (unsigned candidate = template_argument_list->firstToken()) + if (int candidate = template_argument_list->firstToken()) return candidate; if (greater_token) return greater_token; @@ -3717,12 +3717,12 @@ unsigned TemplateIdAST::firstToken() const } /** \generated */ -unsigned TemplateIdAST::lastToken() const +int TemplateIdAST::lastToken() const { if (greater_token) return greater_token + 1; if (template_argument_list) - if (unsigned candidate = template_argument_list->lastToken()) + if (int candidate = template_argument_list->lastToken()) return candidate; if (less_token) return less_token + 1; @@ -3734,14 +3734,14 @@ unsigned TemplateIdAST::lastToken() const } /** \generated */ -unsigned TemplateTypeParameterAST::firstToken() const +int TemplateTypeParameterAST::firstToken() const { if (template_token) return template_token; if (less_token) return less_token; if (template_parameter_list) - if (unsigned candidate = template_parameter_list->firstToken()) + if (int candidate = template_parameter_list->firstToken()) return candidate; if (greater_token) return greater_token; @@ -3750,26 +3750,26 @@ unsigned TemplateTypeParameterAST::firstToken() const if (dot_dot_dot_token) return dot_dot_dot_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (equal_token) return equal_token; if (type_id) - if (unsigned candidate = type_id->firstToken()) + if (int candidate = type_id->firstToken()) return candidate; return 0; } /** \generated */ -unsigned TemplateTypeParameterAST::lastToken() const +int TemplateTypeParameterAST::lastToken() const { if (type_id) - if (unsigned candidate = type_id->lastToken()) + if (int candidate = type_id->lastToken()) return candidate; if (equal_token) return equal_token + 1; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token + 1; @@ -3778,7 +3778,7 @@ unsigned TemplateTypeParameterAST::lastToken() const if (greater_token) return greater_token + 1; if (template_parameter_list) - if (unsigned candidate = template_parameter_list->lastToken()) + if (int candidate = template_parameter_list->lastToken()) return candidate; if (less_token) return less_token + 1; @@ -3788,7 +3788,7 @@ unsigned TemplateTypeParameterAST::lastToken() const } /** \generated */ -unsigned ThisExpressionAST::firstToken() const +int ThisExpressionAST::firstToken() const { if (this_token) return this_token; @@ -3796,7 +3796,7 @@ unsigned ThisExpressionAST::firstToken() const } /** \generated */ -unsigned ThisExpressionAST::lastToken() const +int ThisExpressionAST::lastToken() const { if (this_token) return this_token + 1; @@ -3804,21 +3804,21 @@ unsigned ThisExpressionAST::lastToken() const } /** \generated */ -unsigned ThrowExpressionAST::firstToken() const +int ThrowExpressionAST::firstToken() const { if (throw_token) return throw_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned ThrowExpressionAST::lastToken() const +int ThrowExpressionAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (throw_token) return throw_token + 1; @@ -3826,33 +3826,33 @@ unsigned ThrowExpressionAST::lastToken() const } /** \generated */ -unsigned TrailingReturnTypeAST::firstToken() const +int TrailingReturnTypeAST::firstToken() const { if (arrow_token) return arrow_token; if (attributes) - if (unsigned candidate = attributes->firstToken()) + if (int candidate = attributes->firstToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; return 0; } /** \generated */ -unsigned TrailingReturnTypeAST::lastToken() const +int TrailingReturnTypeAST::lastToken() const { if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; if (attributes) - if (unsigned candidate = attributes->lastToken()) + if (int candidate = attributes->lastToken()) return candidate; if (arrow_token) return arrow_token + 1; @@ -3860,45 +3860,45 @@ unsigned TrailingReturnTypeAST::lastToken() const } /** \generated */ -unsigned TranslationUnitAST::firstToken() const +int TranslationUnitAST::firstToken() const { if (declaration_list) - if (unsigned candidate = declaration_list->firstToken()) + if (int candidate = declaration_list->firstToken()) return candidate; return 0; } /** \generated */ -unsigned TranslationUnitAST::lastToken() const +int TranslationUnitAST::lastToken() const { if (declaration_list) - if (unsigned candidate = declaration_list->lastToken()) + if (int candidate = declaration_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned TryBlockStatementAST::firstToken() const +int TryBlockStatementAST::firstToken() const { if (try_token) return try_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; if (catch_clause_list) - if (unsigned candidate = catch_clause_list->firstToken()) + if (int candidate = catch_clause_list->firstToken()) return candidate; return 0; } /** \generated */ -unsigned TryBlockStatementAST::lastToken() const +int TryBlockStatementAST::lastToken() const { if (catch_clause_list) - if (unsigned candidate = catch_clause_list->lastToken()) + if (int candidate = catch_clause_list->lastToken()) return candidate; if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (try_token) return try_token + 1; @@ -3906,62 +3906,62 @@ unsigned TryBlockStatementAST::lastToken() const } /** \generated */ -unsigned TypeConstructorCallAST::firstToken() const +int TypeConstructorCallAST::firstToken() const { if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned TypeConstructorCallAST::lastToken() const +int TypeConstructorCallAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned TypeIdAST::firstToken() const +int TypeIdAST::firstToken() const { if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; return 0; } /** \generated */ -unsigned TypeIdAST::lastToken() const +int TypeIdAST::lastToken() const { if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned TypeidExpressionAST::firstToken() const +int TypeidExpressionAST::firstToken() const { if (typeid_token) return typeid_token; if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -3969,12 +3969,12 @@ unsigned TypeidExpressionAST::firstToken() const } /** \generated */ -unsigned TypeidExpressionAST::lastToken() const +int TypeidExpressionAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -3984,27 +3984,27 @@ unsigned TypeidExpressionAST::lastToken() const } /** \generated */ -unsigned TypenameCallExpressionAST::firstToken() const +int TypenameCallExpressionAST::firstToken() const { if (typename_token) return typename_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned TypenameCallExpressionAST::lastToken() const +int TypenameCallExpressionAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (typename_token) return typename_token + 1; @@ -4012,33 +4012,33 @@ unsigned TypenameCallExpressionAST::lastToken() const } /** \generated */ -unsigned TypenameTypeParameterAST::firstToken() const +int TypenameTypeParameterAST::firstToken() const { if (classkey_token) return classkey_token; if (dot_dot_dot_token) return dot_dot_dot_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (equal_token) return equal_token; if (type_id) - if (unsigned candidate = type_id->firstToken()) + if (int candidate = type_id->firstToken()) return candidate; return 0; } /** \generated */ -unsigned TypenameTypeParameterAST::lastToken() const +int TypenameTypeParameterAST::lastToken() const { if (type_id) - if (unsigned candidate = type_id->lastToken()) + if (int candidate = type_id->lastToken()) return candidate; if (equal_token) return equal_token + 1; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (dot_dot_dot_token) return dot_dot_dot_token + 1; @@ -4048,14 +4048,14 @@ unsigned TypenameTypeParameterAST::lastToken() const } /** \generated */ -unsigned TypeofSpecifierAST::firstToken() const +int TypeofSpecifierAST::firstToken() const { if (typeof_token) return typeof_token; if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -4063,12 +4063,12 @@ unsigned TypeofSpecifierAST::firstToken() const } /** \generated */ -unsigned TypeofSpecifierAST::lastToken() const +int TypeofSpecifierAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -4078,21 +4078,21 @@ unsigned TypeofSpecifierAST::lastToken() const } /** \generated */ -unsigned UnaryExpressionAST::firstToken() const +int UnaryExpressionAST::firstToken() const { if (unary_op_token) return unary_op_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned UnaryExpressionAST::lastToken() const +int UnaryExpressionAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (unary_op_token) return unary_op_token + 1; @@ -4100,14 +4100,14 @@ unsigned UnaryExpressionAST::lastToken() const } /** \generated */ -unsigned UsingAST::firstToken() const +int UsingAST::firstToken() const { if (using_token) return using_token; if (typename_token) return typename_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -4115,12 +4115,12 @@ unsigned UsingAST::firstToken() const } /** \generated */ -unsigned UsingAST::lastToken() const +int UsingAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (typename_token) return typename_token + 1; @@ -4130,14 +4130,14 @@ unsigned UsingAST::lastToken() const } /** \generated */ -unsigned UsingDirectiveAST::firstToken() const +int UsingDirectiveAST::firstToken() const { if (using_token) return using_token; if (namespace_token) return namespace_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -4145,12 +4145,12 @@ unsigned UsingDirectiveAST::firstToken() const } /** \generated */ -unsigned UsingDirectiveAST::lastToken() const +int UsingDirectiveAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (namespace_token) return namespace_token + 1; @@ -4160,33 +4160,33 @@ unsigned UsingDirectiveAST::lastToken() const } /** \generated */ -unsigned WhileStatementAST::firstToken() const +int WhileStatementAST::firstToken() const { if (while_token) return while_token; if (lparen_token) return lparen_token; if (condition) - if (unsigned candidate = condition->firstToken()) + if (int candidate = condition->firstToken()) return candidate; if (rparen_token) return rparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned WhileStatementAST::lastToken() const +int WhileStatementAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (condition) - if (unsigned candidate = condition->lastToken()) + if (int candidate = condition->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -4196,14 +4196,14 @@ unsigned WhileStatementAST::lastToken() const } /** \generated */ -unsigned GnuAttributeSpecifierAST::lastToken() const +int GnuAttributeSpecifierAST::lastToken() const { if (second_rparen_token) return second_rparen_token + 1; if (first_rparen_token) return first_rparen_token + 1; if (attribute_list) - if (unsigned candidate = attribute_list->lastToken()) + if (int candidate = attribute_list->lastToken()) return candidate; if (second_lparen_token) return second_lparen_token + 1; @@ -4215,7 +4215,7 @@ unsigned GnuAttributeSpecifierAST::lastToken() const } /** \generated */ -unsigned PointerLiteralAST::firstToken() const +int PointerLiteralAST::firstToken() const { if (literal_token) return literal_token; @@ -4223,7 +4223,7 @@ unsigned PointerLiteralAST::firstToken() const } /** \generated */ -unsigned PointerLiteralAST::lastToken() const +int PointerLiteralAST::lastToken() const { if (literal_token) return literal_token + 1; @@ -4231,14 +4231,14 @@ unsigned PointerLiteralAST::lastToken() const } /** \generated */ -unsigned NoExceptSpecificationAST::firstToken() const +int NoExceptSpecificationAST::firstToken() const { if (noexcept_token) return noexcept_token; if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -4246,12 +4246,12 @@ unsigned NoExceptSpecificationAST::firstToken() const } /** \generated */ -unsigned NoExceptSpecificationAST::lastToken() const +int NoExceptSpecificationAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -4261,19 +4261,19 @@ unsigned NoExceptSpecificationAST::lastToken() const } /** \generated */ -unsigned StaticAssertDeclarationAST::firstToken() const +int StaticAssertDeclarationAST::firstToken() const { if (static_assert_token) return static_assert_token; if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (comma_token) return comma_token; if (string_literal) - if (unsigned candidate = string_literal->firstToken()) + if (int candidate = string_literal->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -4283,19 +4283,19 @@ unsigned StaticAssertDeclarationAST::firstToken() const } /** \generated */ -unsigned StaticAssertDeclarationAST::lastToken() const +int StaticAssertDeclarationAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (rparen_token) return rparen_token + 1; if (string_literal) - if (unsigned candidate = string_literal->lastToken()) + if (int candidate = string_literal->lastToken()) return candidate; if (comma_token) return comma_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -4305,14 +4305,14 @@ unsigned StaticAssertDeclarationAST::lastToken() const } /** \generated */ -unsigned DecltypeSpecifierAST::firstToken() const +int DecltypeSpecifierAST::firstToken() const { if (decltype_token) return decltype_token; if (lparen_token) return lparen_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -4320,12 +4320,12 @@ unsigned DecltypeSpecifierAST::firstToken() const } /** \generated */ -unsigned DecltypeSpecifierAST::lastToken() const +int DecltypeSpecifierAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -4335,49 +4335,49 @@ unsigned DecltypeSpecifierAST::lastToken() const } /** \generated */ -unsigned RangeBasedForStatementAST::firstToken() const +int RangeBasedForStatementAST::firstToken() const { if (for_token) return for_token; if (lparen_token) return lparen_token; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->firstToken()) + if (int candidate = type_specifier_list->firstToken()) return candidate; if (declarator) - if (unsigned candidate = declarator->firstToken()) + if (int candidate = declarator->firstToken()) return candidate; if (colon_token) return colon_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rparen_token) return rparen_token; if (statement) - if (unsigned candidate = statement->firstToken()) + if (int candidate = statement->firstToken()) return candidate; return 0; } /** \generated */ -unsigned RangeBasedForStatementAST::lastToken() const +int RangeBasedForStatementAST::lastToken() const { if (statement) - if (unsigned candidate = statement->lastToken()) + if (int candidate = statement->lastToken()) return candidate; if (rparen_token) return rparen_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (colon_token) return colon_token + 1; if (declarator) - if (unsigned candidate = declarator->lastToken()) + if (int candidate = declarator->lastToken()) return candidate; if (type_specifier_list) - if (unsigned candidate = type_specifier_list->lastToken()) + if (int candidate = type_specifier_list->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -4387,14 +4387,14 @@ unsigned RangeBasedForStatementAST::lastToken() const } /** \generated */ -unsigned AlignofExpressionAST::firstToken() const +int AlignofExpressionAST::firstToken() const { if (alignof_token) return alignof_token; if (lparen_token) return lparen_token; if (typeId) - if (unsigned candidate = typeId->firstToken()) + if (int candidate = typeId->firstToken()) return candidate; if (rparen_token) return rparen_token; @@ -4402,12 +4402,12 @@ unsigned AlignofExpressionAST::firstToken() const } /** \generated */ -unsigned AlignofExpressionAST::lastToken() const +int AlignofExpressionAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (typeId) - if (unsigned candidate = typeId->lastToken()) + if (int candidate = typeId->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -4417,17 +4417,17 @@ unsigned AlignofExpressionAST::lastToken() const } /** \generated */ -unsigned AliasDeclarationAST::firstToken() const +int AliasDeclarationAST::firstToken() const { if (using_token) return using_token; if (name) - if (unsigned candidate = name->firstToken()) + if (int candidate = name->firstToken()) return candidate; if (equal_token) return equal_token; if (typeId) - if (unsigned candidate = typeId->firstToken()) + if (int candidate = typeId->firstToken()) return candidate; if (semicolon_token) return semicolon_token; @@ -4435,17 +4435,17 @@ unsigned AliasDeclarationAST::firstToken() const } /** \generated */ -unsigned AliasDeclarationAST::lastToken() const +int AliasDeclarationAST::lastToken() const { if (semicolon_token) return semicolon_token + 1; if (typeId) - if (unsigned candidate = typeId->lastToken()) + if (int candidate = typeId->lastToken()) return candidate; if (equal_token) return equal_token + 1; if (name) - if (unsigned candidate = name->lastToken()) + if (int candidate = name->lastToken()) return candidate; if (using_token) return using_token + 1; @@ -4453,40 +4453,40 @@ unsigned AliasDeclarationAST::lastToken() const } /** \generated */ -unsigned DesignatedInitializerAST::firstToken() const +int DesignatedInitializerAST::firstToken() const { if (designator_list) - if (unsigned candidate = designator_list->firstToken()) + if (int candidate = designator_list->firstToken()) return candidate; if (equal_token) return equal_token; if (initializer) - if (unsigned candidate = initializer->firstToken()) + if (int candidate = initializer->firstToken()) return candidate; return 0; } /** \generated */ -unsigned DesignatedInitializerAST::lastToken() const +int DesignatedInitializerAST::lastToken() const { if (initializer) - if (unsigned candidate = initializer->lastToken()) + if (int candidate = initializer->lastToken()) return candidate; if (equal_token) return equal_token + 1; if (designator_list) - if (unsigned candidate = designator_list->lastToken()) + if (int candidate = designator_list->lastToken()) return candidate; return 1; } /** \generated */ -unsigned BracketDesignatorAST::firstToken() const +int BracketDesignatorAST::firstToken() const { if (lbracket_token) return lbracket_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; if (rbracket_token) return rbracket_token; @@ -4494,12 +4494,12 @@ unsigned BracketDesignatorAST::firstToken() const } /** \generated */ -unsigned BracketDesignatorAST::lastToken() const +int BracketDesignatorAST::lastToken() const { if (rbracket_token) return rbracket_token + 1; if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (lbracket_token) return lbracket_token + 1; @@ -4507,7 +4507,7 @@ unsigned BracketDesignatorAST::lastToken() const } /** \generated */ -unsigned DotDesignatorAST::firstToken() const +int DotDesignatorAST::firstToken() const { if (dot_token) return dot_token; @@ -4517,7 +4517,7 @@ unsigned DotDesignatorAST::firstToken() const } /** \generated */ -unsigned DotDesignatorAST::lastToken() const +int DotDesignatorAST::lastToken() const { if (identifier_token) return identifier_token + 1; @@ -4527,14 +4527,14 @@ unsigned DotDesignatorAST::lastToken() const } /** \generated */ -unsigned AlignmentSpecifierAST::firstToken() const +int AlignmentSpecifierAST::firstToken() const { if (align_token) return align_token; if (lparen_token) return lparen_token; if (typeIdExprOrAlignmentExpr) - if (unsigned candidate = typeIdExprOrAlignmentExpr->firstToken()) + if (int candidate = typeIdExprOrAlignmentExpr->firstToken()) return candidate; if (ellipses_token) return ellipses_token; @@ -4544,14 +4544,14 @@ unsigned AlignmentSpecifierAST::firstToken() const } /** \generated */ -unsigned AlignmentSpecifierAST::lastToken() const +int AlignmentSpecifierAST::lastToken() const { if (rparen_token) return rparen_token + 1; if (ellipses_token) return ellipses_token + 1; if (typeIdExprOrAlignmentExpr) - if (unsigned candidate = typeIdExprOrAlignmentExpr->lastToken()) + if (int candidate = typeIdExprOrAlignmentExpr->lastToken()) return candidate; if (lparen_token) return lparen_token + 1; @@ -4561,21 +4561,21 @@ unsigned AlignmentSpecifierAST::lastToken() const } /** \generated */ -unsigned NoExceptOperatorExpressionAST::firstToken() const +int NoExceptOperatorExpressionAST::firstToken() const { if (noexcept_token) return noexcept_token; if (expression) - if (unsigned candidate = expression->firstToken()) + if (int candidate = expression->firstToken()) return candidate; return 0; } /** \generated */ -unsigned NoExceptOperatorExpressionAST::lastToken() const +int NoExceptOperatorExpressionAST::lastToken() const { if (expression) - if (unsigned candidate = expression->lastToken()) + if (int candidate = expression->lastToken()) return candidate; if (noexcept_token) return noexcept_token + 1; diff --git a/src/libs/3rdparty/cplusplus/AST.h b/src/libs/3rdparty/cplusplus/AST.h index fc6750320b..d013afa544 100644 --- a/src/libs/3rdparty/cplusplus/AST.h +++ b/src/libs/3rdparty/cplusplus/AST.h @@ -41,7 +41,7 @@ public: : value(value), next(0) { } - unsigned firstToken() const + int firstToken() const { if (value) return value->firstToken(); @@ -50,7 +50,7 @@ public: return 0; } - unsigned lastToken() const + int lastToken() const { Tptr lv = lastValue(); @@ -118,8 +118,8 @@ public: return false; } - virtual unsigned firstToken() const = 0; - virtual unsigned lastToken() const = 0; + virtual int firstToken() const = 0; + virtual int lastToken() const = 0; virtual AST *clone(MemoryPool *pool) const = 0; @@ -397,8 +397,8 @@ public: class CPLUSPLUS_EXPORT ObjCSelectorArgumentAST: public AST { public: - unsigned name_token; - unsigned colon_token; + int name_token; + int colon_token; public: ObjCSelectorArgumentAST() @@ -408,8 +408,8 @@ public: virtual ObjCSelectorArgumentAST *asObjCSelectorArgument() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCSelectorArgumentAST *clone(MemoryPool *pool) const; @@ -430,8 +430,8 @@ public: virtual ObjCSelectorAST *asObjCSelector() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCSelectorAST *clone(MemoryPool *pool) const; @@ -443,7 +443,7 @@ protected: class CPLUSPLUS_EXPORT SimpleSpecifierAST: public SpecifierAST { public: - unsigned specifier_token; + int specifier_token; public: SimpleSpecifierAST() @@ -452,8 +452,8 @@ public: virtual SimpleSpecifierAST *asSimpleSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual SimpleSpecifierAST *clone(MemoryPool *pool) const; @@ -476,11 +476,11 @@ public: class CPLUSPLUS_EXPORT AlignmentSpecifierAST: public AttributeSpecifierAST { public: - unsigned align_token; - unsigned lparen_token; + int align_token; + int lparen_token; ExpressionAST *typeIdExprOrAlignmentExpr; - unsigned ellipses_token; - unsigned rparen_token; + int ellipses_token; + int rparen_token; public: AlignmentSpecifierAST() @@ -493,8 +493,8 @@ public: virtual AlignmentSpecifierAST *asAlignmentSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual AlignmentSpecifierAST *clone(MemoryPool *pool) const; @@ -507,12 +507,12 @@ protected: class CPLUSPLUS_EXPORT GnuAttributeSpecifierAST: public AttributeSpecifierAST { public: - unsigned attribute_token; - unsigned first_lparen_token; - unsigned second_lparen_token; + int attribute_token; + int first_lparen_token; + int second_lparen_token; GnuAttributeListAST *attribute_list; - unsigned first_rparen_token; - unsigned second_rparen_token; + int first_rparen_token; + int second_rparen_token; public: GnuAttributeSpecifierAST() @@ -526,8 +526,8 @@ public: virtual GnuAttributeSpecifierAST *asGnuAttributeSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual GnuAttributeSpecifierAST *clone(MemoryPool *pool) const; @@ -539,11 +539,11 @@ protected: class CPLUSPLUS_EXPORT GnuAttributeAST: public AST { public: - unsigned identifier_token; - unsigned lparen_token; - unsigned tag_token; + int identifier_token; + int lparen_token; + int tag_token; ExpressionListAST *expression_list; - unsigned rparen_token; + int rparen_token; public: GnuAttributeAST() @@ -556,8 +556,8 @@ public: virtual GnuAttributeAST *asGnuAttribute() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual GnuAttributeAST *clone(MemoryPool *pool) const; @@ -569,10 +569,10 @@ protected: class CPLUSPLUS_EXPORT TypeofSpecifierAST: public SpecifierAST { public: - unsigned typeof_token; - unsigned lparen_token; + int typeof_token; + int lparen_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; public: TypeofSpecifierAST() @@ -584,8 +584,8 @@ public: virtual TypeofSpecifierAST *asTypeofSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TypeofSpecifierAST *clone(MemoryPool *pool) const; @@ -597,10 +597,10 @@ protected: class CPLUSPLUS_EXPORT DecltypeSpecifierAST: public SpecifierAST { public: - unsigned decltype_token; - unsigned lparen_token; + int decltype_token; + int lparen_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; public: DecltypeSpecifierAST() @@ -612,8 +612,8 @@ public: virtual DecltypeSpecifierAST *asDecltypeSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DecltypeSpecifierAST *clone(MemoryPool *pool) const; @@ -630,7 +630,7 @@ public: CoreDeclaratorAST *core_declarator; PostfixDeclaratorListAST *postfix_declarator_list; SpecifierListAST *post_attribute_list; - unsigned equal_token; + int equal_token; ExpressionAST *initializer; public: @@ -646,8 +646,8 @@ public: virtual DeclaratorAST *asDeclarator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DeclaratorAST *clone(MemoryPool *pool) const; @@ -659,10 +659,10 @@ protected: class CPLUSPLUS_EXPORT SimpleDeclarationAST: public DeclarationAST { public: - unsigned qt_invokable_token; + int qt_invokable_token; SpecifierListAST *decl_specifier_list; DeclaratorListAST *declarator_list; - unsigned semicolon_token; + int semicolon_token; public: List<Symbol *> *symbols; @@ -678,8 +678,8 @@ public: virtual SimpleDeclarationAST *asSimpleDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual SimpleDeclarationAST *clone(MemoryPool *pool) const; @@ -691,7 +691,7 @@ protected: class CPLUSPLUS_EXPORT EmptyDeclarationAST: public DeclarationAST { public: - unsigned semicolon_token; + int semicolon_token; public: EmptyDeclarationAST() @@ -700,8 +700,8 @@ public: virtual EmptyDeclarationAST *asEmptyDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual EmptyDeclarationAST *clone(MemoryPool *pool) const; @@ -713,9 +713,9 @@ protected: class CPLUSPLUS_EXPORT AccessDeclarationAST: public DeclarationAST { public: - unsigned access_specifier_token; - unsigned slots_token; - unsigned colon_token; + int access_specifier_token; + int slots_token; + int colon_token; public: AccessDeclarationAST() @@ -726,8 +726,8 @@ public: virtual AccessDeclarationAST *asAccessDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual AccessDeclarationAST *clone(MemoryPool *pool) const; @@ -739,7 +739,7 @@ protected: class CPLUSPLUS_EXPORT QtObjectTagAST: public DeclarationAST { public: - unsigned q_object_token; + int q_object_token; public: QtObjectTagAST() @@ -748,8 +748,8 @@ public: virtual QtObjectTagAST *asQtObjectTag() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtObjectTagAST *clone(MemoryPool *pool) const; @@ -761,15 +761,15 @@ protected: class CPLUSPLUS_EXPORT QtPrivateSlotAST: public DeclarationAST { public: - unsigned q_private_slot_token; - unsigned lparen_token; - unsigned dptr_token; - unsigned dptr_lparen_token; - unsigned dptr_rparen_token; - unsigned comma_token; + int q_private_slot_token; + int lparen_token; + int dptr_token; + int dptr_lparen_token; + int dptr_rparen_token; + int comma_token; SpecifierListAST *type_specifier_list; DeclaratorAST *declarator; - unsigned rparen_token; + int rparen_token; public: QtPrivateSlotAST() @@ -786,8 +786,8 @@ public: virtual QtPrivateSlotAST *asQtPrivateSlot() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtPrivateSlotAST *clone(MemoryPool *pool) const; @@ -799,7 +799,7 @@ protected: class QtPropertyDeclarationItemAST: public AST { public: - unsigned item_name_token; + int item_name_token; ExpressionAST *expression; public: @@ -810,8 +810,8 @@ public: virtual QtPropertyDeclarationItemAST *asQtPropertyDeclarationItem() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtPropertyDeclarationItemAST *clone(MemoryPool *pool) const; @@ -823,14 +823,14 @@ protected: class CPLUSPLUS_EXPORT QtPropertyDeclarationAST: public DeclarationAST { public: - unsigned property_specifier_token; - unsigned lparen_token; + int property_specifier_token; + int lparen_token; ExpressionAST *expression; // for Q_PRIVATE_PROPERTY(expression, ...) - unsigned comma_token; + int comma_token; ExpressionAST *type_id; NameAST *property_name; QtPropertyDeclarationItemListAST *property_declaration_item_list; - unsigned rparen_token; + int rparen_token; public: QtPropertyDeclarationAST() @@ -846,8 +846,8 @@ public: virtual QtPropertyDeclarationAST *asQtPropertyDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtPropertyDeclarationAST *clone(MemoryPool *pool) const; @@ -859,10 +859,10 @@ protected: class CPLUSPLUS_EXPORT QtEnumDeclarationAST: public DeclarationAST { public: - unsigned enum_specifier_token; - unsigned lparen_token; + int enum_specifier_token; + int lparen_token; NameListAST *enumerator_list; - unsigned rparen_token; + int rparen_token; public: QtEnumDeclarationAST() @@ -874,8 +874,8 @@ public: virtual QtEnumDeclarationAST *asQtEnumDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtEnumDeclarationAST *clone(MemoryPool *pool) const; @@ -887,10 +887,10 @@ protected: class CPLUSPLUS_EXPORT QtFlagsDeclarationAST: public DeclarationAST { public: - unsigned flags_specifier_token; - unsigned lparen_token; + int flags_specifier_token; + int lparen_token; NameListAST *flag_enums_list; - unsigned rparen_token; + int rparen_token; public: QtFlagsDeclarationAST() @@ -902,8 +902,8 @@ public: virtual QtFlagsDeclarationAST *asQtFlagsDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtFlagsDeclarationAST *clone(MemoryPool *pool) const; @@ -926,8 +926,8 @@ public: virtual QtInterfaceNameAST *asQtInterfaceName() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtInterfaceNameAST *clone(MemoryPool *pool) const; @@ -939,10 +939,10 @@ protected: class CPLUSPLUS_EXPORT QtInterfacesDeclarationAST: public DeclarationAST { public: - unsigned interfaces_token; - unsigned lparen_token; + int interfaces_token; + int lparen_token; QtInterfaceNameListAST *interface_name_list; - unsigned rparen_token; + int rparen_token; public: QtInterfacesDeclarationAST() @@ -954,8 +954,8 @@ public: virtual QtInterfacesDeclarationAST *asQtInterfacesDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtInterfacesDeclarationAST *clone(MemoryPool *pool) const; @@ -967,13 +967,13 @@ protected: class CPLUSPLUS_EXPORT AsmDefinitionAST: public DeclarationAST { public: - unsigned asm_token; - unsigned volatile_token; - unsigned lparen_token; + int asm_token; + int volatile_token; + int lparen_token; // ### string literals // ### asm operand list - unsigned rparen_token; - unsigned semicolon_token; + int rparen_token; + int semicolon_token; public: AsmDefinitionAST() @@ -986,8 +986,8 @@ public: virtual AsmDefinitionAST *asAsmDefinition() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual AsmDefinitionAST *clone(MemoryPool *pool) const; @@ -999,10 +999,10 @@ protected: class CPLUSPLUS_EXPORT BaseSpecifierAST: public AST { public: - unsigned virtual_token; - unsigned access_specifier_token; + int virtual_token; + int access_specifier_token; NameAST *name; - unsigned ellipsis_token; + int ellipsis_token; public: // annotations BaseClass *symbol; @@ -1018,8 +1018,8 @@ public: virtual BaseSpecifierAST *asBaseSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual BaseSpecifierAST *clone(MemoryPool *pool) const; @@ -1040,8 +1040,8 @@ public: virtual IdExpressionAST *asIdExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual IdExpressionAST *clone(MemoryPool *pool) const; @@ -1053,9 +1053,9 @@ protected: class CPLUSPLUS_EXPORT CompoundExpressionAST: public ExpressionAST { public: - unsigned lparen_token; + int lparen_token; CompoundStatementAST *statement; - unsigned rparen_token; + int rparen_token; public: CompoundExpressionAST() @@ -1066,8 +1066,8 @@ public: virtual CompoundExpressionAST *asCompoundExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CompoundExpressionAST *clone(MemoryPool *pool) const; @@ -1079,9 +1079,9 @@ protected: class CPLUSPLUS_EXPORT CompoundLiteralAST: public ExpressionAST { public: - unsigned lparen_token; + int lparen_token; ExpressionAST *type_id; - unsigned rparen_token; + int rparen_token; ExpressionAST *initializer; public: @@ -1094,8 +1094,8 @@ public: virtual CompoundLiteralAST *asCompoundLiteral() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CompoundLiteralAST *clone(MemoryPool *pool) const; @@ -1107,10 +1107,10 @@ protected: class CPLUSPLUS_EXPORT QtMethodAST: public ExpressionAST { public: - unsigned method_token; - unsigned lparen_token; + int method_token; + int lparen_token; DeclaratorAST *declarator; - unsigned rparen_token; + int rparen_token; public: QtMethodAST() @@ -1122,8 +1122,8 @@ public: virtual QtMethodAST *asQtMethod() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtMethodAST *clone(MemoryPool *pool) const; @@ -1135,10 +1135,10 @@ protected: class CPLUSPLUS_EXPORT QtMemberDeclarationAST: public StatementAST { public: - unsigned q_token; - unsigned lparen_token; + int q_token; + int lparen_token; ExpressionAST *type_id; - unsigned rparen_token; + int rparen_token; public: QtMemberDeclarationAST() @@ -1150,8 +1150,8 @@ public: virtual QtMemberDeclarationAST *asQtMemberDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QtMemberDeclarationAST *clone(MemoryPool *pool) const; @@ -1164,7 +1164,7 @@ class CPLUSPLUS_EXPORT BinaryExpressionAST: public ExpressionAST { public: ExpressionAST *left_expression; - unsigned binary_op_token; + int binary_op_token; ExpressionAST *right_expression; public: @@ -1176,8 +1176,8 @@ public: virtual BinaryExpressionAST *asBinaryExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual BinaryExpressionAST *clone(MemoryPool *pool) const; @@ -1189,9 +1189,9 @@ protected: class CPLUSPLUS_EXPORT CastExpressionAST: public ExpressionAST { public: - unsigned lparen_token; + int lparen_token; ExpressionAST *type_id; - unsigned rparen_token; + int rparen_token; ExpressionAST *expression; public: @@ -1204,8 +1204,8 @@ public: virtual CastExpressionAST *asCastExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CastExpressionAST *clone(MemoryPool *pool) const; @@ -1217,16 +1217,16 @@ protected: class CPLUSPLUS_EXPORT ClassSpecifierAST: public SpecifierAST { public: - unsigned classkey_token; + int classkey_token; SpecifierListAST *attribute_list; NameAST *name; - unsigned final_token; - unsigned colon_token; + int final_token; + int colon_token; BaseSpecifierListAST *base_clause_list; - unsigned dot_dot_dot_token; - unsigned lbrace_token; + int dot_dot_dot_token; + int lbrace_token; DeclarationListAST *member_specifier_list; - unsigned rbrace_token; + int rbrace_token; public: // annotations Class *symbol; @@ -1248,8 +1248,8 @@ public: virtual ClassSpecifierAST *asClassSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ClassSpecifierAST *clone(MemoryPool *pool) const; @@ -1261,9 +1261,9 @@ protected: class CPLUSPLUS_EXPORT CaseStatementAST: public StatementAST { public: - unsigned case_token; + int case_token; ExpressionAST *expression; - unsigned colon_token; + int colon_token; StatementAST *statement; public: @@ -1276,8 +1276,8 @@ public: virtual CaseStatementAST *asCaseStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CaseStatementAST *clone(MemoryPool *pool) const; @@ -1289,9 +1289,9 @@ protected: class CPLUSPLUS_EXPORT CompoundStatementAST: public StatementAST { public: - unsigned lbrace_token; + int lbrace_token; StatementListAST *statement_list; - unsigned rbrace_token; + int rbrace_token; public: // annotations Block *symbol; @@ -1306,8 +1306,8 @@ public: virtual CompoundStatementAST *asCompoundStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CompoundStatementAST *clone(MemoryPool *pool) const; @@ -1330,8 +1330,8 @@ public: virtual ConditionAST *asCondition() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ConditionAST *clone(MemoryPool *pool) const; @@ -1344,9 +1344,9 @@ class CPLUSPLUS_EXPORT ConditionalExpressionAST: public ExpressionAST { public: ExpressionAST *condition; - unsigned question_token; + int question_token; ExpressionAST *left_expression; - unsigned colon_token; + int colon_token; ExpressionAST *right_expression; public: @@ -1360,8 +1360,8 @@ public: virtual ConditionalExpressionAST *asConditionalExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ConditionalExpressionAST *clone(MemoryPool *pool) const; @@ -1373,13 +1373,13 @@ protected: class CPLUSPLUS_EXPORT CppCastExpressionAST: public ExpressionAST { public: - unsigned cast_token; - unsigned less_token; + int cast_token; + int less_token; ExpressionAST *type_id; - unsigned greater_token; - unsigned lparen_token; + int greater_token; + int lparen_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; public: CppCastExpressionAST() @@ -1394,8 +1394,8 @@ public: virtual CppCastExpressionAST *asCppCastExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CppCastExpressionAST *clone(MemoryPool *pool) const; @@ -1407,9 +1407,9 @@ protected: class CPLUSPLUS_EXPORT CtorInitializerAST: public AST { public: - unsigned colon_token; + int colon_token; MemInitializerListAST *member_initializer_list; - unsigned dot_dot_dot_token; + int dot_dot_dot_token; public: CtorInitializerAST() @@ -1420,8 +1420,8 @@ public: virtual CtorInitializerAST *asCtorInitializer() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CtorInitializerAST *clone(MemoryPool *pool) const; @@ -1442,8 +1442,8 @@ public: virtual DeclarationStatementAST *asDeclarationStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DeclarationStatementAST *clone(MemoryPool *pool) const; @@ -1455,7 +1455,7 @@ protected: class CPLUSPLUS_EXPORT DeclaratorIdAST: public CoreDeclaratorAST { public: - unsigned dot_dot_dot_token; + int dot_dot_dot_token; NameAST *name; public: @@ -1466,8 +1466,8 @@ public: virtual DeclaratorIdAST *asDeclaratorId() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DeclaratorIdAST *clone(MemoryPool *pool) const; @@ -1479,9 +1479,9 @@ protected: class CPLUSPLUS_EXPORT NestedDeclaratorAST: public CoreDeclaratorAST { public: - unsigned lparen_token; + int lparen_token; DeclaratorAST *declarator; - unsigned rparen_token; + int rparen_token; public: NestedDeclaratorAST() @@ -1492,8 +1492,8 @@ public: virtual NestedDeclaratorAST *asNestedDeclarator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NestedDeclaratorAST *clone(MemoryPool *pool) const; @@ -1505,11 +1505,11 @@ protected: class CPLUSPLUS_EXPORT FunctionDeclaratorAST: public PostfixDeclaratorAST { public: - unsigned lparen_token; + int lparen_token; ParameterDeclarationClauseAST *parameter_declaration_clause; - unsigned rparen_token; + int rparen_token; SpecifierListAST *cv_qualifier_list; - unsigned ref_qualifier_token; + int ref_qualifier_token; ExceptionSpecificationAST *exception_specification; TrailingReturnTypeAST *trailing_return_type; // Some FunctionDeclarators can also be interpreted as an initializer, like for 'A b(c);' @@ -1533,8 +1533,8 @@ public: virtual FunctionDeclaratorAST *asFunctionDeclarator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual FunctionDeclaratorAST *clone(MemoryPool *pool) const; @@ -1546,9 +1546,9 @@ protected: class CPLUSPLUS_EXPORT ArrayDeclaratorAST: public PostfixDeclaratorAST { public: - unsigned lbracket_token; + int lbracket_token; ExpressionAST *expression; - unsigned rbracket_token; + int rbracket_token; public: ArrayDeclaratorAST() @@ -1559,8 +1559,8 @@ public: virtual ArrayDeclaratorAST *asArrayDeclarator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ArrayDeclaratorAST *clone(MemoryPool *pool) const; @@ -1572,10 +1572,10 @@ protected: class CPLUSPLUS_EXPORT DeleteExpressionAST: public ExpressionAST { public: - unsigned scope_token; - unsigned delete_token; - unsigned lbracket_token; - unsigned rbracket_token; + int scope_token; + int delete_token; + int lbracket_token; + int rbracket_token; ExpressionAST *expression; public: @@ -1589,8 +1589,8 @@ public: virtual DeleteExpressionAST *asDeleteExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DeleteExpressionAST *clone(MemoryPool *pool) const; @@ -1602,13 +1602,13 @@ protected: class CPLUSPLUS_EXPORT DoStatementAST: public StatementAST { public: - unsigned do_token; + int do_token; StatementAST *statement; - unsigned while_token; - unsigned lparen_token; + int while_token; + int lparen_token; ExpressionAST *expression; - unsigned rparen_token; - unsigned semicolon_token; + int rparen_token; + int semicolon_token; public: DoStatementAST() @@ -1623,8 +1623,8 @@ public: virtual DoStatementAST *asDoStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DoStatementAST *clone(MemoryPool *pool) const; @@ -1645,8 +1645,8 @@ public: virtual NamedTypeSpecifierAST *asNamedTypeSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NamedTypeSpecifierAST *clone(MemoryPool *pool) const; @@ -1658,7 +1658,7 @@ protected: class CPLUSPLUS_EXPORT ElaboratedTypeSpecifierAST: public SpecifierAST { public: - unsigned classkey_token; + int classkey_token; SpecifierListAST *attribute_list; NameAST *name; @@ -1671,8 +1671,8 @@ public: virtual ElaboratedTypeSpecifierAST *asElaboratedTypeSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ElaboratedTypeSpecifierAST *clone(MemoryPool *pool) const; @@ -1684,15 +1684,15 @@ protected: class CPLUSPLUS_EXPORT EnumSpecifierAST: public SpecifierAST { public: - unsigned enum_token; - unsigned key_token; // struct, class or 0 + int enum_token; + int key_token; // struct, class or 0 NameAST *name; - unsigned colon_token; // can be 0 if there is no enum-base + int colon_token; // can be 0 if there is no enum-base SpecifierListAST *type_specifier_list; // ditto - unsigned lbrace_token; + int lbrace_token; EnumeratorListAST *enumerator_list; - unsigned stray_comma_token; - unsigned rbrace_token; + int stray_comma_token; + int rbrace_token; public: // annotations Enum *symbol; @@ -1713,8 +1713,8 @@ public: virtual EnumSpecifierAST *asEnumSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual EnumSpecifierAST *clone(MemoryPool *pool) const; @@ -1726,8 +1726,8 @@ protected: class CPLUSPLUS_EXPORT EnumeratorAST: public AST { public: - unsigned identifier_token; - unsigned equal_token; + int identifier_token; + int equal_token; ExpressionAST *expression; public: @@ -1739,8 +1739,8 @@ public: virtual EnumeratorAST *asEnumerator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual EnumeratorAST *clone(MemoryPool *pool) const; @@ -1754,7 +1754,7 @@ class CPLUSPLUS_EXPORT ExceptionDeclarationAST: public DeclarationAST public: SpecifierListAST *type_specifier_list; DeclaratorAST *declarator; - unsigned dot_dot_dot_token; + int dot_dot_dot_token; public: ExceptionDeclarationAST() @@ -1765,8 +1765,8 @@ public: virtual ExceptionDeclarationAST *asExceptionDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ExceptionDeclarationAST *clone(MemoryPool *pool) const; @@ -1789,11 +1789,11 @@ public: class CPLUSPLUS_EXPORT DynamicExceptionSpecificationAST: public ExceptionSpecificationAST { public: - unsigned throw_token; - unsigned lparen_token; - unsigned dot_dot_dot_token; + int throw_token; + int lparen_token; + int dot_dot_dot_token; ExpressionListAST *type_id_list; - unsigned rparen_token; + int rparen_token; public: DynamicExceptionSpecificationAST() @@ -1806,8 +1806,8 @@ public: virtual DynamicExceptionSpecificationAST *asDynamicExceptionSpecification() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DynamicExceptionSpecificationAST *clone(MemoryPool *pool) const; @@ -1819,10 +1819,10 @@ protected: class CPLUSPLUS_EXPORT NoExceptSpecificationAST: public ExceptionSpecificationAST { public: - unsigned noexcept_token; - unsigned lparen_token; + int noexcept_token; + int lparen_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; public: NoExceptSpecificationAST() @@ -1834,8 +1834,8 @@ public: virtual NoExceptSpecificationAST *asNoExceptSpecification() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NoExceptSpecificationAST *clone(MemoryPool *pool) const; @@ -1858,8 +1858,8 @@ public: virtual ExpressionOrDeclarationStatementAST *asExpressionOrDeclarationStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ExpressionOrDeclarationStatementAST *clone(MemoryPool *pool) const; @@ -1872,7 +1872,7 @@ class CPLUSPLUS_EXPORT ExpressionStatementAST: public StatementAST { public: ExpressionAST *expression; - unsigned semicolon_token; + int semicolon_token; public: ExpressionStatementAST() @@ -1882,8 +1882,8 @@ public: virtual ExpressionStatementAST *asExpressionStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ExpressionStatementAST *clone(MemoryPool *pool) const; @@ -1895,7 +1895,7 @@ protected: class CPLUSPLUS_EXPORT FunctionDefinitionAST: public DeclarationAST { public: - unsigned qt_invokable_token; + int qt_invokable_token; SpecifierListAST *decl_specifier_list; DeclaratorAST *declarator; CtorInitializerAST *ctor_initializer; @@ -1916,8 +1916,8 @@ public: virtual FunctionDefinitionAST *asFunctionDefinition() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual FunctionDefinitionAST *clone(MemoryPool *pool) const; @@ -1929,16 +1929,16 @@ protected: class CPLUSPLUS_EXPORT ForeachStatementAST: public StatementAST { public: - unsigned foreach_token; - unsigned lparen_token; + int foreach_token; + int lparen_token; // declaration SpecifierListAST *type_specifier_list; DeclaratorAST *declarator; // or an expression ExpressionAST *initializer; - unsigned comma_token; + int comma_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; StatementAST *statement; public: // annotations @@ -1960,8 +1960,8 @@ public: virtual ForeachStatementAST *asForeachStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ForeachStatementAST *clone(MemoryPool *pool) const; @@ -1973,15 +1973,15 @@ protected: class CPLUSPLUS_EXPORT RangeBasedForStatementAST : public StatementAST { public: - unsigned for_token; - unsigned lparen_token; + int for_token; + int lparen_token; // declaration SpecifierListAST *type_specifier_list; DeclaratorAST *declarator; // or an expression - unsigned colon_token; + int colon_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; StatementAST *statement; public: // annotations @@ -2002,8 +2002,8 @@ public: virtual RangeBasedForStatementAST *asRangeBasedForStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual RangeBasedForStatementAST *clone(MemoryPool *pool) const; @@ -2015,13 +2015,13 @@ protected: class CPLUSPLUS_EXPORT ForStatementAST: public StatementAST { public: - unsigned for_token; - unsigned lparen_token; + int for_token; + int lparen_token; StatementAST *initializer; ExpressionAST *condition; - unsigned semicolon_token; + int semicolon_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; StatementAST *statement; public: // annotations @@ -2042,8 +2042,8 @@ public: virtual ForStatementAST *asForStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ForStatementAST *clone(MemoryPool *pool) const; @@ -2055,12 +2055,12 @@ protected: class CPLUSPLUS_EXPORT IfStatementAST: public StatementAST { public: - unsigned if_token; - unsigned lparen_token; + int if_token; + int lparen_token; ExpressionAST *condition; - unsigned rparen_token; + int rparen_token; StatementAST *statement; - unsigned else_token; + int else_token; StatementAST *else_statement; public: // annotations @@ -2080,8 +2080,8 @@ public: virtual IfStatementAST *asIfStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual IfStatementAST *clone(MemoryPool *pool) const; @@ -2093,9 +2093,9 @@ protected: class CPLUSPLUS_EXPORT ArrayInitializerAST: public ExpressionAST { public: - unsigned lbrace_token; + int lbrace_token; ExpressionListAST *expression_list; - unsigned rbrace_token; + int rbrace_token; public: ArrayInitializerAST() @@ -2106,8 +2106,8 @@ public: virtual ArrayInitializerAST *asArrayInitializer() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ArrayInitializerAST *clone(MemoryPool *pool) const; @@ -2119,8 +2119,8 @@ protected: class CPLUSPLUS_EXPORT LabeledStatementAST: public StatementAST { public: - unsigned label_token; - unsigned colon_token; + int label_token; + int colon_token; StatementAST *statement; public: @@ -2132,8 +2132,8 @@ public: virtual LabeledStatementAST *asLabeledStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual LabeledStatementAST *clone(MemoryPool *pool) const; @@ -2145,9 +2145,9 @@ protected: class CPLUSPLUS_EXPORT LinkageBodyAST: public DeclarationAST { public: - unsigned lbrace_token; + int lbrace_token; DeclarationListAST *declaration_list; - unsigned rbrace_token; + int rbrace_token; public: LinkageBodyAST() @@ -2157,8 +2157,8 @@ public: {} virtual LinkageBodyAST *asLinkageBody() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual LinkageBodyAST *clone(MemoryPool *pool) const; @@ -2170,8 +2170,8 @@ protected: class CPLUSPLUS_EXPORT LinkageSpecificationAST: public DeclarationAST { public: - unsigned extern_token; - unsigned extern_type_token; + int extern_token; + int extern_type_token; DeclarationAST *declaration; public: @@ -2183,8 +2183,8 @@ public: virtual LinkageSpecificationAST *asLinkageSpecification() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual LinkageSpecificationAST *clone(MemoryPool *pool) const; @@ -2208,8 +2208,8 @@ public: virtual MemInitializerAST *asMemInitializer() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual MemInitializerAST *clone(MemoryPool *pool) const; @@ -2222,7 +2222,7 @@ class CPLUSPLUS_EXPORT NestedNameSpecifierAST: public AST { public: NameAST *class_or_namespace_name; - unsigned scope_token; + int scope_token; public: NestedNameSpecifierAST() @@ -2232,8 +2232,8 @@ public: virtual NestedNameSpecifierAST *asNestedNameSpecifier() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NestedNameSpecifierAST *clone(MemoryPool *pool) const; @@ -2245,7 +2245,7 @@ protected: class CPLUSPLUS_EXPORT QualifiedNameAST: public NameAST { public: - unsigned global_scope_token; + int global_scope_token; NestedNameSpecifierListAST *nested_name_specifier_list; NameAST *unqualified_name; @@ -2258,8 +2258,8 @@ public: virtual QualifiedNameAST *asQualifiedName() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual QualifiedNameAST *clone(MemoryPool *pool) const; @@ -2271,7 +2271,7 @@ protected: class CPLUSPLUS_EXPORT OperatorFunctionIdAST: public NameAST { public: - unsigned operator_token; + int operator_token; OperatorAST *op; public: @@ -2282,8 +2282,8 @@ public: virtual OperatorFunctionIdAST *asOperatorFunctionId() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual OperatorFunctionIdAST *clone(MemoryPool *pool) const; @@ -2295,7 +2295,7 @@ protected: class CPLUSPLUS_EXPORT ConversionFunctionIdAST: public NameAST { public: - unsigned operator_token; + int operator_token; SpecifierListAST *type_specifier_list; PtrOperatorListAST *ptr_operator_list; @@ -2308,8 +2308,8 @@ public: virtual ConversionFunctionIdAST *asConversionFunctionId() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ConversionFunctionIdAST *clone(MemoryPool *pool) const; @@ -2321,15 +2321,15 @@ protected: class CPLUSPLUS_EXPORT AnonymousNameAST: public NameAST { public: - unsigned class_token; + int class_token; public: AnonymousNameAST() : class_token(0) {} virtual AnonymousNameAST *asAnonymousName() { return this; } - virtual unsigned firstToken() const { return 0; } - virtual unsigned lastToken() const { return 0; } + virtual int firstToken() const { return 0; } + virtual int lastToken() const { return 0; } virtual AnonymousNameAST *clone(MemoryPool *pool) const; @@ -2341,7 +2341,7 @@ protected: class CPLUSPLUS_EXPORT SimpleNameAST: public NameAST { public: - unsigned identifier_token; + int identifier_token; public: SimpleNameAST() @@ -2350,8 +2350,8 @@ public: virtual SimpleNameAST *asSimpleName() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual SimpleNameAST *clone(MemoryPool *pool) const; @@ -2363,7 +2363,7 @@ protected: class CPLUSPLUS_EXPORT DestructorNameAST: public NameAST { public: - unsigned tilde_token; + int tilde_token; NameAST *unqualified_name; public: @@ -2374,8 +2374,8 @@ public: virtual DestructorNameAST *asDestructorName() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DestructorNameAST *clone(MemoryPool *pool) const; @@ -2387,11 +2387,11 @@ protected: class CPLUSPLUS_EXPORT TemplateIdAST: public NameAST { public: - unsigned template_token; - unsigned identifier_token; - unsigned less_token; + int template_token; + int identifier_token; + int less_token; ExpressionListAST *template_argument_list; - unsigned greater_token; + int greater_token; public: TemplateIdAST() @@ -2404,8 +2404,8 @@ public: virtual TemplateIdAST *asTemplateId() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TemplateIdAST *clone(MemoryPool *pool) const; @@ -2417,9 +2417,9 @@ protected: class CPLUSPLUS_EXPORT NamespaceAST: public DeclarationAST { public: - unsigned inline_token; - unsigned namespace_token; - unsigned identifier_token; + int inline_token; + int namespace_token; + int identifier_token; SpecifierListAST *attribute_list; DeclarationAST *linkage_body; @@ -2438,8 +2438,8 @@ public: virtual NamespaceAST *asNamespace() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NamespaceAST *clone(MemoryPool *pool) const; @@ -2451,11 +2451,11 @@ protected: class CPLUSPLUS_EXPORT NamespaceAliasDefinitionAST: public DeclarationAST { public: - unsigned namespace_token; - unsigned namespace_name_token; - unsigned equal_token; + int namespace_token; + int namespace_name_token; + int equal_token; NameAST *name; - unsigned semicolon_token; + int semicolon_token; public: NamespaceAliasDefinitionAST() @@ -2468,8 +2468,8 @@ public: virtual NamespaceAliasDefinitionAST *asNamespaceAliasDefinition() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NamespaceAliasDefinitionAST *clone(MemoryPool *pool) const; @@ -2481,11 +2481,11 @@ protected: class CPLUSPLUS_EXPORT AliasDeclarationAST: public DeclarationAST { public: - unsigned using_token; + int using_token; NameAST *name; - unsigned equal_token; + int equal_token; TypeIdAST *typeId; - unsigned semicolon_token; + int semicolon_token; public: // annotations Declaration *symbol; @@ -2502,8 +2502,8 @@ public: virtual AliasDeclarationAST *asAliasDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual AliasDeclarationAST *clone(MemoryPool *pool) const; @@ -2515,9 +2515,9 @@ protected: class CPLUSPLUS_EXPORT ExpressionListParenAST: public ExpressionAST { public: - unsigned lparen_token; + int lparen_token; ExpressionListAST *expression_list; - unsigned rparen_token; + int rparen_token; public: ExpressionListParenAST() @@ -2528,8 +2528,8 @@ public: virtual ExpressionListParenAST *asExpressionListParen() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ExpressionListParenAST *clone(MemoryPool *pool) const; @@ -2541,9 +2541,9 @@ protected: class CPLUSPLUS_EXPORT NewArrayDeclaratorAST: public AST { public: - unsigned lbracket_token; + int lbracket_token; ExpressionAST *expression; - unsigned rbracket_token; + int rbracket_token; public: NewArrayDeclaratorAST() @@ -2554,8 +2554,8 @@ public: virtual NewArrayDeclaratorAST *asNewArrayDeclarator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NewArrayDeclaratorAST *clone(MemoryPool *pool) const; @@ -2567,13 +2567,13 @@ protected: class CPLUSPLUS_EXPORT NewExpressionAST: public ExpressionAST { public: - unsigned scope_token; - unsigned new_token; + int scope_token; + int new_token; ExpressionListParenAST *new_placement; - unsigned lparen_token; + int lparen_token; ExpressionAST *type_id; - unsigned rparen_token; + int rparen_token; NewTypeIdAST *new_type_id; @@ -2593,8 +2593,8 @@ public: virtual NewExpressionAST *asNewExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NewExpressionAST *clone(MemoryPool *pool) const; @@ -2619,8 +2619,8 @@ public: virtual NewTypeIdAST *asNewTypeId() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NewTypeIdAST *clone(MemoryPool *pool) const; @@ -2632,9 +2632,9 @@ protected: class CPLUSPLUS_EXPORT OperatorAST: public AST { public: - unsigned op_token; - unsigned open_token; - unsigned close_token; + int op_token; + int open_token; + int close_token; public: OperatorAST() @@ -2645,8 +2645,8 @@ public: virtual OperatorAST *asOperator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual OperatorAST *clone(MemoryPool *pool) const; @@ -2660,7 +2660,7 @@ class CPLUSPLUS_EXPORT ParameterDeclarationAST: public DeclarationAST public: SpecifierListAST *type_specifier_list; DeclaratorAST *declarator; - unsigned equal_token; + int equal_token; ExpressionAST *expression; public: // annotations @@ -2677,8 +2677,8 @@ public: virtual ParameterDeclarationAST *asParameterDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ParameterDeclarationAST *clone(MemoryPool *pool) const; @@ -2691,7 +2691,7 @@ class CPLUSPLUS_EXPORT ParameterDeclarationClauseAST: public AST { public: ParameterDeclarationListAST *parameter_declaration_list; - unsigned dot_dot_dot_token; + int dot_dot_dot_token; public: ParameterDeclarationClauseAST() @@ -2701,8 +2701,8 @@ public: virtual ParameterDeclarationClauseAST *asParameterDeclarationClause() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ParameterDeclarationClauseAST *clone(MemoryPool *pool) const; @@ -2715,9 +2715,9 @@ class CPLUSPLUS_EXPORT CallAST: public PostfixAST { public: ExpressionAST *base_expression; - unsigned lparen_token; + int lparen_token; ExpressionListAST *expression_list; - unsigned rparen_token; + int rparen_token; public: CallAST() @@ -2729,8 +2729,8 @@ public: virtual CallAST *asCall() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CallAST *clone(MemoryPool *pool) const; @@ -2743,9 +2743,9 @@ class CPLUSPLUS_EXPORT ArrayAccessAST: public PostfixAST { public: ExpressionAST *base_expression; - unsigned lbracket_token; + int lbracket_token; ExpressionAST *expression; - unsigned rbracket_token; + int rbracket_token; public: ArrayAccessAST() @@ -2757,8 +2757,8 @@ public: virtual ArrayAccessAST *asArrayAccess() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ArrayAccessAST *clone(MemoryPool *pool) const; @@ -2771,7 +2771,7 @@ class CPLUSPLUS_EXPORT PostIncrDecrAST: public PostfixAST { public: ExpressionAST *base_expression; - unsigned incr_decr_token; + int incr_decr_token; public: PostIncrDecrAST() @@ -2781,8 +2781,8 @@ public: virtual PostIncrDecrAST *asPostIncrDecr() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual PostIncrDecrAST *clone(MemoryPool *pool) const; @@ -2795,8 +2795,8 @@ class CPLUSPLUS_EXPORT MemberAccessAST: public PostfixAST { public: ExpressionAST *base_expression; - unsigned access_token; - unsigned template_token; + int access_token; + int template_token; NameAST *member_name; public: @@ -2809,8 +2809,8 @@ public: virtual MemberAccessAST *asMemberAccess() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual MemberAccessAST *clone(MemoryPool *pool) const; @@ -2822,10 +2822,10 @@ protected: class CPLUSPLUS_EXPORT TypeidExpressionAST: public ExpressionAST { public: - unsigned typeid_token; - unsigned lparen_token; + int typeid_token; + int lparen_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; public: TypeidExpressionAST() @@ -2837,8 +2837,8 @@ public: virtual TypeidExpressionAST *asTypeidExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TypeidExpressionAST *clone(MemoryPool *pool) const; @@ -2850,7 +2850,7 @@ protected: class CPLUSPLUS_EXPORT TypenameCallExpressionAST: public ExpressionAST { public: - unsigned typename_token; + int typename_token; NameAST *name; ExpressionAST *expression; // either ExpressionListParenAST or BracedInitializerAST @@ -2863,8 +2863,8 @@ public: virtual TypenameCallExpressionAST *asTypenameCallExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TypenameCallExpressionAST *clone(MemoryPool *pool) const; @@ -2887,8 +2887,8 @@ public: virtual TypeConstructorCallAST *asTypeConstructorCall() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TypeConstructorCallAST *clone(MemoryPool *pool) const; @@ -2900,11 +2900,11 @@ protected: class CPLUSPLUS_EXPORT PointerToMemberAST: public PtrOperatorAST { public: - unsigned global_scope_token; + int global_scope_token; NestedNameSpecifierListAST *nested_name_specifier_list; - unsigned star_token; + int star_token; SpecifierListAST *cv_qualifier_list; - unsigned ref_qualifier_token; + int ref_qualifier_token; public: PointerToMemberAST() @@ -2917,8 +2917,8 @@ public: virtual PointerToMemberAST *asPointerToMember() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual PointerToMemberAST *clone(MemoryPool *pool) const; @@ -2930,7 +2930,7 @@ protected: class CPLUSPLUS_EXPORT PointerAST: public PtrOperatorAST { public: - unsigned star_token; + int star_token; SpecifierListAST *cv_qualifier_list; public: @@ -2941,8 +2941,8 @@ public: virtual PointerAST *asPointer() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual PointerAST *clone(MemoryPool *pool) const; @@ -2954,7 +2954,7 @@ protected: class CPLUSPLUS_EXPORT ReferenceAST: public PtrOperatorAST { public: - unsigned reference_token; + int reference_token; public: ReferenceAST() @@ -2963,8 +2963,8 @@ public: virtual ReferenceAST *asReference() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ReferenceAST *clone(MemoryPool *pool) const; @@ -2976,8 +2976,8 @@ protected: class CPLUSPLUS_EXPORT BreakStatementAST: public StatementAST { public: - unsigned break_token; - unsigned semicolon_token; + int break_token; + int semicolon_token; public: BreakStatementAST() @@ -2987,8 +2987,8 @@ public: virtual BreakStatementAST *asBreakStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual BreakStatementAST *clone(MemoryPool *pool) const; @@ -3000,8 +3000,8 @@ protected: class CPLUSPLUS_EXPORT ContinueStatementAST: public StatementAST { public: - unsigned continue_token; - unsigned semicolon_token; + int continue_token; + int semicolon_token; public: ContinueStatementAST() @@ -3011,8 +3011,8 @@ public: virtual ContinueStatementAST *asContinueStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ContinueStatementAST *clone(MemoryPool *pool) const; @@ -3024,9 +3024,9 @@ protected: class CPLUSPLUS_EXPORT GotoStatementAST: public StatementAST { public: - unsigned goto_token; - unsigned identifier_token; - unsigned semicolon_token; + int goto_token; + int identifier_token; + int semicolon_token; public: GotoStatementAST() @@ -3037,8 +3037,8 @@ public: virtual GotoStatementAST *asGotoStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual GotoStatementAST *clone(MemoryPool *pool) const; @@ -3050,9 +3050,9 @@ protected: class CPLUSPLUS_EXPORT ReturnStatementAST: public StatementAST { public: - unsigned return_token; + int return_token; ExpressionAST *expression; - unsigned semicolon_token; + int semicolon_token; public: ReturnStatementAST() @@ -3063,8 +3063,8 @@ public: virtual ReturnStatementAST *asReturnStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ReturnStatementAST *clone(MemoryPool *pool) const; @@ -3076,11 +3076,11 @@ protected: class CPLUSPLUS_EXPORT SizeofExpressionAST: public ExpressionAST { public: - unsigned sizeof_token; - unsigned dot_dot_dot_token; - unsigned lparen_token; + int sizeof_token; + int dot_dot_dot_token; + int lparen_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; public: SizeofExpressionAST() @@ -3093,8 +3093,8 @@ public: virtual SizeofExpressionAST *asSizeofExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual SizeofExpressionAST *clone(MemoryPool *pool) const; @@ -3106,10 +3106,10 @@ protected: class CPLUSPLUS_EXPORT AlignofExpressionAST: public ExpressionAST { public: - unsigned alignof_token; - unsigned lparen_token; + int alignof_token; + int lparen_token; TypeIdAST *typeId; - unsigned rparen_token; + int rparen_token; public: AlignofExpressionAST() @@ -3121,8 +3121,8 @@ public: virtual AlignofExpressionAST *asAlignofExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual AlignofExpressionAST *clone(MemoryPool *pool) const; @@ -3134,7 +3134,7 @@ protected: class CPLUSPLUS_EXPORT PointerLiteralAST: public ExpressionAST { public: - unsigned literal_token; + int literal_token; public: PointerLiteralAST() @@ -3143,8 +3143,8 @@ public: virtual PointerLiteralAST *asPointerLiteral() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual PointerLiteralAST *clone(MemoryPool *pool) const; @@ -3156,7 +3156,7 @@ protected: class CPLUSPLUS_EXPORT NumericLiteralAST: public ExpressionAST { public: - unsigned literal_token; + int literal_token; public: NumericLiteralAST() @@ -3165,8 +3165,8 @@ public: virtual NumericLiteralAST *asNumericLiteral() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NumericLiteralAST *clone(MemoryPool *pool) const; @@ -3178,7 +3178,7 @@ protected: class CPLUSPLUS_EXPORT BoolLiteralAST: public ExpressionAST { public: - unsigned literal_token; + int literal_token; public: BoolLiteralAST() @@ -3187,8 +3187,8 @@ public: virtual BoolLiteralAST *asBoolLiteral() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual BoolLiteralAST *clone(MemoryPool *pool) const; @@ -3200,7 +3200,7 @@ protected: class CPLUSPLUS_EXPORT ThisExpressionAST: public ExpressionAST { public: - unsigned this_token; + int this_token; public: ThisExpressionAST() @@ -3209,8 +3209,8 @@ public: virtual ThisExpressionAST *asThisExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ThisExpressionAST *clone(MemoryPool *pool) const; @@ -3222,9 +3222,9 @@ protected: class CPLUSPLUS_EXPORT NestedExpressionAST: public ExpressionAST { public: - unsigned lparen_token; + int lparen_token; ExpressionAST *expression; - unsigned rparen_token; + int rparen_token; public: NestedExpressionAST() @@ -3235,8 +3235,8 @@ public: virtual NestedExpressionAST *asNestedExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NestedExpressionAST *clone(MemoryPool *pool) const; @@ -3248,13 +3248,13 @@ protected: class CPLUSPLUS_EXPORT StaticAssertDeclarationAST: public DeclarationAST { public: - unsigned static_assert_token; - unsigned lparen_token; + int static_assert_token; + int lparen_token; ExpressionAST *expression; - unsigned comma_token; + int comma_token; ExpressionAST *string_literal; - unsigned rparen_token; - unsigned semicolon_token; + int rparen_token; + int semicolon_token; public: StaticAssertDeclarationAST() @@ -3269,8 +3269,8 @@ public: virtual StaticAssertDeclarationAST *asStaticAssertDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual StaticAssertDeclarationAST *clone(MemoryPool *pool) const; @@ -3282,7 +3282,7 @@ protected: class CPLUSPLUS_EXPORT StringLiteralAST: public ExpressionAST { public: - unsigned literal_token; + int literal_token; StringLiteralAST *next; public: @@ -3293,8 +3293,8 @@ public: virtual StringLiteralAST *asStringLiteral() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual StringLiteralAST *clone(MemoryPool *pool) const; @@ -3306,10 +3306,10 @@ protected: class CPLUSPLUS_EXPORT SwitchStatementAST: public StatementAST { public: - unsigned switch_token; - unsigned lparen_token; + int switch_token; + int lparen_token; ExpressionAST *condition; - unsigned rparen_token; + int rparen_token; StatementAST *statement; public: // annotations @@ -3327,8 +3327,8 @@ public: virtual SwitchStatementAST *asSwitchStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual SwitchStatementAST *clone(MemoryPool *pool) const; @@ -3340,11 +3340,11 @@ protected: class CPLUSPLUS_EXPORT TemplateDeclarationAST: public DeclarationAST { public: - unsigned export_token; - unsigned template_token; - unsigned less_token; + int export_token; + int template_token; + int less_token; DeclarationListAST *template_parameter_list; - unsigned greater_token; + int greater_token; DeclarationAST *declaration; public: // annotations @@ -3363,8 +3363,8 @@ public: virtual TemplateDeclarationAST *asTemplateDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TemplateDeclarationAST *clone(MemoryPool *pool) const; @@ -3376,7 +3376,7 @@ protected: class CPLUSPLUS_EXPORT ThrowExpressionAST: public ExpressionAST { public: - unsigned throw_token; + int throw_token; ExpressionAST *expression; public: @@ -3387,8 +3387,8 @@ public: virtual ThrowExpressionAST *asThrowExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ThrowExpressionAST *clone(MemoryPool *pool) const; @@ -3400,7 +3400,7 @@ protected: class CPLUSPLUS_EXPORT NoExceptOperatorExpressionAST: public ExpressionAST { public: - unsigned noexcept_token; + int noexcept_token; ExpressionAST *expression; public: @@ -3411,8 +3411,8 @@ public: virtual NoExceptOperatorExpressionAST *asNoExceptOperatorExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual NoExceptOperatorExpressionAST *clone(MemoryPool *pool) const; @@ -3433,8 +3433,8 @@ public: virtual TranslationUnitAST *asTranslationUnit() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TranslationUnitAST *clone(MemoryPool *pool) const; @@ -3446,7 +3446,7 @@ protected: class CPLUSPLUS_EXPORT TryBlockStatementAST: public StatementAST { public: - unsigned try_token; + int try_token; StatementAST *statement; CatchClauseListAST *catch_clause_list; @@ -3459,8 +3459,8 @@ public: virtual TryBlockStatementAST *asTryBlockStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TryBlockStatementAST *clone(MemoryPool *pool) const; @@ -3472,10 +3472,10 @@ protected: class CPLUSPLUS_EXPORT CatchClauseAST: public StatementAST { public: - unsigned catch_token; - unsigned lparen_token; + int catch_token; + int lparen_token; ExceptionDeclarationAST *exception_declaration; - unsigned rparen_token; + int rparen_token; StatementAST *statement; public: // annotations @@ -3493,8 +3493,8 @@ public: virtual CatchClauseAST *asCatchClause() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CatchClauseAST *clone(MemoryPool *pool) const; @@ -3517,8 +3517,8 @@ public: virtual TypeIdAST *asTypeId() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TypeIdAST *clone(MemoryPool *pool) const; @@ -3530,10 +3530,10 @@ protected: class CPLUSPLUS_EXPORT TypenameTypeParameterAST: public DeclarationAST { public: - unsigned classkey_token; - unsigned dot_dot_dot_token; + int classkey_token; + int dot_dot_dot_token; NameAST *name; - unsigned equal_token; + int equal_token; ExpressionAST *type_id; public: // annotations @@ -3551,8 +3551,8 @@ public: virtual TypenameTypeParameterAST *asTypenameTypeParameter() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TypenameTypeParameterAST *clone(MemoryPool *pool) const; @@ -3564,14 +3564,14 @@ protected: class CPLUSPLUS_EXPORT TemplateTypeParameterAST: public DeclarationAST { public: - unsigned template_token; - unsigned less_token; + int template_token; + int less_token; DeclarationListAST *template_parameter_list; - unsigned greater_token; - unsigned class_token; - unsigned dot_dot_dot_token; + int greater_token; + int class_token; + int dot_dot_dot_token; NameAST *name; - unsigned equal_token; + int equal_token; ExpressionAST *type_id; public: @@ -3593,8 +3593,8 @@ public: virtual TemplateTypeParameterAST *asTemplateTypeParameter() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TemplateTypeParameterAST *clone(MemoryPool *pool) const; @@ -3606,7 +3606,7 @@ protected: class CPLUSPLUS_EXPORT UnaryExpressionAST: public ExpressionAST { public: - unsigned unary_op_token; + int unary_op_token; ExpressionAST *expression; public: @@ -3617,8 +3617,8 @@ public: virtual UnaryExpressionAST *asUnaryExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual UnaryExpressionAST *clone(MemoryPool *pool) const; @@ -3630,10 +3630,10 @@ protected: class CPLUSPLUS_EXPORT UsingAST: public DeclarationAST { public: - unsigned using_token; - unsigned typename_token; + int using_token; + int typename_token; NameAST *name; - unsigned semicolon_token; + int semicolon_token; public: // annotations UsingDeclaration *symbol; @@ -3649,8 +3649,8 @@ public: virtual UsingAST *asUsing() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual UsingAST *clone(MemoryPool *pool) const; @@ -3662,10 +3662,10 @@ protected: class CPLUSPLUS_EXPORT UsingDirectiveAST: public DeclarationAST { public: - unsigned using_token; - unsigned namespace_token; + int using_token; + int namespace_token; NameAST *name; - unsigned semicolon_token; + int semicolon_token; public: UsingNamespaceDirective *symbol; @@ -3681,8 +3681,8 @@ public: virtual UsingDirectiveAST *asUsingDirective() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual UsingDirectiveAST *clone(MemoryPool *pool) const; @@ -3694,10 +3694,10 @@ protected: class CPLUSPLUS_EXPORT WhileStatementAST: public StatementAST { public: - unsigned while_token; - unsigned lparen_token; + int while_token; + int lparen_token; ExpressionAST *condition; - unsigned rparen_token; + int rparen_token; StatementAST *statement; public: // annotations @@ -3715,8 +3715,8 @@ public: virtual WhileStatementAST *asWhileStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual WhileStatementAST *clone(MemoryPool *pool) const; @@ -3729,9 +3729,9 @@ class CPLUSPLUS_EXPORT ObjCClassForwardDeclarationAST: public DeclarationAST { public: SpecifierListAST *attribute_list; - unsigned class_token; + int class_token; NameListAST *identifier_list; - unsigned semicolon_token; + int semicolon_token; public: // annotations List<ObjCForwardClassDeclaration *> *symbols; @@ -3747,8 +3747,8 @@ public: virtual ObjCClassForwardDeclarationAST *asObjCClassForwardDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCClassForwardDeclarationAST *clone(MemoryPool *pool) const; @@ -3761,18 +3761,18 @@ class CPLUSPLUS_EXPORT ObjCClassDeclarationAST: public DeclarationAST { public: SpecifierListAST *attribute_list; - unsigned interface_token; - unsigned implementation_token; + int interface_token; + int implementation_token; NameAST *class_name; - unsigned lparen_token; + int lparen_token; NameAST *category_name; - unsigned rparen_token; - unsigned colon_token; + int rparen_token; + int colon_token; NameAST *superclass; ObjCProtocolRefsAST *protocol_refs; ObjCInstanceVariablesDeclarationAST *inst_vars_decl; DeclarationListAST *member_declaration_list; - unsigned end_token; + int end_token; public: // annotations ObjCClass *symbol; @@ -3797,8 +3797,8 @@ public: virtual ObjCClassDeclarationAST *asObjCClassDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCClassDeclarationAST *clone(MemoryPool *pool) const; @@ -3811,9 +3811,9 @@ class CPLUSPLUS_EXPORT ObjCProtocolForwardDeclarationAST: public DeclarationAST { public: SpecifierListAST *attribute_list; - unsigned protocol_token; + int protocol_token; NameListAST *identifier_list; - unsigned semicolon_token; + int semicolon_token; public: // annotations List<ObjCForwardProtocolDeclaration *> *symbols; @@ -3829,8 +3829,8 @@ public: virtual ObjCProtocolForwardDeclarationAST *asObjCProtocolForwardDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCProtocolForwardDeclarationAST *clone(MemoryPool *pool) const; @@ -3843,11 +3843,11 @@ class CPLUSPLUS_EXPORT ObjCProtocolDeclarationAST: public DeclarationAST { public: SpecifierListAST *attribute_list; - unsigned protocol_token; + int protocol_token; NameAST *name; ObjCProtocolRefsAST *protocol_refs; DeclarationListAST *member_declaration_list; - unsigned end_token; + int end_token; public: // annotations ObjCProtocol *symbol; @@ -3865,8 +3865,8 @@ public: virtual ObjCProtocolDeclarationAST *asObjCProtocolDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCProtocolDeclarationAST *clone(MemoryPool *pool) const; @@ -3878,9 +3878,9 @@ protected: class CPLUSPLUS_EXPORT ObjCProtocolRefsAST: public AST { public: - unsigned less_token; + int less_token; NameListAST *identifier_list; - unsigned greater_token; + int greater_token; public: ObjCProtocolRefsAST() @@ -3891,8 +3891,8 @@ public: virtual ObjCProtocolRefsAST *asObjCProtocolRefs() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCProtocolRefsAST *clone(MemoryPool *pool) const; @@ -3913,8 +3913,8 @@ public: virtual ObjCMessageArgumentAST *asObjCMessageArgument() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCMessageArgumentAST *clone(MemoryPool *pool) const; @@ -3926,11 +3926,11 @@ protected: class CPLUSPLUS_EXPORT ObjCMessageExpressionAST: public ExpressionAST { public: - unsigned lbracket_token; + int lbracket_token; ExpressionAST *receiver_expression; ObjCSelectorAST *selector; ObjCMessageArgumentListAST *argument_list; - unsigned rbracket_token; + int rbracket_token; public: ObjCMessageExpressionAST() @@ -3943,8 +3943,8 @@ public: virtual ObjCMessageExpressionAST *asObjCMessageExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCMessageExpressionAST *clone(MemoryPool *pool) const; @@ -3956,10 +3956,10 @@ protected: class CPLUSPLUS_EXPORT ObjCProtocolExpressionAST: public ExpressionAST { public: - unsigned protocol_token; - unsigned lparen_token; - unsigned identifier_token; - unsigned rparen_token; + int protocol_token; + int lparen_token; + int identifier_token; + int rparen_token; public: ObjCProtocolExpressionAST() @@ -3971,8 +3971,8 @@ public: virtual ObjCProtocolExpressionAST *asObjCProtocolExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCProtocolExpressionAST *clone(MemoryPool *pool) const; @@ -3984,10 +3984,10 @@ protected: class CPLUSPLUS_EXPORT ObjCTypeNameAST: public AST { public: - unsigned lparen_token; - unsigned type_qualifier_token; + int lparen_token; + int type_qualifier_token; ExpressionAST *type_id; - unsigned rparen_token; + int rparen_token; public: ObjCTypeNameAST() @@ -3999,8 +3999,8 @@ public: virtual ObjCTypeNameAST *asObjCTypeName() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCTypeNameAST *clone(MemoryPool *pool) const; @@ -4012,7 +4012,7 @@ protected: class CPLUSPLUS_EXPORT ObjCEncodeExpressionAST: public ExpressionAST { public: - unsigned encode_token; + int encode_token; ObjCTypeNameAST *type_name; public: @@ -4023,8 +4023,8 @@ public: virtual ObjCEncodeExpressionAST *asObjCEncodeExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCEncodeExpressionAST *clone(MemoryPool *pool) const; @@ -4036,10 +4036,10 @@ protected: class CPLUSPLUS_EXPORT ObjCSelectorExpressionAST: public ExpressionAST { public: - unsigned selector_token; - unsigned lparen_token; + int selector_token; + int lparen_token; ObjCSelectorAST *selector; - unsigned rparen_token; + int rparen_token; public: ObjCSelectorExpressionAST() @@ -4051,8 +4051,8 @@ public: virtual ObjCSelectorExpressionAST *asObjCSelectorExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCSelectorExpressionAST *clone(MemoryPool *pool) const; @@ -4064,9 +4064,9 @@ protected: class CPLUSPLUS_EXPORT ObjCInstanceVariablesDeclarationAST: public AST { public: - unsigned lbrace_token; + int lbrace_token; DeclarationListAST *instance_variable_list; - unsigned rbrace_token; + int rbrace_token; public: ObjCInstanceVariablesDeclarationAST() @@ -4077,8 +4077,8 @@ public: virtual ObjCInstanceVariablesDeclarationAST *asObjCInstanceVariablesDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCInstanceVariablesDeclarationAST *clone(MemoryPool *pool) const; @@ -4090,7 +4090,7 @@ protected: class CPLUSPLUS_EXPORT ObjCVisibilityDeclarationAST: public DeclarationAST { public: - unsigned visibility_token; + int visibility_token; public: ObjCVisibilityDeclarationAST() @@ -4099,8 +4099,8 @@ public: virtual ObjCVisibilityDeclarationAST *asObjCVisibilityDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCVisibilityDeclarationAST *clone(MemoryPool *pool) const; @@ -4112,8 +4112,8 @@ protected: class CPLUSPLUS_EXPORT ObjCPropertyAttributeAST: public AST { public: - unsigned attribute_identifier_token; - unsigned equals_token; + int attribute_identifier_token; + int equals_token; ObjCSelectorAST *method_selector; public: @@ -4125,8 +4125,8 @@ public: virtual ObjCPropertyAttributeAST *asObjCPropertyAttribute() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCPropertyAttributeAST *clone(MemoryPool *pool) const; @@ -4139,10 +4139,10 @@ class CPLUSPLUS_EXPORT ObjCPropertyDeclarationAST: public DeclarationAST { public: SpecifierListAST *attribute_list; - unsigned property_token; - unsigned lparen_token; + int property_token; + int lparen_token; ObjCPropertyAttributeListAST *property_attribute_list; - unsigned rparen_token; + int rparen_token; DeclarationAST *simple_declaration; public: // annotations @@ -4161,8 +4161,8 @@ public: virtual ObjCPropertyDeclarationAST *asObjCPropertyDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCPropertyDeclarationAST *clone(MemoryPool *pool) const; @@ -4191,8 +4191,8 @@ public: virtual ObjCMessageArgumentDeclarationAST *asObjCMessageArgumentDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCMessageArgumentDeclarationAST *clone(MemoryPool *pool) const; @@ -4204,11 +4204,11 @@ protected: class CPLUSPLUS_EXPORT ObjCMethodPrototypeAST: public AST { public: - unsigned method_type_token; + int method_type_token; ObjCTypeNameAST *type_name; ObjCSelectorAST *selector; ObjCMessageArgumentDeclarationListAST *argument_list; - unsigned dot_dot_dot_token; + int dot_dot_dot_token; SpecifierListAST *attribute_list; public: // annotations @@ -4227,8 +4227,8 @@ public: virtual ObjCMethodPrototypeAST *asObjCMethodPrototype() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCMethodPrototypeAST *clone(MemoryPool *pool) const; @@ -4242,7 +4242,7 @@ class CPLUSPLUS_EXPORT ObjCMethodDeclarationAST: public DeclarationAST public: ObjCMethodPrototypeAST *method_prototype; StatementAST *function_body; - unsigned semicolon_token; + int semicolon_token; public: ObjCMethodDeclarationAST() @@ -4253,8 +4253,8 @@ public: virtual ObjCMethodDeclarationAST *asObjCMethodDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCMethodDeclarationAST *clone(MemoryPool *pool) const; @@ -4266,9 +4266,9 @@ protected: class CPLUSPLUS_EXPORT ObjCSynthesizedPropertyAST: public AST { public: - unsigned property_identifier_token; - unsigned equals_token; - unsigned alias_identifier_token; + int property_identifier_token; + int equals_token; + int alias_identifier_token; public: ObjCSynthesizedPropertyAST() @@ -4279,8 +4279,8 @@ public: virtual ObjCSynthesizedPropertyAST *asObjCSynthesizedProperty() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCSynthesizedPropertyAST *clone(MemoryPool *pool) const; @@ -4292,9 +4292,9 @@ protected: class CPLUSPLUS_EXPORT ObjCSynthesizedPropertiesDeclarationAST: public DeclarationAST { public: - unsigned synthesized_token; + int synthesized_token; ObjCSynthesizedPropertyListAST *property_identifier_list; - unsigned semicolon_token; + int semicolon_token; public: ObjCSynthesizedPropertiesDeclarationAST() @@ -4305,8 +4305,8 @@ public: virtual ObjCSynthesizedPropertiesDeclarationAST *asObjCSynthesizedPropertiesDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCSynthesizedPropertiesDeclarationAST *clone(MemoryPool *pool) const; @@ -4318,9 +4318,9 @@ protected: class CPLUSPLUS_EXPORT ObjCDynamicPropertiesDeclarationAST: public DeclarationAST { public: - unsigned dynamic_token; + int dynamic_token; NameListAST *property_identifier_list; - unsigned semicolon_token; + int semicolon_token; public: ObjCDynamicPropertiesDeclarationAST() @@ -4331,8 +4331,8 @@ public: virtual ObjCDynamicPropertiesDeclarationAST *asObjCDynamicPropertiesDeclaration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCDynamicPropertiesDeclarationAST *clone(MemoryPool *pool) const; @@ -4344,8 +4344,8 @@ protected: class CPLUSPLUS_EXPORT ObjCFastEnumerationAST: public StatementAST { public: - unsigned for_token; - unsigned lparen_token; + int for_token; + int lparen_token; // declaration SpecifierListAST *type_specifier_list; @@ -4353,9 +4353,9 @@ public: // or an expression ExpressionAST *initializer; - unsigned in_token; + int in_token; ExpressionAST *fast_enumeratable_expression; - unsigned rparen_token; + int rparen_token; StatementAST *statement; public: // annotations @@ -4377,8 +4377,8 @@ public: virtual ObjCFastEnumerationAST *asObjCFastEnumeration() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCFastEnumerationAST *clone(MemoryPool *pool) const; @@ -4390,10 +4390,10 @@ protected: class CPLUSPLUS_EXPORT ObjCSynchronizedStatementAST: public StatementAST { public: - unsigned synchronized_token; - unsigned lparen_token; + int synchronized_token; + int lparen_token; ExpressionAST *synchronized_object; - unsigned rparen_token; + int rparen_token; StatementAST *statement; public: @@ -4407,8 +4407,8 @@ public: virtual ObjCSynchronizedStatementAST *asObjCSynchronizedStatement() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual ObjCSynchronizedStatementAST *clone(MemoryPool *pool) const; @@ -4434,8 +4434,8 @@ public: virtual LambdaExpressionAST *asLambdaExpression() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual LambdaExpressionAST *clone(MemoryPool *pool) const; protected: @@ -4446,9 +4446,9 @@ protected: class LambdaIntroducerAST: public AST { public: - unsigned lbracket_token; + int lbracket_token; LambdaCaptureAST *lambda_capture; - unsigned rbracket_token; + int rbracket_token; public: LambdaIntroducerAST() @@ -4458,8 +4458,8 @@ public: {} virtual LambdaIntroducerAST *asLambdaIntroducer() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual LambdaIntroducerAST *clone(MemoryPool *pool) const; @@ -4471,7 +4471,7 @@ protected: class LambdaCaptureAST: public AST { public: - unsigned default_capture_token; + int default_capture_token; CaptureListAST *capture_list; public: @@ -4481,8 +4481,8 @@ public: {} virtual LambdaCaptureAST *asLambdaCapture() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual LambdaCaptureAST *clone(MemoryPool *pool) const; @@ -4494,7 +4494,7 @@ protected: class CaptureAST: public AST { public: - unsigned amper_token; + int amper_token; NameAST *identifier; public: @@ -4504,8 +4504,8 @@ public: {} virtual CaptureAST *asCapture() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual CaptureAST *clone(MemoryPool *pool) const; @@ -4517,11 +4517,11 @@ protected: class LambdaDeclaratorAST: public AST { public: - unsigned lparen_token; + int lparen_token; ParameterDeclarationClauseAST *parameter_declaration_clause; - unsigned rparen_token; + int rparen_token; SpecifierListAST *attributes; - unsigned mutable_token; + int mutable_token; ExceptionSpecificationAST *exception_specification; TrailingReturnTypeAST *trailing_return_type; @@ -4541,8 +4541,8 @@ public: {} virtual LambdaDeclaratorAST *asLambdaDeclarator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual LambdaDeclaratorAST *clone(MemoryPool *pool) const; @@ -4554,7 +4554,7 @@ protected: class TrailingReturnTypeAST: public AST { public: - unsigned arrow_token; + int arrow_token; SpecifierListAST *attributes; SpecifierListAST *type_specifier_list; DeclaratorAST *declarator; @@ -4568,8 +4568,8 @@ public: {} virtual TrailingReturnTypeAST *asTrailingReturnType() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual TrailingReturnTypeAST *clone(MemoryPool *pool) const; @@ -4581,10 +4581,10 @@ protected: class BracedInitializerAST: public ExpressionAST { public: - unsigned lbrace_token; + int lbrace_token; ExpressionListAST *expression_list; - unsigned comma_token; - unsigned rbrace_token; + int comma_token; + int rbrace_token; public: BracedInitializerAST() @@ -4595,8 +4595,8 @@ public: {} virtual BracedInitializerAST *asBracedInitializer() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual BracedInitializerAST *clone(MemoryPool *pool) const; @@ -4618,8 +4618,8 @@ public: class DotDesignatorAST: public DesignatorAST { public: - unsigned dot_token; - unsigned identifier_token; + int dot_token; + int identifier_token; public: DotDesignatorAST() : dot_token(0) @@ -4627,8 +4627,8 @@ public: {} virtual DotDesignatorAST *asDotDesignator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DotDesignatorAST *clone(MemoryPool *pool) const; @@ -4640,9 +4640,9 @@ protected: class BracketDesignatorAST: public DesignatorAST { public: - unsigned lbracket_token; + int lbracket_token; ExpressionAST *expression; - unsigned rbracket_token; + int rbracket_token; public: BracketDesignatorAST() : lbracket_token(0) @@ -4651,8 +4651,8 @@ public: {} virtual BracketDesignatorAST *asBracketDesignator() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual BracketDesignatorAST *clone(MemoryPool *pool) const; @@ -4665,7 +4665,7 @@ class DesignatedInitializerAST: public ExpressionAST { public: DesignatorListAST *designator_list; - unsigned equal_token; + int equal_token; ExpressionAST *initializer; public: @@ -4676,8 +4676,8 @@ public: {} virtual DesignatedInitializerAST *asDesignatedInitializer() { return this; } - virtual unsigned firstToken() const; - virtual unsigned lastToken() const; + virtual int firstToken() const; + virtual int lastToken() const; virtual DesignatedInitializerAST *clone(MemoryPool *pool) const; diff --git a/src/libs/3rdparty/cplusplus/ASTVisitor.cpp b/src/libs/3rdparty/cplusplus/ASTVisitor.cpp index f4119e9ce1..3e0d62c9f2 100644 --- a/src/libs/3rdparty/cplusplus/ASTVisitor.cpp +++ b/src/libs/3rdparty/cplusplus/ASTVisitor.cpp @@ -49,44 +49,40 @@ TranslationUnit *ASTVisitor::translationUnit() const void ASTVisitor::setTranslationUnit(TranslationUnit *translationUnit) { _translationUnit = translationUnit; } -unsigned ASTVisitor::tokenCount() const +int ASTVisitor::tokenCount() const { return translationUnit()->tokenCount(); } -const Token &ASTVisitor::tokenAt(unsigned index) const +const Token &ASTVisitor::tokenAt(int index) const { return translationUnit()->tokenAt(index); } -int ASTVisitor::tokenKind(unsigned index) const +int ASTVisitor::tokenKind(int index) const { return translationUnit()->tokenKind(index); } -const char *ASTVisitor::spell(unsigned index) const +const char *ASTVisitor::spell(int index) const { return translationUnit()->spell(index); } -const Identifier *ASTVisitor::identifier(unsigned index) const +const Identifier *ASTVisitor::identifier(int index) const { return translationUnit()->identifier(index); } -const Literal *ASTVisitor::literal(unsigned index) const +const Literal *ASTVisitor::literal(int index) const { return translationUnit()->literal(index); } -const NumericLiteral *ASTVisitor::numericLiteral(unsigned index) const +const NumericLiteral *ASTVisitor::numericLiteral(int index) const { return translationUnit()->numericLiteral(index); } -const StringLiteral *ASTVisitor::stringLiteral(unsigned index) const +const StringLiteral *ASTVisitor::stringLiteral(int index) const { return translationUnit()->stringLiteral(index); } -void ASTVisitor::getPosition(unsigned offset, - unsigned *line, - unsigned *column, +void ASTVisitor::getPosition(int offset, int *line, int *column, const StringLiteral **fileName) const { translationUnit()->getPosition(offset, line, column, fileName); } -void ASTVisitor::getTokenPosition(unsigned index, - unsigned *line, - unsigned *column, +void ASTVisitor::getTokenPosition(int index, int *line, int *column, const StringLiteral **fileName) const { translationUnit()->getTokenPosition(index, line, column, fileName); } -void ASTVisitor::getTokenStartPosition(unsigned index, unsigned *line, unsigned *column) const +void ASTVisitor::getTokenStartPosition(int index, int *line, int *column) const { getPosition(tokenAt(index).utf16charsBegin(), line, column); } -void ASTVisitor::getTokenEndPosition(unsigned index, unsigned *line, unsigned *column) const +void ASTVisitor::getTokenEndPosition(int index, int *line, int *column) const { getPosition(tokenAt(index).utf16charsEnd(), line, column); } diff --git a/src/libs/3rdparty/cplusplus/ASTVisitor.h b/src/libs/3rdparty/cplusplus/ASTVisitor.h index 46bfde340b..a1740e12cd 100644 --- a/src/libs/3rdparty/cplusplus/ASTVisitor.h +++ b/src/libs/3rdparty/cplusplus/ASTVisitor.h @@ -38,27 +38,27 @@ public: void setTranslationUnit(TranslationUnit *translationUnit); Control *control() const; - unsigned tokenCount() const; - const Token &tokenAt(unsigned index) const; - int tokenKind(unsigned index) const; - const char *spell(unsigned index) const; - const Identifier *identifier(unsigned index) const; - const Literal *literal(unsigned index) const; - const NumericLiteral *numericLiteral(unsigned index) const; - const StringLiteral *stringLiteral(unsigned index) const; + int tokenCount() const; + const Token &tokenAt(int index) const; + int tokenKind(int index) const; + const char *spell(int index) const; + const Identifier *identifier(int index) const; + const Literal *literal(int index) const; + const NumericLiteral *numericLiteral(int index) const; + const StringLiteral *stringLiteral(int index) const; - void getPosition(unsigned offset, - unsigned *line, - unsigned *column = 0, - const StringLiteral **fileName = 0) const; + void getPosition(int offset, + int *line, + int *column = nullptr, + const StringLiteral **fileName = nullptr) const; - void getTokenPosition(unsigned index, - unsigned *line, - unsigned *column = 0, - const StringLiteral **fileName = 0) const; + void getTokenPosition(int index, + int *line, + int *column = nullptr, + const StringLiteral **fileName = nullptr) const; - void getTokenStartPosition(unsigned index, unsigned *line, unsigned *column) const; - void getTokenEndPosition(unsigned index, unsigned *line, unsigned *column) const; + void getTokenStartPosition(int index, int *line, int *column) const; + void getTokenEndPosition(int index, int *line, int *column) const; void accept(AST *ast); diff --git a/src/libs/3rdparty/cplusplus/Bind.cpp b/src/libs/3rdparty/cplusplus/Bind.cpp index 1f082a6ec8..80f02304d8 100644 --- a/src/libs/3rdparty/cplusplus/Bind.cpp +++ b/src/libs/3rdparty/cplusplus/Bind.cpp @@ -64,7 +64,7 @@ void Bind::setSkipFunctionBodies(bool skipFunctionBodies) _skipFunctionBodies = skipFunctionBodies; } -unsigned Bind::location(DeclaratorAST *ast, unsigned defaultLocation) const +int Bind::location(DeclaratorAST *ast, int defaultLocation) const { if (! ast) return defaultLocation; @@ -75,7 +75,7 @@ unsigned Bind::location(DeclaratorAST *ast, unsigned defaultLocation) const return ast->firstToken(); } -unsigned Bind::location(CoreDeclaratorAST *ast, unsigned defaultLocation) const +int Bind::location(CoreDeclaratorAST *ast, int defaultLocation) const { if (! ast) return defaultLocation; @@ -89,7 +89,7 @@ unsigned Bind::location(CoreDeclaratorAST *ast, unsigned defaultLocation) const return ast->firstToken(); } -unsigned Bind::location(NameAST *name, unsigned defaultLocation) const +int Bind::location(NameAST *name, int defaultLocation) const { if (! name) return defaultLocation; @@ -316,7 +316,7 @@ void Bind::attribute(GnuAttributeAST *ast) if (! ast) return; - // unsigned identifier_token = ast->identifier_token; + // int identifier_token = ast->identifier_token; if (const Identifier *id = identifier(ast->identifier_token)) { if (id == control()->deprecatedId()) _type.setDeprecated(true); @@ -324,12 +324,12 @@ void Bind::attribute(GnuAttributeAST *ast) _type.setUnavailable(true); } - // unsigned lparen_token = ast->lparen_token; - // unsigned tag_token = ast->tag_token; + // int lparen_token = ast->lparen_token; + // int tag_token = ast->tag_token; for (ExpressionListAST *it = ast->expression_list; it; it = it->next) { ExpressionTy value = this->expression(it->value); } - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; } bool Bind::visit(DeclaratorAST *ast) @@ -413,12 +413,12 @@ bool Bind::visit(BaseSpecifierAST *ast) return false; } -void Bind::baseSpecifier(BaseSpecifierAST *ast, unsigned colon_token, Class *klass) +void Bind::baseSpecifier(BaseSpecifierAST *ast, int colon_token, Class *klass) { if (! ast) return; - unsigned sourceLocation = location(ast->name, ast->firstToken()); + int sourceLocation = location(ast->name, ast->firstToken()); if (! sourceLocation) sourceLocation = std::max(colon_token, klass->sourceLocation()); @@ -448,11 +448,11 @@ void Bind::ctorInitializer(CtorInitializerAST *ast, Function *fun) if (! ast) return; - // unsigned colon_token = ast->colon_token; + // int colon_token = ast->colon_token; for (MemInitializerListAST *it = ast->member_initializer_list; it; it = it->next) { this->memInitializer(it->value, fun); } - // unsigned dot_dot_dot_token = ast->dot_dot_dot_token; + // int dot_dot_dot_token = ast->dot_dot_dot_token; } bool Bind::visit(EnumeratorAST *ast) @@ -508,7 +508,7 @@ void calculateConstantValue(const Symbol *symbol, EnumeratorDeclaration *e, Cont const std::string buffer = std::to_string(static_cast<long long>(constantValueAsInt)); e->setConstantValue(control->stringLiteral(buffer.c_str(), - unsigned(buffer.size()))); + int(buffer.size()))); } } } @@ -543,8 +543,8 @@ void Bind::enumerator(EnumeratorAST *ast, Enum *symbol) if (! ast) return; - // unsigned identifier_token = ast->identifier_token; - // unsigned equal_token = ast->equal_token; + // int identifier_token = ast->identifier_token; + // int equal_token = ast->equal_token; /*ExpressionTy expression =*/ this->expression(ast->expression); if (ast->identifier_token) { @@ -587,16 +587,16 @@ FullySpecifiedType Bind::exceptionSpecification(ExceptionSpecificationAST *ast, return type; if (DynamicExceptionSpecificationAST *dyn = ast->asDynamicExceptionSpecification()) { - // unsigned throw_token = ast->throw_token; - // unsigned lparen_token = ast->lparen_token; - // unsigned dot_dot_dot_token = ast->dot_dot_dot_token; + // int throw_token = ast->throw_token; + // int lparen_token = ast->lparen_token; + // int dot_dot_dot_token = ast->dot_dot_dot_token; for (ExpressionListAST *it = dyn->type_id_list; it; it = it->next) { /*ExpressionTy value =*/ this->expression(it->value); } } else if (NoExceptSpecificationAST *no = ast->asNoExceptSpecification()) { /*ExpressionTy value =*/ this->expression(no->expression); } - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return type; } @@ -637,11 +637,11 @@ const Name *Bind::nestedNameSpecifier(NestedNameSpecifierAST *ast) bool Bind::visit(ExpressionListParenAST *ast) { - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; for (ExpressionListAST *it = ast->expression_list; it; it = it->next) { /*ExpressionTy value =*/ this->expression(it->value); } - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } @@ -651,11 +651,11 @@ void Bind::newPlacement(ExpressionListParenAST *ast) if (! ast) return; - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; for (ExpressionListAST *it = ast->expression_list; it; it = it->next) { ExpressionTy value = this->expression(it->value); } - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; } bool Bind::visit(NewArrayDeclaratorAST *ast) @@ -672,9 +672,9 @@ FullySpecifiedType Bind::newArrayDeclarator(NewArrayDeclaratorAST *ast, const Fu if (! ast) return type; - // unsigned lbracket_token = ast->lbracket_token; + // int lbracket_token = ast->lbracket_token; ExpressionTy expression = this->expression(ast->expression); - // unsigned rbracket_token = ast->rbracket_token; + // int rbracket_token = ast->rbracket_token; return type; } @@ -719,9 +719,9 @@ OperatorNameId::Kind Bind::cppOperator(OperatorAST *ast) if (! ast) return kind; - // unsigned op_token = ast->op_token; - // unsigned open_token = ast->open_token; - // unsigned close_token = ast->close_token; + // int op_token = ast->op_token; + // int open_token = ast->open_token; + // int close_token = ast->close_token; switch (tokenKind(ast->op_token)) { case T_NEW: @@ -904,7 +904,7 @@ bool Bind::visit(ParameterDeclarationClauseAST *ast) return false; } -void Bind::parameterDeclarationClause(ParameterDeclarationClauseAST *ast, unsigned lparen_token, Function *fun) +void Bind::parameterDeclarationClause(ParameterDeclarationClauseAST *ast, int lparen_token, Function *fun) { if (! ast) return; @@ -992,7 +992,7 @@ FullySpecifiedType Bind::objCTypeName(ObjCTypeNameAST *ast) if (! ast) return FullySpecifiedType(); - // unsigned type_qualifier_token = ast->type_qualifier_token; + // int type_qualifier_token = ast->type_qualifier_token; ExpressionTy type_id = this->expression(ast->type_id); return type_id; } @@ -1011,11 +1011,11 @@ void Bind::objCInstanceVariablesDeclaration(ObjCInstanceVariablesDeclarationAST if (! ast) return; - // unsigned lbrace_token = ast->lbrace_token; + // int lbrace_token = ast->lbrace_token; for (DeclarationListAST *it = ast->instance_variable_list; it; it = it->next) { this->declaration(it->value); } - // unsigned rbrace_token = ast->rbrace_token; + // int rbrace_token = ast->rbrace_token; } bool Bind::visit(ObjCPropertyAttributeAST *ast) @@ -1030,8 +1030,8 @@ void Bind::objCPropertyAttribute(ObjCPropertyAttributeAST *ast) if (! ast) return; - // unsigned attribute_identifier_token = ast->attribute_identifier_token; - // unsigned equals_token = ast->equals_token; + // int attribute_identifier_token = ast->attribute_identifier_token; + // int equals_token = ast->equals_token; /*const Name *method_selector =*/ this->name(ast->method_selector); } @@ -1072,11 +1072,11 @@ ObjCMethod *Bind::objCMethodPrototype(ObjCMethodPrototypeAST *ast) if (! ast) return 0; - // unsigned method_type_token = ast->method_type_token; + // int method_type_token = ast->method_type_token; FullySpecifiedType returnType = this->objCTypeName(ast->type_name); const Name *selector = this->name(ast->selector); - const unsigned sourceLocation = location(ast->selector, ast->firstToken()); + const int sourceLocation = location(ast->selector, ast->firstToken()); ObjCMethod *method = control()->newObjCMethod(sourceLocation, selector); // ### set the offsets method->setReturnType(returnType); @@ -1115,9 +1115,9 @@ void Bind::objCSynthesizedProperty(ObjCSynthesizedPropertyAST *ast) if (! ast) return; - // unsigned property_identifier_token = ast->property_identifier_token; - // unsigned equals_token = ast->equals_token; - // unsigned alias_identifier_token = ast->alias_identifier_token; + // int property_identifier_token = ast->property_identifier_token; + // int equals_token = ast->equals_token; + // int alias_identifier_token = ast->alias_identifier_token; } bool Bind::visit(LambdaIntroducerAST *ast) @@ -1132,9 +1132,9 @@ void Bind::lambdaIntroducer(LambdaIntroducerAST *ast) if (! ast) return; - // unsigned lbracket_token = ast->lbracket_token; + // int lbracket_token = ast->lbracket_token; this->lambdaCapture(ast->lambda_capture); - // unsigned rbracket_token = ast->rbracket_token; + // int rbracket_token = ast->rbracket_token; } bool Bind::visit(LambdaCaptureAST *ast) @@ -1149,7 +1149,7 @@ void Bind::lambdaCapture(LambdaCaptureAST *ast) if (! ast) return; - // unsigned default_capture_token = ast->default_capture_token; + // int default_capture_token = ast->default_capture_token; for (CaptureListAST *it = ast->capture_list; it; it = it->next) { this->capture(it->value); } @@ -1191,13 +1191,13 @@ Function *Bind::lambdaDeclarator(LambdaDeclaratorAST *ast) type = this->trailingReturnType(ast->trailing_return_type, type); ast->symbol = fun; - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; this->parameterDeclarationClause(ast->parameter_declaration_clause, ast->lparen_token, fun); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; for (SpecifierListAST *it = ast->attributes; it; it = it->next) { type = this->specifier(it->value, type); } - // unsigned mutable_token = ast->mutable_token; + // int mutable_token = ast->mutable_token; type = this->exceptionSpecification(ast->exception_specification, type); if (!type.isValid()) @@ -1220,7 +1220,7 @@ FullySpecifiedType Bind::trailingReturnType(TrailingReturnTypeAST *ast, const Fu if (! ast) return type; - // unsigned arrow_token = ast->arrow_token; + // int arrow_token = ast->arrow_token; for (SpecifierListAST *it = ast->attributes; it; it = it->next) { type = this->specifier(it->value, type); } @@ -1235,16 +1235,16 @@ FullySpecifiedType Bind::trailingReturnType(TrailingReturnTypeAST *ast, const Fu const StringLiteral *Bind::asStringLiteral(const ExpressionAST *ast) { CPP_ASSERT(ast, return 0); - const unsigned firstToken = ast->firstToken(); - const unsigned lastToken = ast->lastToken(); + const int firstToken = ast->firstToken(); + const int lastToken = ast->lastToken(); std::string buffer; - for (unsigned index = firstToken; index != lastToken; ++index) { + for (int index = firstToken; index != lastToken; ++index) { const Token &tk = tokenAt(index); if (index != firstToken && (tk.whitespace() || tk.newline())) buffer += ' '; buffer += tk.spell(); } - return control()->stringLiteral(buffer.c_str(), unsigned(buffer.size())); + return control()->stringLiteral(buffer.c_str(), int(buffer.size())); } // StatementAST @@ -1266,7 +1266,7 @@ bool Bind::visit(QtMemberDeclarationAST *ast) privateClass += nameId->identifier()->chars(); privateClass += "Private"; - const Name *privName = control()->identifier(privateClass.c_str(), unsigned(privateClass.size())); + const Name *privName = control()->identifier(privateClass.c_str(), int(privateClass.size())); declTy.setType(control()->namedType(privName)); } } @@ -1289,7 +1289,7 @@ bool Bind::visit(CaseStatementAST *ast) bool Bind::visit(CompoundStatementAST *ast) { Block *block = control()->newBlock(ast->firstToken()); - unsigned startScopeToken = ast->lbrace_token ? ast->lbrace_token : ast->firstToken(); + int startScopeToken = ast->lbrace_token ? ast->lbrace_token : ast->firstToken(); block->setStartOffset(tokenAt(startScopeToken).utf16charsEnd()); block->setEndOffset(tokenAt(ast->lastToken() - 1).utf16charsEnd()); ast->symbol = block; @@ -1325,14 +1325,14 @@ bool Bind::visit(ExpressionOrDeclarationStatementAST *ast) bool Bind::visit(ExpressionStatementAST *ast) { ExpressionTy expression = this->expression(ast->expression); - // unsigned semicolon_token = ast->semicolon_token; + // int semicolon_token = ast->semicolon_token; return false; } bool Bind::visit(ForeachStatementAST *ast) { Block *block = control()->newBlock(ast->firstToken()); - const unsigned startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); + const int startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); block->setStartOffset(tokenAt(startScopeToken).utf16charsEnd()); block->setEndOffset(tokenAt(ast->lastToken()).utf16charsBegin()); _scope->addMember(block); @@ -1358,12 +1358,12 @@ bool Bind::visit(ForeachStatementAST *ast) else if (ast->expression != 0) { const StringLiteral *sl = asStringLiteral(ast->expression); const std::string buff = std::string("*") + sl->chars() + ".begin()"; - initializer = control()->stringLiteral(buff.c_str(), unsigned(buff.size())); + initializer = control()->stringLiteral(buff.c_str(), int(buff.size())); } } if (declaratorId && declaratorId->name) { - unsigned sourceLocation = location(declaratorId->name, ast->firstToken()); + int sourceLocation = location(declaratorId->name, ast->firstToken()); Declaration *decl = control()->newDeclaration(sourceLocation, declaratorId->name->name); decl->setType(type); decl->setInitializer(initializer); @@ -1380,7 +1380,7 @@ bool Bind::visit(ForeachStatementAST *ast) bool Bind::visit(RangeBasedForStatementAST *ast) { Block *block = control()->newBlock(ast->firstToken()); - const unsigned startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); + const int startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); block->setStartOffset(tokenAt(startScopeToken).utf16charsEnd()); block->setEndOffset(tokenAt(ast->lastToken()).utf16charsBegin()); _scope->addMember(block); @@ -1406,12 +1406,12 @@ bool Bind::visit(RangeBasedForStatementAST *ast) else if (ast->expression != 0) { const StringLiteral *sl = asStringLiteral(ast->expression); const std::string buff = std::string("*") + sl->chars() + ".begin()"; - initializer = control()->stringLiteral(buff.c_str(), unsigned(buff.size())); + initializer = control()->stringLiteral(buff.c_str(), int(buff.size())); } } if (declaratorId && declaratorId->name) { - unsigned sourceLocation = location(declaratorId->name, ast->firstToken()); + int sourceLocation = location(declaratorId->name, ast->firstToken()); Declaration *decl = control()->newDeclaration(sourceLocation, declaratorId->name->name); decl->setType(type); decl->setInitializer(initializer); @@ -1427,7 +1427,7 @@ bool Bind::visit(RangeBasedForStatementAST *ast) bool Bind::visit(ForStatementAST *ast) { Block *block = control()->newBlock(ast->firstToken()); - const unsigned startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); + const int startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); block->setStartOffset(tokenAt(startScopeToken).utf16charsEnd()); block->setEndOffset(tokenAt(ast->lastToken()).utf16charsBegin()); _scope->addMember(block); @@ -1436,9 +1436,9 @@ bool Bind::visit(ForStatementAST *ast) Scope *previousScope = switchScope(block); this->statement(ast->initializer); /*ExpressionTy condition =*/ this->expression(ast->condition); - // unsigned semicolon_token = ast->semicolon_token; + // int semicolon_token = ast->semicolon_token; /*ExpressionTy expression =*/ this->expression(ast->expression); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; this->statement(ast->statement); (void) switchScope(previousScope); return false; @@ -1447,7 +1447,7 @@ bool Bind::visit(ForStatementAST *ast) bool Bind::visit(IfStatementAST *ast) { Block *block = control()->newBlock(ast->firstToken()); - const unsigned startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); + const int startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); block->setStartOffset(tokenAt(startScopeToken).utf16charsEnd()); block->setEndOffset(tokenAt(ast->lastToken()).utf16charsBegin()); _scope->addMember(block); @@ -1463,8 +1463,8 @@ bool Bind::visit(IfStatementAST *ast) bool Bind::visit(LabeledStatementAST *ast) { - // unsigned label_token = ast->label_token; - // unsigned colon_token = ast->colon_token; + // int label_token = ast->label_token; + // int colon_token = ast->colon_token; this->statement(ast->statement); return false; } @@ -1472,25 +1472,25 @@ bool Bind::visit(LabeledStatementAST *ast) bool Bind::visit(BreakStatementAST *ast) { (void) ast; - // unsigned break_token = ast->break_token; - // unsigned semicolon_token = ast->semicolon_token; + // int break_token = ast->break_token; + // int semicolon_token = ast->semicolon_token; return false; } bool Bind::visit(ContinueStatementAST *ast) { (void) ast; - // unsigned continue_token = ast->continue_token; - // unsigned semicolon_token = ast->semicolon_token; + // int continue_token = ast->continue_token; + // int semicolon_token = ast->semicolon_token; return false; } bool Bind::visit(GotoStatementAST *ast) { (void) ast; - // unsigned goto_token = ast->goto_token; - // unsigned identifier_token = ast->identifier_token; - // unsigned semicolon_token = ast->semicolon_token; + // int goto_token = ast->goto_token; + // int identifier_token = ast->identifier_token; + // int semicolon_token = ast->semicolon_token; return false; } @@ -1503,7 +1503,7 @@ bool Bind::visit(ReturnStatementAST *ast) bool Bind::visit(SwitchStatementAST *ast) { Block *block = control()->newBlock(ast->firstToken()); - const unsigned startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); + const int startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); block->setStartOffset(tokenAt(startScopeToken).utf16charsEnd()); block->setEndOffset(tokenAt(ast->lastToken()).utf16charsBegin()); _scope->addMember(block); @@ -1518,7 +1518,7 @@ bool Bind::visit(SwitchStatementAST *ast) bool Bind::visit(TryBlockStatementAST *ast) { - // unsigned try_token = ast->try_token; + // int try_token = ast->try_token; this->statement(ast->statement); for (CatchClauseListAST *it = ast->catch_clause_list; it; it = it->next) { this->statement(it->value); @@ -1529,7 +1529,7 @@ bool Bind::visit(TryBlockStatementAST *ast) bool Bind::visit(CatchClauseAST *ast) { Block *block = control()->newBlock(ast->firstToken()); - const unsigned startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); + const int startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); block->setStartOffset(tokenAt(startScopeToken).utf16charsEnd()); block->setEndOffset(tokenAt(ast->lastToken()).utf16charsBegin()); _scope->addMember(block); @@ -1537,7 +1537,7 @@ bool Bind::visit(CatchClauseAST *ast) Scope *previousScope = switchScope(block); this->declaration(ast->exception_declaration); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; this->statement(ast->statement); (void) switchScope(previousScope); return false; @@ -1546,7 +1546,7 @@ bool Bind::visit(CatchClauseAST *ast) bool Bind::visit(WhileStatementAST *ast) { Block *block = control()->newBlock(ast->firstToken()); - const unsigned startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); + const int startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); block->setStartOffset(tokenAt(startScopeToken).utf16charsEnd()); block->setEndOffset(tokenAt(ast->lastToken()).utf16charsBegin()); _scope->addMember(block); @@ -1562,7 +1562,7 @@ bool Bind::visit(WhileStatementAST *ast) bool Bind::visit(ObjCFastEnumerationAST *ast) { Block *block = control()->newBlock(ast->firstToken()); - const unsigned startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); + const int startScopeToken = ast->lparen_token ? ast->lparen_token : ast->firstToken(); block->setStartOffset(tokenAt(startScopeToken).utf16charsEnd()); block->setEndOffset(tokenAt(ast->lastToken()).utf16charsBegin()); _scope->addMember(block); @@ -1577,7 +1577,7 @@ bool Bind::visit(ObjCFastEnumerationAST *ast) type = this->declarator(ast->declarator, type, &declaratorId); if (declaratorId && declaratorId->name) { - unsigned sourceLocation = location(declaratorId->name, ast->firstToken()); + int sourceLocation = location(declaratorId->name, ast->firstToken()); Declaration *decl = control()->newDeclaration(sourceLocation, declaratorId->name->name); decl->setType(type); block->addMember(decl); @@ -1592,10 +1592,10 @@ bool Bind::visit(ObjCFastEnumerationAST *ast) bool Bind::visit(ObjCSynchronizedStatementAST *ast) { - // unsigned synchronized_token = ast->synchronized_token; - // unsigned lparen_token = ast->lparen_token; + // int synchronized_token = ast->synchronized_token; + // int lparen_token = ast->lparen_token; ExpressionTy synchronized_object = this->expression(ast->synchronized_object); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; this->statement(ast->statement); return false; } @@ -1610,45 +1610,45 @@ bool Bind::visit(IdExpressionAST *ast) bool Bind::visit(CompoundExpressionAST *ast) { - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; this->statement(ast->statement); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(CompoundLiteralAST *ast) { - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; ExpressionTy type_id = this->expression(ast->type_id); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; ExpressionTy initializer = this->expression(ast->initializer); return false; } bool Bind::visit(QtMethodAST *ast) { - // unsigned method_token = ast->method_token; - // unsigned lparen_token = ast->lparen_token; + // int method_token = ast->method_token; + // int lparen_token = ast->lparen_token; FullySpecifiedType type; DeclaratorIdAST *declaratorId = 0; type = this->declarator(ast->declarator, type, &declaratorId); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(BinaryExpressionAST *ast) { ExpressionTy left_expression = this->expression(ast->left_expression); - // unsigned binary_op_token = ast->binary_op_token; + // int binary_op_token = ast->binary_op_token; ExpressionTy right_expression = this->expression(ast->right_expression); return false; } bool Bind::visit(CastExpressionAST *ast) { - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; ExpressionTy type_id = this->expression(ast->type_id); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; ExpressionTy expression = this->expression(ast->expression); return false; } @@ -1663,7 +1663,7 @@ bool Bind::visit(ConditionAST *ast) type = this->declarator(ast->declarator, type, &declaratorId); if (declaratorId && declaratorId->name) { - unsigned sourceLocation = location(declaratorId->name, ast->firstToken()); + int sourceLocation = location(declaratorId->name, ast->firstToken()); Declaration *decl = control()->newDeclaration(sourceLocation, declaratorId->name->name); decl->setType(type); @@ -1679,53 +1679,53 @@ bool Bind::visit(ConditionAST *ast) bool Bind::visit(ConditionalExpressionAST *ast) { ExpressionTy condition = this->expression(ast->condition); - // unsigned question_token = ast->question_token; + // int question_token = ast->question_token; ExpressionTy left_expression = this->expression(ast->left_expression); - // unsigned colon_token = ast->colon_token; + // int colon_token = ast->colon_token; ExpressionTy right_expression = this->expression(ast->right_expression); return false; } bool Bind::visit(CppCastExpressionAST *ast) { - // unsigned cast_token = ast->cast_token; - // unsigned less_token = ast->less_token; + // int cast_token = ast->cast_token; + // int less_token = ast->less_token; ExpressionTy type_id = this->expression(ast->type_id); - // unsigned greater_token = ast->greater_token; - // unsigned lparen_token = ast->lparen_token; + // int greater_token = ast->greater_token; + // int lparen_token = ast->lparen_token; ExpressionTy expression = this->expression(ast->expression); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(DeleteExpressionAST *ast) { - // unsigned scope_token = ast->scope_token; - // unsigned delete_token = ast->delete_token; - // unsigned lbracket_token = ast->lbracket_token; - // unsigned rbracket_token = ast->rbracket_token; + // int scope_token = ast->scope_token; + // int delete_token = ast->delete_token; + // int lbracket_token = ast->lbracket_token; + // int rbracket_token = ast->rbracket_token; ExpressionTy expression = this->expression(ast->expression); return false; } bool Bind::visit(ArrayInitializerAST *ast) { - // unsigned lbrace_token = ast->lbrace_token; + // int lbrace_token = ast->lbrace_token; for (ExpressionListAST *it = ast->expression_list; it; it = it->next) { ExpressionTy value = this->expression(it->value); } - // unsigned rbrace_token = ast->rbrace_token; + // int rbrace_token = ast->rbrace_token; return false; } bool Bind::visit(NewExpressionAST *ast) { - // unsigned scope_token = ast->scope_token; - // unsigned new_token = ast->new_token; + // int scope_token = ast->scope_token; + // int new_token = ast->new_token; this->newPlacement(ast->new_placement); - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; ExpressionTy type_id = this->expression(ast->type_id); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; this->newTypeId(ast->new_type_id); this->expression(ast->new_initializer); return false; @@ -1733,16 +1733,16 @@ bool Bind::visit(NewExpressionAST *ast) bool Bind::visit(TypeidExpressionAST *ast) { - // unsigned typeid_token = ast->typeid_token; - // unsigned lparen_token = ast->lparen_token; + // int typeid_token = ast->typeid_token; + // int lparen_token = ast->lparen_token; ExpressionTy expression = this->expression(ast->expression); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(TypenameCallExpressionAST *ast) { - // unsigned typename_token = ast->typename_token; + // int typename_token = ast->typename_token; /*const Name *name =*/ this->name(ast->name); this->expression(ast->expression); return false; @@ -1760,60 +1760,60 @@ bool Bind::visit(TypeConstructorCallAST *ast) bool Bind::visit(SizeofExpressionAST *ast) { - // unsigned sizeof_token = ast->sizeof_token; - // unsigned dot_dot_dot_token = ast->dot_dot_dot_token; - // unsigned lparen_token = ast->lparen_token; + // int sizeof_token = ast->sizeof_token; + // int dot_dot_dot_token = ast->dot_dot_dot_token; + // int lparen_token = ast->lparen_token; ExpressionTy expression = this->expression(ast->expression); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(PointerLiteralAST *ast) { (void) ast; - // unsigned literal_token = ast->literal_token; + // int literal_token = ast->literal_token; return false; } bool Bind::visit(NumericLiteralAST *ast) { (void) ast; - // unsigned literal_token = ast->literal_token; + // int literal_token = ast->literal_token; return false; } bool Bind::visit(BoolLiteralAST *ast) { (void) ast; - // unsigned literal_token = ast->literal_token; + // int literal_token = ast->literal_token; return false; } bool Bind::visit(ThisExpressionAST *ast) { (void) ast; - // unsigned this_token = ast->this_token; + // int this_token = ast->this_token; return false; } bool Bind::visit(NestedExpressionAST *ast) { - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; ExpressionTy expression = this->expression(ast->expression); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(StringLiteralAST *ast) { - // unsigned literal_token = ast->literal_token; + // int literal_token = ast->literal_token; ExpressionTy next = this->expression(ast->next); return false; } bool Bind::visit(ThrowExpressionAST *ast) { - // unsigned throw_token = ast->throw_token; + // int throw_token = ast->throw_token; ExpressionTy expression = this->expression(ast->expression); return false; } @@ -1832,46 +1832,46 @@ bool Bind::visit(TypeIdAST *ast) bool Bind::visit(UnaryExpressionAST *ast) { - // unsigned unary_op_token = ast->unary_op_token; + // int unary_op_token = ast->unary_op_token; ExpressionTy expression = this->expression(ast->expression); return false; } bool Bind::visit(ObjCMessageExpressionAST *ast) { - // unsigned lbracket_token = ast->lbracket_token; + // int lbracket_token = ast->lbracket_token; /*ExpressionTy receiver_expression =*/ this->expression(ast->receiver_expression); /*const Name *selector =*/ this->name(ast->selector); for (ObjCMessageArgumentListAST *it = ast->argument_list; it; it = it->next) { this->objCMessageArgument(it->value); } - // unsigned rbracket_token = ast->rbracket_token; + // int rbracket_token = ast->rbracket_token; return false; } bool Bind::visit(ObjCProtocolExpressionAST *ast) { (void) ast; - // unsigned protocol_token = ast->protocol_token; - // unsigned lparen_token = ast->lparen_token; - // unsigned identifier_token = ast->identifier_token; - // unsigned rparen_token = ast->rparen_token; + // int protocol_token = ast->protocol_token; + // int lparen_token = ast->lparen_token; + // int identifier_token = ast->identifier_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(ObjCEncodeExpressionAST *ast) { - // unsigned encode_token = ast->encode_token; + // int encode_token = ast->encode_token; FullySpecifiedType type = this->objCTypeName(ast->type_name); return false; } bool Bind::visit(ObjCSelectorExpressionAST *ast) { - // unsigned selector_token = ast->selector_token; - // unsigned lparen_token = ast->lparen_token; + // int selector_token = ast->selector_token; + // int lparen_token = ast->lparen_token; /*const Name *selector =*/ this->name(ast->selector); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } @@ -1892,12 +1892,12 @@ bool Bind::visit(LambdaExpressionAST *ast) bool Bind::visit(BracedInitializerAST *ast) { - // unsigned lbrace_token = ast->lbrace_token; + // int lbrace_token = ast->lbrace_token; for (ExpressionListAST *it = ast->expression_list; it; it = it->next) { /*ExpressionTy value =*/ this->expression(it->value); } - // unsigned comma_token = ast->comma_token; - // unsigned rbrace_token = ast->rbrace_token; + // int comma_token = ast->comma_token; + // int rbrace_token = ast->rbrace_token; return false; } @@ -1920,7 +1920,7 @@ bool Bind::visit(SimpleDeclarationAST *ast) if (ast->qt_invokable_token) methodKey = methodKeyForInvokableToken(tokenKind(ast->qt_invokable_token)); - // unsigned qt_invokable_token = ast->qt_invokable_token; + // int qt_invokable_token = ast->qt_invokable_token; FullySpecifiedType type; for (SpecifierListAST *it = ast->decl_specifier_list; it; it = it->next) { type = this->specifier(it->value, type); @@ -1934,7 +1934,7 @@ bool Bind::visit(SimpleDeclarationAST *ast) elabTypeSpec = it->value->asElaboratedTypeSpecifier(); if (elabTypeSpec && tokenKind(elabTypeSpec->classkey_token) != T_TYPENAME) { - unsigned sourceLocation = elabTypeSpec->firstToken(); + int sourceLocation = elabTypeSpec->firstToken(); const Name *name = 0; if (elabTypeSpec->name) { sourceLocation = location(elabTypeSpec->name, sourceLocation); @@ -1957,7 +1957,7 @@ bool Bind::visit(SimpleDeclarationAST *ast) FullySpecifiedType declTy = this->declarator(it->value, type, &declaratorId); const Name *declName = 0; - unsigned sourceLocation = location(it->value, ast->firstToken()); + int sourceLocation = location(it->value, ast->firstToken()); if (declaratorId && declaratorId->name) declName = declaratorId->name->name; @@ -2006,7 +2006,7 @@ bool Bind::visit(SimpleDeclarationAST *ast) bool Bind::visit(EmptyDeclarationAST *ast) { (void) ast; - unsigned semicolon_token = ast->semicolon_token; + int semicolon_token = ast->semicolon_token; if (_scope && (_scope->isClass() || _scope->isNamespace())) { const Token &tk = tokenAt(semicolon_token); @@ -2034,25 +2034,25 @@ bool Bind::visit(AccessDeclarationAST *ast) bool Bind::visit(QtObjectTagAST *ast) { (void) ast; - // unsigned q_object_token = ast->q_object_token; + // int q_object_token = ast->q_object_token; return false; } bool Bind::visit(QtPrivateSlotAST *ast) { - // unsigned q_private_slot_token = ast->q_private_slot_token; - // unsigned lparen_token = ast->lparen_token; - // unsigned dptr_token = ast->dptr_token; - // unsigned dptr_lparen_token = ast->dptr_lparen_token; - // unsigned dptr_rparen_token = ast->dptr_rparen_token; - // unsigned comma_token = ast->comma_token; + // int q_private_slot_token = ast->q_private_slot_token; + // int lparen_token = ast->lparen_token; + // int dptr_token = ast->dptr_token; + // int dptr_lparen_token = ast->dptr_lparen_token; + // int dptr_rparen_token = ast->dptr_rparen_token; + // int comma_token = ast->comma_token; FullySpecifiedType type; for (SpecifierListAST *it = ast->type_specifier_list; it; it = it->next) { type = this->specifier(it->value, type); } DeclaratorIdAST *declaratorId = 0; type = this->declarator(ast->declarator, type, &declaratorId); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } @@ -2075,12 +2075,12 @@ static void qtPropertyAttribute(TranslationUnit *unit, ExpressionAST *expression bool Bind::visit(QtPropertyDeclarationAST *ast) { - // unsigned property_specifier_token = ast->property_specifier_token; - // unsigned lparen_token = ast->lparen_token; + // int property_specifier_token = ast->property_specifier_token; + // int lparen_token = ast->lparen_token; ExpressionTy type_id = this->expression(ast->type_id); const Name *property_name = this->name(ast->property_name); - unsigned sourceLocation = ast->firstToken(); + int sourceLocation = ast->firstToken(); if (ast->property_name) sourceLocation = ast->property_name->firstToken(); QtPropertyDeclaration *propertyDeclaration = control()->newQtPropertyDeclaration(sourceLocation, property_name); @@ -2128,14 +2128,14 @@ bool Bind::visit(QtPropertyDeclarationAST *ast) } propertyDeclaration->setFlags(flags); _scope->addMember(propertyDeclaration); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(QtEnumDeclarationAST *ast) { - // unsigned enum_specifier_token = ast->enum_specifier_token; - // unsigned lparen_token = ast->lparen_token; + // int enum_specifier_token = ast->enum_specifier_token; + // int lparen_token = ast->lparen_token; for (NameListAST *it = ast->enumerator_list; it; it = it->next) { const Name *value = this->name(it->value); if (!value) @@ -2144,29 +2144,29 @@ bool Bind::visit(QtEnumDeclarationAST *ast) _scope->addMember(qtEnum); } - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(QtFlagsDeclarationAST *ast) { - // unsigned flags_specifier_token = ast->flags_specifier_token; - // unsigned lparen_token = ast->lparen_token; + // int flags_specifier_token = ast->flags_specifier_token; + // int lparen_token = ast->lparen_token; for (NameListAST *it = ast->flag_enums_list; it; it = it->next) { /*const Name *value =*/ this->name(it->value); } - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(QtInterfacesDeclarationAST *ast) { - // unsigned interfaces_token = ast->interfaces_token; - // unsigned lparen_token = ast->lparen_token; + // int interfaces_token = ast->interfaces_token; + // int lparen_token = ast->lparen_token; for (QtInterfaceNameListAST *it = ast->interface_name_list; it; it = it->next) { this->qtInterfaceName(it->value); } - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } @@ -2194,11 +2194,11 @@ bool Bind::visit(AliasDeclarationAST *ast) bool Bind::visit(AsmDefinitionAST *ast) { (void) ast; - // unsigned asm_token = ast->asm_token; - // unsigned volatile_token = ast->volatile_token; - // unsigned lparen_token = ast->lparen_token; - // unsigned rparen_token = ast->rparen_token; - // unsigned semicolon_token = ast->semicolon_token; + // int asm_token = ast->asm_token; + // int volatile_token = ast->volatile_token; + // int lparen_token = ast->lparen_token; + // int rparen_token = ast->rparen_token; + // int semicolon_token = ast->semicolon_token; return false; } @@ -2218,7 +2218,7 @@ bool Bind::visit(ExceptionDeclarationAST *ast) arg->setType(type); _scope->addMember(arg); - // unsigned dot_dot_dot_token = ast->dot_dot_dot_token; + // int dot_dot_dot_token = ast->dot_dot_dot_token; return false; } @@ -2270,32 +2270,32 @@ bool Bind::visit(FunctionDefinitionAST *ast) bool Bind::visit(LinkageBodyAST *ast) { - // unsigned lbrace_token = ast->lbrace_token; + // int lbrace_token = ast->lbrace_token; for (DeclarationListAST *it = ast->declaration_list; it; it = it->next) { this->declaration(it->value); } - // unsigned rbrace_token = ast->rbrace_token; + // int rbrace_token = ast->rbrace_token; return false; } bool Bind::visit(LinkageSpecificationAST *ast) { - // unsigned extern_token = ast->extern_token; - // unsigned extern_type_token = ast->extern_type_token; + // int extern_token = ast->extern_token; + // int extern_type_token = ast->extern_type_token; this->declaration(ast->declaration); return false; } bool Bind::visit(NamespaceAST *ast) { - // unsigned namespace_token = ast->namespace_token; - // unsigned identifier_token = ast->identifier_token; + // int namespace_token = ast->namespace_token; + // int identifier_token = ast->identifier_token; FullySpecifiedType type; for (SpecifierListAST *it = ast->attribute_list; it; it = it->next) { type = this->specifier(it->value, type); } - unsigned sourceLocation = ast->firstToken(); + int sourceLocation = ast->firstToken(); const Name *namespaceName = 0; if (ast->identifier_token) { sourceLocation = ast->identifier_token; @@ -2317,7 +2317,7 @@ bool Bind::visit(NamespaceAST *ast) bool Bind::visit(NamespaceAliasDefinitionAST *ast) { - unsigned sourceLocation = ast->firstToken(); + int sourceLocation = ast->firstToken(); const Name *name = 0; if (ast->namespace_name_token) { sourceLocation = ast->namespace_name_token; @@ -2338,7 +2338,7 @@ bool Bind::visit(ParameterDeclarationAST *ast) } DeclaratorIdAST *declaratorId = 0; type = this->declarator(ast->declarator, type, &declaratorId); - // unsigned equal_token = ast->equal_token; + // int equal_token = ast->equal_token; ExpressionTy expression = this->expression(ast->expression); const Name *argName = 0; @@ -2368,7 +2368,7 @@ bool Bind::visit(TemplateDeclarationAST *ast) for (DeclarationListAST *it = ast->template_parameter_list; it; it = it->next) { this->declaration(it->value); } - // unsigned greater_token = ast->greater_token; + // int greater_token = ast->greater_token; this->declaration(ast->declaration); (void) switchScope(previousScope); @@ -2383,9 +2383,9 @@ bool Bind::visit(TemplateDeclarationAST *ast) bool Bind::visit(TypenameTypeParameterAST *ast) { - unsigned sourceLocation = location(ast->name, ast->firstToken()); - // unsigned classkey_token = ast->classkey_token; - // unsigned dot_dot_dot_token = ast->dot_dot_dot_token; + int sourceLocation = location(ast->name, ast->firstToken()); + // int classkey_token = ast->classkey_token; + // int dot_dot_dot_token = ast->dot_dot_dot_token; const Name *name = this->name(ast->name); ExpressionTy type_id = this->expression(ast->type_id); CPlusPlus::Kind classKey = translationUnit()->tokenKind(ast->classkey_token); @@ -2400,19 +2400,19 @@ bool Bind::visit(TypenameTypeParameterAST *ast) bool Bind::visit(TemplateTypeParameterAST *ast) { - unsigned sourceLocation = location(ast->name, ast->firstToken()); + int sourceLocation = location(ast->name, ast->firstToken()); - // unsigned template_token = ast->template_token; - // unsigned less_token = ast->less_token; + // int template_token = ast->template_token; + // int less_token = ast->less_token; // ### process the template prototype #if 0 for (DeclarationListAST *it = ast->template_parameter_list; it; it = it->next) { this->declaration(it->value); } #endif - // unsigned greater_token = ast->greater_token; - // unsigned class_token = ast->class_token; - // unsigned dot_dot_dot_token = ast->dot_dot_dot_token; + // int greater_token = ast->greater_token; + // int class_token = ast->class_token; + // int dot_dot_dot_token = ast->dot_dot_dot_token; const Name *name = this->name(ast->name); ExpressionTy type_id = this->expression(ast->type_id); @@ -2428,7 +2428,7 @@ bool Bind::visit(TemplateTypeParameterAST *ast) bool Bind::visit(UsingAST *ast) { - unsigned sourceLocation = location(ast->name, ast->firstToken()); + int sourceLocation = location(ast->name, ast->firstToken()); const Name *name = this->name(ast->name); UsingDeclaration *symbol = control()->newUsingDeclaration(sourceLocation, name); @@ -2439,7 +2439,7 @@ bool Bind::visit(UsingAST *ast) bool Bind::visit(UsingDirectiveAST *ast) { - unsigned sourceLocation = location(ast->name, ast->firstToken()); + int sourceLocation = location(ast->name, ast->firstToken()); const Name *name = this->name(ast->name); UsingNamespaceDirective *symbol = control()->newUsingNamespaceDirective(sourceLocation, name); ast->symbol = symbol; @@ -2456,11 +2456,11 @@ bool Bind::visit(ObjCClassForwardDeclarationAST *ast) List<ObjCForwardClassDeclaration *> **symbolTail = &ast->symbols; - // unsigned class_token = ast->class_token; + // int class_token = ast->class_token; for (NameListAST *it = ast->identifier_list; it; it = it->next) { const Name *name = this->name(it->value); - const unsigned sourceLocation = location(it->value, ast->firstToken()); + const int sourceLocation = location(it->value, ast->firstToken()); ObjCForwardClassDeclaration *fwd = control()->newObjCForwardClassDeclaration(sourceLocation, name); setDeclSpecifiers(fwd, declSpecifiers); _scope->addMember(fwd); @@ -2472,18 +2472,18 @@ bool Bind::visit(ObjCClassForwardDeclarationAST *ast) return false; } -unsigned Bind::calculateScopeStart(ObjCClassDeclarationAST *ast) const +int Bind::calculateScopeStart(ObjCClassDeclarationAST *ast) const { if (ast->inst_vars_decl) - if (unsigned pos = ast->inst_vars_decl->lbrace_token) + if (int pos = ast->inst_vars_decl->lbrace_token) return tokenAt(pos).utf16charsEnd(); if (ast->protocol_refs) - if (unsigned pos = ast->protocol_refs->lastToken()) + if (int pos = ast->protocol_refs->lastToken()) return tokenAt(pos - 1).utf16charsEnd(); if (ast->superclass) - if (unsigned pos = ast->superclass->lastToken()) + if (int pos = ast->superclass->lastToken()) return tokenAt(pos - 1).utf16charsEnd(); if (ast->colon_token) @@ -2493,14 +2493,14 @@ unsigned Bind::calculateScopeStart(ObjCClassDeclarationAST *ast) const return tokenAt(ast->rparen_token).utf16charsEnd(); if (ast->category_name) - if (unsigned pos = ast->category_name->lastToken()) + if (int pos = ast->category_name->lastToken()) return tokenAt(pos - 1).utf16charsEnd(); if (ast->lparen_token) return tokenAt(ast->lparen_token).utf16charsEnd(); if (ast->class_name) - if (unsigned pos = ast->class_name->lastToken()) + if (int pos = ast->class_name->lastToken()) return tokenAt(pos - 1).utf16charsEnd(); return tokenAt(ast->firstToken()).utf16charsBegin(); @@ -2515,7 +2515,7 @@ bool Bind::visit(ObjCClassDeclarationAST *ast) const Name *class_name = this->name(ast->class_name); const Name *category_name = this->name(ast->category_name); - const unsigned sourceLocation = location(ast->class_name, ast->firstToken()); + const int sourceLocation = location(ast->class_name, ast->firstToken()); ObjCClass *klass = control()->newObjCClass(sourceLocation, class_name); ast->symbol = klass; _scope->addMember(klass); @@ -2560,11 +2560,11 @@ bool Bind::visit(ObjCProtocolForwardDeclarationAST *ast) List<ObjCForwardProtocolDeclaration *> **symbolTail = &ast->symbols; - // unsigned class_token = ast->class_token; + // int class_token = ast->class_token; for (NameListAST *it = ast->identifier_list; it; it = it->next) { const Name *name = this->name(it->value); - const unsigned sourceLocation = location(it->value, ast->firstToken()); + const int sourceLocation = location(it->value, ast->firstToken()); ObjCForwardProtocolDeclaration *fwd = control()->newObjCForwardProtocolDeclaration(sourceLocation, name); setDeclSpecifiers(fwd, declSpecifiers); _scope->addMember(fwd); @@ -2576,13 +2576,13 @@ bool Bind::visit(ObjCProtocolForwardDeclarationAST *ast) return false; } -unsigned Bind::calculateScopeStart(ObjCProtocolDeclarationAST *ast) const +int Bind::calculateScopeStart(ObjCProtocolDeclarationAST *ast) const { if (ast->protocol_refs) - if (unsigned pos = ast->protocol_refs->lastToken()) + if (int pos = ast->protocol_refs->lastToken()) return tokenAt(pos - 1).utf16charsEnd(); if (ast->name) - if (unsigned pos = ast->name->lastToken()) + if (int pos = ast->name->lastToken()) return tokenAt(pos - 1).utf16charsEnd(); return tokenAt(ast->firstToken()).utf16charsBegin(); @@ -2594,10 +2594,10 @@ bool Bind::visit(ObjCProtocolDeclarationAST *ast) for (SpecifierListAST *it = ast->attribute_list; it; it = it->next) { type = this->specifier(it->value, type); } - // unsigned protocol_token = ast->protocol_token; + // int protocol_token = ast->protocol_token; const Name *name = this->name(ast->name); - const unsigned sourceLocation = location(ast->name, ast->firstToken()); + const int sourceLocation = location(ast->name, ast->firstToken()); ObjCProtocol *protocol = control()->newObjCProtocol(sourceLocation, name); protocol->setStartOffset(calculateScopeStart(ast)); protocol->setEndOffset(tokenAt(ast->lastToken() - 1).utf16charsEnd()); @@ -2630,12 +2630,12 @@ bool Bind::visit(ObjCPropertyDeclarationAST *ast) for (SpecifierListAST *it = ast->attribute_list; it; it = it->next) { type = this->specifier(it->value, type); } - // unsigned property_token = ast->property_token; - // unsigned lparen_token = ast->lparen_token; + // int property_token = ast->property_token; + // int lparen_token = ast->lparen_token; for (ObjCPropertyAttributeListAST *it = ast->property_attribute_list; it; it = it->next) { this->objCPropertyAttribute(it->value); } - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; this->declaration(ast->simple_declaration); // List<ObjCPropertyDeclaration *> *symbols = ast->symbols; return false; @@ -2647,7 +2647,7 @@ bool Bind::visit(ObjCMethodDeclarationAST *ast) if (! ast->function_body) { const Name *name = method->name(); - unsigned sourceLocation = ast->firstToken(); + int sourceLocation = ast->firstToken(); Declaration *decl = control()->newDeclaration(sourceLocation, name); decl->setType(method); _scope->addMember(decl); @@ -2665,21 +2665,21 @@ bool Bind::visit(ObjCMethodDeclarationAST *ast) bool Bind::visit(ObjCSynthesizedPropertiesDeclarationAST *ast) { - // unsigned synthesized_token = ast->synthesized_token; + // int synthesized_token = ast->synthesized_token; for (ObjCSynthesizedPropertyListAST *it = ast->property_identifier_list; it; it = it->next) { this->objCSynthesizedProperty(it->value); } - // unsigned semicolon_token = ast->semicolon_token; + // int semicolon_token = ast->semicolon_token; return false; } bool Bind::visit(ObjCDynamicPropertiesDeclarationAST *ast) { - // unsigned dynamic_token = ast->dynamic_token; + // int dynamic_token = ast->dynamic_token; for (NameListAST *it = ast->property_identifier_list; it; it = it->next) { /*const Name *value =*/ this->name(it->value); } - // unsigned semicolon_token = ast->semicolon_token; + // int semicolon_token = ast->semicolon_token; return false; } @@ -2696,7 +2696,7 @@ bool Bind::visit(ObjCSelectorAST *ast) // ### review } if (! arguments.empty()) { - _name = control()->selectorNameId(&arguments[0], unsigned(arguments.size()), hasArgs); + _name = control()->selectorNameId(&arguments[0], int(arguments.size()), hasArgs); ast->name = _name; } @@ -2781,7 +2781,7 @@ bool Bind::visit(TemplateIdAST *ast) _name = control()->templateNameId(id, isSpecialization); else _name = control()->templateNameId(id, isSpecialization, &templateArguments[0], - unsigned(templateArguments.size())); + int(templateArguments.size())); ast->name = _name; return false; @@ -3003,14 +3003,14 @@ bool Bind::visit(AlignmentSpecifierAST *ast) bool Bind::visit(GnuAttributeSpecifierAST *ast) { - // unsigned attribute_token = ast->attribute_token; - // unsigned first_lparen_token = ast->first_lparen_token; - // unsigned second_lparen_token = ast->second_lparen_token; + // int attribute_token = ast->attribute_token; + // int first_lparen_token = ast->first_lparen_token; + // int second_lparen_token = ast->second_lparen_token; for (GnuAttributeListAST *it = ast->attribute_list; it; it = it->next) { this->attribute(it->value); } - // unsigned first_rparen_token = ast->first_rparen_token; - // unsigned second_rparen_token = ast->second_rparen_token; + // int first_rparen_token = ast->first_rparen_token; + // int second_rparen_token = ast->second_rparen_token; return false; } @@ -3029,9 +3029,9 @@ bool Bind::visit(DecltypeSpecifierAST *ast) bool Bind::visit(ClassSpecifierAST *ast) { - // unsigned classkey_token = ast->classkey_token; - unsigned sourceLocation = ast->firstToken(); - unsigned startScopeOffset = tokenAt(sourceLocation).utf16charsEnd(); // at the end of the class key + // int classkey_token = ast->classkey_token; + int sourceLocation = ast->firstToken(); + int startScopeOffset = tokenAt(sourceLocation).utf16charsEnd(); // at the end of the class key for (SpecifierListAST *it = ast->attribute_list; it; it = it->next) { _type = this->specifier(it->value, _type); @@ -3062,7 +3062,7 @@ bool Bind::visit(ClassSpecifierAST *ast) klass->setVisibility(_visibility); // set the class key - unsigned classKey = tokenKind(ast->classkey_token); + int classKey = tokenKind(ast->classkey_token); if (classKey == T_CLASS) klass->setClassKey(Class::ClassKey); else if (classKey == T_STRUCT) @@ -3079,7 +3079,7 @@ bool Bind::visit(ClassSpecifierAST *ast) for (BaseSpecifierListAST *it = ast->base_clause_list; it; it = it->next) { this->baseSpecifier(it->value, ast->colon_token, klass); } - // unsigned dot_dot_dot_token = ast->dot_dot_dot_token; + // int dot_dot_dot_token = ast->dot_dot_dot_token; for (DeclarationListAST *it = ast->member_specifier_list; it; it = it->next) { this->declaration(it->value); } @@ -3100,7 +3100,7 @@ bool Bind::visit(NamedTypeSpecifierAST *ast) bool Bind::visit(ElaboratedTypeSpecifierAST *ast) { - // unsigned classkey_token = ast->classkey_token; + // int classkey_token = ast->classkey_token; for (SpecifierListAST *it = ast->attribute_list; it; it = it->next) { _type = this->specifier(it->value, _type); } @@ -3110,7 +3110,7 @@ bool Bind::visit(ElaboratedTypeSpecifierAST *ast) bool Bind::visit(EnumSpecifierAST *ast) { - unsigned sourceLocation = location(ast->name, ast->firstToken()); + int sourceLocation = location(ast->name, ast->firstToken()); const Name *enumName = this->name(ast->name); Enum *e = control()->newEnum(sourceLocation, enumName); @@ -3184,35 +3184,35 @@ bool Bind::visit(ReferenceAST *ast) bool Bind::visit(CallAST *ast) { /*ExpressionTy base_expression =*/ this->expression(ast->base_expression); - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; for (ExpressionListAST *it = ast->expression_list; it; it = it->next) { /*ExpressionTy value =*/ this->expression(it->value); } - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; return false; } bool Bind::visit(ArrayAccessAST *ast) { /*ExpressionTy base_expression =*/ this->expression(ast->base_expression); - // unsigned lbracket_token = ast->lbracket_token; + // int lbracket_token = ast->lbracket_token; /*ExpressionTy expression =*/ this->expression(ast->expression); - // unsigned rbracket_token = ast->rbracket_token; + // int rbracket_token = ast->rbracket_token; return false; } bool Bind::visit(PostIncrDecrAST *ast) { ExpressionTy base_expression = this->expression(ast->base_expression); - // unsigned incr_decr_token = ast->incr_decr_token; + // int incr_decr_token = ast->incr_decr_token; return false; } bool Bind::visit(MemberAccessAST *ast) { ExpressionTy base_expression = this->expression(ast->base_expression); - // unsigned access_token = ast->access_token; - // unsigned template_token = ast->template_token; + // int access_token = ast->access_token; + // int template_token = ast->template_token; /*const Name *member_name =*/ this->name(ast->member_name); return false; } @@ -3243,9 +3243,9 @@ bool Bind::visit(FunctionDeclaratorAST *ast) _type = this->trailingReturnType(ast->trailing_return_type, _type); fun->setReturnType(_type); - // unsigned lparen_token = ast->lparen_token; + // int lparen_token = ast->lparen_token; this->parameterDeclarationClause(ast->parameter_declaration_clause, ast->lparen_token, fun); - // unsigned rparen_token = ast->rparen_token; + // int rparen_token = ast->rparen_token; FullySpecifiedType type(fun); for (SpecifierListAST *it = ast->cv_qualifier_list; it; it = it->next) { type = this->specifier(it->value, type); @@ -3283,7 +3283,7 @@ bool Bind::visit(ArrayDeclaratorAST *ast) return false; } -void Bind::ensureValidClassName(const Name **name, unsigned sourceLocation) +void Bind::ensureValidClassName(const Name **name, int sourceLocation) { if (!*name) return; diff --git a/src/libs/3rdparty/cplusplus/Bind.h b/src/libs/3rdparty/cplusplus/Bind.h index 741043fdea..0898722964 100644 --- a/src/libs/3rdparty/cplusplus/Bind.h +++ b/src/libs/3rdparty/cplusplus/Bind.h @@ -43,9 +43,9 @@ public: protected: using ASTVisitor::translationUnit; - unsigned location(DeclaratorAST *ast, unsigned defaultLocation) const; - unsigned location(CoreDeclaratorAST *ast, unsigned defaultLocation) const; - unsigned location(NameAST *name, unsigned defaultLocation) const; + int location(DeclaratorAST *ast, int defaultLocation) const; + int location(CoreDeclaratorAST *ast, int defaultLocation) const; + int location(NameAST *name, int defaultLocation) const; static int visibilityForAccessSpecifier(int tokenKind); static int visibilityForClassKey(int tokenKind); @@ -72,14 +72,14 @@ protected: int switchMethodKey(int methodKey); int switchObjCVisibility(int visibility); - unsigned calculateScopeStart(ObjCClassDeclarationAST *ast) const; - unsigned calculateScopeStart(ObjCProtocolDeclarationAST *ast) const; + int calculateScopeStart(ObjCClassDeclarationAST *ast) const; + int calculateScopeStart(ObjCProtocolDeclarationAST *ast) const; const Name *objCSelectorArgument(ObjCSelectorArgumentAST *ast, bool *hasArg); void attribute(GnuAttributeAST *ast); FullySpecifiedType declarator(DeclaratorAST *ast, const FullySpecifiedType &init, DeclaratorIdAST **declaratorId); void qtInterfaceName(QtInterfaceNameAST *ast); - void baseSpecifier(BaseSpecifierAST *ast, unsigned colon_token, Class *klass); + void baseSpecifier(BaseSpecifierAST *ast, int colon_token, Class *klass); void ctorInitializer(CtorInitializerAST *ast, Function *fun); void enumerator(EnumeratorAST *ast, Enum *symbol); FullySpecifiedType exceptionSpecification(ExceptionSpecificationAST *ast, const FullySpecifiedType &init); @@ -89,7 +89,7 @@ protected: FullySpecifiedType newArrayDeclarator(NewArrayDeclaratorAST *ast, const FullySpecifiedType &init); FullySpecifiedType newTypeId(NewTypeIdAST *ast); OperatorNameId::Kind cppOperator(OperatorAST *ast); - void parameterDeclarationClause(ParameterDeclarationClauseAST *ast, unsigned lparen_token, Function *fun); + void parameterDeclarationClause(ParameterDeclarationClauseAST *ast, int lparen_token, Function *fun); void translationUnit(TranslationUnitAST *ast); void objCProtocolRefs(ObjCProtocolRefsAST *ast, Symbol *objcClassOrProtocol); void objCMessageArgument(ObjCMessageArgumentAST *ast); @@ -282,7 +282,7 @@ protected: private: static const int kMaxDepth; - void ensureValidClassName(const Name **name, unsigned sourceLocation); + void ensureValidClassName(const Name **name, int sourceLocation); Scope *_scope; ExpressionTy _expression; diff --git a/src/libs/3rdparty/cplusplus/Control.cpp b/src/libs/3rdparty/cplusplus/Control.cpp index a5601bf620..195cc34641 100644 --- a/src/libs/3rdparty/cplusplus/Control.cpp +++ b/src/libs/3rdparty/cplusplus/Control.cpp @@ -579,15 +579,15 @@ const OperatorNameId *Control::findOperatorNameId(OperatorNameId::Kind operatorI return &*i; } -const Identifier *Control::findIdentifier(const char *chars, unsigned size) const +const Identifier *Control::findIdentifier(const char *chars, int size) const { return d->identifiers.findLiteral(chars, size); } -const Identifier *Control::identifier(const char *chars, unsigned size) +const Identifier *Control::identifier(const char *chars, int size) { return d->identifiers.findOrInsertLiteral(chars, size); } const Identifier *Control::identifier(const char *chars) { - const unsigned length = unsigned(std::strlen(chars)); + const int length = int(std::strlen(chars)); return identifier(chars, length); } @@ -609,28 +609,28 @@ Control::NumericLiteralIterator Control::firstNumericLiteral() const Control::NumericLiteralIterator Control::lastNumericLiteral() const { return d->numericLiterals.end(); } -const StringLiteral *Control::stringLiteral(const char *chars, unsigned size) +const StringLiteral *Control::stringLiteral(const char *chars, int size) { return d->stringLiterals.findOrInsertLiteral(chars, size); } const StringLiteral *Control::stringLiteral(const char *chars) { - const unsigned length = unsigned(std::strlen(chars)); + const int length = int(std::strlen(chars)); return stringLiteral(chars, length); } -const NumericLiteral *Control::numericLiteral(const char *chars, unsigned size) +const NumericLiteral *Control::numericLiteral(const char *chars, int size) { return d->numericLiterals.findOrInsertLiteral(chars, size); } const NumericLiteral *Control::numericLiteral(const char *chars) { - const unsigned length = unsigned(std::strlen(chars)); + const int length = int(std::strlen(chars)); return numericLiteral(chars, length); } const TemplateNameId *Control::templateNameId(const Identifier *id, bool isSpecialization, const FullySpecifiedType *const args, - unsigned argv) + int argv) { return d->findOrInsertTemplateNameId(id, isSpecialization, args, args + argv); } @@ -650,7 +650,7 @@ const QualifiedNameId *Control::qualifiedNameId(const Name *base, const Name *na } const SelectorNameId *Control::selectorNameId(const Name *const *names, - unsigned nameCount, + int nameCount, bool hasArguments) { return d->findOrInsertSelectorNameId(names, names + nameCount, hasArguments); @@ -675,88 +675,88 @@ PointerType *Control::pointerType(const FullySpecifiedType &elementType) ReferenceType *Control::referenceType(const FullySpecifiedType &elementType, bool rvalueRef) { return d->findOrInsertReferenceType(elementType, rvalueRef); } -ArrayType *Control::arrayType(const FullySpecifiedType &elementType, unsigned size) +ArrayType *Control::arrayType(const FullySpecifiedType &elementType, int size) { return d->findOrInsertArrayType(elementType, size); } NamedType *Control::namedType(const Name *name) { return d->findOrInsertNamedType(name); } -Argument *Control::newArgument(unsigned sourceLocation, const Name *name) +Argument *Control::newArgument(int sourceLocation, const Name *name) { return d->newArgument(sourceLocation, name); } -TypenameArgument *Control::newTypenameArgument(unsigned sourceLocation, const Name *name) +TypenameArgument *Control::newTypenameArgument(int sourceLocation, const Name *name) { return d->newTypenameArgument(sourceLocation, name); } -Function *Control::newFunction(unsigned sourceLocation, const Name *name) +Function *Control::newFunction(int sourceLocation, const Name *name) { return d->newFunction(sourceLocation, name); } -Namespace *Control::newNamespace(unsigned sourceLocation, const Name *name) +Namespace *Control::newNamespace(int sourceLocation, const Name *name) { return d->newNamespace(sourceLocation, name); } -Template *Control::newTemplate(unsigned sourceLocation, const Name *name) +Template *Control::newTemplate(int sourceLocation, const Name *name) { return d->newTemplate(sourceLocation, name); } -NamespaceAlias *Control::newNamespaceAlias(unsigned sourceLocation, const Name *name) +NamespaceAlias *Control::newNamespaceAlias(int sourceLocation, const Name *name) { return d->newNamespaceAlias(sourceLocation, name); } -BaseClass *Control::newBaseClass(unsigned sourceLocation, const Name *name) +BaseClass *Control::newBaseClass(int sourceLocation, const Name *name) { return d->newBaseClass(sourceLocation, name); } -Class *Control::newClass(unsigned sourceLocation, const Name *name) +Class *Control::newClass(int sourceLocation, const Name *name) { return d->newClass(sourceLocation, name); } -Enum *Control::newEnum(unsigned sourceLocation, const Name *name) +Enum *Control::newEnum(int sourceLocation, const Name *name) { return d->newEnum(sourceLocation, name); } -Block *Control::newBlock(unsigned sourceLocation) +Block *Control::newBlock(int sourceLocation) { return d->newBlock(sourceLocation); } -Declaration *Control::newDeclaration(unsigned sourceLocation, const Name *name) +Declaration *Control::newDeclaration(int sourceLocation, const Name *name) { return d->newDeclaration(sourceLocation, name); } -EnumeratorDeclaration *Control::newEnumeratorDeclaration(unsigned sourceLocation, const Name *name) +EnumeratorDeclaration *Control::newEnumeratorDeclaration(int sourceLocation, const Name *name) { return d->newEnumeratorDeclaration(sourceLocation, name); } -UsingNamespaceDirective *Control::newUsingNamespaceDirective(unsigned sourceLocation, +UsingNamespaceDirective *Control::newUsingNamespaceDirective(int sourceLocation, const Name *name) { return d->newUsingNamespaceDirective(sourceLocation, name); } -UsingDeclaration *Control::newUsingDeclaration(unsigned sourceLocation, const Name *name) +UsingDeclaration *Control::newUsingDeclaration(int sourceLocation, const Name *name) { return d->newUsingDeclaration(sourceLocation, name); } -ForwardClassDeclaration *Control::newForwardClassDeclaration(unsigned sourceLocation, +ForwardClassDeclaration *Control::newForwardClassDeclaration(int sourceLocation, const Name *name) { return d->newForwardClassDeclaration(sourceLocation, name); } -QtPropertyDeclaration *Control::newQtPropertyDeclaration(unsigned sourceLocation, +QtPropertyDeclaration *Control::newQtPropertyDeclaration(int sourceLocation, const Name *name) { return d->newQtPropertyDeclaration(sourceLocation, name); } -QtEnum *Control::newQtEnum(unsigned sourceLocation, const Name *name) +QtEnum *Control::newQtEnum(int sourceLocation, const Name *name) { return d->newQtEnum(sourceLocation, name); } -ObjCBaseClass *Control::newObjCBaseClass(unsigned sourceLocation, const Name *name) +ObjCBaseClass *Control::newObjCBaseClass(int sourceLocation, const Name *name) { return d->newObjCBaseClass(sourceLocation, name); } -ObjCBaseProtocol *Control::newObjCBaseProtocol(unsigned sourceLocation, const Name *name) +ObjCBaseProtocol *Control::newObjCBaseProtocol(int sourceLocation, const Name *name) { return d->newObjCBaseProtocol(sourceLocation, name); } -ObjCClass *Control::newObjCClass(unsigned sourceLocation, const Name *name) +ObjCClass *Control::newObjCClass(int sourceLocation, const Name *name) { return d->newObjCClass(sourceLocation, name); } -ObjCForwardClassDeclaration *Control::newObjCForwardClassDeclaration(unsigned sourceLocation, const Name *name) +ObjCForwardClassDeclaration *Control::newObjCForwardClassDeclaration(int sourceLocation, const Name *name) { return d->newObjCForwardClassDeclaration(sourceLocation, name); } -ObjCProtocol *Control::newObjCProtocol(unsigned sourceLocation, const Name *name) +ObjCProtocol *Control::newObjCProtocol(int sourceLocation, const Name *name) { return d->newObjCProtocol(sourceLocation, name); } -ObjCForwardProtocolDeclaration *Control::newObjCForwardProtocolDeclaration(unsigned sourceLocation, const Name *name) +ObjCForwardProtocolDeclaration *Control::newObjCForwardProtocolDeclaration(int sourceLocation, const Name *name) { return d->newObjCForwardProtocolDeclaration(sourceLocation, name); } -ObjCMethod *Control::newObjCMethod(unsigned sourceLocation, const Name *name) +ObjCMethod *Control::newObjCMethod(int sourceLocation, const Name *name) { return d->newObjCMethod(sourceLocation, name); } -ObjCPropertyDeclaration *Control::newObjCPropertyDeclaration(unsigned sourceLocation, const Name *name) +ObjCPropertyDeclaration *Control::newObjCPropertyDeclaration(int sourceLocation, const Name *name) { return d->newObjCPropertyDeclaration(sourceLocation, name); } const Identifier *Control::deprecatedId() const @@ -811,7 +811,7 @@ Symbol **Control::lastSymbol() const return &*d->symbols.begin() + d->symbols.size(); } -unsigned Control::symbolCount() const +int Control::symbolCount() const { return unsigned(d->symbols.size()); } diff --git a/src/libs/3rdparty/cplusplus/Control.h b/src/libs/3rdparty/cplusplus/Control.h index 97c1503833..e4020e2653 100644 --- a/src/libs/3rdparty/cplusplus/Control.h +++ b/src/libs/3rdparty/cplusplus/Control.h @@ -55,7 +55,7 @@ public: const TemplateNameId *templateNameId(const Identifier *id, bool isSpecialization, const FullySpecifiedType *const args = 0, - unsigned argc = 0); + int argc = 0); /// Returns the canonical destructor name id. const DestructorNameId *destructorNameId(const Name *name); @@ -70,7 +70,7 @@ public: const QualifiedNameId *qualifiedNameId(const Name *base, const Name *name); const SelectorNameId *selectorNameId(const Name *const *names, - unsigned nameCount, + int nameCount, bool hasArguments); /// Returns a Type object of type VoidType. @@ -93,82 +93,82 @@ public: ReferenceType *referenceType(const FullySpecifiedType &elementType, bool rvalueRef); /// Retruns a Type object of type ArrayType. - ArrayType *arrayType(const FullySpecifiedType &elementType, unsigned size = 0); + ArrayType *arrayType(const FullySpecifiedType &elementType, int size = 0); /// Returns a Type object of type NamedType. NamedType *namedType(const Name *name); /// Creates a new Declaration symbol. - Declaration *newDeclaration(unsigned sourceLocation, const Name *name); + Declaration *newDeclaration(int sourceLocation, const Name *name); /// Creates a new EnumeratorDeclaration symbol. - EnumeratorDeclaration *newEnumeratorDeclaration(unsigned sourceLocation, const Name *name); + EnumeratorDeclaration *newEnumeratorDeclaration(int sourceLocation, const Name *name); /// Creates a new Argument symbol. - Argument *newArgument(unsigned sourceLocation, const Name *name = 0); + Argument *newArgument(int sourceLocation, const Name *name = 0); /// Creates a new Argument symbol. - TypenameArgument *newTypenameArgument(unsigned sourceLocation, const Name *name = 0); + TypenameArgument *newTypenameArgument(int sourceLocation, const Name *name = 0); /// Creates a new Function symbol. - Function *newFunction(unsigned sourceLocation, const Name *name = 0); + Function *newFunction(int sourceLocation, const Name *name = 0); /// Creates a new Namespace symbol. - Namespace *newNamespace(unsigned sourceLocation, const Name *name = 0); + Namespace *newNamespace(int sourceLocation, const Name *name = 0); /// Creates a new Template symbol. - Template *newTemplate(unsigned sourceLocation, const Name *name = 0); + Template *newTemplate(int sourceLocation, const Name *name = 0); /// Creates a new Namespace symbol. - NamespaceAlias *newNamespaceAlias(unsigned sourceLocation, const Name *name = 0); + NamespaceAlias *newNamespaceAlias(int sourceLocation, const Name *name = 0); /// Creates a new BaseClass symbol. - BaseClass *newBaseClass(unsigned sourceLocation, const Name *name = 0); + BaseClass *newBaseClass(int sourceLocation, const Name *name = 0); /// Creates a new Class symbol. - Class *newClass(unsigned sourceLocation, const Name *name = 0); + Class *newClass(int sourceLocation, const Name *name = 0); /// Creates a new Enum symbol. - Enum *newEnum(unsigned sourceLocation, const Name *name = 0); + Enum *newEnum(int sourceLocation, const Name *name = 0); /// Creates a new Block symbol. - Block *newBlock(unsigned sourceLocation); + Block *newBlock(int sourceLocation); /// Creates a new UsingNamespaceDirective symbol. - UsingNamespaceDirective *newUsingNamespaceDirective(unsigned sourceLocation, const Name *name = 0); + UsingNamespaceDirective *newUsingNamespaceDirective(int sourceLocation, const Name *name = 0); /// Creates a new UsingDeclaration symbol. - UsingDeclaration *newUsingDeclaration(unsigned sourceLocation, const Name *name = 0); + UsingDeclaration *newUsingDeclaration(int sourceLocation, const Name *name = 0); /// Creates a new ForwardClassDeclaration symbol. - ForwardClassDeclaration *newForwardClassDeclaration(unsigned sourceLocation, const Name *name = 0); + ForwardClassDeclaration *newForwardClassDeclaration(int sourceLocation, const Name *name = 0); /// Creates a new QtPropertyDeclaration symbol. - QtPropertyDeclaration *newQtPropertyDeclaration(unsigned sourceLocation, const Name *name = 0); + QtPropertyDeclaration *newQtPropertyDeclaration(int sourceLocation, const Name *name = 0); /// Creates a new QtEnum symbol. - QtEnum *newQtEnum(unsigned sourceLocation, const Name *name = 0); + QtEnum *newQtEnum(int sourceLocation, const Name *name = 0); - ObjCBaseClass *newObjCBaseClass(unsigned sourceLocation, const Name *name); - ObjCBaseProtocol *newObjCBaseProtocol(unsigned sourceLocation, const Name *name); + ObjCBaseClass *newObjCBaseClass(int sourceLocation, const Name *name); + ObjCBaseProtocol *newObjCBaseProtocol(int sourceLocation, const Name *name); /// Creates a new Objective-C class symbol. - ObjCClass *newObjCClass(unsigned sourceLocation, const Name *name = 0); + ObjCClass *newObjCClass(int sourceLocation, const Name *name = 0); /// Creates a new Objective-C class forward declaration symbol. - ObjCForwardClassDeclaration *newObjCForwardClassDeclaration(unsigned sourceLocation, const Name *name = 0); + ObjCForwardClassDeclaration *newObjCForwardClassDeclaration(int sourceLocation, const Name *name = 0); /// Creates a new Objective-C protocol symbol. - ObjCProtocol *newObjCProtocol(unsigned sourceLocation, const Name *name = 0); + ObjCProtocol *newObjCProtocol(int sourceLocation, const Name *name = 0); /// Creates a new Objective-C protocol forward declaration symbol. - ObjCForwardProtocolDeclaration *newObjCForwardProtocolDeclaration(unsigned sourceLocation, const Name *name = 0); + ObjCForwardProtocolDeclaration *newObjCForwardProtocolDeclaration(int sourceLocation, const Name *name = 0); /// Creates a new Objective-C method symbol. - ObjCMethod *newObjCMethod(unsigned sourceLocation, const Name *name = 0); + ObjCMethod *newObjCMethod(int sourceLocation, const Name *name = 0); /// Creates a new Objective-C @property declaration symbol. - ObjCPropertyDeclaration *newObjCPropertyDeclaration(unsigned sourceLocation, const Name *name); + ObjCPropertyDeclaration *newObjCPropertyDeclaration(int sourceLocation, const Name *name); const Identifier *deprecatedId() const; const Identifier *unavailableId() const; @@ -187,8 +187,8 @@ public: const OperatorNameId *findOperatorNameId(OperatorNameId::Kind operatorId) const; - const Identifier *findIdentifier(const char *chars, unsigned size) const; - const Identifier *identifier(const char *chars, unsigned size); + const Identifier *findIdentifier(const char *chars, int size) const; + const Identifier *identifier(const char *chars, int size); const Identifier *identifier(const char *chars); typedef const Identifier *const *IdentifierIterator; @@ -204,15 +204,15 @@ public: NumericLiteralIterator firstNumericLiteral() const; NumericLiteralIterator lastNumericLiteral() const; - const StringLiteral *stringLiteral(const char *chars, unsigned size); + const StringLiteral *stringLiteral(const char *chars, int size); const StringLiteral *stringLiteral(const char *chars); - const NumericLiteral *numericLiteral(const char *chars, unsigned size); + const NumericLiteral *numericLiteral(const char *chars, int size); const NumericLiteral *numericLiteral(const char *chars); Symbol **firstSymbol() const; Symbol **lastSymbol() const; - unsigned symbolCount() const; + int symbolCount() const; bool hasSymbol(Symbol *symbol) const; void addSymbol(Symbol *symbol); diff --git a/src/libs/3rdparty/cplusplus/DiagnosticClient.h b/src/libs/3rdparty/cplusplus/DiagnosticClient.h index 108133b97e..b009074ebd 100644 --- a/src/libs/3rdparty/cplusplus/DiagnosticClient.h +++ b/src/libs/3rdparty/cplusplus/DiagnosticClient.h @@ -42,7 +42,7 @@ public: virtual void report(int level, const StringLiteral *fileName, - unsigned line, unsigned column, + int line, int column, const char *format, va_list ap) = 0; }; diff --git a/src/libs/3rdparty/cplusplus/LiteralTable.h b/src/libs/3rdparty/cplusplus/LiteralTable.h index 5a3f1e9042..e40055b7ce 100644 --- a/src/libs/3rdparty/cplusplus/LiteralTable.h +++ b/src/libs/3rdparty/cplusplus/LiteralTable.h @@ -69,10 +69,10 @@ public: bool empty() const { return _literalCount == -1; } - unsigned size() const + int size() const { return _literalCount + 1; } - const Literal *at(unsigned index) const + const Literal *at(int index) const { return _literals[index]; } iterator begin() const @@ -81,7 +81,7 @@ public: iterator end() const { return _literals + _literalCount + 1; } - const Literal *findLiteral(const char *chars, unsigned size) const + const Literal *findLiteral(const char *chars, int size) const { if (_buckets) { unsigned h = Literal::hashCode(chars, size); @@ -95,7 +95,7 @@ public: return 0; } - const Literal *findOrInsertLiteral(const char *chars, unsigned size) + const Literal *findOrInsertLiteral(const char *chars, int size) { if (_buckets) { unsigned h = Literal::hashCode(chars, size); diff --git a/src/libs/3rdparty/cplusplus/Literals.cpp b/src/libs/3rdparty/cplusplus/Literals.cpp index 19c92e49bb..3300d47c31 100644 --- a/src/libs/3rdparty/cplusplus/Literals.cpp +++ b/src/libs/3rdparty/cplusplus/Literals.cpp @@ -28,7 +28,7 @@ using namespace CPlusPlus; //////////////////////////////////////////////////////////////////////////////// -Literal::Literal(const char *chars, unsigned size) +Literal::Literal(const char *chars, int size) : _next(0), _index(0) { _chars = new char[size + 1]; @@ -79,7 +79,7 @@ unsigned Literal::hashCode(const char *chars, unsigned size) } //////////////////////////////////////////////////////////////////////////////// -NumericLiteral::NumericLiteral(const char *chars, unsigned size) +NumericLiteral::NumericLiteral(const char *chars, int size) : Literal(chars, size), _flags(0) { f._type = NumericLiteralIsInt; diff --git a/src/libs/3rdparty/cplusplus/Literals.h b/src/libs/3rdparty/cplusplus/Literals.h index 19255b619b..8a4f4332ac 100644 --- a/src/libs/3rdparty/cplusplus/Literals.h +++ b/src/libs/3rdparty/cplusplus/Literals.h @@ -36,15 +36,15 @@ public: typedef iterator const_iterator; public: - Literal(const char *chars, unsigned size); + Literal(const char *chars, int size); virtual ~Literal(); iterator begin() const { return _chars; } iterator end() const { return _chars + _size; } - char at(unsigned index) const { return _chars[index]; } + char at(int index) const { return _chars[index]; } const char *chars() const { return _chars; } - unsigned size() const { return _size; } + int size() const { return _size; } unsigned hashCode() const { return _hashCode; } static unsigned hashCode(const char *chars, unsigned size); @@ -73,7 +73,7 @@ public: class CPLUSPLUS_EXPORT NumericLiteral: public Literal { public: - NumericLiteral(const char *chars, unsigned size); + NumericLiteral(const char *chars, int size); enum { NumericLiteralIsInt, @@ -108,7 +108,7 @@ private: class CPLUSPLUS_EXPORT Identifier: public Literal, public Name { public: - Identifier(const char *chars, unsigned size) + Identifier(const char *chars, int size) : Literal(chars, size) { } diff --git a/src/libs/3rdparty/cplusplus/Matcher.cpp b/src/libs/3rdparty/cplusplus/Matcher.cpp index ffb852a67c..8ef26017c6 100644 --- a/src/libs/3rdparty/cplusplus/Matcher.cpp +++ b/src/libs/3rdparty/cplusplus/Matcher.cpp @@ -293,7 +293,7 @@ bool Matcher::match(const ObjCMethod *type, const ObjCMethod *otherType) else if (! type->returnType().match(otherType->returnType(), this)) return false; - for (unsigned i = 0; i < type->argumentCount(); ++i) { + for (int i = 0; i < type->argumentCount(); ++i) { Symbol *l = type->argumentAt(i); Symbol *r = otherType->argumentAt(i); if (! l->type().match(r->type(), this)) @@ -356,10 +356,10 @@ bool Matcher::match(const QualifiedNameId *name, const QualifiedNameId *otherNam bool Matcher::match(const SelectorNameId *name, const SelectorNameId *otherName) { - const unsigned nc = name->nameCount(); + const int nc = name->nameCount(); if (name->hasArguments() != otherName->hasArguments() || nc != otherName->nameCount()) return false; - for (unsigned i = 0; i < nc; ++i) + for (int i = 0; i < nc; ++i) if (! Matcher::match(name->nameAt(i), otherName->nameAt(i), this)) return false; return true; diff --git a/src/libs/3rdparty/cplusplus/Names.cpp b/src/libs/3rdparty/cplusplus/Names.cpp index 10bbf389d2..b41234647d 100644 --- a/src/libs/3rdparty/cplusplus/Names.cpp +++ b/src/libs/3rdparty/cplusplus/Names.cpp @@ -93,10 +93,10 @@ bool TemplateNameId::match0(const Name *otherName, Matcher *matcher) const const Identifier *TemplateNameId::identifier() const { return _identifier; } -unsigned TemplateNameId::templateArgumentCount() const -{ return unsigned(_templateArguments.size()); } +int TemplateNameId::templateArgumentCount() const +{ return int(_templateArguments.size()); } -const FullySpecifiedType &TemplateNameId::templateArgumentAt(unsigned index) const +const FullySpecifiedType &TemplateNameId::templateArgumentAt(int index) const { return _templateArguments[index]; } bool TemplateNameId::Compare::operator()(const TemplateNameId *name, @@ -200,23 +200,23 @@ const Identifier *SelectorNameId::identifier() const return nameAt(0)->identifier(); } -unsigned SelectorNameId::nameCount() const -{ return unsigned(_names.size()); } +int SelectorNameId::nameCount() const +{ return int(_names.size()); } -const Name *SelectorNameId::nameAt(unsigned index) const +const Name *SelectorNameId::nameAt(int index) const { return _names[index]; } bool SelectorNameId::hasArguments() const { return _hasArguments; } -AnonymousNameId::AnonymousNameId(unsigned classTokenIndex) +AnonymousNameId::AnonymousNameId(int classTokenIndex) : _classTokenIndex(classTokenIndex) { } AnonymousNameId::~AnonymousNameId() { } -unsigned AnonymousNameId::classTokenIndex() const +int AnonymousNameId::classTokenIndex() const { return _classTokenIndex; } diff --git a/src/libs/3rdparty/cplusplus/Names.h b/src/libs/3rdparty/cplusplus/Names.h index b8d090da2f..cea93911c6 100644 --- a/src/libs/3rdparty/cplusplus/Names.h +++ b/src/libs/3rdparty/cplusplus/Names.h @@ -88,8 +88,8 @@ public: virtual const Identifier *identifier() const; // ### find a better name - unsigned templateArgumentCount() const; - const FullySpecifiedType &templateArgumentAt(unsigned index) const; + int templateArgumentCount() const; + const FullySpecifiedType &templateArgumentAt(int index) const; virtual const TemplateNameId *asTemplateNameId() const { return this; } @@ -224,8 +224,8 @@ public: virtual const Identifier *identifier() const; - unsigned nameCount() const; - const Name *nameAt(unsigned index) const; + int nameCount() const; + const Name *nameAt(int index) const; bool hasArguments() const; virtual const SelectorNameId *asSelectorNameId() const @@ -248,10 +248,10 @@ private: class CPLUSPLUS_EXPORT AnonymousNameId: public Name { public: - AnonymousNameId(unsigned classTokenIndex); + AnonymousNameId(int classTokenIndex); virtual ~AnonymousNameId(); - unsigned classTokenIndex() const; + int classTokenIndex() const; virtual const Identifier *identifier() const; @@ -263,7 +263,7 @@ protected: virtual bool match0(const Name *otherName, Matcher *matcher) const; private: - unsigned _classTokenIndex; + int _classTokenIndex; }; diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp index 6bee0fa972..0db3eb4348 100644 --- a/src/libs/3rdparty/cplusplus/Parser.cpp +++ b/src/libs/3rdparty/cplusplus/Parser.cpp @@ -49,7 +49,7 @@ class DebugRule { public: static int depth; - DebugRule(const char *name, const char *spell, unsigned idx, bool blocked) + DebugRule(const char *name, const char *spell, int idx, bool blocked) { for (int i = 0; i <= depth; ++i) fputc('-', stderr); @@ -170,20 +170,20 @@ public: }; struct CacheKey { - CacheKey(unsigned initialCursor, ASTKind astKind) + CacheKey(int initialCursor, ASTKind astKind) : initialCursor(initialCursor) , astKind(astKind) {} - const unsigned initialCursor; + const int initialCursor; const ASTKind astKind; }; public: ASTCache() {} - void insert(ASTKind astKind, unsigned tokenIndexBeforeParsing, - AST *resultingAST, unsigned resultingTokenIndex, bool resultingReturnValue) + void insert(ASTKind astKind, int tokenIndexBeforeParsing, + AST *resultingAST, int resultingTokenIndex, bool resultingReturnValue) { const auto key = std::make_pair(astKind, tokenIndexBeforeParsing); @@ -195,8 +195,8 @@ public: _cache.insert(keyValue); } - AST *find(ASTKind astKind, unsigned tokenIndex, - unsigned *resultingTokenIndex, bool *foundInCache, bool *returnValue) const + AST *find(ASTKind astKind, int tokenIndex, + int *resultingTokenIndex, bool *foundInCache, bool *returnValue) const { const auto key = std::make_pair(astKind, tokenIndex); const auto it = _cache.find(key); @@ -224,11 +224,11 @@ private: struct ParseFunctionResult { AST *resultingAST; - unsigned resultingTokenIndex; + int resultingTokenIndex; bool returnValue; }; - typedef std::pair<int, unsigned> ASTKindAndTokenIndex; + typedef std::pair<int, int> ASTKindAndTokenIndex; std::unordered_map<ASTKindAndTokenIndex, ParseFunctionResult, KeyHasher> _cache; }; @@ -251,7 +251,7 @@ inline void debugPrintCheckCache(bool) {} #define CHECK_CACHE(ASTKind, ASTType) \ do { \ bool foundInCache; \ - unsigned newTokenIndex; \ + int newTokenIndex; \ bool returnValue; \ if (AST *ast = _astCache->find(ASTKind, cursor(), \ &newTokenIndex, &foundInCache, &returnValue)) { \ @@ -486,7 +486,7 @@ int Parser::find(int token, int stopAt) return 0; } -void Parser::match(int kind, unsigned *token) +void Parser::match(int kind, int *token) { if (LA() == kind) *token = consumeToken(); @@ -501,7 +501,7 @@ bool Parser::parseClassOrNamespaceName(NameAST *&node) { DEBUG_THIS_RULE(); if (LA() == T_IDENTIFIER && (LA(2) == T_COLON_COLON || LA(2) == T_LESS)) { - unsigned identifier_token = cursor(); + int identifier_token = cursor(); if (LA(2) == T_LESS) { bool blocked = blockErrors(true); @@ -521,7 +521,7 @@ bool Parser::parseClassOrNamespaceName(NameAST *&node) return true; } } else if (LA() == T_TEMPLATE) { - unsigned template_token = consumeToken(); + int template_token = consumeToken(); if (parseTemplateId(node, template_token) && LA() == T_COLON_COLON) return true; rewind(template_token); @@ -529,12 +529,12 @@ bool Parser::parseClassOrNamespaceName(NameAST *&node) return false; } -bool Parser::parseTemplateId(NameAST *&node, unsigned template_token) +bool Parser::parseTemplateId(NameAST *&node, int template_token) { DEBUG_THIS_RULE(); CHECK_CACHE(ASTCache::TemplateId, NameAST); - const unsigned start = cursor(); + const int start = cursor(); if (LA() == T_IDENTIFIER && LA(2) == T_LESS) { TemplateIdAST *ast = new (_pool) TemplateIdAST; @@ -566,7 +566,7 @@ bool Parser::parseNestedNameSpecifier(NestedNameSpecifierListAST *&node, NestedNameSpecifierListAST **nested_name_specifier = &node; NameAST *class_or_namespace_name = 0; if (parseClassOrNamespaceName(class_or_namespace_name) && LA() == T_COLON_COLON) { - unsigned scope_token = consumeToken(); + int scope_token = consumeToken(); NestedNameSpecifierAST *name = new (_pool) NestedNameSpecifierAST; name->class_or_namespace_name = class_or_namespace_name; @@ -598,7 +598,7 @@ bool Parser::parseNestedNameSpecifier(NestedNameSpecifierListAST *&node, bool Parser::parseNestedNameSpecifierOpt(NestedNameSpecifierListAST *&name, bool acceptTemplateId) { DEBUG_THIS_RULE(); - unsigned start = cursor(); + int start = cursor(); if (! parseNestedNameSpecifier(name, acceptTemplateId)) rewind(start); return true; @@ -607,7 +607,7 @@ bool Parser::parseNestedNameSpecifierOpt(NestedNameSpecifierListAST *&name, bool bool Parser::parseName(NameAST *&node, bool acceptTemplateId) { DEBUG_THIS_RULE(); - unsigned global_scope_token = 0; + int global_scope_token = 0; switch (LA()) { case T_COLON_COLON: @@ -653,7 +653,7 @@ bool Parser::parseTranslationUnit(TranslationUnitAST *&node) DeclarationListAST **decl = &ast->declaration_list; while (LA()) { - unsigned start_declaration = cursor(); + int start_declaration = cursor(); DeclarationAST *declaration = 0; @@ -729,15 +729,15 @@ bool Parser::parseDeclaration(DeclarationAST *&node) case T_Q_DECLARE_INTERFACE: { consumeToken(); - unsigned lparen_token = 0; + int lparen_token = 0; match(T_LPAREN, &lparen_token); NameAST *name = 0; parseName(name); - unsigned comma_token = 0; + int comma_token = 0; match(T_COMMA, &comma_token); - unsigned string_literal = 0; + int string_literal = 0; match(T_STRING_LITERAL, &string_literal); - unsigned rparen_token = 0; + int rparen_token = 0; match(T_RPAREN, &rparen_token); } return true; @@ -759,7 +759,7 @@ bool Parser::parseDeclaration(DeclarationAST *&node) default: { if (_languageFeatures.objCEnabled && LA() == T___ATTRIBUTE__) { - const unsigned start = cursor(); + const int start = cursor(); SpecifierListAST *attributes = 0, **attr = &attributes; while (parseGnuAttributeSpecifier(*attr)) attr = &(*attr)->next; @@ -817,7 +817,7 @@ bool Parser::parseLinkageBody(DeclarationAST *&node) if (tk == T_RBRACE) break; - unsigned start_declaration = cursor(); + int start_declaration = cursor(); DeclarationAST *declaration = 0; if (parseDeclaration(declaration)) { *declaration_ptr = new (_pool) DeclarationListAST; @@ -865,11 +865,11 @@ bool Parser::parseNamespace(DeclarationAST *&node) && !isNestedNamespace()) return false; - unsigned inline_token = 0; + int inline_token = 0; if (_languageFeatures.cxx11Enabled && LA() == T_INLINE) inline_token = consumeToken(); - unsigned namespace_token = consumeToken(); + int namespace_token = consumeToken(); if (LA() == T_IDENTIFIER && LA(2) == T_EQUAL) { if (inline_token) @@ -896,7 +896,7 @@ bool Parser::parseNamespace(DeclarationAST *&node) } else if (LA() == T_LBRACE) { parseLinkageBody(ast->linkage_body); } else { // attempt to do error recovery - unsigned pos = cursor(); + int pos = cursor(); for (;LA() != T_EOF_SYMBOL; consumeToken()) { switch (LA()) { case T_IDENTIFIER: @@ -1019,7 +1019,7 @@ bool Parser::parseConversionFunctionId(NameAST *&node) DEBUG_THIS_RULE(); if (LA() != T_OPERATOR) return false; - unsigned operator_token = consumeToken(); + int operator_token = consumeToken(); SpecifierListAST *type_specifier = 0; if (! parseTypeSpecifier(type_specifier)) return false; @@ -1040,7 +1040,7 @@ bool Parser::parseOperatorFunctionId(NameAST *&node) DEBUG_THIS_RULE(); if (LA() != T_OPERATOR) return false; - unsigned operator_token = consumeToken(); + int operator_token = consumeToken(); OperatorAST *op = 0; if (! parseOperator(op)) @@ -1053,9 +1053,9 @@ bool Parser::parseOperatorFunctionId(NameAST *&node) return true; } -Parser::TemplateArgumentListEntry *Parser::templateArgumentListEntry(unsigned tokenIndex) +Parser::TemplateArgumentListEntry *Parser::templateArgumentListEntry(int tokenIndex) { - std::map<unsigned, TemplateArgumentListEntry>::iterator it =_templateArgumentList.find(tokenIndex); + std::map<int, TemplateArgumentListEntry>::iterator it =_templateArgumentList.find(tokenIndex); if (it != _templateArgumentList.end()) return &it->second; @@ -1072,7 +1072,7 @@ bool Parser::parseTemplateArgumentList(ExpressionListAST *&node) return entry->ast != 0; } - unsigned start = cursor(); + int start = cursor(); ExpressionListAST **template_argument_ptr = &node; ExpressionAST *template_argument = 0; @@ -1127,7 +1127,7 @@ bool Parser::parseAsmDefinition(DeclarationAST *&node) ast->volatile_token = consumeToken(); match(T_LPAREN, &ast->lparen_token); - unsigned string_literal_token = 0; + int string_literal_token = 0; match(T_STRING_LITERAL, &string_literal_token); while (LA() == T_STRING_LITERAL) { consumeToken(); @@ -1181,17 +1181,17 @@ bool Parser::parseAsmOperandList() bool Parser::parseAsmOperand() { DEBUG_THIS_RULE(); - unsigned string_literal_token = 0; + int string_literal_token = 0; match(T_STRING_LITERAL, &string_literal_token); if (LA() == T_LBRACKET) { - /*unsigned lbracket_token = */ consumeToken(); + /*int lbracket_token = */ consumeToken(); match(T_STRING_LITERAL, &string_literal_token); - unsigned rbracket_token = 0; + int rbracket_token = 0; match(T_RBRACKET, &rbracket_token); } - unsigned lparen_token = 0, rparen_token = 0; + int lparen_token = 0, rparen_token = 0; match(T_LPAREN, &lparen_token); ExpressionAST *expression = 0; parseExpression(expression); @@ -1205,7 +1205,7 @@ bool Parser::parseAsmClobberList() if (LA() != T_STRING_LITERAL) return false; - unsigned string_literal_token = consumeToken(); + int string_literal_token = consumeToken(); while (LA() == T_COMMA) { consumeToken(); @@ -1236,7 +1236,7 @@ bool Parser::parseTemplateDeclaration(DeclarationAST *&node) } while (LA()) { - unsigned start_declaration = cursor(); + int start_declaration = cursor(); ast->declaration = 0; if (parseDeclaration(ast->declaration)) @@ -1335,7 +1335,7 @@ bool Parser::parseCvQualifiers(SpecifierListAST *&node) { DEBUG_THIS_RULE(); - unsigned start = cursor(); + int start = cursor(); SpecifierListAST **ast = &node; while (*ast) @@ -1357,7 +1357,7 @@ bool Parser::parseCvQualifiers(SpecifierListAST *&node) return start != cursor(); } -bool Parser::parseRefQualifier(unsigned &ref_qualifier) +bool Parser::parseRefQualifier(int &ref_qualifier) { DEBUG_THIS_RULE(); @@ -1382,7 +1382,7 @@ bool Parser::parseOverrideFinalQualifiers(SpecifierListAST *&node) if (!_languageFeatures.cxx11Enabled) return false; - unsigned start = cursor(); + int start = cursor(); SpecifierListAST **ast = &node; while (*ast) @@ -1421,9 +1421,9 @@ bool Parser::parsePtrOperator(PtrOperatorListAST *&node) node = new (_pool) PtrOperatorListAST(ast); return true; } else if (LA() == T_COLON_COLON || LA() == T_IDENTIFIER) { - unsigned scope_or_identifier_token = cursor(); + int scope_or_identifier_token = cursor(); - unsigned global_scope_token = 0; + int global_scope_token = 0; if (LA() == T_COLON_COLON) global_scope_token = consumeToken(); @@ -1446,7 +1446,7 @@ bool Parser::parsePtrOperator(PtrOperatorListAST *&node) bool Parser::parseTemplateArgument(ExpressionAST *&node) { DEBUG_THIS_RULE(); - unsigned start = cursor(); + int start = cursor(); if (parseTypeId(node)) { int index = 1; @@ -1515,7 +1515,7 @@ bool Parser::parseDeclSpecifierSeq(SpecifierListAST *&decl_specifier_seq, } else if (! onlySimpleTypeSpecifiers && ! has_type_specifier && (LA() == T_TYPENAME || LA() == T_ENUM || lookAtClassKey())) { // typename-specifier, elaborated-type-specifier - unsigned startOfElaboratedTypeSpecifier = cursor(); + int startOfElaboratedTypeSpecifier = cursor(); if (! parseElaboratedTypeSpecifier(*decl_specifier_seq_ptr)) { error(startOfElaboratedTypeSpecifier, "expected an elaborated type specifier"); break; @@ -1532,7 +1532,7 @@ bool Parser::parseDeclSpecifierSeq(SpecifierListAST *&decl_specifier_seq, bool Parser::parseDeclaratorOrAbstractDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specifier_list) { DEBUG_THIS_RULE(); - unsigned start = cursor(); + int start = cursor(); bool blocked = blockErrors(true); if (parseDeclarator(node, decl_specifier_list)) { blockErrors(blocked); @@ -1546,7 +1546,7 @@ bool Parser::parseDeclaratorOrAbstractDeclarator(DeclaratorAST *&node, Specifier bool Parser::parseCoreDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specifier_list, ClassSpecifierAST *) { DEBUG_THIS_RULE(); - unsigned start = cursor(); + int start = cursor(); SpecifierListAST *attributes = 0; parseOptionalAttributeSpecifierSequence(attributes); @@ -1557,7 +1557,7 @@ bool Parser::parseCoreDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_sp if (LA() == T_COLON_COLON || LA() == T_IDENTIFIER || LA() == T_TILDE || LA() == T_OPERATOR || (_languageFeatures.cxx11Enabled && LA() == T_DOT_DOT_DOT && (LA(2) == T_COLON_COLON || LA(2) == T_IDENTIFIER))) { - unsigned dot_dot_dot_token = 0; + int dot_dot_dot_token = 0; if (LA() == T_DOT_DOT_DOT) dot_dot_dot_token = consumeToken(); @@ -1578,7 +1578,7 @@ bool Parser::parseCoreDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_sp if (attributes) warning(attributes->firstToken(), "unexpected attribtues"); - unsigned lparen_token = consumeToken(); + int lparen_token = consumeToken(); DeclaratorAST *declarator = 0; if (parseDeclarator(declarator, decl_specifier_list) && LA() == T_RPAREN) { NestedDeclaratorAST *nested_declarator = new (_pool) NestedDeclaratorAST; @@ -1623,11 +1623,11 @@ bool Parser::parseDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specif PostfixDeclaratorListAST **postfix_ptr = &node->postfix_declarator_list; for (;;) { - unsigned startOfPostDeclarator = cursor(); + int startOfPostDeclarator = cursor(); if (LA() == T_LPAREN) { if (! declaringClass && LA(2) != T_RPAREN && maybeCppInitializer(node)) { - unsigned lparen_token = cursor(); + int lparen_token = cursor(); ExpressionAST *initializer = 0; bool blocked = blockErrors(true); @@ -1645,7 +1645,7 @@ bool Parser::parseDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specif consumeToken(); ParameterDeclarationClauseAST *parameter_declaration_clause = 0; if (parseParameterDeclarationClause(parameter_declaration_clause) && LA() == T_RPAREN) { - unsigned rparen_token = consumeToken(); + int rparen_token = consumeToken(); FunctionDeclaratorAST *ast = new (_pool) FunctionDeclaratorAST; ast->lparen_token = lparen_token; @@ -1734,10 +1734,10 @@ bool Parser::parseAbstractCoreDeclarator(DeclaratorAST *&node, SpecifierListAST while (parsePtrOperator(*ptr_operators_tail)) ptr_operators_tail = &(*ptr_operators_tail)->next; - unsigned after_ptr_operators = cursor(); + int after_ptr_operators = cursor(); if (LA() == T_LPAREN && LA(2) != T_RPAREN) { - unsigned lparen_token = consumeToken(); + int lparen_token = consumeToken(); DeclaratorAST *declarator = 0; if (parseAbstractDeclarator(declarator, decl_specifier_list) && LA() == T_RPAREN) { NestedDeclaratorAST *nested_declarator = new (_pool) NestedDeclaratorAST; @@ -1844,7 +1844,7 @@ bool Parser::parseEnumSpecifier(SpecifierListAST *&node) } if (LA() == T_LBRACE) { ast->lbrace_token = consumeToken(); - unsigned comma_token = 0; + int comma_token = 0; EnumeratorListAST **enumerator_ptr = &ast->enumerator_list; while (int tk = LA()) { if (tk == T_RBRACE) @@ -2022,11 +2022,11 @@ bool Parser::parseParameterDeclarationClause(ParameterDeclarationClauseAST *&nod if (LA() == T_RPAREN) return true; // nothing to do CHECK_CACHE(ASTCache::ParameterDeclarationClause, ParameterDeclarationClauseAST); - const unsigned initialCursor = cursor(); + const int initialCursor = cursor(); ParameterDeclarationListAST *parameter_declarations = 0; - unsigned dot_dot_dot_token = 0; + int dot_dot_dot_token = 0; if (LA() == T_DOT_DOT_DOT) dot_dot_dot_token = consumeToken(); else { @@ -2136,7 +2136,7 @@ bool Parser::parseClassSpecifier(SpecifierListAST *&node) if (! lookAtClassKey()) return false; - unsigned classkey_token = consumeToken(); + int classkey_token = consumeToken(); SpecifierListAST *attributes = 0; parseOptionalAttributeSpecifierSequence(attributes); @@ -2158,9 +2158,9 @@ bool Parser::parseClassSpecifier(SpecifierListAST *&node) const bool previousInFunctionBody = _inFunctionBody; _inFunctionBody = false; - unsigned colon_token = 0; - unsigned dot_dot_dot_token = 0; - unsigned final_token = 0; + int colon_token = 0; + int dot_dot_dot_token = 0; + int final_token = 0; if (LA() == T_IDENTIFIER) { const Identifier *id = tok().identifier; @@ -2188,7 +2188,7 @@ bool Parser::parseClassSpecifier(SpecifierListAST *&node) if (LA() != T_LBRACE) { error(cursor(), "expected `{' before `%s'", tok().spell()); - const unsigned saved = cursor(); + const int saved = cursor(); for (int n = 0; n < 3 && LA() != T_EOF_SYMBOL; ++n, consumeToken()) { if (LA() == T_LBRACE) @@ -2219,7 +2219,7 @@ bool Parser::parseClassSpecifier(SpecifierListAST *&node) break; } - unsigned start_declaration = cursor(); + int start_declaration = cursor(); DeclarationAST *declaration = 0; if (parseMemberSpecification(declaration, ast)) { if (declaration) { // paranoia check @@ -2337,7 +2337,7 @@ bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node) case Token_SCRIPTABLE: case Token_STORED: case Token_USER: { - unsigned item_name_token = consumeToken(); + int item_name_token = consumeToken(); ExpressionAST *expr = 0; if (parsePostfixExpression(expr)) { QtPropertyDeclarationItemAST *bItem = @@ -2493,7 +2493,7 @@ bool Parser::parseQtInterfaces(DeclarationAST *&node) (*iter)->value = new (_pool) QtInterfaceNameAST; (*iter)->value->interface_name = name_ast; for (NameListAST **iter2 = &(*iter)->value->constraint_list; LA() && LA() == T_COLON; iter2 = &(*iter2)->next) { - /*unsigned colon_token =*/ consumeToken(); + /*int colon_token =*/ consumeToken(); NameAST *name_ast2 = 0; if (!parseName(name_ast2)) break; @@ -2595,7 +2595,7 @@ bool Parser::parseCtorInitializer(CtorInitializerAST *&node) { DEBUG_THIS_RULE(); if (LA() == T_COLON) { - unsigned colon_token = consumeToken(); + int colon_token = consumeToken(); CtorInitializerAST *ast = new (_pool) CtorInitializerAST; ast->colon_token = colon_token; @@ -2615,7 +2615,7 @@ bool Parser::parseElaboratedTypeSpecifier(SpecifierListAST *&node) { DEBUG_THIS_RULE(); if (lookAtClassKey() || LA() == T_ENUM || LA() == T_TYPENAME) { - unsigned classkey_token = consumeToken(); + int classkey_token = consumeToken(); SpecifierListAST *attributes = 0; parseOptionalAttributeSpecifierSequence(attributes); @@ -2706,7 +2706,7 @@ bool Parser::parseInitDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_sp && node->postfix_declarator_list->lastValue()->asFunctionDeclarator(); if (declaringClass && LA() == T_COLON && (! node || ! node->postfix_declarator_list)) { - unsigned colon_token = consumeToken(); + int colon_token = consumeToken(); ExpressionAST *expression = 0; if (parseConstantExpression(expression) && (LA() == T_COMMA || LA() == T_SEMICOLON)) { @@ -2760,14 +2760,14 @@ bool Parser::parseBaseClause(BaseSpecifierListAST *&node) return false; } -bool Parser::parseInitializer(ExpressionAST *&node, unsigned *equals_token) +bool Parser::parseInitializer(ExpressionAST *&node, int *equals_token) { DEBUG_THIS_RULE(); return parseInitializer0x(node, equals_token); } -bool Parser::parseInitializer0x(ExpressionAST *&node, unsigned *equals_token) +bool Parser::parseInitializer0x(ExpressionAST *&node, int *equals_token) { DEBUG_THIS_RULE(); @@ -3000,7 +3000,7 @@ bool Parser::parseExpressionList(ExpressionListAST *&node) { DEBUG_THIS_RULE(); CHECK_CACHE(ASTCache::ExpressionList, ExpressionListAST); - unsigned initialCursor = cursor(); + int initialCursor = cursor(); if (_languageFeatures.cxx11Enabled) { const bool result = parseInitializerList0x(node); @@ -3116,13 +3116,13 @@ bool Parser::parseUnqualifiedName(NameAST *&node, bool acceptTemplateId) node = ast; return true; } else if (LA() == T_OPERATOR) { - unsigned operator_token = cursor(); + int operator_token = cursor(); if (parseOperatorFunctionId(node)) return true; rewind(operator_token); return parseConversionFunctionId(node); } else if (LA() == T_IDENTIFIER) { - unsigned identifier_token = cursor(); + int identifier_token = cursor(); if (acceptTemplateId && LA(2) == T_LESS) { bool blocked = blockErrors(true); if (parseTemplateId(node) @@ -3141,7 +3141,7 @@ bool Parser::parseUnqualifiedName(NameAST *&node, bool acceptTemplateId) node = ast; return true; } else if (LA() == T_TEMPLATE) { - unsigned template_token = consumeToken(); + int template_token = consumeToken(); if (parseTemplateId(node, template_token)) return true; rewind(template_token); @@ -3397,8 +3397,8 @@ bool Parser::parseReturnStatement(StatementAST *&node) bool Parser::maybeAmbiguousStatement(DeclarationStatementAST *ast, StatementAST *&node) { - const unsigned start = ast->firstToken(); - const unsigned end = ast->lastToken(); + const int start = ast->firstToken(); + const int end = ast->lastToken(); const bool blocked = blockErrors(true); bool maybeAmbiguous = false; @@ -3423,7 +3423,7 @@ bool Parser::parseExpressionOrDeclarationStatement(StatementAST *&node) if (LA() == T_SEMICOLON) return parseExpressionStatement(node); - const unsigned start = cursor(); + const int start = cursor(); if (lookAtCVQualifier() || lookAtStorageClassSpecifier() @@ -3440,11 +3440,11 @@ bool Parser::parseExpressionOrDeclarationStatement(StatementAST *&node) ExpressionAST *expression = 0; const bool hasExpression = parseExpression(expression); - const unsigned afterExpression = cursor(); + const int afterExpression = cursor(); if (hasExpression/* && LA() == T_SEMICOLON*/) { - //const unsigned semicolon_token = consumeToken(); - unsigned semicolon_token = 0; + //const int semicolon_token = consumeToken(); + int semicolon_token = 0; if (LA() == T_SEMICOLON) semicolon_token = cursor(); @@ -3518,7 +3518,7 @@ bool Parser::parseExpressionOrDeclarationStatement(StatementAST *&node) bool Parser::parseCondition(ExpressionAST *&node) { DEBUG_THIS_RULE(); - unsigned start = cursor(); + int start = cursor(); bool blocked = blockErrors(true); SpecifierListAST *type_specifier = 0; @@ -3583,7 +3583,7 @@ bool Parser::parseForeachStatement(StatementAST *&node) ast->foreach_token = consumeToken(); match(T_LPAREN, &ast->lparen_token); - unsigned startOfTypeSpecifier = cursor(); + int startOfTypeSpecifier = cursor(); bool blocked = blockErrors(true); if (parseTypeSpecifier(ast->type_specifier_list)) @@ -3617,11 +3617,11 @@ bool Parser::parseForStatement(StatementAST *&node) if (LA() != T_FOR) return false; - unsigned for_token = consumeToken(); - unsigned lparen_token = 0; + int for_token = consumeToken(); + int lparen_token = 0; match(T_LPAREN, &lparen_token); - unsigned startOfTypeSpecifier = cursor(); + int startOfTypeSpecifier = cursor(); bool blocked = blockErrors(true); if (_languageFeatures.objCEnabled) { @@ -3736,7 +3736,7 @@ bool Parser::parseCompoundStatement(StatementAST *&node) if (tk == T_RBRACE) break; - unsigned start_statement = cursor(); + int start_statement = cursor(); StatementAST *statement = 0; if (! parseStatement(statement)) { rewind(start_statement + 1); @@ -3876,7 +3876,7 @@ bool Parser::parseNamespaceAliasDefinition(DeclarationAST *&node) bool Parser::parseDeclarationStatement(StatementAST *&node) { DEBUG_THIS_RULE(); - unsigned start = cursor(); + int start = cursor(); DeclarationAST *declaration = 0; if (! parseBlockDeclaration(declaration)) return false; @@ -3998,7 +3998,7 @@ bool Parser::parseAttributeSpecifier(SpecifierListAST *&attribute_list) ast->align_token = consumeToken(); match(T_LPAREN, &ast->lparen_token); - const unsigned saved = cursor(); + const int saved = cursor(); if (!parseTypeId(ast->typeIdExprOrAlignmentExpr) || (LA() != T_RPAREN && (LA(1) != T_DOT_DOT_DOT || LA(2) != T_RPAREN))) { @@ -4087,7 +4087,7 @@ bool Parser::parseBuiltinTypeSpecifier(SpecifierListAST *&node) TypeofSpecifierAST *ast = new (_pool) TypeofSpecifierAST; ast->typeof_token = consumeToken(); if (LA() == T_LPAREN) { - unsigned lparen_token = consumeToken(); + int lparen_token = consumeToken(); if (parseTypeId(ast->expression) && LA() == T_RPAREN) { ast->lparen_token = lparen_token; ast->rparen_token = consumeToken(); @@ -4122,7 +4122,7 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node, ClassSpecifierAST *de const ASTCache::CacheKey cacheKey(cursor(), ASTCache::Declaration); CHECK_CACHE(cacheKey.astKind, DeclarationAST); - unsigned qt_invokable_token = 0; + int qt_invokable_token = 0; if (declaringClass && (LA() == T_Q_SIGNAL || LA() == T_Q_SLOT || LA() == T_Q_INVOKABLE)) qt_invokable_token = consumeToken(); @@ -4130,7 +4130,7 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node, ClassSpecifierAST *de // or a contructor declaration. bool has_type_specifier = false; bool has_complex_type_specifier = false; - unsigned startOfNamedTypeSpecifier = 0; + int startOfNamedTypeSpecifier = 0; NameAST *named_type_specifier = 0; SpecifierListAST *decl_specifier_seq = 0, **decl_specifier_seq_ptr = &decl_specifier_seq; @@ -4174,7 +4174,7 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node, ClassSpecifierAST *de break; } } else if (! has_type_specifier && LA() == T_ENUM) { - unsigned startOfTypeSpecifier = cursor(); + int startOfTypeSpecifier = cursor(); if (! parseElaboratedTypeSpecifier(*decl_specifier_seq_ptr) || LA() == T_LBRACE || (_languageFeatures.cxx11Enabled && LA() == T_COLON)) { @@ -4188,7 +4188,7 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node, ClassSpecifierAST *de decl_specifier_seq_ptr = &(*decl_specifier_seq_ptr)->next; has_type_specifier = true; } else if (! has_type_specifier && LA() == T_TYPENAME) { - unsigned startOfElaboratedTypeSpecifier = cursor(); + int startOfElaboratedTypeSpecifier = cursor(); if (! parseElaboratedTypeSpecifier(*decl_specifier_seq_ptr)) { error(startOfElaboratedTypeSpecifier, "expected an elaborated type specifier"); break; @@ -4196,7 +4196,7 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node, ClassSpecifierAST *de decl_specifier_seq_ptr = &(*decl_specifier_seq_ptr)->next; has_type_specifier = true; } else if (! has_type_specifier && lookAtClassKey()) { - unsigned startOfTypeSpecifier = cursor(); + int startOfTypeSpecifier = cursor(); if (! parseElaboratedTypeSpecifier(*decl_specifier_seq_ptr) || (LA() == T_COLON || LA() == T_LBRACE || (LA(0) == T_IDENTIFIER && LA(1) == T_IDENTIFIER // MACRO Name followed by : or { @@ -4290,7 +4290,7 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node, ClassSpecifierAST *de parseCtorInitializer(ctor_initializer); if (LA() != T_LBRACE) { - const unsigned pos = cursor(); + const int pos = cursor(); for (int n = 0; n < 3 && LA(); consumeToken(), ++n) if (LA() == T_LBRACE) @@ -4353,7 +4353,7 @@ bool Parser::parseFunctionBody(StatementAST *&node) { DEBUG_THIS_RULE(); if (_translationUnit->skipFunctionBody()) { - unsigned token_lbrace = 0; + int token_lbrace = 0; match(T_LBRACE, &token_lbrace); if (! token_lbrace) return false; @@ -4361,7 +4361,7 @@ bool Parser::parseFunctionBody(StatementAST *&node) const Token &tk = _translationUnit->tokenAt(token_lbrace); if (tk.close_brace) rewind(tk.close_brace); - unsigned token_rbrace = 0; + int token_rbrace = 0; match(T_RBRACE, &token_rbrace); return true; } @@ -4391,12 +4391,12 @@ bool Parser::parseTryBlockStatement(StatementAST *&node, CtorInitializerAST **pl ast->try_token = consumeToken(); // [ctor-initializer] if (LA() == T_COLON) { - const unsigned colonPos = cursor(); + const int colonPos = cursor(); CtorInitializerAST *ctor_initializer = 0; parseCtorInitializer(ctor_initializer); if (LA() != T_LBRACE) { - const unsigned pos = cursor(); + const int pos = cursor(); for (int n = 0; n < 3 && LA(); consumeToken(), ++n) if (LA() == T_LBRACE) @@ -4569,7 +4569,7 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node) return parseQtMethod(node); case T_LBRACKET: { - const unsigned lbracket_token = cursor(); + const int lbracket_token = cursor(); if (_languageFeatures.cxx11Enabled) { if (parseLambdaExpression(node)) @@ -4667,15 +4667,15 @@ bool Parser::parseObjCTryStatement(StatementAST *& /*node*/) parseCompoundStatement(body_statment); while (LA() == T_AT_CATCH) { /*catch_token =*/ consumeToken(); - unsigned lparen_token; + int lparen_token; match(T_LPAREN, &lparen_token); if (LA() == T_DOT_DOT_DOT) { - /*unsigned ellipsis_token =*/ consumeToken(); + /*int ellipsis_token =*/ consumeToken(); } else { ParameterDeclarationAST *exception_decl; parseParameterDeclaration(exception_decl); } - unsigned rparen_token; + int rparen_token; match(T_RPAREN, &rparen_token); StatementAST *catch_statement; parseCompoundStatement(catch_statement); @@ -4720,7 +4720,7 @@ bool Parser::parseObjCThrowStatement(StatementAST *&/*node*/) /*throw_token =*/ consumeToken(); ExpressionAST *thrown_expression; parseExpression(thrown_expression); - unsigned semicolon_token; + int semicolon_token; match(T_SEMICOLON, &semicolon_token); return true; @@ -4764,7 +4764,7 @@ bool Parser::parseObjCSelectorExpression(ExpressionAST *&node) ast->selector_token = consumeToken(); match(T_LPAREN, &ast->lparen_token); - unsigned identifier_token = 0; + int identifier_token = 0; match(T_IDENTIFIER, &identifier_token); if (LA() == T_COLON) { ObjCSelectorAST *args = new (_pool) ObjCSelectorAST; @@ -4807,9 +4807,9 @@ bool Parser::parseObjCMessageExpression(ExpressionAST *&node) if (LA() != T_LBRACKET) return false; - unsigned start = cursor(); + int start = cursor(); - unsigned lbracket_token = consumeToken(); + int lbracket_token = consumeToken(); ExpressionAST *receiver_expression = 0; ObjCSelectorAST *selector = 0; ObjCMessageArgumentListAST *argument_list = 0; @@ -4845,7 +4845,7 @@ bool Parser::parseObjCMessageArguments(ObjCSelectorAST *&selNode, ObjCMessageArg if (LA() == T_RBRACKET) return false; // nothing to do. - unsigned start = cursor(); + int start = cursor(); ObjCSelectorArgumentAST *selectorArgument = 0; ObjCMessageArgumentAST *messageArgument = 0; @@ -4890,7 +4890,7 @@ bool Parser::parseObjCMessageArguments(ObjCSelectorAST *&selNode, ObjCMessageArg return true; } else { rewind(start); - unsigned name_token = 0; + int name_token = 0; if (!parseObjCSelector(name_token)) return false; ObjCSelectorAST *sel = new (_pool) ObjCSelectorAST; @@ -4908,7 +4908,7 @@ bool Parser::parseObjCMessageArguments(ObjCSelectorAST *&selNode, ObjCMessageArg bool Parser::parseObjCSelectorArg(ObjCSelectorArgumentAST *&selNode, ObjCMessageArgumentAST *&argNode) { DEBUG_THIS_RULE(); - unsigned selector_token = 0; + int selector_token = 0; if (!parseObjCSelector(selector_token)) return false; @@ -4921,7 +4921,7 @@ bool Parser::parseObjCSelectorArg(ObjCSelectorArgumentAST *&selNode, ObjCMessage argNode = new (_pool) ObjCMessageArgumentAST; ExpressionAST **expr = &argNode->parameter_value_expression; - unsigned expressionStart = cursor(); + int expressionStart = cursor(); if (parseAssignmentExpression(*expr) && LA() == T_COLON && (*expr)->asCastExpression()) { rewind(expressionStart); parseUnaryExpression(*expr); @@ -4933,7 +4933,7 @@ bool Parser::parseObjCSelectorArg(ObjCSelectorArgumentAST *&selNode, ObjCMessage bool Parser::parseNameId(NameAST *&name) { DEBUG_THIS_RULE(); - unsigned start = cursor(); + int start = cursor(); if (! parseName(name)) return false; @@ -4959,7 +4959,7 @@ bool Parser::parseNameId(NameAST *&name) if (! template_arguments->next && template_arguments->value && template_arguments->value->asBinaryExpression()) { - unsigned saved = cursor(); + int saved = cursor(); ExpressionAST *expr = 0; bool blocked = blockErrors(true); @@ -5013,7 +5013,7 @@ bool Parser::parseNestedExpression(ExpressionAST *&node) { DEBUG_THIS_RULE(); if (LA() == T_LPAREN) { - unsigned lparen_token = consumeToken(); + int lparen_token = consumeToken(); bool previousTemplateArguments = switchTemplateArguments(false); ExpressionAST *expression = 0; @@ -5056,7 +5056,7 @@ bool Parser::parseTypenameCallExpression(ExpressionAST *&node) { DEBUG_THIS_RULE(); if (LA() == T_TYPENAME) { - unsigned typename_token = consumeToken(); + int typename_token = consumeToken(); NameAST *name = 0; if (parseName(name) && (LA() == T_LPAREN || (_languageFeatures.cxx11Enabled && LA() == T_LBRACE))) { @@ -5085,7 +5085,7 @@ bool Parser::parseTypeidExpression(ExpressionAST *&node) ast->typeid_token = consumeToken(); if (LA() == T_LPAREN) ast->lparen_token = consumeToken(); - unsigned saved = cursor(); + int saved = cursor(); if (! (parseTypeId(ast->expression) && LA() == T_RPAREN)) { rewind(saved); parseExpression(ast->expression); @@ -5115,7 +5115,7 @@ bool Parser::parseCorePostfixExpression(ExpressionAST *&node) return parseTypeidExpression(node); default: { - unsigned start = cursor(); + int start = cursor(); SpecifierListAST *type_specifier = 0; bool blocked = blockErrors(true); if (lookAtBuiltinTypeSpecifier() && @@ -5138,10 +5138,10 @@ bool Parser::parseCorePostfixExpression(ExpressionAST *&node) // look for compound literals if (LA() == T_LPAREN) { - unsigned lparen_token = consumeToken(); + int lparen_token = consumeToken(); ExpressionAST *type_id = 0; if (parseTypeId(type_id) && LA() == T_RPAREN) { - unsigned rparen_token = consumeToken(); + int rparen_token = consumeToken(); if (LA() == T_LBRACE) { blockErrors(blocked); @@ -5223,7 +5223,7 @@ bool Parser::parseUnaryExpression(ExpressionAST *&node) case T_PLUS: case T_MINUS: case T_EXCLAIM: { - unsigned op = cursor(); + int op = cursor(); UnaryExpressionAST *ast = new (_pool) UnaryExpressionAST; ast->unary_op_token = consumeToken(); if (! parseCastExpression(ast->expression)) @@ -5253,7 +5253,7 @@ bool Parser::parseUnaryExpression(ExpressionAST *&node) ast->dot_dot_dot_token = consumeToken(); if (LA() == T_LPAREN) { - unsigned lparen_token = consumeToken(); + int lparen_token = consumeToken(); const bool blocked = blockErrors(true); const bool hasTypeId = parseTypeId(ast->expression); (void) blockErrors(blocked); @@ -5318,10 +5318,10 @@ bool Parser::parseExpressionListParen(ExpressionAST *&node) { DEBUG_THIS_RULE(); if (LA() == T_LPAREN) { - unsigned lparen_token = consumeToken(); + int lparen_token = consumeToken(); ExpressionListAST *expression_list = 0; if (parseExpressionList(expression_list) && LA() == T_RPAREN) { - unsigned rparen_token = consumeToken(); + int rparen_token = consumeToken(); ExpressionListParenAST *ast = new (_pool) ExpressionListParenAST; ast->lparen_token = lparen_token; ast->expression_list = expression_list; @@ -5354,7 +5354,7 @@ bool Parser::parseNewExpression(ExpressionAST *&node) ExpressionAST *parenExpressionList = 0; if (parseExpressionListParen(parenExpressionList)) { - unsigned after_new_placement = cursor(); + int after_new_placement = cursor(); NewTypeIdAST *new_type_id = 0; if (parseNewTypeId(new_type_id)) { @@ -5368,7 +5368,7 @@ bool Parser::parseNewExpression(ExpressionAST *&node) rewind(after_new_placement); if (LA() == T_LPAREN) { - unsigned lparen_token = consumeToken(); + int lparen_token = consumeToken(); ExpressionAST *type_id = 0; if (parseTypeId(type_id) && LA() == T_RPAREN) { ast->new_placement = parenExpressionList->asExpressionListParen(); @@ -5385,7 +5385,7 @@ bool Parser::parseNewExpression(ExpressionAST *&node) rewind(ast->new_token + 1); if (LA() == T_LPAREN) { - unsigned lparen_token = consumeToken(); + int lparen_token = consumeToken(); ExpressionAST *type_id = 0; if (parseTypeId(type_id) && LA() == T_RPAREN) { ast->lparen_token = lparen_token; @@ -5479,8 +5479,8 @@ bool Parser::parseCastExpression(ExpressionAST *&node) { DEBUG_THIS_RULE(); if (LA() == T_LPAREN) { - unsigned lparen_token = consumeToken(); - unsigned initialCursor = cursor(); + int lparen_token = consumeToken(); + int initialCursor = cursor(); ExpressionAST *type_id = 0; if (parseTypeId(type_id) && LA() == T_RPAREN) { @@ -5493,7 +5493,7 @@ bool Parser::parseCastExpression(ExpressionAST *&node) case T_PLUS_PLUS: case T_MINUS_MINUS: { - const unsigned rparen_token = consumeToken(); + const int rparen_token = consumeToken(); const bool blocked = blockErrors(true); ExpressionAST *unary = 0; @@ -5521,7 +5521,7 @@ bool Parser::parseCastExpression(ExpressionAST *&node) } } - unsigned rparen_token = consumeToken(); + int rparen_token = consumeToken(); ExpressionAST *expression = 0; if (parseCastExpression(expression)) { CastExpressionAST *ast = new (_pool) CastExpressionAST; @@ -5637,7 +5637,7 @@ bool Parser::parseExpression(ExpressionAST *&node) { DEBUG_THIS_RULE(); CHECK_CACHE(ASTCache::Expression, ExpressionAST); - unsigned initialCursor = cursor(); + int initialCursor = cursor(); if (_expressionDepth > MAX_EXPRESSION_DEPTH) return false; @@ -5654,7 +5654,7 @@ void Parser::parseExpressionWithOperatorPrecedence(ExpressionAST *&lhs, int minP { DEBUG_THIS_RULE(); - unsigned iterations = 0; + int iterations = 0; while (precedence(tok().kind(), _templateArguments) >= minPrecedence) { if (++iterations > MAX_EXPRESSION_DEPTH) { warning(cursor(), "Reached parse limit for expression"); @@ -5784,7 +5784,7 @@ bool Parser::parseDesignatedInitializer(ExpressionAST *&node) DesignatedInitializerAST *ast = new (_pool) DesignatedInitializerAST; DesignatorListAST **designator_list_ptr = &ast->designator_list; DesignatorAST *designator = 0; - const unsigned start = cursor(); + const int start = cursor(); while (parseDesignator(designator)) { *designator_list_ptr = new (_pool) DesignatorListAST; (*designator_list_ptr)->value = designator; @@ -5817,7 +5817,7 @@ bool Parser::parseDesignatedInitializer(ExpressionAST *&node) bool Parser::parseDesignator(DesignatorAST *&node) { DEBUG_THIS_RULE(); - const unsigned start = cursor(); + const int start = cursor(); if (LA() == T_DOT) { DotDesignatorAST *ast = new (_pool) DotDesignatorAST; ast->dot_token = consumeToken(); @@ -5849,7 +5849,7 @@ bool Parser::parseObjCClassForwardDeclaration(DeclarationAST *&node) ObjCClassForwardDeclarationAST *ast = new (_pool) ObjCClassForwardDeclarationAST; ast->class_token = consumeToken(); - unsigned identifier_token = 0; + int identifier_token = 0; match(T_IDENTIFIER, &identifier_token); ast->identifier_list = new (_pool) NameListAST; @@ -5902,8 +5902,8 @@ bool Parser::parseObjCInterface(DeclarationAST *&node, if (LA() != T_AT_INTERFACE) return false; - unsigned objc_interface_token = consumeToken(); - unsigned identifier_token = 0; + int objc_interface_token = consumeToken(); + int identifier_token = 0; match(T_IDENTIFIER, &identifier_token); if (LA() == T_LPAREN) { @@ -5991,8 +5991,8 @@ bool Parser::parseObjCProtocol(DeclarationAST *&node, if (LA() != T_AT_PROTOCOL) return false; - unsigned protocol_token = consumeToken(); - unsigned identifier_token = 0; + int protocol_token = consumeToken(); + int identifier_token = 0; match(T_IDENTIFIER, &identifier_token); if (LA() == T_COMMA || LA() == T_SEMICOLON) { @@ -6057,8 +6057,8 @@ bool Parser::parseObjCImplementation(DeclarationAST *&node) if (LA() != T_AT_IMPLEMENTATION) return false; - unsigned implementation_token = consumeToken(); - unsigned identifier_token = 0; + int implementation_token = consumeToken(); + int identifier_token = 0; match(T_IDENTIFIER, &identifier_token); if (LA() == T_LPAREN) { @@ -6110,7 +6110,7 @@ bool Parser::parseObjCMethodDefinitionList(DeclarationListAST *&node) DeclarationListAST **next = &node; while (LA() && LA() != T_AT_END) { - unsigned start = cursor(); + int start = cursor(); DeclarationAST *declaration = 0; switch (LA()) { @@ -6245,7 +6245,7 @@ bool Parser::parseObjCProtocolRefs(ObjCProtocolRefsAST *&node) match(T_LESS, &ast->less_token); - unsigned identifier_token = 0; + int identifier_token = 0; match(T_IDENTIFIER, &identifier_token); ast->identifier_list = new (_pool) NameListAST; SimpleNameAST *name = new (_pool) SimpleNameAST; @@ -6286,7 +6286,7 @@ bool Parser::parseObjClassInstanceVariables(ObjCInstanceVariablesDeclarationAST if (LA() == T_RBRACE) break; - const unsigned start = cursor(); + const int start = cursor(); *next = new (_pool) DeclarationListAST; parseObjCInstanceVariableDeclaration((*next)->value); @@ -6568,7 +6568,7 @@ bool Parser::parseObjCTypeName(ObjCTypeNameAST *&node) // objc-selector ::= T_IDENTIFIER | keyword // -bool Parser::parseObjCSelector(unsigned &selector_token) +bool Parser::parseObjCSelector(int &selector_token) { DEBUG_THIS_RULE(); if (! lookAtObjCSelector()) @@ -6605,7 +6605,7 @@ bool Parser::parseObjCKeywordDeclaration(ObjCSelectorArgumentAST *&argument, Obj return true; } -bool Parser::parseObjCTypeQualifiers(unsigned &type_qualifier) +bool Parser::parseObjCTypeQualifiers(int &type_qualifier) { DEBUG_THIS_RULE(); if (LA() != T_IDENTIFIER) @@ -6636,7 +6636,7 @@ bool Parser::peekAtObjCContextKeyword(int kind) return k == kind; } -bool Parser::parseObjCContextKeyword(int kind, unsigned &in_token) +bool Parser::parseObjCContextKeyword(int kind, int &in_token) { DEBUG_THIS_RULE(); @@ -6703,7 +6703,7 @@ bool Parser::parseLambdaCapture(LambdaCaptureAST *&node) DEBUG_THIS_RULE(); bool startsWithDefaultCapture = false; - unsigned default_capture = 0; + int default_capture = 0; CaptureListAST *capture_list = 0; if (LA() == T_AMPER || LA() == T_EQUAL) { @@ -6828,21 +6828,21 @@ bool Parser::parseTrailingReturnType(TrailingReturnTypeAST *&node) return true; } -void Parser::rewind(unsigned cursor) +void Parser::rewind(int cursor) { #ifndef CPLUSPLUS_NO_DEBUG_RULE if (cursor != _tokenIndex) fprintf(stderr, "! rewinding from token %d to token %d\n", _tokenIndex, cursor); #endif - const unsigned n = _translationUnit->tokenCount(); + const int n = _translationUnit->tokenCount(); if (cursor < n) _tokenIndex = cursor; else _tokenIndex = n - 1; } -void Parser::warning(unsigned index, const char *format, ...) +void Parser::warning(int index, const char *format, ...) { va_list args, ap; va_start(args, format); @@ -6852,7 +6852,7 @@ void Parser::warning(unsigned index, const char *format, ...) va_end(args); } -void Parser::error(unsigned index, const char *format, ...) +void Parser::error(int index, const char *format, ...) { va_list args, ap; va_start(args, format); @@ -6862,7 +6862,7 @@ void Parser::error(unsigned index, const char *format, ...) va_end(args); } -void Parser::fatal(unsigned index, const char *format, ...) +void Parser::fatal(int index, const char *format, ...) { va_list args, ap; va_start(args, format); diff --git a/src/libs/3rdparty/cplusplus/Parser.h b/src/libs/3rdparty/cplusplus/Parser.h index 110bb29d2b..fc2bffaf54 100644 --- a/src/libs/3rdparty/cplusplus/Parser.h +++ b/src/libs/3rdparty/cplusplus/Parser.h @@ -72,7 +72,7 @@ public: bool parseConstantExpression(ExpressionAST *&node); bool parseCtorInitializer(CtorInitializerAST *&node); bool parseCvQualifiers(SpecifierListAST *&node); - bool parseRefQualifier(unsigned &ref_qualifier); + bool parseRefQualifier(int &ref_qualifier); bool parseOverrideFinalQualifiers(SpecifierListAST *&node); bool parseDeclaratorOrAbstractDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specifier_list); bool parseDeclaration(DeclarationAST *&node); @@ -100,7 +100,7 @@ public: bool parseInclusiveOrExpression(ExpressionAST *&node); bool parseInitDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specifier_list, ClassSpecifierAST *declaringClass); bool parseInitializerList(ExpressionListAST *&node); - bool parseInitializer(ExpressionAST *&node, unsigned *equals_token); + bool parseInitializer(ExpressionAST *&node, int *equals_token); bool parseInitializerClause(ExpressionAST *&node); bool parseLabeledStatement(StatementAST *&node); bool parseLinkageBody(DeclarationAST *&node); @@ -111,7 +111,7 @@ public: bool parseMemInitializerList(MemInitializerListAST *&node); bool parseMemberSpecification(DeclarationAST *&node, ClassSpecifierAST *declaringClass); bool parseMultiplicativeExpression(ExpressionAST *&node); - bool parseTemplateId(NameAST *&node, unsigned template_token = 0); + bool parseTemplateId(NameAST *&node, int template_token = 0); bool parseClassOrNamespaceName(NameAST *&node); bool parseNameId(NameAST *&node); bool parseName(NameAST *&node, bool acceptTemplateId = true); @@ -195,7 +195,7 @@ public: bool parseQtMethod(ExpressionAST *&node); // C++0x - bool parseInitializer0x(ExpressionAST *&node, unsigned *equals_token); + bool parseInitializer0x(ExpressionAST *&node, int *equals_token); bool parseBraceOrEqualInitializer0x(ExpressionAST *&node); bool parseInitializerClause0x(ExpressionAST *&node); bool parseInitializerList0x(ExpressionListAST *&node); @@ -241,11 +241,11 @@ public: bool parseObjCMethodPrototype(ObjCMethodPrototypeAST *&node); bool parseObjCPropertyAttribute(ObjCPropertyAttributeAST *&node); bool parseObjCTypeName(ObjCTypeNameAST *&node); - bool parseObjCSelector(unsigned &selector_token); + bool parseObjCSelector(int &selector_token); bool parseObjCKeywordDeclaration(ObjCSelectorArgumentAST *&argument, ObjCMessageArgumentDeclarationAST *&node); - bool parseObjCTypeQualifiers(unsigned &type_qualifier); + bool parseObjCTypeQualifiers(int &type_qualifier); bool peekAtObjCContextKeyword(int kind); - bool parseObjCContextKeyword(int kind, unsigned &in_token); + bool parseObjCContextKeyword(int kind, int &in_token); bool lookAtObjCSelector() const; @@ -269,7 +269,7 @@ public: const Identifier *className(ClassSpecifierAST *ast) const; const Identifier *identifier(NameAST *name) const; - void match(int kind, unsigned *token); + void match(int kind, int *token); bool maybeAmbiguousStatement(DeclarationStatementAST *ast, StatementAST *&node); bool maybeForwardOrClassDeclaration(SpecifierListAST *decl_specifier_seq) const; @@ -280,9 +280,9 @@ public: bool maybeSplitGreaterGreaterToken(int n = 1); bool blockErrors(bool block) { return _translationUnit->blockErrors(block); } - void warning(unsigned index, const char *format, ...); - void error(unsigned index, const char *format, ...); - void fatal(unsigned index, const char *format, ...); + void warning(int index, const char *format, ...); + void error(int index, const char *format, ...); + void fatal(int index, const char *format, ...); inline const Token &tok(int i = 1) const { return _translationUnit->tokenAt(_tokenIndex + i - 1); } @@ -293,21 +293,21 @@ public: inline int consumeToken() { return _tokenIndex++; } - inline unsigned cursor() const + inline int cursor() const { return _tokenIndex; } - void rewind(unsigned cursor); + void rewind(int cursor); struct TemplateArgumentListEntry { - unsigned index; - unsigned cursor; + int index; + int cursor; ExpressionListAST *ast; - TemplateArgumentListEntry(unsigned index = 0, unsigned cursor = 0, ExpressionListAST *ast = 0) + TemplateArgumentListEntry(int index = 0, int cursor = 0, ExpressionListAST *ast = 0) : index(index), cursor(cursor), ast(ast) {} }; - TemplateArgumentListEntry *templateArgumentListEntry(unsigned tokenIndex); + TemplateArgumentListEntry *templateArgumentListEntry(int tokenIndex); void clearTemplateArgumentList() { _templateArgumentList.clear(); } private: @@ -315,7 +315,7 @@ private: Control *_control; MemoryPool *_pool; LanguageFeatures _languageFeatures; - unsigned _tokenIndex; + int _tokenIndex; bool _templateArguments: 1; bool _inFunctionBody: 1; bool _inExpressionStatement: 1; @@ -324,7 +324,7 @@ private: std::stack<int> _initializerClauseDepth; MemoryPool _expressionStatementTempPool; - std::map<unsigned, TemplateArgumentListEntry> _templateArgumentList; + std::map<int, TemplateArgumentListEntry> _templateArgumentList; class ASTCache; ASTCache *_astCache; diff --git a/src/libs/3rdparty/cplusplus/Scope.cpp b/src/libs/3rdparty/cplusplus/Scope.cpp index 406a794c7e..a6aa43ca97 100644 --- a/src/libs/3rdparty/cplusplus/Scope.cpp +++ b/src/libs/3rdparty/cplusplus/Scope.cpp @@ -58,10 +58,10 @@ public: bool isEmpty() const; /// Returns the number of symbols is in the scope. - unsigned symbolCount() const; + int symbolCount() const; /// Returns the Symbol at the given position. - Symbol *symbolAt(unsigned index) const; + Symbol *symbolAt(int index) const; /// Returns the first Symbol in the scope. iterator firstSymbol() const; @@ -210,10 +210,10 @@ unsigned SymbolTable::hashValue(Symbol *symbol) const bool SymbolTable::isEmpty() const { return _symbolCount == -1; } -unsigned SymbolTable::symbolCount() const +int SymbolTable::symbolCount() const { return _symbolCount + 1; } -Symbol *SymbolTable::symbolAt(unsigned index) const +Symbol *SymbolTable::symbolAt(int index) const { if (! _symbols) return 0; @@ -226,7 +226,7 @@ SymbolTable::iterator SymbolTable::firstSymbol() const SymbolTable::iterator SymbolTable::lastSymbol() const { return _symbols + _symbolCount + 1; } -Scope::Scope(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +Scope::Scope(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name), _members(0), _startOffset(0), @@ -260,11 +260,11 @@ bool Scope::isEmpty() const { return _members ? _members->isEmpty() : true; } /// Returns the number of symbols is in the scope. -unsigned Scope::memberCount() const +int Scope::memberCount() const { return _members ? _members->symbolCount() : 0; } /// Returns the Symbol at the given position. -Symbol *Scope::memberAt(unsigned index) const +Symbol *Scope::memberAt(int index) const { return _members ? _members->symbolAt(index) : 0; } /// Returns the first Symbol in the scope. @@ -282,17 +282,17 @@ Symbol *Scope::find(OperatorNameId::Kind operatorId) const { return _members ? _members->lookat(operatorId) : 0; } /// Set the start offset of the scope -unsigned Scope::startOffset() const +int Scope::startOffset() const { return _startOffset; } -void Scope::setStartOffset(unsigned offset) +void Scope::setStartOffset(int offset) { _startOffset = offset; } /// Set the end offset of the scope -unsigned Scope::endOffset() const +int Scope::endOffset() const { return _endOffset; } -void Scope::setEndOffset(unsigned offset) +void Scope::setEndOffset(int offset) { _endOffset = offset; } } // namespace CPlusPlus diff --git a/src/libs/3rdparty/cplusplus/Scope.h b/src/libs/3rdparty/cplusplus/Scope.h index 01a5b7450d..c3b2a6ca37 100644 --- a/src/libs/3rdparty/cplusplus/Scope.h +++ b/src/libs/3rdparty/cplusplus/Scope.h @@ -29,7 +29,7 @@ namespace CPlusPlus { class CPLUSPLUS_EXPORT Scope: public Symbol { public: - Scope(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + Scope(TranslationUnit *translationUnit, int sourceLocation, const Name *name); Scope(Clone *clone, Subst *subst, Scope *original); virtual ~Scope(); @@ -40,10 +40,10 @@ public: bool isEmpty() const; /// Returns the number of symbols is in the scope. - unsigned memberCount() const; + int memberCount() const; /// Returns the Symbol at the given position. - Symbol *memberAt(unsigned index) const; + Symbol *memberAt(int index) const; typedef Symbol **iterator; @@ -57,12 +57,12 @@ public: Symbol *find(OperatorNameId::Kind operatorId) const; /// Set the start offset of the scope - unsigned startOffset() const; - void setStartOffset(unsigned offset); + int startOffset() const; + void setStartOffset(int offset); /// Set the end offset of the scope - unsigned endOffset() const; - void setEndOffset(unsigned offset); + int endOffset() const; + void setEndOffset(int offset); virtual const Scope *asScope() const { return this; } @@ -72,8 +72,8 @@ public: private: SymbolTable *_members; - unsigned _startOffset; - unsigned _endOffset; + int _startOffset; + int _endOffset; }; } // namespace CPlusPlus diff --git a/src/libs/3rdparty/cplusplus/Symbol.cpp b/src/libs/3rdparty/cplusplus/Symbol.cpp index e9c7edb0dc..e93060a57b 100644 --- a/src/libs/3rdparty/cplusplus/Symbol.cpp +++ b/src/libs/3rdparty/cplusplus/Symbol.cpp @@ -86,7 +86,7 @@ private: unsigned _value; }; -Symbol::Symbol(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +Symbol::Symbol(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : _name(0), _enclosingScope(0), _next(0), @@ -142,7 +142,7 @@ void Symbol::visitSymbol(Symbol *symbol, SymbolVisitor *visitor) symbol->visitSymbol(visitor); } -unsigned Symbol::sourceLocation() const +int Symbol::sourceLocation() const { return _sourceLocation; } bool Symbol::isGenerated() const @@ -160,7 +160,7 @@ bool Symbol::isUnavailable() const void Symbol::setUnavailable(bool isUnavailable) { _isUnavailable = isUnavailable; } -void Symbol::setSourceLocation(unsigned sourceLocation, TranslationUnit *translationUnit) +void Symbol::setSourceLocation(int sourceLocation, TranslationUnit *translationUnit) { _sourceLocation = sourceLocation; @@ -176,12 +176,12 @@ void Symbol::setSourceLocation(unsigned sourceLocation, TranslationUnit *transla } } -unsigned Symbol::line() const +int Symbol::line() const { return _line; } -unsigned Symbol::column() const +int Symbol::column() const { return _column; } @@ -194,7 +194,7 @@ const StringLiteral *Symbol::fileId() const const char *Symbol::fileName() const { return _fileId ? _fileId->chars() : ""; } -unsigned Symbol::fileNameLength() const +int Symbol::fileNameLength() const { return _fileId ? _fileId->size() : 0; } const Name *Symbol::unqualifiedName() const @@ -439,10 +439,10 @@ void Symbol::copy(Symbol *other) Utils::Link Symbol::toLink() const { - const QString filename = QString::fromUtf8(fileName(), static_cast<int>(fileNameLength())); + const QString filename = QString::fromUtf8(fileName(), fileNameLength()); - int line = static_cast<int>(this->line()); - int column = static_cast<int>(this->column()); + int line = this->line(); + int column = this->column(); if (column) --column; diff --git a/src/libs/3rdparty/cplusplus/Symbol.h b/src/libs/3rdparty/cplusplus/Symbol.h index e4c8eea152..9d2777132b 100644 --- a/src/libs/3rdparty/cplusplus/Symbol.h +++ b/src/libs/3rdparty/cplusplus/Symbol.h @@ -54,20 +54,20 @@ public: public: /// Constructs a Symbol with the given source location, name and translation unit. - Symbol(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + Symbol(TranslationUnit *translationUnit, int sourceLocation, const Name *name); Symbol(Clone *clone, Subst *subst, Symbol *original); /// Destroy this Symbol. virtual ~Symbol(); /// Returns this Symbol's source location. - unsigned sourceLocation() const; + int sourceLocation() const; /// \returns this Symbol's line number. The line number is 1-based. - unsigned line() const; + int line() const; /// \returns this Symbol's column number. The column number is 1-based. - unsigned column() const; + int column() const; /// Returns this Symbol's file name. const StringLiteral *fileId() const; @@ -76,7 +76,7 @@ public: const char *fileName() const; /// Returns this Symbol's file name length. - unsigned fileNameLength() const; + int fileNameLength() const; /// Returns this Symbol's name. const Name *name() const; @@ -294,7 +294,7 @@ public: void setEnclosingScope(Scope *enclosingScope); // ### make me private void resetEnclosingScope(); // ### make me private - void setSourceLocation(unsigned sourceLocation, TranslationUnit *translationUnit); // ### make me private + void setSourceLocation(int sourceLocation, TranslationUnit *translationUnit); // ### make me private void visitSymbol(SymbolVisitor *visitor); static void visitSymbol(Symbol *symbol, SymbolVisitor *visitor); @@ -309,13 +309,13 @@ private: Scope *_enclosingScope; Symbol *_next; const StringLiteral *_fileId; - unsigned _sourceLocation; + int _sourceLocation; unsigned _hashCode; int _storage; int _visibility; - unsigned _index; - unsigned _line; - unsigned _column; + int _index; + int _line; + int _column; bool _isGenerated: 1; bool _isDeprecated: 1; diff --git a/src/libs/3rdparty/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp index 8ce7cb8a73..6e156685ac 100644 --- a/src/libs/3rdparty/cplusplus/Symbols.cpp +++ b/src/libs/3rdparty/cplusplus/Symbols.cpp @@ -34,7 +34,7 @@ using namespace CPlusPlus; UsingNamespaceDirective::UsingNamespaceDirective(TranslationUnit *translationUnit, - unsigned sourceLocation, const Name *name) + int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name) { } @@ -52,7 +52,7 @@ void UsingNamespaceDirective::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } NamespaceAlias::NamespaceAlias(TranslationUnit *translationUnit, - unsigned sourceLocation, const Name *name) + int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name), _namespaceName(0) { } @@ -78,7 +78,7 @@ void NamespaceAlias::visitSymbol0(SymbolVisitor *visitor) UsingDeclaration::UsingDeclaration(TranslationUnit *translationUnit, - unsigned sourceLocation, const Name *name) + int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name) { } @@ -95,7 +95,7 @@ FullySpecifiedType UsingDeclaration::type() const void UsingDeclaration::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } -Declaration::Declaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +Declaration::Declaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name) , _initializer(0) { } @@ -226,7 +226,7 @@ const StringLiteral *Declaration::getInitializer() const void Declaration::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } -EnumeratorDeclaration::EnumeratorDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +EnumeratorDeclaration::EnumeratorDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Declaration(translationUnit, sourceLocation, name) , _constantValue(0) {} @@ -240,7 +240,7 @@ const StringLiteral *EnumeratorDeclaration::constantValue() const void EnumeratorDeclaration::setConstantValue(const StringLiteral *constantValue) { _constantValue = constantValue; } -Argument::Argument(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +Argument::Argument(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name), _initializer(0) { } @@ -272,7 +272,7 @@ FullySpecifiedType Argument::type() const void Argument::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } -TypenameArgument::TypenameArgument(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +TypenameArgument::TypenameArgument(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name) , _isClassDeclarator(false) { } @@ -295,7 +295,7 @@ FullySpecifiedType TypenameArgument::type() const void TypenameArgument::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } -Function::Function(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +Function::Function(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Scope(translationUnit, sourceLocation, name), _flags(0) { } @@ -338,10 +338,10 @@ bool Function::isSignatureEqualTo(const Function *other, Matcher *matcher) const else if (! Matcher::match(unqualifiedName(), other->unqualifiedName(), matcher)) return false; - const unsigned argc = argumentCount(); + const int argc = argumentCount(); if (argc != other->argumentCount()) return false; - for (unsigned i = 0; i < argc; ++i) { + for (int i = 0; i < argc; ++i) { Symbol *l = argumentAt(i); Symbol *r = other->argumentAt(i); if (! l->type().match(r->type(), matcher)) { @@ -395,24 +395,24 @@ bool Function::hasReturnType() const return ty.isValid() || ty.isSigned() || ty.isUnsigned(); } -unsigned Function::argumentCount() const +int Function::argumentCount() const { - const unsigned memCnt = memberCount(); + const int memCnt = memberCount(); if (memCnt > 0 && memberAt(0)->type()->isVoidType()) return 0; // Definitions with function-try-blocks will have more than a block, and // arguments with a lambda as default argument will also have more blocks. - unsigned argc = 0; - for (unsigned it = 0; it < memCnt; ++it) + int argc = 0; + for (int it = 0; it < memCnt; ++it) if (memberAt(it)->isArgument()) ++argc; return argc; } -Symbol *Function::argumentAt(unsigned index) const +Symbol *Function::argumentAt(int index) const { - for (unsigned it = 0, eit = memberCount(); it < eit; ++it) { + for (int it = 0, eit = memberCount(); it < eit; ++it) { if (Argument *arg = memberAt(it)->asArgument()) { if (index == 0) return arg; @@ -426,15 +426,15 @@ Symbol *Function::argumentAt(unsigned index) const bool Function::hasArguments() const { - unsigned argc = argumentCount(); + int argc = argumentCount(); return ! (argc == 0 || (argc == 1 && argumentAt(0)->type()->isVoidType())); } -unsigned Function::minimumArgumentCount() const +int Function::minimumArgumentCount() const { - unsigned index = 0; + int index = 0; - for (unsigned ei = argumentCount(); index < ei; ++index) { + for (int ei = argumentCount(); index < ei; ++index) { if (Argument *arg = argumentAt(index)->asArgument()) { if (arg->hasInitializer()) break; @@ -501,16 +501,16 @@ void Function::setAmbiguous(bool isAmbiguous) void Function::visitSymbol0(SymbolVisitor *visitor) { if (visitor->visit(this)) { - for (unsigned i = 0; i < memberCount(); ++i) { + for (int i = 0; i < memberCount(); ++i) { visitSymbol(memberAt(i), visitor); } } } -bool Function::maybeValidPrototype(unsigned actualArgumentCount) const +bool Function::maybeValidPrototype(int actualArgumentCount) const { - const unsigned argc = argumentCount(); - unsigned minNumberArguments = 0; + const int argc = argumentCount(); + int minNumberArguments = 0; for (; minNumberArguments < argc; ++minNumberArguments) { Argument *arg = argumentAt(minNumberArguments)->asArgument(); @@ -535,7 +535,7 @@ bool Function::maybeValidPrototype(unsigned actualArgumentCount) const } -Block::Block(TranslationUnit *translationUnit, unsigned sourceLocation) +Block::Block(TranslationUnit *translationUnit, int sourceLocation) : Scope(translationUnit, sourceLocation, /*name = */ 0) { } @@ -552,13 +552,13 @@ FullySpecifiedType Block::type() const void Block::visitSymbol0(SymbolVisitor *visitor) { if (visitor->visit(this)) { - for (unsigned i = 0; i < memberCount(); ++i) { + for (int i = 0; i < memberCount(); ++i) { visitSymbol(memberAt(i), visitor); } } } -Enum::Enum(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +Enum::Enum(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Scope(translationUnit, sourceLocation, name) , _isScoped(false) { } @@ -598,13 +598,13 @@ bool Enum::match0(const Type *otherType, Matcher *matcher) const void Enum::visitSymbol0(SymbolVisitor *visitor) { if (visitor->visit(this)) { - for (unsigned i = 0; i < memberCount(); ++i) { + for (int i = 0; i < memberCount(); ++i) { visitSymbol(memberAt(i), visitor); } } } -Template::Template(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +Template::Template(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Scope(translationUnit, sourceLocation, name) { } @@ -615,7 +615,7 @@ Template::Template(Clone *clone, Subst *subst, Template *original) Template::~Template() { } -unsigned Template::templateParameterCount() const +int Template::templateParameterCount() const { if (declaration() != 0) return memberCount() - 1; @@ -623,7 +623,7 @@ unsigned Template::templateParameterCount() const return 0; } -Symbol *Template::templateParameterAt(unsigned index) const +Symbol *Template::templateParameterAt(int index) const { return memberAt(index); } Symbol *Template::declaration() const @@ -646,7 +646,7 @@ FullySpecifiedType Template::type() const void Template::visitSymbol0(SymbolVisitor *visitor) { if (visitor->visit(this)) { - for (unsigned i = 0; i < memberCount(); ++i) { + for (int i = 0; i < memberCount(); ++i) { visitSymbol(memberAt(i), visitor); } } @@ -662,7 +662,7 @@ bool Template::match0(const Type *otherType, Matcher *matcher) const return false; } -Namespace::Namespace(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +Namespace::Namespace(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Scope(translationUnit, sourceLocation, name) , _isInline(false) { } @@ -689,7 +689,7 @@ bool Namespace::match0(const Type *otherType, Matcher *matcher) const void Namespace::visitSymbol0(SymbolVisitor *visitor) { if (visitor->visit(this)) { - for (unsigned i = 0; i < memberCount(); ++i) { + for (int i = 0; i < memberCount(); ++i) { visitSymbol(memberAt(i), visitor); } } @@ -698,7 +698,7 @@ void Namespace::visitSymbol0(SymbolVisitor *visitor) FullySpecifiedType Namespace::type() const { return FullySpecifiedType(const_cast<Namespace *>(this)); } -BaseClass::BaseClass(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +BaseClass::BaseClass(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name), _isVirtual(false) { } @@ -734,7 +734,7 @@ void BaseClass::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } ForwardClassDeclaration::ForwardClassDeclaration(TranslationUnit *translationUnit, - unsigned sourceLocation, const Name *name) + int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name) { } @@ -762,7 +762,7 @@ bool ForwardClassDeclaration::match0(const Type *otherType, Matcher *matcher) co return false; } -Class::Class(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +Class::Class(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Scope(translationUnit, sourceLocation, name), _key(ClassKey) { } @@ -804,10 +804,10 @@ bool Class::match0(const Type *otherType, Matcher *matcher) const return false; } -unsigned Class::baseClassCount() const -{ return unsigned(_baseClasses.size()); } +int Class::baseClassCount() const +{ return int(_baseClasses.size()); } -BaseClass *Class::baseClassAt(unsigned index) const +BaseClass *Class::baseClassAt(int index) const { return _baseClasses.at(index); } void Class::addBaseClass(BaseClass *baseClass) @@ -819,17 +819,17 @@ FullySpecifiedType Class::type() const void Class::visitSymbol0(SymbolVisitor *visitor) { if (visitor->visit(this)) { - for (unsigned i = 0; i < _baseClasses.size(); ++i) { + for (int i = 0; i < int(_baseClasses.size()); ++i) { visitSymbol(_baseClasses.at(i), visitor); } - for (unsigned i = 0; i < memberCount(); ++i) { + for (int i = 0; i < memberCount(); ++i) { visitSymbol(memberAt(i), visitor); } } } -QtPropertyDeclaration::QtPropertyDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +QtPropertyDeclaration::QtPropertyDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name) , _flags(NoFlags) { } @@ -859,7 +859,7 @@ void QtPropertyDeclaration::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } -QtEnum::QtEnum(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +QtEnum::QtEnum(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name) { } @@ -877,7 +877,7 @@ void QtEnum::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } -ObjCBaseClass::ObjCBaseClass(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +ObjCBaseClass::ObjCBaseClass(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name) { } @@ -894,7 +894,7 @@ FullySpecifiedType ObjCBaseClass::type() const void ObjCBaseClass::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } -ObjCBaseProtocol::ObjCBaseProtocol(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +ObjCBaseProtocol::ObjCBaseProtocol(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Symbol(translationUnit, sourceLocation, name) { } @@ -911,7 +911,7 @@ FullySpecifiedType ObjCBaseProtocol::type() const void ObjCBaseProtocol::visitSymbol0(SymbolVisitor *visitor) { visitor->visit(this); } -ObjCClass::ObjCClass(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name): +ObjCClass::ObjCClass(TranslationUnit *translationUnit, int sourceLocation, const Name *name): Scope(translationUnit, sourceLocation, name), _categoryName(0), _baseClass(0), @@ -954,10 +954,10 @@ ObjCBaseClass *ObjCClass::baseClass() const void ObjCClass::setBaseClass(ObjCBaseClass *baseClass) { _baseClass = baseClass; } -unsigned ObjCClass::protocolCount() const -{ return unsigned(_protocols.size()); } +int ObjCClass::protocolCount() const +{ return int(_protocols.size()); } -ObjCBaseProtocol *ObjCClass::protocolAt(unsigned index) const +ObjCBaseProtocol *ObjCClass::protocolAt(int index) const { return _protocols.at(index); } void ObjCClass::addProtocol(ObjCBaseProtocol *protocol) @@ -972,10 +972,10 @@ void ObjCClass::visitSymbol0(SymbolVisitor *visitor) if (_baseClass) visitSymbol(_baseClass, visitor); - for (unsigned i = 0; i < _protocols.size(); ++i) + for (int i = 0; i < int(_protocols.size()); ++i) visitSymbol(_protocols.at(i), visitor); - for (unsigned i = 0; i < memberCount(); ++i) + for (int i = 0; i < memberCount(); ++i) visitSymbol(memberAt(i), visitor); } } @@ -991,7 +991,7 @@ bool ObjCClass::match0(const Type *otherType, Matcher *matcher) const return false; } -ObjCProtocol::ObjCProtocol(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name): +ObjCProtocol::ObjCProtocol(TranslationUnit *translationUnit, int sourceLocation, const Name *name): Scope(translationUnit, sourceLocation, name) { } @@ -1006,10 +1006,10 @@ ObjCProtocol::ObjCProtocol(Clone *clone, Subst *subst, ObjCProtocol *original) ObjCProtocol::~ObjCProtocol() {} -unsigned ObjCProtocol::protocolCount() const -{ return unsigned(_protocols.size()); } +int ObjCProtocol::protocolCount() const +{ return int(_protocols.size()); } -ObjCBaseProtocol *ObjCProtocol::protocolAt(unsigned index) const +ObjCBaseProtocol *ObjCProtocol::protocolAt(int index) const { return _protocols.at(index); } void ObjCProtocol::addProtocol(ObjCBaseProtocol *protocol) @@ -1021,7 +1021,7 @@ FullySpecifiedType ObjCProtocol::type() const void ObjCProtocol::visitSymbol0(SymbolVisitor *visitor) { if (visitor->visit(this)) { - for (unsigned i = 0; i < _protocols.size(); ++i) + for (int i = 0; i < int(_protocols.size()); ++i) visitSymbol(_protocols.at(i), visitor); } } @@ -1037,7 +1037,7 @@ bool ObjCProtocol::match0(const Type *otherType, Matcher *matcher) const return false; } -ObjCForwardClassDeclaration::ObjCForwardClassDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, +ObjCForwardClassDeclaration::ObjCForwardClassDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name): Symbol(translationUnit, sourceLocation, name) { @@ -1067,7 +1067,7 @@ bool ObjCForwardClassDeclaration::match0(const Type *otherType, Matcher *matcher return false; } -ObjCForwardProtocolDeclaration::ObjCForwardProtocolDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, +ObjCForwardProtocolDeclaration::ObjCForwardProtocolDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name): Symbol(translationUnit, sourceLocation, name) { @@ -1097,7 +1097,7 @@ bool ObjCForwardProtocolDeclaration::match0(const Type *otherType, Matcher *matc return false; } -ObjCMethod::ObjCMethod(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name) +ObjCMethod::ObjCMethod(TranslationUnit *translationUnit, int sourceLocation, const Name *name) : Scope(translationUnit, sourceLocation, name), _flags(0) { } @@ -1137,15 +1137,15 @@ bool ObjCMethod::hasReturnType() const return ty.isValid() || ty.isSigned() || ty.isUnsigned(); } -unsigned ObjCMethod::argumentCount() const +int ObjCMethod::argumentCount() const { - const unsigned c = memberCount(); + const int c = memberCount(); if (c > 0 && memberAt(c - 1)->isBlock()) return c - 1; return c; } -Symbol *ObjCMethod::argumentAt(unsigned index) const +Symbol *ObjCMethod::argumentAt(int index) const { return memberAt(index); } @@ -1165,14 +1165,14 @@ void ObjCMethod::setVariadic(bool isVariadic) void ObjCMethod::visitSymbol0(SymbolVisitor *visitor) { if (visitor->visit(this)) { - for (unsigned i = 0; i < memberCount(); ++i) { + for (int i = 0; i < memberCount(); ++i) { visitSymbol(memberAt(i), visitor); } } } ObjCPropertyDeclaration::ObjCPropertyDeclaration(TranslationUnit *translationUnit, - unsigned sourceLocation, + int sourceLocation, const Name *name): Symbol(translationUnit, sourceLocation, name), _getterName(0), diff --git a/src/libs/3rdparty/cplusplus/Symbols.h b/src/libs/3rdparty/cplusplus/Symbols.h index e29f78bf01..070b64634b 100644 --- a/src/libs/3rdparty/cplusplus/Symbols.h +++ b/src/libs/3rdparty/cplusplus/Symbols.h @@ -32,7 +32,7 @@ namespace CPlusPlus { class CPLUSPLUS_EXPORT UsingNamespaceDirective: public Symbol { public: - UsingNamespaceDirective(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + UsingNamespaceDirective(TranslationUnit *translationUnit, int sourceLocation, const Name *name); UsingNamespaceDirective(Clone *clone, Subst *subst, UsingNamespaceDirective *original); virtual ~UsingNamespaceDirective(); @@ -52,7 +52,7 @@ protected: class CPLUSPLUS_EXPORT UsingDeclaration: public Symbol { public: - UsingDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + UsingDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name); UsingDeclaration(Clone *clone, Subst *subst, UsingDeclaration *original); virtual ~UsingDeclaration(); @@ -72,7 +72,7 @@ protected: class CPLUSPLUS_EXPORT NamespaceAlias: public Symbol { public: - NamespaceAlias(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + NamespaceAlias(TranslationUnit *translationUnit, int sourceLocation, const Name *name); NamespaceAlias(Clone *clone, Subst *subst, NamespaceAlias *original); virtual ~NamespaceAlias(); @@ -98,7 +98,7 @@ private: class CPLUSPLUS_EXPORT Declaration: public Symbol { public: - Declaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + Declaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name); Declaration(Clone *clone, Subst *subst, Declaration *original); virtual ~Declaration(); @@ -132,7 +132,7 @@ private: class CPLUSPLUS_EXPORT EnumeratorDeclaration: public Declaration { public: - EnumeratorDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + EnumeratorDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name); virtual ~EnumeratorDeclaration(); const StringLiteral *constantValue() const; @@ -151,7 +151,7 @@ private: class CPLUSPLUS_EXPORT Argument: public Symbol { public: - Argument(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + Argument(TranslationUnit *translationUnit, int sourceLocation, const Name *name); Argument(Clone *clone, Subst *subst, Argument *original); virtual ~Argument(); @@ -182,7 +182,7 @@ private: class CPLUSPLUS_EXPORT TypenameArgument: public Symbol { public: - TypenameArgument(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + TypenameArgument(TranslationUnit *translationUnit, int sourceLocation, const Name *name); TypenameArgument(Clone *clone, Subst *subst, TypenameArgument *original); virtual ~TypenameArgument(); @@ -210,7 +210,7 @@ private: class CPLUSPLUS_EXPORT Block: public Scope { public: - Block(TranslationUnit *translationUnit, unsigned sourceLocation); + Block(TranslationUnit *translationUnit, int sourceLocation); Block(Clone *clone, Subst *subst, Block *original); virtual ~Block(); @@ -230,7 +230,7 @@ protected: class CPLUSPLUS_EXPORT ForwardClassDeclaration: public Symbol, public Type { public: - ForwardClassDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + ForwardClassDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name); ForwardClassDeclaration(Clone *clone, Subst *subst, ForwardClassDeclaration *original); virtual ~ForwardClassDeclaration(); @@ -259,7 +259,7 @@ protected: class CPLUSPLUS_EXPORT Enum: public Scope, public Type { public: - Enum(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + Enum(TranslationUnit *translationUnit, int sourceLocation, const Name *name); Enum(Clone *clone, Subst *subst, Enum *original); virtual ~Enum(); @@ -308,7 +308,7 @@ public: }; public: - Function(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + Function(TranslationUnit *translationUnit, int sourceLocation, const Name *name); Function(Clone *clone, Subst *subst, Function *original); virtual ~Function(); @@ -325,12 +325,12 @@ public: /** Convenience function that returns whether the function returns something (including void). */ bool hasReturnType() const; - unsigned argumentCount() const; - Symbol *argumentAt(unsigned index) const; + int argumentCount() const; + Symbol *argumentAt(int index) const; /** Convenience function that returns whether the function receives any arguments. */ bool hasArguments() const; - unsigned minimumArgumentCount() const; + int minimumArgumentCount() const; bool isVirtual() const; void setVirtual(bool isVirtual); @@ -361,7 +361,7 @@ public: bool isAmbiguous() const; // internal void setAmbiguous(bool isAmbiguous); // internal - bool maybeValidPrototype(unsigned actualArgumentCount) const; + bool maybeValidPrototype(int actualArgumentCount) const; // Symbol's interface virtual FullySpecifiedType type() const; @@ -407,12 +407,12 @@ private: class CPLUSPLUS_EXPORT Template: public Scope, public Type { public: - Template(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + Template(TranslationUnit *translationUnit, int sourceLocation, const Name *name); Template(Clone *clone, Subst *subst, Template *original); virtual ~Template(); - unsigned templateParameterCount() const; - Symbol *templateParameterAt(unsigned index) const; + int templateParameterCount() const; + Symbol *templateParameterAt(int index) const; Symbol *declaration() const; // Symbol's interface @@ -441,7 +441,7 @@ protected: class CPLUSPLUS_EXPORT Namespace: public Scope, public Type { public: - Namespace(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + Namespace(TranslationUnit *translationUnit, int sourceLocation, const Name *name); Namespace(Clone *clone, Subst *subst, Namespace *original); virtual ~Namespace(); @@ -479,7 +479,7 @@ private: class CPLUSPLUS_EXPORT BaseClass: public Symbol { public: - BaseClass(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + BaseClass(TranslationUnit *translationUnit, int sourceLocation, const Name *name); BaseClass(Clone *clone, Subst *subst, BaseClass *original); virtual ~BaseClass(); @@ -511,7 +511,7 @@ private: class CPLUSPLUS_EXPORT Class: public Scope, public Type { public: - Class(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + Class(TranslationUnit *translationUnit, int sourceLocation, const Name *name); Class(Clone *clone, Subst *subst, Class *original); virtual ~Class(); @@ -527,8 +527,8 @@ public: Key classKey() const; void setClassKey(Key key); - unsigned baseClassCount() const; - BaseClass *baseClassAt(unsigned index) const; + int baseClassCount() const; + BaseClass *baseClassAt(int index) const; void addBaseClass(BaseClass *baseClass); // Symbol's interface @@ -580,7 +580,7 @@ public: }; public: - QtPropertyDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + QtPropertyDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name); QtPropertyDeclaration(Clone *clone, Subst *subst, QtPropertyDeclaration *original); virtual ~QtPropertyDeclaration(); @@ -609,7 +609,7 @@ private: class CPLUSPLUS_EXPORT QtEnum: public Symbol { public: - QtEnum(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + QtEnum(TranslationUnit *translationUnit, int sourceLocation, const Name *name); QtEnum(Clone *clone, Subst *subst, QtEnum *original); virtual ~QtEnum(); @@ -629,7 +629,7 @@ protected: class CPLUSPLUS_EXPORT ObjCBaseClass: public Symbol { public: - ObjCBaseClass(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + ObjCBaseClass(TranslationUnit *translationUnit, int sourceLocation, const Name *name); ObjCBaseClass(Clone *clone, Subst *subst, ObjCBaseClass *original); virtual ~ObjCBaseClass(); @@ -649,7 +649,7 @@ protected: class CPLUSPLUS_EXPORT ObjCBaseProtocol: public Symbol { public: - ObjCBaseProtocol(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + ObjCBaseProtocol(TranslationUnit *translationUnit, int sourceLocation, const Name *name); ObjCBaseProtocol(Clone *clone, Subst *subst, ObjCBaseProtocol *original); virtual ~ObjCBaseProtocol(); @@ -669,7 +669,7 @@ protected: class CPLUSPLUS_EXPORT ObjCForwardProtocolDeclaration: public Symbol, public Type { public: - ObjCForwardProtocolDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + ObjCForwardProtocolDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name); ObjCForwardProtocolDeclaration(Clone *clone, Subst *subst, ObjCForwardProtocolDeclaration *original); virtual ~ObjCForwardProtocolDeclaration(); @@ -698,12 +698,12 @@ protected: class CPLUSPLUS_EXPORT ObjCProtocol: public Scope, public Type { public: - ObjCProtocol(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + ObjCProtocol(TranslationUnit *translationUnit, int sourceLocation, const Name *name); ObjCProtocol(Clone *clone, Subst *subst, ObjCProtocol *original); virtual ~ObjCProtocol(); - unsigned protocolCount() const; - ObjCBaseProtocol *protocolAt(unsigned index) const; + int protocolCount() const; + ObjCBaseProtocol *protocolAt(int index) const; void addProtocol(ObjCBaseProtocol *protocol); // Symbol's interface @@ -734,7 +734,7 @@ private: class CPLUSPLUS_EXPORT ObjCForwardClassDeclaration: public Symbol, public Type { public: - ObjCForwardClassDeclaration(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + ObjCForwardClassDeclaration(TranslationUnit *translationUnit, int sourceLocation, const Name *name); ObjCForwardClassDeclaration(Clone *clone, Subst *subst, ObjCForwardClassDeclaration *original); virtual ~ObjCForwardClassDeclaration(); @@ -763,7 +763,7 @@ protected: class CPLUSPLUS_EXPORT ObjCClass: public Scope, public Type { public: - ObjCClass(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + ObjCClass(TranslationUnit *translationUnit, int sourceLocation, const Name *name); ObjCClass(Clone *clone, Subst *subst, ObjCClass *original); virtual ~ObjCClass(); @@ -777,8 +777,8 @@ public: ObjCBaseClass *baseClass() const; void setBaseClass(ObjCBaseClass *baseClass); - unsigned protocolCount() const; - ObjCBaseProtocol *protocolAt(unsigned index) const; + int protocolCount() const; + ObjCBaseProtocol *protocolAt(int index) const; void addProtocol(ObjCBaseProtocol *protocol); // Symbol's interface @@ -812,7 +812,7 @@ private: class CPLUSPLUS_EXPORT ObjCMethod: public Scope, public Type { public: - ObjCMethod(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name); + ObjCMethod(TranslationUnit *translationUnit, int sourceLocation, const Name *name); ObjCMethod(Clone *clone, Subst *subst, ObjCMethod *original); virtual ~ObjCMethod(); @@ -822,8 +822,8 @@ public: /** Convenience function that returns whether the function returns something (including void). */ bool hasReturnType() const; - unsigned argumentCount() const; - Symbol *argumentAt(unsigned index) const; + int argumentCount() const; + Symbol *argumentAt(int index) const; /** Convenience function that returns whether the function receives any arguments. */ bool hasArguments() const; @@ -883,7 +883,7 @@ public: public: ObjCPropertyDeclaration(TranslationUnit *translationUnit, - unsigned sourceLocation, + int sourceLocation, const Name *name); ObjCPropertyDeclaration(Clone *clone, Subst *subst, ObjCPropertyDeclaration *original); virtual ~ObjCPropertyDeclaration(); diff --git a/src/libs/3rdparty/cplusplus/Templates.cpp b/src/libs/3rdparty/cplusplus/Templates.cpp index 61c6e612ae..6c03e83fdf 100644 --- a/src/libs/3rdparty/cplusplus/Templates.cpp +++ b/src/libs/3rdparty/cplusplus/Templates.cpp @@ -440,13 +440,13 @@ void CloneName::visit(const AnonymousNameId *name) void CloneName::visit(const TemplateNameId *name) { std::vector<FullySpecifiedType> args(name->templateArgumentCount()); - for (unsigned i = 0; i < args.size(); ++i) + for (int i = 0; i < int(args.size()); ++i) args[i] = _clone->type(name->templateArgumentAt(i), _subst); if (args.empty()) _name = _control->templateNameId(_clone->identifier(name->identifier()), name->isSpecialization()); else _name = _control->templateNameId(_clone->identifier(name->identifier()), name->isSpecialization(), - &args[0], unsigned(args.size())); + &args[0], int(args.size())); } void CloneName::visit(const DestructorNameId *name) @@ -474,9 +474,9 @@ void CloneName::visit(const SelectorNameId *name) { CPP_CHECK(name->nameCount() > 0); std::vector<const Name *> names(name->nameCount()); - for (unsigned i = 0; i < names.size(); ++i) + for (int i = 0; i < int(names.size()); ++i) names[i] = _clone->name(name->nameAt(i), _subst); - _name = _control->selectorNameId(&names[0], unsigned(names.size()), name->hasArguments()); + _name = _control->selectorNameId(&names[0], int(names.size()), name->hasArguments()); } @@ -518,16 +518,16 @@ Symbol *Clone::symbol(Symbol *symbol, Subst *subst) return _symbol(symbol, subst); } -Symbol *Clone::instantiate(Template *templ, const FullySpecifiedType *const args, unsigned argc, Subst *s) +Symbol *Clone::instantiate(Template *templ, const FullySpecifiedType *const args, int argc, Subst *s) { Subst subst(_control, s); - for (unsigned i = 0, e = std::min(templ->templateParameterCount(), argc); i < e; ++i) { + for (int i = 0, e = std::min(templ->templateParameterCount(), argc); i < e; ++i) { Symbol *formal = templ->templateParameterAt(i); FullySpecifiedType actual = args[i]; subst.bind(name(formal->name(), 0), actual); } if (argc < templ->templateParameterCount()) { - for (unsigned i = argc; i < templ->templateParameterCount(); ++i) { + for (int i = argc; i < templ->templateParameterCount(); ++i) { Symbol *formal = templ->templateParameterAt(i); if (TypenameArgument *tn = formal->asTypenameArgument()) subst.bind(name(formal->name(), &subst), type(tn->type(), &subst)); diff --git a/src/libs/3rdparty/cplusplus/Templates.h b/src/libs/3rdparty/cplusplus/Templates.h index 67b57a6296..afd67f7e81 100644 --- a/src/libs/3rdparty/cplusplus/Templates.h +++ b/src/libs/3rdparty/cplusplus/Templates.h @@ -196,7 +196,7 @@ public: Symbol *symbol(Symbol *symbol, Subst *subst); Symbol *instantiate(Template *templ, - const FullySpecifiedType *const args, unsigned argc, + const FullySpecifiedType *const args, int argc, Subst *subst = 0); private: diff --git a/src/libs/3rdparty/cplusplus/Token.h b/src/libs/3rdparty/cplusplus/Token.h index 36a893efff..8c809661b4 100644 --- a/src/libs/3rdparty/cplusplus/Token.h +++ b/src/libs/3rdparty/cplusplus/Token.h @@ -313,13 +313,13 @@ public: inline bool generated() const { return f.generated; } inline bool userDefinedLiteral() const { return f.userDefinedLiteral; } - inline unsigned bytes() const { return f.bytes; } - inline unsigned bytesBegin() const { return byteOffset; } - inline unsigned bytesEnd() const { return byteOffset + f.bytes; } + inline int bytes() const { return f.bytes; } + inline int bytesBegin() const { return byteOffset; } + inline int bytesEnd() const { return byteOffset + f.bytes; } - inline unsigned utf16chars() const { return f.utf16chars; } - inline unsigned utf16charsBegin() const { return utf16charOffset; } - inline unsigned utf16charsEnd() const { return utf16charOffset + f.utf16chars; } + inline int utf16chars() const { return f.utf16chars; } + inline int utf16charsBegin() const { return utf16charOffset; } + inline int utf16charsEnd() const { return utf16charOffset + f.utf16chars; } inline bool isLiteral() const { return f.kind >= T_FIRST_LITERAL && f.kind <= T_LAST_LITERAL; } @@ -405,7 +405,7 @@ public: const StringLiteral *string; const Identifier *identifier; unsigned close_brace; - unsigned lineno; + int lineno; }; }; diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp index 2da8ad563e..e3c992ccbc 100644 --- a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp @@ -70,7 +70,7 @@ const StringLiteral *TranslationUnit::fileId() const const char *TranslationUnit::fileName() const { return _fileId->chars(); } -unsigned TranslationUnit::fileNameLength() const +int TranslationUnit::fileNameLength() const { return _fileId->size(); } const char *TranslationUnit::firstSourceChar() const @@ -79,16 +79,16 @@ const char *TranslationUnit::firstSourceChar() const const char *TranslationUnit::lastSourceChar() const { return _lastSourceChar; } -unsigned TranslationUnit::sourceLength() const +int TranslationUnit::sourceLength() const { return _lastSourceChar - _firstSourceChar; } -void TranslationUnit::setSource(const char *source, unsigned size) +void TranslationUnit::setSource(const char *source, int size) { _firstSourceChar = source; _lastSourceChar = source + size; } -const char *TranslationUnit::spell(unsigned index) const +const char *TranslationUnit::spell(int index) const { if (! index) return 0; @@ -96,25 +96,25 @@ const char *TranslationUnit::spell(unsigned index) const return tokenAt(index).spell(); } -unsigned TranslationUnit::commentCount() const -{ return unsigned(_comments->size()); } +int TranslationUnit::commentCount() const +{ return int(_comments->size()); } -const Token &TranslationUnit::commentAt(unsigned index) const +const Token &TranslationUnit::commentAt(int index) const { return _comments->at(index); } -const Identifier *TranslationUnit::identifier(unsigned index) const +const Identifier *TranslationUnit::identifier(int index) const { return tokenAt(index).identifier; } -const Literal *TranslationUnit::literal(unsigned index) const +const Literal *TranslationUnit::literal(int index) const { return tokenAt(index).literal; } -const StringLiteral *TranslationUnit::stringLiteral(unsigned index) const +const StringLiteral *TranslationUnit::stringLiteral(int index) const { return tokenAt(index).string; } -const NumericLiteral *TranslationUnit::numericLiteral(unsigned index) const +const NumericLiteral *TranslationUnit::numericLiteral(int index) const { return tokenAt(index).number; } -unsigned TranslationUnit::matchingBrace(unsigned index) const +int TranslationUnit::matchingBrace(int index) const { return tokenAt(index).close_brace; } MemoryPool *TranslationUnit::memoryPool() const @@ -140,7 +140,7 @@ void TranslationUnit::tokenize() lex.setLanguageFeatures(_languageFeatures); lex.setScanCommentTokens(true); - std::stack<unsigned> braces; + std::stack<int> braces; _tokens->push_back(nullToken); // the first token needs to be invalid! pushLineOffset(0); @@ -153,8 +153,8 @@ void TranslationUnit::tokenize() // We need to track information about the expanded tokens. A vector with an addition // explicit index control is used instead of queue mainly for performance reasons. - std::vector<std::pair<unsigned, unsigned> > lineColumn; - unsigned lineColumnIdx = 0; + std::vector<std::pair<int, int> > lineColumn; + int lineColumnIdx = 0; Token tk; do { @@ -162,7 +162,7 @@ void TranslationUnit::tokenize() recognize: if (tk.is(T_POUND) && tk.newline()) { - const unsigned utf16CharOffset = tk.utf16charOffset; + const int utf16CharOffset = tk.utf16charOffset; lex(&tk); if (! tk.newline() && tk.is(T_IDENTIFIER) && tk.identifier == expansionId) { @@ -175,10 +175,10 @@ recognize: lex(&tk); // Gather where the expansion happens and its length. - //unsigned macroOffset = static_cast<unsigned>(strtoul(tk.spell(), 0, 0)); + //int macroOffset = static_cast<int>(strtoul(tk.spell(), 0, 0)); lex(&tk); lex(&tk); // Skip the separating comma - //unsigned macroLength = static_cast<unsigned>(strtoul(tk.spell(), 0, 0)); + //int macroLength = static_cast<int>(strtoul(tk.spell(), 0, 0)); lex(&tk); // NOTE: We are currently not using the macro offset and length. They @@ -198,7 +198,7 @@ recognize: // Get the total number of generated tokens and specify "null" // information for them. unsigned totalGenerated = - static_cast<unsigned>(strtoul(tk.spell(), 0, 0)); + static_cast<int>(strtoul(tk.spell(), 0, 0)); const std::size_t previousSize = lineColumn.size(); lineColumn.resize(previousSize + totalGenerated); std::fill(lineColumn.begin() + previousSize, @@ -207,10 +207,10 @@ recognize: lex(&tk); } else if (tk.is(T_NUMERIC_LITERAL)) { - unsigned line = static_cast<unsigned>(strtoul(tk.spell(), 0, 0)); + int line = static_cast<int>(strtoul(tk.spell(), 0, 0)); lex(&tk); lex(&tk); // Skip the separating colon - unsigned column = static_cast<unsigned>(strtoul(tk.spell(), 0, 0)); + int column = static_cast<int>(strtoul(tk.spell(), 0, 0)); // Store line and column for this non-generated token. lineColumn.push_back(std::make_pair(line, column)); @@ -230,7 +230,7 @@ recognize: if (! tk.newline() && tk.is(T_IDENTIFIER) && tk.identifier == lineId) lex(&tk); if (! tk.newline() && tk.is(T_NUMERIC_LITERAL)) { - unsigned line = (unsigned) strtoul(tk.spell(), 0, 0); + int line = static_cast<int>(strtol(tk.spell(), 0, 0)); lex(&tk); if (! tk.newline() && tk.is(T_STRING_LITERAL)) { const StringLiteral *fileName = @@ -244,12 +244,12 @@ recognize: } goto recognize; } else if (tk.kind() == T_LBRACE) { - braces.push(unsigned(_tokens->size())); + braces.push(int(_tokens->size())); } else if (tk.kind() == T_RBRACE && ! braces.empty()) { - const unsigned open_brace_index = braces.top(); + const int open_brace_index = braces.top(); braces.pop(); if (open_brace_index < tokenCount()) - (*_tokens)[open_brace_index].close_brace = unsigned(_tokens->size()); + (*_tokens)[open_brace_index].close_brace = int(_tokens->size()); } else if (tk.isComment()) { _comments->push_back(tk); continue; // comments are not in the regular token stream @@ -258,9 +258,9 @@ recognize: bool currentExpanded = false; bool currentGenerated = false; - if (!lineColumn.empty() && lineColumnIdx < lineColumn.size()) { + if (!lineColumn.empty() && lineColumnIdx < static_cast<int>(lineColumn.size())) { currentExpanded = true; - const std::pair<unsigned, unsigned> &p = lineColumn[lineColumnIdx]; + const std::pair<int, int> &p = lineColumn[lineColumnIdx]; if (p.first) _expandedLineColumn.insert(std::make_pair(tk.utf16charsBegin(), p)); else @@ -276,8 +276,8 @@ recognize: } while (tk.kind()); for (; ! braces.empty(); braces.pop()) { - unsigned open_brace_index = braces.top(); - (*_tokens)[open_brace_index].close_brace = unsigned(_tokens->size()); + int open_brace_index = braces.top(); + (*_tokens)[open_brace_index].close_brace = int(_tokens->size()); } } @@ -338,17 +338,17 @@ bool TranslationUnit::parse(ParseMode mode) return parsed; } -void TranslationUnit::pushLineOffset(unsigned offset) +void TranslationUnit::pushLineOffset(int offset) { _lineOffsets.push_back(offset); } -void TranslationUnit::pushPreprocessorLine(unsigned utf16charOffset, - unsigned line, +void TranslationUnit::pushPreprocessorLine(int utf16charOffset, + int line, const StringLiteral *fileName) { _ppLines.push_back(PPLine(utf16charOffset, line, fileName)); } -unsigned TranslationUnit::findLineNumber(unsigned utf16charOffset) const +int TranslationUnit::findLineNumber(int utf16charOffset) const { - std::vector<unsigned>::const_iterator it = + std::vector<int>::const_iterator it = std::lower_bound(_lineOffsets.begin(), _lineOffsets.end(), utf16charOffset); if (it != _lineOffsets.begin()) @@ -357,7 +357,7 @@ unsigned TranslationUnit::findLineNumber(unsigned utf16charOffset) const return it - _lineOffsets.begin(); } -TranslationUnit::PPLine TranslationUnit::findPreprocessorLine(unsigned utf16charOffset) const +TranslationUnit::PPLine TranslationUnit::findPreprocessorLine(int utf16charOffset) const { std::vector<PPLine>::const_iterator it = std::lower_bound(_ppLines.begin(), _ppLines.end(), PPLine(utf16charOffset)); @@ -368,7 +368,7 @@ TranslationUnit::PPLine TranslationUnit::findPreprocessorLine(unsigned utf16char return *it; } -unsigned TranslationUnit::findColumnNumber(unsigned utf16CharOffset, unsigned lineNumber) const +int TranslationUnit::findColumnNumber(int utf16CharOffset, int lineNumber) const { if (! utf16CharOffset) return 0; @@ -376,29 +376,29 @@ unsigned TranslationUnit::findColumnNumber(unsigned utf16CharOffset, unsigned li return utf16CharOffset - _lineOffsets[lineNumber]; } -void TranslationUnit::getTokenPosition(unsigned index, - unsigned *line, - unsigned *column, +void TranslationUnit::getTokenPosition(int index, + int *line, + int *column, const StringLiteral **fileName) const { return getPosition(tokenAt(index).utf16charsBegin(), line, column, fileName); } -void TranslationUnit::getTokenStartPosition(unsigned index, unsigned *line, - unsigned *column, +void TranslationUnit::getTokenStartPosition(int index, int *line, + int *column, const StringLiteral **fileName) const { return getPosition(tokenAt(index).utf16charsBegin(), line, column, fileName); } -void TranslationUnit::getTokenEndPosition(unsigned index, unsigned *line, - unsigned *column, +void TranslationUnit::getTokenEndPosition(int index, int *line, + int *column, const StringLiteral **fileName) const { return getPosition(tokenAt(index).utf16charsEnd(), line, column, fileName); } -void TranslationUnit::getPosition(unsigned utf16charOffset, - unsigned *line, - unsigned *column, +void TranslationUnit::getPosition(int utf16charOffset, + int *line, + int *column, const StringLiteral **fileName) const { - unsigned lineNumber = 0; - unsigned columnNumber = 0; + int lineNumber = 0; + int columnNumber = 0; const StringLiteral *file = 0; // If this token is expanded we already have the information directly from the expansion @@ -433,14 +433,14 @@ void TranslationUnit::getPosition(unsigned utf16charOffset, *fileName = file; } -void TranslationUnit::message(DiagnosticClient::Level level, unsigned index, const char *format, va_list args) +void TranslationUnit::message(DiagnosticClient::Level level, int index, const char *format, va_list args) { if (f._blockErrors) return; index = std::min(index, tokenCount() - 1); - unsigned line = 0, column = 0; + int line = 0, column = 0; const StringLiteral *fileName = 0; getTokenPosition(index, &line, &column, &fileName); @@ -448,7 +448,7 @@ void TranslationUnit::message(DiagnosticClient::Level level, unsigned index, con client->report(level, fileName, line, column, format, args); } -void TranslationUnit::warning(unsigned index, const char *format, ...) +void TranslationUnit::warning(int index, const char *format, ...) { if (f._blockErrors) return; @@ -461,7 +461,7 @@ void TranslationUnit::warning(unsigned index, const char *format, ...) va_end(args); } -void TranslationUnit::error(unsigned index, const char *format, ...) +void TranslationUnit::error(int index, const char *format, ...) { if (f._blockErrors) return; @@ -474,7 +474,7 @@ void TranslationUnit::error(unsigned index, const char *format, ...) va_end(args); } -void TranslationUnit::fatal(unsigned index, const char *format, ...) +void TranslationUnit::fatal(int index, const char *format, ...) { if (f._blockErrors) return; @@ -487,13 +487,13 @@ void TranslationUnit::fatal(unsigned index, const char *format, ...) va_end(args); } -unsigned TranslationUnit::findPreviousLineOffset(unsigned tokenIndex) const +int TranslationUnit::findPreviousLineOffset(int tokenIndex) const { - unsigned lineOffset = _lineOffsets[findLineNumber(tokenAt(tokenIndex).utf16charsBegin())]; + int lineOffset = _lineOffsets[findLineNumber(tokenAt(tokenIndex).utf16charsBegin())]; return lineOffset; } -bool TranslationUnit::maybeSplitGreaterGreaterToken(unsigned tokenIndex) +bool TranslationUnit::maybeSplitGreaterGreaterToken(int tokenIndex) { if (tokenIndex >= tokenCount()) return false; diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.h b/src/libs/3rdparty/cplusplus/TranslationUnit.h index 7def1a65a3..16e9f4de31 100644 --- a/src/libs/3rdparty/cplusplus/TranslationUnit.h +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.h @@ -43,29 +43,29 @@ public: const StringLiteral *fileId() const; const char *fileName() const; - unsigned fileNameLength() const; + int fileNameLength() const; const char *firstSourceChar() const; const char *lastSourceChar() const; - unsigned sourceLength() const; + int sourceLength() const; - void setSource(const char *source, unsigned size); + void setSource(const char *source, int size); - unsigned tokenCount() const { return _tokens ? unsigned(_tokens->size()) : unsigned(0); } - const Token &tokenAt(unsigned index) const + int tokenCount() const { return _tokens ? int(_tokens->size()) : 0; } + const Token &tokenAt(int index) const { return _tokens && index < tokenCount() ? (*_tokens)[index] : nullToken; } - Kind tokenKind(unsigned index) const { return tokenAt(index).kind(); } - const char *spell(unsigned index) const; + Kind tokenKind(int index) const { return tokenAt(index).kind(); } + const char *spell(int index) const; - unsigned commentCount() const; - const Token &commentAt(unsigned index) const; + int commentCount() const; + const Token &commentAt(int index) const; - unsigned matchingBrace(unsigned index) const; - const Identifier *identifier(unsigned index) const; - const Literal *literal(unsigned index) const; - const StringLiteral *stringLiteral(unsigned index) const; - const NumericLiteral *numericLiteral(unsigned index) const; + int matchingBrace(int index) const; + const Identifier *identifier(int index) const; + const Literal *literal(int index) const; + const StringLiteral *stringLiteral(int index) const; + const NumericLiteral *numericLiteral(int index) const; MemoryPool *memoryPool() const; AST *ast() const; @@ -78,11 +78,11 @@ public: return previous; } - void warning(unsigned index, const char *fmt, ...); - void error(unsigned index, const char *fmt, ...); - void fatal(unsigned index, const char *fmt, ...); + void warning(int index, const char *fmt, ...); + void error(int index, const char *fmt, ...); + void fatal(int index, const char *fmt, ...); - void message(DiagnosticClient::Level level, unsigned index, + void message(DiagnosticClient::Level level, int index, const char *format, va_list ap); bool isTokenized() const; @@ -106,44 +106,44 @@ public: void resetAST(); void release(); - void getTokenStartPosition(unsigned index, unsigned *line, - unsigned *column = 0, - const StringLiteral **fileName = 0) const; + void getTokenStartPosition(int index, int *line, + int *column = nullptr, + const StringLiteral **fileName = nullptr) const; - void getTokenEndPosition(unsigned index, unsigned *line, - unsigned *column = 0, - const StringLiteral **fileName = 0) const; + void getTokenEndPosition(int index, int *line, + int *column = nullptr, + const StringLiteral **fileName = nullptr) const; - void getPosition(unsigned utf16charOffset, - unsigned *line, - unsigned *column = 0, - const StringLiteral **fileName = 0) const; + void getPosition(int utf16charOffset, + int *line, + int *column = nullptr, + const StringLiteral **fileName = nullptr) const; - void getTokenPosition(unsigned index, - unsigned *line, - unsigned *column = 0, - const StringLiteral **fileName = 0) const; + void getTokenPosition(int index, + int *line, + int *column = nullptr, + const StringLiteral **fileName = nullptr) const; - void pushLineOffset(unsigned offset); - void pushPreprocessorLine(unsigned utf16charOffset, - unsigned line, + void pushLineOffset(int offset); + void pushPreprocessorLine(int utf16charOffset, + int line, const StringLiteral *fileName); - unsigned findPreviousLineOffset(unsigned tokenIndex) const; + int findPreviousLineOffset(int tokenIndex) const; - bool maybeSplitGreaterGreaterToken(unsigned tokenIndex); + bool maybeSplitGreaterGreaterToken(int tokenIndex); LanguageFeatures languageFeatures() const { return _languageFeatures; } void setLanguageFeatures(LanguageFeatures features) { _languageFeatures = features; } private: struct PPLine { - unsigned utf16charOffset; - unsigned line; + int utf16charOffset; + int line; const StringLiteral *fileName; - PPLine(unsigned utf16charOffset = 0, - unsigned line = 0, + PPLine(int utf16charOffset = 0, + int line = 0, const StringLiteral *fileName = 0) : utf16charOffset(utf16charOffset), line(line), fileName(fileName) { } @@ -159,9 +159,9 @@ private: }; void releaseTokensAndComments(); - unsigned findLineNumber(unsigned utf16charOffset) const; - unsigned findColumnNumber(unsigned utf16CharOffset, unsigned lineNumber) const; - PPLine findPreprocessorLine(unsigned utf16charOffset) const; + int findLineNumber(int utf16charOffset) const; + int findColumnNumber(int utf16CharOffset, int lineNumber) const; + PPLine findPreprocessorLine(int utf16charOffset) const; static const Token nullToken; @@ -171,9 +171,9 @@ private: const char *_lastSourceChar; std::vector<Token> *_tokens; std::vector<Token> *_comments; - std::vector<unsigned> _lineOffsets; + std::vector<int> _lineOffsets; std::vector<PPLine> _ppLines; - typedef std::unordered_map<unsigned, std::pair<unsigned, unsigned> > TokenLineColumn; + typedef std::unordered_map<unsigned, std::pair<int, int> > TokenLineColumn; TokenLineColumn _expandedLineColumn; MemoryPool *_pool; AST *_ast; diff --git a/src/libs/clangsupport/sourcelocationcontainer.h b/src/libs/clangsupport/sourcelocationcontainer.h index a975b1b2f4..1c205755b1 100644 --- a/src/libs/clangsupport/sourcelocationcontainer.h +++ b/src/libs/clangsupport/sourcelocationcontainer.h @@ -36,8 +36,8 @@ class CLANGSUPPORT_EXPORT SourceLocationContainer public: SourceLocationContainer() = default; SourceLocationContainer(const Utf8String &filePath, - uint line, - uint column) + int line, + int column) : filePath(filePath), line(line), column(column) @@ -46,8 +46,8 @@ public: public: Utf8String filePath; - uint line = 0; - uint column = 0; + int line = 0; + int column = 0; }; CLANGSUPPORT_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container); diff --git a/src/libs/clangsupport/sourcerangecontainer.h b/src/libs/clangsupport/sourcerangecontainer.h index d8ea0ce02c..603143e210 100644 --- a/src/libs/clangsupport/sourcerangecontainer.h +++ b/src/libs/clangsupport/sourcerangecontainer.h @@ -42,7 +42,7 @@ public: { } - bool contains(unsigned line, unsigned column) const + bool contains(int line, int column) const { if (line < start.line || line > end.line) return false; diff --git a/src/libs/clangsupport/tokeninfocontainer.h b/src/libs/clangsupport/tokeninfocontainer.h index 2b8e01e769..c819268fb9 100644 --- a/src/libs/clangsupport/tokeninfocontainer.h +++ b/src/libs/clangsupport/tokeninfocontainer.h @@ -103,7 +103,7 @@ class TokenInfoContainer { public: TokenInfoContainer() = default; - TokenInfoContainer(uint line, uint column, uint length, HighlightingTypes types) + TokenInfoContainer(int line, int column, int length, HighlightingTypes types) : line(line) , column(column) , length(length) @@ -111,7 +111,7 @@ public: { } - TokenInfoContainer(uint line, uint column, uint length, HighlightingTypes types, + TokenInfoContainer(int line, int column, int length, HighlightingTypes types, const ExtraInfo &extraInfo) : line(line) , column(column) @@ -184,9 +184,9 @@ public: && first.extraInfo == second.extraInfo; } - uint line = 0; - uint column = 0; - uint length = 0; + int line = 0; + int column = 0; + int length = 0; HighlightingTypes types; ExtraInfo extraInfo; bool noExtraInfo = true; diff --git a/src/libs/cplusplus/ASTPath.cpp b/src/libs/cplusplus/ASTPath.cpp index 3acec43c42..277a7d0838 100644 --- a/src/libs/cplusplus/ASTPath.cpp +++ b/src/libs/cplusplus/ASTPath.cpp @@ -67,12 +67,12 @@ bool ASTPath::preVisit(AST *ast) if (lastToken <= firstToken) return false; - unsigned startLine, startColumn; + int startLine, startColumn; getTokenStartPosition(firstToken, &startLine, &startColumn); if (_line > startLine || (_line == startLine && _column >= startColumn)) { - unsigned endLine, endColumn; + int endLine, endColumn; getTokenEndPosition(lastToken - 1, &endLine, &endColumn); if (_line < endLine || (_line == endLine && _column <= endColumn)) { diff --git a/src/libs/cplusplus/ASTPath.h b/src/libs/cplusplus/ASTPath.h index e7dfab7fad..6e199ca853 100644 --- a/src/libs/cplusplus/ASTPath.h +++ b/src/libs/cplusplus/ASTPath.h @@ -64,8 +64,8 @@ private: private: Document::Ptr _doc; - unsigned _line; - unsigned _column; + int _line; + int _column; QList<AST *> _nodes; }; diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp index 73cc06f26a..fec44e8421 100644 --- a/src/libs/cplusplus/CppDocument.cpp +++ b/src/libs/cplusplus/CppDocument.cpp @@ -61,15 +61,15 @@ namespace { class LastVisibleSymbolAt: protected SymbolVisitor { Symbol *root; - unsigned line; - unsigned column; + int line; + int column; Symbol *symbol; public: LastVisibleSymbolAt(Symbol *root) : root(root), line(0), column(0), symbol(0) {} - Symbol *operator()(unsigned line, unsigned column) + Symbol *operator()(int line, int column) { this->line = line; this->column = column; @@ -97,13 +97,13 @@ protected: class FindScopeAt: protected SymbolVisitor { TranslationUnit *_unit; - unsigned _line; - unsigned _column; + int _line; + int _column; Scope *_scope; public: /** line and column should be 1-based */ - FindScopeAt(TranslationUnit *unit, unsigned line, unsigned column) + FindScopeAt(TranslationUnit *unit, int line, int column) : _unit(unit), _line(line), _column(column), _scope(0) {} Scope *operator()(Symbol *symbol) @@ -118,18 +118,18 @@ protected: if (! _scope) { Scope *scope = symbol; - for (unsigned i = 0; i < scope->memberCount(); ++i) { + for (int i = 0; i < scope->memberCount(); ++i) { accept(scope->memberAt(i)); if (_scope) return false; } - unsigned startLine, startColumn; + int startLine, startColumn; _unit->getPosition(scope->startOffset(), &startLine, &startColumn); if (_line > startLine || (_line == startLine && _column >= startColumn)) { - unsigned endLine, endColumn; + int endLine, endColumn; _unit->getPosition(scope->endOffset(), &endLine, &endColumn); if (_line < endLine || (_line == endLine && _column < endColumn)) @@ -211,7 +211,7 @@ public: void report(int level, const StringLiteral *fileId, - unsigned line, unsigned column, + int line, int column, const char *format, va_list ap) override { if (level == Error) { @@ -375,9 +375,9 @@ void Document::appendMacro(const Macro ¯o) } void Document::addMacroUse(const Macro ¯o, - unsigned bytesOffset, unsigned bytesLength, - unsigned utf16charsOffset, unsigned utf16charLength, - unsigned beginLine, + int bytesOffset, int bytesLength, + int utf16charsOffset, int utf16charLength, + int beginLine, const QVector<MacroArgumentReference> &actuals) { MacroUse use(macro, @@ -397,7 +397,7 @@ void Document::addMacroUse(const Macro ¯o, } void Document::addUndefinedMacroUse(const QByteArray &name, - unsigned bytesOffset, unsigned utf16charsOffset) + int bytesOffset, int utf16charsOffset) { QByteArray copy(name.data(), name.size()); UndefinedMacroUse use(copy, bytesOffset, utf16charsOffset); @@ -468,7 +468,7 @@ void Document::setSkipFunctionBody(bool skipFunctionBody) _translationUnit->setSkipFunctionBody(skipFunctionBody); } -unsigned Document::globalSymbolCount() const +int Document::globalSymbolCount() const { if (! _globalNamespace) return 0; @@ -476,7 +476,7 @@ unsigned Document::globalSymbolCount() const return _globalNamespace->memberCount(); } -Symbol *Document::globalSymbolAt(unsigned index) const +Symbol *Document::globalSymbolAt(int index) const { return _globalNamespace->memberAt(index); } @@ -527,23 +527,17 @@ QString Document::functionAt(int line, int column, int *lineOpeningDeclaratorPar return QString(); // We found the function scope - if (lineOpeningDeclaratorParenthesis) { - unsigned line; - translationUnit()->getPosition(scope->startOffset(), &line); - *lineOpeningDeclaratorParenthesis = static_cast<int>(line); - } + if (lineOpeningDeclaratorParenthesis) + translationUnit()->getPosition(scope->startOffset(), lineOpeningDeclaratorParenthesis); - if (lineClosingBrace) { - unsigned line; - translationUnit()->getPosition(scope->endOffset(), &line); - *lineClosingBrace = static_cast<int>(line); - } + if (lineClosingBrace) + translationUnit()->getPosition(scope->endOffset(), lineClosingBrace); const QList<const Name *> fullyQualifiedName = LookupContext::fullyQualifiedName(scope); return Overview().prettyName(fullyQualifiedName); } -Scope *Document::scopeAt(unsigned line, unsigned column) +Scope *Document::scopeAt(int line, int column) { FindScopeAt findScopeAt(_translationUnit, line, column); if (Scope *scope = findScopeAt(_globalNamespace)) @@ -551,13 +545,13 @@ Scope *Document::scopeAt(unsigned line, unsigned column) return globalNamespace(); } -Symbol *Document::lastVisibleSymbolAt(unsigned line, unsigned column) const +Symbol *Document::lastVisibleSymbolAt(int line, int column) const { LastVisibleSymbolAt lastVisibleSymbolAt(globalNamespace()); return lastVisibleSymbolAt(line, column); } -const Macro *Document::findMacroDefinitionAt(unsigned line) const +const Macro *Document::findMacroDefinitionAt(int line) const { foreach (const Macro ¯o, _definedMacros) { if (macro.line() == line) @@ -566,7 +560,7 @@ const Macro *Document::findMacroDefinitionAt(unsigned line) const return 0; } -const Document::MacroUse *Document::findMacroUseAt(unsigned utf16charsOffset) const +const Document::MacroUse *Document::findMacroUseAt(int utf16charsOffset) const { foreach (const Document::MacroUse &use, _macroUses) { if (use.containsUtf16charOffset(utf16charsOffset) @@ -577,7 +571,7 @@ const Document::MacroUse *Document::findMacroUseAt(unsigned utf16charsOffset) co return 0; } -const Document::UndefinedMacroUse *Document::findUndefinedMacroUseAt(unsigned utf16charsOffset) const +const Document::UndefinedMacroUse *Document::findUndefinedMacroUseAt(int utf16charsOffset) const { foreach (const Document::UndefinedMacroUse &use, _undefinedMacroUses) { if (use.containsUtf16charOffset(utf16charsOffset) @@ -616,17 +610,17 @@ void Document::setLanguageFeatures(LanguageFeatures features) tu->setLanguageFeatures(features); } -void Document::startSkippingBlocks(unsigned utf16charsOffset) +void Document::startSkippingBlocks(int utf16charsOffset) { _skippedBlocks.append(Block(0, 0, utf16charsOffset, 0)); } -void Document::stopSkippingBlocks(unsigned utf16charsOffset) +void Document::stopSkippingBlocks(int utf16charsOffset) { if (_skippedBlocks.isEmpty()) return; - unsigned start = _skippedBlocks.back().utf16charsBegin(); + int start = _skippedBlocks.back().utf16charsBegin(); if (start > utf16charsOffset) _skippedBlocks.removeLast(); // Ignore this block, it's invalid. else @@ -783,7 +777,7 @@ static QList<Macro> macrosDefinedUntilLine(const QList<Macro> ¯os, int line) QList<Macro> filtered; foreach (const Macro ¯o, macros) { - if (macro.line() <= unsigned(line)) + if (macro.line() <= line) filtered.append(macro); else break; diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h index 74205f1625..94c16be742 100644 --- a/src/libs/cplusplus/CppDocument.h +++ b/src/libs/cplusplus/CppDocument.h @@ -71,11 +71,11 @@ public: void appendMacro(const Macro ¯o); void addMacroUse(const Macro ¯o, - unsigned bytesOffset, unsigned bytesLength, - unsigned utf16charsOffset, unsigned utf16charLength, - unsigned beginLine, const QVector<MacroArgumentReference> &range); + int bytesOffset, int bytesLength, + int utf16charsOffset, int utf16charLength, + int beginLine, const QVector<MacroArgumentReference> &range); void addUndefinedMacroUse(const QByteArray &name, - unsigned bytesOffset, unsigned utf16charsOffset); + int bytesOffset, int utf16charsOffset); Control *control() const; Control *swapControl(Control *newControl); @@ -84,8 +84,8 @@ public: bool skipFunctionBody() const; void setSkipFunctionBody(bool skipFunctionBody); - unsigned globalSymbolCount() const; - Symbol *globalSymbolAt(unsigned index) const; + int globalSymbolCount() const; + Symbol *globalSymbolAt(int index) const; Namespace *globalNamespace() const; void setGlobalNamespace(Namespace *globalNamespace); // ### internal @@ -93,10 +93,10 @@ public: QList<Macro> definedMacros() const { return _definedMacros; } - QString functionAt(int line, int column, int *lineOpeningDeclaratorParenthesis = 0, - int *lineClosingBrace = 0) const; - Symbol *lastVisibleSymbolAt(unsigned line, unsigned column = 0) const; - Scope *scopeAt(unsigned line, unsigned column = 0); + QString functionAt(int line, int column, int *lineOpeningDeclaratorParenthesis = nullptr, + int *lineClosingBrace = nullptr) const; + Symbol *lastVisibleSymbolAt(int line, int column = 0) const; + Scope *scopeAt(int line, int column = 0); QByteArray utf8Source() const; void setUtf8Source(const QByteArray &utf8Source); @@ -108,8 +108,8 @@ public: LanguageFeatures languageFeatures() const; void setLanguageFeatures(LanguageFeatures features); - void startSkippingBlocks(unsigned utf16charsOffset); - void stopSkippingBlocks(unsigned utf16charsOffset); + void startSkippingBlocks(int utf16charsOffset); + void stopSkippingBlocks(int utf16charsOffset); enum ParseMode { // ### keep in sync with CPlusPlus::TranslationUnit ParseTranlationUnit, @@ -146,9 +146,9 @@ public: public: DiagnosticMessage(int level, const QString &fileName, - unsigned line, unsigned column, + int line, int column, const QString &text, - unsigned length = 0) + int length = 0) : _level(level), _line(line), _fileName(fileName), @@ -172,13 +172,13 @@ public: QString fileName() const { return _fileName; } - unsigned line() const + int line() const { return _line; } - unsigned column() const + int column() const { return _column; } - unsigned length() const + int length() const { return _length; } QString text() const @@ -189,10 +189,10 @@ public: private: int _level; - unsigned _line; + int _line; QString _fileName; - unsigned _column; - unsigned _length; + int _column; + int _length; QString _text; }; @@ -207,44 +207,44 @@ public: class Block { - unsigned _bytesBegin; - unsigned _bytesEnd; - unsigned _utf16charsBegin; - unsigned _utf16charsEnd; + int _bytesBegin; + int _bytesEnd; + int _utf16charsBegin; + int _utf16charsEnd; public: - inline Block(unsigned bytesBegin = 0, unsigned bytesEnd = 0, - unsigned utf16charsBegin = 0, unsigned utf16charsEnd = 0) + inline Block(int bytesBegin = 0, int bytesEnd = 0, + int utf16charsBegin = 0, int utf16charsEnd = 0) : _bytesBegin(bytesBegin), _bytesEnd(bytesEnd), _utf16charsBegin(utf16charsBegin), _utf16charsEnd(utf16charsEnd) {} - inline unsigned bytesBegin() const + inline int bytesBegin() const { return _bytesBegin; } - inline unsigned bytesEnd() const + inline int bytesEnd() const { return _bytesEnd; } - inline unsigned utf16charsBegin() const + inline int utf16charsBegin() const { return _utf16charsBegin; } - inline unsigned utf16charsEnd() const + inline int utf16charsEnd() const { return _utf16charsEnd; } - bool containsUtf16charOffset(unsigned utf16charOffset) const + bool containsUtf16charOffset(int utf16charOffset) const { return utf16charOffset >= _utf16charsBegin && utf16charOffset < _utf16charsEnd; } }; class Include { QString _resolvedFileName; QString _unresolvedFileName; - unsigned _line; + int _line; Client::IncludeType _type; public: - Include(const QString &unresolvedFileName, const QString &resolvedFileName, unsigned line, + Include(const QString &unresolvedFileName, const QString &resolvedFileName, int line, Client::IncludeType type) : _resolvedFileName(resolvedFileName) , _unresolvedFileName(unresolvedFileName) @@ -258,7 +258,7 @@ public: QString unresolvedFileName() const { return _unresolvedFileName; } - unsigned line() const + int line() const { return _line; } Client::IncludeType type() const @@ -268,13 +268,13 @@ public: class MacroUse: public Block { Macro _macro; QVector<Block> _arguments; - unsigned _beginLine; + int _beginLine; public: inline MacroUse(const Macro ¯o, - unsigned bytesBegin, unsigned bytesEnd, - unsigned utf16charsBegin, unsigned utf16charsEnd, - unsigned beginLine) + int bytesBegin, int bytesEnd, + int utf16charsBegin, int utf16charsEnd, + int beginLine) : Block(bytesBegin, bytesEnd, utf16charsBegin, utf16charsEnd), _macro(macro), _beginLine(beginLine) @@ -289,7 +289,7 @@ public: QVector<Block> arguments() const { return _arguments; } - unsigned beginLine() const + int beginLine() const { return _beginLine; } private: @@ -308,8 +308,8 @@ public: public: inline UndefinedMacroUse( const QByteArray &name, - unsigned bytesBegin, - unsigned utf16charsBegin) + int bytesBegin, + int utf16charsBegin) : Block(bytesBegin, bytesBegin + name.length(), utf16charsBegin, @@ -346,9 +346,9 @@ public: QByteArray includeGuardMacroName() const { return _includeGuardMacroName; } - const Macro *findMacroDefinitionAt(unsigned line) const; - const MacroUse *findMacroUseAt(unsigned utf16charsOffset) const; - const UndefinedMacroUse *findUndefinedMacroUseAt(unsigned utf16charsOffset) const; + const Macro *findMacroDefinitionAt(int line) const; + const MacroUse *findMacroUseAt(int utf16charsOffset) const; + const UndefinedMacroUse *findUndefinedMacroUseAt(int utf16charsOffset) const; void keepSourceAndAST(); void releaseSourceAndAST(); @@ -397,7 +397,7 @@ public: typedef Base::const_iterator iterator; typedef Base::const_iterator const_iterator; - typedef QPair<Document::Ptr, unsigned> IncludeLocation; + typedef QPair<Document::Ptr, int> IncludeLocation; int size() const; // ### remove bool isEmpty() const; diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp index aec22d8248..2c554e3dd1 100644 --- a/src/libs/cplusplus/CppRewriter.cpp +++ b/src/libs/cplusplus/CppRewriter.cpp @@ -257,7 +257,7 @@ public: void visit(const TemplateNameId *name) override { QVarLengthArray<FullySpecifiedType, 8> args(name->templateArgumentCount()); - for (unsigned i = 0; i < name->templateArgumentCount(); ++i) + for (int i = 0; i < name->templateArgumentCount(); ++i) args[i] = rewrite->rewriteType(name->templateArgumentAt(i)); temps.append(control()->templateNameId(identifier(name->identifier()), name->isSpecialization(), args.data(), args.size())); @@ -282,7 +282,7 @@ public: void visit(const SelectorNameId *name) override { QVarLengthArray<const Name *, 8> names(name->nameCount()); - for (unsigned i = 0; i < name->nameCount(); ++i) + for (int i = 0; i < name->nameCount(); ++i) names[i] = rewrite->rewriteName(name->nameAt(i)); temps.append(control()->selectorNameId(names.constData(), names.size(), name->hasArguments())); } diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp index db39d0b20d..3992740b22 100644 --- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp +++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp @@ -136,7 +136,7 @@ private: fun->setReturnType(q->apply(funTy->returnType())); - for (unsigned i = 0, argc = funTy->argumentCount(); i < argc; ++i) { + for (int i = 0, argc = funTy->argumentCount(); i < argc; ++i) { Argument *originalArgument = funTy->argumentAt(i)->asArgument(); Argument *arg = control()->newArgument(/*sourceLocation*/ 0, originalArgument->name()); @@ -243,7 +243,7 @@ private: void visit(const TemplateNameId *name) override { QVarLengthArray<FullySpecifiedType, 8> arguments(name->templateArgumentCount()); - for (unsigned i = 0; i < name->templateArgumentCount(); ++i) { + for (int i = 0; i < name->templateArgumentCount(); ++i) { FullySpecifiedType argTy = name->templateArgumentAt(i); arguments[i] = q->apply(argTy); } @@ -266,7 +266,7 @@ private: } else if (const TemplateNameId *templId = name->asTemplateNameId()) { QVarLengthArray<FullySpecifiedType, 8> arguments(templId->templateArgumentCount()); - for (unsigned templateArgIndex = 0; templateArgIndex < templId->templateArgumentCount(); + for (int templateArgIndex = 0; templateArgIndex < templId->templateArgumentCount(); ++templateArgIndex) { FullySpecifiedType argTy = templId->templateArgumentAt(templateArgIndex); arguments[templateArgIndex] = q->apply(argTy); @@ -403,7 +403,7 @@ FullySpecifiedType DeprecatedGenTemplateInstance::instantiate(const Name *classN if (Template *templ = candidate->enclosingTemplate()) { DeprecatedGenTemplateInstance::Substitution subst; - for (unsigned i = 0; i < templId->templateArgumentCount(); ++i) { + for (int i = 0; i < templId->templateArgumentCount(); ++i) { FullySpecifiedType templArgTy = templId->templateArgumentAt(i); if (i < templ->templateParameterCount()) { diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp index 78a25826cc..be63dea9a2 100644 --- a/src/libs/cplusplus/FastPreprocessor.cpp +++ b/src/libs/cplusplus/FastPreprocessor.cpp @@ -70,7 +70,7 @@ QByteArray FastPreprocessor::run(Document::Ptr newDoc, return preprocessed; } -void FastPreprocessor::sourceNeeded(unsigned line, const QString &fileName, IncludeType mode, +void FastPreprocessor::sourceNeeded(int line, const QString &fileName, IncludeType mode, const QStringList &initialIncludes) { Q_UNUSED(initialIncludes) @@ -115,8 +115,8 @@ static const Macro revision(const Snapshot &s, const Macro &m) return m; } -void FastPreprocessor::passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const Macro ¯o) +void FastPreprocessor::passedMacroDefinitionCheck(int bytesOffset, int utf16charsOffset, + int line, const Macro ¯o) { Q_ASSERT(_currentDoc); @@ -126,7 +126,7 @@ void FastPreprocessor::passedMacroDefinitionCheck(unsigned bytesOffset, unsigned line, QVector<MacroArgumentReference>()); } -void FastPreprocessor::failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, +void FastPreprocessor::failedMacroDefinitionCheck(int bytesOffset, int utf16charsOffset, const ByteArrayRef &name) { Q_ASSERT(_currentDoc); @@ -135,8 +135,8 @@ void FastPreprocessor::failedMacroDefinitionCheck(unsigned bytesOffset, unsigned bytesOffset, utf16charsOffset); } -void FastPreprocessor::notifyMacroReference(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const Macro ¯o) +void FastPreprocessor::notifyMacroReference(int bytesOffset, int utf16charsOffset, + int line, const Macro ¯o) { Q_ASSERT(_currentDoc); @@ -146,8 +146,8 @@ void FastPreprocessor::notifyMacroReference(unsigned bytesOffset, unsigned utf16 line, QVector<MacroArgumentReference>()); } -void FastPreprocessor::startExpandingMacro(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const Macro ¯o, +void FastPreprocessor::startExpandingMacro(int bytesOffset, int utf16charsOffset, + int line, const Macro ¯o, const QVector<MacroArgumentReference> &actuals) { Q_ASSERT(_currentDoc); diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h index da63bdd59b..bebe3da4d2 100644 --- a/src/libs/cplusplus/FastPreprocessor.h +++ b/src/libs/cplusplus/FastPreprocessor.h @@ -55,26 +55,26 @@ public: bool mergeDefinedMacrosOfDocument = false); // CPlusPlus::Client - virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType mode, + virtual void sourceNeeded(int line, const QString &fileName, IncludeType mode, const QStringList &initialIncludes = QStringList()); virtual void macroAdded(const Macro &); - virtual void passedMacroDefinitionCheck(unsigned, unsigned, unsigned, const Macro &); - virtual void failedMacroDefinitionCheck(unsigned, unsigned, const ByteArrayRef &); + virtual void passedMacroDefinitionCheck(int, int, int, const Macro &); + virtual void failedMacroDefinitionCheck(int, int, const ByteArrayRef &); - virtual void notifyMacroReference(unsigned, unsigned, unsigned, const Macro &); + virtual void notifyMacroReference(int, int, int, const Macro &); - virtual void startExpandingMacro(unsigned, - unsigned, - unsigned, + virtual void startExpandingMacro(int, + int, + int, const Macro &, const QVector<MacroArgumentReference> &); - virtual void stopExpandingMacro(unsigned, const Macro &) {} + virtual void stopExpandingMacro(int, const Macro &) {} virtual void markAsIncludeGuard(const QByteArray ¯oName); - virtual void startSkippingBlocks(unsigned) {} - virtual void stopSkippingBlocks(unsigned) {} + virtual void startSkippingBlocks(int) {} + virtual void stopSkippingBlocks(int) {} }; } // namespace CPlusPlus diff --git a/src/libs/cplusplus/FindUsages.cpp b/src/libs/cplusplus/FindUsages.cpp index 638fba451b..3a82ee2d2b 100644 --- a/src/libs/cplusplus/FindUsages.cpp +++ b/src/libs/cplusplus/FindUsages.cpp @@ -157,10 +157,10 @@ void FindUsages::reportResult(unsigned tokenIndex) _processed.insert(tokenIndex); - unsigned line, col; + int line, col; getTokenStartPosition(tokenIndex, &line, &col); QString lineText; - if (line < _sourceLineEnds.size()) + if (line < int(_sourceLineEnds.size())) lineText = fetchLine(line); else lineText = matchingLine(tk); diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 5a187e4f1d..d58bc212c4 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -299,7 +299,7 @@ QList<LookupItem> LookupContext::lookupByUsing(const Name *name, if (name->isNameId() || name->isTemplateNameId()) { foreach (Symbol *s, bindingScope->symbols()) { if (Scope *scope = s->asScope()) { - for (unsigned i = 0, count = scope->memberCount(); i < count; ++i) { + for (int i = 0, count = scope->memberCount(); i < count; ++i) { if (UsingDeclaration *u = scope->memberAt(i)->asUsingDeclaration()) { if (const Name *usingDeclarationName = u->name()) { if (const QualifiedNameId *q @@ -362,7 +362,7 @@ ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope, if (! scope || ! name) { return 0; } else if (Block *block = scope->asBlock()) { - for (unsigned i = 0; i < block->memberCount(); ++i) { + for (int i = 0; i < block->memberCount(); ++i) { Symbol *m = block->memberAt(i); if (UsingNamespaceDirective *u = m->asUsingNamespaceDirective()) { if (ClassOrNamespace *uu = lookupType(u->name(), scope->enclosingNamespace())) { @@ -450,7 +450,7 @@ QList<LookupItem> LookupContext::lookup(const Name *name, Scope *scope) const break; } - for (unsigned i = 0; i < scope->memberCount(); ++i) { + for (int i = 0; i < scope->memberCount(); ++i) { if (UsingNamespaceDirective *u = scope->memberAt(i)->asUsingNamespaceDirective()) { if (ClassOrNamespace *uu = lookupType(u->name(), scope->enclosingNamespace())) { candidates = uu->find(name); @@ -905,7 +905,7 @@ Symbol *ClassOrNamespace::lookupInScope(const QList<const Name *> &fullName) for (int j = 0; j < symbols().size(); ++j) { if (Scope *scope = symbols().at(j)->asScope()) { - for (unsigned i = 0; i < scope->memberCount(); ++i) { + for (int i = 0; i < scope->memberCount(); ++i) { Symbol *s = scope->memberAt(i); _scopeLookupCache->insert(LookupContext::fullyQualifiedName(s), s); } @@ -994,9 +994,9 @@ static ClassOrNamespace *findSpecializationWithMatchingTemplateArgument(const Na foreach (Symbol *s, reference->symbols()) { if (Class *clazz = s->asClass()) { if (Template *templateSpecialization = clazz->enclosingTemplate()) { - const unsigned argumentCountOfSpecialization + const int argumentCountOfSpecialization = templateSpecialization->templateParameterCount(); - for (unsigned i = 0; i < argumentCountOfSpecialization; ++i) { + for (int i = 0; i < argumentCountOfSpecialization; ++i) { if (TypenameArgument *tParam = templateSpecialization->templateParameterAt(i)->asTypenameArgument()) { if (const Name *name = tParam->name()) { @@ -1018,14 +1018,14 @@ ClassOrNamespace *ClassOrNamespace::findSpecialization(const TemplateNameId *tem for (TemplateNameIdTable::const_iterator cit = specializations.begin(); cit != specializations.end(); ++cit) { const TemplateNameId *specializationNameId = cit->first; - const unsigned specializationTemplateArgumentCount + const int specializationTemplateArgumentCount = specializationNameId->templateArgumentCount(); - const unsigned initializationTemplateArgumentCount + const int initializationTemplateArgumentCount = templId->templateArgumentCount(); // for now it works only when we have the same number of arguments in specialization // and initialization(in future it should be more clever) if (specializationTemplateArgumentCount == initializationTemplateArgumentCount) { - for (unsigned i = 0; i < initializationTemplateArgumentCount; ++i) { + for (int i = 0; i < initializationTemplateArgumentCount; ++i) { const FullySpecifiedType &specializationTemplateArgument = specializationNameId->templateArgumentAt(i); const FullySpecifiedType &initializationTemplateArgument @@ -1155,7 +1155,7 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, QList<const Name *> allBases; foreach (Symbol *s, reference->symbols()) { if (Class *clazz = s->asClass()) { - for (unsigned i = 0; i < clazz->baseClassCount(); ++i) { + for (int i = 0; i < clazz->baseClassCount(); ++i) { BaseClass *baseClass = clazz->baseClassAt(i); if (baseClass->name()) allBases.append(baseClass->name()); @@ -1207,18 +1207,18 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, // It gets a bit complicated if the reference is actually a class template because we // now must worry about dependent names in base classes. if (Template *templateSpecialization = referenceClass->enclosingTemplate()) { - const unsigned argumentCountOfInitialization = templId->templateArgumentCount(); - const unsigned argumentCountOfSpecialization + const int argumentCountOfInitialization = templId->templateArgumentCount(); + const int argumentCountOfSpecialization = templateSpecialization->templateParameterCount(); Subst subst(_control.data()); if (_factory->expandTemplates()) { const TemplateNameId *templSpecId = templateSpecialization->name()->asTemplateNameId(); - const unsigned templSpecArgumentCount = templSpecId ? + const int templSpecArgumentCount = templSpecId ? templSpecId->templateArgumentCount() : 0; Clone cloner(_control.data()); - for (unsigned i = 0; i < argumentCountOfSpecialization; ++i) { + for (int i = 0; i < argumentCountOfSpecialization; ++i) { const TypenameArgument *tParam = templateSpecialization->templateParameterAt(i)->asTypenameArgument(); if (!tParam) @@ -1251,8 +1251,8 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, oo.showTemplateParameters = true; qDebug() << "cloned" << oo(clone->type()); if (Class *klass = clone->asClass()) { - const unsigned klassMemberCount = klass->memberCount(); - for (unsigned i = 0; i < klassMemberCount; ++i){ + const int klassMemberCount = klass->memberCount(); + for (int i = 0; i < klassMemberCount; ++i){ Symbol *klassMemberAsSymbol = klass->memberAt(i); if (klassMemberAsSymbol->isTypedef()) { if (Declaration *declaration = klassMemberAsSymbol->asDeclaration()) @@ -1267,8 +1267,8 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, instantiation->_symbols.append(reference->symbols()); } - QHash<const Name*, unsigned> templParams; - for (unsigned i = 0; i < argumentCountOfSpecialization; ++i) + QHash<const Name*, int> templParams; + for (int i = 0; i < argumentCountOfSpecialization; ++i) templParams.insert(templateSpecialization->templateParameterAt(i)->name(), i); foreach (const Name *baseName, allBases) { @@ -1278,7 +1278,7 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, // This is the simple case in which a template parameter is itself a base. // Ex.: template <class T> class A : public T {}; if (templParams.contains(nameId)) { - const unsigned parameterIndex = templParams.value(nameId); + const int parameterIndex = templParams.value(nameId); if (parameterIndex < argumentCountOfInitialization) { const FullySpecifiedType &fullType = templId->templateArgumentAt(parameterIndex); @@ -1297,7 +1297,7 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, } } else { SubstitutionMap map; - for (unsigned i = 0; i < argumentCountOfSpecialization; ++i) { + for (int i = 0; i < argumentCountOfSpecialization; ++i) { const Name *name = templateSpecialization->templateParameterAt(i)->name(); FullySpecifiedType ty = (i < argumentCountOfInitialization) ? templId->templateArgumentAt(i): @@ -1664,7 +1664,7 @@ bool CreateBindings::visit(Namespace *ns) { ClassOrNamespace *previous = enterClassOrNamespaceBinding(ns); - for (unsigned i = 0; i < ns->memberCount(); ++i) + for (int i = 0; i < ns->memberCount(); ++i) process(ns->memberAt(i)); if (ns->isInline() && previous) @@ -1689,10 +1689,10 @@ bool CreateBindings::visit(Class *klass) _currentClassOrNamespace = binding; _currentClassOrNamespace->addSymbol(klass); - for (unsigned i = 0; i < klass->baseClassCount(); ++i) + for (int i = 0; i < klass->baseClassCount(); ++i) process(klass->baseClassAt(i)); - for (unsigned i = 0; i < klass->memberCount(); ++i) + for (int i = 0; i < klass->memberCount(); ++i) process(klass->memberAt(i)); _currentClassOrNamespace = previous; @@ -1759,7 +1759,7 @@ bool CreateBindings::visit(Function *function) if (!binding) return false; _currentClassOrNamespace = binding; - for (unsigned i = 0, count = function->memberCount(); i < count; ++i) { + for (int i = 0, count = function->memberCount(); i < count; ++i) { Symbol *s = function->memberAt(i); if (Block *b = s->asBlock()) visit(b); @@ -1778,7 +1778,7 @@ bool CreateBindings::visit(Block *block) _currentClassOrNamespace = binding; _currentClassOrNamespace->addSymbol(block); - for (unsigned i = 0; i < block->memberCount(); ++i) + for (int i = 0; i < block->memberCount(); ++i) // we cannot use lazy processing here, because we have to know // does this block contain any other blocks or classOrNamespaces process(block->memberAt(i), _currentClassOrNamespace); @@ -1862,10 +1862,10 @@ bool CreateBindings::visit(ObjCClass *klass) process(klass->baseClass()); - for (unsigned i = 0; i < klass->protocolCount(); ++i) + for (int i = 0; i < klass->protocolCount(); ++i) process(klass->protocolAt(i)); - for (unsigned i = 0; i < klass->memberCount(); ++i) + for (int i = 0; i < klass->memberCount(); ++i) process(klass->memberAt(i)); _currentClassOrNamespace = previous; @@ -1894,10 +1894,10 @@ bool CreateBindings::visit(ObjCProtocol *proto) { ClassOrNamespace *previous = enterGlobalClassOrNamespace(proto); - for (unsigned i = 0; i < proto->protocolCount(); ++i) + for (int i = 0; i < proto->protocolCount(); ++i) process(proto->protocolAt(i)); - for (unsigned i = 0; i < proto->memberCount(); ++i) + for (int i = 0; i < proto->memberCount(); ++i) process(proto->memberAt(i)); _currentClassOrNamespace = previous; @@ -1930,12 +1930,12 @@ bool CreateBindings::visit(ObjCMethod *) Symbol *CreateBindings::instantiateTemplateFunction(const TemplateNameId *instantiation, Template *specialization) const { - const unsigned argumentCountOfInitialization = instantiation->templateArgumentCount(); - const unsigned argumentCountOfSpecialization = specialization->templateParameterCount(); + const int argumentCountOfInitialization = instantiation->templateArgumentCount(); + const int argumentCountOfSpecialization = specialization->templateParameterCount(); Clone cloner(_control.data()); Subst subst(_control.data()); - for (unsigned i = 0; i < argumentCountOfSpecialization; ++i) { + for (int i = 0; i < argumentCountOfSpecialization; ++i) { const TypenameArgument *tParam = specialization->templateParameterAt(i)->asTypenameArgument(); if (!tParam) diff --git a/src/libs/cplusplus/Macro.h b/src/libs/cplusplus/Macro.h index f54df57458..ba510109a8 100644 --- a/src/libs/cplusplus/Macro.h +++ b/src/libs/cplusplus/Macro.h @@ -100,10 +100,10 @@ public: void setFileRevision(unsigned fileRevision) { _fileRevision = fileRevision; } - unsigned line() const + int line() const { return _line; } - void setLine(unsigned line) + void setLine(int line) { _line = line; } unsigned bytesOffset() const @@ -165,7 +165,7 @@ private: QString _fileName; unsigned _hashcode; unsigned _fileRevision; - unsigned _line; + int _line; unsigned _bytesOffset; unsigned _utf16charsOffset; unsigned _length; diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp index 5aea683f1e..9e1ffdecb8 100644 --- a/src/libs/cplusplus/MatchingText.cpp +++ b/src/libs/cplusplus/MatchingText.cpp @@ -128,7 +128,7 @@ static int countSkippedChars(const QString &blockText, const QString &textToProc return skippedChars; } -static const Token tokenAtPosition(const Tokens &tokens, const unsigned pos) +static const Token tokenAtPosition(const Tokens &tokens, const int pos) { for (int i = tokens.size() - 1; i >= 0; --i) { const Token tk = tokens.at(i); @@ -450,7 +450,7 @@ bool MatchingText::contextAllowsElectricCharacters(const QTextCursor &cursor) return false; if (token.isStringLiteral() || token.isCharLiteral()) { - const unsigned pos = cursor.selectionEnd() - cursor.block().position(); + const int pos = cursor.selectionEnd() - cursor.block().position(); if (pos <= token.utf16charsEnd()) return false; } @@ -485,7 +485,7 @@ bool MatchingText::isInCommentHelper(const QTextCursor &cursor, Token *retToken) int prevState = 0; const Tokens tokens = getTokens(cursor, prevState); - const unsigned pos = cursor.selectionEnd() - cursor.block().position(); + const int pos = cursor.selectionEnd() - cursor.block().position(); if (tokens.isEmpty() || pos < tokens.first().utf16charsBegin()) return prevState > 0; @@ -510,7 +510,7 @@ Kind MatchingText::stringKindAtCursor(const QTextCursor &cursor) int prevState = 0; const Tokens tokens = getTokens(cursor, prevState); - const unsigned pos = cursor.selectionEnd() - cursor.block().position(); + const int pos = cursor.selectionEnd() - cursor.block().position(); if (tokens.isEmpty() || pos <= tokens.first().utf16charsBegin()) return T_EOF_SYMBOL; diff --git a/src/libs/cplusplus/NamePrettyPrinter.cpp b/src/libs/cplusplus/NamePrettyPrinter.cpp index 3870763d0c..5d9c5770e0 100644 --- a/src/libs/cplusplus/NamePrettyPrinter.cpp +++ b/src/libs/cplusplus/NamePrettyPrinter.cpp @@ -76,7 +76,7 @@ void NamePrettyPrinter::visit(const TemplateNameId *name) else _name = QLatin1String("anonymous"); _name += QLatin1Char('<'); - for (unsigned index = 0; index < name->templateArgumentCount(); ++index) { + for (int index = 0; index < name->templateArgumentCount(); ++index) { if (index != 0) _name += QLatin1String(", "); @@ -253,7 +253,7 @@ void NamePrettyPrinter::visit(const QualifiedNameId *name) void NamePrettyPrinter::visit(const SelectorNameId *name) { - for (unsigned i = 0; i < name->nameCount(); ++i) { + for (int i = 0; i < name->nameCount(); ++i) { const Name *n = name->nameAt(i); if (!n) continue; diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h index eeef87212e..546a04f5bc 100644 --- a/src/libs/cplusplus/Overview.h +++ b/src/libs/cplusplus/Overview.h @@ -70,7 +70,7 @@ public: bool showEnclosingTemplate: 1; bool includeWhiteSpaceInOperatorName: 1; /// "operator =()" vs "operator=()" - unsigned markedArgument; + int markedArgument; int markedArgumentBegin; int markedArgumentEnd; }; diff --git a/src/libs/cplusplus/PreprocessorClient.cpp b/src/libs/cplusplus/PreprocessorClient.cpp index 1b2595651c..68be342821 100644 --- a/src/libs/cplusplus/PreprocessorClient.cpp +++ b/src/libs/cplusplus/PreprocessorClient.cpp @@ -40,7 +40,7 @@ using namespace CPlusPlus; */ /*! - \fn void Client::passedMacroDefinitionCheck(unsigned offset, unsigned line, const Macro ¯o) + \fn void Client::passedMacroDefinitionCheck(int offset, int line, const Macro ¯o) Called when the preprocessor checks whether a macro is defined or not and the result is positive. @@ -49,7 +49,7 @@ using namespace CPlusPlus; */ /*! - \fn void Client::failedMacroDefinitionCheck(unsigned offset, const ByteArrayRef &name) + \fn void Client::failedMacroDefinitionCheck(int offset, const ByteArrayRef &name) Called when the preprocessor checks whether a macro is defined or not and the result is negative. @@ -58,8 +58,8 @@ using namespace CPlusPlus; */ /*! - \fn void Client::startExpandingMacro(unsigned offset, - unsigned line, + \fn void Client::startExpandingMacro(int offset, + int line, const Macro ¯o, const QVector<MacroArgumentReference> &actuals = QVector<MacroArgumentReference>()) diff --git a/src/libs/cplusplus/PreprocessorClient.h b/src/libs/cplusplus/PreprocessorClient.h index accccdab1f..97d3cc8efb 100644 --- a/src/libs/cplusplus/PreprocessorClient.h +++ b/src/libs/cplusplus/PreprocessorClient.h @@ -41,30 +41,30 @@ class Macro; class CPLUSPLUS_EXPORT MacroArgumentReference { - unsigned _bytesOffset; - unsigned _bytesLength; - unsigned _utf16charsOffset; - unsigned _utf16charsLength; + int _bytesOffset; + int _bytesLength; + int _utf16charsOffset; + int _utf16charsLength; public: - explicit MacroArgumentReference(unsigned bytesOffset = 0, unsigned bytesLength = 0, - unsigned utf16charsOffset = 0, unsigned utf16charsLength = 0) + explicit MacroArgumentReference(int bytesOffset = 0, int bytesLength = 0, + int utf16charsOffset = 0, int utf16charsLength = 0) : _bytesOffset(bytesOffset) , _bytesLength(bytesLength) , _utf16charsOffset(utf16charsOffset) , _utf16charsLength(utf16charsLength) { } - unsigned bytesOffset() const + int bytesOffset() const { return _bytesOffset; } - unsigned bytesLength() const + int bytesLength() const { return _bytesLength; } - unsigned utf16charsOffset() const + int utf16charsOffset() const { return _utf16charsOffset; } - unsigned utf16charsLength() const + int utf16charsLength() const { return _utf16charsLength; } }; @@ -86,28 +86,28 @@ public: virtual void macroAdded(const Macro ¯o) = 0; - virtual void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const Macro ¯o) = 0; - virtual void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, + virtual void passedMacroDefinitionCheck(int bytesOffset, int utf16charsOffset, + int line, const Macro ¯o) = 0; + virtual void failedMacroDefinitionCheck(int bytesOffset, int utf16charsOffset, const ByteArrayRef &name) = 0; - virtual void notifyMacroReference(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const Macro ¯o) = 0; + virtual void notifyMacroReference(int bytesOffset, int utf16charsOffset, + int line, const Macro ¯o) = 0; - virtual void startExpandingMacro(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const Macro ¯o, + virtual void startExpandingMacro(int bytesOffset, int utf16charsOffset, + int line, const Macro ¯o, const QVector<MacroArgumentReference> &actuals = QVector<MacroArgumentReference>()) = 0; - virtual void stopExpandingMacro(unsigned bytesOffset, const Macro ¯o) = 0; // TODO: ?! + virtual void stopExpandingMacro(int bytesOffset, const Macro ¯o) = 0; // TODO: ?! /// Mark the given macro name as the include guard for the current file. virtual void markAsIncludeGuard(const QByteArray ¯oName) = 0; /// Start skipping from the given utf16charsOffset. - virtual void startSkippingBlocks(unsigned utf16charsOffset) = 0; - virtual void stopSkippingBlocks(unsigned utf16charsOffset) = 0; + virtual void startSkippingBlocks(int utf16charsOffset) = 0; + virtual void stopSkippingBlocks(int utf16charsOffset) = 0; - virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType mode, + virtual void sourceNeeded(int line, const QString &fileName, IncludeType mode, const QStringList &initialIncludes = QStringList()) = 0; static inline bool isInjectedFile(const QString &fileName) diff --git a/src/libs/cplusplus/PreprocessorEnvironment.h b/src/libs/cplusplus/PreprocessorEnvironment.h index a6db2d0c7f..6f085ed519 100644 --- a/src/libs/cplusplus/PreprocessorEnvironment.h +++ b/src/libs/cplusplus/PreprocessorEnvironment.h @@ -88,7 +88,7 @@ private: public: QString currentFile; QByteArray currentFileUtf8; - unsigned currentLine; + int currentLine; bool hideNext; private: diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index a01a2b9b67..57bad400de 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -110,7 +110,7 @@ Tokens SimpleLexer::operator()(const QString &text, int state) return tokens; } -int SimpleLexer::tokenAt(const Tokens &tokens, unsigned utf16charsOffset) +int SimpleLexer::tokenAt(const Tokens &tokens, int utf16charsOffset) { for (int index = tokens.size() - 1; index >= 0; --index) { const Token &tk = tokens.at(index); @@ -122,7 +122,7 @@ int SimpleLexer::tokenAt(const Tokens &tokens, unsigned utf16charsOffset) } Token SimpleLexer::tokenAt(const QString &text, - unsigned utf16charsOffset, + int utf16charsOffset, int state, const LanguageFeatures &languageFeatures) { @@ -133,7 +133,7 @@ Token SimpleLexer::tokenAt(const QString &text, return (tokenIdx == -1) ? Token() : tokens.at(tokenIdx); } -int SimpleLexer::tokenBefore(const Tokens &tokens, unsigned utf16charsOffset) +int SimpleLexer::tokenBefore(const Tokens &tokens, int utf16charsOffset) { for (int index = tokens.size() - 1; index >= 0; --index) { const Token &tk = tokens.at(index); diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h index 2bd794933d..75138e830a 100644 --- a/src/libs/cplusplus/SimpleLexer.h +++ b/src/libs/cplusplus/SimpleLexer.h @@ -59,13 +59,13 @@ public: int state() const { return _lastState; } - static int tokenAt(const Tokens &tokens, unsigned utf16charsOffset); + static int tokenAt(const Tokens &tokens, int utf16charsOffset); static Token tokenAt(const QString &text, - unsigned utf16charsOffset, + int utf16charsOffset, int state, const LanguageFeatures &languageFeatures); - static int tokenBefore(const Tokens &tokens, unsigned utf16charsOffset); + static int tokenBefore(const Tokens &tokens, int utf16charsOffset); private: int _lastState; diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp index dabbcf0063..a2368e91c8 100644 --- a/src/libs/cplusplus/TypePrettyPrinter.cpp +++ b/src/libs/cplusplus/TypePrettyPrinter.cpp @@ -169,7 +169,7 @@ void TypePrettyPrinter::visit(Template *type) const Overview &oo = *overview(); if (oo.showTemplateParameters && ! _name.isEmpty()) { _name += QLatin1Char('<'); - for (unsigned index = 0; index < type->templateParameterCount(); ++index) { + for (int index = 0; index < type->templateParameterCount(); ++index) { if (index) _name += QLatin1String(", "); QString arg = oo.prettyName(type->templateParameterAt(index)->name()); @@ -410,7 +410,7 @@ void TypePrettyPrinter::visit(Function *type) if (_overview->showEnclosingTemplate) { if (Template *templ = type->enclosingTemplate()) { QString templateScope = "template<"; - for (unsigned i = 0, total = templ->templateParameterCount(); i < total; ++i) { + for (int i = 0, total = templ->templateParameterCount(); i < total; ++i) { if (Symbol *param = templ->templateParameterAt(i)) { if (i > 0) templateScope.append(", "); @@ -437,7 +437,7 @@ void TypePrettyPrinter::visit(Function *type) _text += QLatin1Char('('); - for (unsigned index = 0, argc = type->argumentCount(); index < argc; ++index) { + for (int index = 0, argc = type->argumentCount(); index < argc; ++index) { if (index != 0) _text += QLatin1String(", "); diff --git a/src/libs/cplusplus/findcdbbreakpoint.cpp b/src/libs/cplusplus/findcdbbreakpoint.cpp index 8943ad0001..54f618a50e 100644 --- a/src/libs/cplusplus/findcdbbreakpoint.cpp +++ b/src/libs/cplusplus/findcdbbreakpoint.cpp @@ -39,7 +39,7 @@ FindCdbBreakpoint::FindCdbBreakpoint(TranslationUnit *unit) { } -unsigned FindCdbBreakpoint::searchFrom(unsigned line) +int FindCdbBreakpoint::searchFrom(int line) { m_initialLine = line; m_breakpointLine = NO_LINE_FOUND; @@ -51,18 +51,18 @@ unsigned FindCdbBreakpoint::searchFrom(unsigned line) void FindCdbBreakpoint::foundLine(unsigned tokenIndex) { - unsigned dummy = 0; + int dummy = 0; getTokenStartPosition(tokenIndex, &m_breakpointLine, &dummy); } -unsigned FindCdbBreakpoint::endLine(unsigned tokenIndex) const +int FindCdbBreakpoint::endLine(unsigned tokenIndex) const { - unsigned line = 0, column = 0; + int line = 0, column = 0; getTokenEndPosition(tokenIndex, &line, &column); return line; } -unsigned FindCdbBreakpoint::endLine(AST *ast) const +int FindCdbBreakpoint::endLine(AST *ast) const { if (ast) return endLine(ast->lastToken() - 1); diff --git a/src/libs/cplusplus/findcdbbreakpoint.h b/src/libs/cplusplus/findcdbbreakpoint.h index 6fb61030e7..0be6ae048d 100644 --- a/src/libs/cplusplus/findcdbbreakpoint.h +++ b/src/libs/cplusplus/findcdbbreakpoint.h @@ -33,13 +33,12 @@ namespace CPlusPlus { class CPLUSPLUS_EXPORT FindCdbBreakpoint: protected ASTVisitor { public: - static const unsigned NO_LINE_FOUND = 0; + static const int NO_LINE_FOUND = 0; public: FindCdbBreakpoint(TranslationUnit *unit); - unsigned operator()(unsigned line) - { return searchFrom(line); } + int operator()(int line) { return searchFrom(line); } /** * Search for the next breakable line of code. @@ -49,12 +48,12 @@ public: * \return the next breakable code line (1-based), or \c NO_LINE_FOUND if * no line could be found. */ - unsigned searchFrom(unsigned line); + int searchFrom(int line); protected: void foundLine(unsigned tokenIndex); - unsigned endLine(unsigned tokenIndex) const; - unsigned endLine(AST *ast) const; + int endLine(unsigned tokenIndex) const; + int endLine(AST *ast) const; protected: using ASTVisitor::visit; @@ -86,9 +85,9 @@ protected: bool visit(ObjCSynchronizedStatementAST *ast); private: - unsigned m_initialLine; + int m_initialLine; - unsigned m_breakpointLine; + int m_breakpointLine; }; } // namespace CPlusPlus diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index f8874101fe..6b882e73b9 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -1321,7 +1321,7 @@ void Preprocessor::trackExpansionCycles(PPToken *tk) } } -static void adjustForCommentOrStringNewlines(unsigned *currentLine, const PPToken &tk) +static void adjustForCommentOrStringNewlines(int *currentLine, const PPToken &tk) { if (tk.isComment() || tk.isStringLiteral()) (*currentLine) += tk.asByteArrayRef().count('\n'); @@ -1343,7 +1343,7 @@ void Preprocessor::synchronizeOutputLines(const PPToken &tk, bool forceLine) generateOutputLineMarker(tk.lineno); } } else { - for (unsigned i = m_env->currentLine; i < tk.lineno; ++i) + for (int i = m_env->currentLine; i < tk.lineno; ++i) currentOutputBuffer().append('\n'); } @@ -1419,7 +1419,7 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source, ScopedSwap<QString> savedFileName(m_env->currentFile, fileName); ScopedSwap<QByteArray> savedUtf8FileName(m_env->currentFileUtf8, fileName.toUtf8()); - ScopedSwap<unsigned> savedCurrentLine(m_env->currentLine, 1); + ScopedSwap<int> savedCurrentLine(m_env->currentLine, 1); if (!m_state.m_noLines) generateOutputLineMarker(1); diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index fb9cdda2b2..0ca559d431 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -133,7 +133,7 @@ private: unsigned m_bytesOffsetRef; unsigned m_utf16charsOffsetRef; QByteArray *m_result; - unsigned m_lineRef; + int m_lineRef; ExpansionStatus m_expansionStatus; void setExpansionStatus(ExpansionStatus status) diff --git a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp index 6bf17505d6..6dad8947b8 100644 --- a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp +++ b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp @@ -57,7 +57,7 @@ class ContextProperty { public: QString name; QString expression; - unsigned line, column; + int line, column; }; class FindExportsVisitor : protected ASTVisitor @@ -245,7 +245,7 @@ protected: if (StringLiteralAST *nameAst = skipStringCall(nameExp)->asStringLiteral()) nameLit = translationUnit()->stringLiteral(nameAst->literal_token); if (!nameLit) { - unsigned line, column; + int line, column; translationUnit()->getTokenStartPosition(nameExp->firstToken(), &line, &column); _messages += Document::DiagnosticMessage( Document::DiagnosticMessage::Warning, @@ -290,7 +290,7 @@ protected: const Token end = _doc->translationUnit()->tokenAt(ast->firstToken()); // go through comments backwards to find the annotation closest to the call - for (unsigned i = _doc->translationUnit()->commentCount(); i-- > 0; ) { + for (int i = _doc->translationUnit()->commentCount(); i-- > 0; ) { const Token commentToken = _doc->translationUnit()->commentAt(i); if (commentToken.utf16charsBegin() >= end.utf16charsBegin() || commentToken.utf16charsEnd() <= begin.utf16charsBegin()) { @@ -305,7 +305,7 @@ protected: } if (packageName.isEmpty()) { packageName = QmlJS::CppQmlTypes::defaultPackage; - unsigned line, column; + int line, column; translationUnit()->getTokenStartPosition(ast->firstToken(), &line, &column); _messages += Document::DiagnosticMessage( Document::DiagnosticMessage::Warning, @@ -341,7 +341,7 @@ protected: } // we want to do lookup later, so also store the surrounding scope - unsigned line, column; + int line, column; translationUnit()->getTokenStartPosition(ast->firstToken(), &line, &column); exportedType.scope = _doc->scopeAt(line, column); @@ -483,7 +483,7 @@ protected: if (StringLiteralAST *nameAst = skipStringCall(ast->expression_list->value)->asStringLiteral()) nameLit = translationUnit()->stringLiteral(nameAst->literal_token); if (!nameLit) { - unsigned line, column; + int line, column; translationUnit()->getTokenStartPosition(ast->expression_list->value->firstToken(), &line, &column); _messages += Document::DiagnosticMessage( Document::DiagnosticMessage::Warning, @@ -666,7 +666,7 @@ static LanguageUtils::FakeMetaObject::Ptr buildFakeMetaObject( // add the no-package export, so the cpp name can be used in properties fmo->addExport(fmo->className(), QmlJS::CppQmlTypes::cppPackage, ComponentVersion()); - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { Symbol *member = klass->memberAt(i); if (!member->name()) continue; @@ -678,7 +678,7 @@ static LanguageUtils::FakeMetaObject::Ptr buildFakeMetaObject( method.setMethodType(FakeMetaMethod::Signal); else method.setMethodType(FakeMetaMethod::Slot); - for (unsigned a = 0, argc = func->argumentCount(); a < argc; ++a) { + for (int a = 0, argc = func->argumentCount(); a < argc; ++a) { Symbol *arg = func->argumentAt(a); QString name; if (arg->name()) @@ -715,7 +715,7 @@ static LanguageUtils::FakeMetaObject::Ptr buildFakeMetaObject( continue; FakeMetaEnum metaEnum(namePrinter.prettyName(e->name())); - for (unsigned j = 0; j < e->memberCount(); ++j) { + for (int j = 0; j < e->memberCount(); ++j) { Symbol *enumMember = e->memberAt(j); if (!enumMember->name()) continue; diff --git a/src/libs/utils/textutils.cpp b/src/libs/utils/textutils.cpp index ba10ca56ae..2233d1c680 100644 --- a/src/libs/utils/textutils.cpp +++ b/src/libs/utils/textutils.cpp @@ -80,7 +80,7 @@ QString textAt(QTextCursor tc, int pos, int length) return tc.selectedText().replace(QChar::ParagraphSeparator, QLatin1Char('\n')); } -QTextCursor selectAt(QTextCursor textCursor, uint line, uint column, uint length) +QTextCursor selectAt(QTextCursor textCursor, int line, int column, uint length) { if (line < 1) line = 1; diff --git a/src/libs/utils/textutils.h b/src/libs/utils/textutils.h index fb0efe3f15..a86ab5d0fa 100644 --- a/src/libs/utils/textutils.h +++ b/src/libs/utils/textutils.h @@ -48,7 +48,7 @@ QTCREATOR_UTILS_EXPORT int positionInText(const QTextDocument *textDocument, int QTCREATOR_UTILS_EXPORT QString textAt(QTextCursor tc, int pos, int length); -QTCREATOR_UTILS_EXPORT QTextCursor selectAt(QTextCursor textCursor, uint line, uint column, uint length); +QTCREATOR_UTILS_EXPORT QTextCursor selectAt(QTextCursor textCursor, int line, int column, uint length); QTCREATOR_UTILS_EXPORT QTextCursor flippedCursor(const QTextCursor &cursor); diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp index 8c687ff52a..65620220b9 100644 --- a/src/plugins/autotest/autotestplugin.cpp +++ b/src/plugins/autotest/autotestplugin.cpp @@ -288,7 +288,7 @@ void AutotestPlugin::onRunUnderCursorTriggered(TestRunMode mode) return; // Wrong location triggered // check whether we have been triggered on a test function definition - const uint line = uint(currentEditor->currentLine()); + const int line = currentEditor->currentLine(); const QString &filePath = currentEditor->textDocument()->filePath().toString(); const QList<TestTreeItem *> filteredItems = Utils::filtered(testsItems, [&](TestTreeItem *it){ return it->line() == line && it->filePath() == filePath; diff --git a/src/plugins/autotest/boost/boostcodeparser.h b/src/plugins/autotest/boost/boostcodeparser.h index 23fd4b3c03..ecdc4f84d0 100644 --- a/src/plugins/autotest/boost/boostcodeparser.h +++ b/src/plugins/autotest/boost/boostcodeparser.h @@ -75,7 +75,7 @@ private: QVector<BoostTestInfo> m_suites; QString m_currentSuite; BoostTestTreeItem::TestStates m_currentState = BoostTestTreeItem::Enabled; - unsigned m_lineNo = 0; + int m_lineNo = 0; }; } // Internal diff --git a/src/plugins/autotest/boost/boosttesttreeitem.h b/src/plugins/autotest/boost/boosttesttreeitem.h index 1149720f9d..a3676c39de 100644 --- a/src/plugins/autotest/boost/boosttesttreeitem.h +++ b/src/plugins/autotest/boost/boosttesttreeitem.h @@ -88,7 +88,7 @@ struct BoostTestInfo { QString fullName; // formatted like UNIX path BoostTestTreeItem::TestStates state; - unsigned line; + int line; }; typedef QVector<BoostTestInfo> BoostTestInfoList; diff --git a/src/plugins/autotest/gtest/gtestvisitors.cpp b/src/plugins/autotest/gtest/gtestvisitors.cpp index f7104ff93d..14198d76ae 100644 --- a/src/plugins/autotest/gtest/gtestvisitors.cpp +++ b/src/plugins/autotest/gtest/gtestvisitors.cpp @@ -69,8 +69,8 @@ bool GTestVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast) const bool disabled = testName.startsWith(disabledPrefix); const bool disabledCase = testCaseName.startsWith(disabledPrefix); - unsigned line = 0; - unsigned column = 0; + int line = 0; + int column = 0; unsigned token = id->firstToken(); m_document->translationUnit()->getTokenStartPosition(token, &line, &column); diff --git a/src/plugins/autotest/itestparser.h b/src/plugins/autotest/itestparser.h index b69b23b253..0aef8eb3a6 100644 --- a/src/plugins/autotest/itestparser.h +++ b/src/plugins/autotest/itestparser.h @@ -51,8 +51,8 @@ public: QString fileName; QString proFile; QString name; - unsigned line = 0; - unsigned column = 0; + int line = 0; + int column = 0; }; using TestParseResultPtr = QSharedPointer<TestParseResult>; diff --git a/src/plugins/autotest/qtest/qttestparser.cpp b/src/plugins/autotest/qtest/qttestparser.cpp index f03d9da923..fe0b3db70c 100644 --- a/src/plugins/autotest/qtest/qttestparser.cpp +++ b/src/plugins/autotest/qtest/qttestparser.cpp @@ -126,8 +126,8 @@ static CPlusPlus::Document::Ptr declaringDocument(CPlusPlus::Document::Ptr doc, const CPlusPlus::Snapshot &snapshot, const QString &testCaseName, const QStringList &alternativeFiles = {}, - unsigned *line = nullptr, - unsigned *column = nullptr) + int *line = nullptr, + int *column = nullptr) { CPlusPlus::Document::Ptr declaringDoc; CPlusPlus::TypeOfExpression typeOfExpr; @@ -293,8 +293,8 @@ static bool handleQtTest(QFutureInterface<TestParseResultPtr> futureInterface, if (testCaseName.isEmpty()) testCaseName = oldTestCaseName; if (!testCaseName.isEmpty()) { - unsigned line = 0; - unsigned column = 0; + int line = 0; + int column = 0; CPlusPlus::Document::Ptr declaringDoc = declaringDocument(document, snapshot, testCaseName, alternativeFiles, &line, &column); if (declaringDoc.isNull()) diff --git a/src/plugins/autotest/qtest/qttestvisitors.cpp b/src/plugins/autotest/qtest/qttestvisitors.cpp index 58a69f2dbf..1992520438 100644 --- a/src/plugins/autotest/qtest/qttestvisitors.cpp +++ b/src/plugins/autotest/qtest/qttestvisitors.cpp @@ -50,8 +50,8 @@ bool TestVisitor::visit(CPlusPlus::Class *symbol) const CPlusPlus::Overview o; CPlusPlus::LookupContext lc; - unsigned count = symbol->memberCount(); - for (unsigned i = 0; i < count; ++i) { + int count = symbol->memberCount(); + for (int i = 0; i < count; ++i) { CPlusPlus::Symbol *member = symbol->memberAt(i); CPlusPlus::Type *type = member->type().type(); @@ -87,7 +87,7 @@ bool TestVisitor::visit(CPlusPlus::Class *symbol) m_privSlots.insert(className + "::" + name, locationAndType); } } - for (unsigned counter = 0, end = symbol->baseClassCount(); counter < end; ++counter) { + for (int counter = 0, end = symbol->baseClassCount(); counter < end; ++counter) { if (CPlusPlus::BaseClass *base = symbol->baseClassAt(counter)) { const QString &baseClassName = o.prettyName(lc.fullyQualifiedName(base)); if (baseClassName != "QObject") @@ -224,8 +224,8 @@ bool TestDataFunctionVisitor::visit(CPlusPlus::CallAST *ast) bool ok = false; QString name = extractNameFromAST(stringLiteral, &ok); if (ok) { - unsigned line = 0; - unsigned column = 0; + int line = 0; + int column = 0; m_currentDoc->translationUnit()->getTokenStartPosition( firstToken, &line, &column); QtTestCodeLocationAndType locationAndType; diff --git a/src/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h index e6d47bb820..a311043558 100644 --- a/src/plugins/autotest/testtreeitem.h +++ b/src/plugins/autotest/testtreeitem.h @@ -88,10 +88,10 @@ public: void setName(const QString &name) { m_name = name; } const QString filePath() const { return m_filePath; } void setFilePath(const QString &filePath) { m_filePath = filePath; } - void setLine(unsigned line) { m_line = line;} - unsigned line() const { return m_line; } - void setColumn(unsigned column) { m_column = column; } - unsigned column() const { return m_column; } + void setLine(int line) { m_line = line;} + int line() const { return m_line; } + void setColumn(int column) { m_column = column; } + int column() const { return m_column; } QString proFile() const { return m_proFile; } void setProFile(const QString &proFile) { m_proFile = proFile; } virtual Qt::CheckState checked() const; @@ -151,8 +151,8 @@ private: QString m_filePath; Qt::CheckState m_checked; Type m_type; - unsigned m_line = 0; - unsigned m_column = 0; + int m_line = 0; + int m_column = 0; QString m_proFile; Status m_status = NewlyAdded; @@ -163,8 +163,8 @@ class TestCodeLocationAndType { public: QString m_name; // tag name for m_type == TestDataTag, file name for other values - unsigned m_line = 0; - unsigned m_column = 0; + int m_line = 0; + int m_column = 0; TestTreeItem::Type m_type = TestTreeItem::Root; }; diff --git a/src/plugins/clangcodemodel/clangbackendreceiver.cpp b/src/plugins/clangcodemodel/clangbackendreceiver.cpp index 34e3136830..7f2ef28fd6 100644 --- a/src/plugins/clangcodemodel/clangbackendreceiver.cpp +++ b/src/plugins/clangcodemodel/clangbackendreceiver.cpp @@ -219,7 +219,7 @@ CppTools::CursorInfo::Range toCursorInfoRange(const SourceRangeContainer &source { const SourceLocationContainer &start = sourceRange.start; const SourceLocationContainer &end = sourceRange.end; - const unsigned length = end.column - start.column; + const int length = end.column - start.column; return {start.line, start.column, length}; } @@ -249,10 +249,10 @@ CppTools::SymbolInfo toSymbolInfo(const FollowSymbolMessage &message) const SourceLocationContainer &start = range.start; const SourceLocationContainer &end = range.end; - result.startLine = static_cast<int>(start.line); - result.startColumn = static_cast<int>(start.column); - result.endLine = static_cast<int>(end.line); - result.endColumn = static_cast<int>(end.column); + result.startLine = start.line; + result.startColumn = start.column; + result.endLine = end.line; + result.endColumn = end.column; result.fileName = start.filePath; result.isResultOnlyForFallBack = message.result.isResultOnlyForFallBack; diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index 6f1397c487..09f5ee9507 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -189,7 +189,7 @@ CodeCompletions ClangCompletionAssistProcessor::applyCompletionFixIt(const CodeC ClangFixItOperation fixItOperation(Utf8String(), completion.requiredFixIts); fixItOperation.perform(); - const int fixItLength = static_cast<int>(fixIt.range.end.column - fixIt.range.start.column); + const int fixItLength = fixIt.range.end.column - fixIt.range.start.column; const QString fixItText = fixIt.text.toString(); m_positionForProposal += fixItText.length() - fixItLength; diff --git a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp index cd90c29fb4..20d4cf707a 100644 --- a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp +++ b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp @@ -75,7 +75,7 @@ static Core::LocatorFilterEntry makeEntry(Core::ILocatorFilter *filter, { const ClangBackEnd::ExtraInfo &extraInfo = info.extraInfo; QString displayName = extraInfo.token; - ::Utils::LineColumn lineColumn(static_cast<int>(info.line), static_cast<int>(info.column)); + ::Utils::LineColumn lineColumn(info.line, info.column); Core::LocatorFilterEntry entry(filter, displayName, QVariant::fromValue(lineColumn)); QString extra; ClangBackEnd::HighlightingType mainType = info.types.mainHighlightingType; diff --git a/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp b/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp index 981a679a9b..72d52cb81b 100644 --- a/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp +++ b/src/plugins/clangcodemodel/clangfixitoperationsextractor.cpp @@ -63,7 +63,7 @@ bool hasFixItAt(const QVector<ClangBackEnd::FixItContainer> &fixits, { const auto isFixitForLocation = [filePath, line] (const ClangBackEnd::FixItContainer &fixit) { const ClangBackEnd::SourceLocationContainer &location = fixit.range.start; - return location.filePath == filePath && location.line == uint(line); + return location.filePath == filePath && location.line == line; }; return Utils::anyOf(fixits, isFixitForLocation); diff --git a/src/plugins/clangcodemodel/clangfollowsymbol.cpp b/src/plugins/clangcodemodel/clangfollowsymbol.cpp index e03a2b904c..58adcacee2 100644 --- a/src/plugins/clangcodemodel/clangfollowsymbol.cpp +++ b/src/plugins/clangcodemodel/clangfollowsymbol.cpp @@ -43,8 +43,8 @@ namespace Internal { // Returns invalid Mark if it is not found at (line, column) static bool findMark(const QVector<ClangBackEnd::TokenInfoContainer> &marks, - uint line, - uint column, + int line, + int column, ClangBackEnd::TokenInfoContainer &mark) { mark = Utils::findOrDefault(marks, diff --git a/src/plugins/clangcodemodel/clanghighlightingresultreporter.h b/src/plugins/clangcodemodel/clanghighlightingresultreporter.h index 2c6e7a89a8..b3755fd264 100644 --- a/src/plugins/clangcodemodel/clanghighlightingresultreporter.h +++ b/src/plugins/clangcodemodel/clanghighlightingresultreporter.h @@ -65,7 +65,7 @@ private: int m_chunkSize = 100; bool m_flushRequested = false; - unsigned m_flushLine = 0; + int m_flushLine = 0; }; } // namespace Internal diff --git a/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h b/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h index 6a88a1fd22..c8de24a0d0 100644 --- a/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h +++ b/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h @@ -31,8 +31,8 @@ namespace ClangCodeModel { namespace Internal { static bool isWithinRange(const ClangBackEnd::SourceRangeContainer &range, - uint line, - uint column) + int line, + int column) { const ClangBackEnd::SourceLocationContainer &startLocation = range.start; const ClangBackEnd::SourceLocationContainer &endLocation = range.end; @@ -44,8 +44,8 @@ static bool isWithinRange(const ClangBackEnd::SourceRangeContainer &range, } static bool isWithinOneRange(const QVector<ClangBackEnd::SourceRangeContainer> &ranges, - uint line, - uint column) + int line, + int column) { for (const ClangBackEnd::SourceRangeContainer &range : ranges) { if (isWithinRange(range, line, column)) @@ -57,8 +57,8 @@ static bool isWithinOneRange(const QVector<ClangBackEnd::SourceRangeContainer> & bool isDiagnosticRelatedToLocation(const ClangBackEnd::DiagnosticContainer &diagnostic, const QVector<ClangBackEnd::SourceRangeContainer> &additionalRanges, - uint line, - uint column) + int line, + int column) { const ClangBackEnd::SourceLocationContainer &location = diagnostic.location; diff --git a/src/plugins/clangrefactoring/clangqueryhoverhandler.cpp b/src/plugins/clangrefactoring/clangqueryhoverhandler.cpp index 3e60919e32..cb9d64fe42 100644 --- a/src/plugins/clangrefactoring/clangqueryhoverhandler.cpp +++ b/src/plugins/clangrefactoring/clangqueryhoverhandler.cpp @@ -53,8 +53,8 @@ void ClangQueryHoverHandler::identifyMatch(TextEditor::TextEditorWidget *editorW int line = textCursor.blockNumber() + 1; int column = textCursor.columnNumber() + 1; - Messages messages = m_highligher->messagesForLineAndColumn(uint(line), uint(column)); - Contexts contexts = m_highligher->contextsForLineAndColumn(uint(line), uint(column)); + Messages messages = m_highligher->messagesForLineAndColumn(line, column); + Contexts contexts = m_highligher->contextsForLineAndColumn(line, column); if (!messages.empty()) setToolTip(QString("%1: %2").arg(QString(messages[0].errorTypeText())).arg(QString(messages[0].arguments.join(", ")))); diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp index 6b26cd8185..2744f69348 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp +++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp @@ -902,7 +902,7 @@ QModelIndex SymbolsModel::index(int row, int column, const QModelIndex &parent) scope = m_document->globalNamespace(); if (scope) { - if ((unsigned)row < scope->memberCount()) + if (row < scope->memberCount()) return createIndex(row, column, scope->memberAt(row)); } @@ -997,8 +997,8 @@ public: private: struct TokenInfo { Token token; - unsigned line; - unsigned column; + int line; + int column; }; QList<TokenInfo> m_tokenInfos; }; diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.h b/src/plugins/cppeditor/cppfunctiondecldeflink.h index 136e069449..0f11fabc8d 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.h +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.h @@ -94,8 +94,8 @@ public: // The 'target' prefix denotes information about the remote declaration matching // the 'source' declaration, where we will try to apply the user changes. // 1-based line and column - unsigned targetLine = 0; - unsigned targetColumn = 0; + int targetLine = 0; + int targetColumn = 0; QString targetInitial; CppTools::CppRefactoringFileConstPtr targetFile; diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index a7531acf1e..681ba51ce3 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -86,7 +86,7 @@ void CppHighlighter::highlightBlock(const QString &text) return; } - const unsigned firstNonSpace = tokens.first().utf16charsBegin(); + const int firstNonSpace = tokens.first().utf16charsBegin(); Parentheses parentheses; parentheses.reserve(5); @@ -97,7 +97,7 @@ void CppHighlighter::highlightBlock(const QString &text) for (int i = 0; i < tokens.size(); ++i) { const Token &tk = tokens.at(i); - unsigned previousTokenEnd = 0; + int previousTokenEnd = 0; if (i != 0) { // mark the whitespaces previousTokenEnd = tokens.at(i - 1).utf16charsBegin() + diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp index 1f2650ac63..68fbbf8bc7 100644 --- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp +++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp @@ -844,7 +844,7 @@ public: // make target lookup context Document::Ptr implementationDoc = implementationFile->cppDocument(); - unsigned line, column; + int line, column; implementationDoc->translationUnit()->getPosition(insertPos, &line, &column); Scope *targetScope = implementationDoc->scopeAt(line, column); const LookupContext targetContext(implementationDoc, snapshot()); @@ -853,7 +853,7 @@ public: targetCoN = targetContext.globalNamespace(); // Loop through inserted declarations - for (unsigned i = targetClass->memberCount(); i < clazz->memberCount(); ++i) { + for (int i = targetClass->memberCount(); i < clazz->memberCount(); ++i) { Declaration *decl = clazz->memberAt(i)->asDeclaration(); if (!decl) continue; diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 538c9242b8..b667cc9842 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -131,7 +131,7 @@ InsertionLocation insertLocationForMethodDefinition(Symbol *symbol, const bool u // ...failed, // if class member try to get position right after class CppRefactoringFilePtr file = refactoring.file(fileName); - unsigned line = 0, column = 0; + int line = 0, column = 0; if (Class *clazz = symbol->enclosingClass()) { if (symbol->fileName() == fileName.toUtf8()) { file->cppDocument()->translationUnit()->getPosition(clazz->endOffset(), &line, &column); @@ -1854,7 +1854,7 @@ bool canLookupDefinition(const CppQuickFixInterface &interface, const NameAST *n QTC_ASSERT(nameAst && nameAst->name, return false); // Find the enclosing scope - unsigned line, column; + int line, column; const Document::Ptr &doc = interface.semanticInfo().doc; doc->translationUnit()->getTokenStartPosition(nameAst->firstToken(), &line, &column); Scope *scope = doc->scopeAt(line, column); @@ -2364,7 +2364,7 @@ void CompleteSwitchCaseStatement::match(const CppQuickFixInterface &interface, // check the possible enum values QStringList values; Overview prettyPrint; - for (unsigned i = 0; i < e->memberCount(); ++i) { + for (int i = 0; i < e->memberCount(); ++i) { if (Declaration *decl = e->memberAt(i)->asDeclaration()) values << prettyPrint.prettyName(LookupContext::fullyQualifiedName(decl)); } @@ -2752,7 +2752,7 @@ void InsertDefFromDecl::match(const CppQuickFixInterface &interface, QuickFixOpe // Insert Position: Inside Class // Determine insert location direct after the declaration. - unsigned line, column; + int line, column; const CppRefactoringFilePtr file = interface.currentFile(); file->lineAndColumn(file->endOf(simpleDecl), &line, &column); const InsertionLocation loc @@ -2779,7 +2779,7 @@ bool hasClassMemberWithGetPrefix(const Class *klass) if (!klass) return false; - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { const Symbol *symbol = klass->memberAt(i); if (symbol->isFunction() || symbol->isDeclaration()) { if (const Name *symbolName = symbol->name()) { @@ -2872,7 +2872,7 @@ public: bool hasGetter = false; bool hasSetter = false; if (Class *klass = m_classSpecifier->symbol) { - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { Symbol *symbol = klass->memberAt(i); if (symbol->isQtPropertyDeclaration()) continue; @@ -3125,7 +3125,7 @@ public: // Create and apply changes ChangeSet currChanges; - int declInsertPos = currentFile->position(qMax(1u, declLocation.line()), + int declInsertPos = currentFile->position(qMax(1, declLocation.line()), declLocation.column()); currChanges.insert(declInsertPos, declaration); @@ -4608,7 +4608,7 @@ void InsertQtPropertyMembers::match(const CppQuickFixInterface &interface, Class *c = klass->symbol; Overview overview; - for (unsigned i = 0; i < c->memberCount(); ++i) { + for (int i = 0; i < c->memberCount(); ++i) { Symbol *member = c->memberAt(i); FullySpecifiedType type = member->type(); if (member->asFunction() || (type.isValid() && type->asFunctionType())) { diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp index 02c1314d7d..1c058c0f82 100644 --- a/src/plugins/cppeditor/fileandtokenactions_test.cpp +++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp @@ -232,7 +232,7 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti i = j - 1; // Continue with next not expanded token } else { // Position the cursor on the token - unsigned line, column; + int line, column; translationUnit->getPosition(token.utf16charsBegin(), &line, &column); editor->gotoLine(line, column - 1); QApplication::processEvents(); @@ -287,7 +287,7 @@ void TestActionsTestCase::moveWordCamelCaseToToken(TranslationUnit *translationU CppEditorWidget *editorWidget = dynamic_cast<CppEditorWidget *>(editor->editorWidget()); QVERIFY(editorWidget); - unsigned line, column; + int line, column; translationUnit->getPosition(token.utf16charsBegin(), &line, &column); while (editor->currentLine() < (int) line diff --git a/src/plugins/cpptools/builtincursorinfo.cpp b/src/plugins/cpptools/builtincursorinfo.cpp index 486db2c503..ee17a8091a 100644 --- a/src/plugins/cpptools/builtincursorinfo.cpp +++ b/src/plugins/cpptools/builtincursorinfo.cpp @@ -55,26 +55,24 @@ CursorInfo::Range toRange(const SemanticInfo::Use &use) CursorInfo::Range toRange(int tokenIndex, TranslationUnit *translationUnit) { - unsigned line, column; - translationUnit->getTokenPosition(static_cast<unsigned>(tokenIndex), &line, &column); + int line, column; + translationUnit->getTokenPosition(tokenIndex, &line, &column); if (column) --column; // adjust the column position. return {line, column + 1, - translationUnit->tokenAt(static_cast<unsigned>(tokenIndex)).utf16chars()}; + translationUnit->tokenAt(tokenIndex).utf16chars()}; } -CursorInfo::Range toRange(const QTextCursor &textCursor, - unsigned utf16offset, - unsigned length) +CursorInfo::Range toRange(const QTextCursor &textCursor, int utf16offset, int length) { QTextCursor cursor(textCursor.document()); - cursor.setPosition(static_cast<int>(utf16offset)); + cursor.setPosition(utf16offset); const QTextBlock textBlock = cursor.block(); - return {static_cast<unsigned>(textBlock.blockNumber() + 1), - static_cast<unsigned>(cursor.position() - textBlock.position() + 1), + return {textBlock.blockNumber() + 1, + cursor.position() - textBlock.position() + 1, length}; } @@ -102,8 +100,8 @@ CursorInfo::Ranges toRanges(const QList<int> &tokenIndices, TranslationUnit *tra class FunctionDefinitionUnderCursor: protected ASTVisitor { - unsigned m_line = 0; - unsigned m_column = 0; + int m_line = 0; + int m_column = 0; DeclarationAST *m_functionDefinition = nullptr; public: @@ -111,7 +109,7 @@ public: : ASTVisitor(translationUnit) { } - DeclarationAST *operator()(AST *ast, unsigned line, unsigned column) + DeclarationAST *operator()(AST *ast, int line, int column) { m_functionDefinition = nullptr; m_line = line; @@ -140,8 +138,8 @@ protected: private: bool checkDeclaration(DeclarationAST *ast) { - unsigned startLine, startColumn; - unsigned endLine, endColumn; + int startLine, startColumn; + int endLine, endColumn; getTokenStartPosition(ast->firstToken(), &startLine, &startColumn); getTokenEndPosition(ast->lastToken() - 1, &endLine, &endColumn); @@ -214,9 +212,8 @@ private: bool good = false; foreach (const CppTools::SemanticInfo::Use &use, uses) { - const auto l = static_cast<unsigned>(m_line); - const auto c = static_cast<unsigned>(m_column); - if (l == use.line && c >= use.column && c <= (use.column + use.length)) { + if (m_line == use.line && m_column >= use.column + && m_column <= static_cast<int>(use.column + use.length)) { good = true; break; } @@ -293,7 +290,7 @@ bool handleMacroCase(const Document::Ptr document, if (!macro) return false; - const unsigned length = static_cast<unsigned>(macro->nameToQString().size()); + const int length = macro->nameToQString().size(); // Macro definition if (macro->fileName() == document->fileName()) @@ -359,9 +356,7 @@ BuiltinCursorInfo::findLocalUses(const Document::Ptr &document, int line, int co AST *ast = document->translationUnit()->ast(); FunctionDefinitionUnderCursor functionDefinitionUnderCursor(document->translationUnit()); - DeclarationAST *declaration = functionDefinitionUnderCursor(ast, - static_cast<unsigned>(line), - static_cast<unsigned>(column)); + DeclarationAST *declaration = functionDefinitionUnderCursor(ast, line, column); return CppTools::LocalSymbols(document, declaration).uses; } diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp index 9232750684..c9f69f644c 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp +++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp @@ -71,7 +71,7 @@ QList<QTextEdit::ExtraSelection> toTextEditorSelections( QTextCursor c(textDocument->findBlockByNumber(m.line() - 1)); const QString text = c.block().text(); const int startPos = m.column() > 0 ? m.column() - 1 : 0; - if (m.length() > 0 && startPos + m.length() <= (unsigned)text.size()) { + if (m.length() > 0 && startPos + m.length() <= text.size()) { c.setPosition(c.position() + startPos); c.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor, m.length()); } else { diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp index ea534531e6..f4458bd059 100644 --- a/src/plugins/cpptools/cppchecksymbols.cpp +++ b/src/plugins/cpptools/cppchecksymbols.cpp @@ -314,9 +314,9 @@ CheckSymbols::CheckSymbols(Document::Ptr doc, const LookupContext &context, cons : ASTVisitor(doc->translationUnit()), _doc(doc), _context(context) , _lineOfLastUsage(0), _macroUses(macroUses) { - unsigned line = 0; + int line = 0; getTokenEndPosition(translationUnit()->ast()->lastToken(), &line, nullptr); - _chunkSize = qMax(50U, line / 200); + _chunkSize = qMax(50, line / 200); _usages.reserve(_chunkSize); _astStack.reserve(200); @@ -365,7 +365,7 @@ bool CheckSymbols::warning(AST *ast, const QString &text) const Token &lastToken = tokenAt(ast->lastToken() - 1); const unsigned length = lastToken.utf16charsEnd() - firstToken.utf16charsBegin(); - unsigned line = 1, column = 1; + int line = 1, column = 1; getTokenStartPosition(ast->firstToken(), &line, &column); warning(line, column, text, length); @@ -478,7 +478,7 @@ bool CheckSymbols::visit(NamespaceAST *ast) if (ast->identifier_token) { const Token &tok = tokenAt(ast->identifier_token); if (!tok.generated()) { - unsigned line, column; + int line, column; getTokenStartPosition(ast->identifier_token, &line, &column); Result use(line, column, tok.utf16chars(), SemanticHighlighter::TypeUse); addUse(use); @@ -786,7 +786,7 @@ void CheckSymbols::checkNamespace(NameAST *name) if (!name) return; - unsigned line, column; + int line, column; getTokenStartPosition(name->firstToken(), &line, &column); if (ClassOrNamespace *b = _context.lookupType(name->name, enclosingScope())) { @@ -1184,7 +1184,7 @@ void CheckSymbols::addUse(unsigned tokenIndex, Kind kind) if (tok.generated()) return; - unsigned line, column; + int line, column; getTokenStartPosition(tokenIndex, &line, &column); const unsigned length = tok.utf16chars(); @@ -1221,7 +1221,7 @@ void CheckSymbols::addType(ClassOrNamespace *b, NameAST *ast) if (tok.generated()) return; - unsigned line, column; + int line, column; getTokenStartPosition(startToken, &line, &column); const unsigned length = tok.utf16chars(); const Result use(line, column, length, SemanticHighlighter::TypeUse); @@ -1263,7 +1263,7 @@ bool CheckSymbols::maybeAddTypeOrStatic(const QList<LookupItem> &candidates, Nam c->isClass() || c->isEnum() || isTemplateClass(c) || c->isForwardClassDeclaration() || c->isTypenameArgument() || c->enclosingEnum() != nullptr) { - unsigned line, column; + int line, column; getTokenStartPosition(startToken, &line, &column); const unsigned length = tok.utf16chars(); @@ -1305,7 +1305,7 @@ bool CheckSymbols::maybeAddField(const QList<LookupItem> &candidates, NameAST *a else if (c->isTypedef() || (c->type() && c->type()->isFunctionType())) return false; // shadowed - unsigned line, column; + int line, column; getTokenStartPosition(startToken, &line, &column); const unsigned length = tok.utf16chars(); @@ -1319,9 +1319,9 @@ bool CheckSymbols::maybeAddField(const QList<LookupItem> &candidates, NameAST *a } bool CheckSymbols::maybeAddFunction(const QList<LookupItem> &candidates, NameAST *ast, - unsigned argumentCount, FunctionKind functionKind) + int argumentCount, FunctionKind functionKind) { - unsigned startToken = ast->firstToken(); + int startToken = ast->firstToken(); bool isDestructor = false; bool isConstructor = false; if (DestructorNameAST *dtor = ast->asDestructorName()) { @@ -1399,7 +1399,7 @@ bool CheckSymbols::maybeAddFunction(const QList<LookupItem> &candidates, NameAST return false; } - unsigned line, column; + int line, column; getTokenStartPosition(startToken, &line, &column); const unsigned length = tok.utf16chars(); diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h index 9a686c2995..fa1229977d 100644 --- a/src/plugins/cpptools/cppchecksymbols.h +++ b/src/plugins/cpptools/cppchecksymbols.h @@ -132,7 +132,7 @@ protected: bool maybeAddField(const QList<CPlusPlus::LookupItem> &candidates, CPlusPlus::NameAST *ast); bool maybeAddFunction(const QList<CPlusPlus::LookupItem> &candidates, - CPlusPlus::NameAST *ast, unsigned argumentCount, + CPlusPlus::NameAST *ast, int argumentCount, FunctionKind functionKind); bool isTemplateClass(CPlusPlus::Symbol *s) const; @@ -201,7 +201,7 @@ private: QVector<Result> _usages; QList<CPlusPlus::Document::DiagnosticMessage> _diagMsgs; int _chunkSize; - unsigned _lineOfLastUsage; + int _lineOfLastUsage; QList<Result> _macroUses; }; diff --git a/src/plugins/cpptools/cppcodegen_test.cpp b/src/plugins/cpptools/cppcodegen_test.cpp index 01d8973904..088e55c9de 100644 --- a/src/plugins/cpptools/cppcodegen_test.cpp +++ b/src/plugins/cpptools/cppcodegen_test.cpp @@ -45,7 +45,7 @@ using namespace CppTools::Internal; namespace { Document::Ptr createDocument(const QString &filePath, const QByteArray &text, - unsigned expectedGlobalSymbolCount) + int expectedGlobalSymbolCount) { Document::Ptr document = Document::create(filePath); document->setUtf8Source(text); @@ -59,7 +59,7 @@ Document::Ptr createDocument(const QString &filePath, const QByteArray &text, Document::Ptr createDocumentAndFile(Tests::TemporaryDir *temporaryDir, const QByteArray relativeFilePath, const QByteArray text, - unsigned expectedGlobalSymbolCount) + int expectedGlobalSymbolCount) { QTC_ASSERT(temporaryDir, return Document::Ptr()); const QString absoluteFilePath = temporaryDir->createFile(relativeFilePath, text); @@ -80,13 +80,13 @@ void CppToolsPlugin::test_codegen_public_in_empty_class() "{\n" "};\n" "\n"; - Document::Ptr doc = createDocument(QLatin1String("public_in_empty_class"), src, 1U); + Document::Ptr doc = createDocument(QLatin1String("public_in_empty_class"), src, 1); QVERIFY(doc); Class *foo = doc->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); Snapshot snapshot; snapshot.insert(doc); @@ -99,8 +99,8 @@ void CppToolsPlugin::test_codegen_public_in_empty_class() QVERIFY(loc.isValid()); QCOMPARE(loc.prefix(), QLatin1String("public:\n")); QVERIFY(loc.suffix().isEmpty()); - QCOMPARE(loc.line(), 3U); - QCOMPARE(loc.column(), 1U); + QCOMPARE(loc.line(), 3); + QCOMPARE(loc.column(), 1); } /*! @@ -114,13 +114,13 @@ void CppToolsPlugin::test_codegen_public_in_nonempty_class() "public:\n" // line 3 "};\n" // line 4 "\n"; - Document::Ptr doc = createDocument(QLatin1String("public_in_nonempty_class"), src, 1U); + Document::Ptr doc = createDocument(QLatin1String("public_in_nonempty_class"), src, 1); QVERIFY(doc); Class *foo = doc->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); Snapshot snapshot; snapshot.insert(doc); @@ -133,8 +133,8 @@ void CppToolsPlugin::test_codegen_public_in_nonempty_class() QVERIFY(loc.isValid()); QVERIFY(loc.prefix().isEmpty()); QVERIFY(loc.suffix().isEmpty()); - QCOMPARE(loc.line(), 4U); - QCOMPARE(loc.column(), 1U); + QCOMPARE(loc.line(), 4); + QCOMPARE(loc.column(), 1); } /*! @@ -148,13 +148,13 @@ void CppToolsPlugin::test_codegen_public_before_protected() "protected:\n" // line 3 "};\n" "\n"; - Document::Ptr doc = createDocument(QLatin1String("public_before_protected"), src, 1U); + Document::Ptr doc = createDocument(QLatin1String("public_before_protected"), src, 1); QVERIFY(doc); Class *foo = doc->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); Snapshot snapshot; snapshot.insert(doc); @@ -167,8 +167,8 @@ void CppToolsPlugin::test_codegen_public_before_protected() QVERIFY(loc.isValid()); QCOMPARE(loc.prefix(), QLatin1String("public:\n")); QCOMPARE(loc.suffix(), QLatin1String("\n")); - QCOMPARE(loc.column(), 1U); - QCOMPARE(loc.line(), 3U); + QCOMPARE(loc.column(), 1); + QCOMPARE(loc.line(), 3); } /*! @@ -183,13 +183,13 @@ void CppToolsPlugin::test_codegen_private_after_protected() "protected:\n" // line 3 "};\n" "\n"; - Document::Ptr doc = createDocument(QLatin1String("private_after_protected"), src, 1U); + Document::Ptr doc = createDocument(QLatin1String("private_after_protected"), src, 1); QVERIFY(doc); Class *foo = doc->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); Snapshot snapshot; snapshot.insert(doc); @@ -202,8 +202,8 @@ void CppToolsPlugin::test_codegen_private_after_protected() QVERIFY(loc.isValid()); QCOMPARE(loc.prefix(), QLatin1String("private:\n")); QVERIFY(loc.suffix().isEmpty()); - QCOMPARE(loc.column(), 1U); - QCOMPARE(loc.line(), 4U); + QCOMPARE(loc.column(), 1); + QCOMPARE(loc.line(), 4); } /*! @@ -218,13 +218,13 @@ void CppToolsPlugin::test_codegen_protected_in_nonempty_class() "public:\n" // line 3 "};\n" // line 4 "\n"; - Document::Ptr doc = createDocument(QLatin1String("protected_in_nonempty_class"), src, 1U); + Document::Ptr doc = createDocument(QLatin1String("protected_in_nonempty_class"), src, 1); QVERIFY(doc); Class *foo = doc->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); Snapshot snapshot; snapshot.insert(doc); @@ -237,8 +237,8 @@ void CppToolsPlugin::test_codegen_protected_in_nonempty_class() QVERIFY(loc.isValid()); QCOMPARE(loc.prefix(), QLatin1String("protected:\n")); QVERIFY(loc.suffix().isEmpty()); - QCOMPARE(loc.column(), 1U); - QCOMPARE(loc.line(), 4U); + QCOMPARE(loc.column(), 1); + QCOMPARE(loc.line(), 4); } /*! @@ -253,13 +253,13 @@ void CppToolsPlugin::test_codegen_protected_between_public_and_private() "private:\n" // line 4 "};\n" // line 5 "\n"; - Document::Ptr doc = createDocument(QLatin1String("protected_betwee_public_and_private"), src, 1U); + Document::Ptr doc = createDocument(QLatin1String("protected_betwee_public_and_private"), src, 1); QVERIFY(doc); Class *foo = doc->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); Snapshot snapshot; snapshot.insert(doc); @@ -272,8 +272,8 @@ void CppToolsPlugin::test_codegen_protected_between_public_and_private() QVERIFY(loc.isValid()); QCOMPARE(loc.prefix(), QLatin1String("protected:\n")); QCOMPARE(loc.suffix(), QLatin1String("\n")); - QCOMPARE(loc.column(), 1U); - QCOMPARE(loc.line(), 4U); + QCOMPARE(loc.column(), 1); + QCOMPARE(loc.line(), 4); } /*! @@ -309,13 +309,13 @@ void CppToolsPlugin::test_codegen_qtdesigner_integration() "\n" "#endif // MAINWINDOW_H\n"; - Document::Ptr doc = createDocument(QLatin1String("qtdesigner_integration"), src, 2U); + Document::Ptr doc = createDocument(QLatin1String("qtdesigner_integration"), src, 2); QVERIFY(doc); Class *foo = doc->globalSymbolAt(1)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 10U); - QCOMPARE(foo->column(), 7U); + QCOMPARE(foo->line(), 10); + QCOMPARE(foo->column(), 7); Snapshot snapshot; snapshot.insert(doc); @@ -328,8 +328,8 @@ void CppToolsPlugin::test_codegen_qtdesigner_integration() QVERIFY(loc.isValid()); QCOMPARE(loc.prefix(), QLatin1String("private slots:\n")); QCOMPARE(loc.suffix(), QLatin1String("\n")); - QCOMPARE(loc.line(), 18U); - QCOMPARE(loc.column(), 1U); + QCOMPARE(loc.line(), 18); + QCOMPARE(loc.column(), 1); } void CppToolsPlugin::test_codegen_definition_empty_class() @@ -343,13 +343,13 @@ void CppToolsPlugin::test_codegen_definition_empty_class() "void foo();\n" // line 3 "};\n" "\n"; - Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1U); + Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1); QVERIFY(headerDocument); const QByteArray sourceText = "\n" "int x;\n" // line 1 "\n"; - Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 1U); + Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 1); QVERIFY(sourceDocument); Snapshot snapshot; @@ -358,13 +358,13 @@ void CppToolsPlugin::test_codegen_definition_empty_class() Class *foo = headerDocument->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); - QCOMPARE(foo->memberCount(), 1U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); + QCOMPARE(foo->memberCount(), 1); Declaration *decl = foo->memberAt(0)->asDeclaration(); QVERIFY(decl); - QCOMPARE(decl->line(), 3U); - QCOMPARE(decl->column(), 6U); + QCOMPARE(decl->line(), 3); + QCOMPARE(decl->column(), 6); CppRefactoringChanges changes(snapshot); InsertionPointLocator find(changes); @@ -374,8 +374,8 @@ void CppToolsPlugin::test_codegen_definition_empty_class() QCOMPARE(loc.fileName(), sourceDocument->fileName()); QCOMPARE(loc.prefix(), QLatin1String("\n\n")); QCOMPARE(loc.suffix(), QString()); - QCOMPARE(loc.line(), 3U); - QCOMPARE(loc.column(), 1U); + QCOMPARE(loc.line(), 3); + QCOMPARE(loc.column(), 1); } void CppToolsPlugin::test_codegen_definition_first_member() @@ -390,7 +390,7 @@ void CppToolsPlugin::test_codegen_definition_first_member() "void bar();\n" // line 4 "};\n" "\n"; - Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1U); + Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1); QVERIFY(headerDocument); const QByteArray sourceText = QString::fromLatin1( @@ -404,7 +404,7 @@ void CppToolsPlugin::test_codegen_definition_first_member() "}\n" "\n" "int y;\n").arg(temporaryDir.path()).toLatin1(); - Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 3U); + Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 3); QVERIFY(sourceDocument); sourceDocument->addIncludeFile(Document::Include(QLatin1String("file.h"), headerDocument->fileName(), 1, @@ -416,13 +416,13 @@ void CppToolsPlugin::test_codegen_definition_first_member() Class *foo = headerDocument->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); - QCOMPARE(foo->memberCount(), 2U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); + QCOMPARE(foo->memberCount(), 2); Declaration *decl = foo->memberAt(0)->asDeclaration(); QVERIFY(decl); - QCOMPARE(decl->line(), 3U); - QCOMPARE(decl->column(), 6U); + QCOMPARE(decl->line(), 3); + QCOMPARE(decl->column(), 6); CppRefactoringChanges changes(snapshot); InsertionPointLocator find(changes); @@ -430,8 +430,8 @@ void CppToolsPlugin::test_codegen_definition_first_member() QVERIFY(locList.size() == 1); InsertionLocation loc = locList.first(); QCOMPARE(loc.fileName(), sourceDocument->fileName()); - QCOMPARE(loc.line(), 4U); - QCOMPARE(loc.column(), 1U); + QCOMPARE(loc.line(), 4); + QCOMPARE(loc.column(), 1); QCOMPARE(loc.suffix(), QLatin1String("\n\n")); QCOMPARE(loc.prefix(), QString()); } @@ -448,7 +448,7 @@ void CppToolsPlugin::test_codegen_definition_last_member() "void bar();\n" // line 4 "};\n" "\n"; - Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1U); + Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1); QVERIFY(headerDocument); const QByteArray sourceText = QString::fromLatin1( @@ -463,7 +463,7 @@ void CppToolsPlugin::test_codegen_definition_last_member() "\n" "int y;\n").arg(temporaryDir.path()).toLatin1(); - Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 3U); + Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 3); QVERIFY(sourceDocument); sourceDocument->addIncludeFile(Document::Include(QLatin1String("file.h"), headerDocument->fileName(), 1, @@ -475,13 +475,13 @@ void CppToolsPlugin::test_codegen_definition_last_member() Class *foo = headerDocument->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); - QCOMPARE(foo->memberCount(), 2U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); + QCOMPARE(foo->memberCount(), 2); Declaration *decl = foo->memberAt(1)->asDeclaration(); QVERIFY(decl); - QCOMPARE(decl->line(), 4U); - QCOMPARE(decl->column(), 6U); + QCOMPARE(decl->line(), 4); + QCOMPARE(decl->column(), 6); CppRefactoringChanges changes(snapshot); InsertionPointLocator find(changes); @@ -489,8 +489,8 @@ void CppToolsPlugin::test_codegen_definition_last_member() QVERIFY(locList.size() == 1); InsertionLocation loc = locList.first(); QCOMPARE(loc.fileName(), sourceDocument->fileName()); - QCOMPARE(loc.line(), 7U); - QCOMPARE(loc.column(), 2U); + QCOMPARE(loc.line(), 7); + QCOMPARE(loc.column(), 2); QCOMPARE(loc.prefix(), QLatin1String("\n\n")); QCOMPARE(loc.suffix(), QString()); } @@ -509,7 +509,7 @@ void CppToolsPlugin::test_codegen_definition_middle_member() "};\n" "\n"; - Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1U); + Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1); QVERIFY(headerDocument); const QByteArray sourceText = QString::fromLatin1( @@ -529,7 +529,7 @@ void CppToolsPlugin::test_codegen_definition_middle_member() "\n" "int y;\n").arg(Utils::TemporaryDirectory::masterDirectoryPath()).toLatin1(); - Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 4U); + Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 4); QVERIFY(sourceDocument); sourceDocument->addIncludeFile(Document::Include(QLatin1String("file.h"), headerDocument->fileName(), 1, @@ -541,13 +541,13 @@ void CppToolsPlugin::test_codegen_definition_middle_member() Class *foo = headerDocument->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); - QCOMPARE(foo->memberCount(), 3U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); + QCOMPARE(foo->memberCount(), 3); Declaration *decl = foo->memberAt(1)->asDeclaration(); QVERIFY(decl); - QCOMPARE(decl->line(), 4U); - QCOMPARE(decl->column(), 6U); + QCOMPARE(decl->line(), 4); + QCOMPARE(decl->column(), 6); CppRefactoringChanges changes(snapshot); InsertionPointLocator find(changes); @@ -555,8 +555,8 @@ void CppToolsPlugin::test_codegen_definition_middle_member() QVERIFY(locList.size() == 1); InsertionLocation loc = locList.first(); QCOMPARE(loc.fileName(), sourceDocument->fileName()); - QCOMPARE(loc.line(), 7U); - QCOMPARE(loc.column(), 2U); + QCOMPARE(loc.line(), 7); + QCOMPARE(loc.column(), 2); QCOMPARE(loc.prefix(), QLatin1String("\n\n")); QCOMPARE(loc.suffix(), QString()); } @@ -575,7 +575,7 @@ void CppToolsPlugin::test_codegen_definition_middle_member_surrounded_by_undefin "void car();\n" // line 6 "};\n" "\n"; - Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1U); + Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 1); QVERIFY(headerDocument); const QByteArray sourceText = QString::fromLatin1( @@ -589,7 +589,7 @@ void CppToolsPlugin::test_codegen_definition_middle_member_surrounded_by_undefin "}\n" "\n" "int y;\n").arg(temporaryDir.path()).toLatin1(); - Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 3U); + Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 3); QVERIFY(sourceDocument); sourceDocument->addIncludeFile(Document::Include(QLatin1String("file.h"), headerDocument->fileName(), 1, @@ -601,13 +601,13 @@ void CppToolsPlugin::test_codegen_definition_middle_member_surrounded_by_undefin Class *foo = headerDocument->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); - QCOMPARE(foo->memberCount(), 4U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); + QCOMPARE(foo->memberCount(), 4); Declaration *decl = foo->memberAt(1)->asDeclaration(); QVERIFY(decl); - QCOMPARE(decl->line(), 4U); - QCOMPARE(decl->column(), 6U); + QCOMPARE(decl->line(), 4); + QCOMPARE(decl->column(), 6); CppRefactoringChanges changes(snapshot); InsertionPointLocator find(changes); @@ -615,8 +615,8 @@ void CppToolsPlugin::test_codegen_definition_middle_member_surrounded_by_undefin QVERIFY(locList.size() == 1); InsertionLocation loc = locList.first(); QCOMPARE(loc.fileName(), sourceDocument->fileName()); - QCOMPARE(loc.line(), 4U); - QCOMPARE(loc.column(), 1U); + QCOMPARE(loc.line(), 4); + QCOMPARE(loc.column(), 1); QCOMPARE(loc.prefix(), QString()); QCOMPARE(loc.suffix(), QLatin1String("\n\n")); } @@ -638,7 +638,7 @@ void CppToolsPlugin::test_codegen_definition_member_specific_file() "{\n" "\n" "}\n"; - Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 2U); + Document::Ptr headerDocument = createDocumentAndFile(&temporaryDir, "file.h", headerText, 2); QVERIFY(headerDocument); const QByteArray sourceText = QString::fromLatin1( @@ -652,7 +652,7 @@ void CppToolsPlugin::test_codegen_definition_member_specific_file() "}\n" // line 7 "\n" "int y;\n").arg(temporaryDir.path()).toLatin1(); - Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 3U); + Document::Ptr sourceDocument = createDocumentAndFile(&temporaryDir, "file.cpp", sourceText, 3); QVERIFY(sourceDocument); sourceDocument->addIncludeFile(Document::Include(QLatin1String("file.h"), headerDocument->fileName(), 1, @@ -664,13 +664,13 @@ void CppToolsPlugin::test_codegen_definition_member_specific_file() Class *foo = headerDocument->globalSymbolAt(0)->asClass(); QVERIFY(foo); - QCOMPARE(foo->line(), 1U); - QCOMPARE(foo->column(), 7U); - QCOMPARE(foo->memberCount(), 3U); + QCOMPARE(foo->line(), 1); + QCOMPARE(foo->column(), 7); + QCOMPARE(foo->memberCount(), 3); Declaration *decl = foo->memberAt(2)->asDeclaration(); QVERIFY(decl); - QCOMPARE(decl->line(), 5U); - QCOMPARE(decl->column(), 6U); + QCOMPARE(decl->line(), 5); + QCOMPARE(decl->column(), 6); CppRefactoringChanges changes(snapshot); InsertionPointLocator find(changes); @@ -678,8 +678,8 @@ void CppToolsPlugin::test_codegen_definition_member_specific_file() QVERIFY(locList.size() == 1); InsertionLocation loc = locList.first(); QCOMPARE(loc.fileName(), sourceDocument->fileName()); - QCOMPARE(loc.line(), 7U); - QCOMPARE(loc.column(), 2U); + QCOMPARE(loc.line(), 7); + QCOMPARE(loc.column(), 2); QCOMPARE(loc.prefix(), QLatin1String("\n\n")); QCOMPARE(loc.suffix(), QString()); } diff --git a/src/plugins/cpptools/cppcodemodelinspectordumper.cpp b/src/plugins/cpptools/cppcodemodelinspectordumper.cpp index efde14abc4..23a3d1e034 100644 --- a/src/plugins/cpptools/cppcodemodelinspectordumper.cpp +++ b/src/plugins/cpptools/cppcodemodelinspectordumper.cpp @@ -53,6 +53,11 @@ QString Utils::toString(bool value) return value ? QLatin1String("Yes") : QLatin1String("No"); } +QString Utils::toString(int value) +{ + return QString::number(value); +} + QString Utils::toString(unsigned value) { return QString::number(value); diff --git a/src/plugins/cpptools/cppcodemodelinspectordumper.h b/src/plugins/cpptools/cppcodemodelinspectordumper.h index 41d294e817..9e30903d7f 100644 --- a/src/plugins/cpptools/cppcodemodelinspectordumper.h +++ b/src/plugins/cpptools/cppcodemodelinspectordumper.h @@ -42,6 +42,7 @@ namespace CppCodeModelInspector { struct CPPTOOLS_EXPORT Utils { static QString toString(bool value); + static QString toString(int value); static QString toString(unsigned value); static QString toString(const QDateTime &dateTime); static QString toString(CPlusPlus::Document::CheckMode checkMode); diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index b51f833afe..0a7624576a 100644 --- a/src/plugins/cpptools/cppcompletionassist.cpp +++ b/src/plugins/cpptools/cppcompletionassist.cpp @@ -1203,7 +1203,7 @@ void InternalCppCompletionAssistProcessor::completeObjCMsgSend(ClassOrNamespace } foreach (Scope *scope, memberScopes) { - for (unsigned i = 0; i < scope->memberCount(); ++i) { + for (int i = 0; i < scope->memberCount(); ++i) { Symbol *symbol = scope->memberAt(i); if (ObjCMethod *method = symbol->type()->asObjCMethodType()) { @@ -1214,7 +1214,7 @@ void InternalCppCompletionAssistProcessor::completeObjCMsgSend(ClassOrNamespace QString text; QString data; if (selectorName->hasArguments()) { - for (unsigned i = 0; i < selectorName->nameCount(); ++i) { + for (int i = 0; i < selectorName->nameCount(); ++i) { if (i > 0) text += QLatin1Char(' '); Symbol *arg = method->argumentAt(i); @@ -1320,8 +1320,8 @@ bool InternalCppCompletionAssistProcessor::objcKeywordsWanted() const } int InternalCppCompletionAssistProcessor::startCompletionInternal(const QString &fileName, - unsigned line, - unsigned positionInBlock, + int line, + int positionInBlock, const QString &expr, int endOfExpression) { @@ -1467,7 +1467,7 @@ bool InternalCppCompletionAssistProcessor::globalCompletion(Scope *currentScope) for (Scope *scope = currentScope; scope; scope = scope->enclosingScope()) { if (Block *block = scope->asBlock()) { if (ClassOrNamespace *binding = context.lookupType(scope)) { - for (unsigned i = 0; i < scope->memberCount(); ++i) { + for (int i = 0; i < scope->memberCount(); ++i) { Symbol *member = scope->memberAt(i); if (member->isEnum()) { if (ClassOrNamespace *b = binding->findBlock(block)) @@ -1494,13 +1494,13 @@ bool InternalCppCompletionAssistProcessor::globalCompletion(Scope *currentScope) for (Scope *scope = currentScope; scope; scope = scope->enclosingScope()) { if (scope->isBlock()) { - for (unsigned i = 0; i < scope->memberCount(); ++i) + for (int i = 0; i < scope->memberCount(); ++i) addCompletionItem(scope->memberAt(i), FunctionLocalsOrder); } else if (Function *fun = scope->asFunction()) { - for (unsigned i = 0, argc = fun->argumentCount(); i < argc; ++i) + for (int i = 0, argc = fun->argumentCount(); i < argc; ++i) addCompletionItem(fun->argumentAt(i), FunctionArgumentsOrder); } else if (Template *templ = scope->asTemplate()) { - for (unsigned i = 0, argc = templ->templateParameterCount(); i < argc; ++i) + for (int i = 0, argc = templ->templateParameterCount(); i < argc; ++i) addCompletionItem(templ->templateParameterAt(i), FunctionArgumentsOrder); break; } @@ -1799,7 +1799,7 @@ bool InternalCppCompletionAssistProcessor::completeQtMethod(const QList<LookupIt if (!klass) continue; - for (unsigned i = 0; i < scope->memberCount(); ++i) { + for (int i = 0; i < scope->memberCount(); ++i) { Symbol *member = scope->memberAt(i); Function *fun = member->type()->asFunctionType(); if (!fun || fun->isGenerated()) @@ -1809,7 +1809,7 @@ bool InternalCppCompletionAssistProcessor::completeQtMethod(const QList<LookupIt else if (!wantSignals && type == CompleteQt4Slots && !fun->isSlot()) continue; - unsigned count = fun->argumentCount(); + int count = fun->argumentCount(); while (true) { const QString completionText = wantQt5SignalOrSlot ? createQt5SignalOrSlot(fun, o) @@ -1937,7 +1937,7 @@ bool InternalCppCompletionAssistProcessor::completeConstructorOrFunction(const Q if (!className) continue; // nothing to do for anonymous classes. - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { Symbol *member = klass->memberAt(i); const Name *memberName = member->name(); diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h index 7213271263..5afdc43593 100644 --- a/src/plugins/cpptools/cppcompletionassist.h +++ b/src/plugins/cpptools/cppcompletionassist.h @@ -111,7 +111,7 @@ private: bool tryObjCCompletion(); bool objcKeywordsWanted() const; int startCompletionInternal(const QString &fileName, - unsigned line, unsigned positionInBlock, + int line, int positionInBlock, const QString &expression, int endOfExpression); diff --git a/src/plugins/cpptools/cppcursorinfo.h b/src/plugins/cpptools/cppcursorinfo.h index d9da2541d3..233fdeac26 100644 --- a/src/plugins/cpptools/cppcursorinfo.h +++ b/src/plugins/cpptools/cppcursorinfo.h @@ -46,16 +46,16 @@ class CPPTOOLS_EXPORT CursorInfo public: struct Range { Range() = default; - Range(unsigned line, unsigned column, unsigned length) + Range(int line, int column, int length) : line(line) , column(column) , length(length) { } - unsigned line = 0; // 1-based - unsigned column = 0; // 1-based - unsigned length = 0; + int line = 0; // 1-based + int column = 0; // 1-based + int length = 0; }; using Ranges = QVector<Range>; diff --git a/src/plugins/cpptools/cppelementevaluator.cpp b/src/plugins/cpptools/cppelementevaluator.cpp index 88ffc3c075..b59bf3380d 100644 --- a/src/plugins/cpptools/cppelementevaluator.cpp +++ b/src/plugins/cpptools/cppelementevaluator.cpp @@ -397,7 +397,7 @@ void CppElementEvaluator::checkDiagnosticMessage(int pos) } } -bool CppElementEvaluator::matchIncludeFile(const Document::Ptr &document, unsigned line) +bool CppElementEvaluator::matchIncludeFile(const Document::Ptr &document, int line) { foreach (const Document::Include &includeFile, document->resolvedIncludes()) { if (includeFile.line() == line) { @@ -408,11 +408,11 @@ bool CppElementEvaluator::matchIncludeFile(const Document::Ptr &document, unsign return false; } -bool CppElementEvaluator::matchMacroInUse(const Document::Ptr &document, unsigned pos) +bool CppElementEvaluator::matchMacroInUse(const Document::Ptr &document, int pos) { foreach (const Document::MacroUse &use, document->macroUses()) { if (use.containsUtf16charOffset(pos)) { - const unsigned begin = use.utf16charsBegin(); + const int begin = use.utf16charsBegin(); if (pos < begin + use.macro().nameToQString().size()) { m_element = QSharedPointer<CppElement>(new CppMacro(use.macro())); return true; diff --git a/src/plugins/cpptools/cppelementevaluator.h b/src/plugins/cpptools/cppelementevaluator.h index 13950a09cc..6ce518a2e1 100644 --- a/src/plugins/cpptools/cppelementevaluator.h +++ b/src/plugins/cpptools/cppelementevaluator.h @@ -65,8 +65,8 @@ public: private: void clear(); void checkDiagnosticMessage(int pos); - bool matchIncludeFile(const CPlusPlus::Document::Ptr &document, unsigned line); - bool matchMacroInUse(const CPlusPlus::Document::Ptr &document, unsigned pos); + bool matchIncludeFile(const CPlusPlus::Document::Ptr &document, int line); + bool matchMacroInUse(const CPlusPlus::Document::Ptr &document, int pos); void handleLookupItemMatch(const CPlusPlus::Snapshot &snapshot, const CPlusPlus::LookupItem &lookupItem, const CPlusPlus::LookupContext &lookupContext, diff --git a/src/plugins/cpptools/cppfollowsymbolundercursor.cpp b/src/plugins/cpptools/cppfollowsymbolundercursor.cpp index 5ec6b572a2..9a66467951 100644 --- a/src/plugins/cpptools/cppfollowsymbolundercursor.cpp +++ b/src/plugins/cpptools/cppfollowsymbolundercursor.cpp @@ -353,7 +353,7 @@ Link attemptFuncDeclDef(const QTextCursor &cursor, Snapshot snapshot, if (target) { result = target->toLink(); - unsigned startLine, startColumn, endLine, endColumn; + int startLine, startColumn, endLine, endColumn; document->translationUnit()->getTokenStartPosition(name->firstToken(), &startLine, &startColumn); document->translationUnit()->getTokenEndPosition(name->lastToken() - 1, &endLine, @@ -540,8 +540,7 @@ void FollowSymbolUnderCursor::findLink( for (int i = 0; i < tokens.size(); ++i) { const Token &tk = tokens.at(i); - if (static_cast<unsigned>(positionInBlock) >= tk.utf16charsBegin() - && static_cast<unsigned>(positionInBlock) < tk.utf16charsEnd()) { + if (positionInBlock >= tk.utf16charsBegin() && positionInBlock < tk.utf16charsEnd()) { int closingParenthesisPos = tokens.size(); if (i >= 2 && tokens.at(i).is(T_IDENTIFIER) && tokens.at(i - 1).is(T_LPAREN) && (tokens.at(i - 2).is(T_SIGNAL) || tokens.at(i - 2).is(T_SLOT))) { @@ -583,8 +582,7 @@ void FollowSymbolUnderCursor::findLink( // In this case we want to look at one token before the current position to recognize // an operator if the cursor is inside the actual operator: operator[$] - if (static_cast<unsigned>(positionInBlock) >= tk.utf16charsBegin() - && static_cast<unsigned>(positionInBlock) <= tk.utf16charsEnd()) { + if (positionInBlock >= tk.utf16charsBegin() && positionInBlock <= tk.utf16charsEnd()) { cursorRegionReached = true; if (tk.is(T_OPERATOR)) { link = attemptFuncDeclDef(cursor, theSnapshot, @@ -633,7 +631,7 @@ void FollowSymbolUnderCursor::findLink( // Handle include directives if (tk.is(T_STRING_LITERAL) || tk.is(T_ANGLE_STRING_LITERAL)) { - const unsigned lineno = cursor.blockNumber() + 1; + const int lineno = cursor.blockNumber() + 1; foreach (const Document::Include &incl, doc->resolvedIncludes()) { if (incl.line() == lineno) { link.targetFileName = incl.resolvedFileName(); @@ -697,8 +695,7 @@ void FollowSymbolUnderCursor::findLink( if (d->isDeclaration() || d->isFunction()) { const QString fileName = QString::fromUtf8(d->fileName(), d->fileNameLength()); if (data.filePath().toString() == fileName) { - if (static_cast<unsigned>(line) == d->line() - && static_cast<unsigned>(positionInBlock) >= d->column()) { + if (line == d->line() && positionInBlock >= d->column()) { // TODO: check the end result = r; // take the symbol under cursor. break; @@ -709,9 +706,9 @@ void FollowSymbolUnderCursor::findLink( int tokenBeginColumnNumber = 0; Utils::Text::convertPosition(document, beginOfToken, &tokenBeginLineNumber, &tokenBeginColumnNumber); - if (static_cast<unsigned>(tokenBeginLineNumber) > d->line() - || (static_cast<unsigned>(tokenBeginLineNumber) == d->line() - && static_cast<unsigned>(tokenBeginColumnNumber) >= d->column())) { + if (tokenBeginLineNumber > d->line() + || (tokenBeginLineNumber == d->line() + && tokenBeginColumnNumber >= d->column())) { result = r; // take the symbol under cursor. break; } diff --git a/src/plugins/cpptools/cpplocalsymbols.cpp b/src/plugins/cpptools/cpplocalsymbols.cpp index feec5dc606..36ce87ce49 100644 --- a/src/plugins/cpptools/cpplocalsymbols.cpp +++ b/src/plugins/cpptools/cpplocalsymbols.cpp @@ -71,14 +71,14 @@ protected: { _scopeStack.append(scope); - for (unsigned i = 0; i < scope->memberCount(); ++i) { + for (int i = 0; i < scope->memberCount(); ++i) { if (Symbol *member = scope->memberAt(i)) { if (member->isTypedef()) continue; if (!member->isGenerated() && (member->isDeclaration() || member->isArgument())) { if (member->name() && member->name()->isNameId()) { const Token token = tokenAt(member->sourceLocation()); - unsigned line, column; + int line, column; getPosition(token.utf16charsBegin(), &line, &column); localUses[member].append( HighlightingResult(line, column, token.utf16chars(), @@ -89,7 +89,7 @@ protected: } } - bool checkLocalUse(NameAST *nameAst, unsigned firstToken) + bool checkLocalUse(NameAST *nameAst, int firstToken) { if (SimpleNameAST *simpleName = nameAst->asSimpleName()) { const Token token = tokenAt(simpleName->identifier_token); @@ -102,7 +102,7 @@ protected: continue; if (!member->isGenerated() && (member->sourceLocation() < firstToken || member->enclosingScope()->isFunction())) { - unsigned line, column; + int line, column; getTokenStartPosition(simpleName->identifier_token, &line, &column); localUses[member].append( HighlightingResult(line, column, token.utf16chars(), diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index fad91b3d4a..be6791738b 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -498,7 +498,7 @@ void CppToolsPlugin::test_modelmanager_refresh_timeStampModified_if_sourcefiles_ document = snapshot.document(fileToChange); const QDateTime lastModifiedBefore = document->lastModified(); - QCOMPARE(document->globalSymbolCount(), 1U); + QCOMPARE(document->globalSymbolCount(), 1); QCOMPARE(document->globalSymbolAt(0)->name()->identifier()->chars(), "someGlobal"); // Modify the file @@ -527,7 +527,7 @@ void CppToolsPlugin::test_modelmanager_refresh_timeStampModified_if_sourcefiles_ document = snapshot.document(fileToChange); const QDateTime lastModifiedAfter = document->lastModified(); QVERIFY(lastModifiedAfter > lastModifiedBefore); - QCOMPARE(document->globalSymbolCount(), 2U); + QCOMPARE(document->globalSymbolCount(), 2); QCOMPARE(document->globalSymbolAt(0)->name()->identifier()->chars(), "someGlobal"); QCOMPARE(document->globalSymbolAt(1)->name()->identifier()->chars(), "addedOtherGlobal"); } diff --git a/src/plugins/cpptools/cppoverviewmodel.cpp b/src/plugins/cpptools/cppoverviewmodel.cpp index e0fc805698..6fd9b161dc 100644 --- a/src/plugins/cpptools/cppoverviewmodel.cpp +++ b/src/plugins/cpptools/cppoverviewmodel.cpp @@ -82,8 +82,8 @@ QVariant SymbolItem::data(int /*column*/, int role) const if (Template *t = symbl->asTemplate()) if (Symbol *templateDeclaration = t->declaration()) { QStringList parameters; - parameters.reserve(static_cast<int>(t->templateParameterCount())); - for (unsigned i = 0; i < t->templateParameterCount(); ++i) { + parameters.reserve(t->templateParameterCount()); + for (int i = 0; i < t->templateParameterCount(); ++i) { parameters.append(overviewModel->_overview.prettyName( t->templateParameterAt(i)->name())); } @@ -119,7 +119,7 @@ QVariant SymbolItem::data(int /*column*/, int role) const return Icons::iconForSymbol(symbol); case AbstractOverviewModel::FileNameRole: - return QString::fromUtf8(symbol->fileName(), static_cast<int>(symbol->fileNameLength())); + return QString::fromUtf8(symbol->fileName(), symbol->fileNameLength()); case AbstractOverviewModel::LineNumberRole: return symbol->line(); @@ -135,15 +135,15 @@ bool OverviewModel::hasDocument() const return _cppDocument; } -unsigned OverviewModel::globalSymbolCount() const +int OverviewModel::globalSymbolCount() const { - unsigned count = 0; + int count = 0; if (_cppDocument) count += _cppDocument->globalSymbolCount(); return count; } -Symbol *OverviewModel::globalSymbolAt(unsigned index) const +Symbol *OverviewModel::globalSymbolAt(int index) const { return _cppDocument->globalSymbolAt(index); } Symbol *OverviewModel::symbolFromIndex(const QModelIndex &index) const @@ -185,8 +185,8 @@ Utils::LineColumn OverviewModel::lineColumnFromIndex(const QModelIndex &sourceIn CPlusPlus::Symbol *symbol = symbolFromIndex(sourceIndex); if (!symbol) return lineColumn; - lineColumn.line = static_cast<int>(symbol->line()); - lineColumn.column = static_cast<int>(symbol->column()); + lineColumn.line = symbol->line(); + lineColumn.column = symbol->column(); return lineColumn; } @@ -202,8 +202,8 @@ void OverviewModel::buildTree(SymbolItem *root, bool isRoot) return; if (isRoot) { - unsigned rows = globalSymbolCount(); - for (unsigned row = 0; row < rows; ++row) { + int rows = globalSymbolCount(); + for (int row = 0; row < rows; ++row) { Symbol *symbol = globalSymbolAt(row); auto currentItem = new SymbolItem(symbol); buildTree(currentItem, false); diff --git a/src/plugins/cpptools/cppoverviewmodel.h b/src/plugins/cpptools/cppoverviewmodel.h index 44a45ace36..4d06427395 100644 --- a/src/plugins/cpptools/cppoverviewmodel.h +++ b/src/plugins/cpptools/cppoverviewmodel.h @@ -59,8 +59,8 @@ public: private: CPlusPlus::Symbol *symbolFromIndex(const QModelIndex &index) const; bool hasDocument() const; - unsigned globalSymbolCount() const; - CPlusPlus::Symbol *globalSymbolAt(unsigned index) const; + int globalSymbolCount() const; + CPlusPlus::Symbol *globalSymbolAt(int index) const; void buildTree(SymbolItem *root, bool isRoot); private: diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter.cpp index 853e563424..82df823af1 100644 --- a/src/plugins/cpptools/cpppointerdeclarationformatter.cpp +++ b/src/plugins/cpptools/cpppointerdeclarationformatter.cpp @@ -377,7 +377,7 @@ void PointerDeclarationFormatter::checkAndRewrite(DeclaratorAST *declarator, CHECK_R(symbol, "No symbol"); // Check for expanded tokens - for (unsigned token = tokenRange.start; token <= tokenRange.end; ++token) + for (int token = tokenRange.start; token <= tokenRange.end; ++token) CHECK_R(!tokenAt(token).expanded(), "Token is expanded"); Utils::ChangeSet::Range range(m_cppRefactoringFile->startOf(tokenRange.start), @@ -455,7 +455,7 @@ void PointerDeclarationFormatter::printCandidate(AST *ast) { #if DEBUG_OUTPUT QString tokens; - for (unsigned token = ast->firstToken(); token < ast->lastToken(); token++) + for (int token = ast->firstToken(); token < ast->lastToken(); token++) tokens += QString::fromLatin1(tokenAt(token).spell()) + QLatin1Char(' '); # ifdef __GNUC__ diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.h b/src/plugins/cpptools/cpppointerdeclarationformatter.h index 20ed9557bc..e965d89774 100644 --- a/src/plugins/cpptools/cpppointerdeclarationformatter.h +++ b/src/plugins/cpptools/cpppointerdeclarationformatter.h @@ -101,9 +101,9 @@ private: class TokenRange { public: TokenRange() = default; - TokenRange(unsigned start, unsigned end) : start(start), end(end) {} - unsigned start = 0; - unsigned end = 0; + TokenRange(int start, int end) : start(start), end(end) {} + int start = 0; + int end = 0; }; void processIfWhileForStatement(ExpressionAST *expression, Symbol *symbol); diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp index f3c27073a9..4d16dd4813 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.cpp +++ b/src/plugins/cpptools/cpprefactoringchanges.cpp @@ -159,7 +159,7 @@ void CppRefactoringFile::setCppDocument(Document::Ptr document) Scope *CppRefactoringFile::scopeAt(unsigned index) const { - unsigned line, column; + int line, column; cppDocument()->translationUnit()->getTokenStartPosition(index, &line, &column); return cppDocument()->scopeAt(line, column); } @@ -195,10 +195,10 @@ bool CppRefactoringFile::isCursorOn(const AST *ast) const Utils::ChangeSet::Range CppRefactoringFile::range(unsigned tokenIndex) const { const Token &token = tokenAt(tokenIndex); - unsigned line, column; + int line, column; cppDocument()->translationUnit()->getPosition(token.utf16charsBegin(), &line, &column); const int start = document()->findBlockByNumber(line - 1).position() + column - 1; - return {start, static_cast<int>(start + token.utf16chars())}; + return {start, start + token.utf16chars()}; } Utils::ChangeSet::Range CppRefactoringFile::range(AST *ast) const @@ -208,7 +208,7 @@ Utils::ChangeSet::Range CppRefactoringFile::range(AST *ast) const int CppRefactoringFile::startOf(unsigned index) const { - unsigned line, column; + int line, column; cppDocument()->translationUnit()->getPosition(tokenAt(index).utf16charsBegin(), &line, &column); return document()->findBlockByNumber(line - 1).position() + column - 1; } @@ -220,21 +220,21 @@ int CppRefactoringFile::startOf(const AST *ast) const int CppRefactoringFile::endOf(unsigned index) const { - unsigned line, column; + int line, column; cppDocument()->translationUnit()->getPosition(tokenAt(index).utf16charsEnd(), &line, &column); return document()->findBlockByNumber(line - 1).position() + column - 1; } int CppRefactoringFile::endOf(const AST *ast) const { - unsigned end = ast->lastToken(); + int end = ast->lastToken(); QTC_ASSERT(end > 0, return -1); return endOf(end - 1); } void CppRefactoringFile::startAndEndOf(unsigned index, int *start, int *end) const { - unsigned line, column; + int line, column; Token token(tokenAt(index)); cppDocument()->translationUnit()->getPosition(token.utf16charsBegin(), &line, &column); *start = document()->findBlockByNumber(line - 1).position() + column - 1; diff --git a/src/plugins/cpptools/cppselectionchanger.cpp b/src/plugins/cpptools/cppselectionchanger.cpp index 98437c1ced..3159f16eb3 100644 --- a/src/plugins/cpptools/cppselectionchanger.cpp +++ b/src/plugins/cpptools/cppselectionchanger.cpp @@ -136,13 +136,12 @@ int CppSelectionChanger::getTokenStartCursorPosition( unsigned tokenIndex, const QTextCursor &cursor) const { - unsigned startLine, startColumn; + int startLine, startColumn; m_unit->getTokenStartPosition(tokenIndex, &startLine, &startColumn); const QTextDocument *document = cursor.document(); - const int startPosition = - document->findBlockByNumber(static_cast<int>(startLine) - 1).position() - + static_cast<int>(startColumn) - 1; + const int startPosition = document->findBlockByNumber(startLine - 1).position() + + startColumn - 1; return startPosition; } @@ -151,13 +150,12 @@ int CppSelectionChanger::getTokenEndCursorPosition( unsigned tokenIndex, const QTextCursor &cursor) const { - unsigned endLine, endColumn; + int endLine, endColumn; m_unit->getTokenEndPosition(tokenIndex, &endLine, &endColumn); const QTextDocument *document = cursor.document(); - const int endPosition = - document->findBlockByNumber(static_cast<int>(endLine) - 1).position() - + static_cast<int>(endColumn) - 1; + const int endPosition = document->findBlockByNumber(endLine - 1).position() + + endColumn - 1; return endPosition; } @@ -167,7 +165,7 @@ void CppSelectionChanger::printTokenDebugInfo( const QTextCursor &cursor, QString prefix) const { - unsigned line, column; + int line, column; const Token token = m_unit->tokenAt(tokenIndex); m_unit->getTokenStartPosition(tokenIndex, &line, &column); const int startPos = getTokenStartCursorPosition(tokenIndex, cursor); @@ -571,7 +569,7 @@ void CppSelectionChanger::fineTuneASTNodePositions(ASTNodePositions &positions) // Start position will be the end position minus the size of the actual contents of the // literal. - int newPosStart = newPosEnd - static_cast<int>(firstToken.string->size()); + int newPosStart = newPosEnd - firstToken.string->size(); // Skip raw literal parentheses. if (isRawLiteral) @@ -591,7 +589,7 @@ void CppSelectionChanger::fineTuneASTNodePositions(ASTNodePositions &positions) qDebug() << "Selecting inner contents of char literal."; positions.astPosEnd = positions.astPosEnd - 1; - positions.astPosStart = positions.astPosEnd - int(firstToken.literal->size()); + positions.astPosStart = positions.astPosEnd - firstToken.literal->size(); } } } else if (ForStatementAST *forStatementAST = ast->asForStatement()) { diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp index 35a0ccf529..7f232c1ad7 100644 --- a/src/plugins/cpptools/cppsourceprocessor.cpp +++ b/src/plugins/cpptools/cppsourceprocessor.cpp @@ -324,8 +324,8 @@ void CppSourceProcessor::macroAdded(const CPlusPlus::Macro ¯o) m_currentDoc->appendMacro(macro); } -void CppSourceProcessor::passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const CPlusPlus::Macro ¯o) +void CppSourceProcessor::passedMacroDefinitionCheck(int bytesOffset, int utf16charsOffset, + int line, const CPlusPlus::Macro ¯o) { if (!m_currentDoc) return; @@ -336,7 +336,7 @@ void CppSourceProcessor::passedMacroDefinitionCheck(unsigned bytesOffset, unsign line, QVector<MacroArgumentReference>()); } -void CppSourceProcessor::failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset, +void CppSourceProcessor::failedMacroDefinitionCheck(int bytesOffset, int utf16charOffset, const ByteArrayRef &name) { if (!m_currentDoc) @@ -346,8 +346,8 @@ void CppSourceProcessor::failedMacroDefinitionCheck(unsigned bytesOffset, unsign bytesOffset, utf16charOffset); } -void CppSourceProcessor::notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset, - unsigned line, const CPlusPlus::Macro ¯o) +void CppSourceProcessor::notifyMacroReference(int bytesOffset, int utf16charOffset, + int line, const CPlusPlus::Macro ¯o) { if (!m_currentDoc) return; @@ -358,8 +358,8 @@ void CppSourceProcessor::notifyMacroReference(unsigned bytesOffset, unsigned utf line, QVector<MacroArgumentReference>()); } -void CppSourceProcessor::startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset, - unsigned line, const CPlusPlus::Macro ¯o, +void CppSourceProcessor::startExpandingMacro(int bytesOffset, int utf16charOffset, + int line, const CPlusPlus::Macro ¯o, const QVector<MacroArgumentReference> &actuals) { if (!m_currentDoc) @@ -371,7 +371,7 @@ void CppSourceProcessor::startExpandingMacro(unsigned bytesOffset, unsigned utf1 line, actuals); } -void CppSourceProcessor::stopExpandingMacro(unsigned, const CPlusPlus::Macro &) +void CppSourceProcessor::stopExpandingMacro(int, const CPlusPlus::Macro &) { if (!m_currentDoc) return; @@ -409,19 +409,19 @@ void CppSourceProcessor::mergeEnvironment(Document::Ptr doc) m_env.addMacros(doc->definedMacros()); } -void CppSourceProcessor::startSkippingBlocks(unsigned utf16charsOffset) +void CppSourceProcessor::startSkippingBlocks(int utf16charsOffset) { if (m_currentDoc) m_currentDoc->startSkippingBlocks(utf16charsOffset); } -void CppSourceProcessor::stopSkippingBlocks(unsigned utf16charsOffset) +void CppSourceProcessor::stopSkippingBlocks(int utf16charsOffset) { if (m_currentDoc) m_currentDoc->stopSkippingBlocks(utf16charsOffset); } -void CppSourceProcessor::sourceNeeded(unsigned line, const QString &fileName, IncludeType type, +void CppSourceProcessor::sourceNeeded(int line, const QString &fileName, IncludeType type, const QStringList &initialIncludes) { if (fileName.isEmpty()) diff --git a/src/plugins/cpptools/cppsourceprocessor.h b/src/plugins/cpptools/cppsourceprocessor.h index de6ea7928a..faa5a266c8 100644 --- a/src/plugins/cpptools/cppsourceprocessor.h +++ b/src/plugins/cpptools/cppsourceprocessor.h @@ -93,20 +93,20 @@ private: // Client interface void macroAdded(const CPlusPlus::Macro ¯o) override; - void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const CPlusPlus::Macro ¯o) override; - void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset, + void passedMacroDefinitionCheck(int bytesOffset, int utf16charsOffset, + int line, const CPlusPlus::Macro ¯o) override; + void failedMacroDefinitionCheck(int bytesOffset, int utf16charOffset, const CPlusPlus::ByteArrayRef &name) override; - void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset, - unsigned line, const CPlusPlus::Macro ¯o) override; - void startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset, - unsigned line, const CPlusPlus::Macro ¯o, + void notifyMacroReference(int bytesOffset, int utf16charOffset, + int line, const CPlusPlus::Macro ¯o) override; + void startExpandingMacro(int bytesOffset, int utf16charOffset, + int line, const CPlusPlus::Macro ¯o, const QVector<CPlusPlus::MacroArgumentReference> &actuals) override; - void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro ¯o) override; + void stopExpandingMacro(int bytesOffset, const CPlusPlus::Macro ¯o) override; void markAsIncludeGuard(const QByteArray ¯oName) override; - void startSkippingBlocks(unsigned utf16charsOffset) override; - void stopSkippingBlocks(unsigned utf16charsOffset) override; - void sourceNeeded(unsigned line, const QString &fileName, IncludeType type, + void startSkippingBlocks(int utf16charsOffset) override; + void stopSkippingBlocks(int utf16charsOffset) override; + void sourceNeeded(int line, const QString &fileName, IncludeType type, const QStringList &initialIncludes) override; private: diff --git a/src/plugins/cpptools/cppsourceprocessor_test.cpp b/src/plugins/cpptools/cppsourceprocessor_test.cpp index 009264cc3c..67a1b9f702 100644 --- a/src/plugins/cpptools/cppsourceprocessor_test.cpp +++ b/src/plugins/cpptools/cppsourceprocessor_test.cpp @@ -179,11 +179,11 @@ void CppToolsPlugin::test_cppsourceprocessor_macroUses() const QList<Document::MacroUse> macroUses = document->macroUses(); QCOMPARE(macroUses.size(), 1); const Document::MacroUse macroUse = macroUses.at(0); - QCOMPARE(macroUse.bytesBegin(), 25U); - QCOMPARE(macroUse.bytesEnd(), 35U); - QCOMPARE(macroUse.utf16charsBegin(), 25U); - QCOMPARE(macroUse.utf16charsEnd(), 35U); - QCOMPARE(macroUse.beginLine(), 2U); + QCOMPARE(macroUse.bytesBegin(), 25); + QCOMPARE(macroUse.bytesEnd(), 35); + QCOMPARE(macroUse.utf16charsBegin(), 25); + QCOMPARE(macroUse.utf16charsEnd(), 35); + QCOMPARE(macroUse.beginLine(), 2); } static bool isMacroDefinedInDocument(const QByteArray ¯oName, const Document::Ptr &document) diff --git a/src/plugins/cpptools/includeutils.cpp b/src/plugins/cpptools/includeutils.cpp index c57366332c..c42b104acf 100644 --- a/src/plugins/cpptools/includeutils.cpp +++ b/src/plugins/cpptools/includeutils.cpp @@ -319,7 +319,7 @@ QList<IncludeGroup> IncludeGroup::detectIncludeGroupsByNewLines(QList<Document:: { // Create groups QList<IncludeGroup> result; - unsigned lastLine = 0; + int lastLine = 0; QList<Include> currentIncludes; bool isFirst = true; foreach (const Include &include, includes) { diff --git a/src/plugins/cpptools/insertionpointlocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp index e6db241d79..c92d8bbca8 100644 --- a/src/plugins/cpptools/insertionpointlocator.cpp +++ b/src/plugins/cpptools/insertionpointlocator.cpp @@ -58,7 +58,7 @@ static int ordering(InsertionPointLocator::AccessSpec xsSpec) struct AccessRange { - unsigned start = 0; + int start = 0; unsigned end = 0; InsertionPointLocator::AccessSpec xsSpec = InsertionPointLocator::Invalid; unsigned colonToken = 0; @@ -119,7 +119,7 @@ protected: bool needsSuffix = false; findMatch(ranges, _xsSpec, beforeToken, needsLeadingEmptyLine, needsPrefix, needsSuffix); - unsigned line = 0, column = 0; + int line = 0, column = 0; getTokenStartPosition(beforeToken, &line, &column); QString prefix; @@ -253,7 +253,7 @@ InsertionLocation::InsertionLocation() = default; InsertionLocation::InsertionLocation(const QString &fileName, const QString &prefix, const QString &suffix, - unsigned line, unsigned column) + int line, int column) : m_fileName(fileName) , m_prefix(prefix) , m_suffix(suffix) @@ -350,7 +350,7 @@ public: : ASTVisitor(translationUnit) {} - void operator()(Symbol *decl, unsigned *line, unsigned *column) + void operator()(Symbol *decl, int *line, int *column) { // default to end of file const unsigned lastToken = translationUnit()->ast()->lastToken(); @@ -408,15 +408,15 @@ protected: class FindFunctionDefinition : protected ASTVisitor { FunctionDefinitionAST *_result = nullptr; - unsigned _line = 0; - unsigned _column = 0; + int _line = 0; + int _column = 0; public: explicit FindFunctionDefinition(TranslationUnit *translationUnit) : ASTVisitor(translationUnit) { } - FunctionDefinitionAST *operator()(unsigned line, unsigned column) + FunctionDefinitionAST *operator()(int line, int column) { _result = nullptr; _line = line; @@ -430,7 +430,7 @@ protected: { if (_result) return false; - unsigned line, column; + int line, column; translationUnit()->getTokenStartPosition(ast->firstToken(), &line, &column); if (line > _line || (line == _line && column > _column)) return false; @@ -473,7 +473,7 @@ static InsertionLocation nextToSurroundingDefinitions(Symbol *declaration, // find the index of declaration int declIndex = -1; - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { Symbol *s = klass->memberAt(i); if (s == declaration) { declIndex = i; @@ -505,7 +505,7 @@ static InsertionLocation nextToSurroundingDefinitions(Symbol *declaration, } if (!definitionFunction) { // try to find one below - for (unsigned i = declIndex + 1; i < klass->memberCount(); ++i) { + for (int i = declIndex + 1; i < klass->memberCount(); ++i) { Symbol *s = klass->memberAt(i); surroundingFunctionDecl = isNonVirtualFunctionDeclaration(s); if (!surroundingFunctionDecl) @@ -526,7 +526,7 @@ static InsertionLocation nextToSurroundingDefinitions(Symbol *declaration, if (!definitionFunction) return noResult; - unsigned line, column; + int line, column; if (suffix.isEmpty()) { Document::Ptr targetDoc = changes.snapshot().document(QString::fromUtf8(definitionFunction->fileName())); if (!targetDoc) @@ -586,7 +586,7 @@ QList<InsertionLocation> InsertionPointLocator::methodDefinition(Symbol *declara if (doc.isNull()) return result; - unsigned line = 0, column = 0; + int line = 0, column = 0; FindMethodDefinitionInsertPoint finder(doc->translationUnit()); finder(declaration, &line, &column); diff --git a/src/plugins/cpptools/insertionpointlocator.h b/src/plugins/cpptools/insertionpointlocator.h index c05bc0f6ff..a54f988241 100644 --- a/src/plugins/cpptools/insertionpointlocator.h +++ b/src/plugins/cpptools/insertionpointlocator.h @@ -35,7 +35,7 @@ class CPPTOOLS_EXPORT InsertionLocation public: InsertionLocation(); InsertionLocation(const QString &fileName, const QString &prefix, - const QString &suffix, unsigned line, unsigned column); + const QString &suffix, int line, int column); QString fileName() const { return m_fileName; } @@ -49,11 +49,11 @@ public: { return m_suffix; } /// \returns The line where to insert. The line number is 1-based. - unsigned line() const + int line() const { return m_line; } /// \returns The column where to insert. The column number is 1-based. - unsigned column() const + int column() const { return m_column; } bool isValid() const @@ -63,8 +63,8 @@ private: QString m_fileName; QString m_prefix; QString m_suffix; - unsigned m_line = 0; - unsigned m_column = 0; + int m_line = 0; + int m_column = 0; }; class CPPTOOLS_EXPORT InsertionPointLocator diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp index 6adb437bf8..05080fdb87 100644 --- a/src/plugins/cpptools/searchsymbols.cpp +++ b/src/plugins/cpptools/searchsymbols.cpp @@ -70,7 +70,7 @@ IndexItem::Ptr SearchSymbols::operator()(Document::Ptr doc, const QString &scope QTC_ASSERT(_parent->fileName() == Internal::StringTable::insert(doc->fileName()), return IndexItem::Ptr()); - for (unsigned i = 0, ei = doc->globalSymbolCount(); i != ei; ++i) + for (int i = 0, ei = doc->globalSymbolCount(); i != ei; ++i) accept(doc->globalSymbolAt(i)); Internal::StringTable::scheduleGC(); @@ -95,7 +95,7 @@ bool SearchSymbols::visit(Enum *symbol) QString newScope = scopedSymbolName(name, symbol); ScopedScope scopeRaii(_scope, newScope); - for (unsigned i = 0, ei = symbol->memberCount(); i != ei; ++i) + for (int i = 0, ei = symbol->memberCount(); i != ei; ++i) accept(symbol->memberAt(i)); return false; @@ -112,7 +112,7 @@ bool SearchSymbols::visit(Namespace *symbol) QString name = scopedSymbolName(symbol); QString newScope = name; ScopedScope raii(_scope, newScope); - for (unsigned i = 0; i < symbol->memberCount(); ++i) { + for (int i = 0; i < symbol->memberCount(); ++i) { accept(symbol->memberAt(i)); } return false; @@ -321,7 +321,7 @@ void SearchSymbols::processClass(T *clazz) QString newScope = scopedSymbolName(name, clazz); ScopedScope scopeRaii(_scope, newScope); - for (unsigned i = 0, ei = clazz->memberCount(); i != ei; ++i) + for (int i = 0, ei = clazz->memberCount(); i != ei; ++i) accept(clazz->memberAt(i)); } diff --git a/src/plugins/cpptools/typehierarchybuilder.cpp b/src/plugins/cpptools/typehierarchybuilder.cpp index aee41076d7..b0a31ad62a 100644 --- a/src/plugins/cpptools/typehierarchybuilder.cpp +++ b/src/plugins/cpptools/typehierarchybuilder.cpp @@ -71,13 +71,13 @@ void DerivedHierarchyVisitor::execute(const CPlusPlus::Document::Ptr &doc, _otherBases.clear(); _context = CPlusPlus::LookupContext(doc, snapshot); - for (unsigned i = 0; i < doc->globalSymbolCount(); ++i) + for (int i = 0; i < doc->globalSymbolCount(); ++i) accept(doc->globalSymbolAt(i)); } bool DerivedHierarchyVisitor::visit(CPlusPlus::Class *symbol) { - for (unsigned i = 0; i < symbol->baseClassCount(); ++i) { + for (int i = 0; i < symbol->baseClassCount(); ++i) { CPlusPlus::BaseClass *baseSymbol = symbol->baseClassAt(i); QString baseName = _actualBases.value(baseSymbol); diff --git a/src/plugins/debugger/disassemblerlines.cpp b/src/plugins/debugger/disassemblerlines.cpp index dbe9c06f4f..ed77866ca7 100644 --- a/src/plugins/debugger/disassemblerlines.cpp +++ b/src/plugins/debugger/disassemblerlines.cpp @@ -108,7 +108,7 @@ struct SourceFileCache Q_GLOBAL_STATIC(SourceFileCache, sourceFileCache) -void DisassemblerLines::appendSourceLine(const QString &fileName, uint lineNumber) +void DisassemblerLines::appendSourceLine(const QString &fileName, int lineNumber) { if (fileName.isEmpty() || lineNumber == 0) @@ -124,7 +124,7 @@ void DisassemblerLines::appendSourceLine(const QString &fileName, uint lineNumbe cache->lines = ts.readAll().split('\n'); } } - if (lineNumber >= uint(cache->lines.size())) + if (lineNumber >= cache->lines.size()) return; DisassemblerLine dl; dl.lineNumber = lineNumber; diff --git a/src/plugins/debugger/disassemblerlines.h b/src/plugins/debugger/disassemblerlines.h index 7cede27ac3..71cd5104a6 100644 --- a/src/plugins/debugger/disassemblerlines.h +++ b/src/plugins/debugger/disassemblerlines.h @@ -52,7 +52,7 @@ public: QString function; // (ass) Function to which current instruction belongs. QString fileName; // (src) Source file uint offset = 0; // (ass) Offset of instruction in relation to current function. - uint lineNumber = 0; // (src) Line number in source. + int lineNumber = 0; // (src) Line number in source. uint hunk = 0; // (src) Number of hunk if source line was split QByteArray rawData; // (ass) Raw bytes of the instruction QString data; // (ass) Instruction text, (src) source text, (cmt) arbitrary. @@ -69,7 +69,7 @@ public: void appendLine(const DisassemblerLine &dl); void appendComment(const QString &line); // Mixed source/assembly: Retrieve contents of source (cached) - void appendSourceLine(const QString &fileName, uint line); + void appendSourceLine(const QString &fileName, int line); QString toString() const; void setBytesLength(int x) { m_bytesLength = x; } int bytesLength() const { return m_bytesLength; } diff --git a/src/plugins/debugger/sourceutils.cpp b/src/plugins/debugger/sourceutils.cpp index b1c254038a..a08221c4e1 100644 --- a/src/plugins/debugger/sourceutils.cpp +++ b/src/plugins/debugger/sourceutils.cpp @@ -153,7 +153,7 @@ using SeenHash = QHash<QString, int>; static void blockRecursion(const Overview &overview, const Scope *scope, - unsigned line, + int line, QStringList *uninitializedVariables, SeenHash *seenHash, int level = 0) diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp index 52bb38f5d1..de7eb582ac 100644 --- a/src/plugins/designer/codemodelhelpers.cpp +++ b/src/plugins/designer/codemodelhelpers.cpp @@ -67,7 +67,7 @@ public: bool visit(CPlusPlus::Function * f) override; private: - const size_t m_length; + const int m_length; const char *m_name; FunctionList m_matches; @@ -82,8 +82,8 @@ SearchFunction::SearchFunction(const char *name) : SearchFunction::FunctionList SearchFunction::operator()(const DocumentPtr &doc) { m_matches.clear(); - const unsigned globalSymbolCount = doc->globalSymbolCount(); - for (unsigned i = 0; i < globalSymbolCount; ++i) + const int globalSymbolCount = doc->globalSymbolCount(); + for (int i = 0; i < globalSymbolCount; ++i) accept(doc->globalSymbolAt(i)); return m_matches; } @@ -93,7 +93,7 @@ bool SearchFunction::visit(CPlusPlus::Function * f) if (const CPlusPlus::Name *name = f->name()) if (const CPlusPlus::Identifier *id = name->identifier()) if (id->size() == m_length) - if (!qstrncmp(m_name, id->chars(), uint(m_length))) + if (!qstrncmp(m_name, id->chars(), m_length)) m_matches.push_back(f); return true; } diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index d004f4a661..22f66c0258 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -142,8 +142,8 @@ static QList<Document::Ptr> findDocumentsIncluding(const Snapshot &docTable, // Does klass inherit baseClass? static bool inherits(const Overview &o, const Class *klass, const QString &baseClass) { - const unsigned int baseClassCount = klass->baseClassCount(); - for (unsigned int b = 0; b < baseClassCount; ++b) + const int baseClassCount = klass->baseClassCount(); + for (int b = 0; b < baseClassCount; ++b) if (o.prettyName(klass->baseClassAt(b)->name()) == baseClass) return true; return false; @@ -171,14 +171,14 @@ static const Class *findClass(const Namespace *parentNameSpace, const LookupCont qDebug() << Q_FUNC_INFO << className; const Overview o; - const unsigned namespaceMemberCount = parentNameSpace->memberCount(); - for (unsigned i = 0; i < namespaceMemberCount; ++i) { // we go through all namespace members + const int namespaceMemberCount = parentNameSpace->memberCount(); + for (int i = 0; i < namespaceMemberCount; ++i) { // we go through all namespace members const Symbol *sym = parentNameSpace->memberAt(i); // we have found a class - we are interested in classes only if (const Class *cl = sym->asClass()) { // 1) we go through class members - const unsigned classMemberCount = cl->memberCount(); - for (unsigned j = 0; j < classMemberCount; ++j) + const int classMemberCount = cl->memberCount(); + for (int j = 0; j < classMemberCount; ++j) if (Declaration *decl = cl->memberAt(j)->asDeclaration()) { // we want to know if the class contains a member (so we look into // a declaration) of uiClassName type diff --git a/src/plugins/modeleditor/classviewcontroller.cpp b/src/plugins/modeleditor/classviewcontroller.cpp index ae8340d311..dccb0b8795 100644 --- a/src/plugins/modeleditor/classviewcontroller.cpp +++ b/src/plugins/modeleditor/classviewcontroller.cpp @@ -65,8 +65,8 @@ void ClassViewController::appendClassDeclarationsFromDocument(CPlusPlus::Documen int line, int column, QSet<QString> *classNames) { - unsigned int total = document->globalSymbolCount(); - for (unsigned int i = 0; i < total; ++i) { + int total = document->globalSymbolCount(); + for (int i = 0; i < total; ++i) { CPlusPlus::Symbol *symbol = document->globalSymbolAt(i); appendClassDeclarationsFromSymbol(symbol, line, column, classNames); } @@ -77,9 +77,7 @@ void ClassViewController::appendClassDeclarationsFromSymbol(CPlusPlus::Symbol *s QSet<QString> *classNames) { if (symbol->isClass() - && (line <= 0 - || (symbol->line() == static_cast<unsigned int>(line) - && symbol->column() == static_cast<unsigned int>(column + 1)))) + && (line <= 0 || (symbol->line() == line && symbol->column() == column + 1))) { CPlusPlus::Overview overview; QString className = overview.prettyName( @@ -91,8 +89,8 @@ void ClassViewController::appendClassDeclarationsFromSymbol(CPlusPlus::Symbol *s if (symbol->isScope()) { CPlusPlus::Scope *scope = symbol->asScope(); - unsigned int total = scope->memberCount(); - for (unsigned int i = 0; i < total; ++i) { + int total = scope->memberCount(); + for (int i = 0; i < total; ++i) { CPlusPlus::Symbol *member = scope->memberAt(i); appendClassDeclarationsFromSymbol(member, line, column, classNames); } diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp index 3541793208..63c2361339 100644 --- a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp +++ b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp @@ -522,7 +522,7 @@ private: ScopeBuilder m_scopeBuilder; QStringList m_stateNames; QVector<SemanticHighlighter::Use> m_uses; - unsigned m_lineOfLastUse; + int m_lineOfLastUse; QVector<SemanticHighlighter::Use> m_delayedUses; int m_nextExtraFormat; int m_currentDelayedUse; diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index 76029cc6fd..01c61f10f8 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/src/plugins/texteditor/refactoringchanges.cpp @@ -232,7 +232,7 @@ TextEditorWidget *RefactoringFile::editor() const return m_editor; } -int RefactoringFile::position(unsigned line, unsigned column) const +int RefactoringFile::position(int line, int column) const { QTC_ASSERT(line != 0, return -1); QTC_ASSERT(column != 0, return -1); @@ -241,7 +241,7 @@ int RefactoringFile::position(unsigned line, unsigned column) const return -1; } -void RefactoringFile::lineAndColumn(int offset, unsigned *line, unsigned *column) const +void RefactoringFile::lineAndColumn(int offset, int *line, int *column) const { QTC_ASSERT(line, return); QTC_ASSERT(column, return); @@ -322,7 +322,7 @@ bool RefactoringFile::apply() // open / activate / goto position if (m_openEditor && !m_fileName.isEmpty()) { - auto line = unsigned(-1), column = unsigned(-1); + int line = -1, column = -1; if (m_editorCursorPosition != -1) lineAndColumn(m_editorCursorPosition, &line, &column); m_editor = RefactoringChanges::openEditor(m_fileName, m_activateEditor, line, column); diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h index d7e6cdd2fe..807f536242 100644 --- a/src/plugins/texteditor/refactoringchanges.h +++ b/src/plugins/texteditor/refactoringchanges.h @@ -66,9 +66,9 @@ public: TextEditorWidget *editor() const; // converts 1-based line and column into 0-based source offset - int position(unsigned line, unsigned column) const; + int position(int line, int column) const; // converts 0-based source offset into 1-based line and column - void lineAndColumn(int offset, unsigned *line, unsigned *column) const; + void lineAndColumn(int offset, int *line, int *column) const; QChar charAt(int pos) const; QString textOf(int start, int end) const; diff --git a/src/plugins/texteditor/semantichighlighter.h b/src/plugins/texteditor/semantichighlighter.h index f924e4abdb..330f9c8f05 100644 --- a/src/plugins/texteditor/semantichighlighter.h +++ b/src/plugins/texteditor/semantichighlighter.h @@ -37,11 +37,12 @@ namespace TextEditor { class SyntaxHighlighter; -class TEXTEDITOR_EXPORT HighlightingResult { +class TEXTEDITOR_EXPORT HighlightingResult +{ public: - unsigned line = 0; // 1-based - unsigned column = 0; // 1-based - unsigned length = 0; + int line = 0; // 1-based + int column = 0; // 1-based + int length = 0; TextStyles textStyles; int kind = 0; /// The various highlighters can define their own kind of results. bool useTextSyles = false; @@ -54,11 +55,11 @@ public: HighlightingResult() = default; - HighlightingResult(unsigned line, unsigned column, unsigned length, int kind) + HighlightingResult(int line, int column, int length, int kind) : line(line), column(column), length(length), kind(kind), useTextSyles(false) {} - HighlightingResult(unsigned line, unsigned column, unsigned length, TextStyles textStyles) + HighlightingResult(int line, int column, int length, TextStyles textStyles) : line(line), column(column), length(length), textStyles(textStyles), useTextSyles(true) {} diff --git a/src/plugins/todo/cpptodoitemsscanner.cpp b/src/plugins/todo/cpptodoitemsscanner.cpp index 2c6f8f0e1c..8fa9972274 100644 --- a/src/plugins/todo/cpptodoitemsscanner.cpp +++ b/src/plugins/todo/cpptodoitemsscanner.cpp @@ -77,7 +77,7 @@ void CppTodoItemsScanner::processDocument(CPlusPlus::Document::Ptr doc) QList<TodoItem> itemList; CPlusPlus::TranslationUnit *translationUnit = doc->translationUnit(); - for (unsigned i = 0; i < translationUnit->commentCount(); ++i) { + for (int i = 0; i < translationUnit->commentCount(); ++i) { // Get comment source CPlusPlus::Token token = doc->translationUnit()->commentAt(i); @@ -89,7 +89,7 @@ void CppTodoItemsScanner::processDocument(CPlusPlus::Document::Ptr doc) } // Process every line of the comment - unsigned lineNumber = 0; + int lineNumber = 0; translationUnit->getPosition(token.utf16charsBegin(), &lineNumber); for (int from = 0, sz = source.size(); from < sz; ++lineNumber) { diff --git a/src/tools/clangbackend/source/clangfollowsymbol.cpp b/src/tools/clangbackend/source/clangfollowsymbol.cpp index 27e8fb61e9..7ad610d41b 100644 --- a/src/tools/clangbackend/source/clangfollowsymbol.cpp +++ b/src/tools/clangbackend/source/clangfollowsymbol.cpp @@ -74,7 +74,7 @@ static SourceRangeContainer extractMatchingTokenRange(const Cursor &cursor, static int getTokenIndex(CXTranslationUnit tu, const Tokens &tokens, uint line, uint column) { int tokenIndex = -1; - for (int i = static_cast<int>(tokens.size() - 1); i >= 0; --i) { + for (int i = tokens.size() - 1; i >= 0; --i) { const SourceRange range(tu, tokens[i].extent()); if (range.contains(line, column)) { tokenIndex = i; diff --git a/src/tools/clangbackend/source/clangreferencescollector.cpp b/src/tools/clangbackend/source/clangreferencescollector.cpp index c5b39aa2cf..a750beac03 100644 --- a/src/tools/clangbackend/source/clangreferencescollector.cpp +++ b/src/tools/clangbackend/source/clangreferencescollector.cpp @@ -124,7 +124,7 @@ public: ReferencesResult collect(uint line, uint column, bool localReferences = false) const; private: - bool pointsToIdentifier(uint line, uint column, unsigned *tokenIndex) const; + bool pointsToIdentifier(int line, int column, unsigned *tokenIndex) const; bool matchesIdentifier(const Token &token, const Utf8String &identifier) const; bool checkToken(unsigned index, const Utf8String &identifier, const Utf8String &usr) const; @@ -141,9 +141,9 @@ ReferencesCollector::ReferencesCollector(CXTranslationUnit cxTranslationUnit) { } -bool ReferencesCollector::pointsToIdentifier(uint line, uint column, unsigned *tokenIndex) const +bool ReferencesCollector::pointsToIdentifier(int line, int column, unsigned *tokenIndex) const { - for (uint i = 0; i < m_tokens.size(); ++i) { + for (int i = 0; i < m_tokens.size(); ++i) { const Token &token = m_tokens[i]; if (token.kind() == CXToken_Identifier && token.extent().contains(line, column)) { *tokenIndex = i; @@ -202,7 +202,7 @@ ReferencesResult ReferencesCollector::collect(uint line, uint column, bool local const Token &token = m_tokens[index]; const Utf8String identifier = token.spelling(); - for (uint i = 0; i < m_tokens.size(); ++i) { + for (int i = 0; i < m_tokens.size(); ++i) { if (checkToken(i, identifier, usr)) result.references.append(m_tokens[i].extent()); } diff --git a/src/tools/clangbackend/source/clangtooltipinfocollector.cpp b/src/tools/clangbackend/source/clangtooltipinfocollector.cpp index 0d001ca3d4..36281674f7 100644 --- a/src/tools/clangbackend/source/clangtooltipinfocollector.cpp +++ b/src/tools/clangbackend/source/clangtooltipinfocollector.cpp @@ -269,7 +269,7 @@ Utf8String ToolTipInfoCollector::textForNamespaceAlias(const Cursor &cursor) con Utf8String aliasedName; // Start at 3 in order to skip these tokens: namespace X = - for (uint i = 3; i < tokens.size(); ++i) + for (int i = 3; i < tokens.size(); ++i) aliasedName += tokens[i].spelling(); return aliasedName; diff --git a/src/tools/clangbackend/source/codecompleter.cpp b/src/tools/clangbackend/source/codecompleter.cpp index 2db3fbe0f1..91a9ad69ba 100644 --- a/src/tools/clangbackend/source/codecompleter.cpp +++ b/src/tools/clangbackend/source/codecompleter.cpp @@ -94,7 +94,7 @@ static void replaceWithOpeningParen(UnsavedFile &file, uint line, uint column) file.replaceAt(pos, 1, Utf8String("(", 1)); } -CodeCompletions CodeCompleter::complete(uint line, uint column, +CodeCompletions CodeCompleter::complete(int line, int column, int funcNameStartLine, int funcNameStartColumn) { diff --git a/src/tools/clangbackend/source/codecompleter.h b/src/tools/clangbackend/source/codecompleter.h index 473404f03e..3fdab36b57 100644 --- a/src/tools/clangbackend/source/codecompleter.h +++ b/src/tools/clangbackend/source/codecompleter.h @@ -42,7 +42,7 @@ public: CodeCompleter(const TranslationUnit &translationUnit, const UnsavedFiles &unsavedFiles); - CodeCompletions complete(uint line, uint column, + CodeCompletions complete(int line, int column, int funcNameStartLine = -1, int funcNameStartColumn = -1); diff --git a/src/tools/clangbackend/source/sourcelocation.cpp b/src/tools/clangbackend/source/sourcelocation.cpp index 70bb0e16aa..108173bf94 100644 --- a/src/tools/clangbackend/source/sourcelocation.cpp +++ b/src/tools/clangbackend/source/sourcelocation.cpp @@ -58,21 +58,21 @@ const Utf8String &SourceLocation::filePath() const return m_filePath; } -uint SourceLocation::line() const +int SourceLocation::line() const { if (!m_isEvaluated) evaluate(); return m_line; } -uint SourceLocation::column() const +int SourceLocation::column() const { if (!m_isEvaluated) evaluate(); return m_column; } -uint SourceLocation::offset() const +int SourceLocation::offset() const { if (!m_isEvaluated) evaluate(); @@ -92,11 +92,15 @@ void SourceLocation::evaluate() const CXFile cxFile; + unsigned line, column, offset; clang_getFileLocation(m_cxSourceLocation, &cxFile, - &m_line, - &m_column, - &m_offset); + &line, + &column, + &offset); + m_line = line; + m_column = column; + m_offset = offset; m_isFilePathNormalized = false; if (!cxFile) @@ -104,15 +108,14 @@ void SourceLocation::evaluate() const m_filePath = ClangString(clang_getFileName(cxFile)); if (m_column > 1) { - const uint lineStart = m_offset + 1 - m_column; + const int lineStart = m_offset + 1 - m_column; const char *contents = clang_getFileContents(m_cxTranslationUnit, cxFile, nullptr); if (!contents) return; // (1) column in SourceLocation is the actual column shown by CppEditor. // (2) column in Clang is the utf8 byte offset from the beginning of the line. // Here we convert column from (2) to (1). - m_column = static_cast<uint>(QString::fromUtf8(&contents[lineStart], - static_cast<int>(m_column) - 1).size()) + 1; + m_column = QString::fromUtf8(&contents[lineStart], m_column - 1).size() + 1; } } diff --git a/src/tools/clangbackend/source/sourcelocation.h b/src/tools/clangbackend/source/sourcelocation.h index 63a600a2a6..0c668c38de 100644 --- a/src/tools/clangbackend/source/sourcelocation.h +++ b/src/tools/clangbackend/source/sourcelocation.h @@ -54,9 +54,9 @@ public: CXSourceLocation cxSourceLocation); const Utf8String &filePath() const; - uint line() const; - uint column() const; - uint offset() const; + int line() const; + int column() const; + int offset() const; SourceLocationContainer toSourceLocationContainer() const; @@ -71,9 +71,9 @@ private: CXSourceLocation m_cxSourceLocation; CXTranslationUnit m_cxTranslationUnit; mutable Utf8String m_filePath; - mutable uint m_line = 0; - mutable uint m_column = 0; - mutable uint m_offset = 0; + mutable int m_line = 0; + mutable int m_column = 0; + mutable int m_offset = 0; mutable bool m_isFilePathNormalized = true; mutable bool m_isEvaluated = false; }; diff --git a/src/tools/clangbackend/source/sourcerange.cpp b/src/tools/clangbackend/source/sourcerange.cpp index 413ddd77fa..7100122669 100644 --- a/src/tools/clangbackend/source/sourcerange.cpp +++ b/src/tools/clangbackend/source/sourcerange.cpp @@ -64,7 +64,7 @@ SourceLocation SourceRange::end() const return {cxTranslationUnit, clang_getRangeEnd(cxSourceRange)}; } -bool SourceRange::contains(unsigned line, unsigned column) const +bool SourceRange::contains(int line, int column) const { const SourceLocation start_ = start(); const SourceLocation end_ = end(); diff --git a/src/tools/clangbackend/source/sourcerange.h b/src/tools/clangbackend/source/sourcerange.h index d4887aee32..e21f32e9a6 100644 --- a/src/tools/clangbackend/source/sourcerange.h +++ b/src/tools/clangbackend/source/sourcerange.h @@ -49,7 +49,7 @@ public: SourceLocation start() const; SourceLocation end() const; - bool contains(unsigned line, unsigned column) const; + bool contains(int line, int column) const; SourceRangeContainer toSourceRangeContainer() const; diff --git a/src/tools/clangbackend/source/token.cpp b/src/tools/clangbackend/source/token.cpp index 0754f84317..f69497b989 100644 --- a/src/tools/clangbackend/source/token.cpp +++ b/src/tools/clangbackend/source/token.cpp @@ -99,12 +99,12 @@ std::vector<Cursor> Tokens::annotate() const return cursors; } -const Token &Tokens::operator[](size_t index) const +const Token &Tokens::operator[](int index) const { return m_tokens[index]; } -Token &Tokens::operator[](size_t index) +Token &Tokens::operator[](int index) { return m_tokens[index]; } diff --git a/src/tools/clangbackend/source/token.h b/src/tools/clangbackend/source/token.h index a2e3941061..ecfb42f6f4 100644 --- a/src/tools/clangbackend/source/token.h +++ b/src/tools/clangbackend/source/token.h @@ -72,9 +72,9 @@ public: std::vector<Cursor> annotate() const; - size_t size() const { return m_tokens.size(); } - const Token &operator[](size_t index) const; - Token &operator[](size_t index); + int size() const { return static_cast<int>(m_tokens.size()); } + const Token &operator[](int index) const; + Token &operator[](int index); std::vector<Token>::const_iterator cbegin() const; std::vector<Token>::const_iterator cend() const; diff --git a/src/tools/clangbackend/source/unsavedfile.cpp b/src/tools/clangbackend/source/unsavedfile.cpp index 25925ea308..df667a3630 100644 --- a/src/tools/clangbackend/source/unsavedfile.cpp +++ b/src/tools/clangbackend/source/unsavedfile.cpp @@ -61,7 +61,7 @@ Utf8String UnsavedFile::fileContent() const return m_fileContent; } -uint UnsavedFile::toUtf8Position(uint line, uint column, bool *ok) const +uint UnsavedFile::toUtf8Position(int line, int column, bool *ok) const { Utf8PositionFromLineColumn converter(m_fileContent.constData()); if (converter.find(line, column)) { @@ -73,7 +73,7 @@ uint UnsavedFile::toUtf8Position(uint line, uint column, bool *ok) const return 0; } -bool UnsavedFile::hasCharacterAt(uint line, uint column, char character) const +bool UnsavedFile::hasCharacterAt(int line, int column, char character) const { bool positionIsOk = false; const uint utf8Position = toUtf8Position(line, column, &positionIsOk); @@ -81,7 +81,7 @@ bool UnsavedFile::hasCharacterAt(uint line, uint column, char character) const return positionIsOk && hasCharacterAt(utf8Position, character); } -Utf8String UnsavedFile::lineRange(uint fromLine, uint toLine) const +Utf8String UnsavedFile::lineRange(int fromLine, int toLine) const { if (fromLine > toLine) return Utf8String(); diff --git a/src/tools/clangbackend/source/unsavedfile.h b/src/tools/clangbackend/source/unsavedfile.h index 325139d240..58966dd9bb 100644 --- a/src/tools/clangbackend/source/unsavedfile.h +++ b/src/tools/clangbackend/source/unsavedfile.h @@ -44,9 +44,9 @@ public: Utf8String fileContent() const; // 1-based line and column - uint toUtf8Position(uint line, uint column, bool *ok) const; - bool hasCharacterAt(uint line, uint column, char character) const; - Utf8String lineRange(uint fromLine, uint toLine) const; + uint toUtf8Position(int line, int column, bool *ok) const; + bool hasCharacterAt(int line, int column, char character) const; + Utf8String lineRange(int fromLine, int toLine) const; // 0-based position bool hasCharacterAt(uint position, char character) const; diff --git a/src/tools/clangbackend/source/utf8positionfromlinecolumn.cpp b/src/tools/clangbackend/source/utf8positionfromlinecolumn.cpp index 1d7ea1a88f..8526eba067 100644 --- a/src/tools/clangbackend/source/utf8positionfromlinecolumn.cpp +++ b/src/tools/clangbackend/source/utf8positionfromlinecolumn.cpp @@ -35,7 +35,7 @@ Utf8PositionFromLineColumn::Utf8PositionFromLineColumn(const char *utf8Text) { } -bool Utf8PositionFromLineColumn::find(uint line, uint column) +bool Utf8PositionFromLineColumn::find(int line, int column) { if (!m_utf8Text || *m_utf8Text == '\0' || line == 0 || column == 0) return false; @@ -49,12 +49,12 @@ uint Utf8PositionFromLineColumn::position() const return m_previousByte - m_utf8Text; } -bool Utf8PositionFromLineColumn::advanceToLine(uint line) +bool Utf8PositionFromLineColumn::advanceToLine(int line) { if (line == 1) return true; - uint currentLine = 1; + int currentLine = 1; do { if (*m_currentByte == '\n' && ++currentLine == line) { advanceCodePoint(); @@ -65,7 +65,7 @@ bool Utf8PositionFromLineColumn::advanceToLine(uint line) return false; } -bool Utf8PositionFromLineColumn::advanceToColumn(uint column) +bool Utf8PositionFromLineColumn::advanceToColumn(int column) { while (column) { if (advanceCodePoint(/*stopOnNewLine=*/ true)) diff --git a/src/tools/clangbackend/source/utf8positionfromlinecolumn.h b/src/tools/clangbackend/source/utf8positionfromlinecolumn.h index facb152772..f07a9f33b4 100644 --- a/src/tools/clangbackend/source/utf8positionfromlinecolumn.h +++ b/src/tools/clangbackend/source/utf8positionfromlinecolumn.h @@ -35,13 +35,13 @@ public: Utf8PositionFromLineColumn(const char *utf8Text); // 1-based line and column - bool find(uint line, uint column); + bool find(int line, int column); uint position() const; private: - bool advanceToLine(uint line); - bool advanceToColumn(uint column); + bool advanceToLine(int line); + bool advanceToColumn(int column); bool advanceCodePoint(bool stopOnNewLine = false); private: diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp index ad69adae56..86a2a34e39 100644 --- a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp +++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp @@ -127,15 +127,15 @@ protected: return name; } - QByteArray terminalId(unsigned token) + QByteArray terminalId(int token) { return 't' + QByteArray::number(token); } - void terminal(unsigned token, AST *node) { + void terminal(int token, AST *node) { _connections.append(qMakePair(_id[node], terminalId(token))); } void generateTokens() { - for (unsigned token = 1; token < translationUnit()->tokenCount(); ++token) { + for (int token = 1; token < translationUnit()->tokenCount(); ++token) { if (translationUnit()->tokenKind(token) == T_EOF_SYMBOL) break; @@ -413,7 +413,7 @@ public: void report(int level, const StringLiteral *fileName, - unsigned line, unsigned column, + int line, int column, const char *format, va_list ap) { ++m_errorCount; diff --git a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp index 14e858cfcd..d834a62db0 100644 --- a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp +++ b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp @@ -308,7 +308,7 @@ public: << " if (debug_todo)" << std::endl << " translationUnit()->warning(ast->firstToken(), \"TODO: %s\", __func__);" << std::endl; - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { Declaration *decl = klass->memberAt(i)->asDeclaration(); if (! decl) continue; diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp index 2b83d7fa4e..c35e9e5edb 100644 --- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp +++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp @@ -112,7 +112,7 @@ static ASTNodes astNodes; static QTextCursor createCursor(TranslationUnit *unit, AST *ast, QTextDocument *document) { - unsigned startLine, startColumn, endLine, endColumn; + int startLine, startColumn, endLine, endColumn; unit->getTokenStartPosition(ast->firstToken(), &startLine, &startColumn); unit->getTokenEndPosition(ast->lastToken() - 1, &endLine, &endColumn); @@ -248,7 +248,7 @@ protected: void visitMembers(Class *klass) { // *out << " // visit " << className.constData() << endl; - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { Symbol *member = klass->memberAt(i); if (! member->name()) continue; @@ -259,7 +259,7 @@ protected: continue; const QByteArray memberName = QByteArray::fromRawData(id->chars(), id->size()); - if (member->type().isUnsigned() && memberName.endsWith("_token")) { + if (member->type()->isIntegerType() && memberName.endsWith("_token")) { // nothing to do. The member is a token. } else if (PointerType *ptrTy = member->type()->asPointerType()) { @@ -273,7 +273,7 @@ protected: } } - for (unsigned i = 0; i < klass->baseClassCount(); ++i) { + for (int i = 0; i < klass->baseClassCount(); ++i) { const QByteArray baseClassName = klass->baseClassAt(i)->identifier()->chars(); if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0)) @@ -502,7 +502,7 @@ protected: void visitMembers(Class *klass) { - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { Symbol *member = klass->memberAt(i); if (! member->name()) continue; @@ -513,7 +513,7 @@ protected: continue; const QByteArray memberName = QByteArray::fromRawData(id->chars(), id->size()); - if (member->type().isUnsigned() && memberName.endsWith("_token")) { + if (member->type()->isIntegerType() && memberName.endsWith("_token")) { *out << " pattern->" << memberName << " = node->" << memberName << ";" << endl @@ -536,7 +536,7 @@ protected: } } - for (unsigned i = 0; i < klass->baseClassCount(); ++i) { + for (int i = 0; i < klass->baseClassCount(); ++i) { const QByteArray baseClassName = klass->baseClassAt(i)->identifier()->chars(); if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0)) @@ -649,7 +649,7 @@ protected: void visitMembers(Class *klass) { - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { Symbol *member = klass->memberAt(i); if (! member->name()) continue; @@ -660,7 +660,7 @@ protected: continue; const QByteArray memberName = QByteArray::fromRawData(id->chars(), id->size()); - if (member->type().isUnsigned() && memberName.endsWith("_token")) { + if (member->type()->isIntegerType() && memberName.endsWith("_token")) { *out << " ast->" << memberName << " = " << memberName << ";" << endl; } else if (PointerType *ptrTy = member->type()->asPointerType()) { if (NamedType *namedTy = ptrTy->elementType()->asNamedType()) { @@ -678,7 +678,7 @@ protected: } } - for (unsigned i = 0; i < klass->baseClassCount(); ++i) { + for (int i = 0; i < klass->baseClassCount(); ++i) { const QByteArray baseClassName = klass->baseClassAt(i)->identifier()->chars(); if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0)) @@ -782,7 +782,7 @@ protected: void visitMembers(Class *klass) { - for (unsigned i = 0; i < klass->memberCount(); ++i) { + for (int i = 0; i < klass->memberCount(); ++i) { Symbol *member = klass->memberAt(i); if (! member->name()) continue; @@ -793,7 +793,7 @@ protected: continue; const QByteArray memberName = QByteArray::fromRawData(id->chars(), id->size()); - if (member->type().isUnsigned() && memberName.endsWith("_token")) { + if (member->type()->isIntegerType() && memberName.endsWith("_token")) { out << " if (ast->" << memberName << ")" << endl; out << " terminal(ast->" << memberName << ", ast);" << endl; } else if (PointerType *ptrTy = member->type()->asPointerType()) { @@ -810,7 +810,7 @@ protected: } } - for (unsigned i = 0; i < klass->baseClassCount(); ++i) { + for (int i = 0; i < klass->baseClassCount(); ++i) { const QByteArray baseClassName = klass->baseClassAt(i)->identifier()->chars(); if (ClassSpecifierAST *baseClassSpec = classMap.value(baseClassName, 0)) @@ -933,7 +933,7 @@ static QStringList collectFieldNames(ClassSpecifierAST *classAST, bool onlyToken QStringList fields; Overview oo; Class *clazz = classAST->symbol; - for (unsigned i = 0; i < clazz->memberCount(); ++i) { + for (int i = 0; i < clazz->memberCount(); ++i) { Symbol *s = clazz->memberAt(i); if (Declaration *decl = s->asDeclaration()) { const QString declName = oo(decl->name()); @@ -947,7 +947,7 @@ static QStringList collectFieldNames(ClassSpecifierAST *classAST, bool onlyToken } else { fields.append(declName); } - } else if (ty.isUnsigned()) { + } else if (ty->isIntegerType()) { fields.append(declName); } } @@ -1013,7 +1013,7 @@ struct GenInfo { void generateFirstToken(QTextStream &os, const QString &className, const QStringList &fields) { - os << "unsigned "<< className << "::firstToken() const" << endl + os << "int "<< className << "::firstToken() const" << endl << "{" << endl; foreach (const QString &field, fields) { @@ -1022,7 +1022,7 @@ void generateFirstToken(QTextStream &os, const QString &className, const QString if (field.endsWith(QLatin1String("_token"))) { os << " return " << field << ";" << endl; } else { - os << " if (unsigned candidate = " << field << "->firstToken())" << endl; + os << " if (int candidate = " << field << "->firstToken())" << endl; os << " return candidate;" << endl; } } @@ -1033,7 +1033,7 @@ void generateFirstToken(QTextStream &os, const QString &className, const QString void generateLastToken(QTextStream &os, const QString &className, const QStringList &fields) { - os << "unsigned "<< className << "::lastToken() const" << endl + os << "int "<< className << "::lastToken() const" << endl << "{" << endl; for (int i = fields.size() - 1; i >= 0; --i) { @@ -1044,7 +1044,7 @@ void generateLastToken(QTextStream &os, const QString &className, const QStringL if (field.endsWith(QLatin1String("_token"))) { os << " return " << field << " + 1;" << endl; } else { - os << " if (unsigned candidate = " << field << "->lastToken())" << endl; + os << " if (int candidate = " << field << "->lastToken())" << endl; os << " return candidate;" << endl; } } @@ -1120,7 +1120,7 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir) QTextCursor cursor(&cpp_document); - unsigned line = 0, column = 0; + int line = 0, column = 0; AST_cpp_document->translationUnit()->getTokenStartPosition(funDef->firstToken(), &line, &column); const int start = cpp_document.findBlockByNumber(line - 1).position() + column - 1; cursor.setPosition(start); @@ -1266,27 +1266,27 @@ void generateASTVisitor_H(const Snapshot &, const QDir &cplusplusDir, " void setTranslationUnit(TranslationUnit *translationUnit);\n" "\n" " Control *control() const;\n" -" unsigned tokenCount() const;\n" -" const Token &tokenAt(unsigned index) const;\n" -" int tokenKind(unsigned index) const;\n" -" const char *spell(unsigned index) const;\n" -" const Identifier *identifier(unsigned index) const;\n" -" const Literal *literal(unsigned index) const;\n" -" const NumericLiteral *numericLiteral(unsigned index) const;\n" -" const StringLiteral *stringLiteral(unsigned index) const;\n" +" int tokenCount() const;\n" +" const Token &tokenAt(int index) const;\n" +" int tokenKind(int index) const;\n" +" const char *spell(int index) const;\n" +" const Identifier *identifier(int index) const;\n" +" const Literal *literal(int index) const;\n" +" const NumericLiteral *numericLiteral(int index) const;\n" +" const StringLiteral *stringLiteral(int index) const;\n" "\n" -" void getPosition(unsigned offset,\n" -" unsigned *line,\n" -" unsigned *column = 0,\n" -" const StringLiteral **fileName = 0) const;\n" +" void getPosition(int offset,\n" +" int *line,\n" +" int *column = nullptr,\n" +" const StringLiteral **fileName = nullptr) const;\n" "\n" -" void getTokenPosition(unsigned index,\n" -" unsigned *line,\n" -" unsigned *column = 0,\n" -" const StringLiteral **fileName = 0) const;\n" +" void getTokenPosition(int index,\n" +" int *line,\n" +" int *column = nullptr,\n" +" const StringLiteral **fileName = nullptr) const;\n" "\n" -" void getTokenStartPosition(unsigned index, unsigned *line, unsigned *column) const;\n" -" void getTokenEndPosition(unsigned index, unsigned *line, unsigned *column) const;\n" +" void getTokenStartPosition(int index, int *line, int *column) const;\n" +" void getTokenEndPosition(int index, int *line, int *column) const;\n" "\n" " void accept(AST *ast);\n" "\n" @@ -1616,7 +1616,7 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir) QList<StringPair> args; bool first = true; - for (unsigned index = 0; index < klass->memberCount(); ++index) { + for (int index = 0; index < klass->memberCount(); ++index) { Declaration *member = klass->memberAt(index)->asDeclaration(); if (! member) continue; |