Changeset 4329

Timestamp:

Dec 9, 2014, 8:05:18 PM (4 years ago)

Author:

cameron

Message:

Improved names

Location:

icGREP/icgrep-devel/icgrep

Files:

• cc/cc_compiler.cpp (modified) (2 diffs)
• cc/cc_namemap.cpp (modified) (2 diffs)
• re/printer_re.cpp (modified) (1 diff)
• re/re_cc.cpp (modified) (2 diffs)
• re/re_cc.h (modified) (1 diff)
• re/re_compiler.cpp (modified) (5 diffs)
• re/re_name.h (modified) (3 diffs)

icGREP/icgrep-devel/icgrep/cc/cc_compiler.cpp

@@ -71 +71 @@
 PabloAST * CC_Compiler::compile_re(Name * name) {
     assert(name);
-    Var * var = name->getVar();
+    Var * var = name->getCompiled();
     if (var == nullptr) {
         if (name->getType() == Name::Type::FixedLength) {
@@ -98 +98 @@
             var = mCG.createVar(name->getName());
         }
-        name->setVar(var);
+        name->setCompiled(var);
     }
     return var;

icGREP/icgrep-devel/icgrep/cc/cc_namemap.cpp

@@ -16 +16 @@
 void CC_NameMap::addPredefined(const std::string friendlyName, re::CC * cc) {
     assert (cc);
-    std::string classname = cc->getName();
+    std::string classname = cc->canonicalName();
     Name * name = makeName(classname, cc);
     assert (name->getCC() == cc);
@@ -59 +59 @@
     }
     else if (CC * cc = dyn_cast<CC>(re)) {
-        std::string classname = cc->getName();
+        std::string classname = cc->canonicalName();
         auto f = mNameMap.find(classname);
         if (f == mNameMap.end()) {

icGREP/icgrep-devel/icgrep/re/printer_re.cpp

@@ -45 +45 @@
     {
         retVal = "CC \"";
-        retVal += re_cc->getName();
+        retVal += re_cc->canonicalName();
         retVal += "\" ";
 

icGREP/icgrep-devel/icgrep/re/re_cc.cpp

@@ -25 +25 @@
 }
 
-std::string CC::getName() const {
+std::string CC::canonicalName() const {
     std::string name = "CC";
-    char seperator = '_';
+    char separator = '_';
     for (const CharSetItem & i : mSparseCharSet) {
-        name += seperator;
+        name += separator;
         if (i.lo_codepoint == i.hi_codepoint) {
             name += std::to_string(i.lo_codepoint);
@@ -36 +36 @@
             name += std::to_string(i.lo_codepoint) + "-" + std::to_string(i.hi_codepoint);
         }
-        seperator = ',';
+        separator = ',';
     }
     return name;

icGREP/icgrep-devel/icgrep/re/re_cc.h

@@ -52 +52 @@
     static const CodePointType UNICODE_MAX = 0x10FFFF;
 
-    std::string getName() const;
+    std::string canonicalName() const;
 
     void insert_range(const CodePointType lo_codepoint, const CodePointType hi_codepoint);

icGREP/icgrep-devel/icgrep/re/re_compiler.cpp

@@ -44 +44 @@
 void RE_Compiler::compile(RE * re, PabloBlock & pb) {
 
-    mLineFeed = mNameMap["LineFeed"]->getVar();
+    mLineFeed = mNameMap["LineFeed"]->getCompiled();
 
     const std::string initial = "initial";
@@ -50 +50 @@
 
     //Set the 'internal.initial' bit stream for the utf-8 multi-byte encoding.
-    PabloAST * u8single = mNameMap["UTF8-SingleByte"]->getVar();
-    PabloAST * u8pfx2 = mNameMap["UTF8-Prefix2"]->getVar();
-    PabloAST * u8pfx3 = mNameMap["UTF8-Prefix3"]->getVar();
-    PabloAST * u8pfx4 = mNameMap["UTF8-Prefix4"]->getVar();
+    PabloAST * u8single = mNameMap["UTF8-SingleByte"]->getCompiled();
+    PabloAST * u8pfx2 = mNameMap["UTF8-Prefix2"]->getCompiled();
+    PabloAST * u8pfx3 = mNameMap["UTF8-Prefix3"]->getCompiled();
+    PabloAST * u8pfx4 = mNameMap["UTF8-Prefix4"]->getCompiled();
     PabloAST * u8pfx = pb.createOr(pb.createOr(u8pfx2, u8pfx3), u8pfx4);
     mInitial = pb.createVar(pb.createAssign(initial, pb.createOr(u8pfx, u8single)));
@@ -82 +82 @@
     }
     else {
-        return name->getVar();
+        return name->getCompiled();
     }
 }
@@ -223 +223 @@
         if (isFixedLength(repeated)) {
         Name * name = cast<Name>(repeated);
-        Assign * cc_lb = consecutive(pb.createAssign("repeated", pb.createAdvance(name->getVar(), 1)), 1, lb, pb);
+        Assign * cc_lb = consecutive(pb.createAssign("repeated", pb.createAdvance(name->getCompiled(), 1)), 1, lb, pb);
                 return pb.createAssign("lowerbound", pb.createAnd(pb.createAdvance(pb.createVar(marker), lb), pb.createVar(cc_lb)));
         }
@@ -240 +240 @@
                 Assign * nonMatch = pb.createAssign("nonmatch", pb.createNot(pb.createVar(marker)));
                 PabloAST * upperLimitMask = pb.createNot(pb.createVar(consecutive(nonMatch, 1, ub + 1, pb)));
-        PabloAST * rep_class_var = cast<Name>(repeated)->getVar();
+        PabloAST * rep_class_var = cast<Name>(repeated)->getCompiled();
         return pb.createAssign("bounded", pb.createAnd(pb.createMatchStar(pb.createVar(marker), rep_class_var), upperLimitMask));
         }

icGREP/icgrep-devel/icgrep/re/re_name.h

@@ -32 +32 @@
     Type getType() const;
     RE *getCC() const;
-    pablo::Var * getVar() const {
-        return mVar;
+    pablo::Var * getCompiled() const {
+        return mCompiled;
     }
-    void setVar(pablo::Var * var) {
-        mVar = var;
+    void setCompiled(pablo::Var * var) {
+        mCompiled = var;
     }
     void setCC(RE *cc);
@@ -51 +51 @@
     , mType(type)
     , mCC(cc)
-    , mVar(nullptr)
+    , mCompiled(nullptr)
     {
 
@@ -60 +60 @@
     const Type          mType;
     RE *                mCC;
-    pablo::Var *        mVar;
+    pablo::Var *        mCompiled;
 };