Changeset 4486

Timestamp:

Feb 9, 2015, 12:32:19 PM (4 years ago)

Author:

nmedfort

Message:

Minor code clean-up

Location:

icGREP/icgrep-devel/icgrep

Files:

• pablo/printer_pablos.cpp (modified) (1 diff)
• re/re_compiler.cpp (modified) (6 diffs)
• re/re_compiler.h (modified) (1 diff)

icGREP/icgrep-devel/icgrep/pablo/printer_pablos.cpp

@@ -74 +74 @@
         strm << "if ";
         print(ifstmt->getCondition(), strm);
-        strm << ":\n";
+        strm << ":" << std::endl;
         print(ifstmt->getBody(), indent + "  ", strm);
     }
     else if (const While * whl = dyn_cast<const While>(stmt)) {
-        strm << "while";
+        strm << "while ";
         print(whl->getCondition(), strm);
-        strm << ":\n";
+        strm << ":" << std::endl;
         print(whl->getBody(), indent + "  ", strm);
     }

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

@@ -78 +78 @@
     }
 }
-    
-    
 
 #define USE_IF_FOR_NONFINAL 1
@@ -87 +85 @@
 
 void RE_Compiler::initializeRequiredStreams(cc::CC_Compiler & ccc) {
-
-    const std::string nonfinal = "nonfinal";
 
     Assign * LF = mPB.createAssign("LF", ccc.compileCC(makeCC(0x0A)));
@@ -119 +115 @@
     PabloAST * LS_PS = mPB.createAnd(mPB.createAdvance(E2_80, 1), ccc.compileCC(makeCC(0xA8,0xA9)));
     PabloAST * LB_chars = mPB.createOr(LF_VT_FF_CR, mPB.createOr(NEL, LS_PS));
-    mNonFinal = mPB.createAssign(nonfinal, mPB.createOr(mPB.createOr(u8pfx, u8scope32), mPB.createOr(u8scope42, u8scope43)));
+    mNonFinal = mPB.createAssign("nonfinal", mPB.createOr(mPB.createOr(u8pfx, u8scope32), mPB.createOr(u8scope42, u8scope43)));
     mUnicodeLineBreak = mPB.createAnd(LB_chars, mPB.createNot(mCRLF));  // count the CR, but not CRLF
 #endif
@@ -133 +129 @@
     PabloAST * u8scope42 = it.createAdvance(u8pfx4, 1, "u8scope42");
     PabloAST * u8scope43 = it.createAdvance(u8scope42, 1);
-    mNonFinal = it.createAssign(nonfinal, it.createOr(it.createOr(u8pfx, u8scope32), it.createOr(u8scope42, u8scope43)));
+    mNonFinal = it.createAssign("nonfinal", it.createOr(it.createOr(u8pfx, u8scope32), it.createOr(u8scope42, u8scope43)));
     PabloAST * NEL = it.createAnd(it.createAdvance(ccc.compileCC(makeCC(0xC2), it), 1), ccc.compileCC(makeCC(0x85), it));
     PabloAST * E2_80 = it.createAnd(it.createAdvance(ccc.compileCC(makeCC(0xE2), it), 1), ccc.compileCC(makeCC(0x80), it));
@@ -159 +155 @@
 }
 
-PabloAST * RE_Compiler::character_class_strm(Name * name, PabloBlock & pb) {
-    PabloAST * var = name->getCompiled();
-    if (var) {
-        return var;
-    }
-    else {
-        RE * def = name->getDefinition();
-        if (def != nullptr) {
-            MarkerType m = compile(def, mPB);
-            assert(markerPos(m) == FinalMatchByte);
-            PabloAST * v = markerVar(m);
-            v = mPB.createAnd(v, mPB.createNot(UNICODE_LINE_BREAK ? mUnicodeLineBreak : mLineFeed));
-            name->setCompiled(v);
-            return v;
-        }
-        else if (name->getType() == Name::Type::UnicodeProperty) {
-            PabloAST * v = mPB.createCall(name->getName());
-            v = mPB.createAnd(v, mPB.createNot(UNICODE_LINE_BREAK ? mUnicodeLineBreak : mLineFeed));
-            name->setCompiled(v);
-            return v;
-        }
-        else {
-            throw std::runtime_error("Unresolved name " + name->getName());
-        }
-    }
-}
-
 PabloAST * RE_Compiler::nextUnicodePosition(MarkerType m, PabloBlock & pb) {
     if (markerPos(m) == FinalPostPositionByte) {
@@ -257 +226 @@
         nextPos = AdvanceMarker(marker, FinalPostPositionByte, pb);
     }
-    return makeMarker(FinalMatchByte, pb.createAnd(markerVar(nextPos), character_class_strm(name, pb), "m"));
-}
+    return makeMarker(FinalMatchByte, pb.createAnd(markerVar(nextPos), getNamedCharacterClassStream(name), "m"));
+}
+
+PabloAST * RE_Compiler::getNamedCharacterClassStream(Name * name) {
+    PabloAST * var = name->getCompiled();
+    if (LLVM_LIKELY(var != nullptr)) {
+        return var;
+    }
+    else if (name->getDefinition() != nullptr) {
+        MarkerType m = compile(name->getDefinition(), mPB);
+        assert(markerPos(m) == FinalMatchByte);
+        var = markerVar(m);
+    }
+    else if (name->getType() == Name::Type::UnicodeProperty) {
+        var = mPB.createCall(name->getName());
+    }
+    else {
+        throw std::runtime_error("Unresolved name " + name->getName());
+    }
+
+    var = mPB.createAnd(var, mPB.createNot(UNICODE_LINE_BREAK ? mUnicodeLineBreak : mLineFeed));
+    name->setCompiled(var);
+    return var;
+}
+
 
 MarkerType RE_Compiler::process(Seq * seq, MarkerType marker, PabloBlock & pb) {

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

@@ -72 +72 @@
     void AlignMarkers(MarkerType & m1, MarkerType & m2, pablo::PabloBlock & pb);
     
-    pablo::PabloAST * character_class_strm(Name * name, pablo::PabloBlock & pb);
+    pablo::PabloAST * getNamedCharacterClassStream(Name * name);
     pablo::PabloAST * nextUnicodePosition(MarkerType m, pablo::PabloBlock & pb);
     MarkerType process(RE * re, MarkerType marker, pablo::PabloBlock & pb);