diff --git a/src/Makefile.dep b/src/Makefile.dep index 29cbe87..de37e9b 100755 --- a/src/Makefile.dep +++ b/src/Makefile.dep @@ -9,4 +9,3 @@ pattern.o: pattern.h item.h funinfo.h functions.h ../../pikotools/utf8/utf8.h pattern.o: cache.h blocks.h patternparser.o: patternparser.h blocks.h item.h funinfo.h functions.h patternparser.o: ../../pikotools/utf8/utf8.h cache.h pattern.h -vars.o: vars.h diff --git a/src/Makefile.o.dep b/src/Makefile.o.dep index 320694b..ef04db9 100755 --- a/src/Makefile.o.dep +++ b/src/Makefile.o.dep @@ -1 +1 @@ -o = blocks.o cache.o item.o pattern.o patternparser.o vars.o +o = blocks.o cache.o item.o pattern.o patternparser.o diff --git a/src/vars.cpp b/src/vars.cpp deleted file mode 100644 index 25c3681..0000000 --- a/src/vars.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is a part of EZC -- Easy templating in C++ library - * and is distributed under the BSD 3-Clause licence. - * Author: Tomasz Sowa - */ - -/* - * Copyright (c) 2014, Tomasz Sowa - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name Tomasz Sowa nor the names of contributors to this - * project may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "vars.h" - - -namespace Ezc -{ - - -void Vars::Insert(const std::wstring & name, VariableType type, const std::wstring & value) -{ -Variable variable; - - variable.type = type; - variable.val = value; - - vars_tab[name] = variable; -} - - -Vars::Iterator Vars::Find(const std::wstring & name) -{ - return vars_tab.find(name); -} - - -Vars::Iterator Vars::Begin() -{ - return vars_tab.begin(); -} - - -Vars::Iterator Vars::End() -{ - return vars_tab.end(); -} - - -size_t Vars::Size() -{ - return vars_tab.size(); -} - - -void Vars::Clear() -{ - vars_tab.clear(); -} - - - -} // namespace diff --git a/src/vars.h b/src/vars.h deleted file mode 100644 index 53ad916..0000000 --- a/src/vars.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is a part of EZC -- Easy templating in C++ library - * and is distributed under the BSD 3-Clause licence. - * Author: Tomasz Sowa - */ - -/* - * Copyright (c) 2014, Tomasz Sowa - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name Tomasz Sowa nor the names of contributors to this - * project may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef headerfile_ezc_vars -#define headerfile_ezc_vars - -#include -#include - - - -namespace Ezc -{ - - - -class Vars -{ -public: - - enum VariableType - { - variable_string, - variable_alias - }; - - struct Variable - { - VariableType type; - std::wstring val; - }; - - typedef std::map VariablesTable; - typedef VariablesTable::iterator Iterator; - - void Insert(const std::wstring & name, VariableType type, const std::wstring & value); - - Iterator Find(const std::wstring & name); - - Iterator Begin(); - Iterator End(); - size_t Size(); - void Clear(); - -private: - - VariablesTable vars_tab; - -}; - -} // namespace - -#endif