From 420bb6abb4a95460b42a3bd8de94e9bfac9e73fa Mon Sep 17 00:00:00 2001 From: Danila Danko Date: Mon, 25 Nov 2024 22:19:26 +0300 Subject: [PATCH 1/4] fix(eo-phi-normalizer): printing comma-separated bindings --- eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs b/eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs index 728a8e475..3f7ba1aff 100644 --- a/eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs +++ b/eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs @@ -76,9 +76,13 @@ render d = rend 0 False (map ($ "") $ d []) "" ")" : ts -> onNewLine (i - 1) p . showChar ')' . new (i - 1) ts [";"] -> char ';' ";" : ts -> char ';' . new i ts - t : ts@(s : _) + t : ts@(s : ss) | closingOrPunctuation s -> - pending . showString t . rend i False ts + (pending . showString t) + . ( case s of + "," -> showChar ',' . new i ss + _ -> rend i False ts + ) t : ts -> pending . space t . rend i False ts [] -> id where From 99d066ef4fa377232689ae5a23ac9dc5c7ba0d1a Mon Sep 17 00:00:00 2001 From: Danila Danko Date: Mon, 25 Nov 2024 23:04:31 +0300 Subject: [PATCH 2/4] fix(eo-phi-normalizer): indentation of dispatch --- eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs b/eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs index 3f7ba1aff..b3af68c1f 100644 --- a/eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs +++ b/eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs @@ -76,6 +76,7 @@ render d = rend 0 False (map ($ "") $ d []) "" ")" : ts -> onNewLine (i - 1) p . showChar ')' . new (i - 1) ts [";"] -> char ';' ";" : ts -> char ';' . new i ts + "." : ts -> rend i p (" ." : ts) t : ts@(s : ss) | closingOrPunctuation s -> (pending . showString t) From f850e377b83f9c215c94d96977abf4b79fca69dd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 25 Nov 2024 20:12:24 +0000 Subject: [PATCH 3/4] Update Markdown files --- site/docs/src/eo-phi-normalizer/dataize.md | 222 ++++++++++----------- site/docs/src/eo-phi-normalizer/rewrite.md | 18 +- 2 files changed, 120 insertions(+), 120 deletions(-) diff --git a/site/docs/src/eo-phi-normalizer/dataize.md b/site/docs/src/eo-phi-normalizer/dataize.md index 62ebec0b5..c63df7c4a 100644 --- a/site/docs/src/eo-phi-normalizer/dataize.md +++ b/site/docs/src/eo-phi-normalizer/dataize.md @@ -91,7 +91,7 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -116,14 +116,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) @@ -140,14 +140,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -159,14 +159,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) @@ -182,14 +182,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -201,14 +201,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) @@ -224,14 +224,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float +.org.eolang.float Dataizing inside dispatch: ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -243,14 +243,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang +.org.eolang Dataizing inside dispatch: ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -262,14 +262,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org +.org Dataizing inside dispatch: ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -281,7 +281,7 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -300,7 +300,7 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -319,14 +319,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -338,14 +338,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) @@ -355,7 +355,7 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) -. plus ( +.plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -372,19 +372,19 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. c.times ( +.c.times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) -. plus ( +.plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -395,12 +395,12 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 40-39-00-00-00-00-00-00 ) ) -. times ( +.times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) -. plus ( +.plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -417,24 +417,24 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) -. times ( +.times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) -. plus ( +.plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -451,14 +451,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -470,23 +470,23 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) -. times ( +.times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) -. plus ( +.plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -503,14 +503,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -522,23 +522,23 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) -. times ( +.times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) -. plus ( +.plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -555,14 +555,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -574,23 +574,23 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) -. times ( +.times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) -. plus +.plus Dataizing inside dispatch: ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -602,14 +602,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -621,18 +621,18 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) -. times ( +.times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ @@ -649,14 +649,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -668,18 +668,18 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) -. times +.times Dataizing inside dispatch: ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -691,14 +691,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -710,14 +710,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) @@ -733,14 +733,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float +.org.eolang.float Dataizing inside dispatch: ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -752,14 +752,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang +.org.eolang Dataizing inside dispatch: ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -771,14 +771,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org +.org Dataizing inside dispatch: ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -790,7 +790,7 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -809,7 +809,7 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -828,14 +828,14 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ -. org.eolang.float ( +.org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -847,23 +847,23 @@ Evaluating lambda 'Package' : ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) -. times ( +.times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) -. plus ( +.plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -881,14 +881,14 @@ Dataized 'Package' siblings: ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.float ( + .org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -900,14 +900,14 @@ Dataized 'Package' siblings: ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ), @@ -922,14 +922,14 @@ Dataized 'Package' siblings: ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.float ( + .org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -941,23 +941,23 @@ Dataized 'Package' siblings: ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) - .times ( + .times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -998,14 +998,14 @@ eo-phi-normalizer dataize --recursive --rules eo-phi-normalizer/test/eo/phi/rule Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.float ( + .org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -1017,14 +1017,14 @@ eo-phi-normalizer dataize --recursive --rules eo-phi-normalizer/test/eo/phi/rule Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ), @@ -1039,14 +1039,14 @@ eo-phi-normalizer dataize --recursive --rules eo-phi-normalizer/test/eo/phi/rule Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.float ( + .org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -1058,23 +1058,23 @@ eo-phi-normalizer dataize --recursive --rules eo-phi-normalizer/test/eo/phi/rule Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) - .times ( + .times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -1107,7 +1107,7 @@ eo-phi-normalizer dataize --minimize-stuck-terms --recursive --enable-atom "Lorg Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -1138,7 +1138,7 @@ eo-phi-normalizer dataize --minimize-stuck-terms --recursive --disable-atom "Lor Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -1170,14 +1170,14 @@ cat celsius.phi | eo-phi-normalizer dataize --recursive --rules ./eo-phi-normali Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.float ( + .org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -1189,14 +1189,14 @@ cat celsius.phi | eo-phi-normalizer dataize --recursive --rules ./eo-phi-normali Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ), @@ -1211,14 +1211,14 @@ cat celsius.phi | eo-phi-normalizer dataize --recursive --rules ./eo-phi-normali Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.float ( + .org.eolang.float ( as-bytes ↦ ⟦ c ↦ Φ.org.eolang.float ( as-bytes ↦ Φ.org.eolang.bytes ( @@ -1230,23 +1230,23 @@ cat celsius.phi | eo-phi-normalizer dataize --recursive --rules ./eo-phi-normali Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ ), λ ⤍ Package ⟧ - .org.eolang.bytes ( + .org.eolang.bytes ( Δ ⤍ 40-39-00-00-00-00-00-00 ) ) - .times ( + .times ( x ↦ ⟦ Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ diff --git a/site/docs/src/eo-phi-normalizer/rewrite.md b/site/docs/src/eo-phi-normalizer/rewrite.md index 0c8fa326f..921416b92 100644 --- a/site/docs/src/eo-phi-normalizer/rewrite.md +++ b/site/docs/src/eo-phi-normalizer/rewrite.md @@ -74,7 +74,7 @@ Input: Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -96,7 +96,7 @@ Result 1 out of 1: Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -130,7 +130,7 @@ Input: Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -152,7 +152,7 @@ Result 1 out of 1: Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -171,12 +171,12 @@ eo-phi-normalizer rewrite --json --chain --rules ./eo-phi-normalizer/test/eo/phi ```json { - "input": "{\n ⟦\n c ↦ Φ.org.eolang.float (\n as-bytes ↦ Φ.org.eolang.bytes (\n Δ ⤍ 40-39-00-00-00-00-00-00\n )\n ),\n result ↦ ξ.c.times (\n x ↦ ⟦\n Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD\n ⟧\n )\n .plus (\n x ↦ ⟦\n Δ ⤍ 40-40-00-00-00-00-00-00\n ⟧\n ),\n λ ⤍ Package\n ⟧\n}", + "input": "{\n ⟦\n c ↦ Φ.org.eolang.float (\n as-bytes ↦ Φ.org.eolang.bytes (\n Δ ⤍ 40-39-00-00-00-00-00-00\n )\n ),\n result ↦ ξ.c.times (\n x ↦ ⟦\n Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD\n ⟧\n )\n .plus (\n x ↦ ⟦\n Δ ⤍ 40-40-00-00-00-00-00-00\n ⟧\n ),\n λ ⤍ Package\n ⟧\n}", "output": [ [ [ "Normal form", - "{\n ⟦\n c ↦ Φ.org.eolang.float (\n as-bytes ↦ Φ.org.eolang.bytes (\n Δ ⤍ 40-39-00-00-00-00-00-00\n )\n ),\n result ↦ ξ.c.times (\n x ↦ ⟦\n Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD\n ⟧\n )\n .plus (\n x ↦ ⟦\n Δ ⤍ 40-40-00-00-00-00-00-00\n ⟧\n ),\n λ ⤍ Package\n ⟧\n}" + "{\n ⟦\n c ↦ Φ.org.eolang.float (\n as-bytes ↦ Φ.org.eolang.bytes (\n Δ ⤍ 40-39-00-00-00-00-00-00\n )\n ),\n result ↦ ξ.c.times (\n x ↦ ⟦\n Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD\n ⟧\n )\n .plus (\n x ↦ ⟦\n Δ ⤍ 40-40-00-00-00-00-00-00\n ⟧\n ),\n λ ⤍ Package\n ⟧\n}" ] ] ] @@ -202,7 +202,7 @@ eo-phi-normalizer rewrite --single --rules ./eo-phi-normalizer/test/eo/phi/rules Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD ⟧ ) - .plus ( + .plus ( x ↦ ⟦ Δ ⤍ 40-40-00-00-00-00-00-00 ⟧ @@ -219,7 +219,7 @@ eo-phi-normalizer rewrite --single --json --rules ./eo-phi-normalizer/test/eo/ph ``` ```console -"{\n ⟦\n c ↦ Φ.org.eolang.float (\n as-bytes ↦ Φ.org.eolang.bytes (\n Δ ⤍ 40-39-00-00-00-00-00-00\n )\n ),\n result ↦ ξ.c.times (\n x ↦ ⟦\n Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD\n ⟧\n )\n .plus (\n x ↦ ⟦\n Δ ⤍ 40-40-00-00-00-00-00-00\n ⟧\n ),\n λ ⤍ Package\n ⟧\n}" +"{\n ⟦\n c ↦ Φ.org.eolang.float (\n as-bytes ↦ Φ.org.eolang.bytes (\n Δ ⤍ 40-39-00-00-00-00-00-00\n )\n ),\n result ↦ ξ.c.times (\n x ↦ ⟦\n Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD\n ⟧\n )\n .plus (\n x ↦ ⟦\n Δ ⤍ 40-40-00-00-00-00-00-00\n ⟧\n ),\n λ ⤍ Package\n ⟧\n}" ``` ### `--output-file FILE` @@ -238,5 +238,5 @@ cat celsius.phi | eo-phi-normalizer rewrite --single --json --rules ./eo-phi-nor ``` ```console -"{\n ⟦\n c ↦ Φ.org.eolang.float (\n as-bytes ↦ Φ.org.eolang.bytes (\n Δ ⤍ 40-39-00-00-00-00-00-00\n )\n ),\n result ↦ ξ.c.times (\n x ↦ ⟦\n Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD\n ⟧\n )\n .plus (\n x ↦ ⟦\n Δ ⤍ 40-40-00-00-00-00-00-00\n ⟧\n ),\n λ ⤍ Package\n ⟧\n}" +"{\n ⟦\n c ↦ Φ.org.eolang.float (\n as-bytes ↦ Φ.org.eolang.bytes (\n Δ ⤍ 40-39-00-00-00-00-00-00\n )\n ),\n result ↦ ξ.c.times (\n x ↦ ⟦\n Δ ⤍ 3F-FC-CC-CC-CC-CC-CC-CD\n ⟧\n )\n .plus (\n x ↦ ⟦\n Δ ⤍ 40-40-00-00-00-00-00-00\n ⟧\n ),\n λ ⤍ Package\n ⟧\n}" ``` From 8d93e6f1e69a975a6b814b752c330e32a2c4384e Mon Sep 17 00:00:00 2001 From: Danila Danko Date: Mon, 25 Nov 2024 23:18:30 +0300 Subject: [PATCH 4/4] fix(eo-phi-normalizer): test --- eo-phi-normalizer/test/eo/phi/from-eo/as-phi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo-phi-normalizer/test/eo/phi/from-eo/as-phi.yaml b/eo-phi-normalizer/test/eo/phi/from-eo/as-phi.yaml index c2146883a..979b11eb0 100644 --- a/eo-phi-normalizer/test/eo/phi/from-eo/as-phi.yaml +++ b/eo-phi-normalizer/test/eo/phi/from-eo/as-phi.yaml @@ -36,7 +36,7 @@ tests: φ ↦ Φ.org.eolang.as-phi ( α0 ↦ ξ ) - .length.gt ( + .length.gt ( α0 ↦ Φ.org.eolang.int ( α0 ↦ Φ.org.eolang.bytes ( Δ ⤍ 00-00-00-00-00-00-00-00