more usage of c++17 stuff for more streamlined code

Interpreter/DataValue.h

@@ -2,7 +2,7 @@
 #ifndef DATA_VALUE_H_
 #define DATA_VALUE_H_
 
-#include "Util/string_view.h"
+#include <string_view>
 
 #include <gsl/span>
 
@@ -87,9 +87,9 @@ inline DataValue make_value(bool n) {
 	return DV;
 }
 
-inline DataValue make_value(view::string_view str) {
+inline DataValue make_value(std::string_view str) {
 	DataValue DV;
-	DV.value = str.to_string();
+	DV.value = std::string(str);
 	return DV;
 }
 

Interpreter/interpret.cpp

@@ -688,7 +688,7 @@ Symbol *InstallIteratorSymbol() {
 /*
 ** Lookup a constant string by its value.
 */
-Symbol *LookupStringConstSymbol(view::string_view value) {
+Symbol *LookupStringConstSymbol(std::string_view value) {
 
 	auto it = std::find_if(GlobalSymList.begin(), GlobalSymList.end(), [value](Symbol *s) {
 		return (s->type == CONST_SYM && is_string(s->value) && to_string(s->value) == value);
@@ -708,7 +708,7 @@ Symbol *InstallStringConstSymbolEx(const QString &str) {
 /*
 ** install string str in the global symbol table with a string name
 */
-Symbol *InstallStringConstSymbol(view::string_view str) {
+Symbol *InstallStringConstSymbol(std::string_view str) {
 
 	static int stringConstIndex = 0;
 
@@ -729,7 +729,7 @@ Symbol *LookupSymbolEx(const QString &name) {
 	return LookupSymbol(name.toStdString());
 }
 
-Symbol *LookupSymbol(view::string_view name) {
+Symbol *LookupSymbol(std::string_view name) {
 
 	// first look for a local symbol
 	auto local = std::find_if(LocalSymList.begin(), LocalSymList.end(), [name](Symbol *s) {
@@ -835,9 +835,9 @@ Symbol *PromoteToGlobal(Symbol *sym) {
 		*Context.StackP++ = (dataVal);                          \
 	} while (0)
 
-#define PEEK(dataVal, peekIndex)                       \
-	do {                                               \
-		(dataVal) = *(Context.StackP - (peekIndex)-1); \
+#define PEEK(dataVal, peekIndex)                         \
+	do {                                                 \
+		(dataVal) = *(Context.StackP - (peekIndex) - 1); \
 	} while (0)
 
 #define POP_INT(number)                                              \

Interpreter/interpret.h

@@ -3,7 +3,7 @@
 #define INTERPRET_H_
 
 #include "DataValue.h"
-#include "Util/string_view.h"
+#include <string_view>
 
 #include <gsl/span>
 
@@ -144,13 +144,13 @@ bool AddSym(Symbol *sym, QString *msg);
 Inst *GetPC();
 Program *FinishCreatingProgram();
 Symbol *InstallIteratorSymbol();
-Symbol *InstallStringConstSymbol(view::string_view str);
+Symbol *InstallStringConstSymbol(std::string_view str);
 Symbol *InstallStringConstSymbolEx(const QString &str);
 Symbol *InstallSymbol(const std::string &name, SymTypes type, const DataValue &value);
 Symbol *InstallSymbolEx(const QString &name, enum SymTypes type, const DataValue &value);
-Symbol *LookupStringConstSymbol(view::string_view value);
+Symbol *LookupStringConstSymbol(std::string_view value);
 Symbol *LookupSymbolEx(const QString &name);
-Symbol *LookupSymbol(view::string_view name);
+Symbol *LookupSymbol(std::string_view name);
 void BeginCreatingProgram();
 void FillLoopAddrs(const Inst *breakAddr, const Inst *continueAddr);
 void StartLoopAddrList();

Regex/Common.h

@@ -70,8 +70,8 @@ constexpr R literal_escape(Ch ch) noexcept {
  * octal escape.  RegexError is thrown if \x0, \x00, \0, \00, \000, or
  * \0000 is specified.
  *--------------------------------------------------------------------*/
-template <class R, class Ch>
-R numeric_escape(Ch ch, const char **parse) {
+template <class R, class Ch, class Iterator>
+R numeric_escape(Ch ch, Iterator *parse) {
 
 	static const char digits[] = "fedcbaFEDCBA9876543210";
 
@@ -105,7 +105,7 @@ R numeric_escape(Ch ch, const char **parse) {
 		return '\0'; // Not a numeric escape
 	}
 
-	const char *scan = *parse;
+	Iterator scan = *parse;
 	scan++; // Only change *parse on success.
 
 	const char *pos_ptr = ::strchr(digit_str, static_cast<int>(*scan));