Fixes to build on Ubuntu 18.04 with gcc-9.4

mk-it.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+cwd=$PWD
+cd src
+#gcc-13-env
+gcc -g build.c -o build && ./build
+#emsdk-env emcc -Wno-multichar -DMOCKFILES "lib.c" -o "web\cake.js" -s WASM=0 -s EXPORTED_FUNCTIONS=_CompileText -s EXPORTED_RUNTIME_METHODS=ccall,cwrap
+cd $cwd
+#myvalgrind src/cake -Iinclude /home/mingo/dev/dadbiz++/third-party/dad/sqlite3-orig/sqlite3.c
+#myvalgrind ./cake -E /home/mingo/dev/dadbiz++/third-party/dad/sqlite3-orig/sqlite3.c
+#./cake -analyze -D__x86_64__ -I/usr/lib/gcc/x86_64-linux-gnu/11/include/ -I/usr/local/include/ -I/usr/include/x86_64-linux-gnu/ -I/usr/include/ console.h tokenizer.h parser.h error.h fs.h hash.h object.h hashmap.h osstream.h options.h token.h type.h pre_expressions.h expressions.h visit.h format_visit.h token.c hash.c hashmap.c console.c tokenizer.c osstream.c fs.c options.c expressions.c pre_expressions.c type.c object.c parser.c visit.c flow_visit.c error.c format_visit.c tests.c
+#./cake -analyze -I/usr/lib/gcc/x86_64-linux-gnu/11/include/ -I/usr/local/include/ -I/usr/include/x86_64-linux-gnu/ -I/usr/include/ console.c
+#myvalgrind --vgdb-error=0 src/cake -Iinclude /home/mingo/dev/dadbiz++/third-party/dad/sqlite3-orig/sqlite3.c
+#myvalgrind src/cake -Iinclude dad/test-va.c
+#src/cake -dump-tokens dad/test-inf-nan.c
+#src/cake -dump-tokens dad/test-wchar.c
+#src/cake dad/test-type-pointer.c
+#src/cake dad/test-align.c
+#src/cake dad/test-double-free.c
+#src/cake dad/test-generic.c
+#src/cake dad/test-trigraph.c

ownership.md

@@ -1023,7 +1023,11 @@ int main()
 
 
 **Rule:** Arguments must be valid.
-
+
+Exception
+
+`malloc` and `calloc` have built in semantics.
+
 
 **Listing 35 - Function Arguments cannot be in a moved or uninitialized state**
 

src/build.c

@@ -8,6 +8,20 @@
 
 #include "build.h"
 
+static int mysytem(const char *cmd)
+{
+ printf("%s\n", cmd);
+ fflush(stdout);
+ return system(cmd);
+}
+
+static int mychdir(const char *path)
+{
+ printf("chdir: %s\n", path);
+ fflush(stdout);
+ return chdir(path);
+}
+
 #ifdef BUILD_WINDOWS
 #define OUTPUT "cake.exe"
 #else
@@ -30,8 +44,8 @@
  " pre_expressions.h " \
  " expressions.h " \
  " visit.h " \
- " format_visit.h " 
- 
+ " format_visit.h "
+
 
 #define SOURCE_FILES \
  " token.c " \
@@ -52,13 +66,13 @@
  " error.c " \
  " format_visit.c " \
  " tests.c "
- 
+
 
 void compile_cake()
 {
 
 #ifdef BUILD_WINDOWS_MSC
- if (system("cl " SOURCE_FILES " main.c "
+ if (mysytem("cl " SOURCE_FILES " main.c "
 
 #ifdef DISABLE_COLORS
  " /DDISABLE_COLORS "
@@ -106,7 +120,7 @@ void compile_cake()
 
 #ifdef BUILD_WINDOWS_CLANG
 
- system("clang " SOURCE_FILES " main.c "
+ mysytem("clang " SOURCE_FILES " main.c "
 #if defined DEBUG
  " -D_DEBUG"
 #else
@@ -129,7 +143,7 @@ void compile_cake()
 #endif
 
 #ifdef BUILD_LINUX_CLANG
- system("clang " SOURCE_FILES " main.c "
+ mysytem("clang " SOURCE_FILES " main.c "
 #ifdef TEST
  "-DTEST"
 #endif
@@ -141,11 +155,10 @@ void compile_cake()
 #if defined BUILD_LINUX_GCC || defined BUILD_WINDOWS_GCC
 
  // #define GCC_ANALIZER " -fanalyzer "
- system("gcc "
+ mysytem("gcc "
  " -Wall "
  " -Wno-multichar "
- " -Wno-switch "
- " -g " SOURCE_FILES " main.c "
+ " -g -O2 " SOURCE_FILES " main.c "
 
 #if defined DEBUG
  " -D_DEBUG"
@@ -160,7 +173,7 @@ void compile_cake()
 #endif
 
 #ifdef BUILD_WINDOWS_TCC
- system(CC
+ mysytem(CC
  SOURCE_FILES " main.c "
 
 #if defined DEBUG
@@ -204,11 +217,11 @@ void generate_doc(const char *mdfilename, const char *outfile)
  }
  char cmd[200];
  snprintf(cmd, sizeof cmd, RUN "hoedown.exe --html-toc --toc-level 3 --autolink --fenced-code %s >> %s", mdfilename, outfile);
- if (system(cmd) != 0)
+ if (mysytem(cmd) != 0)
  exit(1);
 
  snprintf(cmd, sizeof cmd, RUN "hoedown.exe --toc-level 3 --autolink --fenced-code %s >> %s", mdfilename, outfile);
- if (system(cmd) != 0)
+ if (mysytem(cmd) != 0)
  exit(1);
 
  FILE *f3 = fopen(outfile /*"./web/index.html"*/, "a");
@@ -229,22 +242,22 @@ int main()
 #endif
 
  printf("Building tools-------------------------------------------\n");
- chdir("./tools");
+ mychdir("./tools");
 
- if (system(CC " -D_CRT_SECURE_NO_WARNINGS maketest.c " OUT_OPT "../maketest.exe") != 0)
+ if (mysytem(CC " -D_CRT_SECURE_NO_WARNINGS maketest.c " OUT_OPT "../maketest.exe") != 0)
  exit(1);
- if (system(CC " -D_CRT_SECURE_NO_WARNINGS amalgamator.c " OUT_OPT "../amalgamator.exe") != 0)
+ if (mysytem(CC " -D_CRT_SECURE_NO_WARNINGS amalgamator.c " OUT_OPT "../amalgamator.exe") != 0)
  exit(1);
 
- chdir("./hoedown");
+ mychdir("./hoedown");
 
 #define HOEDOWN_SRC " autolink.c buffer.c document.c escape.c hoedown.c html.c html_blocks.c html_smartypants.c stack.c version.c"
 
- if (system(CC HOEDOWN_SRC OUT_OPT "../../hoedown.exe") != 0)
+ if (mysytem(CC HOEDOWN_SRC OUT_OPT "../../hoedown.exe") != 0)
  exit(1);
 
- chdir("..");
- chdir("..");
+ mychdir("..");
+ mychdir("..");
 
  /*
  * Generates documentation from md files
@@ -254,15 +267,15 @@ int main()
  generate_doc("../README.md", "./web/index.html");
  generate_doc("../warnings.md", "./web/warnings.html");
  generate_doc("../ownership.md", "./web/ownership.html");
- 
+
 
  remove("hoedown.exe");
 
- if (system(RUN "maketest.exe unit_test.c " SOURCE_FILES) != 0)
+ if (mysytem(RUN "maketest.exe unit_test.c " SOURCE_FILES) != 0)
  exit(1);
  remove("maketest.exe");
 
- if (system(RUN "amalgamator.exe -olib.c" SOURCE_FILES) != 0)
+ if (mysytem(RUN "amalgamator.exe -olib.c" SOURCE_FILES) != 0)
  exit(1);
  remove("amalgamator.exe");
 
@@ -277,30 +290,31 @@ int main()
  running cake on its own source code
  */
 
- //-flow-analysis 
+ //-flow-analysis
  //-nullchecks
 #ifdef NULLCHECKS
 #define NC " -nullchecks "
 #else
 #define NC " "
 #endif
 
- if (system("cake.exe " NC " -Wstyle -analyze -Wno-unused-parameter -Wno-unused-variable -sarif " HEADER_FILES SOURCE_FILES) != 0)
+ if (mysytem("cake.exe " NC " -Wstyle -analyze -Wno-unused-parameter -Wno-unused-variable -sarif " HEADER_FILES SOURCE_FILES) != 0)
  exit(1);
 #endif
 
 #if defined BUILD_LINUX_GCC
  /*
  running cake on its own source code
- To find GCC directories use 
+ To find GCC directories use
  echo | gcc -E -Wp,-v -
  */
- if (system("./cake " 
+ if (mysytem("./cake "
  " -D__x86_64__ "
+ " -analyze "
  " -I/usr/lib/gcc/x86_64-linux-gnu/11/include/ "
  " -I/usr/local/include/ "
  " -I/usr/include/x86_64-linux-gnu/ "
- " -I/usr/include/ " 
+ " -I/usr/include/ "
  HEADER_FILES
  SOURCE_FILES) != 0)
  {
@@ -311,7 +325,7 @@ int main()
 #endif
 
 #ifdef TEST
- int test_result = system(RUN OUTPUT);
+ int test_result = mysytem(RUN OUTPUT);
  if (test_result)
  {
  printf("\n");

src/build.h

@@ -106,24 +106,28 @@
 #endif
 
 
-
-#define ESC "\x1b"
-#define CSI "\x1b["
-#define RESET ESC "[0m"
-#define BLACK "\x1b[30m"
-#define BLUE "\x1b[34m"
-#define GREEN "\x1b[32m"
-#define CYAN "\x1b[36m"
-#define RED "\x1b[31;1m"
-#define MAGENTA "\x1b[35m"
-#define BROWN "\x1b[31m"
-#define LIGHTGRAY "\x1b[30;1m"
-#define DARKGRAY "\x1b[30m"
-#define LIGHTBLUE "\x1b[34;1m"
-#define LIGHTGREEN "\x1b[32,1m"
-#define LIGHTCYAN "\x1b[36;1m"
-#define LIGHTRED "\x1b[31;1m"
-#define LIGHTMAGENTA "\x1b[35;1m"
-#define YELLOW "\x1b[33;1m"
-#define WHITE "\x1b[37;1m"
+#ifdef WITH_ANSI_COLOR
+#define COLOR_ESC(x) x
+#else
+#define COLOR_ESC(x) ""
+#endif
+#define ESC COLOR_ESC("\x1b")
+#define CSI COLOR_ESC("\x1b[")
+#define RESET ESC COLOR_ESC("[0m")
+#define BLACK COLOR_ESC("\x1b[30m")
+#define BLUE COLOR_ESC("\x1b[34m")
+#define GREEN COLOR_ESC("\x1b[32m")
+#define CYAN COLOR_ESC("\x1b[36m")
+#define RED COLOR_ESC("\x1b[31;1m")
+#define MAGENTA COLOR_ESC("\x1b[35m")
+#define BROWN COLOR_ESC("\x1b[31m")
+#define LIGHTGRAY COLOR_ESC("\x1b[30;1m")
+#define DARKGRAY COLOR_ESC("\x1b[30m")
+#define LIGHTBLUE COLOR_ESC("\x1b[34;1m")
+#define LIGHTGREEN COLOR_ESC("\x1b[32,1m")
+#define LIGHTCYAN COLOR_ESC("\x1b[36;1m")
+#define LIGHTRED COLOR_ESC("\x1b[31;1m")
+#define LIGHTMAGENTA COLOR_ESC("\x1b[35;1m")
+#define YELLOW COLOR_ESC("\x1b[33;1m")
+#define WHITE COLOR_ESC("\x1b[37;1m")
 

src/console.c

@@ -1,4 +1,3 @@
-
 #ifdef _WIN32
 #include <Windows.h>
 #else
@@ -22,7 +21,8 @@ bool enable_vt_mode(void)
 
 int c_kbhit(void)
 {
- struct termios oldt, newt;
+ struct termios oldt = {0};
+ struct termios newt = {0};
  int ch;
  int oldf;
 
@@ -50,7 +50,8 @@ int c_kbhit(void)
 /* Read 1 character without echo */
 int c_getch(void)
 {
- struct termios old, new;
+ struct termios old = {0};
+ struct termios new = {0};
  int ch;
 
  tcgetattr(0, &old);
@@ -72,7 +73,7 @@ int c_getch(void)
 bool enable_vt_mode(void)
 {
 //missing in mingw (installed with codeblocs)
-#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING 
+#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
 #endif