Changeset 4431

Timestamp:

Jan 21, 2015, 11:26:40 AM (4 years ago)

Author:

cameron

Message:

Throw exceptions in preference to exit(-1)

Location:

icGREP/icgrep-devel/icgrep

Files:

• UCD/PropertyObjects.h (modified) (4 diffs)
• cc/cc_compiler.cpp (modified) (1 diff)
• compiler.cpp (modified) (1 diff)

icGREP/icgrep-devel/icgrep/UCD/PropertyObjects.h

@@ -12 +12 @@
 #include <iostream>
 #include <unordered_map>
+#include <stdexcept>
 #include "unicode_set.h"
 #include "PropertyAliases.h"
@@ -57 +58 @@
         
         UnicodeSet UnsupportedPropertyObject::GetCodepointSet(std::string value_spec) {
-                std::cerr << "Property " << UCD::property_full_name[the_property] << " unsupported.\n";
-                exit(-1);
+                throw std::runtime_error("Property " + UCD::property_full_name[the_property] + " unsupported.");
         }
         
@@ -84 +84 @@
                 int property_enum_val = GetPropertyValueEnumCode(value_spec);
                 if (property_enum_val == -1) {
-                        std::cerr << "Enumerated Property " << UCD::property_full_name[the_property] << ": unknown value: " << value_spec << ".\n";
-                        exit(-1);
+                        throw std::runtime_error("Enumerated Property " + UCD::property_full_name[the_property] +  ": unknown value: " + value_spec);
                 }
                 else {
-                        std::cout << "Enumerated Property: " << UCD::property_full_name[the_property] << ", value: " << property_value_full_names[property_enum_val] << "(" << property_enum_val << ").\n";
+                        //std::cout << "Enumerated Property: " << UCD::property_full_name[the_property] << ", value: " << property_value_full_names[property_enum_val] << "(" << property_enum_val << ").\n";
                         return property_value_sets[property_enum_val];
                 }
@@ -122 +121 @@
                         auto valit = Binary_ns::aliases_only_map.find(value_spec);
                         if (valit == Binary_ns::aliases_only_map.end()) {
-                                std::cerr << "Binary property " << property_full_name[the_property] << ": bad value: " << value_spec << ".\n";
-                                exit(-1);
+                                throw std::runtime_error("Binary Property " + UCD::property_full_name[the_property] +  ": bad value: " + value_spec);
                         }
                         else property_enum_val = valit->second;

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

@@ -96 +96 @@
     }
     else if (isa<CC>(re)) {
-        std::cerr << "Shouldn't get here\n";
-        exit(-1);
+        throw std::runtime_error("icgrep internal error: unexpected CC object found in compileByteClasses.");
     }
 }

icGREP/icgrep-devel/icgrep/compiler.cpp

@@ -66 +66 @@
         catch (ParseFailure failure)
         {
-            std::cerr << "REGEX PARSING FAILURE: " << failure.what() << std::endl;
+            std::cerr << "Regex parsing failure: " << failure.what() << std::endl;
             std::cerr << regexps[i] << std::endl;
             exit(1);