Merge pull request #8 from RobLoach/stringmethods

Add String Methods

Author: lefticus

CMakeLists.txt

@@ -175,20 +175,14 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
 
-
-
-
-
-set(CHAISCRIPT_BRANCH develop)
-
+# ChaiScript
+set(CHAISCRIPT_BRANCH v5.8.6)
+set(CHAISCRIPT_VERSION 5.8.6)
 file(DOWNLOAD https://github.com/ChaiScript/ChaiScript/archive/${CHAISCRIPT_BRANCH}.tar.gz "${CMAKE_BINARY_DIR}/chaiscript/chaiscript-${CHAISCRIPT_BRANCH}.tar.gz"
   INACTIVITY_TIMEOUT 180 TIMEOUT 180 TLS_VERIFY off)
-
 execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${CMAKE_BINARY_DIR}/chaiscript/chaiscript-${CHAISCRIPT_BRANCH}.tar.gz" "${CMAKE_BINARY_DIR}/chaiscript"
   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/chaiscript")
-
-include_directories("${CMAKE_BINARY_DIR}/chaiscript/ChaiScript-${CHAISCRIPT_BRANCH}/include")
-
+include_directories("${CMAKE_BINARY_DIR}/chaiscript/ChaiScript-${CHAISCRIPT_VERSION}/include")
 
 # Add catch tests macro
 macro(ADD_CATCH_TESTS executable)
@@ -230,4 +224,6 @@ add_executable(string_id_test tests/string_id.cpp)
 target_link_libraries(string_id_test ${LIBS})
 ADD_CATCH_TESTS(string_id_test)
 
-
+add_executable(string_methods_test tests/string_methods.cpp)
+target_link_libraries(string_methods_test ${LIBS})
+ADD_CATCH_TESTS(string_methods_test)

README.md

@@ -1,4 +1,9 @@
-In this repository will live user contributed wrappers
-for ChaiScript.
+# ChaiScript Extras
 
+User contributed wrappers for ChaiScript.
 
+## Modules
+
+- Math: Adds common math methods to ChaiScript.
+- String ID: String hashing with [string_id](https://github.com/foonathan/string_id)
+- String Methods: Introduces some extra string methods to ChaiScript strings

include/chaiscript/extras/string_methods.hpp

@@ -0,0 +1,96 @@
+/**
+ * @file ChaiScript String Methods
+ *
+ * Adds some additional string methods to ChaiScript strings.
+ *
+ * string::replace(string search, string replace)
+ * string::replace(char search, char replace)
+ * string::trim()
+ * string::split(string token)
+ * string::toLowerCase()
+ * string::toUpperCase()
+ */
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include <chaiscript/chaiscript.hpp>
+
+namespace chaiscript {
+  namespace extras {
+    namespace string_methods {
+      ModulePtr bootstrap(ModulePtr m = std::make_shared<Module>())
+      {
+        // Add lists of strings.
+        m->add(bootstrap::standard_library::vector_type<std::vector<std::string>>("StringVector"));
+
+        // string::replace(std::string search, std::string replace)
+        m->add(fun([](const std::string& subject, const std::string& search, const std::string& replace) {
+          std::string result(subject);
+          size_t pos = 0;
+          while ((pos = result.find(search, pos)) != std::string::npos) {
+            result.replace(pos, search.length(), replace);
+            pos += replace.length();
+          }
+          return result;
+        }), "replace");
+
+        // string::replace(char, char)
+        m->add(fun([](const std::string& subject, char search, char replace) {
+          std::string result(subject);
+          std::replace(result.begin(), result.end(), search, replace);
+          return result;
+        }), "replace");
+
+        // string::trim()
+        m->add(fun([](const std::string& subject) {
+          std::string result(subject);
+          std::string chars = "\t\n\v\f\r ";
+          result.erase(0, result.find_first_not_of(chars));
+          result.erase(0, result.find_last_not_of(chars));
+          return result;
+        }), "trim");
+
+        // string::split(string)
+        m->add(fun([](const std::string& subject, const std::string& token) {
+          std::string str(subject);
+          std::vector<std::string> result;
+          while (str.size()) {
+            size_t index = str.find(token);
+            if (index != std::string::npos) {
+              result.push_back(str.substr(0, index));
+              str = str.substr(index + token.size());
+              if (str.size() == 0) {
+                result.push_back(str);
+              }
+            } else {
+              result.push_back(str);
+              str = "";
+            }
+          }
+          return result;
+        }), "split");
+
+        // string::toLowerCase()
+        m->add(fun([](const std::string& subject) {
+          std::string result(subject);
+          std::transform(result.begin(), result.end(), result.begin(), [](unsigned char c) {
+            return std::tolower(c);
+          });
+          return result;
+        }), "toLowerCase");
+
+        // string::toUpperCase
+        m->add(fun([](const std::string& subject) {
+          std::string result(subject);
+          std::transform(result.begin(), result.end(), result.begin(), [](unsigned char c) {
+            return std::toupper(c);
+          });
+          return result;
+        }), "toUpperCase");
+
+        return m;
+      }
+    }
+  }
+}

tests/string_methods.cpp

@@ -0,0 +1,34 @@
+#define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
+#include <string>
+#include "catch.hpp"
+
+#include <chaiscript/chaiscript.hpp>
+#include <chaiscript/chaiscript_stdlib.hpp>
+#include "../include/chaiscript/extras/string_methods.hpp"
+
+TEST_CASE( "string_methods functions work", "[string_methods]" ) {
+  auto stdlib = chaiscript::Std_Lib::library();
+  chaiscript::ChaiScript chai(stdlib);
+
+  // Add the string_methods module.
+  auto stringmethods = chaiscript::extras::string_methods::bootstrap();
+  chai.add(stringmethods);
+
+  // replace(string, string)
+  CHECK(chai.eval<std::string>("\"Hello World!\".replace(\"Hello\", \"Goodbye\")") == "Goodbye World!");
+
+  // replace(char, char)
+  CHECK(chai.eval<std::string>("\"Hello World!\".replace('e', 'i')") == "Hillo World!");
+
+  // trim()
+  CHECK(chai.eval<std::string>("\"   Hello World!    \".trim()") == "Hello World!");
+
+  // split()
+  CHECK(chai.eval<std::string>("\"Hello,World,How,Are,You\".split(\",\")[1]") == "World");
+
+  // toLowerCase()
+  CHECK(chai.eval<std::string>("\"HeLLO WoRLD!\".toLowerCase()") == "hello world!");
+
+  // toUpperCase()
+  CHECK(chai.eval<std::string>("\"Hello World!\".toUpperCase()") == "HELLO WORLD!");
+}