regex: move functions out of headers
Change-Id: I6a3ea61a6564195e297288d514c5a805a832e0e6
diff --git a/src/util/regex/regex-backref-matcher.hpp b/src/util/regex/regex-backref-matcher.hpp
index 1174541..8b8e491 100644
--- a/src/util/regex/regex-backref-matcher.hpp
+++ b/src/util/regex/regex-backref-matcher.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2013-2014 Regents of the University of California.
+ * Copyright (c) 2013-2015 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -17,8 +17,6 @@
* <http://www.gnu.org/licenses/>.
*
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
- *
- * @author Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
*/
#ifndef NDN_UTIL_REGEX_REGEX_BACKREF_MATCHER_HPP
@@ -36,54 +34,16 @@
RegexBackrefMatcher(const std::string& expr, shared_ptr<RegexBackrefManager> backrefManager);
virtual
- ~RegexBackrefMatcher()
- {
- }
+ ~RegexBackrefMatcher() NDN_CXX_DECL_FINAL;
void
- lateCompile()
- {
- compile();
- }
+ lateCompile();
protected:
virtual void
- compile();
+ compile() NDN_CXX_DECL_FINAL;
};
} // namespace ndn
-#include "regex-pattern-list-matcher.hpp"
-
-namespace ndn {
-
-inline
-RegexBackrefMatcher::RegexBackrefMatcher(const std::string& expr,
- shared_ptr<RegexBackrefManager> backrefManager)
- : RegexMatcher(expr, EXPR_BACKREF, backrefManager)
-{
- // compile();
-}
-
-inline void
-RegexBackrefMatcher::compile()
-{
- if (m_expr.size() < 2)
- throw RegexMatcher::Error("Unrecognized format: " + m_expr);
-
- size_t lastIndex = m_expr.size() - 1;
- if ('(' == m_expr[0] && ')' == m_expr[lastIndex]) {
- // m_backRefManager->pushRef(this);
-
- shared_ptr<RegexMatcher> matcher(new RegexPatternListMatcher(m_expr.substr(1, lastIndex - 1),
- m_backrefManager));
- m_matchers.push_back(matcher);
- }
- else
- throw RegexMatcher::Error("Unrecognized format: " + m_expr);
-}
-
-
-} // namespace ndn
-
#endif // NDN_UTIL_REGEX_REGEX_BACKREF_MATCHER_HPP