tomasz.sowa/pikotools
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

start changing the Space API

Browse Source 
removed table_single from Space



git-svn-id: svn://ttmath.org/publicrep/pikotools/trunk@1065 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2017-06-27 16:51:55 +00:00
parent 62f16ecb1b
commit cde990ba82
9 changed files with 253 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
space/jsontospaceparser.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012, Tomasz Sowa
* Copyright (c) 2012-2017, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,7 +76,6 @@ void JSONToSpaceParser::SetDefault()
table_start = '[';
table_end = ']';
option_delimiter = ',';
split_single = true;
skip_empty = false;
use_escape_char = true;
input_as_utf8 = true;
@@ -85,11 +84,6 @@ void JSONToSpaceParser::SetDefault()
}
void JSONToSpaceParser::SplitSingle(bool split)
{
split_single = split;
}
void JSONToSpaceParser::SkipEmpty(bool skip)
{
@@ -503,15 +497,6 @@ void JSONToSpaceParser::DeleteFromTable(const std::wstring & var)
void JSONToSpaceParser::DeleteFromTableSingle(const std::wstring & var)
{
Space::TableSingle::iterator i = space->table_single.find(var);
if( i != space->table_single.end() )
space->table_single.erase(i);
}
void JSONToSpaceParser::ReadTokenQuoted()
@@ -673,20 +658,10 @@ void JSONToSpaceParser::AddKeyValuePair()
if( value.empty() && skip_empty )
{
DeleteFromTable(key);
DeleteFromTableSingle(key);
return;
}
if( split_single && value.size() == 1 )
{
space->table_single[key] = value[0];
DeleteFromTable(key);
}
else
{
space->table[key] = value;
DeleteFromTableSingle(key);
}
space->table[key] = value;
}