From 13ce7a2efa0a4f284d3787fb2bba76f92a14a1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Reuh=20Fildadut?= Date: Tue, 30 Apr 2024 23:00:14 +0200 Subject: [PATCH] [language] flush literals are now --- instead of empty lines Empty lines could lead to unexpected flushes, for example when calling another function where empty lines are used for code presentation. --- anselme/parser/expression/block.lua | 18 ++++-------- anselme/parser/expression/primary/flush.lua | 16 ++++++++++ anselme/parser/expression/primary/init.lua | 1 + anselme/state/event_manager.lua | 2 +- doc/language.md | 5 ++-- test/results/alias identifier.ans | 1 - test/results/assignment tuple unpacking.ans | 1 - test/results/autocall text statement.ans | 2 -- test/results/binary operator overload.ans | 2 -- test/results/binop assignement.ans | 1 - test/results/brace multiline.ans | 3 -- test/results/bracket multiline.ans | 3 -- test/results/checkpoint change.ans | 13 --------- .../checkpoint merging mutable value.ans | 3 +- test/results/checkpoint merging variable.ans | 1 - test/results/checkpoint reached seen.ans | 1 - test/results/closure.ans | 1 - test/results/commit.ans | 6 ++-- test/results/condition operator.ans | 1 - test/results/constant variable list.ans | 1 - .../constrained variable assignement.ans | 1 - .../constrained variable definition.ans | 1 - test/results/defininion tuple unpacking.ans | 1 - test/results/equality operator.ans | 10 ------- test/results/exported variable nested.ans | 1 - test/results/floor ceil round.ans | 3 -- test/results/for range.ans | 6 ---- test/results/function assignement.ans | 4 --- .../function custom type dispatch error.ans | 1 - .../results/function custom type dispatch.ans | 2 -- test/results/function cycle.ans | 4 --- test/results/function definition.ans | 4 --- test/results/function exported.ans | 7 ----- test/results/function name dispatch.ans | 1 - test/results/function next.ans | 4 --- test/results/function random.ans | 4 --- test/results/function scoped mutable.ans | 29 ------------------- test/results/function scoped nested.ans | 27 ----------------- test/results/function scoped recursive.ans | 13 --------- test/results/function scoped.ans | 7 ----- test/results/function selection.ans | 1 - .../function type dispatch with default.ans | 3 -- test/results/function type dispatch.ans | 1 - test/results/function ufcs arg.ans | 1 - test/results/function.ans | 1 - test/results/implicit multiplication.ans | 4 --- test/results/index identifier.ans | 2 -- .../interrupt callback nested paragraph.ans | 3 +- test/results/interrupt callback nested.ans | 3 +- test/results/interrupt callback.ans | 3 +- test/results/interrupt no callback.ans | 2 -- test/results/lazy boolean operators.ans | 7 ----- test/results/list assignement.ans | 4 --- test/results/list find.ans | 1 - test/results/list index.ans | 3 -- test/results/list insert.ans | 2 -- test/results/list len.ans | 1 - test/results/list remove.ans | 2 -- test/results/litterals.ans | 9 ------ test/results/load file import.ans | 1 - test/results/load file.ans | 1 - test/results/map assignement.ans | 8 ----- .../results/map index accross checkpoints.ans | 3 -- test/results/map index.ans | 2 -- test/results/nested conditions.ans | 1 - test/results/pair name value.ans | 1 - test/results/pair operator.ans | 1 - test/results/paragraph run from.ans | 2 -- test/results/paragraph run.ans | 2 -- test/results/parentheses multiline.ans | 3 -- test/results/persist.ans | 3 -- test/results/resume anchors.ans | 3 -- test/results/resume from nested paragraph.ans | 10 ------- .../resume from paragraph restore tags.ans | 6 ---- ...e from paragraph with nested condition.ans | 3 -- test/results/return children.ans | 1 - .../scope checkpoint mutable bis error.ans | 5 ---- test/results/scope checkpoint mutable bis.ans | 10 ------- .../scope checkpoint mutable error.ans | 4 --- .../scope checkpoint mutable ter error.ans | 5 ---- test/results/scope checkpoint mutable ter.ans | 10 ------- test/results/scope checkpoint mutable.ans | 7 ----- test/results/seen checkpoint resume.ans | 2 -- test/results/serialize.ans | 2 -- test/results/string escaping.ans | 3 -- test/results/swap assignment.ans | 1 - test/results/symbol alias constant.ans | 1 - test/results/symbol alias exported.ans | 1 - test/results/symbol alias.ans | 1 - test/results/tag operator.ans | 1 - test/results/text block.ans | 1 - test/results/text break.ans | 1 - test/results/text escaping.ans | 4 --- ...t line interpolation with choice event.ans | 1 - test/results/translate context.ans | 2 -- test/results/translate string.ans | 1 - test/results/translate text attachblock.ans | 1 - test/results/translate text.ans | 1 - test/results/unary operator overload.ans | 2 -- test/results/while break.ans | 6 ---- test/results/while continue.ans | 5 ---- test/results/while loop else.ans | 6 ---- test/results/while loop.ans | 17 ----------- .../checkpoint merging mutable value.ans | 1 + test/tests/checkpoint merging variable.ans | 2 +- test/tests/choice block.ans | 2 +- ...ice line interpolation with text event.ans | 2 +- test/tests/choice preserve tags.ans | 4 +-- test/tests/choice with decorators.ans | 10 +++---- test/tests/closure define nested.ans | 2 +- .../constrained variable assignement.ans | 2 +- test/tests/exported variable nested.ans | 2 +- .../function custom type dispatch error.ans | 2 +- test/tests/list assignement.ans | 2 +- test/tests/list index.ans | 2 +- test/tests/loop decorator.ans | 2 +- test/tests/nested flush.ans | 10 +++---- ...sume from paragraph with nested choice.ans | 2 +- test/tests/symbol alias constant.ans | 2 +- test/tests/text grouping.ans | 12 ++++---- ...xt line interpolation with event flush.ans | 6 ++-- ...ext line interpolation with text event.ans | 2 +- 122 files changed, 68 insertions(+), 418 deletions(-) create mode 100644 anselme/parser/expression/primary/flush.lua diff --git a/anselme/parser/expression/block.lua b/anselme/parser/expression/block.lua index a0de68d..ae00861 100644 --- a/anselme/parser/expression/block.lua +++ b/anselme/parser/expression/block.lua @@ -1,7 +1,7 @@ local expression_to_ast = require("anselme.parser.expression.to_ast") local ast = require("anselme.ast") -local PartialScope, Block, Flush, Call, Identifier = ast.PartialScope, ast.Block, ast.Flush, ast.Call, ast.Identifier +local PartialScope, Block, Call, Identifier = ast.PartialScope, ast.Block, ast.Call, ast.Identifier local function block(source, options, str) local start_source = source:clone() @@ -15,7 +15,6 @@ local function block(source, options, str) local current_level = levels[#levels] local rem = str - local last_line_empty while rem:match("^\n") do local line = source:consume(rem:match("^(\n)(.*)$")) local new_indentation = utf8.len(line:match("^([ \t]*)")) @@ -23,7 +22,6 @@ local function block(source, options, str) -- (consecutive empty lines are merged into one) if line:match("^\n") then rem = line - last_line_empty = true elseif line:match("[^%s]") then -- raise indentation if new_indentation > current_level.indentation then @@ -48,17 +46,13 @@ local function block(source, options, str) s, exp, rem = pcall(expression_to_ast, source, options, line) if not s then error(("invalid expression in block: %s"):format(exp), 0) end - -- single implicit _: line was empty (e.g. single comment in the line) + -- single implicit _: line was effectively empty (e.g. single comment in the line) if Call:is(exp) and not exp.explicit and Identifier:is(exp.func) and exp.func.name == "_" then - exp = Flush:new() + -- skip, empty line + else + -- add line + current_level.block:add(exp) end - - -- add line - if last_line_empty then - current_level.block:add(Flush:new()) - last_line_empty = nil - end - current_level.block:add(exp) else -- end-of-file rem = "" end diff --git a/anselme/parser/expression/primary/flush.lua b/anselme/parser/expression/primary/flush.lua new file mode 100644 index 0000000..36cc78c --- /dev/null +++ b/anselme/parser/expression/primary/flush.lua @@ -0,0 +1,16 @@ +local primary = require("anselme.parser.expression.primary.primary") + +local ast = require("anselme.ast") +local Flush = ast.Flush + +return primary { + match = function(self, str) + return str:match("^%-%-%-") + end, + + parse = function(self, source, options, str) + local start_source = source:clone() + local rem = source:consume(str:match("^(%-%-%-)(.-)$")) + return Flush:new():set_source(start_source), rem + end +} diff --git a/anselme/parser/expression/primary/init.lua b/anselme/parser/expression/primary/init.lua index df5ed41..c617758 100644 --- a/anselme/parser/expression/primary/init.lua +++ b/anselme/parser/expression/primary/init.lua @@ -19,6 +19,7 @@ local primaries = { r("implicit_block_identifier"), r("tuple"), r("struct"), + r("flush"), -- prefixes r("prefix.semicolon"), diff --git a/anselme/state/event_manager.lua b/anselme/state/event_manager.lua index ffe36f4..2365221 100644 --- a/anselme/state/event_manager.lua +++ b/anselme/state/event_manager.lua @@ -76,6 +76,6 @@ return class { end, -- keep flushing until nothing is left (a flush may re-fill the buffer during its execution) complete_flush = function(self, state) - while state.scope:get(last_event_type_identifier):to_lua(state) do self:flush(state) end + while state.scope:get(last_event_type_identifier):truthy() do self:flush(state) end end } diff --git a/doc/language.md b/doc/language.md index 0b3fddf..61c6344 100644 --- a/doc/language.md +++ b/doc/language.md @@ -15,8 +15,7 @@ Anselme files are UTF-8 encoded text files. Anselme will try to parse the file as a block expression. A block is a list of expression, each on a separate line. Each line can be prefixed with indentation, consisting of spaces or tabs. The number of spaces or tabs is the indentation level. Lines with a higher level of indentation than the previous line will create a new block; this new block will be evaluated wherever the `_` block identifier appear in the previous line. - -TODO Empty lines +Empty lines are ignored with regard to indentation. ``` 1 // expression on line 1 @@ -397,7 +396,7 @@ fn(| Text) // the text literal is not automatically called when it is not the ma Return values consist of a an arbitrary value. -When a return value appear as one of the lines of a block, the block is stopped and immediately return the return value. +When a return value is returned by one of the lines of a block, the block is stopped and immediately return the return value. When a return value is returned from a function call, the value associated with the return value is returned instead. diff --git a/test/results/alias identifier.ans b/test/results/alias identifier.ans index f766716..3aa17b7 100644 --- a/test/results/alias identifier.ans +++ b/test/results/alias identifier.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"4" {}" = " {}"4" {}" = 4" | ---- text --- | {}"" {}"12" {}" = " {}"12" {}" = 12" | --- return --- () diff --git a/test/results/assignment tuple unpacking.ans b/test/results/assignment tuple unpacking.ans index 87e2d9f..9fe471a 100644 --- a/test/results/assignment tuple unpacking.ans +++ b/test/results/assignment tuple unpacking.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"3" {}"" | ---- text --- | {}"" {}"4" {}"" | --- return --- () diff --git a/test/results/autocall text statement.ans b/test/results/autocall text statement.ans index deaa764..f11cef5 100644 --- a/test/results/autocall text statement.ans +++ b/test/results/autocall text statement.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"Hello" | ---- text --- | {}"Hello" | ---- text --- | {}"Wor" {}"ld" | --- return --- () diff --git a/test/results/binary operator overload.ans b/test/results/binary operator overload.ans index 3b8a0c1..22ba0eb 100644 --- a/test/results/binary operator overload.ans +++ b/test/results/binary operator overload.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"" {}"-3" {}"" | ---- text --- | {}"" {}"heh minus lol" {}"" | ---- text --- | {}"" {}"generic minus" {}"" | --- return --- () diff --git a/test/results/binop assignement.ans b/test/results/binop assignement.ans index bc7e080..07131cd 100644 --- a/test/results/binop assignement.ans +++ b/test/results/binop assignement.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"3" {}"" | --- return --- () diff --git a/test/results/brace multiline.ans b/test/results/brace multiline.ans index f8ea667..aba0866 100644 --- a/test/results/brace multiline.ans +++ b/test/results/brace multiline.ans @@ -1,11 +1,8 @@ --# run #-- --- text --- | {}"" {}"{1:1, 2:2, 3:4, 4:6}" {}"" | ---- text --- | {}"" {}"{1:1, 2:2, 3:4, 4:6}" {}"" | ---- text --- | {}"" {}"{}" {}"" | ---- text --- | {}"" {}"{1:1, 2:2, 3:4, 4:3, 5:9, 6:6}" {}"" | --- return --- () diff --git a/test/results/bracket multiline.ans b/test/results/bracket multiline.ans index 028cec2..1a63239 100644 --- a/test/results/bracket multiline.ans +++ b/test/results/bracket multiline.ans @@ -1,11 +1,8 @@ --# run #-- --- text --- | {}"" {}"[1, 2, 4, 6]" {}"" | ---- text --- | {}"" {}"[1, 2, 4, 6]" {}"" | ---- text --- | {}"" {}"[]" {}"" | ---- text --- | {}"" {}"[1, 2, 4, 3, 9, 6]" {}"" | --- return --- () diff --git a/test/results/checkpoint change.ans b/test/results/checkpoint change.ans index eeb3b0c..db00ccb 100644 --- a/test/results/checkpoint change.ans +++ b/test/results/checkpoint change.ans @@ -4,40 +4,27 @@ | {}"x" | --- text --- | {}"d" | ---- text --- | {}"From p checkpoint:" | | {}"a" | --- text --- | {}"c" | ---- text --- | {}"d" | ---- text --- | {}"From q checkpoint:" | | {}"b" | ---- text --- | {}"c" | ---- text --- | {}"d" | ---- text --- | {}"From q checkpoint again:" | | {}"b" | ---- text --- | {}"c" | ---- text --- | {}"d" | ---- text --- | {}"Go to p again by setting checkpoint manually:" | | {}"a" | --- text --- | {}"c" | ---- text --- | {}"d" | ---- text --- | {}"From q again:" | | {}"b" | ---- text --- | {}"c" | ---- text --- | {}"d" | --- return --- () diff --git a/test/results/checkpoint merging mutable value.ans b/test/results/checkpoint merging mutable value.ans index 45e26d4..f8f1d46 100644 --- a/test/results/checkpoint merging mutable value.ans +++ b/test/results/checkpoint merging mutable value.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"1,2: " {}"*[1, 2]" {}"" | ---- text --- | {}"1,2,3: " {}"*[1, 2, 3]" {}"" | --- text --- | {}"1,2,3,4: " {}"*[1, 2, 3, 4]" {}"" | @@ -9,7 +8,7 @@ | {}"1,2,3,4,5: " {}"*[1, 2, 3, 4, 5]" {}"" | --- error --- cancel merge - ↳ from test/tests/checkpoint merging mutable value.ans:24:6 in call: error("cancel merge") + ↳ from test/tests/checkpoint merging mutable value.ans:25:6 in call: error("cancel merge") ↳ from test/tests/checkpoint merging mutable value.ans:1:1 in block: :l = *[1, 2]… --# post run check #-- --- text --- diff --git a/test/results/checkpoint merging variable.ans b/test/results/checkpoint merging variable.ans index 3828ebf..d7c87ff 100644 --- a/test/results/checkpoint merging variable.ans +++ b/test/results/checkpoint merging variable.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"1: " {}"1" {}"" | ---- text --- | {}"2: " {}"2" {}"" | --- text --- | {}"3: " {}"3" {}"" | diff --git a/test/results/checkpoint reached seen.ans b/test/results/checkpoint reached seen.ans index b9fb32e..ca7f255 100644 --- a/test/results/checkpoint reached seen.ans +++ b/test/results/checkpoint reached seen.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"Seen: " {}"2" {}"" | ---- text --- | {}"Reached: " {}"1" {}"" | --- return --- () diff --git a/test/results/closure.ans b/test/results/closure.ans index ac43e13..5043a56 100644 --- a/test/results/closure.ans +++ b/test/results/closure.ans @@ -2,7 +2,6 @@ --- text --- | {}"" {}"5" {}" = 5" | | {}"" {}"8" {}" = 8" | ---- text --- | {}"" {}"4" {}" = 4" | | {}"" {}"7" {}" = 7" | --- return --- diff --git a/test/results/commit.ans b/test/results/commit.ans index a06128d..e135f10 100644 --- a/test/results/commit.ans +++ b/test/results/commit.ans @@ -1,6 +1,4 @@ --# run #-- ---- text --- -| {}"before: " {}"2" {}"" | --# parallel script #-- --- text --- | {}"parallel: " {}"5" {}"" | @@ -8,13 +6,15 @@ () --# main script #-- --- text --- -| {}"after: " {}"2" {}"" | +| {}"before: " {}"2" {}"" | --# parallel script #-- --- text --- | {}"parallel: " {}"2" {}"" | --- return --- () --# main script #-- +--- text --- +| {}"after: " {}"2" {}"" | --- return --- () --# saved #-- diff --git a/test/results/condition operator.ans b/test/results/condition operator.ans index b40c44b..1f6bef4 100644 --- a/test/results/condition operator.ans +++ b/test/results/condition operator.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"a " {}"b" {}" c" | ---- text --- | {}"a " {}"()" {}" c" | --- return --- () diff --git a/test/results/constant variable list.ans b/test/results/constant variable list.ans index 8162ae6..85963f5 100644 --- a/test/results/constant variable list.ans +++ b/test/results/constant variable list.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"*[3]" {}"" | ---- text --- | {}"" {}"*[3, 52]" {}"" | --- return --- () diff --git a/test/results/constrained variable assignement.ans b/test/results/constrained variable assignement.ans index 57f899d..d43e40f 100644 --- a/test/results/constrained variable assignement.ans +++ b/test/results/constrained variable assignement.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"type(5, \"kg\")" {}"" | ---- text --- | {}"" {}"type(12, \"kg\")" {}"" | --- error --- can not set weigh = 32; $(x) type(x) == t value check failed diff --git a/test/results/constrained variable definition.ans b/test/results/constrained variable definition.ans index c81a028..6a4ce58 100644 --- a/test/results/constrained variable definition.ans +++ b/test/results/constrained variable definition.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"type(5, \"kg\")" {}"" | ---- text --- | {}"" {}"12" {}"" | --- return --- () diff --git a/test/results/defininion tuple unpacking.ans b/test/results/defininion tuple unpacking.ans index 87e2d9f..9fe471a 100644 --- a/test/results/defininion tuple unpacking.ans +++ b/test/results/defininion tuple unpacking.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"3" {}"" | ---- text --- | {}"" {}"4" {}"" | --- return --- () diff --git a/test/results/equality operator.ans b/test/results/equality operator.ans index d92f702..2dfb96f 100644 --- a/test/results/equality operator.ans +++ b/test/results/equality operator.ans @@ -1,25 +1,15 @@ --# run #-- --- text --- | {}"false = " {}"false" {}"" | ---- text --- | {}"false = " {}"false" {}"" | ---- text --- | {}"true = " {}"true" {}"" | ---- text --- | {}"false = " {}"false" {}"" | ---- text --- | {}"false = " {}"false" {}"" | ---- text --- | {}"false = " {}"false" {}"" | ---- text --- | {}"false = " {}"false" {}"" | ---- text --- | {}"true = " {}"true" {}"" | ---- text --- | {}"false = " {}"false" {}"" | ---- text --- | {}"true = " {}"true" {}"" | ---- text --- | {}"true = " {}"true" {}"" | --- return --- () diff --git a/test/results/exported variable nested.ans b/test/results/exported variable nested.ans index 1dab027..f2477b5 100644 --- a/test/results/exported variable nested.ans +++ b/test/results/exported variable nested.ans @@ -2,7 +2,6 @@ --- text --- | {}"kk" | | {}"ko" | ---- text --- | {}"" {}"42" {}"" | --- error --- identifier "z" is undefined in branch test/tests/exported variable nested.ans - run diff --git a/test/results/floor ceil round.ans b/test/results/floor ceil round.ans index 68673c1..7646f8a 100644 --- a/test/results/floor ceil round.ans +++ b/test/results/floor ceil round.ans @@ -1,11 +1,8 @@ --# run #-- --- text --- | {}"" {}"3" {}"" | ---- text --- | {}"" {}"4" {}"" | ---- text --- | {}"" {}"3" {}"" | ---- text --- | {}"" {}"3.142" {}"" | --- return --- () diff --git a/test/results/for range.ans b/test/results/for range.ans index 8454397..f31be8c 100644 --- a/test/results/for range.ans +++ b/test/results/for range.ans @@ -6,7 +6,6 @@ | {}"" {}"3" {}"" | | {}"" {}"4" {}"" | | {}"" {}"5" {}"" | ---- text --- | {}"-" | | {}"" {}"2" {}"" | | {}"" {}"3" {}"" | @@ -14,22 +13,17 @@ | {}"" {}"5" {}"" | | {}"" {}"6" {}"" | | {}"" {}"7" {}"" | ---- text --- | {}"-" | | {}"" {}"2" {}"" | | {}"" {}"5" {}"" | ---- text --- | {}"-" | | {}"" {}"4" {}"" | | {}"" {}"3" {}"" | | {}"" {}"2" {}"" | | {}"" {}"1" {}"" | | {}"" {}"0" {}"" | ---- text --- | {}"-" | ---- text --- | {}"-" | ---- text --- | {}"-" | | {}"" {}"4" {}"" | --- return --- diff --git a/test/results/function assignement.ans b/test/results/function assignement.ans index 8ac9786..6112564 100644 --- a/test/results/function assignement.ans +++ b/test/results/function assignement.ans @@ -1,13 +1,9 @@ --# run #-- --- text --- | {}"" {}"5" {}"" | ---- text --- | {}"v=" {}"50" {}"" | ---- text --- | {}"" {}"50" {}"" | ---- text --- | {}"v2=" {}"ok" {}"" | ---- text --- | {}"" {}"3" {}"" | --- return --- () diff --git a/test/results/function custom type dispatch error.ans b/test/results/function custom type dispatch error.ans index ec79e48..8b12ce6 100644 --- a/test/results/function custom type dispatch error.ans +++ b/test/results/function custom type dispatch error.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"pierre" {}" is french" | ---- text --- | {}"" {}"idk" {}" is esperanto" | --- error --- can't call overload a: no function match arguments (value), possible functions were: diff --git a/test/results/function custom type dispatch.ans b/test/results/function custom type dispatch.ans index 3a4a570..3912851 100644 --- a/test/results/function custom type dispatch.ans +++ b/test/results/function custom type dispatch.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"" {}"bob" {}" is english or generic" | ---- text --- | {}"" {}"pierre" {}" is french" | ---- text --- | {}"" {}"idk" {}" is english or generic" | --- return --- () diff --git a/test/results/function cycle.ans b/test/results/function cycle.ans index 7cc973b..939ddbc 100644 --- a/test/results/function cycle.ans +++ b/test/results/function cycle.ans @@ -1,13 +1,9 @@ --# run #-- --- text --- | {}"a" | ---- text --- | {}"b" | ---- text --- | {}"c" | ---- text --- | {}"a" | ---- text --- | {}"b" | --- return --- () diff --git a/test/results/function definition.ans b/test/results/function definition.ans index a358253..9d5b6f0 100644 --- a/test/results/function definition.ans +++ b/test/results/function definition.ans @@ -1,13 +1,9 @@ --# run #-- --- text --- | {}"" {}"25" {}" = " {}"25" {}"" | ---- text --- | {}"" {}"4" {}" = " {}"4" {}"" | ---- text --- | {}"" {}"14" {}" == 14" | ---- text --- | {}"" {}"32" {}" == 32" | ---- text --- | {}"" {}"49" {}" == 49" | --- return --- () diff --git a/test/results/function exported.ans b/test/results/function exported.ans index dc8c9be..516c976 100644 --- a/test/results/function exported.ans +++ b/test/results/function exported.ans @@ -1,19 +1,12 @@ --# run #-- --- text --- | {}"local:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"upvalue:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"2" {}"" | ---- text --- | {}"" {}"3" {}"" | --- return --- () diff --git a/test/results/function name dispatch.ans b/test/results/function name dispatch.ans index 746467d..2ec28f1 100644 --- a/test/results/function name dispatch.ans +++ b/test/results/function name dispatch.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"a" | ---- text --- | {}"x" | --- return --- () diff --git a/test/results/function next.ans b/test/results/function next.ans index 07868ce..e5c2352 100644 --- a/test/results/function next.ans +++ b/test/results/function next.ans @@ -1,13 +1,9 @@ --# run #-- --- text --- | {}"a" | ---- text --- | {}"b" | ---- text --- | {}"c" | ---- text --- | {}"c" | ---- text --- | {}"c" | --- return --- () diff --git a/test/results/function random.ans b/test/results/function random.ans index 7d223c2..0ade254 100644 --- a/test/results/function random.ans +++ b/test/results/function random.ans @@ -1,13 +1,9 @@ --# run #-- --- text --- | {}"c" | ---- text --- | {}"a" | ---- text --- | {}"b" | ---- text --- | {}"c" | ---- text --- | {}"a" | --- return --- () diff --git a/test/results/function scoped mutable.ans b/test/results/function scoped mutable.ans index d6b20cc..5a7e277 100644 --- a/test/results/function scoped mutable.ans +++ b/test/results/function scoped mutable.ans @@ -1,63 +1,34 @@ --# run #-- --- text --- | {}"new list each time:" | ---- text --- | {}"start: " {}"*[]" {}"" | ---- text --- | {}"before recursion " {}"1" {}": " {}"*[1]" {}"" | ---- text --- | {}"start: " {}"*[]" {}"" | ---- text --- | {}"before recursion " {}"2" {}": " {}"*[2]" {}"" | ---- text --- | {}"start: " {}"*[]" {}"" | ---- text --- | {}"before recursion " {}"3" {}": " {}"*[3]" {}"" | ---- text --- | {}"start: " {}"*[]" {}"" | ---- text --- | {}"before recursion " {}"4" {}": " {}"*[4]" {}"" | ---- text --- | {}"start: " {}"*[]" {}"" | ---- text --- | {}"before recursion " {}"5" {}": " {}"*[5]" {}"" | ---- text --- | {}"after recursion " {}"4" {}": " {}"*[4]" {}"" | ---- text --- | {}"after recursion " {}"3" {}": " {}"*[3]" {}"" | ---- text --- | {}"after recursion " {}"2" {}": " {}"*[2]" {}"" | ---- text --- | {}"after recursion " {}"1" {}": " {}"*[1]" {}"" | ---- text --- | {}"pass list:" | ---- text --- | {}"start: " {}"*[]" {}"" | ---- text --- | {}"before recursion " {}"1" {}": " {}"*[1]" {}"" | ---- text --- | {}"start: " {}"*[1]" {}"" | ---- text --- | {}"before recursion " {}"2" {}": " {}"*[1, 2]" {}"" | ---- text --- | {}"start: " {}"*[1, 2]" {}"" | ---- text --- | {}"before recursion " {}"3" {}": " {}"*[1, 2, 3]" {}"" | ---- text --- | {}"start: " {}"*[1, 2, 3]" {}"" | ---- text --- | {}"before recursion " {}"4" {}": " {}"*[1, 2, 3, 4]" {}"" | ---- text --- | {}"start: " {}"*[1, 2, 3, 4]" {}"" | ---- text --- | {}"before recursion " {}"5" {}": " {}"*[1, 2, 3, 4, 5]" {}"" | ---- text --- | {}"after recursion " {}"4" {}": " {}"*[1, 2, 3, 4, 5]" {}"" | ---- text --- | {}"after recursion " {}"3" {}": " {}"*[1, 2, 3, 4, 5]" {}"" | ---- text --- | {}"after recursion " {}"2" {}": " {}"*[1, 2, 3, 4, 5]" {}"" | ---- text --- | {}"after recursion " {}"1" {}": " {}"*[1, 2, 3, 4, 5]" {}"" | --- return --- () diff --git a/test/results/function scoped nested.ans b/test/results/function scoped nested.ans index af25ebe..46253e6 100644 --- a/test/results/function scoped nested.ans +++ b/test/results/function scoped nested.ans @@ -1,59 +1,32 @@ --# run #-- --- text --- | {}"depth 1:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}">" {}" depth 2, unscoped:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}">" {}" depth 2, scoped:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}">" {}" depth 2, unscoped:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}">" {}" depth 2, scoped:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}">" {}" depth 2, unscoped:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}">" {}" depth 2, scoped:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | --- return --- () diff --git a/test/results/function scoped recursive.ans b/test/results/function scoped recursive.ans index 2ef9e6f..c567b44 100644 --- a/test/results/function scoped recursive.ans +++ b/test/results/function scoped recursive.ans @@ -1,31 +1,18 @@ --# run #-- --- text --- | {}"start: " {}"1" {}"" | ---- text --- | {}"before recursion " {}"1" {}": " {}"2" {}"" | ---- text --- | {}"start: " {}"1" {}"" | ---- text --- | {}"before recursion " {}"2" {}": " {}"2" {}"" | ---- text --- | {}"start: " {}"1" {}"" | ---- text --- | {}"before recursion " {}"3" {}": " {}"2" {}"" | ---- text --- | {}"start: " {}"1" {}"" | ---- text --- | {}"before recursion " {}"4" {}": " {}"2" {}"" | ---- text --- | {}"start: " {}"1" {}"" | ---- text --- | {}"before recursion " {}"5" {}": " {}"2" {}"" | ---- text --- | {}"after recursion " {}"4" {}": " {}"2" {}"" | ---- text --- | {}"after recursion " {}"3" {}": " {}"2" {}"" | ---- text --- | {}"after recursion " {}"2" {}": " {}"2" {}"" | ---- text --- | {}"after recursion " {}"1" {}": " {}"2" {}"" | --- return --- () diff --git a/test/results/function scoped.ans b/test/results/function scoped.ans index 03dc970..cd5eec7 100644 --- a/test/results/function scoped.ans +++ b/test/results/function scoped.ans @@ -1,19 +1,12 @@ --# run #-- --- text --- | {}"paren:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"no paren:" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"1" {}"" | --- return --- () diff --git a/test/results/function selection.ans b/test/results/function selection.ans index 200dae4..53d5675 100644 --- a/test/results/function selection.ans +++ b/test/results/function selection.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"plopheh" {}"" | ---- text --- | {}"" {}"4" {}"" | --- return --- () diff --git a/test/results/function type dispatch with default.ans b/test/results/function type dispatch with default.ans index 043bb87..25c1d0c 100644 --- a/test/results/function type dispatch with default.ans +++ b/test/results/function type dispatch with default.ans @@ -1,11 +1,8 @@ --# run #-- --- text --- | {}"a" | ---- text --- | {}"x" | ---- text --- | {}"a" | ---- text --- | {}"" {}"gs" {}"" | | {}"" {}"gn" {}"" | | {}"" {}"gs" {}"" | diff --git a/test/results/function type dispatch.ans b/test/results/function type dispatch.ans index 746467d..2ec28f1 100644 --- a/test/results/function type dispatch.ans +++ b/test/results/function type dispatch.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"a" | ---- text --- | {}"x" | --- return --- () diff --git a/test/results/function ufcs arg.ans b/test/results/function ufcs arg.ans index bc677a3..6c0eeb5 100644 --- a/test/results/function ufcs arg.ans +++ b/test/results/function ufcs arg.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"ok" {}"" | ---- text --- | {}"" {}"ok" {}"" | --- return --- () diff --git a/test/results/function.ans b/test/results/function.ans index d36e805..fe4cede 100644 --- a/test/results/function.ans +++ b/test/results/function.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"ok" | ---- text --- | {}"ok2" | --- return --- () diff --git a/test/results/implicit multiplication.ans b/test/results/implicit multiplication.ans index 000ca7d..034e1c1 100644 --- a/test/results/implicit multiplication.ans +++ b/test/results/implicit multiplication.ans @@ -1,13 +1,9 @@ --# run #-- --- text --- | {}"" {}"8" {}" = 8" | ---- text --- | {}"" {}"12" {}" = 12" | ---- text --- | {}"" {}"6.28" {}" = 2pi" | ---- text --- | {}"" {}"0.125" {}" = 0.125" | ---- text --- | {}"" {}"2.1" {}" = 2.1" | --- return --- () diff --git a/test/results/index identifier.ans b/test/results/index identifier.ans index 329219e..0d4529c 100644 --- a/test/results/index identifier.ans +++ b/test/results/index identifier.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"" {}"42" {}"" | ---- text --- | {}"" {}"42" {}"" | ---- text --- | {}"" {}"42" {}"" | --- return --- () diff --git a/test/results/interrupt callback nested paragraph.ans b/test/results/interrupt callback nested paragraph.ans index 157f0b5..5f15fad 100644 --- a/test/results/interrupt callback nested paragraph.ans +++ b/test/results/interrupt callback nested paragraph.ans @@ -1,9 +1,8 @@ --# run #-- ---- text --- -| {}"before: " {}"2" {}"" | --- interrupt --- nil --- text --- +| {}"before: " {}"2" {}"" | | {}"in interrupt: " {}"2" {}"" | --- return --- () diff --git a/test/results/interrupt callback nested.ans b/test/results/interrupt callback nested.ans index 157f0b5..5f15fad 100644 --- a/test/results/interrupt callback nested.ans +++ b/test/results/interrupt callback nested.ans @@ -1,9 +1,8 @@ --# run #-- ---- text --- -| {}"before: " {}"2" {}"" | --- interrupt --- nil --- text --- +| {}"before: " {}"2" {}"" | | {}"in interrupt: " {}"2" {}"" | --- return --- () diff --git a/test/results/interrupt callback.ans b/test/results/interrupt callback.ans index 157f0b5..5f15fad 100644 --- a/test/results/interrupt callback.ans +++ b/test/results/interrupt callback.ans @@ -1,9 +1,8 @@ --# run #-- ---- text --- -| {}"before: " {}"2" {}"" | --- interrupt --- nil --- text --- +| {}"before: " {}"2" {}"" | | {}"in interrupt: " {}"2" {}"" | --- return --- () diff --git a/test/results/interrupt no callback.ans b/test/results/interrupt no callback.ans index 97c3881..4314af3 100644 --- a/test/results/interrupt no callback.ans +++ b/test/results/interrupt no callback.ans @@ -1,6 +1,4 @@ --# run #-- ---- text --- -| {}"before: " {}"2" {}"" | --- interrupt --- nil --# saved #-- diff --git a/test/results/lazy boolean operators.ans b/test/results/lazy boolean operators.ans index 7ebf2e0..40e8f3a 100644 --- a/test/results/lazy boolean operators.ans +++ b/test/results/lazy boolean operators.ans @@ -3,27 +3,20 @@ | {}"a" | | {}"b" | | {}"" {}"()" {}" = a b ()" | ---- text --- | {}"b" | | {}"" {}"()" {}" = b ()" | ---- text --- | {}"a" | | {}"a" | | {}"" {}"1" {}" = a a 1" | ---- text --- | {}"b" | | {}"" {}"()" {}" = b ()" | ---- text --- | {}"a" | | {}"" {}"1" {}" = a 1" | ---- text --- | {}"b" | | {}"a" | | {}"" {}"1" {}" = b a 1" | ---- text --- | {}"a" | | {}"" {}"1" {}" = a 1" | ---- text --- | {}"b" | | {}"b" | | {}"" {}"()" {}" = b b ()" | diff --git a/test/results/list assignement.ans b/test/results/list assignement.ans index f892bd9..66659b1 100644 --- a/test/results/list assignement.ans +++ b/test/results/list assignement.ans @@ -1,13 +1,9 @@ --# run #-- --- text --- | {}"" {}"*[1, 2]" {}"" | ---- text --- | {}"" {}"*[3, 2]" {}"" | ---- text --- | {}"" {}"*[3, 5]" {}"" | ---- text --- | {}"" {}"*[3, 12]" {}"" | ---- text --- | {}"" {}"*[3, 12, 99]" {}"" | --- error --- list index out of bounds diff --git a/test/results/list find.ans b/test/results/list find.ans index 9bbe813..0ef3a2a 100644 --- a/test/results/list find.ans +++ b/test/results/list find.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"3" {}"" | ---- text --- | {}"" {}"3" {}"" | --- return --- () diff --git a/test/results/list index.ans b/test/results/list index.ans index ee45042..e5a224a 100644 --- a/test/results/list index.ans +++ b/test/results/list index.ans @@ -1,11 +1,8 @@ --# run #-- --- text --- | {}"" {}"[1, 2, 3]" {}"" | ---- text --- | {}"" {}"1" {}" == " {}"1" {}"" | ---- text --- | {}"" {}"2" {}" == " {}"2" {}"" | ---- text --- | {}"" {}"3" {}" == " {}"3" {}"" | --- error --- tuple index out of bounds diff --git a/test/results/list insert.ans b/test/results/list insert.ans index c269894..f7f2bf6 100644 --- a/test/results/list insert.ans +++ b/test/results/list insert.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"" {}"*[1, 2, 3]" {}"" | ---- text --- | {}"" {}"*[1, 2, 3, 4]" {}"" | ---- text --- | {}"" {}"*[1, 5, 2, 3, 4]" {}"" | --- return --- () diff --git a/test/results/list len.ans b/test/results/list len.ans index ddce4e2..a602a36 100644 --- a/test/results/list len.ans +++ b/test/results/list len.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"4" {}"" | ---- text --- | {}"" {}"4" {}"" | --- return --- () diff --git a/test/results/list remove.ans b/test/results/list remove.ans index f53102f..2664b19 100644 --- a/test/results/list remove.ans +++ b/test/results/list remove.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"" {}"*[1, 2, 3, 4, 5]" {}"" | ---- text --- | {}"" {}"*[1, 2, 3, 4]" {}"" | ---- text --- | {}"" {}"*[1, 3, 4]" {}"" | --- return --- () diff --git a/test/results/litterals.ans b/test/results/litterals.ans index 7c68328..af500fd 100644 --- a/test/results/litterals.ans +++ b/test/results/litterals.ans @@ -5,34 +5,25 @@ | {}"" {}"12" {}"" | | {}"" {}"0.87" {}"" | | {}"" {}"39.12" {}"" | ---- text --- | {}"strings:" | | {}"" {}"foo" {}"" | ---- text --- | {}"tuple:" | | {}"" {}"[4, 8, 9]" {}"" | ---- text --- | {}"struct:" | | {}"" {}"{1:9, 2:8, 7:4}" {}"" | ---- text --- | {}"symbols:" | | {}"" {}":ab" {}"" | ---- text --- | {}"anchor:" | | {}"" {}"#jdfe" {}"" | | {}"" {}"#foo bar" {}"" | ---- text --- | {}"boolean:" | | {}"" {}"false" {}"" | | {}"" {}"true" {}"" | ---- text --- | {}"nil:" | | {}"" {}"()" {}"" | ---- text --- | {}"pair:" | | {}"" {}"6:8" {}"" | | {}"" {}"\"d\":[]" {}"" | ---- text --- | {}"function:" | | {}"" {}"$() 12" {}"" | | {}"" {}"$(x) x" {}"" | diff --git a/test/results/load file import.ans b/test/results/load file import.ans index bc7e080..07131cd 100644 --- a/test/results/load file import.ans +++ b/test/results/load file import.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"3" {}"" | --- return --- () diff --git a/test/results/load file.ans b/test/results/load file.ans index bc7e080..07131cd 100644 --- a/test/results/load file.ans +++ b/test/results/load file.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"3" {}"" | --- return --- () diff --git a/test/results/map assignement.ans b/test/results/map assignement.ans index 02f4e31..d74a253 100644 --- a/test/results/map assignement.ans +++ b/test/results/map assignement.ans @@ -1,21 +1,13 @@ --# run #-- --- text --- | {}"" {}"*{1:1, 2:2}" {}"" | ---- text --- | {}"" {}"()" {}"" | ---- text --- | {}"" {}"*{1:3, 2:2}" {}"" | ---- text --- | {}"" {}"()" {}"" | ---- text --- | {}"" {}"*{\"foo\":\"a\", 1:3, 2:2}" {}"" | ---- text --- | {}"" {}"()" {}"" | ---- text --- | {}"" {}"*{\"bar\":\"b\", \"foo\":\"a\", 1:3, 2:2}" {}"" | ---- text --- | {}"" {}"()" {}"" | ---- text --- | {}"" {}"*{\"bar\":\"b\", \"foo\":\"c\", 1:3, 2:2}" {}"" | --- return --- () diff --git a/test/results/map index accross checkpoints.ans b/test/results/map index accross checkpoints.ans index c28ea01..987c37d 100644 --- a/test/results/map index accross checkpoints.ans +++ b/test/results/map index accross checkpoints.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"x=" {}"*{1:4}" {}"" | ---- text --- | {}"1=" {}"true" {}"" | ---- text --- | {}"a(x)=" {}"4" {}"" | --- text --- | {}"a(x)=" {}"4" {}"" | @@ -11,7 +9,6 @@ | {}"a(x)=" {}"4" {}"" | --- text --- | {}"a(x)=" {}"4" {}"" | ---- text --- | {}"no=" {}"()" {}"" | --- return --- () diff --git a/test/results/map index.ans b/test/results/map index.ans index 91eedf4..ebabbb4 100644 --- a/test/results/map index.ans +++ b/test/results/map index.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"" {}"{\"ahah\":23, \"k\":23, 3:12}" {}" == " {}"{" {}"3=12, ahah=23, k=23}" | ---- text --- | {}"" {}"12" {}" == 12" | ---- text --- | {}"" {}"23" {}" == 23" | --- return --- () diff --git a/test/results/nested conditions.ans b/test/results/nested conditions.ans index 1b5802c..371e4aa 100644 --- a/test/results/nested conditions.ans +++ b/test/results/nested conditions.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"yes" | ---- text --- | {}"ye" | | {}"da" | --- return --- diff --git a/test/results/pair name value.ans b/test/results/pair name value.ans index 3906bfa..3c0046f 100644 --- a/test/results/pair name value.ans +++ b/test/results/pair name value.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"foo" {}"" | ---- text --- | {}"" {}"barr" {}"" | --- return --- () diff --git a/test/results/pair operator.ans b/test/results/pair operator.ans index 5c5afbd..63475ea 100644 --- a/test/results/pair operator.ans +++ b/test/results/pair operator.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"[\"test\":1, 3:\"p\", \"test\":\"foo\", \"ho\":\"ah\", \"test\":\"test\"]" {}"" | ---- text --- | {}"" {}"[\"name\":1, 3:\"p\", \"test\":\"foo\", \"ho\":\"ah\", \"name\":\"test\"]" {}"" | --- return --- () diff --git a/test/results/paragraph run from.ans b/test/results/paragraph run from.ans index 9721052..3a522a3 100644 --- a/test/results/paragraph run from.ans +++ b/test/results/paragraph run from.ans @@ -3,11 +3,9 @@ | {}"Force run from checkpoint:" | | {}"a" | | {}"b" | ---- text --- | {}"From checkpoint:" | | {}"a" | | {}"b" | ---- text --- | {}"Force no checkpoint:" | | {}"x" | --- text --- diff --git a/test/results/paragraph run.ans b/test/results/paragraph run.ans index 055da87..9561771 100644 --- a/test/results/paragraph run.ans +++ b/test/results/paragraph run.ans @@ -4,11 +4,9 @@ | {}"x" | --- text --- | {}"b" | ---- text --- | {}"From checkpoint:" | | {}"a" | | {}"b" | ---- text --- | {}"Force no checkpoint:" | | {}"x" | --- text --- diff --git a/test/results/parentheses multiline.ans b/test/results/parentheses multiline.ans index ec0542a..258e21a 100644 --- a/test/results/parentheses multiline.ans +++ b/test/results/parentheses multiline.ans @@ -1,11 +1,8 @@ --# run #-- --- text --- | {}"" {}"[1, 2, 4, 6]" {}"" | ---- text --- | {}"" {}"[1, 2, 4, 6]" {}"" | ---- text --- | {}"" {}"()" {}"" | ---- text --- | {}"" {}"[1, 2, 4, 3, 9, 6]" {}"" | --- return --- () diff --git a/test/results/persist.ans b/test/results/persist.ans index f36e54e..9c748b1 100644 --- a/test/results/persist.ans +++ b/test/results/persist.ans @@ -1,11 +1,8 @@ --# run #-- --- text --- | {}"pouet=" {}"7" {}" (7)" | ---- text --- | {}"d=" {}"7" {}" (7)" | ---- text --- | {}"d=" {}"9" {}" (9)" | ---- text --- | {}"pouet=" {}"9" {}" (9)" | --- return --- () diff --git a/test/results/resume anchors.ans b/test/results/resume anchors.ans index ac70db4..74b840d 100644 --- a/test/results/resume anchors.ans +++ b/test/results/resume anchors.ans @@ -8,7 +8,6 @@ --- text --- | {}"boum" | | {}"h " {}"8" {}"" | ---- text --- | {}"<<>>" | | {}"a" | --- choice --- @@ -22,14 +21,12 @@ | {}"f" | | {}"g" | | {}"h " {}"8" {}"" | ---- text --- | {}"<<>>" | | {}"c" | | {}"d" | | {}"e" | | {}"f" | | {}"g" | ---- text --- | {}"h " {}"8" {}"" | --- return --- () diff --git a/test/results/resume from nested paragraph.ans b/test/results/resume from nested paragraph.ans index 196b9d8..16cdbb5 100644 --- a/test/results/resume from nested paragraph.ans +++ b/test/results/resume from nested paragraph.ans @@ -4,33 +4,23 @@ | {}"x" | --- text --- | {}"d" | ---- text --- | {}"From p checkpoint:" | | {}"a" | --- text --- | {}"c" | ---- text --- | {}"d" | ---- text --- | {}"From q checkpoint:" | | {}"b" | ---- text --- | {}"c" | ---- text --- | {}"d" | ---- text --- | {}"From q checkpoint again:" | | {}"b" | ---- text --- | {}"c" | ---- text --- | {}"d" | ---- text --- | {}"Force p checkpoint:" | | {}"a" | --- text --- | {}"c" | ---- text --- | {}"d" | --- return --- () diff --git a/test/results/resume from paragraph restore tags.ans b/test/results/resume from paragraph restore tags.ans index 73dede2..e496f76 100644 --- a/test/results/resume from paragraph restore tags.ans +++ b/test/results/resume from paragraph restore tags.ans @@ -3,17 +3,11 @@ | {"a":"a"}"a" | --- text --- | {"a":"a", "b":"b", "x":"x"}"c" | ---- text --- | {"a":"a"}"d" | ---- text --- | {}"e" | ---- text --- | {"a":"a", "b":"b", "c":"c", "x":"x"}"b" | ---- text --- | {"a":"a", "b":"b", "x":"x"}"c" | ---- text --- | {"a":"a"}"d" | ---- text --- | {}"e" | --- return --- () diff --git a/test/results/resume from paragraph with nested condition.ans b/test/results/resume from paragraph with nested condition.ans index a973669..cc035f9 100644 --- a/test/results/resume from paragraph with nested condition.ans +++ b/test/results/resume from paragraph with nested condition.ans @@ -1,11 +1,8 @@ --# run #-- --- text --- | {}"x" | ---- text --- | {}"x" | ---- text --- | {}"y" | ---- text --- | {}"x" | --- return --- () diff --git a/test/results/return children.ans b/test/results/return children.ans index 052e641..db2a19f 100644 --- a/test/results/return children.ans +++ b/test/results/return children.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"50" {}" = 50" | ---- text --- | {}"" {}"3" {}" = 3" | --- return --- () diff --git a/test/results/scope checkpoint mutable bis error.ans b/test/results/scope checkpoint mutable bis error.ans index 634a4e7..d6fa36b 100644 --- a/test/results/scope checkpoint mutable bis error.ans +++ b/test/results/scope checkpoint mutable bis error.ans @@ -1,17 +1,13 @@ --# run #-- --- text --- | {}"f1: " {}"*[1, *[99], 3]" {}" " {}"*[1, *[99], 3]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"REC" | ---- text --- | {}"f1: " {}"*[1, *[99], 3, 4]" {}" " {}"*[1, *[99], 3, 4]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"f2: " {}"*[1, *[99], 3, 4]" {}"" | ---- text --- | {}"CHECK 2" | --- error --- t @@ -28,7 +24,6 @@ --# post run check #-- --- text --- | {}"AFTER ERROR" | ---- text --- | {}"l: " {}"*[1, *[99], 3, 4]" {}"" | --- return --- () diff --git a/test/results/scope checkpoint mutable bis.ans b/test/results/scope checkpoint mutable bis.ans index 56368d7..e321806 100644 --- a/test/results/scope checkpoint mutable bis.ans +++ b/test/results/scope checkpoint mutable bis.ans @@ -1,33 +1,23 @@ --# run #-- --- text --- | {}"f1: " {}"*[1, *[99], 3]" {}" " {}"*[1, *[99], 3]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"REC" | ---- text --- | {}"f1: " {}"*[1, *[99], 3, 4]" {}" " {}"*[1, *[99], 3, 4]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"f2: " {}"*[1, *[99], 3, 4]" {}"" | ---- text --- | {}"CHECK 2" | --- text --- | {}"f3: " {}"*[1, *[99, 6], 3, 4, 5]" {}" " {}"*[1, *[99, 6], 3, 4, 5]" {}"" | ---- text --- | {}"END REC" | ---- text --- | {}"f2: " {}"*[1, *[99, 6], 3, 4, 5]" {}"" | ---- text --- | {}"CHECK 2" | --- text --- | {}"f3: " {}"*[1, *[99, 6, 7], 3, 4, 5, 6]" {}" " {}"*[1, *[99, 6, 7], 3, 4, 5, 6]" {}"" | ---- text --- | {}"FINAL" | ---- text --- | {}"l: " {}"*[1, *[99, 6, 7], 3, 4, 5, 6]" {}"" | ---- text --- | {}"x: " {}"*[99, 6, 7]" {}"" | --- return --- () diff --git a/test/results/scope checkpoint mutable error.ans b/test/results/scope checkpoint mutable error.ans index cee2945..926a4b1 100644 --- a/test/results/scope checkpoint mutable error.ans +++ b/test/results/scope checkpoint mutable error.ans @@ -1,13 +1,10 @@ --# run #-- --- text --- | {}"f1: " {}"*[1, 2]" {}" " {}"*[1, 2]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"REC" | ---- text --- | {}"f1: " {}"*[1, 2, 3]" {}" " {}"*[1, 2, 3]" {}"" | ---- text --- | {}"CHECK" | --- error --- t @@ -24,7 +21,6 @@ --# post run check #-- --- text --- | {}"AFTER ERROR" | ---- text --- | {}"l: " {}"*[1, 2, 3]" {}"" | --- return --- () diff --git a/test/results/scope checkpoint mutable ter error.ans b/test/results/scope checkpoint mutable ter error.ans index 57794f5..8880266 100644 --- a/test/results/scope checkpoint mutable ter error.ans +++ b/test/results/scope checkpoint mutable ter error.ans @@ -1,17 +1,13 @@ --# run #-- --- text --- | {}"f1: " {}"*[1, *[99], 3]" {}" " {}"*[1, *[99], 3]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"REC" | ---- text --- | {}"f1: " {}"*[1, *[99], 3, 4]" {}" " {}"*[1, *[99], 3, 4]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"f2: " {}"*[1, *[99, 12], 3, 4]" {}"" | ---- text --- | {}"CHECK 2" | --- error --- t @@ -28,7 +24,6 @@ --# post run check #-- --- text --- | {}"AFTER ERROR" | ---- text --- | {}"l: " {}"*[1, *[99, 12], 3, 4]" {}"" | --- return --- () diff --git a/test/results/scope checkpoint mutable ter.ans b/test/results/scope checkpoint mutable ter.ans index 3a44685..3542caf 100644 --- a/test/results/scope checkpoint mutable ter.ans +++ b/test/results/scope checkpoint mutable ter.ans @@ -1,33 +1,23 @@ --# run #-- --- text --- | {}"f1: " {}"*[1, *[99], 3]" {}" " {}"*[1, *[99], 3]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"REC" | ---- text --- | {}"f1: " {}"*[1, *[99], 3, 4]" {}" " {}"*[1, *[99], 3, 4]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"f2: " {}"*[1, *[99, 12], 3, 4]" {}"" | ---- text --- | {}"CHECK 2" | --- text --- | {}"f3: " {}"*[1, *[99, 12, 6], 3, 4, 5]" {}" " {}"*[1, *[99, 12, 6], 3, 4, 5]" {}"" | ---- text --- | {}"END REC" | ---- text --- | {}"f2: " {}"*[1, *[99, 12, 6, 12], 3, 4, 5]" {}"" | ---- text --- | {}"CHECK 2" | --- text --- | {}"f3: " {}"*[1, *[99, 12, 6, 12, 7], 3, 4, 5, 6]" {}" " {}"*[1, *[99, 12, 6, 12, 7], 3, 4, 5, 6]" {}"" | ---- text --- | {}"FINAL" | ---- text --- | {}"l: " {}"*[1, *[99, 12, 6, 12, 7], 3, 4, 5, 6]" {}"" | ---- text --- | {}"x: " {}"*[99, 12, 6, 12, 7]" {}"" | --- return --- () diff --git a/test/results/scope checkpoint mutable.ans b/test/results/scope checkpoint mutable.ans index 311396b..7bd8a03 100644 --- a/test/results/scope checkpoint mutable.ans +++ b/test/results/scope checkpoint mutable.ans @@ -1,23 +1,16 @@ --# run #-- --- text --- | {}"f1: " {}"*[1, 2]" {}" " {}"*[1, 2]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"REC" | ---- text --- | {}"f1: " {}"*[1, 2, 3]" {}" " {}"*[1, 2, 3]" {}"" | ---- text --- | {}"CHECK" | --- text --- | {}"f2: " {}"*[1, 2, 3, 4]" {}"" | ---- text --- | {}"END REC" | ---- text --- | {}"f2: " {}"*[1, 2, 3, 4, 5]" {}"" | ---- text --- | {}"FINAL" | ---- text --- | {}"l: " {}"*[1, 2, 3, 4, 5]" {}"" | --- return --- () diff --git a/test/results/seen checkpoint resume.ans b/test/results/seen checkpoint resume.ans index 2d82e07..7e8efff 100644 --- a/test/results/seen checkpoint resume.ans +++ b/test/results/seen checkpoint resume.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"a: " {}"0" {}"" | ---- text --- | {}"a: " {}"1" {}"" | ---- text --- | {}"a: " {}"2" {}"" | --- return --- () diff --git a/test/results/serialize.ans b/test/results/serialize.ans index 426c21e..ae7df95 100644 --- a/test/results/serialize.ans +++ b/test/results/serialize.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"" {}"43" {}"" | ---- text --- | {}"" {}"[2, \"\", 5]" {}"" | ---- text --- | {}"" {}"*{\"f\":\"b\", 1:2, 2:\"\", 3:\"ok\"}" {}"" | --- return --- () diff --git a/test/results/string escaping.ans b/test/results/string escaping.ans index c8e2149..8b499be 100644 --- a/test/results/string escaping.ans +++ b/test/results/string escaping.ans @@ -1,11 +1,8 @@ --# run #-- --- text --- | {}"expression " {}"a" {}"" | ---- text --- | {}"quote " {}"\"" {}"" | ---- text --- | {}"other codes " {}"\n" {}" " {}"\" {}" " {}"\t" {}" " {}"{" {}"braces}" | ---- text --- | {}"" {}"escaping expressions abc and {stuff} \ and quotes \"" {}"" | --- return --- () diff --git a/test/results/swap assignment.ans b/test/results/swap assignment.ans index d121217..a3b5d01 100644 --- a/test/results/swap assignment.ans +++ b/test/results/swap assignment.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"2" {}"" | ---- text --- | {}"" {}"1" {}"" | --- return --- () diff --git a/test/results/symbol alias constant.ans b/test/results/symbol alias constant.ans index 22a5526..4e0fbd2 100644 --- a/test/results/symbol alias constant.ans +++ b/test/results/symbol alias constant.ans @@ -2,7 +2,6 @@ --- text --- | {}"c=" {}"2" {}" (2)" | | {}"l=" {}"*[1, 2, 3]" {}" (*[1,2,3])" | ---- text --- | {}"d=" {}"2" {}" (2)" | --- error --- can not set d = 5; constant value check failed diff --git a/test/results/symbol alias exported.ans b/test/results/symbol alias exported.ans index 6be1c1d..1adc43e 100644 --- a/test/results/symbol alias exported.ans +++ b/test/results/symbol alias exported.ans @@ -2,7 +2,6 @@ --- text --- | {}"c=" {}"2" {}" (2)" | | {}"l=" {}"*[1, 2, 3]" {}" (*[1,2,3])" | ---- text --- | {}"c=" {}"5" {}" (5)" | | {}"l=" {}"*[1, 5, 3]" {}" (*[1,5,3])" | --- return --- diff --git a/test/results/symbol alias.ans b/test/results/symbol alias.ans index 6be1c1d..1adc43e 100644 --- a/test/results/symbol alias.ans +++ b/test/results/symbol alias.ans @@ -2,7 +2,6 @@ --- text --- | {}"c=" {}"2" {}" (2)" | | {}"l=" {}"*[1, 2, 3]" {}" (*[1,2,3])" | ---- text --- | {}"c=" {}"5" {}" (5)" | | {}"l=" {}"*[1, 5, 3]" {}" (*[1,5,3])" | --- return --- diff --git a/test/results/tag operator.ans b/test/results/tag operator.ans index 73415c5..bb50591 100644 --- a/test/results/tag operator.ans +++ b/test/results/tag operator.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"a " {1:5}"" {1:5}"b" {1:5}"" {}" c" | ---- text --- | {2:2}"a " {1:5, 2:2}"" {1:5, 2:2}"b" {1:5, 2:2}"" {2:2}" c" | --- return --- () diff --git a/test/results/text block.ans b/test/results/text block.ans index d8d5b44..bb606b2 100644 --- a/test/results/text block.ans +++ b/test/results/text block.ans @@ -2,7 +2,6 @@ --- text --- | {}"a" | | {}"b c" | ---- text --- | {}"a" | | {}"b c" | --- return --- diff --git a/test/results/text break.ans b/test/results/text break.ans index f1980de..5b7179d 100644 --- a/test/results/text break.ans +++ b/test/results/text break.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"a" | ---- text --- | {}"b c" | --- return --- () diff --git a/test/results/text escaping.ans b/test/results/text escaping.ans index 85a669f..b965243 100644 --- a/test/results/text escaping.ans +++ b/test/results/text escaping.ans @@ -1,13 +1,9 @@ --# run #-- --- text --- | {}"expression " {}"{" {}"a}" | ---- text --- | {}"quote " {}"\"" {}"" | ---- text --- | {}"other codes " {}"\n" {}" " {}"\" {}" " {}"\t" {}"" | ---- text --- | {}"decorators " {}"#" {}" tag " {}"~" {}" condition " {}"$" {}" fn" | ---- text --- | {}"sub " {}"[" {}"text]" | --- return --- () diff --git a/test/results/text line interpolation with choice event.ans b/test/results/text line interpolation with choice event.ans index 863be39..f6198b0 100644 --- a/test/results/text line interpolation with choice event.ans +++ b/test/results/text line interpolation with choice event.ans @@ -6,7 +6,6 @@ --- text --- | {}"ok" | | {}"Press " {}"()" {}" to jump." | ---- text --- | {1:1}"left" | --- choice --- => | {}"Surprise choice!" | diff --git a/test/results/translate context.ans b/test/results/translate context.ans index d4854ee..f139f9a 100644 --- a/test/results/translate context.ans +++ b/test/results/translate context.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"Hello" | ---- text --- | {}"Bonjour" | ---- text --- | {}"Hello" | --- return --- () diff --git a/test/results/translate string.ans b/test/results/translate string.ans index acff3db..9ce60a1 100644 --- a/test/results/translate string.ans +++ b/test/results/translate string.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"" {}"Hello" {}"" | ---- text --- | {}"" {}"Bonjour" {}"" | --- return --- () diff --git a/test/results/translate text attachblock.ans b/test/results/translate text attachblock.ans index 1aa9032..5376cc6 100644 --- a/test/results/translate text attachblock.ans +++ b/test/results/translate text attachblock.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"Hello" | ---- text --- | {}"Bonjour" | --- return --- () diff --git a/test/results/translate text.ans b/test/results/translate text.ans index 1aa9032..5376cc6 100644 --- a/test/results/translate text.ans +++ b/test/results/translate text.ans @@ -1,7 +1,6 @@ --# run #-- --- text --- | {}"Hello" | ---- text --- | {}"Bonjour" | --- return --- () diff --git a/test/results/unary operator overload.ans b/test/results/unary operator overload.ans index 7786fb8..ac6b01e 100644 --- a/test/results/unary operator overload.ans +++ b/test/results/unary operator overload.ans @@ -1,9 +1,7 @@ --# run #-- --- text --- | {}"" {}"-5" {}"" | ---- text --- | {}"" {}"minus lol" {}"" | ---- text --- | {}"" {}"generic minus" {}"" | --- return --- () diff --git a/test/results/while break.ans b/test/results/while break.ans index c11c779..de8b17e 100644 --- a/test/results/while break.ans +++ b/test/results/while break.ans @@ -1,17 +1,11 @@ --# run #-- --- text --- | {}"" {}"0" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"2" {}"" | ---- text --- | {}"" {}"3" {}"" | ---- text --- | {}"" {}"4" {}"" | ---- text --- | {}"" {}"5" {}"" | ---- text --- | {}"ok" | --- return --- () diff --git a/test/results/while continue.ans b/test/results/while continue.ans index af2ec2d..fd92f8e 100644 --- a/test/results/while continue.ans +++ b/test/results/while continue.ans @@ -1,15 +1,10 @@ --# run #-- --- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"2" {}"" | ---- text --- | {}"" {}"4" {}"" | ---- text --- | {}"" {}"5" {}"" | ---- text --- | {}"" {}"6" {}"" | ---- text --- | {}"ok" | --- return --- () diff --git a/test/results/while loop else.ans b/test/results/while loop else.ans index bf30bfd..dfa32b9 100644 --- a/test/results/while loop else.ans +++ b/test/results/while loop else.ans @@ -1,17 +1,11 @@ --# run #-- --- text --- | {}"Start with i=" {}"1" {}":" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"2" {}"" | ---- text --- | {}"" {}"3" {}"" | ---- text --- | {}"" {}"4" {}"" | ---- text --- | {}"Start with i=" {}"5" {}":" | ---- text --- | {}"Loop not ran." | --- return --- () diff --git a/test/results/while loop.ans b/test/results/while loop.ans index b0a3fca..72b7f3e 100644 --- a/test/results/while loop.ans +++ b/test/results/while loop.ans @@ -1,39 +1,22 @@ --# run #-- --- text --- | {}"" {}"0" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"2" {}"" | ---- text --- | {}"" {}"3" {}"" | ---- text --- | {}"" {}"4" {}"" | ---- text --- | {}"" {}"5" {}"" | ---- text --- | {}"" {}"6" {}"" | ---- text --- | {}"" {}"7" {}"" | ---- text --- | {}"" {}"8" {}"" | ---- text --- | {}"" {}"9" {}"" | ---- text --- | {}"" {}"10" {}"" | ---- text --- | {}"return in loop:" | ---- text --- | {}"" {}"0" {}"" | ---- text --- | {}"" {}"1" {}"" | ---- text --- | {}"" {}"2" {}"" | ---- text --- | {}"" {}"3" {}"" | ---- text --- | {}"" {}"4" {}"" | ---- text --- | {}"" {}"5" {}"" | --- return --- () diff --git a/test/tests/checkpoint merging mutable value.ans b/test/tests/checkpoint merging mutable value.ans index 62d8d2f..88cf32d 100644 --- a/test/tests/checkpoint merging mutable value.ans +++ b/test/tests/checkpoint merging mutable value.ans @@ -20,5 +20,6 @@ merge branch! l!insert(5) |1,2,3,4,5: {l} +--- error("cancel merge") diff --git a/test/tests/checkpoint merging variable.ans b/test/tests/checkpoint merging variable.ans index e0aa005..69d4bb9 100644 --- a/test/tests/checkpoint merging variable.ans +++ b/test/tests/checkpoint merging variable.ans @@ -20,5 +20,5 @@ merge branch! l = 4 |4: {l} - +--- error("cancel merge") diff --git a/test/tests/choice block.ans b/test/tests/choice block.ans index c07d5d9..6e6526d 100644 --- a/test/tests/choice block.ans +++ b/test/tests/choice block.ans @@ -3,7 +3,7 @@ | no *| ne | ok - +--- choice = 1 *| ho | plop diff --git a/test/tests/choice line interpolation with text event.ans b/test/tests/choice line interpolation with text event.ans index 69a6db9..d0cb5e7 100644 --- a/test/tests/choice line interpolation with text event.ans +++ b/test/tests/choice line interpolation with text event.ans @@ -11,7 +11,7 @@ *| No |ko :@choice = 1 - +--- *| Other |ok *| Use {move axis!} to move. diff --git a/test/tests/choice preserve tags.ans b/test/tests/choice preserve tags.ans index c217bde..ebb8eaf 100644 --- a/test/tests/choice preserve tags.ans +++ b/test/tests/choice preserve tags.ans @@ -8,11 +8,11 @@ f! *| c () - +--- "k":"v" # f! *| d () | e - +--- | f diff --git a/test/tests/choice with decorators.ans b/test/tests/choice with decorators.ans index 0fe4e27..de083a5 100644 --- a/test/tests/choice with decorators.ans +++ b/test/tests/choice with decorators.ans @@ -4,31 +4,31 @@ if(1) *| b | -> b :@choice = 1 - +--- if(1, $*| a) | -> a *| b | -> b choice = 2 - +--- if((), $*| a) | -> a *| b | -> b choice = 1 - +--- *| a | -> a 25 # *| b | -> b choice = 2 - +--- 12 # if((), $*| a) | -> a 3 # *| b | -> b choice = 1 - +--- 12 # if(1, $*| a) | -> a 3 # *| b diff --git a/test/tests/closure define nested.ans b/test/tests/closure define nested.ans index 35770b1..f213ed9 100644 --- a/test/tests/closure define nested.ans +++ b/test/tests/closure define nested.ans @@ -8,5 +8,5 @@ f.:x = 42 |{f.x} - +--- |{f.y} diff --git a/test/tests/constrained variable assignement.ans b/test/tests/constrained variable assignement.ans index 6ba40f2..6f8bd7b 100644 --- a/test/tests/constrained variable assignement.ans +++ b/test/tests/constrained variable assignement.ans @@ -5,7 +5,7 @@ weigh = 12!type("kg") |{weigh} - +--- weigh = 32 |{weigh} diff --git a/test/tests/exported variable nested.ans b/test/tests/exported variable nested.ans index 313fe7b..4ba66e8 100644 --- a/test/tests/exported variable nested.ans +++ b/test/tests/exported variable nested.ans @@ -8,5 +8,5 @@ f! |{x} - +--- |{z} diff --git a/test/tests/function custom type dispatch error.ans b/test/tests/function custom type dispatch error.ans index b7a764b..31d4b49 100644 --- a/test/tests/function custom type dispatch error.ans +++ b/test/tests/function custom type dispatch error.ans @@ -10,5 +10,5 @@ a("pierre"!type(french name)) a("idk"!type(esperanto name)) - +--- a(5!type("nope")) diff --git a/test/tests/list assignement.ans b/test/tests/list assignement.ans index 68d9ff4..2c82026 100644 --- a/test/tests/list assignement.ans +++ b/test/tests/list assignement.ans @@ -17,5 +17,5 @@ x(-1) = 12 x(3) = 99 |{x} - +--- x(5) = 0 diff --git a/test/tests/list index.ans b/test/tests/list index.ans index 2e4d0ee..9623ed6 100644 --- a/test/tests/list index.ans +++ b/test/tests/list index.ans @@ -7,5 +7,5 @@ |{x(2)} == {x(-2)} |{x(3)} == {x(-1)} - +--- |{x(-4)} diff --git a/test/tests/loop decorator.ans b/test/tests/loop decorator.ans index 9c771da..d2de4a8 100644 --- a/test/tests/loop decorator.ans +++ b/test/tests/loop decorator.ans @@ -1,5 +1,5 @@ :i = 0 while($()(i += 1; i <= 10), $| {i} |!) - +--- |{i} diff --git a/test/tests/nested flush.ans b/test/tests/nested flush.ans index b86ba80..24e6acf 100644 --- a/test/tests/nested flush.ans +++ b/test/tests/nested flush.ans @@ -1,19 +1,19 @@ if(1) |a - +--- |b - +--- if(1) |c |d - +--- if(1) |e - +--- *| f () :@choice = 1 - +--- if(1) |g *| h diff --git a/test/tests/resume from paragraph with nested choice.ans b/test/tests/resume from paragraph with nested choice.ans index edefab3..a4d4560 100644 --- a/test/tests/resume from paragraph with nested choice.ans +++ b/test/tests/resume from paragraph with nested choice.ans @@ -11,7 +11,7 @@ *| b |-> b choice = 2 - + --- *| c |-> c choice=1 diff --git a/test/tests/symbol alias constant.ans b/test/tests/symbol alias constant.ans index 97dfb12..8565023 100644 --- a/test/tests/symbol alias constant.ans +++ b/test/tests/symbol alias constant.ans @@ -8,5 +8,5 @@ :&d::constant = "{l(2)}" | d={c} (2) - +--- d = 5 diff --git a/test/tests/text grouping.ans b/test/tests/text grouping.ans index 3de00c3..f17dedc 100644 --- a/test/tests/text grouping.ans +++ b/test/tests/text grouping.ans @@ -1,38 +1,38 @@ | A | A | A - +--- "group": 1 # | B | B | B - +--- "group": 1 # | C "group": 1 # | C "group": 3 # | D - +--- "group": 1 # | E "group": "j" # | F "group": 1 # | G - +--- "group": 1 # | H | I "group": 1 # | J - +--- "group": 1 # | K | L "not group": 1 # | L - +--- | M "group": "j" # | N diff --git a/test/tests/text line interpolation with event flush.ans b/test/tests/text line interpolation with event flush.ans index e636316..f868ac5 100644 --- a/test/tests/text line interpolation with event flush.ans +++ b/test/tests/text line interpolation with event flush.ans @@ -1,15 +1,15 @@ :$ jump button 1 # | A - + --- return! :$ move axis 1 # | left - + --- return(" joystick") | Press {jump button!} to jump. - +--- | Use {move axis!} to move. diff --git a/test/tests/text line interpolation with text event.ans b/test/tests/text line interpolation with text event.ans index 46a4d1e..22400cd 100644 --- a/test/tests/text line interpolation with text event.ans +++ b/test/tests/text line interpolation with text event.ans @@ -7,5 +7,5 @@ return(" joystick") | Press {jump button!} to jump. - +--- | Use {move axis!} to move.