Skip to content

reserve_extra_names #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joente merged 2 commits into from
Jun 11, 2026
Merged

reserve_extra_names #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e1beee
reserve_extra_names
joente Jun 11, 2026
d2b530b
Updage changelog
joente Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# v1.8.9-alpha0
# v1.8.9-alpha1

* Include `tasks` and `restarts` for `modules_info()` on _node_ scope, issue #447.
* Added extra reserved named _(see pull request for list of names)_, pr #448.

# v1.8.8

Expand Down
2 changes: 1 addition & 1 deletion inc/ti/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* "-rc0"
* ""
*/
#define TI_VERSION_PRE_RELEASE "-alpha0"
#define TI_VERSION_PRE_RELEASE "-alpha1"

#define TI_MAINTAINER \
"Jeroen van der Heijden <jeroen@cesbit.com>"
Expand Down
146 changes: 89 additions & 57 deletions src/ti/spec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
*
* pcregrep -o1 ' :: `(\w+)' spec.c | gperf -E -k '*,1,$' -m 200

:: `any`
:: `ano`
:: `any`
:: `big`
:: `bool`
:: `break`
:: `bytes`
Expand All @@ -37,15 +38,21 @@
:: `date`
:: `datetime`
:: `else`
:: `email`
:: `enum`
:: `error`
:: `false`
:: `final`
:: `float`
:: `for`
:: `future`
:: `if`
:: `in`
:: `int`
:: `interface`
:: `list`
:: `module`
:: `mpdata`
:: `nil`
:: `nint`
:: `number`
Expand All @@ -57,24 +64,31 @@
:: `set`
:: `str`
:: `task`
:: `tel`
:: `thing`
:: `time`
:: `timedelta`
:: `timeval`
:: `trait`
:: `true`
:: `try`
:: `tuple`
:: `type`
:: `typed`
:: `uint`
:: `union`
:: `url`
:: `utf8`

*/

enum
{
TOTAL_KEYWORDS = 39,
TOTAL_KEYWORDS = 53,
MIN_WORD_LENGTH = 2,
MAX_WORD_LENGTH = 8,
MAX_WORD_LENGTH = 9,
MIN_HASH_VALUE = 3,
MAX_HASH_VALUE = 46
MAX_HASH_VALUE = 67
};

static inline unsigned int spec__hash(
Expand All @@ -83,39 +97,42 @@ static inline unsigned int spec__hash(
{
static unsigned char asso_values[] =
{
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 17, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 15, 10, 13,
9, 0, 11, 13, 0, 5, 47, 8, 2, 8,
0, 3, 16, 47, 2, 0, 0, 3, 2, 13,
11, 19, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
47, 47, 47, 47, 47, 47
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 14, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 5, 11, 11,
3, 3, 10, 35, 3, 0, 68, 16, 3, 22,
1, 8, 22, 68, 0, 15, 4, 0, 7, 12,
4, 20, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
68, 68, 68, 68, 68, 68
};

register unsigned int hval = n;

switch (hval)
{
default:
hval += asso_values[(unsigned char)s[8]];
/*FALLTHROUGH*/
case 8:
hval += asso_values[(unsigned char)s[7]];
/*fall through*/
case 7:
Expand Down Expand Up @@ -148,47 +165,62 @@ _Bool ti_spec_is_reserved(register const char * s, register size_t n)
static const char * wordlist[] =
{
"", "", "",
"set",
"",
"str",
"else",
"in",
"int",
"nint",
"", "",
"url",
"nil",
"list",
"int",
"uint",
"nint",
"true",
"if",
"tel",
"return",
"error",
"enum",
"union",
"time",
"if",
"for",
"room",
"error",
"ano",
"bool",
"thing",
"trait",
"date",
"raw",
"for",
"str",
"future",
"final",
"set",
"list",
"try",
"else",
"any",
"enum",
"pint",
"utf8",
"time",
"bool",
"float",
"continue",
"tuple",
"task",
"date",
"email",
"catch",
"break",
"false",
"room",
"number",
"task",
"module",
"interface",
"closure",
"thing",
"big",
"regex",
"continue",
"raw",
"bytes",
"utf8",
"float",
"any",
"final",
"timeval",
"break",
"", "", "", "",
"datetime",
"catch"
"type",
"", "",
"timedelta",
"typed",
"bytes",
"", "", "", "", "", "", "", "",
"mpdata"
};

if (n <= MAX_WORD_LENGTH && n >= MIN_WORD_LENGTH)
Expand Down