notepad-plus-plus/lexilla/lexlib/PropSetSimple.cxx
Christian Grasser a61b03ea88 Update Scintilla from v4.4.6 to v5.2.1 and add Lexilla v5.1.5
Update with https://www.scintilla.org/scintilla521.zip
            https://www.scintilla.org/lexilla515.zip

- fix setting to bring Scintilla::PositionCR from ScintillaStructures.h inline with Sci_Position.h Sci_PositionCR
- add workaround to enable lexer for searchResult
commented out SCI_SETILEXER call on searchResult to get one result which is correctly handled by the lexer,
added comment about the current problem with property @MarkingsStruct which seems to disappear after call to SCI_SETILEXER or CreateLexer
- corrected usage of ObjC lexer
- removed unnecessary filter stuff
- use own sections for scintilla and lexilla build targets and allow parallel builds
- as libscilex is no longer existing, changed to libscintilla
- adapt makefiles and cmake
- use VS2019
- started simple changes for createlexer adaptations, nullpointercheck missing on return of lexer name from deprecated LexerNameFromID -> undefined behaviour
- movement from id -> lexer name, mostly done via LexerNameFromID + switching off corresponding compiler warning
- changed to SCI_SETILEXER from SCI_SETLEXER, SCI_SETLEXERLANGUAGE needs to be corrected, see Scintilla5Migration.html
- just commented out: SCI_LOADLEXERLIBRARY

Fix #10504, close #11419
2022-03-27 17:12:53 +02:00

76 lines
1.6 KiB
C++

// Scintilla source code edit control
/** @file PropSetSimple.cxx
** A basic string to string map.
**/
// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
// The License.txt file describes the conditions under which this software may be distributed.
// Maintain a dictionary of properties
#include <cstdlib>
#include <cstring>
#include <string>
#include <string_view>
#include <map>
#include <functional>
#include "PropSetSimple.h"
using namespace Lexilla;
namespace {
typedef std::map<std::string, std::string, std::less<>> mapss;
mapss *PropsFromPointer(void *impl) noexcept {
return static_cast<mapss *>(impl);
}
}
PropSetSimple::PropSetSimple() {
mapss *props = new mapss;
impl = static_cast<void *>(props);
}
PropSetSimple::~PropSetSimple() {
mapss *props = PropsFromPointer(impl);
delete props;
impl = nullptr;
}
bool PropSetSimple::Set(std::string_view key, std::string_view val) {
mapss *props = PropsFromPointer(impl);
if (!props)
return false;
mapss::iterator it = props->find(key);
if (it != props->end()) {
if (val == it->second)
return false;
it->second = val;
} else {
props->emplace(key, val);
}
return true;
}
const char *PropSetSimple::Get(std::string_view key) const {
mapss *props = PropsFromPointer(impl);
if (props) {
mapss::const_iterator keyPos = props->find(key);
if (keyPos != props->end()) {
return keyPos->second.c_str();
}
}
return "";
}
int PropSetSimple::GetInt(std::string_view key, int defaultValue) const {
const char *val = Get(key);
if (*val) {
return atoi(val);
}
return defaultValue;
}