Index: lldb/trunk/tools/lldb-mi/MICmdArgSet.h =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdArgSet.h +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.h @@ -60,7 +60,7 @@ public: /* ctor */ CMICmdArgSet(); - void Add(const CMICmdArgValBase &vArg); + void Add(CMICmdArgValBase *vArg); bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const; const SetCmdArgs_t &GetArgsThatAreMissing() const; const SetCmdArgs_t &GetArgsThatInvalid() const; Index: lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp @@ -94,10 +94,9 @@ // Throws: None. //-- void -CMICmdArgSet::Add(const CMICmdArgValBase &vArg) +CMICmdArgSet::Add(CMICmdArgValBase *vArg) { - CMICmdArgValBase *pArg = const_cast(&vArg); - m_setCmdArgs.push_back(pArg); + m_setCmdArgs.push_back(vArg); } //++ ------------------------------------------------------------------------------------ @@ -169,25 +168,25 @@ SetCmdArgs_t::const_iterator it = m_setCmdArgs.begin(); while (it != m_setCmdArgs.end()) { - const CMICmdArgValBase *pArg(*it); + CMICmdArgValBase *pArg = *it; - if (!const_cast(pArg)->Validate(vwCmdArgsText)) + if (!pArg->Validate(vwCmdArgsText)) { if (pArg->GetFound()) { if (pArg->GetIsMissingOptions()) - m_setCmdArgsMissingInfo.push_back(const_cast(pArg)); + m_setCmdArgsMissingInfo.push_back(pArg); else if (!pArg->GetValid()) - m_setCmdArgsThatNotValid.push_back(const_cast(pArg)); + m_setCmdArgsThatNotValid.push_back(pArg); } else if (pArg->GetIsMandatory()) - m_setCmdArgsThatAreMissing.push_back(const_cast(pArg)); + m_setCmdArgsThatAreMissing.push_back(pArg); } if (pArg->GetFound() && !pArg->GetIsHandledByCmd()) { m_bIsArgsPresentButNotHandledByCmd = true; - m_setCmdArgsNotHandledByCmd.push_back(const_cast(pArg)); + m_setCmdArgsNotHandledByCmd.push_back(pArg); } // Next Index: lldb/trunk/tools/lldb-mi/MICmdCmdBreak.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdBreak.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdBreak.cpp @@ -89,21 +89,21 @@ bool CMICmdCmdBreakInsert::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgNamedTempBrkPt, false, true))); - // Not implemented m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedHWBrkPt, false, false ) ) ); - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgNamedPendinfBrkPt, false, true, - CMICmdArgValListBase::eArgValType_StringQuotedNumberPath, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgNamedDisableBrkPt, false, false))); - // Not implemented m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedTracePt, false, false ) ) ); - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgNamedConditionalBrkPt, false, true, - CMICmdArgValListBase::eArgValType_StringQuoted, 1))); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgNamedTempBrkPt, false, true)); + // Not implemented m_setCmdArgs.Add(new CMICmdArgValOptionShort( m_constStrArgNamedHWBrkPt, false, false)); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgNamedPendinfBrkPt, false, true, + CMICmdArgValListBase::eArgValType_StringQuotedNumberPath, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgNamedDisableBrkPt, false, false)); + // Not implemented m_setCmdArgs.Add(new CMICmdArgValOptionShort( m_constStrArgNamedTracePt, false, false)); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgNamedConditionalBrkPt, false, true, + CMICmdArgValListBase::eArgValType_StringQuoted, 1)); m_setCmdArgs.Add( - *(new CMICmdArgValOptionShort(m_constStrArgNamedInoreCnt, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgNamedRestrictBrkPtToThreadId, false, true, - CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgNamedLocation, false, true))); + new CMICmdArgValOptionShort(m_constStrArgNamedInoreCnt, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgNamedRestrictBrkPtToThreadId, false, true, + CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedLocation, false, true)); m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgNamedThreadGroup, false, true, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); + new CMICmdArgValOptionLong(m_constStrArgNamedThreadGroup, false, true, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); return ParseValidateCmdOptions(); } @@ -405,8 +405,8 @@ CMICmdCmdBreakDelete::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValListOfN(m_constStrArgNamedBrkPt, true, true, CMICmdArgValListBase::eArgValType_Number))); + new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); + m_setCmdArgs.Add(new CMICmdArgValListOfN(m_constStrArgNamedBrkPt, true, true, CMICmdArgValListBase::eArgValType_Number)); return ParseValidateCmdOptions(); } @@ -524,8 +524,8 @@ CMICmdCmdBreakDisable::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValListOfN(m_constStrArgNamedBrkPt, true, true, CMICmdArgValListBase::eArgValType_Number))); + new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); + m_setCmdArgs.Add(new CMICmdArgValListOfN(m_constStrArgNamedBrkPt, true, true, CMICmdArgValListBase::eArgValType_Number)); return ParseValidateCmdOptions(); } @@ -663,8 +663,8 @@ CMICmdCmdBreakEnable::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValListOfN(m_constStrArgNamedBrkPt, true, true, CMICmdArgValListBase::eArgValType_Number))); + new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); + m_setCmdArgs.Add(new CMICmdArgValListOfN(m_constStrArgNamedBrkPt, true, true, CMICmdArgValListBase::eArgValType_Number)); return ParseValidateCmdOptions(); } @@ -803,9 +803,9 @@ CMICmdCmdBreakAfter::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNamedNumber, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNamedCount, true, true))); + new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNamedNumber, true, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNamedCount, true, true)); return ParseValidateCmdOptions(); } @@ -934,11 +934,11 @@ CMICmdCmdBreakCondition::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNamedNumber, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgNamedExpr, true, true, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValListOfN(m_constStrArgNamedExprNoQuotes, false, false, - CMICmdArgValListBase::eArgValType_StringQuotedNumber))); + new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNamedNumber, true, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedExpr, true, true, true, true)); + m_setCmdArgs.Add(new CMICmdArgValListOfN(m_constStrArgNamedExprNoQuotes, false, false, + CMICmdArgValListBase::eArgValType_StringQuotedNumber)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp @@ -90,9 +90,9 @@ bool CMICmdCmdDataEvaluateExpression::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, false, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgFrame, false, false, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgExpr, true, true, true, true))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, false, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgFrame, false, false, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgExpr, true, true, true, true)); return ParseValidateCmdOptions(); } @@ -277,13 +277,13 @@ bool CMICmdCmdDataDisassemble::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); m_setCmdArgs.Add( - *(new CMICmdArgValOptionShort(m_constStrArgAddrStart, true, true, CMICmdArgValListBase::eArgValType_StringQuotedNumber, 1))); + new CMICmdArgValOptionShort(m_constStrArgAddrStart, true, true, CMICmdArgValListBase::eArgValType_StringQuotedNumber, 1)); m_setCmdArgs.Add( - *(new CMICmdArgValOptionShort(m_constStrArgAddrEnd, true, true, CMICmdArgValListBase::eArgValType_StringQuotedNumber, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValConsume(m_constStrArgConsume, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgMode, true, true))); + new CMICmdArgValOptionShort(m_constStrArgAddrEnd, true, true, CMICmdArgValListBase::eArgValType_StringQuotedNumber, 1)); + m_setCmdArgs.Add(new CMICmdArgValConsume(m_constStrArgConsume, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgMode, true, true)); return ParseValidateCmdOptions(); } @@ -506,11 +506,11 @@ bool CMICmdCmdDataReadMemoryBytes::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgByteOffset, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgAddrExpr, true, true, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNumBytes, true, true))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgByteOffset, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgAddrExpr, true, true, true, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNumBytes, true, true)); return ParseValidateCmdOptions(); } @@ -822,8 +822,8 @@ bool CMICmdCmdDataListRegisterNames::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThreadGroup, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValListOfN(m_constStrArgRegNo, false, false, CMICmdArgValListBase::eArgValType_Number))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThreadGroup, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); + m_setCmdArgs.Add(new CMICmdArgValListOfN(m_constStrArgRegNo, false, false, CMICmdArgValListBase::eArgValType_Number)); return ParseValidateCmdOptions(); } @@ -1012,10 +1012,10 @@ bool CMICmdCmdDataListRegisterValues::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, false, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgSkip, false, false))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgFormat, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValListOfN(m_constStrArgRegNo, false, true, CMICmdArgValListBase::eArgValType_Number))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, false, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgSkip, false, false)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgFormat, true, true)); + m_setCmdArgs.Add(new CMICmdArgValListOfN(m_constStrArgRegNo, false, true, CMICmdArgValListBase::eArgValType_Number)); return ParseValidateCmdOptions(); } @@ -1322,10 +1322,10 @@ bool CMICmdCmdDataWriteMemoryBytes::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, false, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgAddr, true, true, false, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgContents, true, true, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgCount, false, true, false, true))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, false, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgAddr, true, true, false, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgContents, true, true, true, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgCount, false, true, false, true)); return ParseValidateCmdOptions(); } @@ -1444,12 +1444,12 @@ bool CMICmdCmdDataWriteMemory::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, false, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgOffset, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgAddr, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgD, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNumber, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgContents, true, true))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, false, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgOffset, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgAddr, true, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgD, true, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNumber, true, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgContents, true, true)); return ParseValidateCmdOptions(); } @@ -1587,7 +1587,7 @@ bool CMICmdCmdDataInfoLine::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgLocation, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgLocation, true, true)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdEnviro.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdEnviro.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdEnviro.cpp @@ -57,7 +57,7 @@ bool CMICmdCmdEnvironmentCd::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValFile(m_constStrArgNamePathDir, true, true))); + m_setCmdArgs.Add(new CMICmdArgValFile(m_constStrArgNamePathDir, true, true)); CMICmdArgContext argCntxt(m_cmdData.strMiCmdOption); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdExec.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdExec.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdExec.cpp @@ -315,8 +315,8 @@ bool CMICmdCmdExecNext::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNumber, false, false))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNumber, false, false)); return ParseValidateCmdOptions(); } @@ -441,8 +441,8 @@ bool CMICmdCmdExecStep::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNumber, false, false))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNumber, false, false)); return ParseValidateCmdOptions(); } @@ -567,8 +567,8 @@ bool CMICmdCmdExecNextInstruction::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNumber, false, false))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNumber, false, false)); return ParseValidateCmdOptions(); } @@ -693,8 +693,8 @@ bool CMICmdCmdExecStepInstruction::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNumber, false, false))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNumber, false, false)); return ParseValidateCmdOptions(); } @@ -819,8 +819,8 @@ bool CMICmdCmdExecFinish::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgFrame, false, false, CMICmdArgValListBase::eArgValType_Number, 1))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgFrame, false, false, CMICmdArgValListBase::eArgValType_Number, 1)); return ParseValidateCmdOptions(); } @@ -1047,7 +1047,7 @@ CMICmdCmdExecArguments::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValListOfN(m_constStrArgArguments, false, true, CMICmdArgValListBase::eArgValType_StringAnything))); + new CMICmdArgValListOfN(m_constStrArgArguments, false, true, CMICmdArgValListBase::eArgValType_StringAnything)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp @@ -67,12 +67,12 @@ CMICmdCmdFileExecAndSymbols::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValFile(m_constStrArgNameFile, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgNamedPlatformName, false, true, - CMICmdArgValListBase::eArgValType_String, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgNamedRemotePath, false, true, - CMICmdArgValListBase::eArgValType_StringQuotedNumberPath, 1))); + new CMICmdArgValOptionLong(m_constStrArgThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); + m_setCmdArgs.Add(new CMICmdArgValFile(m_constStrArgNameFile, true, true)); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgNamedPlatformName, false, true, + CMICmdArgValListBase::eArgValType_String, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgNamedRemotePath, false, true, + CMICmdArgValListBase::eArgValType_StringQuotedNumberPath, 1)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp @@ -68,7 +68,7 @@ bool CMICmdCmdGdbInfo::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgNamedPrint, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedPrint, true, true)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdGdbSet.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdGdbSet.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdGdbSet.cpp @@ -73,9 +73,9 @@ CMICmdCmdGdbSet::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); + new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); m_setCmdArgs.Add( - *(new CMICmdArgValListOfN(m_constStrArgNamedGdbOption, true, true, CMICmdArgValListBase::eArgValType_StringAnything))); + new CMICmdArgValListOfN(m_constStrArgNamedGdbOption, true, true, CMICmdArgValListBase::eArgValType_StringAnything)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdGdbShow.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdGdbShow.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdGdbShow.cpp @@ -77,9 +77,9 @@ CMICmdCmdGdbShow::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); + new CMICmdArgValOptionLong(m_constStrArgNamedThreadGrp, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); m_setCmdArgs.Add( - *(new CMICmdArgValListOfN(m_constStrArgNamedGdbOption, true, true, CMICmdArgValListBase::eArgValType_StringAnything))); + new CMICmdArgValListOfN(m_constStrArgNamedGdbOption, true, true, CMICmdArgValListBase::eArgValType_StringAnything)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.cpp @@ -171,11 +171,11 @@ bool CMICmdCmdListThreadGroups::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgNamedAvailable, false, true))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgNamedAvailable, false, true)); m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgNamedRecurse, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValListOfN(m_constStrArgNamedGroup, false, true, CMICmdArgValListBase::eArgValType_Number))); - m_setCmdArgs.Add(*(new CMICmdArgValThreadGrp(m_constStrArgNamedThreadGroup, false, true))); + new CMICmdArgValOptionLong(m_constStrArgNamedRecurse, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValListOfN(m_constStrArgNamedGroup, false, true, CMICmdArgValListBase::eArgValType_Number)); + m_setCmdArgs.Add(new CMICmdArgValThreadGrp(m_constStrArgNamedThreadGroup, false, true)); return ParseValidateCmdOptions(); } @@ -430,8 +430,8 @@ bool CMICmdCmdInterpreterExec::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgNamedInterpreter, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgNamedCommand, true, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedInterpreter, true, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedCommand, true, true, true)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp @@ -74,8 +74,8 @@ bool CMICmdCmdStackInfoDepth::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgMaxDepth, false, false))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgMaxDepth, false, false)); return ParseValidateCmdOptions(); } @@ -300,9 +300,9 @@ bool CMICmdCmdStackListFrames::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrameLow, false, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrameHigh, false, true))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrameLow, false, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrameHigh, false, true)); return ParseValidateCmdOptions(); } @@ -481,10 +481,10 @@ bool CMICmdCmdStackListArguments::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrameLow, false, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrameHigh, false, true))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrameLow, false, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrameHigh, false, true)); return ParseValidateCmdOptions(); } @@ -666,9 +666,9 @@ bool CMICmdCmdStackListLocals::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true)); return ParseValidateCmdOptions(); } @@ -829,9 +829,9 @@ bool CMICmdCmdStackListVariables::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValPrintValues(m_constStrArgPrintValues, true, true)); return ParseValidateCmdOptions(); } @@ -988,7 +988,7 @@ bool CMICmdCmdStackSelectFrame::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrame, true, false))); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrame, true, false)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdSupportInfo.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdSupportInfo.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdSupportInfo.cpp @@ -58,7 +58,7 @@ bool CMICmdCmdSupportInfoMiCmdQuery::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgCmdName, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgCmdName, true, true)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp @@ -60,7 +60,7 @@ bool CMICmdCmdSymbolListLines::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValFile(m_constStrArgNameFile, true, true))); + m_setCmdArgs.Add(new CMICmdArgValFile(m_constStrArgNameFile, true, true)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdTarget.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdTarget.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdTarget.cpp @@ -67,8 +67,8 @@ bool CMICmdCmdTargetSelect::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgNamedType, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgNamedParameters, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedType, true, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedParameters, true, true)); return ParseValidateCmdOptions(); } @@ -250,10 +250,10 @@ bool CMICmdCmdTargetAttach::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgPid, false, true))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionShort(m_constStrArgNamedFile, false, true, - CMICmdArgValListBase::eArgValType_String, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgWaitFor, false, true))); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgPid, false, true)); + m_setCmdArgs.Add(new CMICmdArgValOptionShort(m_constStrArgNamedFile, false, true, + CMICmdArgValListBase::eArgValType_String, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgWaitFor, false, true)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdThread.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdThread.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdThread.cpp @@ -64,7 +64,7 @@ bool CMICmdCmdThreadInfo::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgNamedThreadId, false, true))); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgNamedThreadId, false, true)); return ParseValidateCmdOptions(); } Index: lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp @@ -88,13 +88,13 @@ bool CMICmdCmdVarCreate::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgThread, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); m_setCmdArgs.Add( - *(new CMICmdArgValOptionLong(m_constStrArgThreadGroup, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgName, false, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgFrameAddr, false, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgExpression, true, true, true, true))); + new CMICmdArgValOptionLong(m_constStrArgThreadGroup, false, false, CMICmdArgValListBase::eArgValType_ThreadGrp, 1)); + m_setCmdArgs.Add(new CMICmdArgValOptionLong(m_constStrArgFrame, false, true, CMICmdArgValListBase::eArgValType_Number, 1)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgName, false, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgFrameAddr, false, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgExpression, true, true, true, true)); return ParseValidateCmdOptions(); } @@ -353,8 +353,8 @@ bool CMICmdCmdVarUpdate::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValPrintValues(m_constStrArgPrintValues, false, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgName, true, true))); + m_setCmdArgs.Add(new CMICmdArgValPrintValues(m_constStrArgPrintValues, false, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgName, true, true)); return ParseValidateCmdOptions(); } @@ -558,7 +558,7 @@ bool CMICmdCmdVarDelete::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgName, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgName, true, true)); return ParseValidateCmdOptions(); } @@ -671,8 +671,8 @@ bool CMICmdCmdVarAssign::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgName, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgExpression, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgName, true, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgExpression, true, true)); return ParseValidateCmdOptions(); } @@ -804,8 +804,8 @@ bool CMICmdCmdVarSetFormat::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgName, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgFormatSpec, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgName, true, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgFormatSpec, true, true)); return ParseValidateCmdOptions(); } @@ -951,10 +951,10 @@ bool CMICmdCmdVarListChildren::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValPrintValues(m_constStrArgPrintValues, false, true))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgName, true, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgFrom, false, true))); - m_setCmdArgs.Add(*(new CMICmdArgValNumber(m_constStrArgTo, false, true))); + m_setCmdArgs.Add(new CMICmdArgValPrintValues(m_constStrArgPrintValues, false, true)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgName, true, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgFrom, false, true)); + m_setCmdArgs.Add(new CMICmdArgValNumber(m_constStrArgTo, false, true)); return ParseValidateCmdOptions(); } @@ -1159,8 +1159,8 @@ CMICmdCmdVarEvaluateExpression::ParseArgs() { m_setCmdArgs.Add( - *(new CMICmdArgValOptionShort(m_constStrArgFormatSpec, false, false, CMICmdArgValListBase::eArgValType_String, 1))); - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgName, true, true))); + new CMICmdArgValOptionShort(m_constStrArgFormatSpec, false, false, CMICmdArgValListBase::eArgValType_String, 1)); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgName, true, true)); return ParseValidateCmdOptions(); } @@ -1286,7 +1286,7 @@ bool CMICmdCmdVarInfoPathExpression::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgName, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgName, true, true)); return ParseValidateCmdOptions(); } @@ -1446,7 +1446,7 @@ bool CMICmdCmdVarShowAttributes::ParseArgs() { - m_setCmdArgs.Add(*(new CMICmdArgValString(m_constStrArgName, true, true))); + m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgName, true, true)); return ParseValidateCmdOptions(); }