Skip to content

Commit c6f7503

Browse files
GoPlanGoPlan
committed
- Re-organising for iOS
1 parent 3a48b2e commit c6f7503

75 files changed

Lines changed: 108 additions & 1685 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ set(SOURCE_FILES
1616
${CMAKE_CURRENT_SOURCE_DIR}/cldeparser/Exception.cpp
1717
${CMAKE_CURRENT_SOURCE_DIR}/cldeparser/Token.cpp
1818
${CMAKE_CURRENT_SOURCE_DIR}/cldeparser/Tokenizer.cpp
19+
${CMAKE_CURRENT_SOURCE_DIR}/cldeparser/TokenHelper.cpp
20+
${CMAKE_CURRENT_SOURCE_DIR}/cldeparser/TokenizerFactory.cpp
21+
${CMAKE_CURRENT_SOURCE_DIR}/cldeparser/TokenType.cpp
1922
${CMAKE_CURRENT_SOURCE_DIR}/cldeparser/Scanner.cpp
2023
${CMAKE_CURRENT_SOURCE_DIR}/cldeparser/Parser.cpp
2124
${CMAKE_CURRENT_SOURCE_DIR}/cldeparser/Derivative.cpp
@@ -36,7 +39,8 @@ add_library(cldeparser-static STATIC ${COMPLETE_SOURCE})
3639
add_library(cldeparser SHARED ${COMPLETE_SOURCE})
3740
set_target_properties(cldeparser cldeparser-static PROPERTIES
3841
VERSION ${VERSION}
39-
SOVERSION ${VERSION})
42+
SOVERSION ${VERSION}
43+
)
4044

4145
if (APPLE)
4246
set_property(TARGET cldeparser PROPERTY PREFIX "lib")
@@ -62,37 +66,6 @@ add_library(cldeparser-json-static STATIC ${CLDEPARSER_JSON_SOURCE_FILES})
6266
target_link_libraries(cldeparser-json cldeparser-static)
6367
target_link_libraries(cldeparser-json-static cldeparser-static)
6468

65-
# gtest
66-
include_directories(${EXTRA_DIR}/gtest-1.7.0/include)
67-
link_directories(${EXTRA_DIR}/gtest-1.7.0/build)
68-
6969
# cldeparser-apptest
70-
add_executable(cldeparser-apptest
71-
${CMAKE_CURRENT_SOURCE_DIR}/Test/main.cpp
72-
${CMAKE_CURRENT_SOURCE_DIR}/Test/JsonParserInstance.cpp
73-
${CMAKE_CURRENT_SOURCE_DIR}/Test/JsonTestFixture.cpp
74-
${CMAKE_CURRENT_SOURCE_DIR}/Test/Case00_FeatureTest.cpp
75-
${CMAKE_CURRENT_SOURCE_DIR}/Test/Case01_ActualExamples.cpp)
76-
77-
target_link_libraries(cldeparser-apptest gtest cldeparser-static)
78-
79-
# copy testing examples
80-
add_custom_command(
81-
TARGET cldeparser-apptest POST_BUILD
82-
COMMAND ${CMAKE_COMMAND} -E copy_directory
83-
${CMAKE_SOURCE_DIR}/Test/JsonExamples
84-
$<TARGET_FILE_DIR:cldeparser-apptest>/JsonExamples)
85-
86-
# Valgrind
87-
enable_testing()
88-
add_test(
89-
NAME cldeparser-valgrind
90-
COMMAND valgrind -v --leak-check=summary --show-leak-kinds=all --track-origins=yes ./cldeparser-apptest)
91-
92-
# Example - json
93-
add_executable(example-json Examples/example-json.cpp)
94-
target_link_libraries(example-json cldeparser-static)
95-
96-
# Example - math
97-
add_executable(example-math Examples/example-math.cpp)
98-
target_link_libraries(example-math cldeparser-static)
70+
add_subdirectory(test)
71+
add_subdirectory(examples)

‎Examples/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
# Example - json
3+
add_executable(example-json example-json.cpp)
4+
target_link_libraries(example-json cldeparser-static cldeparser-json-static)
5+
6+
# Example - math
7+
add_executable(example-math example-math.cpp)
8+
target_link_libraries(example-math cldeparser-static cldeparser-json-static)

‎Examples/example-json.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <string>
22
#include <iostream>
33
#include <cldeparser/CldeParser.h>
4-
#include <cldeparser/Parsing/Json/Json.h>
4+
#include <cldeparser-json/Json.h>
55

66
using namespace CLDEParser;
77

‎Test/CMakeLists.txt‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
3+
# gtest
4+
include_directories(${EXTRA_DIR}/gtest-1.7.0/include)
5+
link_directories(${EXTRA_DIR}/gtest-1.7.0/build)
6+
7+
# cldeparser-apptest
8+
add_executable(cldeparser-apptest
9+
${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
10+
${CMAKE_CURRENT_SOURCE_DIR}/JsonParserInstance.cpp
11+
${CMAKE_CURRENT_SOURCE_DIR}/JsonTestFixture.cpp
12+
${CMAKE_CURRENT_SOURCE_DIR}/Case00_FeatureTest.cpp
13+
${CMAKE_CURRENT_SOURCE_DIR}/Case01_ActualExamples.cpp)
14+
15+
target_link_libraries(cldeparser-apptest gtest cldeparser-static cldeparser-json-static)
16+
17+
# copy testing examples
18+
add_custom_command(
19+
TARGET cldeparser-apptest POST_BUILD
20+
COMMAND ${CMAKE_COMMAND} -E copy_directory
21+
${CMAKE_SOURCE_DIR}/test/JsonExamples
22+
$<TARGET_FILE_DIR:cldeparser-apptest>/JsonExamples)
23+
24+
# Valgrind
25+
enable_testing()
26+
add_test(
27+
NAME cldeparser-valgrind
28+
COMMAND valgrind -v --leak-check=summary --show-leak-kinds=all --track-origins=yes ./cldeparser-apptest)

‎Test/JsonParserInstance.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define CLDEPARSER_TEST_PARSERINSTANCE_H
77

88
#include <cldeparser/cldeparser.h>
9-
#include <cldeparser/Parsing/Json/Json.h>
9+
#include <cldeparser-json/Json.h>
1010

1111
namespace CLDEParser {
1212
namespace Test {

‎cldeparser-json/Json.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef CLDEPARSER_PARSING_JSON_JSON_H
66
#define CLDEPARSER_PARSING_JSON_JSON_H
77

8+
#include "JsonParserFactory.h"
89
#include "JsonException.h"
910
#include "JsonDerivative.h"
1011
#include "JsonEntity.h"

‎cldeparser-json/JsonParserFactory.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace CLDEParser {
99
namespace Parsing {
1010

11-
UPtrDerivative ParserFactory::CreateJsonDerivativeInstance() {
11+
UPtrDerivative JsonParserFactory::CreateJsonDerivativeInstance() {
1212
return std::unique_ptr<Json::JsonDerivative>(new Json::JsonDerivative());
1313
}
1414
}

‎cldeparser-json/JsonParserFactory.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace CLDEParser {
1111
namespace Parsing {
12-
struct ParserFactory {
12+
struct JsonParserFactory {
1313
static UPtrDerivative CreateJsonDerivativeInstance();
1414
};
1515
}

‎cldeparser/CldeParser.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
#include "Exception.h"
1313

1414
// Scanning
15-
#include "Scanning/Scanning.h"
16-
17-
// Parsing
18-
#include "Parsing/Parsing.h"
15+
#include "TokenHelper.h"
16+
#include "TokenizerFactory.h"
1917

2018
#endif //CLDEPARSER_CLDEPARSER_H

‎cldeparser/Parsing/CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)