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

now ezc is using 'pikotools' (utf8)

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/ezc/trunk@372 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2012-01-12 02:32:04 +00:00
parent 2c3a2160af
commit a728f86e05
6 changed files with 27 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pattern.cpp
+14 -14
View File
@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2007-2011, Tomasz Sowa
* Copyright (c) 2007-2012, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -90,17 +90,17 @@ void Pattern::Directory(const char * dir, const char * dir2)
directory2.clear();
if( dir )
UTF8ToWide(dir, directory);
PT::UTF8ToWide(dir, directory);
if( dir2 )
UTF8ToWide(dir2, directory2);
PT::UTF8ToWide(dir2, directory2);
}
void Pattern::Directory(const std::string & dir)
{
UTF8ToWide(dir, directory);
PT::UTF8ToWide(dir, directory);
directory2.clear();
}
@@ -108,8 +108,8 @@ void Pattern::Directory(const std::string & dir)
void Pattern::Directory(const std::string & dir, const std::string & dir2)
{
UTF8ToWide(dir, directory);
UTF8ToWide(dir2, directory2);
PT::UTF8ToWide(dir, directory);
PT::UTF8ToWide(dir2, directory2);
}
@@ -154,7 +154,7 @@ void Pattern::ParseFile(const std::string & file_name)
void Pattern::ParseFile(const char * file_name)
{
UTF8ToWide(file_name, item_root.file_name);
PT::UTF8ToWide(file_name, item_root.file_name);
include_level = 0;
CreateTreeReadIncludeSkipAllowFlag(item_root);
}
@@ -183,7 +183,7 @@ void Pattern::ParseFile(const wchar_t * file_name)
void Pattern::ParseString(const char * str)
{
if( input_as_utf8 )
UTF8ToWide(str, string_content);
PT::UTF8ToWide(str, string_content);
else
AssignString(str, string_content);
@@ -260,16 +260,16 @@ void Pattern::UTF8(bool utf8)
void Pattern::SetCommentary(const char * com_start, const char * com_stop)
{
UTF8ToWide(com_start, commentary_start);
UTF8ToWide(com_stop, commentary_stop);
PT::UTF8ToWide(com_start, commentary_start);
PT::UTF8ToWide(com_stop, commentary_stop);
}
void Pattern::SetCommentary(const std::string & com_start, const std::string & com_stop)
{
UTF8ToWide(com_start, commentary_start);
UTF8ToWide(com_stop, commentary_stop);
PT::UTF8ToWide(com_start, commentary_start);
PT::UTF8ToWide(com_stop, commentary_stop);
}
@@ -396,7 +396,7 @@ bool Pattern::ReadFileFromDir(const std::wstring & dir, const wchar_t * name, st
file_name = dir;
file_name += '/';
file_name += name;
WideToUTF8(file_name, afile_name);
PT::WideToUTF8(file_name, afile_name);
std::ifstream file(afile_name.c_str());
@@ -429,7 +429,7 @@ void Pattern::ReadFile(std::ifstream & file, std::wstring & result)
{
if( input_as_utf8 )
{
UTF8ToWide(file, result);
PT::UTF8ToWide(file, result);
}
else
{