095b128671
GetVariableInfo () collected the values of the variable in a list. But it also tried to generate the name/value pairs for children. This caused generation of a wrong value string for may items. This function has been fixed to put value in the list only. The handling of --print-value related option has been moved to caller. GetVariableInfo2 and MIResponseFormVariableInfo3 have been removed. They were almost the duplicate of functions of similar names. I dont see any difference in the output of -stack-list-locals and -stack-list-arguments. So these functions just seemed unnecessary. Char variable was being printed as a string which caused garbage output. This has been fixed. Some misc. cleanup. Test cases have been added that check -stack-list-locals for struct, array and pointers. Modified other tests which depended on hard coded line numbers. Reviewed in http://reviews.llvm.org/D7589 llvm-svn: 229102
213 lines
6.6 KiB
C++
213 lines
6.6 KiB
C++
//===-- Platform.cpp --------------------------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//++
|
|
// File: MICmnMIValueList.h
|
|
//
|
|
// Overview: CMICmnMIValueList implementation.
|
|
//
|
|
// Environment: Compilers: Visual C++ 12.
|
|
// gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
|
|
// Libraries: See MIReadmetxt.
|
|
//
|
|
// Copyright: None.
|
|
//--
|
|
|
|
// In-house headers:
|
|
#include "MICmnMIValueList.h"
|
|
#include "MICmnResources.h"
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: CMICmnMIValueList constructor.
|
|
// Type: Method.
|
|
// Args: vbValueTypeList - (R) True = yes value type list, false = result type list.
|
|
// Return: None.
|
|
// Throws: None.
|
|
//--
|
|
CMICmnMIValueList::CMICmnMIValueList(const bool vbValueTypeList)
|
|
{
|
|
m_strValue = "[]";
|
|
}
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: CMICmnMIValueList constructor.
|
|
// Construct a results only list.
|
|
// return MIstatus::failure.
|
|
// Type: Method.
|
|
// Args: vResult - (R) MI result object.
|
|
// Return: None.
|
|
// Throws: None.
|
|
//--
|
|
CMICmnMIValueList::CMICmnMIValueList(const CMICmnMIValueResult &vResult)
|
|
{
|
|
m_strValue = vResult.GetString();
|
|
BuildList();
|
|
m_bJustConstructed = false;
|
|
}
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: CMICmnMIValueList constructor.
|
|
// Construct a value only list.
|
|
// Type: Method.
|
|
// Args: vValue - (R) MI value object.
|
|
// Return: None.
|
|
// Throws: None.
|
|
//--
|
|
CMICmnMIValueList::CMICmnMIValueList(const CMICmnMIValue &vValue)
|
|
{
|
|
m_strValue = vValue.GetString();
|
|
BuildList();
|
|
m_bJustConstructed = false;
|
|
}
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: CMICmnMIValueList destructor.
|
|
// Type: Overrideable.
|
|
// Args: None.
|
|
// Return: None.
|
|
// Throws: None.
|
|
//--
|
|
CMICmnMIValueList::~CMICmnMIValueList(void)
|
|
{
|
|
}
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: Build the result value's mandatory data part, one tuple
|
|
// Type: Method.
|
|
// Args: None.
|
|
// Return: MIstatus::success - Functional succeeded.
|
|
// MIstatus::failure - Functional failed.
|
|
// Throws: None.
|
|
//--
|
|
bool
|
|
CMICmnMIValueList::BuildList(void)
|
|
{
|
|
const MIchar *pFormat = "[%s]";
|
|
m_strValue = CMIUtilString::Format(pFormat, m_strValue.c_str());
|
|
|
|
return MIstatus::success;
|
|
}
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: Add another MI result object to the value list's of list is results.
|
|
// Only result obejcts can be added to a list of result otherwise this function
|
|
// will return MIstatus::failure.
|
|
// Type: Method.
|
|
// Args: vResult - (R) The MI result object.
|
|
// Return: MIstatus::success - Functional succeeded.
|
|
// MIstatus::failure - Functional failed.
|
|
// Throws: None.
|
|
//--
|
|
bool
|
|
CMICmnMIValueList::Add(const CMICmnMIValueResult &vResult)
|
|
{
|
|
return BuildList(vResult);
|
|
}
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: Add another MI value object to the value list's of list is values.
|
|
// Only values objects can be added to a list of values otherwise this function
|
|
// will return MIstatus::failure.
|
|
// Type: Method.
|
|
// Args: vValue - (R) The MI value object.
|
|
// Return: MIstatus::success - Functional succeeded.
|
|
// MIstatus::failure - Functional failed.
|
|
// Throws: None.
|
|
//--
|
|
bool
|
|
CMICmnMIValueList::Add(const CMICmnMIValue &vValue)
|
|
{
|
|
return BuildList(vValue);
|
|
}
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: Add another MI result object to the value list's of list is results.
|
|
// Only result obejcts can be added to a list of result otherwise this function
|
|
// will return MIstatus::failure.
|
|
// Type: Method.
|
|
// Args: vResult - (R) The MI result object.
|
|
// Return: MIstatus::success - Functional succeeded.
|
|
// MIstatus::failure - Functional failed.
|
|
// Throws: None.
|
|
//--
|
|
bool
|
|
CMICmnMIValueList::BuildList(const CMICmnMIValueResult &vResult)
|
|
{
|
|
// Clear out the default "<Invalid>" text
|
|
if (m_bJustConstructed)
|
|
{
|
|
m_bJustConstructed = false;
|
|
m_strValue = vResult.GetString();
|
|
return BuildList();
|
|
}
|
|
|
|
const CMIUtilString data(ExtractContentNoBrackets());
|
|
const MIchar *pFormat = "[%s,%s]";
|
|
m_strValue = CMIUtilString::Format(pFormat, data.c_str(), vResult.GetString().c_str());
|
|
|
|
return MIstatus::success;
|
|
}
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: Add another MI value object to the value list's of list is values.
|
|
// Only values objects can be added to a list of values otherwise this function
|
|
// will return MIstatus::failure.
|
|
// Type: Method.
|
|
// Args: vValue - (R) The MI value object.
|
|
// Return: MIstatus::success - Functional succeeded.
|
|
// MIstatus::failure - Functional failed.
|
|
// Throws: None.
|
|
//--
|
|
bool
|
|
CMICmnMIValueList::BuildList(const CMICmnMIValue &vValue)
|
|
{
|
|
// Clear out the default "<Invalid>" text
|
|
if (m_bJustConstructed)
|
|
{
|
|
m_bJustConstructed = false;
|
|
m_strValue = vValue.GetString();
|
|
return BuildList();
|
|
}
|
|
|
|
// Remove already present '[' and ']' from the start and end
|
|
m_strValue = m_strValue.Trim();
|
|
size_t len = m_strValue.size();
|
|
if ( (len > 1) && (m_strValue[0] == '[') && (m_strValue[len - 1] == ']') )
|
|
m_strValue = m_strValue.substr(1, len - 2);
|
|
const MIchar *pFormat = "[%s,%s]";
|
|
m_strValue = CMIUtilString::Format(pFormat, m_strValue.c_str(), vValue.GetString().c_str());
|
|
|
|
return MIstatus::success;
|
|
}
|
|
|
|
//++ ------------------------------------------------------------------------------------
|
|
// Details: Retrieve the contents of *this value object but without the outer most
|
|
// brackets.
|
|
// Type: Method.
|
|
// Args: None.
|
|
// Return: CMIUtilString - Data within the object.
|
|
// Throws: None.
|
|
//--
|
|
CMIUtilString
|
|
CMICmnMIValueList::ExtractContentNoBrackets(void) const
|
|
{
|
|
CMIUtilString data(m_strValue);
|
|
|
|
if (data[0] == '[')
|
|
{
|
|
data = data.substr(1, data.length() - 1);
|
|
}
|
|
if (data[data.size() - 1] == ']')
|
|
{
|
|
data = data.substr(0, data.length() - 1);
|
|
}
|
|
|
|
return data;
|
|
}
|