Merge branch 'develop'

protolabs · Aug 11, 2019 · 3b59e61 · 3b59e61
2 parents bf57adc + 1f0f04a
commit 3b59e61
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,17 @@ carbon-temp-statistics--cache-monitor.csv
 examples/json
 book/libcarbon/latest/book
 book/spec/latest/book
+
+CMakeFiles
+
+CMakeCache
+
+.DS_Store
+
+.idea
+
+Makefile
+
+cmake_install.cmake
+
+CMakeCache.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,11 +6,11 @@ project(libcarbon VERSION 1.0.0.0 DESCRIPTION "A library to operate with CARBON
 set (CMAKE_C_STANDARD 11)
 
 #if (${BUILD_TYPE} MATCHES Debug)
-        message("-- Debug build is enabled")
-        set(CMAKE_BUILD_TYPE Debug)
+#        message("-- Debug build is enabled")
+#        set(CMAKE_BUILD_TYPE Debug)
 #else()
-#        message("-- Release build is enabled")
-#        set(CMAKE_BUILD_TYPE Release)
+        message("-- Release build is enabled")
+        set(CMAKE_BUILD_TYPE Release)
 #endif()
 
 file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/build)
@@ -68,13 +68,13 @@ if (${LOG_WARN} MATCHES "on")
     endif()
 endif()
 
-set (CMAKE_C_FLAGS                "-Wall -std=c11 -Wextra -Werror")
+set (CMAKE_C_FLAGS                "-std=c11 -Wall -Wextra -Werror")
 set (CMAKE_C_FLAGS_DEBUG          "-g")
 set (CMAKE_C_FLAGS_MINSIZEREL     "-Os -DNDEBUG")
 set (CMAKE_C_FLAGS_RELEASE        "-O3 -DNDEBUG")
 set (CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
 
-set (CMAKE_CXX_FLAGS                "-std=c++11 -Wall")
+set (CMAKE_CXX_FLAGS                "-std=c++11 -Wall -Wextra -Werror")
 set (CMAKE_CXX_FLAGS_DEBUG          "-g")
 set (CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG")
 set (CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG")

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,7 @@
-## 0.3.00.01 [2019-XX-XX]
+## 0.5.00.01 [2019-XX-XX]
+- JSON parser for carbon files (see `carbon_from_json` in `carbon.h`)
+
+## 0.3.00.01 [2019-08-09]
 - Add thread pool implementation (`struct thread_pool`)
 
 ## 0.3.00.00 [2019-04-11]

diff --git a/src/ark-js/carbon/carbon-array-it.c b/src/ark-js/carbon/carbon-array-it.c
@@ -75,7 +75,7 @@ static bool update_in_place_constant(struct carbon_array_it *it, enum carbon_con
                 error(&it->err, ARK_ERR_INTERNALERR);
                         break;
                 }
-                offset_t datum;
+                offset_t datum = 0;
                 carbon_int_array_it_offset(&datum, it);
                 memfile_seek(&it->memfile, datum);
                 memfile_write(&it->memfile, &value, sizeof(u8));

diff --git a/src/ark-js/carbon/carbon-int.c b/src/ark-js/carbon/carbon-int.c
@@ -74,7 +74,7 @@ ARK_EXPORT(bool) carbon_int_insert_column(struct memfile *memfile_in, struct err
         error_if_null(memfile_in);
         error_if_null(err_in);
 
-        enum carbon_field_type column_type;
+        ark_declare_and_init(enum carbon_field_type, column_type)
 
         switch (type) {
         case CARBON_COLUMN_TYPE_BOOLEAN:

diff --git a/src/ark-js/carbon/carbon-key.c b/src/ark-js/carbon/carbon-key.c
@@ -93,7 +93,9 @@ ARK_EXPORT(bool) carbon_key_skip(enum carbon_primary_key_type *out, struct memfi
 ARK_EXPORT(bool) carbon_key_write_unsigned(struct memfile *file, u64 key)
 {
         error_if_null(file)
-        enum carbon_primary_key_type key_type;
+
+        ark_declare_and_init(enum carbon_primary_key_type, key_type)
+
         carbon_key_read_type(&key_type, file);
         if (carbon_key_is_unsigned_type(key_type)) {
                 memfile_write(file, &key, sizeof(u64));
@@ -107,7 +109,9 @@ ARK_EXPORT(bool) carbon_key_write_unsigned(struct memfile *file, u64 key)
 ARK_EXPORT(bool) carbon_key_write_signed(struct memfile *file, i64 key)
 {
         error_if_null(file)
-        enum carbon_primary_key_type key_type;
+
+        ark_declare_and_init(enum carbon_primary_key_type, key_type)
+
         carbon_key_read_type(&key_type, file);
         if (carbon_key_is_signed_type(key_type)) {
                 memfile_write(file, &key, sizeof(i64));
@@ -121,7 +125,7 @@ ARK_EXPORT(bool) carbon_key_write_signed(struct memfile *file, i64 key)
 ARK_EXPORT(bool) carbon_key_update_string(struct memfile *file, const char *key)
 {
         error_if_null(file)
-        enum carbon_primary_key_type key_type;
+        ark_declare_and_init(enum carbon_primary_key_type, key_type)
         carbon_key_read_type(&key_type, file);
         if (carbon_key_is_string_type(key_type)) {
                 carbon_string_update(file, key);
@@ -135,7 +139,9 @@ ARK_EXPORT(bool) carbon_key_update_string(struct memfile *file, const char *key)
 ARK_EXPORT(bool) carbon_key_write_string(struct memfile *file, const char *key)
 {
         error_if_null(file)
-        enum carbon_primary_key_type key_type;
+
+        ark_declare_and_init(enum carbon_primary_key_type, key_type)
+
         carbon_key_read_type(&key_type, file);
         if (carbon_key_is_string_type(key_type)) {
                 carbon_string_write(file, key);

diff --git a/src/ark-js/carbon/carbon-revision.c b/src/ark-js/carbon/carbon-revision.c
@@ -63,9 +63,11 @@ ARK_EXPORT(bool) carbon_revision_peek(u64 *revision, struct memfile *file)
 
 ARK_EXPORT(bool) carbon_revision_inc(struct memfile *file)
 {
-        u64 rev;
+        ark_declare_and_init(u64, rev)
+
         carbon_revision_peek(&rev, file);
         rev++;
         memfile_update_varuint(file, rev);
+
         return true;
 }
diff --git a/src/ark-js/carbon/carbon.c b/src/ark-js/carbon/carbon.c
@@ -169,6 +169,14 @@ ARK_EXPORT(bool) carbon_create_empty_ex(struct carbon *doc, enum carbon_primary_
         return true;
 }
 
+ARK_EXPORT(bool) carbon_from_json(struct carbon *doc, const char *json)
+{
+        error_if_null(doc)
+        error_if_null(json)
+
+        return true;
+}
+
 ARK_EXPORT(bool) carbon_drop(struct carbon *doc)
 {
         error_if_null(doc);

diff --git a/src/ark-js/carbon/carbon.h b/src/ark-js/carbon/carbon.h
@@ -224,6 +224,8 @@ ARK_EXPORT(bool) carbon_create_empty(struct carbon *doc, enum carbon_primary_key
 ARK_EXPORT(bool) carbon_create_empty_ex(struct carbon *doc, enum carbon_primary_key_type key_type, u64 doc_cap_byte,
         u64 array_cap_byte);
 
+ARK_EXPORT(bool) carbon_from_json(struct carbon *doc, const char *json);
+
 ARK_EXPORT(bool) carbon_drop(struct carbon *doc);
 
 ARK_EXPORT(bool) carbon_is_up_to_date(struct carbon *doc);

diff --git a/src/ark-js/shared/common.h b/src/ark-js/shared/common.h
@@ -271,6 +271,10 @@ ark_func_unused static const char *basic_type_to_system_type_str(enum field_type
 #define  MARKER_SYMBOL_HASHTABLE_HEADER    '#'
 #define  MARKER_SYMBOL_VECTOR_HEADER       '|'
 
+#define ark_declare_and_init(type, name)                                                                               \
+        type name;                                                                                                     \
+        ark_zero_memory(&name, sizeof(type));
+
 #define ark_zero_memory(dst, len)                                                                                      \
     memset((void *) dst, 0, len);
 

diff --git a/tests/carbon/test-carbon.cpp b/tests/carbon/test-carbon.cpp
@@ -437,7 +437,7 @@ TEST(CarbonTest, BisonArrayIteratorStrings) {
         for (i32 i = 0; i < 10; i++) {
                 u64 strlen = rand() % (100 + 1 - 4) + 4;
                 char buffer[strlen];
-                for (i32 j = 0; j < strlen; j++) {
+                for (u64 j = 0; j < strlen; j++) {
                         buffer[j] = 65 + (rand() % 25);
                 }
                 buffer[0] = '!';
@@ -7221,6 +7221,11 @@ TEST(CarbonTest, BisonUpdateSetToNull)
         string_builder_drop(&sb);
 }
 
+TEST(CarbonTest, CarbonFromJson)
+{
+
+}
+
 int main(int argc, char **argv) {
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();