From f35ea281bb9c667b7d514e8defddbedd34cfc7ca Mon Sep 17 00:00:00 2001 From: Seppo Pakonen Date: Fri, 16 Jul 2021 14:44:43 +0300 Subject: [PATCH] Patch from issue #2 --- src/Fog/FogCharacter.cpp | 4 ++-- src/Fog/FogCodeTokens.cpp | 8 ++++---- src/Fog/FogEmitContext.cpp | 2 +- src/Fog/FogFunction.cpp | 4 ++-- src/Fog/FogInline.cpp | 2 +- src/Fog/FogIterationDomain.cpp | 12 ++++++------ src/Fog/FogLexerInput.cpp | 4 ++-- src/Fog/FogMakeSemantics.cpp | 2 +- src/Fog/FogMetaVariableSlot.cpp | 16 ++++++++-------- src/Fog/FogMultipleId.cpp | 2 +- src/Fog/FogParseContext.cpp | 4 ++-- src/Fog/FogParseContext.h | 2 +- src/Fog/FogParser.cpp | 2 +- src/Fog/FogParser.y | 2 +- src/Fog/FogRoot.cpp | 4 ++-- src/Fog/FogScope.cpp | 4 ++-- src/Fog/FogScopeContext.h | 4 ++-- src/Fog/FogSourceFile.cpp | 8 ++++---- src/Fog/FogString.cpp | 4 ++-- src/Fog/FogSubstituteParser.cpp | 2 +- src/Fog/FogTargetFile.cpp | 6 +++--- src/Fog/FogTemplateManager.cpp | 8 ++++---- src/Fog/FogUsage.cpp | 2 +- src/Fog/FogUsageManager.cpp | 2 +- src/Prim/Prim.h | 2 ++ src/Prim/PrimBits.h | 5 +++-- src/Prim/PrimBufRep.h | 2 +- src/Prim/PrimComToken.h | 2 ++ src/Prim/PrimComTokenStr.h | 2 +- src/Prim/PrimComToken_Bool.cpp | 8 ++++---- src/Prim/PrimComToken_Double.cpp | 8 ++++---- src/Prim/PrimComToken_Int.cpp | 4 ++-- src/Prim/PrimComToken_Long.cpp | 4 ++-- src/Prim/PrimListOfRef.cpp | 8 ++++---- src/Prim/PrimMapOfRef.cpp | 4 ++-- src/Prim/PrimNotice.cpp | 4 ++-- src/Prim/PrimNotice.h | 2 +- src/Prim/PrimSinglyLinkedListOfRef.cpp | 8 ++++---- 38 files changed, 89 insertions(+), 84 deletions(-) diff --git a/src/Fog/FogCharacter.cpp b/src/Fog/FogCharacter.cpp index 823f9fe..1468ed0 100644 --- a/src/Fog/FogCharacter.cpp +++ b/src/Fog/FogCharacter.cpp @@ -30,9 +30,9 @@ FogCharacter::FogCharacter() FogCharacter::FogCharacter(const PrimId& rawId, const PrimId& binId, unsigned long aValue, CharacterType characterType) : _raw_id(rawId), - _bin_id(binId), _character_type(characterType), - _value(aValue) {} + _value(aValue), + _bin_id(binId) {} FogCharacter::~FogCharacter() {} diff --git a/src/Fog/FogCodeTokens.cpp b/src/Fog/FogCodeTokens.cpp index 7f712c9..8547f3f 100644 --- a/src/Fog/FogCodeTokens.cpp +++ b/src/Fog/FogCodeTokens.cpp @@ -15,8 +15,8 @@ TMPL_HACK_FIX_DO(FogCodeTokens) FogCodeTokens::FogCodeTokens() : - _executable_tokens(0), - _source_lines(0) + _source_lines(0), + _executable_tokens(0) {} @@ -24,8 +24,8 @@ FogCodeTokens::FogCodeTokens(const This& tokenList) : Super(tokenList), _tokens(tokenList._tokens), - _executable_tokens(tokenList._executable_tokens), - _source_lines(tokenList._source_lines) + _source_lines(tokenList._source_lines), + _executable_tokens(tokenList._executable_tokens) {} FogCodeTokens::~FogCodeTokens() {} diff --git a/src/Fog/FogEmitContext.cpp b/src/Fog/FogEmitContext.cpp index ee4083d..bd9d6db 100644 --- a/src/Fog/FogEmitContext.cpp +++ b/src/Fog/FogEmitContext.cpp @@ -367,8 +367,8 @@ FogStaticEmitContext::FogStaticEmitContext(FogStream& s, FogToken& aToken, ForUs : _static_token(aToken), _in_scope(IN_ANY_SCOPE), - _for_use_as(forUseAs), _s(s), + _for_use_as(forUseAs), _separator(0), _terminator(0) {} diff --git a/src/Fog/FogFunction.cpp b/src/Fog/FogFunction.cpp index aca7d72..41347ea 100644 --- a/src/Fog/FogFunction.cpp +++ b/src/Fog/FogFunction.cpp @@ -437,7 +437,7 @@ FogFunction *FogFunction::deduce_specialisation(FogMakeSpecifierContext& makeSpe // Initialise map of parameters to be deduced. // FogExprSetOfRef deducedValues; - for (int i1 = firstNumber+1; i1 <= lastNumber; i1++) + for (size_t i1 = firstNumber+1; i1 <= lastNumber; i1++) { const FogTemplateParameterSpecifier& tP = templateParameters.template_parameter_number(i1); const FogName& tPN = tP.name(); @@ -492,7 +492,7 @@ FogFunction *FogFunction::deduce_specialisation(FogMakeSpecifierContext& makeSpe if (failedDeductions) return 0; FogListOfExprRef exprList(new FogListOfExpr, FogListOfExprRef::ADOPT); - for (int i2 = firstNumber+1; i2 <= lastNumber; i2++) + for (size_t i2 = firstNumber+1; i2 <= lastNumber; i2++) { const FogTemplateParameterSpecifier& tP = templateParameters.template_parameter_number(i2); const FogName& tPN = tP.name(); diff --git a/src/Fog/FogInline.cpp b/src/Fog/FogInline.cpp index 4a7a950..c04960d 100644 --- a/src/Fog/FogInline.cpp +++ b/src/Fog/FogInline.cpp @@ -38,7 +38,7 @@ bool FogInline_Flyweights::initialise() _flyweights[p->_inline_enum] = flyWeights[p->_inline_enum].pointer(); } _flyweights[FogInline::EXPLICIT_IF_SHORT] = &FogTokenType::get_inline(FogTokenType::INLINE); - for (int i = 0; i < (sizeof(_flyweights)/sizeof(_flyweights[0])); i++) + for (size_t i = 0; i < (sizeof(_flyweights)/sizeof(_flyweights[0])); i++) { if (!_flyweights[i]) { diff --git a/src/Fog/FogIterationDomain.cpp b/src/Fog/FogIterationDomain.cpp index fa881b3..79ac29a 100644 --- a/src/Fog/FogIterationDomain.cpp +++ b/src/Fog/FogIterationDomain.cpp @@ -16,15 +16,15 @@ TMPL_HACK_FIX_DO(FogIterationDomain) FogIterationDomain::FogIterationDomain() : _meta_type(FogMetaType::void_type()), - _executable_tokens(0), - _source_lines(0) + _source_lines(0), + _executable_tokens(0) {} FogIterationDomain::FogIterationDomain(const FogMetaType& metaType) : _meta_type(metaType), - _executable_tokens(0), - _source_lines(0) + _source_lines(0), + _executable_tokens(0) {} FogIterationDomain::FogIterationDomain(const This& tokenList) @@ -32,8 +32,8 @@ FogIterationDomain::FogIterationDomain(const This& tokenList) Super(tokenList), _meta_type(tokenList._meta_type), _tokens(tokenList._tokens), - _executable_tokens(tokenList._executable_tokens), - _source_lines(tokenList._source_lines) + _source_lines(tokenList._source_lines), + _executable_tokens(tokenList._executable_tokens) {} FogIterationDomain::~FogIterationDomain() {} diff --git a/src/Fog/FogLexerInput.cpp b/src/Fog/FogLexerInput.cpp index a40dfd6..dcb19d3 100644 --- a/src/Fog/FogLexerInput.cpp +++ b/src/Fog/FogLexerInput.cpp @@ -204,7 +204,7 @@ const char *FogLexerInput::get(FogTokenContext& tokenContext) } for ( ; !p->is_empty(); p->pop()) { - const char *stateName = stateName = p->get(tokenContext); + const char *stateName = p->get(tokenContext); if (stateName) { if (tokenContext.token().is_line() && _token.is_null()) @@ -772,7 +772,7 @@ const char *FogLexerInput_Stream::peek(FogTokenRef& tokenValue, size_t nextIndex while (nextIndex < _contents.tally()) // If replaying. { tokenValue = _contents[nextIndex++]; - if (!tokenValue->is_skip(skipWhite)); + if (!tokenValue->is_skip(skipWhite)) return ""; } return _lexer.peek(tokenValue, skipWhite); diff --git a/src/Fog/FogMakeSemantics.cpp b/src/Fog/FogMakeSemantics.cpp index 04aea39..8cd0fb0 100644 --- a/src/Fog/FogMakeSemantics.cpp +++ b/src/Fog/FogMakeSemantics.cpp @@ -217,7 +217,7 @@ bool FogMakeSemantics::make_specifier(FogBaseMakeSpecifierContext& aContext, Fog if (scopeSpecifier) return aContext.adopt_specifier(new FogTypeParameterSpecifier(aContext, *scopeSpecifier)); ERRMSG("BUG -- should have made template-type-parameter from an elaborated-type-specifier"); - false; + return false; } // case MAKE_USING: return new FogUsingSpecifier(aContext, *aName); case MAKE_VALUE_PARAMETER: diff --git a/src/Fog/FogMetaVariableSlot.cpp b/src/Fog/FogMetaVariableSlot.cpp index ecdf79e..3c4cb6a 100644 --- a/src/Fog/FogMetaVariableSlot.cpp +++ b/src/Fog/FogMetaVariableSlot.cpp @@ -78,21 +78,21 @@ FogMetaEntity *FogMetaVariableSlot::get_meta_entity(FogScopeContext& inScope) co FogMetaEntity *metaEntity = NULL;//found_meta_entities[this]; if (!metaEntity) { - inToken = get_scope_in(inScope); + inToken = get_scope_in(inScope); - VERBOSE(printf("DEBUG inToken %x\n", &inToken);) + VERBOSE(printf("DEBUG inToken %x\n", &inToken);) - if (!inToken) - return 0; + if (!inToken) + return 0; - VERBOSE(printf("DEBUG find entity %s\n", id().str());) + VERBOSE(printf("DEBUG find entity %s\n", id().str());) - metaEntity = inToken->find_meta_entity(id()); + metaEntity = inToken->find_meta_entity(id()); - VERBOSE(if (metaEntity) {std::strstream str;metaEntity->print_viz(str);printf("DEBUG found %x %s\n", metaEntity, str.str());}) + VERBOSE(if (metaEntity) {std::strstream str;metaEntity->print_viz(str);printf("DEBUG found %x %s\n", metaEntity, str.str());}) } else { - VERBOSE(printf("DEBUG old entity %x\n", metaEntity);) + VERBOSE(printf("DEBUG old entity %x\n", metaEntity);) } diff --git a/src/Fog/FogMultipleId.cpp b/src/Fog/FogMultipleId.cpp index 76dca62..4dd924f 100644 --- a/src/Fog/FogMultipleId.cpp +++ b/src/Fog/FogMultipleId.cpp @@ -29,8 +29,8 @@ FogMultipleId::FogMultipleId(const FogElementType& elementType) FogMultipleId::FogMultipleId(const This& thatName) : Super(thatName), - _element_type(thatName._element_type), _tokens(thatName._tokens), + _element_type(thatName._element_type), _resolved_id(thatName._resolved_id), _resolved(thatName._resolved), _resolved_in(thatName._resolved_in), diff --git a/src/Fog/FogParseContext.cpp b/src/Fog/FogParseContext.cpp index 39f8ac4..ee50d23 100644 --- a/src/Fog/FogParseContext.cpp +++ b/src/Fog/FogParseContext.cpp @@ -102,8 +102,8 @@ FogDeclarationParseContext::FogDeclarationParseContext(FogToken& aToken) FogDeclarationParseContext::FogDeclarationParseContext(FogToken& aToken, FogScopeContext& _scope_context) : - _static_token(aToken), - FogParseContext(_scope_context) + FogParseContext(_scope_context), + _static_token(aToken) // _target_file(0) {} diff --git a/src/Fog/FogParseContext.h b/src/Fog/FogParseContext.h index 2b87fad..005538b 100644 --- a/src/Fog/FogParseContext.h +++ b/src/Fog/FogParseContext.h @@ -180,7 +180,7 @@ class FogDecoratedParseContext : public FogParseContext private: FogParseContext& _parse_context; protected: - FogDecoratedParseContext(FogParseContext& parseContext) : _parse_context(parseContext), FogParseContext(parseContext) {} + FogDecoratedParseContext(FogParseContext& parseContext) : FogParseContext(parseContext), _parse_context(parseContext) {} FogParseContext& parse_context() { return _parse_context; } public: virtual const FogAccess& access() const; diff --git a/src/Fog/FogParser.cpp b/src/Fog/FogParser.cpp index 06ae30c..4a2d2b9 100644 --- a/src/Fog/FogParser.cpp +++ b/src/Fog/FogParser.cpp @@ -7413,7 +7413,7 @@ case 768: { yyval.declaration = YACC_DERIVED_CLAUSE(yyvsp[-4].expression, yyvsp[-1].subspace); ; break;} case 769: -{ yyval.declaration = yyval.declaration = YACC_DERIVED_CLAUSE(yyvsp[-8].expression, yyvsp[-5].subspace); YACC_UNBANG(yyvsp[-2].bang, "Bad object-statement."); ; +{ yyval.declaration = YACC_DERIVED_CLAUSE(yyvsp[-8].expression, yyvsp[-5].subspace); YACC_UNBANG(yyvsp[-2].bang, "Bad object-statement."); ; break;} case 772: { yyval.function_body = YACC_CTOR_FUNCTION_BLOCK(0, yyvsp[-1].mem_initializers); ; diff --git a/src/Fog/FogParser.y b/src/Fog/FogParser.y index 5d4d4ae..7a04d82 100644 --- a/src/Fog/FogParser.y +++ b/src/Fog/FogParser.y @@ -1673,7 +1673,7 @@ object_statement: ';' | derived_clause object_statement { $$ = YACC_DERIVED_CLAUSE($1, $2); } | derived_clause ':' '{' object_statement_seq.opt '}' { $$ = YACC_DERIVED_CLAUSE($1, $4); } | derived_clause ':' '{' object_statement_seq.opt looping_object_statement '#' bang error '#' - { $$ = $$ = YACC_DERIVED_CLAUSE($1, $4); YACC_UNBANG($7, "Bad object-statement."); } + { $$ = YACC_DERIVED_CLAUSE($1, $4); YACC_UNBANG($7, "Bad object-statement."); } function_used_block: function_block | function_try_block | ctor_initializer ';' { $$ = YACC_CTOR_FUNCTION_BLOCK(0, $1); } diff --git a/src/Fog/FogRoot.cpp b/src/Fog/FogRoot.cpp index d7de844..9704960 100644 --- a/src/Fog/FogRoot.cpp +++ b/src/Fog/FogRoot.cpp @@ -26,15 +26,15 @@ TMPL_HACK_FIX_DO(FogRoot) FogRoot::FogRoot() : Super(FogTag::namespace_tag(), *this, *PrimIdHandle("$null$")), - _reader(*this), _program("?"), + _reader(*this), _root_context(*this) {} FogRoot::FogRoot(const PrimId& anId) : Super(FogTag::namespace_tag(), *this, *PrimIdHandle(anId ? anId.str() : "")), - _reader(*this), _program("?"), + _reader(*this), _meta_base(new FogAuto(*this), FogScopeRef::ADOPT), _std(new FogStd(*this), FogScopeRef::ADOPT), _root_context(*this) { diff --git a/src/Fog/FogScope.cpp b/src/Fog/FogScope.cpp index 47fc871..f47d6da 100644 --- a/src/Fog/FogScope.cpp +++ b/src/Fog/FogScope.cpp @@ -68,13 +68,13 @@ FogScope::FogScope(const FogTag& aTag, FogScope& parentScope, const PrimId& anId : Super(parentScope, anId, anId), _nested(&parentScope == this ? 0 : parentScope.nesting_depth()+1), // Avoid recursion for global scope. - _templates(*this), _tag(aTag), _braced(false), _is_leaf(FogLazyBool::make_undecided()), _is_frozen(false), _done_meta_construct(false), - _inline_usage(0) + _inline_usage(0), + _templates(*this) {} FogScope::~FogScope() {} diff --git a/src/Fog/FogScopeContext.h b/src/Fog/FogScopeContext.h index 6ec447d..704e88c 100644 --- a/src/Fog/FogScopeContext.h +++ b/src/Fog/FogScopeContext.h @@ -142,8 +142,8 @@ class FogDecoratedScopeContext : public FogScopeContext private: This& operator=(const This& scopeContext); protected: - FogDecoratedScopeContext(FogScopeContext& scopeContext) : _context(scopeContext), Super(scopeContext, 123) {} - FogDecoratedScopeContext(This& scopeContext) : _context(scopeContext), Super(scopeContext, 123) {} + FogDecoratedScopeContext(FogScopeContext& scopeContext) : Super(scopeContext, 123), _context(scopeContext) {} + FogDecoratedScopeContext(This& scopeContext) : Super(scopeContext, 123), _context(scopeContext) {} public: FogScopeContext& scope_context() { return _context; } const FogScopeContext& scope_context() const { return _context; } diff --git a/src/Fog/FogSourceFile.cpp b/src/Fog/FogSourceFile.cpp index 5c17b79..ccdf2c1 100644 --- a/src/Fog/FogSourceFile.cpp +++ b/src/Fog/FogSourceFile.cpp @@ -14,8 +14,8 @@ TMPL_HACK_FIX_DO(FogSourceFile) FogSourceFile::FogSourceFile() : - _has_been_read(false), - _source_type(FogSourceFileType::invalid()) + _source_type(FogSourceFileType::invalid()), + _has_been_read(false) {} FogSourceFile::FogSourceFile(const PrimId& pathedId, const PrimId& fileIdent, @@ -23,8 +23,8 @@ FogSourceFile::FogSourceFile(const PrimId& pathedId, const PrimId& fileIdent, : _pathed_id(pathedId), _short_id(fileIdent), - _has_been_read(false), - _source_type(sourceType) + _source_type(sourceType), + _has_been_read(false) {} // const FogMetaType *FogSourceFile::meta_type() const { return &FogMetaType::source_file_type(); } diff --git a/src/Fog/FogString.cpp b/src/Fog/FogString.cpp index d786882..aeeccf1 100644 --- a/src/Fog/FogString.cpp +++ b/src/Fog/FogString.cpp @@ -30,8 +30,8 @@ FogString::FogString() FogString::FogString(const PrimId& rawId, const PrimId& binId, StringType stringType) : _raw_id(rawId), - _bin_id(binId), - _string_type(stringType) + _string_type(stringType), + _bin_id(binId) {} FogString::~FogString() {} diff --git a/src/Fog/FogSubstituteParser.cpp b/src/Fog/FogSubstituteParser.cpp index 26934b8..df84383 100644 --- a/src/Fog/FogSubstituteParser.cpp +++ b/src/Fog/FogSubstituteParser.cpp @@ -2043,7 +2043,7 @@ void FogSubstituteParser::substitute_hash_id(FogKeyword *anId) const FogTokenListOfRef& theTokens = replacementMacro.tokens(); bool gotWhite = false; // Flag compressing multi-white, stripping trailing white. bool gotNonWhite = false; // Flag stripping leading white. - for (int i = 0; i < theTokens.tally(); ++i) + for (size_t i = 0; i < theTokens.tally(); ++i) { const FogToken& theToken = *theTokens[i]; if (theToken.is_white()) diff --git a/src/Fog/FogTargetFile.cpp b/src/Fog/FogTargetFile.cpp index 488b989..5f56c60 100644 --- a/src/Fog/FogTargetFile.cpp +++ b/src/Fog/FogTargetFile.cpp @@ -32,9 +32,9 @@ TMPL_HACK_FIX_DO(FogTargetFile) FogTargetFile::FogTargetFile() : _source_file(0), - _is_input(false), _explicit_guard(false), _is_interface(false), + _is_input(false), _file_number(0), _min_usage_number(0), _max_usage_number(0), @@ -45,10 +45,10 @@ FogTargetFile::FogTargetFile(const FogSourceFile& sourceFile) _pathed_id(sourceFile.unique_id()), _short_id(sourceFile.short_id()), _source_file(&sourceFile), - _is_input(false), _utility(FogUtility::pool_utility()), _explicit_guard(false), _is_interface(false), + _is_input(false), _file_number(0), _min_usage_number(0), _max_usage_number(0), @@ -62,10 +62,10 @@ FogTargetFile::FogTargetFile(const PrimId& pathedId, const PrimId& fileIdent) _pathed_id(pathedId), _short_id(fileIdent), _source_file(0), - _is_input(false), _utility(FogUtility::pool_utility()), _explicit_guard(false), _is_interface(false), + _is_input(false), _file_number(0), _min_usage_number(0), _max_usage_number(0), diff --git a/src/Fog/FogTemplateManager.cpp b/src/Fog/FogTemplateManager.cpp index 296e41c..c9eebe0 100644 --- a/src/Fog/FogTemplateManager.cpp +++ b/src/Fog/FogTemplateManager.cpp @@ -18,14 +18,14 @@ TYPEINFO_SINGLE(FogTemplateManager, Super) FogTemplateManager::FogTemplateManager(FogEntity& primaryEntity) : - _classification(NON_TEMPLATE), - _primary(primaryEntity) + _primary(primaryEntity), + _classification(NON_TEMPLATE) {} FogTemplateManager::FogTemplateManager(FogEntity& primaryEntity, FogMakerContext& makerContext) : - _classification(classify_primary(makerContext)), _primary(primaryEntity), + _classification(classify_primary(makerContext)), _parameter_specifiers(is_templated() ? makerContext.template_parameters() : 0) { // install_parameters(makerContext); -- must be in caller to ensure that parent has become at least a FogScope @@ -34,8 +34,8 @@ FogTemplateManager::FogTemplateManager(FogEntity& primaryEntity, FogMakerContext FogTemplateManager::FogTemplateManager(FogMakeTemplateContext& makeTemplateContext) : - _classification(classify_secondary(makeTemplateContext)), _primary(makeTemplateContext.primary()), + _classification(classify_secondary(makeTemplateContext)), _arguments(makeTemplateContext.template_args()), _parameter_specifiers(makeTemplateContext.template_parameters()) { diff --git a/src/Fog/FogUsage.cpp b/src/Fog/FogUsage.cpp index 6517fe6..0f36367 100644 --- a/src/Fog/FogUsage.cpp +++ b/src/Fog/FogUsage.cpp @@ -249,9 +249,9 @@ TMPL_HACK_FIX_DO(FogUsage) FogUsage::FogUsage() : // _entity(FogEntity::mutable_null()), - _entity(0), // _type(NAME), _type(INVALID), + _entity(0), _file(0), _usage_number(0) {} diff --git a/src/Fog/FogUsageManager.cpp b/src/Fog/FogUsageManager.cpp index 8961380..6eb97a3 100644 --- a/src/Fog/FogUsageManager.cpp +++ b/src/Fog/FogUsageManager.cpp @@ -113,7 +113,7 @@ void FogUsageManager::compile() { while (true) { FogUsage *nextUsage = endUsage->pick_cyclic_use_of(*this); if (nextUsage == endUsage) { - int i = 0; + i = 0; } if (!nextUsage) // Only occurs if a bug has left endUsage acyclic diff --git a/src/Prim/Prim.h b/src/Prim/Prim.h index f9a1d08..33324f3 100644 --- a/src/Prim/Prim.h +++ b/src/Prim/Prim.h @@ -320,12 +320,14 @@ PRIM_AND_SHARED_MAP(T) #define PRIM_THAT_AND_LIST(T) PRIM_AND_LIST(T) #define PRIM_THAT_AND_1LIST(T) PRIM_AND_1LIST(T) +/* // typedef PrimSinglyLinkedListOfRefToConst name2(T,1ListOfRefToConst); \ // typedef PrimSinglyLinkedListOfRef name2(T,1ListOfRef); \ // typedef PrimSinglyLinkedListOfRefToConstIterator name2(T,1ListOfRefToConstIterator); \ // typedef PrimSinglyLinkedListOfRefIterator name2(T,1ListOfRefIterator); \ // typedef PrimConstSinglyLinkedListOfRefToConstIterator name2(T,Const1ListOfRefToConstIterator); \ // typedef PrimConstSinglyLinkedListOfRefIterator name2(T,1LinkedListOfRefIterator); +*/ #define PRIM_THAT_AND_MAP(T) PRIM_AND_MAP(T) #define PRIM_THAT_AND_REF(T) PRIM_AND_REF(T) #define PRIM_THAT_WITH_REF(T) PRIM_WITH_REF(T) diff --git a/src/Prim/PrimBits.h b/src/Prim/PrimBits.h index c87e3ca..00e4d44 100644 --- a/src/Prim/PrimBits.h +++ b/src/Prim/PrimBits.h @@ -4,7 +4,7 @@ - +/* // // \ PrimBit_TN defines bit N in an unsigned T. // \ PrimSignedBits_MTN defines a M bit field with least significant bit N in a signed T. @@ -52,7 +52,8 @@ // All standard one bit fields are predeclared. Multiple bit fields must be explicitly declared. // // When templates are available the () can be replaced by <>, and the declarations removed. -// +// +*/ #define PrimBit(T,aBit) name3(PrimBit_,T,aBit) #define PrimBitdeclare(T,N) \ class PrimBit(T,N) \ diff --git a/src/Prim/PrimBufRep.h b/src/Prim/PrimBufRep.h index f1e7deb..2fcdf97 100644 --- a/src/Prim/PrimBufRep.h +++ b/src/Prim/PrimBufRep.h @@ -55,7 +55,7 @@ class PrimBufRep // // Create a default string representation which is the null buffer representation. // - PrimBufRep() : _bytes(_null_buf), _share_count(0), _size(0) {} + PrimBufRep() : _bytes(_null_buf), _size(0), _share_count(0) {} ~PrimBufRep(); }; #endif diff --git a/src/Prim/PrimComToken.h b/src/Prim/PrimComToken.h index d05e877..741ea82 100644 --- a/src/Prim/PrimComToken.h +++ b/src/Prim/PrimComToken.h @@ -102,9 +102,11 @@ class PrimComToken : public PrimNamed /* Inclusion of PrimComToken used to include everything, so if this include file * is the first of the family to be included, the old policy is presumably assumed * so include the lot. Just to make the tests harder PrimComToken_Enum was separate. */ +/* // #if !defined(PRIMCOMPARSE_HXX) && (!defined(PRIMCOMTOKENSTR_HXX) || defined(PRIMCOMTOKEN_ENUM_HXX)) \ // && !defined(PRIMCOMTOKENSTRS_HXX) && !defined(PRIMCOMTOKEN_BOOL_HXX) && !defined(PRIMCOMTOKEN_DOUBLE_HXX) \ // && !defined(PRIMCOMTOKEN_INT_HXX) && !defined(PRIMCOMTOKEN_LONG_HXX) // #include +*/ #endif diff --git a/src/Prim/PrimComTokenStr.h b/src/Prim/PrimComTokenStr.h index 357b4e1..5fc30c9 100644 --- a/src/Prim/PrimComTokenStr.h +++ b/src/Prim/PrimComTokenStr.h @@ -31,7 +31,7 @@ class PrimComTokenStr : public PrimComToken // PrimComTokenStr(PrimComParse& aParser, const char *aName, const char *aUsage, const TokenOptions& someOptions, PrimStringHandle& theValue, const PrimString& defaultValue) - : Super(aParser, aName, aUsage, someOptions), _value(theValue), _default_value(defaultValue) {} + : Super(aParser, aName, aUsage, someOptions), _default_value(defaultValue), _value(theValue) {} virtual ~PrimComTokenStr(); virtual void initialise_parse(PrimComParse& aParser); virtual const char *parse_text(PrimComParse& aParser, const char *someText); diff --git a/src/Prim/PrimComToken_Bool.cpp b/src/Prim/PrimComToken_Bool.cpp index 5a7f072..3c91986 100644 --- a/src/Prim/PrimComToken_Bool.cpp +++ b/src/Prim/PrimComToken_Bool.cpp @@ -16,8 +16,8 @@ PrimComToken_Bool::PrimComToken_Bool(PrimComParse& aParser, bool &theValue, cons const char *aUsage, const TokenOptions& someOptions) : Super(aParser, aName, aUsage, someOptions), - _value(theValue), - _default_value(false) + _default_value(false), + _value(theValue) {} // @@ -28,8 +28,8 @@ PrimComToken_Bool::PrimComToken_Bool(PrimComParse& aParser, bool &theValue, cons const char *aUsage, const bool& defaultValue, const TokenOptions& someOptions) : Super(aParser, aName, aUsage, someOptions), - _value(theValue), - _default_value(defaultValue) + _default_value(defaultValue), + _value(theValue) {} // diff --git a/src/Prim/PrimComToken_Double.cpp b/src/Prim/PrimComToken_Double.cpp index 683bb80..c0a7a9e 100644 --- a/src/Prim/PrimComToken_Double.cpp +++ b/src/Prim/PrimComToken_Double.cpp @@ -16,8 +16,8 @@ PrimComToken_Double::PrimComToken_Double(PrimComParse& aParser, double &theValue const char *aUsage, const TokenOptions& someOptions) : Super(aParser, aName, aUsage, someOptions), - _value(theValue), - _default_value(0.0) + _default_value(0.0), + _value(theValue) {} // @@ -28,8 +28,8 @@ PrimComToken_Double::PrimComToken_Double(PrimComParse& aParser, double &theValue const char *aUsage, double defaultValue, const TokenOptions& someOptions) : Super(aParser, aName, aUsage, someOptions), - _value(theValue), - _default_value(defaultValue) + _default_value(defaultValue), + _value(theValue) {} // diff --git a/src/Prim/PrimComToken_Int.cpp b/src/Prim/PrimComToken_Int.cpp index efd3134..6733b81 100644 --- a/src/Prim/PrimComToken_Int.cpp +++ b/src/Prim/PrimComToken_Int.cpp @@ -17,8 +17,8 @@ PrimComToken_Int::PrimComToken_Int(PrimComParse& aParser, int &theValue, const c const char *aUsage, const TokenOptions& someOptions) : Super(aParser, aName, aUsage, someOptions), - _value(theValue), _default_value(0), + _value(theValue), _number_base(default_number_base()) {} @@ -32,8 +32,8 @@ PrimComToken_Int::PrimComToken_Int(PrimComParse& aParser, int &theValue, const c const char *aUsage, int defaultValue, const int& numberBase, const TokenOptions& someOptions) : Super(aParser, aName, aUsage, someOptions), - _value(theValue), _default_value(defaultValue), + _value(theValue), _number_base(numberBase) {} diff --git a/src/Prim/PrimComToken_Long.cpp b/src/Prim/PrimComToken_Long.cpp index 60c14fb..dabe40e 100644 --- a/src/Prim/PrimComToken_Long.cpp +++ b/src/Prim/PrimComToken_Long.cpp @@ -17,8 +17,8 @@ PrimComToken_Long::PrimComToken_Long(PrimComParse& aParser, long &theValue, cons const char *aUsage, const TokenOptions& someOptions) : Super(aParser, aName, aUsage, someOptions), - _value(theValue), _default_value(0), + _value(theValue), _number_base(default_number_base()) {} @@ -32,8 +32,8 @@ PrimComToken_Long::PrimComToken_Long(PrimComParse& aParser, long &theValue, cons const char *aUsage, long defaultValue, const int& numberBase, const TokenOptions& someOptions) : Super(aParser, aName, aUsage, someOptions), - _value(theValue), _default_value(defaultValue), + _value(theValue), _number_base(numberBase) {} diff --git a/src/Prim/PrimListOfRef.cpp b/src/Prim/PrimListOfRef.cpp index 315f2b4..7c77b2c 100644 --- a/src/Prim/PrimListOfRef.cpp +++ b/src/Prim/PrimListOfRef.cpp @@ -153,9 +153,9 @@ void PrimListOfRefImp::clone(const PrimRefFuncs& supportFunctions, const PrimLis // // Return a non-null pointer if anElement is non-null and matches one of the list pointers. // -const PrimRefValue *PrimListOfRefImp::find(const PrimRefFuncs& supportFunctions, const PrimRefValue& anElement) const +const PrimRefValue *PrimListOfRefImp::find(const PrimRefFuncs& /*supportFunctions*/, const PrimRefValue& anElement) const { - UNUSED(&supportFunctions); + /*UNUSED(&supportFunctions);*/ const PrimRefBase *p = contents(); for (size_t i = tally(); i-- > 0; p++) if (*p == anElement) @@ -252,9 +252,9 @@ std::ostream& PrimListOfRefImp::print_on(const PrimRefFuncs& supportFunctions, s // // Display the list dimensions as part of an inline diagnostic. // -std::ostream& PrimListOfRefImp::print_this(const PrimRefFuncs& supportFunctions, std::ostream& s) const +std::ostream& PrimListOfRefImp::print_this(const PrimRefFuncs& /*supportFunctions*/, std::ostream& s) const { - UNUSED(&supportFunctions); + /*UNUSED(&supportFunctions);*/ return (s << tally() << '/' << capacity()); } diff --git a/src/Prim/PrimMapOfRef.cpp b/src/Prim/PrimMapOfRef.cpp index 31698eb..4769277 100644 --- a/src/Prim/PrimMapOfRef.cpp +++ b/src/Prim/PrimMapOfRef.cpp @@ -540,9 +540,9 @@ std::ostream& PrimMapOfRefImp::print_on(const PrimMapOfRefFuncs& supportFunction // // Provide the dimensions as part of a brief diagnostic. // -std::ostream& PrimMapOfRefImp::print_this(const PrimMapOfRefFuncs& supportFunctions, std::ostream& s) const +std::ostream& PrimMapOfRefImp::print_this(const PrimMapOfRefFuncs& /*supportFunctions*/, std::ostream& s) const { - UNUSED(&supportFunctions); + /*UNUSED(&supportFunctions);*/ s << _tally << '/' << _capacity; return s; } diff --git a/src/Prim/PrimNotice.cpp b/src/Prim/PrimNotice.cpp index 6e26fe1..2d9fa9c 100644 --- a/src/Prim/PrimNotice.cpp +++ b/src/Prim/PrimNotice.cpp @@ -29,9 +29,9 @@ bool PrimNotice::not_posted() const // can respond to the message using the run-time type information mechanism and then use a message // specific method to post the notice. // -bool PrimNotice::posted_on(PrimNotifier& aNoticeBoard) const +bool PrimNotice::posted_on(PrimNotifier& /*aNoticeBoard*/) const { - UNUSED(&aNoticeBoard); + /*UNUSED(&aNoticeBoard);*/ return not_posted(); } diff --git a/src/Prim/PrimNotice.h b/src/Prim/PrimNotice.h index ea4133d..c00482f 100644 --- a/src/Prim/PrimNotice.h +++ b/src/Prim/PrimNotice.h @@ -39,7 +39,7 @@ class PrimNotice : public PrimPrint // augmenting with their own field comparisons. However this proved to be stupid for the test // suite which multiply inherited the notice and so had an inconsistent type for it. // - bool compare(const PrimNotice& aNotice) const { UNUSED(&aNotice); return (true); } + bool compare(const PrimNotice& /*aNotice*/) const { /*UNUSED(&aNotice);*/ return (true); } virtual bool not_posted() const; // // Report the notifier that posted this notice. The return may be 0 if unknown. diff --git a/src/Prim/PrimSinglyLinkedListOfRef.cpp b/src/Prim/PrimSinglyLinkedListOfRef.cpp index 28848f5..bc6e566 100644 --- a/src/Prim/PrimSinglyLinkedListOfRef.cpp +++ b/src/Prim/PrimSinglyLinkedListOfRef.cpp @@ -179,10 +179,10 @@ PrimSinglyLinkedListOfRefElement **PrimSinglyLinkedListOfRefImp::find(const Prim // // Return a non-null pointer if anElement is non-null and matches one of the list pointers. // -const PrimRefValue *PrimSinglyLinkedListOfRefImp::find(const PrimRefFuncs& supportFunctions, +const PrimRefValue *PrimSinglyLinkedListOfRefImp::find(const PrimRefFuncs& /*supportFunctions*/, const PrimRefValue& anElement) const { - UNUSED(&supportFunctions); + /*UNUSED(&supportFunctions);*/ return find(anElement) ? &anElement : 0; } @@ -298,10 +298,10 @@ std::ostream& PrimSinglyLinkedListOfRefImp::print_on(const PrimRefFuncs& support // // Display the list dimensions as part of an inline diagnostic. // -std::ostream& PrimSinglyLinkedListOfRefImp::print_this(const PrimRefFuncs& supportFunctions, +std::ostream& PrimSinglyLinkedListOfRefImp::print_this(const PrimRefFuncs& /*supportFunctions*/, std::ostream& s) const { - UNUSED(&supportFunctions); + /*UNUSED(&supportFunctions);*/ return s << tally(); }