Merge branch 'develop'

Author: arithy

.github/workflows/test.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - develop
+      - trial
   pull_request:
     branches:
       - main
@@ -39,20 +40,23 @@ jobs:
           sudo ./install.sh /usr/local
           )
 
-      - name: Install uncrustify for x64 architecture
-        if: ${{ runner.arch }} == "X64"
-        run: |
-          (
-          curl -LO http://launchpadlibrarian.net/516341795/uncrustify_0.72.0+dfsg1-2_amd64.deb &&
-          sudo dpkg -i uncrustify_0.72.0+dfsg1-2_amd64.deb || true
-          )
+      - name: Set up Python
+        # required for build of uncrustify
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
 
-      - name: Install uncrustify for Arm64 architecture
-        if: ${{ runner.arch }} == "ARM64"
+      - name: Install uncrustify
         run: |
           (
-          curl -LO http://launchpadlibrarian.net/516341795/uncrustify_0.72.0+dfsg1-2_arm64.deb &&
-          sudo dpkg -i uncrustify_0.72.0+dfsg1-2_arm64.deb || true
+          git clone https://github.com/uncrustify/uncrustify.git &&
+          cd uncrustify &&
+          git checkout uncrustify-0.72.0 &&
+          mkdir build &&
+          cd build &&
+          cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=Release .. &&
+          cmake --build . --config Release &&
+          sudo cmake --install . --config Release
           )
 
       - name: Checkout code

README.md

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.14)
 
 project(ast)
 

examples/ast-tinyc/CMakeLists.txt

@@ -19,72 +19,27 @@ So, you can use it freely without noticing the copyright of the original author.
 
 ## How to compile this example ##
 
-### For Unix-like OS ###
-
 You can get the executable by executing the following commands:
 
 ```
 cd /path/to/this_directory
 mkdir build
 cd build
 cmake -DPACKCC=/path/to/packcc ..
-make
-```
-
-Here, `/path/to/this_directory` represents the path name of this directory,
-and `/path/to/packcc` represents the path name of `packcc` command.
-If `packcc` command is installed in one of the directories specified in the environment variable `PATH`,
-the option `-DPACKCC=/path/to/packcc` is not necessary.
-
-The executable `ast` will be created in the directory `build`.
-
-### For Windows ###
-
-#### Using Visual Studio ####
-
-You must have [Build Tools for Visual Studio](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) installed in your system.
-You can get the executable by executing the following commands using 'Developer Command Prompt for VS 2019' or 'Developer PowerShell for VS 2019':
-
-```
-cd \path\to\this_directory
-mkdir build
-cd build
-cmake -DPACKCC=\path\to\packcc ..
-MSBuild ALL_BUILD.vcxproj
-```
-
-Here, `\path\to\this_directory` represents the path name of this directory,
-and `\path\to\packcc` represents the path name of `packcc` command.
-If `packcc` command is installed in one of the directories specified in the environment variable `PATH`,
-the option `-DPACKCC=\path\to\packcc` is not necessary.
-
-The executable `ast.exe` will be created in the directory `build\Debug`.
-
-#### Using MinGW-w64 ####
-
-You can get the executable by executing the following commands:
-
-```
-cd /path/to/this_directory
-mkdir build
-cd build
-cmake -G "MSYS Makefiles" -DPACKCC=/path/to/packcc ..
-make
+cmake --build .
 ```
 
-Here, `/path/to/this_directory` represents the path name of this directory,
-and `/path/to/packcc` represents the path name of `packcc` command.
-If `packcc` command is installed in one of the directories specified in the environment variable `PATH`,
-the option `-DPACKCC=/path/to/packcc` is not necessary.
+Here, `/path/to/this_directory` represents the path of this directory, and `/path/to/packcc` represents the path of `packcc` command.
+If `packcc` command is installed in one of the directories specified in the environment variable `PATH`, the option `-DPACKCC=/path/to/packcc` is not necessary.
 
-The executable `ast.exe` will be created in the directory `build`.
+If using a build system for a Unix-like OS, MinGW, or Cygwin, which is typically `make`, the executable `ast` will be created in the current directory `build`. If using [Visual Studio](https://visualstudio.microsoft.com/) on Windows, it will be created in the directory `build\Debug`.
 
 ## How to run this example ##
 
 Example input source files are prepared in [`inputs`](inputs) directory.
 Most of these are taken from [grammars-v4](https://github.com/antlr/grammars-v4/) repository of [ANTLR project](https://github.com/antlr/) with thanks.
 
-Here, it is assumed that you are in the directory `build`.
+Here, we assume that you are in the directory `build`, and that the executable `ast` is in this directory.
 If you want to print out the AST of the input source file [`inputs/example2.c`](inputs/example2.c), execute the following command:
 
 ```

examples/ast-tinyc/README.md

@@ -33,16 +33,9 @@ int main(int argc, char **argv) {
         system__open_source_file(&system, path);
         parser = parser_create(&system);
         ast_node_t *ast;
-        const int b = parser_parse(parser, &ast);
+        parser_parse(parser, &ast);
         if (system.source.ecount > 0) longjmp(system.jmp, 1); /* never returns */
-        if (b) {
-            ret = 10; /* internal error */
-            fprintf(stderr, "FATAL: Internal error\n");
-                /* <-- input text remaining due to incompleteness of the grammar */
-        }
-        else {
-            system__dump_ast(&system, ast);
-        }
+        system__dump_ast(&system, ast);
     }
     else {
         ret = 2; /* error during parsing */

examples/ast-tinyc/main.c

@@ -41,8 +41,6 @@ The usage procedure is shown below.
    ```
    In the example above, the line number and the column byte offset where each `word` starts are output.
 
-**Notice:** Whenever parsing starts, the values of all marker variables are set to 0.
-
 #### Example
 
 An example which shows the line number and the column byte offset where each `word` starts is shown here.

import/util/eol.md

@@ -41,8 +41,6 @@ The usage procedure is shown below.
    ```
    In the example above, `@tab_col` is set to 0 in advance, and `@tab_col` will have the column number at the position after the part matched by `TAB*`.
 
-**Notice:** Whenever parsing starts, the values of all marker variables are set to 0.
-
 #### Example
 
 An example which shows column numbers of the respective input sequences of space and tab characters followed by `'\n'` is shown here.