Changeset 5649 for icGREP

Timestamp:

Sep 26, 2017, 10:51:47 AM (19 months ago)

Author:

cameron

Message:

Some RE tidy-ups; an empty Alt is permitted and represents the set of no strings

Location:

icGREP/icgrep-devel/icgrep/re

Files:

• re_alt.h (modified) (1 diff)
• re_analysis.cpp (modified) (3 diffs)
• re_analysis.h (modified) (2 diffs)
• re_cc.h (modified) (1 diff)
• re_local.cpp (modified) (3 diffs)

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

@@ -62 +62 @@
 RE * makeAlt(iterator begin, iterator end) {
     if (LLVM_UNLIKELY(std::distance(begin, end) == 0)) {
-        throw std::runtime_error("Alt objects cannot be empty!");
+        return makeAlt();
     } else if (std::distance(begin, end) == 1) {
         return *begin;

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

@@ -11 +11 @@
 #include <re/re_intersect.h>
 #include <re/re_assertion.h>
-#include <iostream>
+#include <re/re_nullable.h>
 #include <re/printer_re.h>
 #include <limits.h>
+#include <llvm/Support/ErrorHandling.h>
 
 using namespace llvm;
@@ -193 +194 @@
     return 0; // otherwise
 }
-
+    
 //If a regular expression contains unit and not byteLength bounded repetition type, we select a different pipeline to utilize the log2 technique.
 bool unitBoundedRep(const RE * re) {
@@ -261 +262 @@
 }
 
-}
+void UndefinedNameError(const Name * n) {
+    report_fatal_error("Error: Undefined name in regular expression: \"" + n->getName() + "\".");
+}
+}

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

@@ -3 +3 @@
 
 #include <utility>
-namespace re { class RE; }
+namespace re { class RE; class Name;}
 
 namespace re {
@@ -18 +18 @@
 
 bool isTypeForLocal(const RE * re);
+    
+void UndefinedNameError (const Name * n);
 
 }

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

@@ -53 +53 @@
 
     inline CC()
-    : RE(ClassTypeId::CC) {
+    : RE(ClassTypeId::CC), UnicodeSet() {
 
     }

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

@@ -33 +33 @@
             return first(name->getDefinition());
         } else {
-            throw std::runtime_error("All non-unicode-property Name objects should have been defined prior to Unicode property resolution.");
+            UndefinedNameError(name);
         }
     } else if (CC * cc = dyn_cast<CC>(re)) {
@@ -75 +75 @@
             return final(name->getDefinition());
         } else {
-            throw std::runtime_error("All non-unicode-property Name objects should have been defined prior to Unicode property resolution.");
+            UndefinedNameError(name);
         }
     } else if (CC * cc = dyn_cast<CC>(re)) {
@@ -118 +118 @@
             return follow(name->getDefinition(), follow_map);
         } else {
-            throw std::runtime_error("All non-unicode-property Name objects should have been defined prior to Unicode property resolution.");
+            UndefinedNameError(name);
         }
     } else if (Seq * seq = dyn_cast<Seq>(re)) {