Fix CDT parser include file handling and support recursion for includes

trunk/examples/CParser/include/directoryHeaderOne.h

@@ -0,0 +1,19 @@
+/*
+ * Header file that can be included as source file in test C programs where
+ * this source file is located using one of the
+ *
+ *   # include "q-char-sequence" new-line
+ *   # include <h-char-sequence> new-line
+ *
+ * preprocessor directives (see C standard, section 6.10.2).
+ */
+
+typedef struct ret {
+    int code;
+} ret_t;
+
+static inline ret_t funcFromDirectoryHeaderOne(void)
+{
+    ret_t ret = { .code = 2 };
+    return ret;
+}

trunk/examples/CParser/include/directoryHeaderTwo.h

@@ -0,0 +1,15 @@
+/*
+ * Header file that can be included as source file in test C programs where
+ * this source file is located using one of the
+ *
+ *   # include "q-char-sequence" new-line
+ *   # include <h-char-sequence> new-line
+ *
+ * preprocessor directives (see C standard, section 6.10.2).
+ */
+
+static inline int funcFromDirectoryHeaderTwo(void)
+{
+    int var = 4;
+    return var;
+}

trunk/examples/CParser/include/subdirectory/additionalHeader.h

@@ -0,0 +1,11 @@
+/*
+ * Header file that can be included as source file in test C programs where
+ * this source file is located using one of the
+ *
+ *   # include "q-char-sequence" new-line
+ *   # include <h-char-sequence> new-line
+ *
+ * preprocessor directives (see C standard, section 6.10.2).
+ */
+
+int groundTruth = 17;

trunk/examples/CParser/includeHeadersLocal.c

@@ -0,0 +1,32 @@
+//#Safe
+/**
+ * This test program includes a named header file that is searched for in an
+ * implementation-defined manner (see C standard, section 6.10.2):
+ *
+ *   # include <h-char-sequence> new-line
+ *   # include "q-char-sequence" new-line
+ *
+ * The first directive searches a sequence of implementation-defined places for
+ * a header identified uniquely by the specified sequence between the '<' and
+ * '>' delimiters. The second directive causes the replacement of that
+ * directive by the entire contents of the source file identified by the
+ * specified sequence between the '"' delimiters. The named source file is
+ * searched for in an implementation-defined manner.
+ *
+ * As usual, a C preprocessor searches for the named source file first in the
+ * directory containing the current file, then in the same directories
+ * specified with a sequence between the '<' and '>' delimiters.
+ */
+
+#include "localHeaderOne.h"
+#include "localHeaderTwo.h"
+
+int main(void)
+{
+    status_t funcOneRet = funcFromLocalHeaderOne();
+    int funcOneVal = funcOneRet.retval;
+    //@ assert(funcOneVal == 3);
+    int funcTwoVal = funcFromLocalHeaderTwo();
+    //@ assert(funcTwoVal == 5);
+    return funcOneVal + funcTwoVal;
+}

trunk/examples/CParser/includeHeadersNonRecursiveSimple.c

@@ -0,0 +1,32 @@
+//#Safe
+/**
+ * This test program includes a named header file that is searched for in an
+ * implementation-defined manner (see C standard, section 6.10.2):
+ *
+ *   # include <h-char-sequence> new-line
+ *   # include "q-char-sequence" new-line
+ *
+ * The first directive searches a sequence of implementation-defined places for
+ * a header identified uniquely by the specified sequence between the '<' and
+ * '>' delimiters. The second directive causes the replacement of that
+ * directive by the entire contents of the source file identified by the
+ * specified sequence between the '"' delimiters. The named source file is
+ * searched for in an implementation-defined manner.
+ *
+ * As usual, a C preprocessor searches for the named source file first in the
+ * directory containing the current file, then in the same directories
+ * specified with a sequence between the '<' and '>' delimiters.
+ */
+
+#include <directoryHeaderOne.h>
+#include <directoryHeaderTwo.h>
+
+int main(void)
+{
+    ret_t funcOneRet = funcFromDirectoryHeaderOne();
+    int funcOneVal = funcOneRet.code;
+    //@ assert(funcOneVal == 2);
+    int funcTwoVal = funcFromDirectoryHeaderTwo();
+    //@ assert(funcTwoVal == 4);
+    return funcOneVal + funcTwoVal;
+}

trunk/examples/CParser/includeHeadersNonRecursiveSubdirectory.c

@@ -0,0 +1,34 @@
+//#Safe
+/**
+ * This test program includes a named header file that is searched for in an
+ * implementation-defined manner (see C standard, section 6.10.2):
+ *
+ *   # include <h-char-sequence> new-line
+ *   # include "q-char-sequence" new-line
+ *
+ * The first directive searches a sequence of implementation-defined places for
+ * a header identified uniquely by the specified sequence between the '<' and
+ * '>' delimiters. The second directive causes the replacement of that
+ * directive by the entire contents of the source file identified by the
+ * specified sequence between the '"' delimiters. The named source file is
+ * searched for in an implementation-defined manner.
+ *
+ * As usual, a C preprocessor searches for the named source file first in the
+ * directory containing the current file, then in the same directories
+ * specified with a sequence between the '<' and '>' delimiters.
+ */
+
+#include <directoryHeaderOne.h>
+#include <directoryHeaderTwo.h>
+#include <additionalHeader.h>
+
+int main(void)
+{
+    ret_t funcOneRet = funcFromDirectoryHeaderOne();
+    int funcOneVal = funcOneRet.code;
+    //@ assert(funcOneVal == 2);
+    int funcTwoVal = funcFromDirectoryHeaderTwo();
+    //@ assert(funcTwoVal == 4);
+    //@ assert(groundTruth == 17);
+    return funcOneVal + funcTwoVal + groundTruth;
+}

trunk/examples/CParser/includeHeadersRecursive.c

@@ -0,0 +1,34 @@
+//#Safe
+/**
+ * This test program includes a named header file that is searched for in an
+ * implementation-defined manner (see C standard, section 6.10.2):
+ *
+ *   # include <h-char-sequence> new-line
+ *   # include "q-char-sequence" new-line
+ *
+ * The first directive searches a sequence of implementation-defined places for
+ * a header identified uniquely by the specified sequence between the '<' and
+ * '>' delimiters. The second directive causes the replacement of that
+ * directive by the entire contents of the source file identified by the
+ * specified sequence between the '"' delimiters. The named source file is
+ * searched for in an implementation-defined manner.
+ *
+ * As usual, a C preprocessor searches for the named source file first in the
+ * directory containing the current file, then in the same directories
+ * specified with a sequence between the '<' and '>' delimiters.
+ */
+
+#include <directoryHeaderOne.h>
+#include <directoryHeaderTwo.h>
+#include <additionalHeader.h>
+
+int main(void)
+{
+    ret_t funcOneRet = funcFromDirectoryHeaderOne();
+    int funcOneVal = funcOneRet.code;
+    //@ assert(funcOneVal == 2);
+    int funcTwoVal = funcFromDirectoryHeaderTwo();
+    //@ assert(funcTwoVal == 4);
+    //@ assert(groundTruth == 17);
+    return funcOneVal + funcTwoVal + groundTruth;
+}

trunk/examples/CParser/localHeaderOne.h

@@ -0,0 +1,18 @@
+/*
+ * Header file that can be included as source file in test C programs where
+ * this source file is located using the
+ *
+ *   # include "q-char-sequence" new-line
+ *
+ * preprocessor directive (see C standard, section 6.10.2).
+ */
+
+typedef struct status {
+    int retval;
+} status_t;
+
+static inline status_t funcFromLocalHeaderOne(void)
+{
+    status_t ret = { .retval = 3 };
+    return ret;
+}

trunk/examples/CParser/localHeaderTwo.h

@@ -0,0 +1,14 @@
+/*
+ * Header file that can be included as source file in test C programs where
+ * this source file is located using the
+ *
+ *   # include "q-char-sequence" new-line
+ *
+ * preprocessor directive (see C standard, section 6.10.2).
+ */
+
+static inline int funcFromLocalHeaderTwo(void)
+{
+    int var = 5;
+    return var;
+}

trunk/examples/programs/regression/c/preprocessor/preprocessor-conditionals_safe.c

@@ -0,0 +1,34 @@
+//#Safe
+/*-----------------------------------------------------------------------------
+ * C program with preprocessor macros to test macro parsing and substitution
+ *-----------------------------------------------------------------------------
+ * Author: Manuel Bentele
+ *   Date: 2023-09-25
+ *---------------------------------------------------------------------------*/
+
+#undef SELECT_FUNC_ONE
+
+#define VALUE 100
+
+int compute_one(int num)
+{
+    return num - VALUE;
+}
+
+int compute_two(int num)
+{
+    return num + VALUE;
+}
+
+#ifdef SELECT_FUNC_ONE
+#define FUNC(VAL) compute_one(VAL)
+#else
+#define FUNC(VAL) compute_two(VAL)
+#endif
+
+int main(void)
+{
+    int ret = FUNC(VALUE);
+    //@ assert(ret == 100 + 100);
+    return ret;
+}

trunk/examples/programs/regression/c/preprocessor/preprocessor-conditionals_unsafe.c

@@ -0,0 +1,34 @@
+//#Unafe
+/*-----------------------------------------------------------------------------
+ * C program with preprocessor macros to test macro parsing and substitution
+ *-----------------------------------------------------------------------------
+ * Author: Manuel Bentele
+ *   Date: 2023-09-25
+ *---------------------------------------------------------------------------*/
+
+#define SELECT_FUNC_ONE
+
+#define VALUE 100
+
+int compute_one(int num)
+{
+    return num - VALUE;
+}
+
+int compute_two(int num)
+{
+    return num + VALUE;
+}
+
+#ifdef SELECT_FUNC_ONE
+#define FUNC(VAL) compute_one(VAL)
+#else
+#define FUNC(VAL) compute_two(VAL)
+#endif
+
+int main(void)
+{
+    int ret = FUNC(VALUE);
+    //@ assert(ret == 100 + 100);
+    return ret;
+}

trunk/examples/programs/regression/c/preprocessor/preprocessor-macro_safe.c

@@ -0,0 +1,16 @@
+//#Safe
+/*-----------------------------------------------------------------------------
+ * C program with preprocessor macro to test macro parsing and substitution
+ *-----------------------------------------------------------------------------
+ * Author: Manuel Bentele
+ *   Date: 2023-09-25
+ *---------------------------------------------------------------------------*/
+
+#define VALUE 100
+
+int main(void)
+{
+    int ret = VALUE;
+    //@ assert(ret == 100);
+    return ret;
+}

trunk/examples/programs/regression/c/preprocessor/preprocessor-macro_unsafe.c

@@ -0,0 +1,16 @@
+//#Unsafe
+/*-----------------------------------------------------------------------------
+ * C program with preprocessor macro to test macro parsing and substitution
+ *-----------------------------------------------------------------------------
+ * Author: Manuel Bentele
+ *   Date: 2023-09-25
+ *---------------------------------------------------------------------------*/
+
+#define VALUE 100
+
+int main(void)
+{
+    int ret = VALUE;
+    //@ assert(ret == 200);
+    return ret;
+}