[PATCH] variables.ch

[John Levon]

fix indentation and set -> isSet (the capital S shouldn't clash
like isset did right ???)

thanks
john

-- 
"Q: Name a non-living object with legs
 A: A plant."
        - Family Fortunes

Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.201
diff -u -r1.201 ChangeLog
--- src/ChangeLog       2001/06/28 13:02:02     1.201
+++ src/ChangeLog       2001/06/29 01:29:29
@@ -1,3 +1,8 @@
+2001-06-29  John Levon  <[EMAIL PROTECTED]>
+
+       * Variables.h:
+       * Variables.C: fix indentation, rename set to isSet
+ 
 2001-06-28  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
 
        * paragraph_pimpl.C: add std:: qualifier to lower_bound and
Index: src/Variables.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Variables.h,v
retrieving revision 1.6
diff -u -r1.6 Variables.h
--- src/Variables.h     2001/05/30 13:53:26     1.6
+++ src/Variables.h     2001/06/29 01:29:29
@@ -23,19 +23,19 @@
 ///
 class Variables {
 public:
-  /// 
-  void set(string const &, string const &);
-  /// 
-  string const get(string const &) const;
-  ///
-  bool set(string const & var) const;
-  /// 
-  string const expand(string const &) const;
+       /// 
+       void set(string const &, string const &);
+       /// 
+       string const get(string const &) const;
+       ///
+       bool isSet(string const & var) const;
+       /// 
+       string const expand(string const &) const;
 private:
-  ///
-  typedef std::map<string, string> Vars;
-  ///
-  Vars vars_;
+       ///
+       typedef std::map<string, string> Vars;
+       ///
+       Vars vars_;
 };
 
 #endif
Index: src/Variables.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Variables.C,v
retrieving revision 1.6
diff -u -r1.6 Variables.C
--- src/Variables.C     2001/05/30 13:53:26     1.6
+++ src/Variables.C     2001/06/29 01:29:29
@@ -30,40 +30,40 @@
 
 string const Variables::get(string const & var) const
 {
-  Vars::const_iterator cit = vars_.find(var);
-  if (cit != vars_.end()) 
-    return (*cit).second;
-  else 
-    return string();
+       Vars::const_iterator cit = vars_.find(var);
+       if (cit != vars_.end()) 
+               return (*cit).second;
+       else 
+               return string();
 }
 
 
-bool Variables::set(string const & var) const
+bool Variables::isSet(string const & var) const
 {
-   Vars::const_iterator cit = vars_.find(var);
-   return  (cit != vars_.end()); 
+       Vars::const_iterator cit = vars_.find(var);
+       return (cit != vars_.end()); 
 }
 
 
 string const Variables::expand(string const & s) const
 {
-  string str(s);
-  LRegex reg("\\$\\{\\(.*\\)\\}");
+       string str(s);
+       LRegex reg("\\$\\{\\(.*\\)\\}");
 
-  if (!reg.exact_match(str))
-    return str;
+       if (!reg.exact_match(str))
+               return str;
 
-  LRegex::MatchPair match;
-  string var;
-  
-  do {
-    match = reg.first_match(str);
-    var = str.substr(match.first,match.second);
-    // we correct the match to take ${} in account.
-    str.replace(match.first - 2, match.second + 3, get(var));
-  } while (reg.exact_match(str));
+       LRegex::MatchPair match;
+       string var;
 
-  return str;
+       do {
+               match = reg.first_match(str);
+               var = str.substr(match.first,match.second);
+               // we correct the match to take ${} in account.
+               str.replace(match.first - 2, match.second + 3, get(var));
+       } while (reg.exact_match(str));
+
+       return str;
 }
 
 #ifdef TEST
@@ -73,10 +73,10 @@
 using std::cout;
 
 int main() {
-  Variables vars;
-  vars.set("x", "hello");
-  vars.set("y", "world");
-  cout << vars.expand("${x}") << endl;
+       Variables vars;
+       vars.set("x", "hello");
+       vars.set("y", "world");
+       cout << vars.expand("${x}") << endl;
 }
 
 #endif