runtime(algol68): Update syntax, support size prefixes in denotations

Explicitly match the LONG/SHORT size prefixes in integral, real and bits
denotations.

LONG/SHORT are matched as part of the denotation rather than as a mode.

closes: #20512

Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/syntax/algol68.vim b/runtime/syntax/algol68.vim
index 9f9611861d34856583e3be5eb209109999513c50..41b9797c5110eaef1bcb694812c9a3bc8539c0f2 100644 (file)
--- a/runtime/syntax/algol68.vim
+++ b/runtime/syntax/algol68.vim
@@ -3,7 +3,7 @@
 " Version:             0.4
 " Maintainer:          Janis Papanagnou
 " Previous Maintainer: NevilleD.ALGOL_68@sgr-a.net
-" Last Change:         2026 May 19
+" Last Change:         2026 Jun 13
 
 if exists("b:current_syntax")
   finish
@@ -41,7 +41,8 @@ syn keyword algol68Repeat     FOR FROM BY UPTO DOWNTO TO WHILE DO UNTIL OD
 syn keyword algol68Statement   PAR BEGIN END EXIT
 syn keyword algol68Struct      STRUCT
 syn keyword algol68PreProc     VECTOR
-syn keyword algol68Type                FLEX HEAP LOC LONG REF SHORT
+syn match   algol68Type                "\<\%(LONG\|SHORT\)\>"
+syn keyword algol68Type                FLEX HEAP LOC REF
 syn keyword algol68Type                VOID BOOL INT REAL COMPL CHAR STRING COMPLEX
 syn keyword algol68Type                BITS BYTES FILE CHANNEL PIPE SEMA SOUND
 syn keyword algol68Type                FORMAT STRUCT UNION 
@@ -120,16 +121,16 @@ syn match   algol68DefiningOperator       "\u[A-Z0-9]" contained
 syn match   algol68DefiningOperator    "[!%&+\-?^~][*/<=>]\?\%(:=\|=:\)\?" contained
 syn match   algol68DefiningOperator    "\%([!%&+\-?^~]\|[*/<=>]\)[*/<=>]\?\%(:=\|=:\)\?" contained
 
-syn match  algol68Number       "\<\d\+\%(\s\+\d\+\)*\>"
+syn match  algol68Number       "\<\%(\%(LONG\s\+\)\+\|\%(SHORT\s\+\)\+\)\=\d\+\%(\s\+\d\+\)*\>"
 
-syn match  algol68Float                "\c\.\d\+\%(\s\+\d\+\)*\%(\s*[e\\⏨]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\?\>"
-syn match  algol68Float                "\c\<\d\+\%(\s\+\d\+\)*\%(\s*[e\\⏨]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\>"
-syn match  algol68Float                "\c\<\d\+\%(\s\+\d\+\)*\s*\.\s*\d\+\%(\s\+\d\+\)*\%(\s*[e\\⏨]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\?\>"
+syn match  algol68Float                "\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=\.\d\+\%(\s\+\d\+\)*\%(\s*[eE\\⏨]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\?\>"
+syn match  algol68Float                "\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=\d\+\%(\s\+\d\+\)*\%(\s*[eE\\⏨]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\>"
+syn match  algol68Float                "\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=\d\+\%(\s\+\d\+\)*\s*\.\s*\d\+\%(\s\+\d\+\)*\%(\s*[eE\\⏨]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\?\>"
 
-syn match  algol68HexNumber    "\c\<2r\s*[01]\+\%(\s\+[01]\+\)*\>"
-syn match  algol68HexNumber    "\c\<4r\s*[0-3]\+\%(\s\+[0-3]\+\)*\>"
-syn match  algol68HexNumber    "\c\<8r\s*[0-7]\+\%(\s\+[0-7]\+\)*\>"
-syn match  algol68HexNumber    "\c\<16r\s*[0-9a-f]\+\%(\s\+[0-9a-f]\+\)*\>"
+syn match  algol68HexNumber    "\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=2[rR]\s*[01]\+\%(\s\+[01]\+\)*\>"
+syn match  algol68HexNumber    "\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=4[rR]\s*[0-3]\+\%(\s\+[0-3]\+\)*\>"
+syn match  algol68HexNumber    "\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=8[rR]\s*[0-7]\+\%(\s\+[0-7]\+\)*\>"
+syn match  algol68HexNumber    "\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=16[rR]\s*[0-9a-f]\+\%(\s\+[0-9a-f]\+\)*\>"
 
 
 syn region algol68Special      start="\$"  end="\$" contains=algol68String

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_00.dump b/runtime/syntax/testdir/dumps/algol68_denotations_00.dump
index 55331838a52ed4fb1492a72dc5153ee75d5ae17d..ba74ed835488b8e99a82fbe6a3006d63121797ae 100644 (file)
--- a/runtime/syntax/testdir/dumps/algol68_denotations_00.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_00.dump
@@ -14,7 +14,7 @@
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@65
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@64
 @75
-|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
-|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&| |0@2| |0@2| +0#0000000&@57
-@75
+|#+0#0000e05&| |s|i|z|e| |#| +0#0000000&@66
+|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|2| +0#0000000&@52
+@1|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|2| +0#0000000&@52
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_01.dump b/runtime/syntax/testdir/dumps/algol68_denotations_01.dump
index a265b14050ebe1898de3108235fb57bba441cd03..11cbc7c584c506a5148d097d7f1026a74f1e344d 100644 (file)
--- a/runtime/syntax/testdir/dumps/algol68_denotations_01.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_01.dump
@@ -1,20 +1,20 @@
 |I+0#00e0003#ffffff0|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@65
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@64
 @75
+|#+0#0000e05&| |s|i|z|e| |#| +0#0000000&@66
+|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|2| +0#0000000&@52
+@1>L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|2| +0#0000000&@52
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2| +0#0000000&@40
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| @1|L|O|N|G| |4|2| +0#0000000&@40
+@75
 |#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&| |0@2| |0@2| +0#0000000&@57
-> @74
+@75
 |#+0#0000e05&| |m|o|n|a|d|i|c| |o|p|e|r|a|t|o|r|s| |#| +0#0000000&@53
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|4+0#e000002&|2| +0#0000000&@63
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|4+0#e000002&|2| +0#0000000&@63
-@75
-@75
-|#+0#0000e05&| |R|E|A|L| |#| +0#0000000&@66
-@75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2| +0#0000000&@62
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2| +0#0000000&@60
-@75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|4|2| +0#0000000&@60
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|4|2| +0#0000000&@60
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|4|2| +0#0000000&@60
-@57|1|9|,|0|-|1| @7|1|3|%| 
+|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|S+0#e000002&|H|O|R|T| |4|2| +0#0000000&@51
+@1|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|-+0#af5f00255&|L+0#e000002&|O|N|G| |4|2| +0#0000000&@51
+|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|S+0#e000002&|H|O|R|T| |4|2| +0#0000000&@51
+@1|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|++0#af5f00255&|L+0#e000002&|O|N|G| |4|2| +0#0000000&@51
+@57|1|9|,|2| @10|8|%| 

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_02.dump b/runtime/syntax/testdir/dumps/algol68_denotations_02.dump
index 15f03772d357009335155f9dba1eaa7e3bfe1031..5495e4489936a32b112c8ca0d96436fd4bf0544b 100644 (file)
--- a/runtime/syntax/testdir/dumps/algol68_denotations_02.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_02.dump
@@ -1,20 +1,20 @@
-|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|4|2| +0#0000000&@60
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|⏨|4|2| +0#0000000&@60
+| +0&#ffffff0|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|++0#af5f00255&|L+0#e000002&|O|N|G| |4|2| +0#0000000&@51
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2| +0#0000000&@39
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|-+0#af5f00255&|L+0#e000002&|O|N|G| |L|O|N|G| |4|2| +0#0000000&@39
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2| +0#0000000&@39
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|++0#af5f00255&|L+0#e000002&|O|N|G| |L|O|N|G| |4|2| +0#0000000&@39
+> @74
 @75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|-|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|-|4|2| +0#0000000&@59
->R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|-|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|⏨|-|4|2| +0#0000000&@59
+|#+0#0000e05&| |R|E|A|L| |#| +0#0000000&@66
 @75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|+|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|+|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|+|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|⏨|+|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2| +0#0000000&@62
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2| +0#0000000&@60
 @75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|⏨|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|4|2| +0#0000000&@60
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|4|2| +0#0000000&@60
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|4|2| +0#0000000&@60
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|⏨|4|2| +0#0000000&@60
 @75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|-|4|2| +0#0000000&@58
-@57|3|7|,|1| @9|3|1|%| 
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|-|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|-|4|2| +0#0000000&@59
+@57|3|7|,|0|-|1| @7|2|0|%| 

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_03.dump b/runtime/syntax/testdir/dumps/algol68_denotations_03.dump
index 37eb216d2ba6dbabc9a45c72943e453d41d4e6c8..d1f1dcd4e0f75758a9bffc21ff0d2144656e50b0 100644 (file)
--- a/runtime/syntax/testdir/dumps/algol68_denotations_03.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_03.dump
@@ -1,20 +1,20 @@
-|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|-|4|2| +0#0000000&@58
+|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|-|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|-|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|⏨|-|4|2| +0#0000000&@59
+@75
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|+|4|2| +0#0000000&@59
+>R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|+|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|+|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|⏨|+|4|2| +0#0000000&@59
+@75
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|⏨|4|2| +0#0000000&@59
+@75
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|-|4|2| +0#0000000&@58
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|-|4|2| +0#0000000&@58
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|-|4|2| +0#0000000&@58
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|⏨|-|4|2| +0#0000000&@58
 @75
->R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|+|4|2| +0#0000000&@58
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|+|4|2| +0#0000000&@58
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|+|4|2| +0#0000000&@58
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|⏨|+|4|2| +0#0000000&@58
-@75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|4|2| +0#0000000&@57
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|4|2| +0#0000000&@57
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|4|2| +0#0000000&@57
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|⏨|4|2| +0#0000000&@57
-@75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|-|4|2| +0#0000000&@56
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|-|4|2| +0#0000000&@56
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|-|4|2| +0#0000000&@56
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|⏨|-|4|2| +0#0000000&@56
-@57|5@1|,|1| @9|5|0|%| 
+@57|5@1|,|1| @9|3|2|%| 

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_04.dump b/runtime/syntax/testdir/dumps/algol68_denotations_04.dump
index 6b624935853cadf524b682b0dc7c1a9108d7519a..d02c5fbacdac42b6c5101e317953a0bbd252578d 100644 (file)
--- a/runtime/syntax/testdir/dumps/algol68_denotations_04.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_04.dump
@@ -1,20 +1,20 @@
-|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|⏨|-|4|2| +0#0000000&@56
+| +0&#ffffff0@74
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|+|4|2| +0#0000000&@58
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|+|4|2| +0#0000000&@58
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|+|4|2| +0#0000000&@58
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|⏨|+|4|2| +0#0000000&@58
+> @74
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|4|2| +0#0000000&@57
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|4|2| +0#0000000&@57
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|4|2| +0#0000000&@57
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|⏨|4|2| +0#0000000&@57
+@75
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|-|4|2| +0#0000000&@56
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|-|4|2| +0#0000000&@56
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|-|4|2| +0#0000000&@56
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|⏨|-|4|2| +0#0000000&@56
 @75
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|+|4|2| +0#0000000&@56
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|+|4|2| +0#0000000&@56
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|+|4|2| +0#0000000&@56
->R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|⏨|+|4|2| +0#0000000&@56
-@75
-|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |e| |+| |4| |2| +0#0000000&@48
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |\| |+| |4| |2| +0#0000000&@48
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |⏨| |+| |4| |2| +0#0000000&@48
-@75
-|#+0#0000e05&| |m|o|n|a|d|i|c| |o|p|e|r|a|t|o|r|s| |#| +0#0000000&@53
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|4+0#e000002&|2|.|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|4+0#e000002&|2|.|4|2| +0#0000000&@59
-@75
-@75
-|#+0#0000e05&| |B|I|T|S| |#| +0#0000000&@66
-@75
-@57|7|3|,|1| @9|6|8|%| 
+@57|7|3|,|0|-|1| @7|4|3|%| 

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_05.dump b/runtime/syntax/testdir/dumps/algol68_denotations_05.dump
index ff5020025051e275a60e64de29db7d04474e5873..541003ba1744c984e33b6f297c2f89eea192a3da 100644 (file)
--- a/runtime/syntax/testdir/dumps/algol68_denotations_05.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_05.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@74
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|2+0#e000002&|r|1|0|1|0|1|0| +0#0000000&@57
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|r|2@2| +0#0000000&@60
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|8+0#e000002&|r|5|2| +0#0000000&@61
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&|6|r|2|a| +0#0000000&@60
-> @74
-|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|2+0#e000002&|r| |1|0|1|0| |1|0|1|0| +0#0000000&@53
-@75
-|#+0#0000e05&| |u|n|m|a|t|c|h|e|d| |b|y| |b|a|d| |p|a|t@1|e|r|n| |i|n| |l|e|g|a|c|y| |v|e|r|s|i|o|n|s| |o|f| |s|y|n|t|a|x| |f|i|l|e| |#| +0#0000000&@12
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&|6|r|9@1| +0#0000000&@60
-@75
+|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|+|4|2| +0#0000000&@56
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|⏨|+|4|2| +0#0000000&@56
 @75
-|#+0#0000e05&| |S|T|R|I|N|G| |#| +0#0000000&@64
+|#+0#0000e05&| |s|i|z|e| |#| +0#0000000&@66
+|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |.|4|2| +0#0000000&@50
+>S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|2|.|4|2| +0#0000000&@48
+|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|2|e|4|2| +0#0000000&@48
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |.|4|2| +0#0000000&@50
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|2|.|4|2| +0#0000000&@48
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|2|e|4|2| +0#0000000&@48
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |.|4|2| +0#0000000&@38
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2|.|4|2| +0#0000000&@36
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2|e|4|2| +0#0000000&@36
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |.|4|2| +0#0000000&@38
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |4|2|.|4|2| +0#0000000&@36
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |4|2|e|4|2| +0#0000000&@36
 @75
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1| |B|a|r|"| +0#0000000&@54
-@75
-|#+0#0000e05&| |q|u|o|t|e| |e|s|c|a|p|e| |#| +0#0000000&@58
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@59
-@57|9|1|,|0|-|1| @7|8|6|%| 
+|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |e| |+| |4| |2| +0#0000000&@48
+@57|9|1|,|1| @9|5@1|%| 

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_06.dump b/runtime/syntax/testdir/dumps/algol68_denotations_06.dump
index 7b30e05a50bb7a6ef3048d0a53d87cbe2ad52cf8..5ecc6fa0306da7c1aa4b5335b051c98f4a30ada5 100644 (file)
--- a/runtime/syntax/testdir/dumps/algol68_denotations_06.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_06.dump
@@ -1,20 +1,20 @@
-|S+0#00e0003#ffffff0|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@59
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&| |"+0#e000e06&@1| +0#e000002&|"| +0#0000000&@57
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@56
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@56
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@53
-> @74
-|#+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |#| +0#0000000&@53
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|\+0#e000e06&| +0#0000000&@58
-| +0#e000002&|B|a|r|"| +0#0000000&@69
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|\| +0#0000000&@56
-|B+0#e000002&|a|r|"| +0#0000000&@70
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|\+0#e000e06&| +0#0000000&@58
-|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@68
+|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |e| |+| |4| |2| +0#0000000&@48
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |\| |+| |4| |2| +0#0000000&@48
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |⏨| |+| |4| |2| +0#0000000&@48
 @75
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|0|9|,|0|-|1| @6|B|o|t| 
+|#+0#0000e05&| |m|o|n|a|d|i|c| |o|p|e|r|a|t|o|r|s| |#| +0#0000000&@53
+>R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|4+0#e000002&|2|.|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|4+0#e000002&|2|.|4|2| +0#0000000&@59
+|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|S+0#e000002&|H|O|R|T| |4|2|.|4|2| +0#0000000&@47
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|-+0#af5f00255&|L+0#e000002&|O|N|G| |4|2|.|4|2| +0#0000000&@47
+|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|S+0#e000002&|H|O|R|T| |4|2|.|4|2| +0#0000000&@47
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|++0#af5f00255&|L+0#e000002&|O|N|G| |4|2|.|4|2| +0#0000000&@47
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2|.|4|2| +0#0000000&@35
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|-+0#af5f00255&|L+0#e000002&|O|N|G| |L|O|N|G| |4|2|.|4|2| +0#0000000&@35
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2|.|4|2| +0#0000000&@35
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|++0#af5f00255&|L+0#e000002&|O|N|G| |L|O|N|G| |4|2|.|4|2| +0#0000000&@35
+@75
+@75
+|#+0#0000e05&| |B|I|T|S| |#| +0#0000000&@66
+@75
+@57|1|0|9|,|1| @8|6|7|%| 

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_07.dump b/runtime/syntax/testdir/dumps/algol68_denotations_07.dump
new file mode 100644 (file)
index 0000000..4247736
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_07.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@74
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|2+0#e000002&|r|1|0|1|0|1|0| +0#0000000&@57
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|r|2@2| +0#0000000&@60
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|8+0#e000002&|r|5|2| +0#0000000&@61
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&|6|r|2|a| +0#0000000&@60
+> @74
+|#+0#0000e05&| |s|i|z|e| |#| +0#0000000&@66
+|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |2|r|1|0|1|0|1|0| +0#0000000&@45
+|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|r|2@2| +0#0000000&@48
+|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |8|r|5|2| +0#0000000&@49
+|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |1|6|r|2|a| +0#0000000&@48
+@1|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |2|r|1|0|1|0|1|0| +0#0000000&@45
+@1|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|r|2@2| +0#0000000&@48
+@1|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |8|r|5|2| +0#0000000&@49
+@1|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |1|6|r|2|a| +0#0000000&@48
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |2|r|1|0|1|0|1|0| +0#0000000&@33
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|r|2@2| +0#0000000&@36
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |8|r|5|2| +0#0000000&@37
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |1|6|r|2|a| +0#0000000&@36
+@57|1|2|7|,|0|-|1| @6|7|9|%| 

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_08.dump b/runtime/syntax/testdir/dumps/algol68_denotations_08.dump
new file mode 100644 (file)
index 0000000..acd9e02
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_08.dump
@@ -0,0 +1,20 @@
+|S+0#00e0003#ffffff0|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |1|6|r|2|a| +0#0000000&@36
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |2|r|1|0|1|0|1|0| +0#0000000&@33
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |4|r|2@2| +0#0000000&@36
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |8|r|5|2| +0#0000000&@37
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |1|6|r|2|a| +0#0000000&@36
+> @74
+@75
+|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|2+0#e000002&|r| |1|0|1|0| |1|0|1|0| +0#0000000&@53
+@75
+|#+0#0000e05&| |u|n|m|a|t|c|h|e|d| |b|y| |b|a|d| |p|a|t@1|e|r|n| |i|n| |l|e|g|a|c|y| |v|e|r|s|i|o|n|s| |o|f| |s|y|n|t|a|x| |f|i|l|e| |#| +0#0000000&@12
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&|6|r|9@1| +0#0000000&@60
+@75
+@75
+|#+0#0000e05&| |S|T|R|I|N|G| |#| +0#0000000&@64
+@75
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1| |B|a|r|"| +0#0000000&@54
+@75
+|#+0#0000e05&| |q|u|o|t|e| |e|s|c|a|p|e| |#| +0#0000000&@58
+@57|1|4|5|,|0|-|1| @6|9|0|%| 

diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_09.dump b/runtime/syntax/testdir/dumps/algol68_denotations_09.dump
new file mode 100644 (file)
index 0000000..9f32f20
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_09.dump
@@ -0,0 +1,20 @@
+|#+0#0000e05#ffffff0| |q|u|o|t|e| |e|s|c|a|p|e| |#| +0#0000000&@58
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@59
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&| |"+0#e000e06&@1| +0#e000002&|"| +0#0000000&@57
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@56
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@56
+>S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@53
+@75
+|#+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |#| +0#0000000&@53
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|\+0#e000e06&| +0#0000000&@58
+| +0#e000002&|B|a|r|"| +0#0000000&@69
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|\| +0#0000000&@56
+|B+0#e000002&|a|r|"| +0#0000000&@70
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|\+0#e000e06&| +0#0000000&@58
+|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@68
+@75
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|6|3|,|1| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/input/algol68_denotations.a68 b/runtime/syntax/testdir/input/algol68_denotations.a68
index f3ff57b976161b637ec799e986c5a4dd2ff4feb2..0cd8c6e6eb318ada4d7e0d12f0ed9af58dd262f0 100644 (file)
--- a/runtime/syntax/testdir/input/algol68_denotations.a68
+++ b/runtime/syntax/testdir/input/algol68_denotations.a68
@@ -14,12 +14,26 @@ BOOL x = FALSE
 INT x = 0
 INT x = 42
 
+# size #
+SHORT INT x = SHORT 42
+ LONG INT x =  LONG 42
+SHORT SHORT INT x = SHORT SHORT 42
+  LONG LONG INT x =  LONG  LONG 42
+
 # whitespace #
 INT x = 1 000 000
 
 # monadic operators #
 INT x = -42
 INT x = +42
+SHORT INT x = +SHORT 42
+ LONG INT x =  -LONG 42
+SHORT INT x = -SHORT 42
+ LONG INT x =  +LONG 42
+SHORT SHORT INT x = +SHORT SHORT 42
+  LONG LONG INT x =   -LONG LONG 42
+SHORT SHORT INT x = -SHORT SHORT 42
+  LONG LONG INT x =   +LONG LONG 42
 
 
 # REAL #
@@ -72,6 +86,20 @@ REAL x = 42.42E+42
 REAL x = 42.42\+42
 REAL x = 42.42⏨+42
 
+# size #
+SHORT REAL x = SHORT .42
+SHORT REAL x = SHORT 42.42
+SHORT REAL x = SHORT 42e42
+ LONG REAL x =  LONG .42
+ LONG REAL x =  LONG 42.42
+ LONG REAL x =  LONG 42e42
+SHORT SHORT REAL x = SHORT SHORT .42
+SHORT SHORT REAL x = SHORT SHORT 42.42
+SHORT SHORT REAL x = SHORT SHORT 42e42
+  LONG LONG REAL x =   LONG LONG .42
+  LONG LONG REAL x =   LONG LONG 42.42
+  LONG LONG REAL x =   LONG LONG 42e42
+
 # whitespace #
 REAL x = 4 2 . 4 2 e + 4 2
 REAL x = 4 2 . 4 2 \ + 4 2
@@ -80,6 +108,14 @@ REAL x = 4 2 . 4 2 ⏨ + 4 2
 # monadic operators #
 REAL x = -42.42
 REAL x = +42.42
+SHORT REAL x = +SHORT 42.42
+ LONG REAL x =  -LONG 42.42
+SHORT REAL x = -SHORT 42.42
+ LONG REAL x =  +LONG 42.42
+SHORT SHORT REAL x = +SHORT SHORT 42.42
+  LONG LONG REAL x =   -LONG LONG 42.42
+SHORT SHORT REAL x = -SHORT SHORT 42.42
+  LONG LONG REAL x =   +LONG LONG 42.42
 
 
 # BITS #
@@ -89,6 +125,25 @@ BITS x = 4r222
 BITS x = 8r52
 BITS x = 16r2a
 
+# size #
+SHORT BITS x = SHORT 2r101010
+SHORT BITS x = SHORT 4r222
+SHORT BITS x = SHORT 8r52
+SHORT BITS x = SHORT 16r2a
+ LONG BITS x =  LONG 2r101010
+ LONG BITS x =  LONG 4r222
+ LONG BITS x =  LONG 8r52
+ LONG BITS x =  LONG 16r2a
+SHORT SHORT BITS x = SHORT SHORT 2r101010
+SHORT SHORT BITS x = SHORT SHORT 4r222
+SHORT SHORT BITS x = SHORT SHORT 8r52
+SHORT SHORT BITS x = SHORT SHORT 16r2a
+  LONG LONG BITS x =   LONG LONG 2r101010
+  LONG LONG BITS x =   LONG LONG 4r222
+  LONG LONG BITS x =   LONG LONG 8r52
+  LONG LONG BITS x =   LONG LONG 16r2a
+
+
 # whitespace #
 BITS x = 2r 1010 1010