Ignore:
Timestamp:
Jul 15, 2015, 12:30:25 PM (4 years ago)
Author:
nmedfort
Message:

Moved resolveProperty responsibilities out of RE_Parser but kept expansion of Name objects with definitions in it.

File:
1 edited

Legend:

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

    r4671 r4673  
    88#define RE_PARSER_H
    99
    10 #include "re_re.h"
    11 #include "re_any.h"
    12 #include "re_name.h"
    13 
     10#include <re/re_re.h>
     11#include <re/re_any.h>
     12#include <re/re_name.h>
     13#include <UCD/resolve_properties.h>
    1414#include <string>
    1515#include <list>
     
    1717#include <map>
    1818
     19
    1920namespace re {
    20        
     21
    2122enum CharsetOperatorKind
    2223        {intersectOp, setDiffOp, ampChar, hyphenChar, rangeHyphen, posixPropertyOpener, setOpener, setCloser, backSlash, emptyOperator};
     
    3738{
    3839public:
     40
     41    friend Name * UCD::resolveProperty(const std::string, RE_Parser *);
     42    friend Name * UCD::resolveProperty(const std::string, const std::string, RE_Parser *);
    3943
    4044    static RE * parse(const std::string &input_string, ModeFlagSet initialFlags);
     
    7579       
    7680    RE * makeComplement(RE * s);
    77     RE * makeWordBoundary ();
    78     RE * makeWordNonBoundary ();
     81    RE * makeWordBoundary();
     82    RE * makeWordNonBoundary();
    7983    Name * makeDigitSet();
    8084    Name * makeAlphaNumeric();
    8185    Name * makeWhitespaceSet();
    8286    Name * makeWordSet();
    83     Name * resolvePropertyExpression(std::string nameValue);
    8487
    85     Name * resolvePropertyExpression(std::string namespaceValue, std::string nameValue);
     88    Name * createName(const std::string value);
     89    Name * createName(const std::string prop, const std::string value);
    8690
    8791        CharsetOperatorKind getCharsetOperator();
Note: See TracChangeset for help on using the changeset viewer.