now winix is using 'pikotools' (confparser, utf8, mainparser)

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@792 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2012-01-12 02:24:08 +00:00
parent cb33f20a24
commit b2d3ca9543
55 changed files with 1749 additions and 1884 deletions

View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2011, Tomasz Sowa
* Copyright (c) 2008-2012, Tomasz Sowa
* All rights reserved.
*
*/
@@ -31,22 +31,22 @@ void Config::ShowError()
switch( parser.status )
{
case ConfParser::no_space:
case PT::ConfParser::no_space:
log << log2 << "Config: space not set" << logend;
break;
case ConfParser::ok:
case PT::ConfParser::ok:
log << log2 << "Config: syntax ok" << logend;
break;
case ConfParser::cant_open_file:
case PT::ConfParser::cant_open_file:
if( errors_to_stdout )
std::cout << "Config: cant open a config file: " << config_file << std::endl;
log << log1 << "Config: cant open a config file: " << config_file << logend;
break;
case ConfParser::syntax_error:
case PT::ConfParser::syntax_error:
if( errors_to_stdout )
std::cout << "Config: syntax error, line: " << parser.line << std::endl;
@@ -76,9 +76,9 @@ bool Config::ReadConfig(bool errors_to_stdout_, bool stdout_is_closed)
parser.UTF8(true); // config is always read in UTF-8
parser.SetSpace(space);
ConfParser::Status status = parser.Parse(config_file);
PT::ConfParser::Status status = parser.Parse(config_file);
if( status == ConfParser::ok )
if( status == PT::ConfParser::ok )
{
AssignValues(stdout_is_closed);
SetAdditionalVariables();