/[pcre]/code/trunk/pcrecpp.h

Diff of /code/trunk/pcrecpp.h

Parent Directory | Revision Log | View Patch Patch

-revision 199 by ph10,
Tue Jul 31 14:39:09 2007 UTC
+revision 390 by ph10,
Tue Mar 17 10:58:16 2009 UTC
 Line 346 
 namespace pcrecpp {
  #define PCRE_IS_SET(o)  \
          (all_options_ & o) == o
- // We convert user-passed pointers into special Arg objects
- PCRECPP_EXP_DECL Arg no_arg;
  /***** Compiling regular expressions: the RE class *****/
  // RE_Options allow you to set options to be passed along to pcre,
  // along with other options we put on top of pcre.
  // Only 9 modifiers, plus match_limit and match_limit_recursion,
  // are supported now.
- class PCRECPP_EXP_DECL RE_Options {
+ class PCRECPP_EXP_DEFN RE_Options {
   public:
    // constructor
    RE_Options() : match_limit_(0), match_limit_recursion_(0), all_options_(0) {}
-Line 403 
 class PCRECPP_EXP_DECL RE_Options {
+Line 400 
 class PCRECPP_EXP_DECL RE_Options {
      return PCRE_IS_SET(PCRE_DOTALL);
    }
    RE_Options &set_dotall(bool x) {
-     PCRE_SET_OR_CLEAR(x,PCRE_DOTALL);
+     PCRE_SET_OR_CLEAR(x, PCRE_DOTALL);
    }
    bool extended() const {
      return PCRE_IS_SET(PCRE_EXTENDED);
    }
    RE_Options &set_extended(bool x) {
-     PCRE_SET_OR_CLEAR(x,PCRE_EXTENDED);
+     PCRE_SET_OR_CLEAR(x, PCRE_EXTENDED);
    }
    bool dollar_endonly() const {
      return PCRE_IS_SET(PCRE_DOLLAR_ENDONLY);
    }
    RE_Options &set_dollar_endonly(bool x) {
-     PCRE_SET_OR_CLEAR(x,PCRE_DOLLAR_ENDONLY);
+     PCRE_SET_OR_CLEAR(x, PCRE_DOLLAR_ENDONLY);
    }
    bool extra() const {
-     return PCRE_IS_SET( PCRE_EXTRA);
+     return PCRE_IS_SET(PCRE_EXTRA);
    }
    RE_Options &set_extra(bool x) {
      PCRE_SET_OR_CLEAR(x, PCRE_EXTRA);
-Line 487 
 static inline RE_Options EXTENDED() {
+Line 484 
 static inline RE_Options EXTENDED() {
  // Interface for regular expression matching.  Also corresponds to a
  // pre-compiled regular expression.  An "RE" object is safe for
  // concurrent use by multiple threads.
- class PCRECPP_EXP_DECL RE {
+ class PCRECPP_EXP_DEFN RE {
   public:
    // We provide implicit conversions from strings so that users can
    // pass in a string or a "const char*" wherever an "RE" is expected.
-   RE(const char* pat) { Init(pat, NULL); }
-   RE(const char *pat, const RE_Options& option) { Init(pat, &option); }
    RE(const string& pat) { Init(pat, NULL); }
    RE(const string& pat, const RE_Options& option) { Init(pat, &option); }
+   RE(const char* pat) { Init(pat, NULL); }
+   RE(const char* pat, const RE_Options& option) { Init(pat, &option); }
+   RE(const unsigned char* pat) {
+     Init(reinterpret_cast<const char*>(pat), NULL);
+   }
+   RE(const unsigned char* pat, const RE_Options& option) {
+     Init(reinterpret_cast<const char*>(pat), &option);
+   }
    // Copy constructor & assignment - note that these are expensive
    // because they recompile the expression.
-Line 617 
 class PCRECPP_EXP_DECL RE {
+Line 620 
 class PCRECPP_EXP_DECL RE {
    //           1.5-2.0?
    // may become:
    //           1\.5\-2\.0\?
+   // Note QuoteMeta behaves the same as perl's QuoteMeta function,
+   // *except* that it escapes the NUL character (\0) as backslash + 0,
+   // rather than backslash + NUL.
    static string QuoteMeta(const StringPiece& unquoted);
-Line 640 
 class PCRECPP_EXP_DECL RE {
+Line 646 
 class PCRECPP_EXP_DECL RE {
    // regexp wasn't valid on construction.
    int NumberOfCapturingGroups() const;
+   // The default value for an argument, to indicate the end of the argument
+   // list. This must be used only in optional argument defaults. It should NOT
+   // be passed explicitly. Some people have tried to use it like this:
+   //
+   //   FullMatch(x, y, &z, no_arg, &w);
+   //
+   // This is a mistake, and will not work.
+   static Arg no_arg;
   private:
    void Init(const string& pattern, const RE_Options* options);

 Legend:



Removed from v.199
 


changed lines


 
Added in v.390
 Legend:



Removed from v.199
 


changed lines


 
Added in v.390
-Removed from v.199
+Added in v.390

	ViewVC Help
Powered by ViewVC 1.1.5