commit b6b21b3c2d58c2b5d883947f7d96b37941143e04
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Apr 28 22:38:03 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 19:09:24 2014 -0700
tree e4c410ccfad85a1ab98fac5cda6578a81fc53070
parent cfe0b06cce85dc091858680a740c2b4bd493a759

util: Correcting code style in regular expression implementation

Change-Id: I7c31c2c8c7a68094da6e73223171b8ac0c886370
Refs: #1403

src/util/regex/regex-backref-manager.hpp

diff --git a/src/util/regex/regex-backref-manager.hpp b/src/util/regex/regex-backref-manager.hpp
index 56919f5..9ca95ea 100644
--- a/src/util/regex/regex-backref-manager.hpp
+++ b/src/util/regex/regex-backref-manager.hpp
@@ -24,12 +24,15 @@
 class RegexBackrefManager
 {
 public:
-  RegexBackrefManager(){}
+  RegexBackrefManager()
+  {
+  }
 
-  virtual ~RegexBackrefManager();
+  virtual
+  ~RegexBackrefManager();
 
-  int
-  pushRef(shared_ptr<RegexMatcher> matcher);
+  size_t
+  pushRef(const shared_ptr<RegexMatcher>& matcher);
 
   void
   popRef();
@@ -37,24 +40,25 @@
   size_t
   size();
 
-  shared_ptr<RegexMatcher>
-  getBackRef(int i);
+  const shared_ptr<RegexMatcher>&
+  getBackref(size_t backrefNo);
 
 private:
-  std::vector<shared_ptr<RegexMatcher> > m_backRefs;
+  std::vector<shared_ptr<RegexMatcher> > m_backrefs;
 };
 
 
-inline RegexBackrefManager::~RegexBackrefManager()
+inline
+RegexBackrefManager::~RegexBackrefManager()
 {
-  m_backRefs.clear();
+  m_backrefs.clear();
 }
 
-inline int
-RegexBackrefManager::pushRef(shared_ptr<RegexMatcher> matcher)
+inline size_t
+RegexBackrefManager::pushRef(const shared_ptr<RegexMatcher>& matcher)
 {
-  size_t last = m_backRefs.size();
-  m_backRefs.push_back(matcher);
+  size_t last = m_backrefs.size();
+  m_backrefs.push_back(matcher);
 
   return last;
 }
@@ -62,19 +66,19 @@
 inline void
 RegexBackrefManager::popRef()
 {
-  m_backRefs.pop_back();
+  m_backrefs.pop_back();
 }
 
 inline size_t
 RegexBackrefManager::size()
 {
-  return m_backRefs.size();
+  return m_backrefs.size();
 }
 
-inline shared_ptr<RegexMatcher>
-RegexBackrefManager::getBackRef(int i)
+inline const shared_ptr<RegexMatcher>&
+RegexBackrefManager::getBackref(size_t backrefNo)
 {
-  return m_backRefs[i];
+  return m_backrefs[backrefNo];
 }