[PATCH] FileCheck refactor: Use enum instead increasing number of bools for kinds of check lines

Matt Arsenault Matthew.Arsenault at amd.com
Wed Sep 4 10:46:00 PDT 2013



================
Comment at: utils/FileCheck/FileCheck.cpp:988
@@ -976,2 +987,3 @@
 
-    assert((Pat.getMatchDag() ^ Pat.getMatchNot()) &&
+    assert((Pat.getCheckTy() == Check::CheckDAG ||
+            Pat.getCheckTy() == Check::CheckNot) &&
----------------
Ron Ofir wrote:
> Why was this xor originally? 
Probably to avoid setting both at the same time?

================
Comment at: utils/FileCheck/FileCheck.cpp:761
@@ -726,22 +760,3 @@
 
-    // Verify that the : is present after the prefix.
-    if (Buffer[CheckPrefix.size()] == ':') {
-      Buffer = Buffer.substr(CheckPrefix.size()+1);
-    } else if (Buffer.size() > CheckPrefix.size()+6 &&
-               memcmp(Buffer.data()+CheckPrefix.size(), "-NEXT:", 6) == 0) {
-      Buffer = Buffer.substr(CheckPrefix.size()+6);
-      IsCheckNext = true;
-    } else if (Buffer.size() > CheckPrefix.size()+5 &&
-               memcmp(Buffer.data()+CheckPrefix.size(), "-NOT:", 5) == 0) {
-      Buffer = Buffer.substr(CheckPrefix.size()+5);
-      IsCheckNot = true;
-    } else if (Buffer.size() > CheckPrefix.size()+5 &&
-               memcmp(Buffer.data()+CheckPrefix.size(), "-DAG:", 5) == 0) {
-      Buffer = Buffer.substr(CheckPrefix.size()+5);
-      IsCheckDag = true;
-    } else if (Buffer.size() > CheckPrefix.size()+7 &&
-               memcmp(Buffer.data()+CheckPrefix.size(), "-LABEL:", 7) == 0) {
-      Buffer = Buffer.substr(CheckPrefix.size()+7);
-      IsCheckLabel = true;
-    } else {
-      Buffer = Buffer.substr(1);
+    // When we find a check prefix, keep track of whether we find CHECK: or
+    // CHECK-NEXT:
----------------
Ron Ofir wrote:
> Shouldn't this be "keep track of the check type" and not just "CHECK or CHECK-NEXT"? 
Yes


http://llvm-reviews.chandlerc.com/D1592



More information about the llvm-commits mailing list