Squashed 'misc/packcc/' changes from 4a7dbab60..43934f352

43934f352 Improve makefiles
29a2a1b06 Support gcc for IBM AIX
53aefcb47 Update README.md
6035daaba Change macro to check for size_t byte size
6015afca6 Fix universal-ctags#34
dfc33e6bf Merge pull request universal-ctags#33 from dolik-rce/test-improvements
8176c6492 fix uncrustify version check
fa144ef7c properly quote load statements
df95cbde7 refactor test utils
1ff5f9100 test --ascii option
e54a94c03 avoid copying calc.peg into test directories
a6a7ef719 test grammar dump (--debug option)
f1323e5ec display coverage
223b264fa allow options in CC environment variable

git-subtree-dir: misc/packcc
git-subtree-split: 43934f35254c08f0827801f80bbbec0e03c69fe0

README.md

@@ -2,7 +2,7 @@
 
 ## Overview ##
 
-**PackCC** is a packrat parser generator for C. Its main features are as follows:
+**PackCC** is a parser generator for C. Its main features are as follows:
 
 - Generates your parser in C from a grammar described in a **PEG**,
 - Gives your parser great efficiency by **packrat parsing**,
@@ -34,6 +34,8 @@ For convenience, the build environments using GCC, Clang, and Microsoft Visual S
 
 ### Using GCC ###
 
+#### Other than MinGW ####
+
 `packcc` will be built in both directories `build/gcc/debug/bin` and `build/gcc/release/bin` using `gcc` by executing the following commands:
 
 ```
@@ -44,8 +46,22 @@ make check  # bats-core and uncrustify are required (see tests/README.md)
 
 `packcc` in the directory `build/gcc/release/bin` is suitable for practical use.
 
+#### MinGW ####
+
+`packcc` will be built in both directories `build/mingw-gcc/debug/bin` and `build/mingw-gcc/release/bin` using `gcc` by executing the following commands:
+
+```
+cd build/mingw-gcc
+make
+make check  # bats-core and uncrustify are required (see tests/README.md)
+```
+
+`packcc` in the directory `build/mingw-gcc/release/bin` is suitable for practical use.
+
 ### Using Clang ###
 
+#### Other than MinGW ####
+
 `packcc` will be built in both directories `build/clang/debug/bin` and `build/clang/release/bin` using `clang` by executing the following commands:
 
 ```
@@ -56,6 +72,18 @@ make check  # bats-core and uncrustify are required (see tests/README.md)
 
 `packcc` in the directory `build/clang/release/bin` is suitable for practical use.
 
+#### MinGW ####
+
+`packcc` will be built in both directories `build/mingw-clang/debug/bin` and `build/mingw-clang/release/bin` using `clang` by executing the following commands:
+
+```
+cd build/mingw-clang
+make
+make check  # bats-core and uncrustify are required (see tests/README.md)
+```
+
+`packcc` in the directory `build/mingw-clang/release/bin` is suitable for practical use.
+
 ### Using Microsoft Visual Studio ###
 
 You have to install Microsoft Visual Studio 2019 in advance.

build/clang/Makefile

@@ -1,6 +1,6 @@
 CC=clang
-CFLAGS_D=-std=gnu89 -Wall -Wextra -Wno-unused-parameter -Wno-overlength-strings -pedantic -O0 -g2
-CFLAGS_R=-std=gnu89 -Wall -Wextra -Wno-unused-parameter -Wno-overlength-strings -pedantic -O2 -DNDEBUG
+CFLAGS_D=-std=gnu89 -fsigned-char -Wall -Wextra -Wno-unused-parameter -Wno-overlength-strings -pedantic -O0 -g2
+CFLAGS_R=-std=gnu89 -fsigned-char -Wall -Wextra -Wno-unused-parameter -Wno-overlength-strings -pedantic -O2 -DNDEBUG
 LDFLAGS_D=
 LDFLAGS_R=
 
@@ -24,7 +24,7 @@ SRCS= \
   $(patsubst %,$(TMPDIR_R)/%.c,$(EXAMPLES)) \
   $(patsubst %,$(TMPDIR_R)/%.h,$(EXAMPLES))
 
-.PHONY: all clean
+.PHONY: all check clean
 
 .SECONDARY: $(SRCS)
 
@@ -48,8 +48,9 @@ $(TMPDIR_D)/examples/%.c $(TMPDIR_D)/examples/%.h: $(SRCDIR)/examples/%.peg $(BI
 $(TMPDIR_R)/examples/%.c $(TMPDIR_R)/examples/%.h: $(SRCDIR)/examples/%.peg $(BINDIR_R)/packcc
 	mkdir -p $(dir $@) && $(BINDIR_R)/packcc -o $(basename $@) $<
 
-check: $(BINDIR_R)/packcc
-	PACKCC=$$PWD/$^ $(TESTDIR)/test.sh
+check: $(BINDIR_D)/packcc $(BINDIR_R)/packcc
+	@echo "== Debug Version =="   && PACKCC=$$PWD/$(BINDIR_D)/packcc CC="$(CC) $(CFLAGS_D)" $(TESTDIR)/test.sh
+	@echo "== Release Version ==" && PACKCC=$$PWD/$(BINDIR_R)/packcc CC="$(CC) $(CFLAGS_R)" $(TESTDIR)/test.sh
 
 clean:
 	rm -f $(BINS) $(SRCS)

build/gcc/Makefile

@@ -1,6 +1,6 @@
 CC=gcc
-CFLAGS_D=-std=gnu89 -Wall -Wextra -Wno-unused-parameter -Wno-overlength-strings -pedantic -O0 -g2
-CFLAGS_R=-std=gnu89 -Wall -Wextra -Wno-unused-parameter -Wno-overlength-strings -pedantic -O2 -DNDEBUG
+CFLAGS_D=-std=gnu89 -fsigned-char -Wall -Wextra -Wno-unused-parameter -Wno-overlength-strings -pedantic -O0 -g2
+CFLAGS_R=-std=gnu89 -fsigned-char -Wall -Wextra -Wno-unused-parameter -Wno-overlength-strings -pedantic -O2 -DNDEBUG
 LDFLAGS_D=
 LDFLAGS_R=
 
@@ -24,7 +24,7 @@ SRCS= \
   $(patsubst %,$(TMPDIR_R)/%.c,$(EXAMPLES)) \
   $(patsubst %,$(TMPDIR_R)/%.h,$(EXAMPLES))
 
-.PHONY: all clean
+.PHONY: all check clean
 
 .SECONDARY: $(SRCS)
 
@@ -48,8 +48,9 @@ $(TMPDIR_D)/examples/%.c $(TMPDIR_D)/examples/%.h: $(SRCDIR)/examples/%.peg $(BI
 $(TMPDIR_R)/examples/%.c $(TMPDIR_R)/examples/%.h: $(SRCDIR)/examples/%.peg $(BINDIR_R)/packcc
 	mkdir -p $(dir $@) && $(BINDIR_R)/packcc -o $(basename $@) $<
 
-check: $(BINDIR_R)/packcc
-	PACKCC=$$PWD/$^ $(TESTDIR)/test.sh
+check: $(BINDIR_D)/packcc $(BINDIR_R)/packcc
+	@echo "== Debug Version =="   && PACKCC=$$PWD/$(BINDIR_D)/packcc CC="$(CC) $(CFLAGS_D)" $(TESTDIR)/test.sh
+	@echo "== Release Version ==" && PACKCC=$$PWD/$(BINDIR_R)/packcc CC="$(CC) $(CFLAGS_R)" $(TESTDIR)/test.sh
 
 clean:
 	rm -f $(BINS) $(SRCS)

build/mingw-clang/Makefile

@@ -24,7 +24,7 @@ SRCS= \
   $(patsubst %,$(TMPDIR_R)/%.c,$(EXAMPLES)) \
   $(patsubst %,$(TMPDIR_R)/%.h,$(EXAMPLES))
 
-.PHONY: all clean
+.PHONY: all check clean
 
 .SECONDARY: $(SRCS)
 
@@ -48,8 +48,9 @@ $(TMPDIR_D)/examples/%.c $(TMPDIR_D)/examples/%.h: $(SRCDIR)/examples/%.peg $(BI
 $(TMPDIR_R)/examples/%.c $(TMPDIR_R)/examples/%.h: $(SRCDIR)/examples/%.peg $(BINDIR_R)/packcc
 	mkdir -p $(dir $@) && $(BINDIR_R)/packcc -o $(basename $@) $<
 
-check: $(BINDIR_R)/packcc
-	PACKCC=$$PWD/$^ $(TESTDIR)/test.sh
+check: $(BINDIR_D)/packcc $(BINDIR_R)/packcc
+	@echo "== Debug Version =="   && PACKCC=$$PWD/$(BINDIR_D)/packcc CC="$(CC) $(CFLAGS_D)" $(TESTDIR)/test.sh
+	@echo "== Release Version ==" && PACKCC=$$PWD/$(BINDIR_R)/packcc CC="$(CC) $(CFLAGS_R)" $(TESTDIR)/test.sh
 
 clean:
 	rm -f $(BINS) $(SRCS)

build/mingw-gcc/Makefile

@@ -24,7 +24,7 @@ SRCS= \
   $(patsubst %,$(TMPDIR_R)/%.c,$(EXAMPLES)) \
   $(patsubst %,$(TMPDIR_R)/%.h,$(EXAMPLES))
 
-.PHONY: all clean
+.PHONY: all check clean
 
 .SECONDARY: $(SRCS)
 
@@ -48,8 +48,9 @@ $(TMPDIR_D)/examples/%.c $(TMPDIR_D)/examples/%.h: $(SRCDIR)/examples/%.peg $(BI
 $(TMPDIR_R)/examples/%.c $(TMPDIR_R)/examples/%.h: $(SRCDIR)/examples/%.peg $(BINDIR_R)/packcc
 	mkdir -p $(dir $@) && $(BINDIR_R)/packcc -o $(basename $@) $<
 
-check: $(BINDIR_R)/packcc
-	PACKCC=$$PWD/$^ $(TESTDIR)/test.sh
+check: $(BINDIR_D)/packcc $(BINDIR_R)/packcc
+	@echo "== Debug Version =="   && PACKCC=$$PWD/$(BINDIR_D)/packcc CC="$(CC) $(CFLAGS_D)" $(TESTDIR)/test.sh
+	@echo "== Release Version ==" && PACKCC=$$PWD/$(BINDIR_R)/packcc CC="$(CC) $(CFLAGS_R)" $(TESTDIR)/test.sh
 
 clean:
 	rm -f $(BINS) $(SRCS)

src/packcc.c

@@ -68,6 +68,9 @@ static size_t strnlen_(const char *str, size_t maxlen) {
 #define __attribute__(x)
 #endif
 
+#undef TRUE  /* to avoid macro definition conflicts with the system header file of IBM AIX */
+#undef FALSE
+
 #define VERSION "1.5.0"
 
 #ifndef BUFFER_INIT_SIZE
@@ -910,7 +913,7 @@ static size_t populate_bits(size_t x) {
     x |= x >>  4;
     x |= x >>  8;
     x |= x >> 16;
-#ifndef _M_IX86 /* not Windows for x86 (32-bit) */
+#if (defined __SIZEOF_SIZE_T__ && __SIZEOF_SIZE_T__ == 8) /* gcc or clang */ || defined _WIN64 /* MSVC */
     x |= x >> 32;
 #endif
     return x;

tests/.gitignore

@@ -1,6 +1,8 @@
 packcc
 packcc.exe
-*/parser.peg
+packcc.gcda
+packcc.gcno
+packcc.c.gcov
 */parser.c
 */parser.h
 */parser

tests/ascii.d/ascii.bats

@@ -0,0 +1,19 @@
+#!/usr/bin/env bats
+
+load "$TESTDIR/utils.sh"
+
+@test "Testing ascii.d - generation" {
+    PACKCC_OPTS=("--ascii")
+    test_generate
+}
+
+@test "Testing ascii.d - check code" {
+    ! in_source "pcc_get_char_as_utf32"
+}
+
+@test "Testing ascii.d - compilation" {
+    test_compile
+}
+@test "Testing ascii.d - run" {
+    run_for_input "ascii.d/input.txt"
+}

tests/ascii.d/expected.txt

@@ -0,0 +1,4 @@
+This
+is
+a
+test

tests/ascii.d/input.peg

@@ -0,0 +1,3 @@
+FILE <- WORD / SPACE
+WORD <- [^ \r\n\t]+ { PRINT($0); }
+SPACE <- [ \r\n\t]+

tests/ascii.d/input.txt

@@ -0,0 +1 @@
+This is a test

tests/calc.d/calc.bats

@@ -1,14 +1,13 @@
 #!/usr/bin/env bats
 
-load $TESTDIR/utils.sh
+load "$TESTDIR/utils.sh"
 
 @test "Testing calc.d - generation" {
-    cp -f ../src/examples/calc.peg calc.d/parser.peg  ## NOTE: Copy is adopted instead of using a link, considering MinGW.
-    test_generate calc.d parser.peg
+    test_generate "$ROOTDIR/src/examples/calc.peg"
 }
 
 @test "Testing calc.d - compilation" {
-    "${CC:-cc}" calc.d/parser.c -o calc.d/parser
+    ${CC:-cc} calc.d/parser.c -o calc.d/parser
 }
 
 @test "Testing calc.d - run" {

tests/code_generation.d/generation.bats

@@ -1,25 +1,13 @@
 #!/usr/bin/env bats
 
-load $TESTDIR/utils.sh
-
-in_header() {
-    grep -Fq "$1" "code_generation.d/parser.h"
-}
-
-in_source() {
-    grep -Fq "$1" "code_generation.d/parser.c"
-}
-
-get_line() {
-    sed -n "/$1/=" "code_generation.d/$2" | tail -n1
-}
+load "$TESTDIR/utils.sh"
 
 @test "Testing code_generation.d - generation" {
-    test_generate "code_generation.d"
+    test_generate
 }
 
 @test "Testing code_generation.d - compilation" {
-    test_compile "code_generation.d" \
+    test_compile \
         -D pcc_create=my_create \
         -D pcc_destroy=my_destroy \
         -D pcc_parse=my_parse \

tests/dump.d/dump.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load "$TESTDIR/utils.sh"
+
+@test "Testing dump.d - generation" {
+    run "$PACKCC" --debug -o "dump.d/parser" "$ROOTDIR/src/examples/calc.peg" 2>&1
+    check_output "dump.d/expected.txt"
+}