Json parser

.gitignore

@@ -53,3 +53,4 @@ dkms.conf
 
 build/
 .vscode/
+.gdb_history

Makefile

@@ -4,23 +4,32 @@ TARGET=cairo_vm
 TEST_TARGET=cairo_vm_test
 
 CC=cc
+CXX=g++
 SANITIZER_FLAGS=-fsanitize=address -fno-omit-frame-pointer
 CFLAGS=-std=c11 -Wall -Wextra -Wimplicit-fallthrough -Werror -pedantic -g -O0
+CXX_FLAGS=-std=c++14 -Wall -Wextra -Wimplicit-fallthrough -Werror -pedantic -g -O0
 CFLAGS_TEST=-I./src
+
 LN_FLAGS=-L./lambdaworks/lib/lambdaworks/target/release/ -llambdaworks
 
 BUILD_DIR=./build
 SRC_DIR=./src
 TEST_DIR=./test
+LIB_DIR=./lib
 
 SOURCE = $(wildcard $(SRC_DIR)/*.c)
-TEST_SOURCE = $(wildcard $(TEST_DIR)/*.c) $(wildcard $(SRC_DIR)/*.c)
-TEST_SOURCE := $(filter-out %main.c, $(TEST_SOURCE))
+SOURCE := $(filter-out %main.c, $(SOURCE))
+SOURCE_CPP = $(wildcard $(SRC_DIR)/*.cpp)
+LIB_SOURCE_CPP = $(wildcard $(LIB_DIR)/*.cpp)
+TEST_SOURCE = $(wildcard $(TEST_DIR)/*.c)
+TEST_SOURCE_CPP = $(wildcard $(TEST_DIR)/*.cpp) $(wildcard $(SRC_DIR)/*.cpp)
 
 HEADERS = $(wildcard $(SRC_DIR)/*.h)
 TEST_HEADERS = $(wildcard $(TEST_DIR)/*.h)
 OBJECTS = $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.o, $(SOURCE))
+OBJECTS_CPP = $(patsubst $(SRC_DIR)/%.cpp, $(BUILD_DIR)/%.o, $(SOURCE_CPP))
 TEST_OBJECTS = $(patsubst $(TEST_DIR)/%.c, $(BUILD_DIR)/%.o, $(TEST_SOURCE))
+LIB_OBJECTS_CPP = $(patsubst $(LIB_DIR)/%.cpp, $(BUILD_DIR)/%.o, $(LIB_SOURCE_CPP))
 
 # Gcc/Clang will create these .d files containing dependencies.
 DEP = $(OBJECTS:%.o=%.d)
@@ -29,13 +38,13 @@ default: compile-rust $(TARGET)
 
 $(TARGET): $(BUILD_DIR)/$(TARGET)
 
-$(BUILD_DIR)/$(TARGET): $(OBJECTS)
-	$(CC) $(CFLAGS) $(SANITIZER_FLAGS) $(LN_FLAGS) $^ -o $@
+$(BUILD_DIR)/$(TARGET): $(OBJECTS) $(OBJECTS_CPP) $(LIB_OBJECTS_CPP) $(SRC_DIR)/main.o
+	$(CXX) $(CXX_FLAGS) $(SANITIZER_FLAGS) $(LN_FLAGS) $^ -o $@
 
 $(TEST_TARGET): $(BUILD_DIR)/$(TEST_TARGET)
 
-$(BUILD_DIR)/$(TEST_TARGET): $(TEST_OBJECTS)
-	$(CC) $(CFLAGS) $(CFLAGS_TEST) $(SANITIZER_FLAGS) $(LN_FLAGS) $^ -o $@
+$(BUILD_DIR)/$(TEST_TARGET): $(OBJECTS) $(OBJECTS_CPP) $(LIB_OBJECTS_CPP) $(TEST_OBJECTS)
+	$(CXX) $(CXX_FLAGS) $(SANITIZER_FLAGS) $(LN_FLAGS) $^ -o $@
 
 -include $(DEP)
 
@@ -47,15 +56,23 @@ $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
 	@mkdir -p $(@D)
 	$(CC) $(CFLAGS) $(SANITIZER_FLAGS) -MMD -c $< -o $@
 
+$(BUILD_DIR)/%.o: $(SRC_DIR)/%.cpp
+	@mkdir -p $(@D)
+	$(CXX) $(CXX_FLAGS) $(SANITIZER_FLAGS) -MMD -c $< -o $@
+
 $(BUILD_DIR)/%.o: $(TEST_DIR)/%.c
 	@mkdir -p $(@D)
 	$(CC) $(CFLAGS) $(CFLAGS_TEST) $(SANITIZER_FLAGS) -MMD -c $< -o $@
 
+$(BUILD_DIR)/%.o: $(LIB_DIR)/%.cpp
+	@mkdir -p $(@D)
+	$(CXX) $(CXX_FLAGS) $(SANITIZER_FLAGS) -MMD -c $< -o $@
+
 deps-macos:
 	brew install clang-format
 
 run: default
-	$(BUILD_DIR)/$(TARGET) 
+	$(BUILD_DIR)/$(TARGET)
 
 test: compile-rust $(TEST_TARGET)
 	$(BUILD_DIR)/$(TEST_TARGET)

lambdaworks/lib/lambdaworks.h

@@ -1,5 +1,9 @@
+#pragma once
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 /* A single limb (unsigned integer with 64 bits). */
 typedef uint64_t limb_t;
 
@@ -25,4 +29,8 @@ void sub(felt_t a, felt_t b, felt_t result);
 void mul(felt_t a, felt_t b, felt_t result);
 
 /* Writes the result variable with a / b. */
-void div(felt_t a, felt_t b, felt_t result);
+void lw_div(felt_t a, felt_t b, felt_t result);
+
+#ifdef __cplusplus
+}
+#endif

lambdaworks/lib/lambdaworks/src/lib.rs

@@ -68,6 +68,6 @@ pub extern "C" fn mul(a: Limbs, b: Limbs, result: Limbs) {
 }
 
 #[no_mangle]
-pub extern "C" fn div(a: Limbs, b: Limbs, result: Limbs) {
+pub extern "C" fn lw_div(a: Limbs, b: Limbs, result: Limbs) {
     felt_to_limbs(limbs_to_felt(a) / limbs_to_felt(b), result)
 }