github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: LoadIniStream refactored

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5892 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-03-09 11:41:08 +00:00
parent 4a6a7d41cd
commit e312efdf01
1 changed files with 44 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

82
uppsrc/Core/Ini.cpp
View file

@ -2,50 +2,56 @@
namespace Upp {
VectorMap<String, String> LoadIniStream(Stream &sin) {
Stream *in = &sin;
FileIn fin;
VectorMap<String, String> key;
int c;
if((c = in->Get()) < 0) return key;
for(;;) {
String k, v;
for(;;) {
if(IsAlNum(c) || c == '_')
k.Cat(c);
else
break;
if((c = in->Get()) < 0) return key;
}
for(;;) {
if(c != '=' && c != ' ') break;
if((c = in->Get()) < 0) return key;
}
for(;;) {
if(c < ' ') break;
v.Cat(c);
if((c = in->Get()) < 0) break;
}
if(!k.IsEmpty())
key.Add(k, v);
if(k == "LINK") {
if(in == &fin)
fin.Close();
if(!fin.Open(v) || (c = in->Get()) < 0) return key;
in = &fin;
static void LoadIniStream(Stream &sin, VectorMap<String, String>& ret, const char *sfile);
static void LoadIniFile(const char *filename, VectorMap<String, String>& ret)
{
FileIn in(filename);
if(in) LoadIniStream(in, ret, filename);
}
bool sKeyChar(int c)
{
return IsAlNum(c) || c == '_' || c == '@';
}
static void LoadIniStream(Stream& in, VectorMap<String, String>& key, const char *sfile)
{
while(!in.IsEof()) {
String line = in.GetLine();
CParser p(line);
if(p.IsId()) {
String k = p.ReadId();
if(p.Char('='))
key.Add(k, p.GetSpacePtr());
}
else
for(;;) {
if(IsAlNum(c) || c == '_') break;
if((c = in->Get()) < 0) return key;
if(p.Char('@')) {
if(p.Id("include")) {
String fn = p.GetPtr();
if(!IsFullPath(fn) && sfile)
fn = AppendFileName(GetFileFolder(GetFullPath(sfile)), fn);
LoadIniFile(fn, key);
}
else
if(p.Id("end"))
return;
}
}
}
VectorMap<String, String> LoadIniFile(const char *filename) {
FileIn in(filename);
if(!in) return VectorMap<String, String>();
return LoadIniStream(in);
VectorMap<String, String> LoadIniStream(Stream &sin)
{
VectorMap<String, String> ret;
LoadIniStream(sin, ret, NULL);
return ret;
}
VectorMap<String, String> LoadIniFile(const char *filename)
{
VectorMap<String, String> ret;
LoadIniFile(filename, ret);
return ret;
}
static StaticMutex sMtx;