add package options (#13)

* add package options

* update tests

* update Glue package

cmake/CPM.cmake

@@ -6,15 +6,26 @@ if(CPM_DIRECTORY)
   endif()
 endif()
 
+option(CPM_LOCAL_PACKAGES_ONLY "Use only locally installed packages" OFF)
+option(CPM_REMOTE_PACKAGES_ONLY "Always download packages" OFF)
+
 set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "")
 set(CPM_PACKAGES "" CACHE INTERNAL "")
 
 include(FetchContent)
 include(CMakeParseArguments)
 
-option(CPM_LOCAL_PACKAGES_ONLY "Use only locally installed packages" OFF)
+function(CPMRegisterPackage PACKAGE VERSION)
-option(CPM_REMOTE_PACKAGES_ONLY "Always download packages" OFF)
+  LIST(APPEND CPM_PACKAGES ${CPM_ARGS_NAME})
+  set(CPM_PACKAGES ${CPM_PACKAGES} CACHE INTERNAL "")
+  set(PACKAGE_VERSION_VARIABLE "CPM_PACKAGE_${PACKAGE}_VERSION")
+  set(${PACKAGE_VERSION_VARIABLE} ${VERSION} CACHE INTERNAL "")
+endfunction()
 
+function(CPMGetPreviousPackageVersion PACKAGE)
+  set(PACKAGE_VERSION_VARIABLE "CPM_PACKAGE_${PACKAGE}_VERSION")
+  set(CPM_PREVIOUS_PACKAGE_VERSION "${${PACKAGE_VERSION_VARIABLE}}" PARENT_SCOPE)
+endfunction()
 
 function(CPMAddPackage)
     
@@ -24,26 +35,40 @@ function(CPMAddPackage)
     GIT_TAG
   )
 
-  cmake_parse_arguments(CPM_ARGS QUIET "${oneValueArgs}" "" ${ARGN})
+  set(multiValueArgs
+    OPTIONS
+  )
+
+  cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
   if (NOT CPM_ARGS_GIT_TAG)
     set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION})
   endif()
 
   if (${CPM_ARGS_NAME} IN_LIST CPM_PACKAGES)
-    message(STATUS "CPM: not adding ${CPM_ARGS_NAME}@${CPM_ARGS_GIT_TAG}: already addded package ${CPM_ARGS_NAME}")
+    CPMGetPreviousPackageVersion(${CPM_ARGS_NAME})
+    message(STATUS "CPM: SKIP ${CPM_ARGS_NAME}@${CPM_ARGS_GIT_TAG}: already addded package ${CPM_ARGS_NAME}@${CPM_PREVIOUS_PACKAGE_VERSION}")
     return()
   endif()
 
-  LIST(APPEND CPM_PACKAGES ${CPM_ARGS_NAME})
+  CPMRegisterPackage(${CPM_ARGS_NAME} ${CPM_ARGS_GIT_TAG})
-  set(CPM_PACKAGES ${CPM_PACKAGES} CACHE INTERNAL "")
+
+  if (CPM_ARGS_OPTIONS)
+    foreach(OPTION ${CPM_ARGS_OPTIONS})
+      string(REGEX MATCH "^[^ ]+" OPTION_KEY ${OPTION})
+      string(LENGTH ${OPTION_KEY} OPTION_KEY_LENGTH)
+      math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1")
+      string(SUBSTRING ${OPTION} "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE)
+      set(${OPTION_KEY} ${OPTION_VALUE} CACHE INTERNAL "")
+    endforeach()
+  endif()
 
   if (NOT ${CPM_REMOTE_PACKAGES_ONLY})
     find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} QUIET)
     set(CPM_PACKAGE_FOUND ${CPM_ARGS_NAME}_FOUND)
-  
+
     if(${CPM_PACKAGE_FOUND})
-      message(STATUS "CPM: using local package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION}")
+      message(STATUS "CPM: ADD local package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION}")
       set_target_properties(${CPM_ARGS_NAME} 
         PROPERTIES
           IMPORTED_GLOBAL True
@@ -54,7 +79,7 @@ function(CPMAddPackage)
 
   if (NOT ${CPM_LOCAL_PACKAGES_ONLY})
 
-    message(STATUS "CPM: fetching package ${CPM_ARGS_NAME}@${CPM_ARGS_GIT_TAG}")
+    message(STATUS "CPM: ADD remote package ${CPM_ARGS_NAME}@${CPM_ARGS_GIT_TAG}")
 
     set(CPM_PACKAGE_CONTENT ${CPM_ARGS_NAME}_CONTENT)
 

tests/complex/CMakeLists.txt

@@ -4,34 +4,50 @@ project(CPMTest)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/CPM.cmake)
 
+# ignore locally installed projects for reproducable builds
+set(CPM_REMOTE_PACKAGES_ONLY ON CACHE INTERNAL "")
+
+# util library
 CPMAddPackage(
   NAME LHC
   GIT_REPOSITORY https://github.com/TheLartians/LHC.git
-  VERSION 0.4
+  VERSION 0.7
 )
 
+# adding LHC again will be ignored as the package has already been added
 CPMAddPackage(
   NAME LHC
   GIT_REPOSITORY https://github.com/TheLartians/LHC.git
   VERSION 0.1
 )
 
+# language bindings
+# depends on visitor library that depends on Event library and LHC (ignored as already added)
+# configuration arguments passed via OPTIONS. these will all be set internally
+set(GLUE_ENABLE_LUA ON)
 CPMAddPackage(
-  NAME LarsEvent
+  NAME Glue
-  GIT_REPOSITORY https://github.com/TheLartians/Event.git
+  GIT_TAG 78af65625751ad15a42ca52b842863e85b5d2adc
-  VERSION 1.0
+  GIT_REPOSITORY https://github.com/TheLartians/Glue.git
+  OPTIONS 
+    "GLUE_ENABLE_LUA ON"
+    "GLUE_BUILD_LUA ON"
 )
 
+# parser library 
+# depends on LHC (ignored as already added)
 CPMAddPackage(
   NAME LarsParser
   GIT_REPOSITORY https://github.com/TheLartians/Parser.git
-  VERSION 1.4
+  VERSION 1.7
+  OPTIONS 
+    "BUILD_LARS_PARSER_GLUE_EXTENSION ON"
 )
 
 # add executable
 set (CMAKE_CXX_STANDARD 17)
 add_executable(cpm-test test.cpp)
-target_link_libraries(cpm-test LHC LarsEvent LarsParser)
+target_link_libraries(cpm-test LHC LarsParser Glue)
 
 # tests
 enable_testing()

tests/complex/test.cpp

@@ -1,30 +1,52 @@
-#include <lars/parser_generator.h>
+#include <lars/parser/extension.h>
-#include <lars/event.h>
+#include <lars/lua_glue.h>
+#include <stdexcept>
 
 int main() {
-  // Define the return value
+  // create lua state
-  int result = 1;
+  auto lua = lars::LuaState();
+  lua.open_libs();
 
-  // Define grammar and evaluation rules
+  // create extensions
-  lars::ParserGenerator<float> g;
+  lars::Extension extensions;
-  g.setSeparator(g["Whitespace"] << "[\t ]");
-  g["Sum"     ] << "Add | Subtract | Product";
-  g["Product" ] << "Multiply | Divide | Atomic";
-  g["Atomic"  ] << "Number | '(' Sum ')'";
-  g["Add"     ] << "Sum '+' Product"    >> [](auto e){ return e[0].evaluate() + e[1].evaluate(); };
-  g["Subtract"] << "Sum '-' Product"    >> [](auto e){ return e[0].evaluate() - e[1].evaluate(); };
-  g["Multiply"] << "Product '*' Atomic" >> [](auto e){ return e[0].evaluate() * e[1].evaluate(); };
-  g["Divide"  ] << "Product '/' Atomic" >> [](auto e){ return e[0].evaluate() / e[1].evaluate(); };
-  g["Number"  ] << "'-'? [0-9]+ ('.' [0-9]+)?" >> [](auto e){ return stof(e.string()); };
-  g.setStart(g["Sum"]);
 
-  // create an event
+  // add parser library to extension
-  lars::Event<float> onResult;
+  extensions.add_extension("parser", lars::extensions::parser());
-  onResult.connect([&](float v){ result = !(int(v) == 5); });
+
+  // connect parser extension to lua
+  extensions.connect(lua.get_glue());
+
+  // create a parser
+  lua.run(R"(
+    NumberMap = parser.Program.create()
+
+    NumberMap:setRule("Whitespace", "[ \t]")
+    NumberMap:setSeparatorRule("Whitespace")
+
+    NumberMap:setRuleWithCallback("Object", "'{' KeyValue (',' KeyValue)* '}'",function(e) 
+      local N = e:size()-1
+      local res = {}
+      for i=0,N do 
+        local a = e:get(i)
+        res[a:get(0):evaluate()] = a:get(1):evaluate() 
+      end
+      return res
+    end)
+
+    NumberMap:setRule("KeyValue", "Number ':' Number")
+
+    NumberMap:setRuleWithCallback("Number", "'-'? [0-9]+", function(e) return tonumber(e:string()); end)
+    
+    NumberMap:setStartRule("Object")
+  )");
+
+  // parse a string
+  lua.run("m = NumberMap:run('{1:3, 2:-1, 3:42}')");
   
-  // emit the result of a parsed string
+  // check result
-  onResult.notify(g.run("1 + 2 * (3+4)/2 - 3"));
+  if (lua.get_numeric("m[1]") != 3) throw std::runtime_error("unexpected result");
+  if (lua.get_numeric("m[2]") != -1) throw std::runtime_error("unexpected result");
+  if (lua.get_numeric("m[3]") != 42) throw std::runtime_error("unexpected result");
 
-  // return the result
+  return 0;
-  return result;
 }

tests/simple/CMakeLists.txt

@@ -8,7 +8,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/CPM.cmake)
 CPMAddPackage(
   NAME LarsParser
   GIT_REPOSITORY https://github.com/TheLartians/Parser.git
-  VERSION 1.4
+  VERSION 1.7
 )
 
 # add executable

tests/simple/test.cpp

@@ -1,4 +1,4 @@
-#include <lars/parser_generator.h>
+#include <lars/parser/generator.h>
 
 int main() {
   lars::ParserGenerator<float> g;