Initial support of string_id

Author: lefticus

CMakeLists.txt

@@ -217,4 +217,8 @@ add_executable(math_test tests/math.cpp)
 target_link_libraries(math_test ${LIBS})
 ADD_CATCH_TESTS(math_test)
 
+add_executable(string_id_test tests/string_id.cpp)
+target_link_libraries(string_id_test ${LIBS})
+ADD_CATCH_TESTS(string_id_test)
+
 

biicode.cmake

@@ -1,6 +1,7 @@
-set(BII_LIB_DEPS "pthread -ldl")
+set(BII_LIB_DEPS "pthread -ldl ../../lib/libfoonathan_string_id.a")
 
 ADD_BIICODE_TARGETS()
+TARGET_INCLUDE_DIRECTORIES(${BII_BLOCK_TARGET} INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/../foonathan_string_id")
 
 
 IF(APPLE)

biicode.conf

@@ -0,0 +1,52 @@
+# Biicode configuration file
+
+[requirements]
+	 ChaiScript/ChaiScript: 1
+	 foonathan/string_id: 7
+
+[parent]
+    # The parent version of this block. Must match folder name. E.g.
+    # user/block  # No version number means not published yet
+    # You can change it to publish to a different track, and change version, e.g.
+    # user/block(track): 7
+
+[paths]
+    # Local directories to look for headers (within block)
+    # /
+    # include
+
+[dependencies]
+    # Manual adjust file implicit dependencies, add (+), remove (-), or overwrite (=)
+    # hello.h + hello_imp.cpp hello_imp2.cpp
+    # *.h + *.cpp
+
+[mains]
+    # Manual adjust of files that define an executable
+    # !main.cpp  # Do not build executable from this file
+    # main2.cpp # Build it (it doesnt have a main() function, but maybe it includes it)
+    !tests/catch.hpp
+    tests/*.cpp
+    main.cpp
+
+[tests]
+    # Manual adjust of files that define a CTest test
+    # test/* pattern to evaluate this test/ folder sources like tests
+    tests/*.cpp
+
+[hooks]
+    # These are defined equal to [dependencies],files names matching bii*stage*hook.py
+    # will be launched as python scripts at stage = {post_process, clean}
+    # CMakeLists.txt + bii/my_post_process1_hook.py bii_clean_hook.py
+
+[includes]
+    # Mapping of include patterns to external blocks
+    # hello*.h: user3/depblock  # includes will be processed as user3/depblock/hello*.h
+    chaiscript/*.hpp: ChaiScript/ChaiScript/include
+    string_id/*.hpp: foonathan
+
+[data]
+    # Manually define data files dependencies, that will be copied to bin for execution
+    # By default they are copied to bin/user/block/... which should be taken into account
+    # when loading from disk such data
+    # image.cpp + image.jpg  # code should write open("user/block/image.jpg")
+

include/chaiscript/extras/string_id.hpp

@@ -0,0 +1,63 @@
+
+#include <cmath>
+#include <memory>
+
+#include <chaiscript/chaiscript.hpp>
+#include <string_id/string_id.hpp>
+#include <string_id/database.hpp>
+#include <string_id/basic_database.hpp>
+
+namespace chaiscript {
+  namespace extras {
+    namespace string_id {
+
+      ModulePtr bootstrap(ModulePtr m = std::make_shared<Module>())
+      {
+
+        using namespace foonathan;
+
+        // default_database
+        m->add(user_type<foonathan::string_id::default_database>(), "default_database");
+        m->add(constructor<foonathan::string_id::default_database ()>(), "default_database");
+
+        // basic_database
+        m->add(user_type<foonathan::string_id::basic_database>(), "basic_database");
+        m->add(base_class<foonathan::string_id::basic_database, foonathan::string_id::default_database>());
+
+        // string_id
+        m->add(user_type<foonathan::string_id::string_id>(), "string_id");
+        m->add(constructor<foonathan::string_id::string_id (const foonathan::string_id::string_id &)>(), "string_id");
+        m->add(constructor<foonathan::string_id::string_id (const foonathan::string_id::string_info &, foonathan::string_id::basic_database &)>(), "string_id");
+        m->add(constructor<foonathan::string_id::string_id (const foonathan::string_id::string_id &, foonathan::string_id::string_info)>(), "string_id");
+        m->add(fun(&foonathan::string_id::string_id::hash_code), "hash_code");
+        m->add(fun(&foonathan::string_id::string_id::database), "database");
+        m->add(fun<bool (const foonathan::string_id::string_id &, const foonathan::string_id::string_id &)>([](const foonathan::string_id::string_id &t_lhs, const foonathan::string_id::string_id &t_rhs){ return t_lhs == t_rhs; }), "==");
+        m->add(fun<bool (foonathan::string_id::hash_type, const foonathan::string_id::string_id &)>([](foonathan::string_id::hash_type t_lhs, const foonathan::string_id::string_id &t_rhs){ return t_lhs == t_rhs; }), "==");
+        m->add(fun<bool (const foonathan::string_id::string_id &, foonathan::string_id::hash_type)>([](const foonathan::string_id::string_id &t_lhs, foonathan::string_id::hash_type t_rhs){ return t_lhs == t_rhs; }), "==");
+        m->add(fun<bool (const foonathan::string_id::string_id &, const foonathan::string_id::string_id &)>([](const foonathan::string_id::string_id &t_lhs, const foonathan::string_id::string_id &t_rhs){ return t_lhs != t_rhs; }), "!=");
+        m->add(fun<bool (foonathan::string_id::hash_type, const foonathan::string_id::string_id &)>([](foonathan::string_id::hash_type t_lhs, const foonathan::string_id::string_id &t_rhs){ return t_lhs != t_rhs; }), "!=");
+        m->add(fun<bool (const foonathan::string_id::string_id &, foonathan::string_id::hash_type)>([](const foonathan::string_id::string_id &t_lhs, foonathan::string_id::hash_type t_rhs){ return t_lhs != t_rhs; }), "!=");
+
+        // string_info
+        m->add(user_type<foonathan::string_id::string_info>(), "string_info");
+        m->add(fun(&foonathan::string_id::string_info::string), "string");
+        m->add(fun(&foonathan::string_id::string_info::length), "length");
+
+
+
+        // type conversions
+        m->add(type_conversion<const std::string &, foonathan::string_id::string_info>(
+              [](const std::string &t_str) { 
+                return foonathan::string_id::string_info(t_str.c_str(), t_str.size()); 
+              }
+            ));
+
+        // free functions
+        m->add(fun(&foonathan::string_id::detail::sid_hash), "sid_hash");
+
+        return m;
+      }
+    }
+  }
+}
+

main.cpp

@@ -1,14 +1,17 @@
 #include "chaiscript/chaiscript.hpp"
 #include "chaiscript/chaiscript_stdlib.hpp"
 #include "include/chaiscript/extras/math.hpp"
+#include "include/chaiscript/extras/string_id.hpp"
 
 #include <iostream>
 
 int main()
 {
   auto stdlib = chaiscript::Std_Lib::library();
   auto mathlib = chaiscript::extras::math::bootstrap();
+  auto string_idlib = chaiscript::extras::string_id::bootstrap();
 
   chaiscript::ChaiScript chai(stdlib);
   chai.add(mathlib);
+  chai.add(string_idlib);
 }

tests/string_id.cpp

@@ -0,0 +1,29 @@
+#define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
+//#include <sstream>
+#include "catch.hpp"
+
+#include <chaiscript/chaiscript.hpp>
+#include <chaiscript/chaiscript_stdlib.hpp>
+#include "../include/chaiscript/extras/string_id.hpp"
+
+#include <iostream>
+
+TEST_CASE( "string_id functions work", "[string_id]" ) {
+  auto stdlib = chaiscript::Std_Lib::library();
+  auto string_idlib = chaiscript::extras::string_id::bootstrap();
+
+  chaiscript::ChaiScript chai(stdlib);
+  chai.add(string_idlib);
+
+  foonathan::string_id::default_database database;
+  chai.add(chaiscript::var(std::ref(database)), "database");
+
+  chai.eval(R""(
+    var id = string_id("Test0815", database);
+  )"");
+
+  using namespace foonathan::string_id::literals;
+  CHECK(chai.eval<const foonathan::string_id::string_id &>("id") == "Test0815"_id);
+}
+
+