From 84329ea4a0092c37544a90ec228992baba58ae3c Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 13 Apr 2011 16:17:39 +0100
Subject: [PATCH] STYLE: minor code formatting
---
src/OSspecific/POSIX/regExp.H | 85 ++++++++++---------
.../primitives/strings/wordRe/wordRe.H | 76 ++++++++++-------
2 files changed, 88 insertions(+), 73 deletions(-)
diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp.H
index 9106264ac81..067dfc54afd 100644
--- a/src/OSspecific/POSIX/regExp.H
+++ b/src/OSspecific/POSIX/regExp.H
@@ -62,6 +62,7 @@ class regExp
//- Precompiled regular expression
mutable regex_t* preg_;
+
// Private Member Functions
//- Disallow default bitwise copy construct
@@ -72,6 +73,8 @@ class regExp
public:
+ // Static Member Functions
+
//- Is character a regular expression meta-character?
// any character: '.' \n
// quantifiers: '*', '+', '?' \n
@@ -102,66 +105,69 @@ public:
//- Construct from std::string (or string), optionally ignoring case
regExp(const std::string&, const bool ignoreCase=false);
+
//- Destructor
~regExp();
// Member functions
- //- Access
+ // Access
- //- Return true if a precompiled expression does not exist
- inline bool empty() const
- {
- return !preg_;
- }
+ //- Return true if a precompiled expression does not exist
+ inline bool empty() const
+ {
+ return !preg_;
+ }
- //- Does a precompiled expression exist?
- inline bool exists() const
- {
- return preg_ ? true : false;
- }
+ //- Does a precompiled expression exist?
+ inline bool exists() const
+ {
+ return preg_ ? true : false;
+ }
- //- Return the number of (groups)
- inline int ngroups() const
- {
- return preg_ ? preg_->re_nsub : 0;
- }
+ //- Return the number of (groups)
+ inline int ngroups() const
+ {
+ return preg_ ? preg_->re_nsub : 0;
+ }
- //- Editing
+ // Editing
- //- Compile pattern into a regular expression, optionally ignoring case
- void set(const char*, const bool ignoreCase=false) const;
+ //- Compile pattern into a regular expression, optionally ignoring
+ // case
+ void set(const char*, const bool ignoreCase=false) const;
- //- Compile pattern into a regular expression, optionally ignoring case
- void set(const std::string&, const bool ignoreCase=false) const;
+ //- Compile pattern into a regular expression, optionally ignoring
+ // case
+ void set(const std::string&, const bool ignoreCase=false) const;
- //- Release precompiled expression.
- // Returns true if precompiled expression existed before clear
- bool clear() const;
+ //- Release precompiled expression.
+ // Returns true if precompiled expression existed before clear
+ bool clear() const;
- //- Searching
+ // Searching
- //- Find position within string.
- // Returns the index where it begins or string::npos if not found
- std::string::size_type find(const std::string& str) const;
+ //- Find position within string.
+ // Returns the index where it begins or string::npos if not found
+ std::string::size_type find(const std::string& str) const;
- //- Return true if it matches the entire string
- // The begin-of-line (^) and end-of-line ($) anchors are implicit
- bool match(const std::string&) const;
+ //- Return true if it matches the entire string
+ // The begin-of-line (^) and end-of-line ($) anchors are implicit
+ bool match(const std::string&) const;
- //- Return true if it matches and sets the sub-groups matched
- // The begin-of-line (^) and end-of-line ($) anchors are implicit
- bool match(const string&, List<string>& groups) const;
+ //- Return true if it matches and sets the sub-groups matched
+ // The begin-of-line (^) and end-of-line ($) anchors are implicit
+ bool match(const string&, List<string>& groups) const;
- //- Return true if the regex was found within string
- bool search(const std::string& str) const
- {
- return std::string::npos != find(str);
- }
+ //- Return true if the regex was found within string
+ bool search(const std::string& str) const
+ {
+ return std::string::npos != find(str);
+ }
// Member Operators
@@ -173,7 +179,6 @@ public:
//- Assign and compile pattern from string
// Always case sensitive
void operator=(const std::string&);
-
};
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
index 566f42af6ca..8fd3eabc63d 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -110,6 +110,7 @@ public:
//- Test string for regular expression meta characters
static inline bool isPattern(const string&);
+
// Constructors
//- Construct null
@@ -123,66 +124,75 @@ public:
//- Construct as copy of character array
// Optionally specify how it should be treated.
- inline wordRe(const char*, const compOption=LITERAL);
+ inline wordRe(const char*, const compOption = LITERAL);
//- Construct as copy of string.
// Optionally specify how it should be treated.
- inline wordRe(const string&, const compOption=LITERAL);
+ inline wordRe(const string&, const compOption = LITERAL);
//- Construct as copy of std::string
// Optionally specify how it should be treated.
- inline wordRe(const std::string&, const compOption=LITERAL);
+ inline wordRe(const std::string&, const compOption = LITERAL);
//- Construct from Istream
// Words are treated as literals, strings with an auto-test
wordRe(Istream&);
+
// Member functions
- //- Access
+ // Access
+
+ //- Should be treated as a match rather than a literal string?
+ inline bool isPattern() const;
+
+
+ // Infrastructure
+
+ //- Compile the regular expression
+ inline bool compile() const;
- //- Should be treated as a match rather than a literal string?
- inline bool isPattern() const;
+ //- Possibly compile the regular expression, with greater control
+ inline bool compile(const compOption) const;
- //- Infrastructure
+ //- Recompile an existing regular expression
+ inline bool recompile() const;
- //- Compile the regular expression
- inline bool compile() const;
+ //- Frees precompiled regular expression, making wordRe a literal.
+ // Optionally strips invalid word characters
+ inline void uncompile(const bool doStripInvalid = false) const;
- //- Possibly compile the regular expression, with greater control
- inline bool compile(const compOption) const;
- //- Recompile an existing regular expression
- inline bool recompile() const;
+ // Editing
- //- Frees precompiled regular expression, making wordRe a literal.
- // Optionally strips invalid word characters
- inline void uncompile(const bool doStripInvalid=false) const;
+ //- Copy string, auto-test for regular expression or other options
+ inline void set(const std::string&, const compOption = DETECT);
- //- Editing
+ //- Copy string, auto-test for regular expression or other options
+ inline void set(const char*, const compOption = DETECT);
- //- Copy string, auto-test for regular expression or other options
- inline void set(const std::string&, const compOption=DETECT);
+ //- Clear string and precompiled regular expression
+ inline void clear();
- //- Copy string, auto-test for regular expression or other options
- inline void set(const char*, const compOption=DETECT);
- //- Clear string and precompiled regular expression
- inline void clear();
+ // Searching
- //- Searching
+ //- Smart match as regular expression or as a string
+ // Optionally force a literal match only
+ inline bool match
+ (
+ const std::string&,
+ bool literalMatch = false
+ ) const;
- //- Smart match as regular expression or as a string
- // Optionally force a literal match only
- inline bool match(const std::string&, bool literalMatch=false) const;
- //- Miscellaneous
+ // Miscellaneous
- //- Return a string with quoted meta-characters
- inline string quotemeta() const;
+ //- Return a string with quoted meta-characters
+ inline string quotemeta() const;
- //- Output some basic info
- Ostream& info(Ostream&) const;
+ //- Output some basic info
+ Ostream& info(Ostream&) const;
// Member operators
--
GitLab