From d2a973d7345516d6183b652d6554747e2eab68a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Reuh=20Fildadut?= Date: Sat, 20 Apr 2024 17:30:44 +0200 Subject: [PATCH] [internal] minor cleaning --- anselme/ast/Choice.lua | 3 ++- anselme/parser/expression/primary/identifier.lua | 2 +- anselme/stdlib/text.lua | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/anselme/ast/Choice.lua b/anselme/ast/Choice.lua index 7493830..c089a1e 100644 --- a/anselme/ast/Choice.lua +++ b/anselme/ast/Choice.lua @@ -1,10 +1,11 @@ local ast = require("anselme.ast") local ArgumentTuple +local Event = ast.abstract.Event local operator_priority = require("anselme.common").operator_priority local Choice -Choice = ast.abstract.Runtime { +Choice = ast.abstract.Runtime(Event) { type = "choice", text = nil, diff --git a/anselme/parser/expression/primary/identifier.lua b/anselme/parser/expression/primary/identifier.lua index 416de41..45b236e 100644 --- a/anselme/parser/expression/primary/identifier.lua +++ b/anselme/parser/expression/primary/identifier.lua @@ -2,7 +2,7 @@ local primary = require("anselme.parser.expression.primary.primary") local Identifier = require("anselme.ast.Identifier") -local disallowed_set = ("\n.~`^+-=<>/[]*{}|\\_!?,;:()\"@&$#%"):gsub("[^%w]", "%%%1") +local disallowed_set = ("\n+-*/%^=<>[]{}()|\\_.,`!?;:~\"@&$#"):gsub("[^%w]", "%%%1") local identifier_pattern = "[ \t]*[^0-9%s'"..disallowed_set.."][^"..disallowed_set.."]*" local common = require("anselme.common") diff --git a/anselme/stdlib/text.lua b/anselme/stdlib/text.lua index afc6044..001546a 100644 --- a/anselme/stdlib/text.lua +++ b/anselme/stdlib/text.lua @@ -31,7 +31,7 @@ return { -- choice { - "write choice", "(text::is text, fn=attached block(keep return=true))", + "write choice", "(text::is text, fn=attached block(keep return=true, default=($()())))", function(state, text, func) if func:contains_current_resume_target(state) then func:call(state, ArgumentTuple:new())