Merge branch 'dev' of github.com:transceptor-technology/libcleri

cesbit · Oct 22, 2019 · 060afed · 060afed
2 parents 9a4a004 + 9c3d416
commit 060afed
Show file tree

Hide file tree

Showing 54 changed files with 774 additions and 251 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,4 @@ debian/libcleri-dev/
 debian/libcleri0.debhelper.log
 debian/libcleri0.substvars
 debian/libcleri0/
+debian/tmp/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -45,7 +45,7 @@ git commit -am 'some work that has been done'
 
 Create archive from code
 ```
-git archive -o ../libcleri_0.10.0.orig.tar.gz master
+git archive -o ../libcleri_0.10.1.orig.tar.gz master
 ```
 
 Build deb package

diff --git a/README.md b/README.md
@@ -293,13 +293,13 @@ Example:
 ```c
 // In case a translation function returns an empty string, no text is used
 const char * translate(cleri_t * o) {
-    return "";  // a possible result might be: `error at position x`
+    return "";  // a possible result might be: `error at line 0, position x`
 }
 
 // Text may be returned based on gid
 const char * translate(cleri_t * o) {
     switch (o->gid) {
-        case 1: return "A";  // error at position x, expecting: A
+        case 1: return "A";  // error at line 0, position x, expecting: A
         case 2: return "";   // gid 2 will be ignored
     }
     return NULL;  // normal parsing for everything else

diff --git a/Release/makefile b/Release/makefile
@@ -1,12 +1,7 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
 -include ../makefile.init
 
 RM := rm -rf
 
-# All of the sources participating in the build are defined here
 -include sources.mk
 -include src/subdir.mk
 -include subdir.mk
@@ -31,8 +26,6 @@ INSTALL_PATH := /usr
 SO_NAME := soname
 endif
 
-# Add inputs and outputs from these tool invocations to the build variables
-
 # All Target
 all: libcleri
 

diff --git a/Release/objects.mk b/Release/objects.mk
@@ -1,7 +1,3 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
 USER_OBJS :=
 
 LIBS := -lpcre2-8
diff --git a/Release/sources.mk b/Release/sources.mk
@@ -1,17 +1,12 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
+OBJ_SRCS :=
+ASM_SRCS :=
+C_SRCS :=
+O_SRCS :=
+S_UPPER_SRCS :=
+EXECUTABLES :=
+OBJS :=
+C_DEPS :=
 
-OBJ_SRCS := 
-ASM_SRCS := 
-C_SRCS := 
-O_SRCS := 
-S_UPPER_SRCS := 
-EXECUTABLES := 
-OBJS := 
-C_DEPS := 
-
-# Every subdirectory with source files must be described here
 SUBDIRS := \
 src \
 
diff --git a/Release/src/subdir.mk b/Release/src/subdir.mk
@@ -1,8 +1,3 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables
 C_SRCS += \
 ../src/children.c \
 ../src/choice.c \
@@ -25,7 +20,9 @@ C_SRCS += \
 ../src/sequence.c \
 ../src/this.c \
 ../src/token.c \
-../src/tokens.c
+../src/tokens.c \
+../src/version.c
+
 
 OBJS += \
 ./src/children.o \
@@ -49,7 +46,8 @@ OBJS += \
 ./src/sequence.o \
 ./src/this.o \
 ./src/token.o \
-./src/tokens.o
+./src/tokens.o \
+./src/version.o
 
 C_DEPS += \
 ./src/children.d \
@@ -73,14 +71,12 @@ C_DEPS += \
 ./src/sequence.d \
 ./src/this.d \
 ./src/token.d \
-./src/tokens.d
+./src/tokens.d \
+./src/version.d
 
-# Each subdirectory must supply rules for building sources it contributes
 src/%.o: ../src/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: Cross GCC Compiler'
 	gcc -DNDEBUG -I../inc -O3 -Wall $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
-
-
diff --git a/Release/subdir.mk b/Release/subdir.mk
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,27 @@
+libcleri (0.11.0-0~tt1) unstable; urgency=medium
+
+  * Added cleri_parse2() which accepts an additional `flags` argument
+  * Improved syntax error handling
+  * Set correct position when nested error in syntax is found
+
+ -- Jeroen van der Heijden <joente@xjoente>  Tue, 22 Oct 2019 10:59:14 +0200
+
+libcleri (0.10.1-0~alpha1-tt1) unstable; urgency=medium
+
+  * Added option to disable generating expecting info
+
+ -- Jeroen van der Heijden <jeroen@transceptor.technology>  Mon, 12 Nov 2018 14:34:16 +0100
+
+libcleri (0.10.1-0~alpha0-tt1) unstable; urgency=medium
+
+  * Added `void *data` to node type for public usage
+  * Children will only be added to a node when necessary
+    (Be carefull that accessing the first child therefore
+    must be checked for NULL whereas in previous versions,
+    one could immediately check the `children->node` pointer)
+
+ -- Jeroen van der Heijden <jeroen@transceptor.technology>  Wed, 31 Oct 2018 22:22:05 +0100
+
 libcleri (0.10.0-0~tt1) unstable; urgency=medium
 
   * Update deb test

diff --git a/debian/libcleri0.symbols b/debian/libcleri0.symbols
@@ -4,7 +4,6 @@ libcleri.so.0 libcleri0 #MINVER#
  CLERI_THIS@Base 0.9.3
  cleri__children_add@Base 0.9.3
  cleri__children_free@Base 0.9.3
- cleri__children_new@Base 0.9.3
  cleri__expecting_combine@Base 0.9.3
  cleri__expecting_free@Base 0.9.3
  cleri__expecting_new@Base 0.9.3
@@ -35,7 +34,7 @@ libcleri.so.0 libcleri0 #MINVER#
  cleri_list@Base 0.9.3
  cleri_new@Base 0.9.3
  cleri_optional@Base 0.9.3
- cleri_parse@Base 0.9.3
+ cleri_parse2@Base 0.10.1~
  cleri_parse_expect_start@Base 0.9.3
  cleri_parse_free@Base 0.9.3
  cleri_parse_strn@Base 0.10.0~
@@ -47,3 +46,4 @@ libcleri.so.0 libcleri0 #MINVER#
  cleri_sequence@Base 0.9.3
  cleri_token@Base 0.9.3
  cleri_tokens@Base 0.9.3
+ cleri_version@Base 0.10.1~
diff --git a/inc/cleri/children.h b/inc/cleri/children.h
@@ -11,9 +11,8 @@ typedef struct cleri_node_s cleri_node_t;
 typedef struct cleri_children_s cleri_children_t;
 
 /* private functions */
-cleri_children_t * cleri__children_new(void);
 void cleri__children_free(cleri_children_t * children);
-int cleri__children_add(cleri_children_t * children, cleri_node_t * node);
+int cleri__children_add(cleri_children_t ** children, cleri_node_t * node);
 
 /* structs */
 struct cleri_children_s

diff --git a/inc/cleri/cleri.h b/inc/cleri/cleri.h
@@ -10,6 +10,12 @@
 #define cleri__malloc(__t) (malloc(sizeof(__t)))
 #endif
 
+#ifdef __cplusplus
+#define cleri__mallocn(__n, __t) ((__t*)malloc(__n * sizeof(__t)))
+#else
+#define cleri__mallocn(__n, __t) (malloc(__n * sizeof(__t)))
+#endif
+
 #include <cleri/expecting.h>
 #include <cleri/keyword.h>
 #include <cleri/sequence.h>
@@ -28,6 +34,7 @@
 #include <cleri/rule.h>
 #include <cleri/this.h>
 #include <cleri/ref.h>
+#include <cleri/version.h>
 
 /* typedefs */
 typedef struct cleri_s cleri_t;

diff --git a/inc/cleri/expecting.h b/inc/cleri/expecting.h
@@ -20,7 +20,7 @@ typedef struct cleri_exp_modes_s cleri_exp_modes_t;
 typedef struct cleri_expecting_s cleri_expecting_t;
 
 /* private functions */
-cleri_expecting_t * cleri__expecting_new(const char * str);
+cleri_expecting_t * cleri__expecting_new(const char * str, int flags);
 int cleri__expecting_update(
         cleri_expecting_t * expecting,
         cleri_t * cl_obj,

diff --git a/inc/cleri/kwcache.h b/inc/cleri/kwcache.h
@@ -10,20 +10,20 @@
 
 /* typedefs */
 typedef struct cleri_parse_s cleri_parse_t;
-typedef struct cleri_kwcache_s cleri_kwcache_t;
 
 /* private functions */
-cleri_kwcache_t * cleri__kwcache_new(void);
+uint8_t * cleri__kwcache_new(const char * str);
 ssize_t cleri__kwcache_match(cleri_parse_t * pr, const char * str);
-void cleri__kwcache_free(cleri_kwcache_t * kwcache);
+static inline void cleri__kwcache_free(uint8_t * kwcache);
 
-/* structs */
-struct cleri_kwcache_s
+
+/*
+ * Destroy kwcache. (parsing NULL is allowed)
+ */
+static inline void cleri__kwcache_free(uint8_t * kwcache)
 {
-    size_t len;
-    const char * str;
-    cleri_kwcache_t * next;
-};
+    free(kwcache);
+}
 
 #endif /* CLERI_KWCACHE_H_ */
 
diff --git a/inc/cleri/node.h b/inc/cleri/node.h
@@ -34,10 +34,11 @@ struct cleri_node_s
     size_t len;
     cleri_t * cl_obj;
     cleri_children_t * children;
+    void * data;        /* free to use by the user */
 
     /* private */
-    uint_fast8_t ref;
-    int64_t result;
+    size_t ref;
+    int64_t result;     /* DEPRECATED */
 };
 
 #endif /* CLERI_NODE_H_ */
diff --git a/inc/cleri/olist.h b/inc/cleri/olist.h
@@ -18,6 +18,7 @@ int cleri__olist_append_nref(cleri_olist_t * olist, cleri_t * cl_object);
 void cleri__olist_free(cleri_olist_t * olist);
 void cleri__olist_empty(cleri_olist_t * olist);
 void cleri__olist_cancel(cleri_olist_t * olist);
+void cleri__olist_unique(cleri_olist_t * olist);
 
 /* structs */
 struct cleri_olist_s

diff --git a/inc/cleri/parse.h b/inc/cleri/parse.h
@@ -14,15 +14,22 @@
 #include <cleri/rule.h>
 
 #ifndef MAX_RECURSION_DEPTH
-#define MAX_RECURSION_DEPTH 50
+#define MAX_RECURSION_DEPTH 500
 #endif
 
+enum
+{
+    CLERI_FLAG_EXPECTING_DISABLED   =1<<0,
+    CLERI_FLAG_EXCLUDE_OPTIONAL     =1<<1,
+    CLERI_FLAG_EXCLUDE_FM_CHOICE    =1<<2,
+    CLERI_FLAG_EXCLUDE_RULE_THIS    =1<<3,
+};
+
 /* typedefs */
 typedef struct cleri_s cleri_t;
 typedef struct cleri_grammar_s cleri_grammar_t;
 typedef struct cleri_node_s cleri_node_t;
 typedef struct cleri_expecting_s cleri_expecting_t;
-typedef struct cleri_kwcache_s cleri_kwcache_t;
 typedef struct cleri_rule_store_s cleri_rule_store_t;
 typedef struct cleri_parse_s cleri_parse_t;
 typedef const char * (cleri_translate_t)(cleri_t *);
@@ -32,7 +39,13 @@ typedef const char * (cleri_translate_t)(cleri_t *);
 extern "C" {
 #endif
 
-cleri_parse_t * cleri_parse(cleri_grammar_t * grammar, const char * str);
+static inline cleri_parse_t * cleri_parse(
+    cleri_grammar_t * grammar,
+    const char * str);
+cleri_parse_t * cleri_parse2(
+    cleri_grammar_t * grammar,
+    const char * str,
+    int flags);
 void cleri_parse_free(cleri_parse_t * pr);
 void cleri_parse_expect_start(cleri_parse_t * pr);
 int cleri_parse_strn(
@@ -57,14 +70,22 @@ cleri_node_t * cleri__parse_walk(
 struct cleri_parse_s
 {
     int is_valid;
+    int flags;
     size_t pos;
     const char * str;
     cleri_node_t * tree;
     const cleri_olist_t * expect;
     cleri_expecting_t * expecting;
     pcre2_code * re_keywords;
     pcre2_match_data * match_data;
-    cleri_kwcache_t * kwcache;
+    uint8_t * kwcache;
 };
 
-#endif /* CLERI_PARSE_H_ */
+static inline cleri_parse_t * cleri_parse(
+    cleri_grammar_t * grammar,
+    const char * str)
+{
+    return cleri_parse2(grammar, str, 0);
+}
+
+#endif /* CLERI_PARSE_H_ */
diff --git a/inc/cleri/version.h b/inc/cleri/version.h
@@ -4,7 +4,7 @@
 #ifndef CLERI_VERSION_H_
 #define CLERI_VERSION_H_
 
-#define LIBCLERI_VERSION "0.10.0"
+#define LIBCLERI_VERSION "0.11.0"
 
 /* public funtion */
 #ifdef __cplusplus

diff --git a/makefile.init b/makefile.init
@@ -1,4 +1,4 @@
 MAJOR := 0
 MINOR := 10
-PATCH := 0
+PATCH := 1
 VERSION := $(MAJOR).$(MINOR).$(PATCH)