69b95f49f1
Summary: * Clean CMICmdArgValString::Validate: now it's based on CMIUtilString::SplitConsiderQuotes method: A bit of introduction: # Command line is wrapped into CMICmdArgContext. # CMICmdArgSet is a set of arguments to be parsed. This class contains CMICmdArgContext as a private member. # MI command is class which is inhereted from CMICmdBase. It contains CMICmdArgSet as a private member. When command is executed CMICmdBase::ParseArgs() is called. This method adds args for parsing using CMICmdArgSet::Add(). Then CMICmdBase::ParseValidateCmdOptions() is called, which calls CMICmdArgSet::Validate(). Then it gets a number of arguments (using SplitConsiderQuotes().array_length) and for each arguments registered in ParseArgs() tries to validate it using CMICmdArgValBase::Validate(). Every user commands parses this string again (first time it was made in SplitConsiderQuotes) and in case of CMICmdArgValString it was made incorrectly. It searches the first and last quotes (but it should be first and next after first). Besides, it was splitted into 4 cases. I'm just using SplitConsiderQuotes directly, and I don't split them by hand again. Actually, I think we should do so in every CMICmdArgVal_XXX::Validate() method. * Enable MiInterpreterExecTestCase.test_lldbmi_target_create test * Fix MiExecTestCase.test_lldbmi_exec_arguments_set test All tests pass on OS X. Reviewers: abidh, emaste, zturner, clayborg Reviewed By: clayborg Subscribers: lldb-commits, zturner, emaste, clayborg, abidh Differential Revision: http://reviews.llvm.org/D7860 llvm-svn: 230654
96 lines
3.4 KiB
C++
96 lines
3.4 KiB
C++
//===-- MIUtilString.h ------------------------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//++
|
|
// File: MIUtilString.h
|
|
//
|
|
// Overview: CMIUtilString interface.
|
|
//
|
|
// Environment: Compilers: Visual C++ 12.
|
|
// gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
|
|
// Libraries: See MIReadmetxt.
|
|
//
|
|
// Copyright: None.
|
|
//--
|
|
|
|
#pragma once
|
|
|
|
// Third party headers:
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
// In-house headers:
|
|
#include "MIDataTypes.h"
|
|
|
|
//++ ============================================================================
|
|
// Details: MI common code utility class. Used to help handle text.
|
|
// Derived from std::string
|
|
// Gotchas: None.
|
|
// Authors: Illya Rudkin 02/02/2014.
|
|
// Changes: None.
|
|
//--
|
|
class CMIUtilString : public std::string
|
|
{
|
|
// Typdefs:
|
|
public:
|
|
typedef std::vector<CMIUtilString> VecString_t;
|
|
|
|
// Static method:
|
|
public:
|
|
static CMIUtilString Format(const CMIUtilString vFormating, ...);
|
|
static CMIUtilString FormatBinary(const MIuint64 vnDecimal);
|
|
static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs);
|
|
static bool IsAllValidAlphaAndNumeric(const MIchar &vrText);
|
|
static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs);
|
|
|
|
// Methods:
|
|
public:
|
|
/* ctor */ CMIUtilString(void);
|
|
/* ctor */ CMIUtilString(const MIchar *vpData);
|
|
/* ctor */ CMIUtilString(const MIchar *const *vpData);
|
|
//
|
|
bool ExtractNumber(MIint64 &vwrNumber) const;
|
|
CMIUtilString FindAndReplace(const CMIUtilString &vFind, const CMIUtilString &vReplaceWith) const;
|
|
bool IsNumber(void) const;
|
|
bool IsHexadecimalNumber(void) const;
|
|
bool IsQuoted(void) const;
|
|
CMIUtilString RemoveRepeatedCharacters(const MIchar vChar);
|
|
MIuint Split(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const;
|
|
MIuint SplitConsiderQuotes(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const;
|
|
MIuint SplitLines(VecString_t &vwVecSplits) const;
|
|
CMIUtilString StripCREndOfLine(void) const;
|
|
CMIUtilString StripCRAll(void) const;
|
|
CMIUtilString Trim(void) const;
|
|
CMIUtilString Trim(const MIchar vChar) const;
|
|
MIuint FindFirst(const CMIUtilString &vrPattern, const MIuint vnPos = 0) const;
|
|
MIuint FindFirst(const CMIUtilString &vrPattern, const bool vbSkipQuotedText, bool &vrwbNotFoundClosedQuote,
|
|
const MIuint vnPos = 0) const;
|
|
MIuint FindFirstNot(const CMIUtilString &vrPattern, const MIuint vnPos = 0) const;
|
|
CMIUtilString Escape(const bool vbEscapeQuotes = false) const;
|
|
CMIUtilString AddSlashes(void) const;
|
|
CMIUtilString StripSlashes(void) const;
|
|
//
|
|
CMIUtilString &operator=(const MIchar *vpRhs);
|
|
CMIUtilString &operator=(const std::string &vrRhs);
|
|
|
|
// Overrideable:
|
|
public:
|
|
/* dtor */ virtual ~CMIUtilString(void);
|
|
|
|
// Static method:
|
|
private:
|
|
static CMIUtilString FormatPriv(const CMIUtilString &vrFormat, va_list vArgs);
|
|
|
|
// Methods:
|
|
private:
|
|
bool ExtractNumberFromHexadecimal(MIint64 &vwrNumber) const;
|
|
CMIUtilString RemoveRepeatedCharacters(const MIint vnPos, const MIchar vChar);
|
|
MIuint FindFirstQuote(const MIuint vnPos) const;
|
|
};
|