Merge pull request #5 from mudream4869/dev

Dev
mudream4869 · Nov 30, 2020 · 02ffd60 · 02ffd60
2 parents 298fe91 + 72824d8
commit 02ffd60
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,6 +49,16 @@ add_library(cablin
 target_link_libraries(cablin
                       ${YAML_CPP_LIBRARIES})
 
+# ----------
+# Installation
+
+install(TARGETS cablin
+        LIBRARY
+        DESTINATION lib)
+
+install(DIRECTORY include/mukyu/cablin
+        DESTINATION include/mukyu/cablin)
+
 # ----------
 # Interpreter
 
@@ -62,4 +72,4 @@ add_subdirectory(example)
 # ----------
 # Unit Test
 
-add_subdirectory(test)
+add_subdirectory(tests)
diff --git a/cablin_examples/test5-1.yaml → cablin_examples/func-import.yaml b/cablin_examples/test5-1.yaml → cablin_examples/func-import.yaml
@@ -1,4 +1,4 @@
-- import: test5
+- import: func-return
 
 - func:
     name: main
@@ -9,8 +9,8 @@
           name: a
           default_value: 30
 
-      # test5::myFunc(a)
+      # func-return::myFunc(a)
       - call:
-          name: test5::myFunc
+          name: func-return::myFunc
           params:
             - get: a
diff --git a/cablin_examples/test6.yaml → cablin_examples/func-param.yaml b/cablin_examples/test6.yaml → cablin_examples/func-param.yaml
diff --git a/cablin_examples/test5.yaml → cablin_examples/func-return.yaml b/cablin_examples/test5.yaml → cablin_examples/func-return.yaml
diff --git a/cablin_examples/test4.yaml → cablin_examples/func.yaml b/cablin_examples/test4.yaml → cablin_examples/func.yaml
diff --git a/cablin_examples/test.yaml → cablin_examples/if.yaml b/cablin_examples/test.yaml → cablin_examples/if.yaml
diff --git a/cablin_examples/test9.yaml → cablin_examples/parse-error.yaml b/cablin_examples/test9.yaml → cablin_examples/parse-error.yaml
@@ -8,7 +8,7 @@
         var:
           type: string
           name: a
-          default_value: 1哈哈1
+          default_value: hello
 
       - call:
           name: io::print

diff --git a/cablin_examples/test8.yaml b/cablin_examples/test8.yaml
diff --git a/cablin_examples/test7.yaml → cablin_examples/var-not-found.yaml b/cablin_examples/test7.yaml → cablin_examples/var-not-found.yaml
diff --git a/cablin_examples/test3.yaml → cablin_examples/while-break.yaml b/cablin_examples/test3.yaml → cablin_examples/while-break.yaml
@@ -26,7 +26,7 @@
                 params:
                   - get: a
 
-            # a = a - one
+            # a = a - 1
             - assign:
                 target: a
                 source:

diff --git a/cablin_examples/test2.yaml → cablin_examples/while.yaml b/cablin_examples/test2.yaml → cablin_examples/while.yaml
@@ -26,7 +26,7 @@
                 params:
                   - get: a
 
-            # a = a - one
+            # a = a - 1
             - assign:
                 target: a
                 source:

diff --git a/test/CMakeLists.txt → tests/CMakeLists.txt b/test/CMakeLists.txt → tests/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.6.2)
 
-enable_testing()
-
 find_package(GTest REQUIRED)
 include_directories(${GTEST_INCLUDE_DIR})
 
@@ -20,10 +18,13 @@ set(cablin_test_function_src
     "src/function/test_functor.cpp"
     "src/function/test_node.cpp")
 
-add_executable(test
+add_executable(unit_tests
     ${cablin_test_command_src}
     ${cablin_test_expr_src}
     ${cablin_test_function_src})
 
-add_dependencies(test cablin)
-target_link_libraries(test cablin ${GTEST_BOTH_LIBRARIES})
+add_dependencies(unit_tests cablin)
+target_link_libraries(unit_tests cablin ${GTEST_BOTH_LIBRARIES})
+
+add_test(NAME unit_tests
+         COMMAND unit_tests) 
diff --git a/test/src/command/test_if.cpp → tests/src/command/test_if.cpp b/test/src/command/test_if.cpp → tests/src/command/test_if.cpp
diff --git a/test/src/command/test_scope.cpp → tests/src/command/test_scope.cpp b/test/src/command/test_scope.cpp → tests/src/command/test_scope.cpp
diff --git a/test/src/command/test_var.cpp → tests/src/command/test_var.cpp b/test/src/command/test_var.cpp → tests/src/command/test_var.cpp
diff --git a/test/src/command/test_while.cpp → tests/src/command/test_while.cpp b/test/src/command/test_while.cpp → tests/src/command/test_while.cpp
diff --git a/test/src/expr/test_const.cpp → tests/src/expr/test_const.cpp b/test/src/expr/test_const.cpp → tests/src/expr/test_const.cpp
diff --git a/test/src/function/test_functor.cpp → tests/src/function/test_functor.cpp b/test/src/function/test_functor.cpp → tests/src/function/test_functor.cpp
diff --git a/test/src/function/test_node.cpp → tests/src/function/test_node.cpp b/test/src/function/test_node.cpp → tests/src/function/test_node.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ @@
                     params:
                       - get: a
-                # a = a - one
+                # a = a - 1
                 - assign:
                     target: a
                     source:
@@ Expand Down @@