Ignore:
Timestamp:
Sep 27, 2015, 1:40:55 AM (4 years ago)
Author:
nmedfort
Message:

Reverted unintended modification of RE parser

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/re/re_parser.h

    r4797 r4798  
    2121
    2222enum CharsetOperatorKind
    23         {intersectOp, setDiffOp, ampChar, hyphenChar, rangeHyphen, posixPropertyOpener, setOpener, setCloser, backSlash, emptyOperator};
     23    {intersectOp, setDiffOp, ampChar, hyphenChar, rangeHyphen, posixPropertyOpener, setOpener, setCloser, backSlash, emptyOperator};
    2424
    25 enum ModeFlagType 
     25enum ModeFlagType
    2626    {CASE_INSENSITIVE_MODE_FLAG = 1,
    2727     MULTILINE_MODE_FLAG = 2,      // not currently implemented
     
    2929     IGNORE_SPACE_MODE_FLAG = 8,   // not currently implemented
    3030     UNIX_LINES_MODE_FLAG = 16};   // not currently implemented
    31    
     31
    3232const int MAX_REPETITION_LOWER_BOUND = 1024;
    3333const int MAX_REPETITION_UPPER_BOUND = 2048;
    3434
    3535typedef unsigned ModeFlagSet;
    36    
     36
    3737class RE_Parser
    3838{
     
    5151
    5252    RE_Parser(const std::string & regular_expression);
    53    
     53
    5454    RE_Parser(const std::string & regular_expression, ModeFlagSet initialFlags);
    5555
    5656    RE * parse_RE();
    57    
     57
    5858    RE * parse_alt();
    59    
     59
    6060    RE * parse_seq();
    6161
    6262    RE * parse_next_item();
    63    
     63
    6464    RE * parse_group();
    65    
     65
    6666    RE * extend_item(RE * re);
    6767
     
    6969
    7070    unsigned parse_int();
    71    
     71
    7272    RE * parse_escaped();
    7373
     
    7777
    7878    Name * parsePropertyExpression();
    79        
     79
     80    CC * parseNamePatternExpression();
     81
    8082    RE * makeComplement(RE * s);
    8183    RE * makeWordBoundary();
     
    8991    Name * createName(const std::string prop, const std::string value);
    9092
    91         CharsetOperatorKind getCharsetOperator();
     93    CharsetOperatorKind getCharsetOperator();
    9294
    9395    RE * parse_charset();
     
    102104
    103105    inline void throw_incomplete_expression_error_if_end_of_stream() const;
    104    
     106
    105107    // CC insertion dependent on case-insensitive flag.
    106108    CC * build_CC(codepoint_t cp);
    107    
     109
    108110    void CC_add_codepoint(CC * cc, codepoint_t cp);
    109    
     111
    110112    void CC_add_range(CC * cc, codepoint_t lo, codepoint_t hi);
    111113
     
    117119    const cursor_t              _end;
    118120    ModeFlagSet                 fModeFlagSet;
     121    bool                        fNested;
    119122    NameMap                     mNameMap;
    120123};
Note: See TracChangeset for help on using the changeset viewer.