diff options
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/mcpu-cpp-en.md | 9 | ||||
| -rw-r--r-- | doc/mcpu-cpp-ru.md | 9 | ||||
| -rw-r--r-- | man/mcpu-cpp.1 | 2 | ||||
| -rw-r--r-- | man/ru/mcpu-cpp.1 | 2 | ||||
| -rwxr-xr-x | tests/t0022-predefined-macros.sh | 2 | ||||
| -rwxr-xr-x | tests/t0024-abi-predefined.sh | 2 | ||||
| -rwxr-xr-x | tests/t0025-dump-macros.sh | 2 | ||||
| -rwxr-xr-x | tests/t0033-dump-definitions.sh | 2 | ||||
| -rwxr-xr-x | tests/t0053-interface-cleanup.sh | 4 |
12 files changed, 29 insertions, 20 deletions
@@ -1,3 +1,10 @@ + +mcpu-cpp 1.0.4 +============== + +* LibMPU 1.0.27, LibMPUIO 1.0.7 are required. + + mcpu-cpp 1.0.3 =============== @@ -470,9 +470,9 @@ Build mcpu-cpp uses Autoconf/Automake and obtains LibMPUIO compilation and linker flags from `mpuio-config`, following the conventions of LibMPU and LibMPUIO. -No pkg-config or flex dependency is introduced. The 1.0.3 release is -developed and tested against LibMPU 1.0.25 and LibMPUIO 1.0.4. The LibMPUIO -UCS-2 ctype API is required. ZUBR 4.1.0 is the parser-regeneration tool; it is +No pkg-config or flex dependency is introduced. The 1.0.4 release is +developed and tested against LibMPU 1.0.27 and LibMPUIO 1.0.7. The LibMPUIO +UCS-2 ctype API is required. ZUBR 4.1.1 is the parser-regeneration tool; it is not required for a normal build from a release archive containing the generated `src/mcpp-expr.c`. diff --git a/configure.ac b/configure.ac index cb78445..56cd2a2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.69]) m4_include([acsite.m4]) -AC_INIT([mcpu-cpp], [1.0.3], [], [mcpu-cpp]) +AC_INIT([mcpu-cpp], [1.0.4], [], [mcpu-cpp]) AC_MCPU_CPP_REQUIRE_BASH diff --git a/doc/mcpu-cpp-en.md b/doc/mcpu-cpp-en.md index bcab282..dd12ab4 100644 --- a/doc/mcpu-cpp-en.md +++ b/doc/mcpu-cpp-en.md @@ -1,3 +1,4 @@ + # mcpu-cpp `mcpu-cpp` is the preprocessor for MCPU programming languages. It is an @@ -1251,7 +1252,7 @@ exist for the future high-level language. The version of `mcpu-cpp` has its own unambiguous name: ```text -#define __MCPU_CPP_VERSION__ "1.0.3" +#define __MCPU_CPP_VERSION__ "1.0.4" ``` The value is obtained automatically from `PACKAGE_VERSION`. When a compiler @@ -1446,7 +1447,7 @@ WIDTH, and SIZEOF are defined: #define __SIZEOF_UINT1024__ 128 ``` -With the current LibMPU 1.0.35, `NB_I_MAX == 8192`, so the family extends to +With the current LibMPU 1.0.27, `NB_I_MAX == 8192`, so the family extends to `int65536`/`uint65536`, with `__SIZEOF_INT65536__ == 8192`. Decimal-digit metadata is defined for **every** permitted integer width: @@ -1539,7 +1540,7 @@ __REAL<bits>_MAX_10_EXP__ __REAL<bits>_MIN_10_EXP__ ``` -For example, with LibMPU 1.0.35, the current `real128` profile gives values of +For example, with LibMPU 1.0.27, the current `real128` profile gives values of the form: ```text @@ -1997,7 +1998,7 @@ language itself. Starting with 0.0.22, preprocessing identifiers are no longer restricted to ASCII. Inside `mcpu-cpp`, text is already strict UCS-2, and characters are -classified by locale-independent LibMPUIO 1.0.4 functions based on Unicode +classified by locale-independent LibMPUIO 1.0.7 functions based on Unicode 18.0.0. The first identifier character must be `_` or have the `XID_Start` property; following characters must be `_`, `$`, or have `XID_Continue`. `$` is an `mcpu-cpp` extension: it is allowed only after the first character diff --git a/doc/mcpu-cpp-ru.md b/doc/mcpu-cpp-ru.md index f9719e0..ed68598 100644 --- a/doc/mcpu-cpp-ru.md +++ b/doc/mcpu-cpp-ru.md @@ -1,3 +1,4 @@ + # mcpu-cpp `mcpu-cpp` — препроцессор языков программирования MCPU. Он является @@ -1260,7 +1261,7 @@ rescan. пока нет. Собственная версия `mcpu-cpp` имеет отдельное однозначное имя: ```text -#define __MCPU_CPP_VERSION__ "1.0.3" +#define __MCPU_CPP_VERSION__ "1.0.4" ``` Значение автоматически берётся из `PACKAGE_VERSION`. Когда появится compiler @@ -1449,7 +1450,7 @@ Computed MIN expressions вроде `(-__PTRDIFF_MAX__ - 1)` в predefined table #define __SIZEOF_UINT1024__ 128 ``` -На текущей LibMPU 1.0.35 `NB_I_MAX == 8192`, поэтому family доходит до +На текущей LibMPU 1.0.27 `NB_I_MAX == 8192`, поэтому family доходит до `int65536`/`uint65536`, а `__SIZEOF_INT65536__ == 8192`. Decimal-digit metadata определяется для **каждой** разрешённой integer width: @@ -1540,7 +1541,7 @@ __REAL<bits>_MAX_10_EXP__ __REAL<bits>_MIN_10_EXP__ ``` -Например, на LibMPU 1.0.35 для `real128` текущий profile даёт значения вида: +Например, на LibMPU 1.0.27 для `real128` текущий profile даёт значения вида: ```text #define __REAL128_EPSILON__ 2.524354896707237777317531409e-29 @@ -1996,7 +1997,7 @@ Warning interface MCPU-CPP остаётся компактным и расшир Начиная с 0.0.22 имена preprocessing identifiers больше не ограничены ASCII. Внутри `mcpu-cpp` текст уже представлен строгим UCS-2, а классификация символов -выполняется locale-independent функциями LibMPUIO 1.0.4, построенными по Unicode +выполняется locale-independent функциями LibMPUIO 1.0.7, построенными по Unicode 18.0.0. Первый символ идентификатора должен быть `_` или иметь свойство `XID_Start`; последующие символы должны быть `_`, `$` или иметь свойство `XID_Continue`. Символ `$` является расширением `mcpu-cpp`: он разрешён только diff --git a/man/mcpu-cpp.1 b/man/mcpu-cpp.1 index bed892d..8279587 100644 --- a/man/mcpu-cpp.1 +++ b/man/mcpu-cpp.1 @@ -1,4 +1,4 @@ -.TH MCPU-CPP 1 "October 2026" "MCPU-CPP 1.0.3" "User Commands" +.TH MCPU-CPP 1 "October 2026" "MCPU-CPP 1.0.4" "User Commands" .SH NAME mcpu-cpp \- preprocessor for MCPU languages .SH SYNOPSIS diff --git a/man/ru/mcpu-cpp.1 b/man/ru/mcpu-cpp.1 index 720ecee..8681def 100644 --- a/man/ru/mcpu-cpp.1 +++ b/man/ru/mcpu-cpp.1 @@ -1,4 +1,4 @@ -.TH MCPU-CPP 1 "Октябрь 2026" "MCPU-CPP 1.0.3" "Команды пользователя" +.TH MCPU-CPP 1 "Октябрь 2026" "MCPU-CPP 1.0.4" "Команды пользователя" .SH ИМЯ mcpu-cpp \- препроцессор языков MCPU .SH СИНТАКСИС diff --git a/tests/t0022-predefined-macros.sh b/tests/t0022-predefined-macros.sh index bb8f79e..8abf4d9 100755 --- a/tests/t0022-predefined-macros.sh +++ b/tests/t0022-predefined-macros.sh @@ -39,7 +39,7 @@ grep -F "root_file = \"$base/main.c\";" "$base/out" >/dev/null grep -F "root_base = \"$base/main.c\";" "$base/out" >/dev/null grep '^root_level = 0;$' "$base/out" >/dev/null grep '^root_line = 5;$' "$base/out" >/dev/null -grep '^cpp_version = "1\.0\.3";$' "$base/out" >/dev/null +grep '^cpp_version = "1\.0\.4";$' "$base/out" >/dev/null grep '^old_version_name = __VERSION__;$' "$base/out" >/dev/null grep '^date = "[A-Z][a-z][a-z] [0-9] [0-9][0-9][0-9][0-9]";$\|^date = "[A-Z][a-z][a-z] [12][0-9] [0-9][0-9][0-9][0-9]";$\|^date = "[A-Z][a-z][a-z] 3[01] [0-9][0-9][0-9][0-9]";$' "$base/out" >/dev/null grep '^time = "[0-2][0-9]:[0-5][0-9]:[0-5][0-9]";$' "$base/out" >/dev/null diff --git a/tests/t0024-abi-predefined.sh b/tests/t0024-abi-predefined.sh index 04be52f..84d64aa 100755 --- a/tests/t0024-abi-predefined.sh +++ b/tests/t0024-abi-predefined.sh @@ -100,7 +100,7 @@ EOT "$MCPU_CPP" --no-config "$base/main.c" -o "$base/out" grep '^arch = 1;$' "$base/out" >/dev/null -grep '^cpp_version = "1\.0\.3";$' "$base/out" >/dev/null +grep '^cpp_version = "1\.0\.4";$' "$base/out" >/dev/null grep '^old_version = __VERSION__;$' "$base/out" >/dev/null grep '^byte_order = \(1234\|4321\);$' "$base/out" >/dev/null grep '^mcpu_byte_order = \(1234\|4321\);$' "$base/out" >/dev/null diff --git a/tests/t0025-dump-macros.sh b/tests/t0025-dump-macros.sh index 91502a7..72bb212 100755 --- a/tests/t0025-dump-macros.sh +++ b/tests/t0025-dump-macros.sh @@ -9,7 +9,7 @@ trap 'rm -rf "$base"' EXIT HUP INT TERM test -s "$base/macros" LC_ALL=C sort -c "$base/macros" grep '^#define _ARCH_MCPU 1$' "$base/macros" >/dev/null -grep '^#define __MCPU_CPP_VERSION__ "1\.0\.3"$' "$base/macros" >/dev/null +grep '^#define __MCPU_CPP_VERSION__ "1\.0\.4"$' "$base/macros" >/dev/null grep '^#define __MCPU_MACHINE_REGISTER_WIDTH__ 64$' "$base/macros" >/dev/null grep '^#define __MCPU_REAL_IO_LIMIT__ [0-9][0-9]*$' "$base/macros" >/dev/null grep '^#define __MCPU_MATH_FN_LIMIT__ [0-9][0-9]*$' "$base/macros" >/dev/null diff --git a/tests/t0033-dump-definitions.sh b/tests/t0033-dump-definitions.sh index 9c30b8c..3da147b 100755 --- a/tests/t0033-dump-definitions.sh +++ b/tests/t0033-dump-definitions.sh @@ -24,7 +24,7 @@ EOT # ordinary preprocessed result. grep '^# 0 "'"$base/main.c"'"$' "$base/out" >/dev/null grep '^# 0 "<built-in>"$' "$base/out" >/dev/null -grep '^#define __MCPU_CPP_VERSION__ "1.0.3"$' "$base/out" >/dev/null +grep '^#define __MCPU_CPP_VERSION__ "1.0.4"$' "$base/out" >/dev/null grep '^#define FROM_HEADER 17$' "$base/out" >/dev/null grep '^#define LOCAL_VALUE 25$' "$base/out" >/dev/null if grep '^[[:blank:]]*#[[:blank:]]*\(if\|ifdef\|ifndef\|elif\|else\|endif\)\>' "$base/out" >/dev/null; then diff --git a/tests/t0053-interface-cleanup.sh b/tests/t0053-interface-cleanup.sh index 8387b27..f766062 100755 --- a/tests/t0053-interface-cleanup.sh +++ b/tests/t0053-interface-cleanup.sh @@ -6,13 +6,13 @@ trap 'rm -rf "$base"' EXIT HUP INT TERM # --version identifies the independent MCPU languages preprocessor. "$MCPU_CPP" --version > "$base/version" -printf '%s\n' 'mcpu-cpp 1.0.3' 'MCPU languages preprocessor' > "$base/version.expected" +printf '%s\n' 'mcpu-cpp 1.0.4' 'MCPU languages preprocessor' > "$base/version.expected" cmp "$base/version.expected" "$base/version" # --help contains the current public interface, including --object-suffix, # and puts the stdin/stdout notes after the option list. "$MCPU_CPP" --help > "$base/help" -grep '^mcpu-cpp 1\.0\.3$' "$base/help" >/dev/null +grep '^mcpu-cpp 1\.0\.4$' "$base/help" >/dev/null grep '^MCPU languages preprocessor$' "$base/help" >/dev/null grep '^ --object-suffix SFX set object suffix used for dependency targets$' "$base/help" >/dev/null grep '^ --sys-root=PATH use PATH as MCPU root and do not read configuration files$' "$base/help" >/dev/null |