From 7821219f5794eb918ad7dfbffc071bdb6962fac2 Mon Sep 17 00:00:00 2001
From: Patrick Hammer <patham9@gmail.com>
Date: Wed, 11 Apr 2018 10:10:16 -0400
Subject: [PATCH] NAL8 tests updated, intermediate commit
---
nal/test/nal8.1.0.nal | 2 +-
nal/test/nal8.1.1.nal | 4 ++--
nal/test/nal8.1.10.nal | 2 +-
nal/test/nal8.1.11.nal | 4 ++--
nal/test/nal8.1.13.nal | 6 +++---
nal/test/nal8.1.14.nal | 4 ++--
nal/test/nal8.1.16.nal | 6 +++---
nal/test/nal8.1.17.nal | 6 +++---
nal/test/nal8.1.18.nal | 6 +++---
nal/test/nal8.1.19.nal | 8 ++++----
nal/test/nal8.1.2.nal | 2 +-
nal/test/nal8.1.20.nal | 2 +-
nal/test/nal8.1.23.nal | 8 ++++----
nal/test/nal8.1.24.nal | 6 +++---
nal/test/nal8.1.25.nal | 6 +++---
nal/test/nal8.1.27.nal | 6 +++---
nal/test/nal8.1.3.nal | 4 ++--
nal/test/nal8.1.4.nal | 4 ++--
nal/test/nal8.1.5.nal | 4 ++--
nal/test/nal8.1.7.nal | 2 +-
nal/test/nal8.1.8.nal | 4 ++--
nal/test/nal8.1.9.nal | 4 ++--
nal/test/nal8.2.1.nal | 4 ++--
nal/test/nal8.2.2.nal | 4 ++--
nal/test/nal8.2.3.nal | 4 ++--
nal/test/nal8.2.4.nal | 4 ++--
nal/test/nal8.3.0.nal | 4 ++--
nal/test/nal8.3.1.nal | 4 ++--
nal/test/nal8.3.2.nal | 4 ++--
nal/test/nal8.3.3.nal | 4 ++--
nal/test/nal8.3.4.nal | 4 ++--
nal/test/nal8.4.0.nal | 6 +++---
nal/test/nal8.4.1.nal | 4 ++--
nal/test/nal8.4.2.nal | 6 +++---
nal/test/nal8.4.3.nal | 6 +++---
nal/test/nal8.4.4.nal | 8 ++++----
nal/test/nal8.4.5.nal | 4 ++--
nal/test/nal8.4.6.nal | 6 +++---
nal/test/nal8.4.7.nal | 7 +++----
nal/test/nal8.5.0.nal | 6 +++---
nal/test/nal8.5.1.nal | 4 ++--
nal/test/nal8.5.2.nal | 6 +++---
nal/test/nal8.5.3.nal | 6 +++---
nal/test/nal8.5.4.nal | 4 ++--
nal/test/nal8.5.5.nal | 4 ++--
nal/test/nal8.5.6.nal | 6 +++---
nal/test/nal8.5.7.nal | 4 ++--
47 files changed, 111 insertions(+), 112 deletions(-)
diff --git a/nal/test/nal8.1.0.nal b/nal/test/nal8.1.0.nal
index 0f34c8aabc..f92772707d 100755
--- a/nal/test/nal8.1.0.nal
+++ b/nal/test/nal8.1.0.nal
@@ -2,5 +2,5 @@
<(&/,<(*,SELF,{t002}) --> hold>,<(*,SELF,{t001}) --> at>,<(*,{t001}) --> ^open>) =/> <{t001} --> [opened]>>.
20
-''outputMustContain('(&/,<(*,SELF,{t002}) --> hold>,<(*,SELF,{t001}) --> at>,<(*,{t001}) --> ^open>)! %1.00;0.81%')
+''outputMustContain('(&/,<(*,SELF,{t002}) --> hold>,<(*,SELF,{t001}) --> at>,(^open,{t001}))! %1.00;0.81%')
' working in GUI but not in testcase, maybe the following string needs some escapes? but where?
diff --git a/nal/test/nal8.1.1.nal b/nal/test/nal8.1.1.nal
index 9d3a764366..5dd170f9e8 100755
--- a/nal/test/nal8.1.1.nal
+++ b/nal/test/nal8.1.1.nal
@@ -1,4 +1,4 @@
********** [10 -> 11]:
- IN: (&/,<(*,SELF,{t002}) --> hold>,<(*,SELF,{t001}) --> at>,(^open,{t001}))!
-5
+(&/,<(*,SELF,{t002}) --> hold>,<(*,SELF,{t001}) --> at>,(^open,{t001}))!
+10
''outputMustContain('<(*,SELF,{t002}) --> hold>! %1.00;0.81%')
diff --git a/nal/test/nal8.1.10.nal b/nal/test/nal8.1.10.nal
index eddbd477a0..afbf37a396 100755
--- a/nal/test/nal8.1.10.nal
+++ b/nal/test/nal8.1.10.nal
@@ -1,5 +1,5 @@
<{t003} --> (/,at,SELF,_)>. :\:
<{t003} --> (/,on,{t002},_)>. :\:
33
-''outputMustContain('(&&,<#1 --> (/,at,SELF,_)>,<#1 --> (/,on,{t002},_)>). :\: %1.00;0.43%')
+''outputMustContain('(&&,<#1 --> (/,at,SELF,_)>,<#1 --> (/,on,{t002},_)>). :!-5: %1.00;0.81%')
diff --git a/nal/test/nal8.1.11.nal b/nal/test/nal8.1.11.nal
index 0bd3f01354..7b9fb84400 100755
--- a/nal/test/nal8.1.11.nal
+++ b/nal/test/nal8.1.11.nal
@@ -1,4 +1,4 @@
********** [21 -> 22]
- IN: (&|,<#1 --> (/,on,{t002},_)>,<#1 --> (/,at,SELF,_)>). :\:
+(&|,<#1 --> (/,on,{t002},_)>,<#1 --> (/,at,SELF,_)>). :\:
8
-''outputMustContain('(&|,<#1 --> (/,on,{t002},_)>,<(*,SELF,#1) --> at>). :\: %1.00;0.90%')
+''outputMustContain('(&|,<#1 --> (/,on,{t002},_)>,<(*,SELF,#1) --> at>). :!-5: %1.00;0.90%')
diff --git a/nal/test/nal8.1.13.nal b/nal/test/nal8.1.13.nal
index 484a93d4e6..a815f2f7f4 100755
--- a/nal/test/nal8.1.13.nal
+++ b/nal/test/nal8.1.13.nal
@@ -1,5 +1,5 @@
********** [23 + 06 -> 24]
- IN: (&|,<(*,{t002},#1) --> on>,<(*,SELF,#1) --> at>). :|:
- IN: <(&|,<(*,$1,$2) --> on>,<(*,SELF,$2) --> at>) =|> <(*,SELF,$1) --> reachable>>.
+(&|,<(*,{t002},#1) --> on>,<(*,SELF,#1) --> at>). :|:
+<(&|,<(*,$1,$2) --> on>,<(*,SELF,$2) --> at>) =|> <(*,SELF,$1) --> reachable>>.
260
-''outputMustContain('<(*,SELF,{t002}) --> reachable>. :|: %1.00;0.19%')
+''outputMustContain('<(*,SELF,{t002}) --> reachable>. :!0: %1.00;0.81%')
diff --git a/nal/test/nal8.1.14.nal b/nal/test/nal8.1.14.nal
index be877500d9..193be1d773 100755
--- a/nal/test/nal8.1.14.nal
+++ b/nal/test/nal8.1.14.nal
@@ -1,5 +1,5 @@
********** [24 + 12 -> 25]
- IN: <(*,SELF,{t002}) --> reachable>. :|:
- IN: (&/,<(*,SELF,{t002}) --> reachable>,(^pick,{t002}))!
+<(*,SELF,{t002}) --> reachable>. :|:
+(&/,<(*,SELF,{t002}) --> reachable>,(^pick,{t002}))!
45
''outputMustContain('(^pick,{t002})! %1.00;0.43%')
diff --git a/nal/test/nal8.1.16.nal b/nal/test/nal8.1.16.nal
index 80c7c3b56b..d58dc6f641 100755
--- a/nal/test/nal8.1.16.nal
+++ b/nal/test/nal8.1.16.nal
@@ -1,5 +1,5 @@
********** [24 + 05 -> 27]
- IN: <(*,SELF,{t002}) --> reachable>. :|:
- IN: <(&/,<(*,SELF,{t002}) --> reachable>,(^pick,{t002}))=/><(*,SELF,{t002}) --> hold>>.
+<(*,SELF,{t002}) --> reachable>. :|:
+<(&/,<(*,SELF,{t002}) --> reachable>,(^pick,{t002}))=/><(*,SELF,{t002}) --> hold>>.
1
-''outputMustContain('<(^pick,{t002}) =/> <(*,SELF,{t002}) --> hold>>. :\: %1.00;0.81%')
+''outputMustContain('<(^pick,{t002}) =/> <(*,SELF,{t002}) --> hold>>. :!0: %1.00;0.81%')
diff --git a/nal/test/nal8.1.17.nal b/nal/test/nal8.1.17.nal
index c47ab7dc82..125fddc96c 100755
--- a/nal/test/nal8.1.17.nal
+++ b/nal/test/nal8.1.17.nal
@@ -1,5 +1,5 @@
********** [26 + 27 -> 28]
- IN: (^pick,{t002}). :\:
- IN: <(^pick,{t002})=/><(*,SELF,{t002}) --> hold>>. :\:
+(^pick,{t002}). :\:
+<(^pick,{t002})=/><(*,SELF,{t002}) --> hold>>. :\:
20
-''outputMustContain('<(*,SELF,{t002}) --> hold>. :/: %1.00;0.43%')
+''outputMustContain('<(*,SELF,{t002}) --> hold>. :!0: %1.00;0.81%')
diff --git a/nal/test/nal8.1.18.nal b/nal/test/nal8.1.18.nal
index 009608d2bb..a838020b5e 100755
--- a/nal/test/nal8.1.18.nal
+++ b/nal/test/nal8.1.18.nal
@@ -1,5 +1,5 @@
' ********** [28 + 10 -> 29]
- IN: <(*,SELF,{t002}) --> hold>. :|:
- IN: (&/,<(*,SELF,{t002}) --> hold>,<(*,SELF,{t001}) --> at>,(^open,{t001}))!
+<(*,SELF,{t002}) --> hold>. :|:
+(&/,<(*,SELF,{t002}) --> hold>,+100,<(*,SELF,{t001}) --> at>,+100,(^open,{SELF},{t001}))!
30
-''outputMustContain('(&/,<(*,SELF,{t001}) --> at>,(^open,{t001}))! %1.00;0.43%')
+''outputMustContain('(&/,<(*,SELF,{t001}) --> at>,(^open,{SELF},{t001}))! :!0: %1.00;0.73%')
diff --git a/nal/test/nal8.1.19.nal b/nal/test/nal8.1.19.nal
index 82efdf3744..4771288127 100755
--- a/nal/test/nal8.1.19.nal
+++ b/nal/test/nal8.1.19.nal
@@ -1,5 +1,5 @@
********** [03 + 28 -> 30]
- IN: <(&/,<(*,SELF,{t002}) --> hold>,<(*,SELF,{t001}) --> at>,(^open,{t001}))=/><{t001} --> [opened]>>. %1.00;0.90% {0 : 1}
- IN: <(*,SELF,{t002}) --> hold>. :|:
-2
-''outputMustContain('<(&/,<(*,SELF,{t001}) --> at>,(^open,{t001})) =/> <{t001} --> [opened]>>. %1.00;0.43%')
+<(&/,<(*,SELF,{t002}) --> hold>,<(*,SELF,{t001}) --> at>,(^open,{SELF},{t001}))=/><{t001} --> [opened]>>. %1.00;0.90% {0 : 1}
+<(*,SELF,{t002}) --> hold>. :|:
+20
+''outputMustContain('<(&/,<(*,SELF,{t001}) --> at>,(^open,{SELF},{t001})) =/> <{t001} --> [opened]>>. %1.00;0.43%')
diff --git a/nal/test/nal8.1.2.nal b/nal/test/nal8.1.2.nal
index 5b0dee2446..57ac7e9a5c 100755
--- a/nal/test/nal8.1.2.nal
+++ b/nal/test/nal8.1.2.nal
@@ -1,4 +1,4 @@
********** [12 -> 13]:
- IN: (&/,<(*,SELF,{t002}) --> reachable>,(^pick,{t002}))!
+(&/,<(*,SELF,{t002}) --> reachable>,(^pick,{t002}))!
5
''outputMustContain('<(*,SELF,{t002}) --> reachable>! %1.00;0.81%')
diff --git a/nal/test/nal8.1.20.nal b/nal/test/nal8.1.20.nal
index 365e1e17d0..da3c11ff09 100755
--- a/nal/test/nal8.1.20.nal
+++ b/nal/test/nal8.1.20.nal
@@ -1,4 +1,4 @@
********** [29 -> 31]
- IN: (&/,<(*,SELF,{t001}) --> at>,(^open,{t001}))!
+(&/,<(*,SELF,{t001}) --> at>,(^open,{t001}))!
13
''outputMustContain('<(*,SELF,{t001}) --> at>! %1.00;0.81%')
diff --git a/nal/test/nal8.1.23.nal b/nal/test/nal8.1.23.nal
index c4424f5191..5b0aadd7f4 100755
--- a/nal/test/nal8.1.23.nal
+++ b/nal/test/nal8.1.23.nal
@@ -1,9 +1,9 @@
********** [33 + 09 -> 34]
- IN: (^go-to,{t001}). :\:
- IN: <(^go-to,$1)=/><(*,SELF,$1) --> at>>.
+(^go-to,{SELF},{t001}). :\:
+<(^go-to,{SELF},$1)=/><(*,{SELF},$1) --> at>>.
41
-IN: <(*,SELF,{t001}) --> at>? :\:
+IN: <(*,{SELF},{t001}) --> at>? :\:
140
-''outputMustContain('<(*,SELF,{t001}) --> at>. :\: %1.00;0.81%')
+''outputMustContain('<(*,{SELF},{t001}) --> at>. :!0: %1.00;0.81%')
diff --git a/nal/test/nal8.1.24.nal b/nal/test/nal8.1.24.nal
index 7618a51b6b..78035d34b0 100755
--- a/nal/test/nal8.1.24.nal
+++ b/nal/test/nal8.1.24.nal
@@ -1,5 +1,5 @@
********** [34 + 30 -> 35]
- IN: <(*,SELF,{t001}) --> at>. :|:
- IN: <(&/,<(*,SELF,{t001}) --> at>,(^open,{t001}))=/><{t001} --> [opened]>>. :|:
+<(*,SELF,{t001}) --> at>. :|:
+<(&/,<(*,SELF,{t001}) --> at>,+100,(^open,{t001}))=/><{t001} --> [opened]>>. :|:
20
-''outputMustContain('<(^open,{t001}) =/> <{t001} --> [opened]>>. :\: %1.00;0.43%')
+''outputMustContain('<(^open,{t001}) =/> <{t001} --> [opened]>>. :!100: %1.00;0.81%')
diff --git a/nal/test/nal8.1.25.nal b/nal/test/nal8.1.25.nal
index 0022f23dc0..64e96bed5e 100755
--- a/nal/test/nal8.1.25.nal
+++ b/nal/test/nal8.1.25.nal
@@ -1,5 +1,5 @@
********** [34 + 29 -> 36]
- IN: <(*,SELF,{t001}) --> at>. :|:
- IN: (&/,<(*,SELF,{t001}) --> at>,(^open,{t001}))!
+ <(*,SELF,{t001}) --> at>. :|:
+ (&/,<(*,SELF,{t001}) --> at>,(^open,{SELF},{t001}))!
25
-''outputMustContain('(^open,{t001})! %1.00;0.43%')
+''outputMustContain('(^open,{SELF},{t001})! %1.00;0.43%')
diff --git a/nal/test/nal8.1.27.nal b/nal/test/nal8.1.27.nal
index 95eecc5824..4d5b748ac4 100755
--- a/nal/test/nal8.1.27.nal
+++ b/nal/test/nal8.1.27.nal
@@ -1,5 +1,5 @@
********** [35 + 37 -> 38]
- IN: <(^open,{t001})=/><{t001} --> [opened]>>. :|:
- IN: (^open,{t001}). :|:
+<(^open,{SELF},{t001})=/><{t001} --> [opened]>>. :|:
+(^open,{SELF},{t001}). :|:
1
-''outputMustContain('<{t001} --> [opened]>. :/: %1.00;0.43%')
+''outputMustContain('<{t001} --> [opened]>. :!5: %1.00;0.81%')
diff --git a/nal/test/nal8.1.3.nal b/nal/test/nal8.1.3.nal
index a48b894ed8..61f298429b 100755
--- a/nal/test/nal8.1.3.nal
+++ b/nal/test/nal8.1.3.nal
@@ -1,5 +1,5 @@
********** [13 + 06 -> 14]:
- IN: <(*,SELF,{t002}) --> reachable>!
- IN: <(&|,<(*,$1,#2) --> on>,<(*,SELF,#2) --> at>)=|><(*,SELF,$1) --> reachable>>.
+<(*,SELF,{t002}) --> reachable>!
+<(&|,<(*,$1,#2) --> on>,<(*,SELF,#2) --> at>)=|><(*,SELF,$1) --> reachable>>.
10
''outputMustContain('(&|,<(*,SELF,#1) --> at>,<(*,{t002},#1) --> on>)! %1.00;0.81%')
diff --git a/nal/test/nal8.1.4.nal b/nal/test/nal8.1.4.nal
index 2935cd1b0a..309764c5c8 100755
--- a/nal/test/nal8.1.4.nal
+++ b/nal/test/nal8.1.4.nal
@@ -1,5 +1,5 @@
********** [07 + 14 -> 15]:
- IN: <(*,{t002},{t003}) --> on>. :|:
- IN: (&|,<(*,{t002},#1) --> on>,<(*,#1,SELF) --> at>)!
+<(*,{t002},{t003}) --> on>. :|:
+(&|,<(*,{t002},#1) --> on>,<(*,#1,SELF) --> at>)!
350
''outputMustContain('<(*,{t003},SELF) --> at>! :\: %1.00;0.81%')
diff --git a/nal/test/nal8.1.5.nal b/nal/test/nal8.1.5.nal
index 23dbbd9229..8eba9938a1 100755
--- a/nal/test/nal8.1.5.nal
+++ b/nal/test/nal8.1.5.nal
@@ -1,5 +1,5 @@
********** [15 + 09 -> 16]:
- IN: <(*,SELF,{t003}) --> at>!
- IN: <(^go-to,$1)=/><(*,SELF,$1) --> at>>.
+<(*,SELF,{t003}) --> at>!
+<(^go-to,$1)=/><(*,SELF,$1) --> at>>.
100
''outputMustContain('(^go-to,{t003})! %1.00;0.81%')
diff --git a/nal/test/nal8.1.7.nal b/nal/test/nal8.1.7.nal
index 6b220c830b..0b39168398 100755
--- a/nal/test/nal8.1.7.nal
+++ b/nal/test/nal8.1.7.nal
@@ -1,4 +1,4 @@
<(*,{t003}) --> ^go-to>. :|:
<<(*,$1) --> ^go-to> =/> <(*,SELF,$1) --> at>>.
20
-''outputMustContain('<(*,SELF,{t003}) --> at>. :/: %1.00;0.81%')
+''outputMustContain('<(*,SELF,{t003}) --> at>. :!5: %1.00;0.81%')
diff --git a/nal/test/nal8.1.8.nal b/nal/test/nal8.1.8.nal
index 8abf6bea2f..55a1808183 100755
--- a/nal/test/nal8.1.8.nal
+++ b/nal/test/nal8.1.8.nal
@@ -1,4 +1,4 @@
********** [18 -> 19]
- IN: <SELF --> (/,at,_,{t003})>. :\:
+<SELF --> (/,at,_,{t003})>. :\:
6
-''outputMustContain('<{t003} --> (/,at,SELF,_)>. :\: %1.00;0.90%')
+''outputMustContain('<{t003} --> (/,at,SELF,_)>. :!-5: %1.00;0.90%')
diff --git a/nal/test/nal8.1.9.nal b/nal/test/nal8.1.9.nal
index a0301ed425..c4ecad7f1f 100755
--- a/nal/test/nal8.1.9.nal
+++ b/nal/test/nal8.1.9.nal
@@ -1,5 +1,5 @@
********** [07 -> 20]
- IN: <(*,{t002},{t003}) --> on>. :|:
+<(*,{t002},{t003}) --> on>. :|:
6
-''outputMustContain('<{t003} --> (/,on,{t002},_)>. :\: %1.00;0.90%')
+''outputMustContain('<{t003} --> (/,on,{t002},_)>. :!0: %1.00;0.90%')
diff --git a/nal/test/nal8.2.1.nal b/nal/test/nal8.2.1.nal
index ef9fe78dd3..9c598148ab 100644
--- a/nal/test/nal8.2.1.nal
+++ b/nal/test/nal8.2.1.nal
@@ -1,5 +1,5 @@
********** [10 + 05 -> 11]
- IN: <(&/,<(*,Self,{t002}) --> hold>,(^go-to,{t001}),(^open,{t001})) =/> <{t001} --> [opened]>>.
- IN: <(&/,<(*,Self,{t002}) --> reachable>,(^pick,{t002})) =/> <(*,Self,{t002}) --> hold>>.
+<(&/,<(*,Self,{t002}) --> hold>,(^go-to,{t001}),(^open,{t001})) =/> <{t001} --> [opened]>>.
+<(&/,<(*,Self,{t002}) --> reachable>,(^pick,{t002})) =/> <(*,Self,{t002}) --> hold>>.
40
''outputMustContain('<(&/,<(*,Self,{t002}) --> reachable>,(^pick,{t002}),(^go-to,{t001}),(^open,{t001})) =/> <{t001} --> [opened]>>. %1.00;0.81%')
diff --git a/nal/test/nal8.2.2.nal b/nal/test/nal8.2.2.nal
index 07a6ed318f..9b7e8683b9 100644
--- a/nal/test/nal8.2.2.nal
+++ b/nal/test/nal8.2.2.nal
@@ -1,6 +1,6 @@
********** [06 + 07 -> 12]
- IN: <(&|,<(*,$1,$2) --> on>,<(*,Self,$2) --> at>) =|> <(*,Self,$1) --> reachable>>.
- IN: <(*,{t002},{t003}) --> on>. :|:
+<(&|,<(*,$1,$2) --> on>,<(*,Self,$2) --> at>) =|> <(*,Self,$1) --> reachable>>.
+<(*,{t002},{t003}) --> on>. :|:
8
''outputMustContain('<<(*,Self,{t003}) --> at> =|> <(*,Self,{t002}) --> reachable>>. :\: %1.00;0.81%')
diff --git a/nal/test/nal8.2.3.nal b/nal/test/nal8.2.3.nal
index 240247b0b3..f1e7e5b627 100644
--- a/nal/test/nal8.2.3.nal
+++ b/nal/test/nal8.2.3.nal
@@ -1,5 +1,5 @@
********** [13 + 09 -> 14]
- IN: <(&/,<(*,Self,{t003}) --> at>,(^pick,{t002}),(^go-to,{t001}),(^open,{t001})) =/> <{t001} --> [opened]>>. :|:
- IN: <(^go-to,$1) =/> <(*,Self,$1) --> at>>.
+<(&/,<(*,Self,{t003}) --> at>,(^pick,{t002}),(^go-to,{t001}),(^open,{t001})) =/> <{t001} --> [opened]>>. :|:
+<(^go-to,$1) =/> <(*,Self,$1) --> at>>.
16
''outputMustContain('<(&/,(^go-to,{t003}),(^pick,{t002}),(^go-to,{t001}),(^open,{t001})) =/> <{t001} --> [opened]>>. %1.00;0.43%')
diff --git a/nal/test/nal8.2.4.nal b/nal/test/nal8.2.4.nal
index 85cf536586..86b45cbee5 100644
--- a/nal/test/nal8.2.4.nal
+++ b/nal/test/nal8.2.4.nal
@@ -1,5 +1,5 @@
********** [01 + 14 -> 15]
- IN: <{t001} --> [opened]>!
- IN: <(&/,(^go-to,{t003}),(^pick,{t002}),(^go-to,{t001}),(^open,{t001})) =/> <{t001} --> [opened]>>. :|:
+<{t001} --> [opened]>!
+<(&/,(^go-to,{t003}),(^pick,{t002}),(^go-to,{t001}),(^open,{t001})) =/> <{t001} --> [opened]>>. :|:
24
''outputMustContain('(&/,(^go-to,{t003}),(^pick,{t002}),(^go-to,{t001}),(^open,{t001}))! %1.00;0.43%')
diff --git a/nal/test/nal8.3.0.nal b/nal/test/nal8.3.0.nal
index d374240614..e23eff3120 100644
--- a/nal/test/nal8.3.0.nal
+++ b/nal/test/nal8.3.0.nal
@@ -1,6 +1,6 @@
********** [01 + 06 -> 10]:
- IN: <{t001} --> [opened]>!
- IN: <(&/,<(*,Self,{t001}) --> at>,(^break,{t001})) =/> <{t001} --> [opened]>>.
+<{t001} --> [opened]>!
+<(&/,<(*,Self,{t001}) --> at>,(^break,{t001})) =/> <{t001} --> [opened]>>.
28
''outputMustContain('(&/,<(*,Self,{t001}) --> at>,(^break,{t001}))! %1.00;0.81%')
diff --git a/nal/test/nal8.3.1.nal b/nal/test/nal8.3.1.nal
index 9202078d62..e243a8cc22 100644
--- a/nal/test/nal8.3.1.nal
+++ b/nal/test/nal8.3.1.nal
@@ -1,6 +1,6 @@
********** [10 + 07 -> 11]:
- IN: (&/,<(*,Self,{t001}) --> at>,(^break,{t001}))!
- IN: <(*,Self,{t001}) --> at>. :|:
+(&/,<(*,Self,{t001}) --> at>,(^break,{t001}))!
+<(*,Self,{t001}) --> at>. :|:
25
''outputMustContain('(^break,{t001})! %1.00;0.43%')
diff --git a/nal/test/nal8.3.2.nal b/nal/test/nal8.3.2.nal
index c7b468b5fe..84bbd03f95 100644
--- a/nal/test/nal8.3.2.nal
+++ b/nal/test/nal8.3.2.nal
@@ -1,6 +1,6 @@
********** [09 + 08 -> 12]:
- IN: <(^break,$1) =/> <$1 --> [damaged]>>.
- IN: <{t001} --> [damaged]>!
+<(^break,$1) =/> <$1 --> [damaged]>>.
+<{t001} --> [damaged]>!
17
''outputMustContain('(^break,{t001})! %1.00;0.81%')
diff --git a/nal/test/nal8.3.3.nal b/nal/test/nal8.3.3.nal
index d2bf5783a3..3b1067d4d4 100644
--- a/nal/test/nal8.3.3.nal
+++ b/nal/test/nal8.3.3.nal
@@ -1,7 +1,7 @@
********** [12 + 11 -> 13]:
- IN: (^break,{t001})! %0.00;0.86%
+(^break,{t001})! %0.00;0.86%
1
- IN: (^break,{t001})! %1.00;0.73%
+(^break,{t001})! %1.00;0.73%
1
''outputMustContain('(^break,{t001})! %0.31;0.90%')
diff --git a/nal/test/nal8.3.4.nal b/nal/test/nal8.3.4.nal
index 4cad258dce..f8457d0383 100644
--- a/nal/test/nal8.3.4.nal
+++ b/nal/test/nal8.3.4.nal
@@ -1,6 +1,6 @@
********** [13 + 14 -> 15]:
- IN: (^break,{t001})! %0.31;0.89%
+(^break,{t001})! %0.31;0.89%
1
- IN: (^break,{t001})! %1.00;0.95%
+(^break,{t001})! %1.00;0.95%
1
''outputMustContain('(^break,{t001})! %0.79;0.96%')
diff --git a/nal/test/nal8.4.0.nal b/nal/test/nal8.4.0.nal
index d6e0e96078..271c490bee 100644
--- a/nal/test/nal8.4.0.nal
+++ b/nal/test/nal8.4.0.nal
@@ -1,6 +1,6 @@
********** [04 + 03 -> 05]:
- IN: <(*,Self,key001) --> reachable>. :|:
- IN: <(&/,<(*,Self,key001) --> reachable>,(^pick,key001)) =/> <(*,Self,key001) --> hold>>.
+<(*,Self,key001) --> reachable>. :|:
+<(&/,<(*,Self,key001) --> reachable>,(^pick,key001)) =/> <(*,Self,key001) --> hold>>.
1
-''outputMustContain('<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :\: %1.00;0.81%')
+''outputMustContain('<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :!0: %1.00;0.81%')
diff --git a/nal/test/nal8.4.1.nal b/nal/test/nal8.4.1.nal
index c7b8a5a257..c3e329ff2d 100644
--- a/nal/test/nal8.4.1.nal
+++ b/nal/test/nal8.4.1.nal
@@ -1,6 +1,6 @@
********** [05 + 01 -> 06]:
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|:
- IN: <(*,Self,key001) --> hold>!
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|:
+<(*,Self,key001) --> hold>!
8
''outputMustContain('(^pick,key001)! %1.00;0.43%')
diff --git a/nal/test/nal8.4.2.nal b/nal/test/nal8.4.2.nal
index ff4aa7b672..7c062ea8b9 100644
--- a/nal/test/nal8.4.2.nal
+++ b/nal/test/nal8.4.2.nal
@@ -1,6 +1,6 @@
********** [07 + 05 -> 08]:
- IN: (^pick,key001). :\:
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>.
+(^pick,key001). :\:
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>.
15
-''outputMustContain('<(*,Self,key001) --> hold>. :\: %1.00;0.81%')
+''outputMustContain('<(*,Self,key001) --> hold>. :!0: %1.00;0.81%')
diff --git a/nal/test/nal8.4.3.nal b/nal/test/nal8.4.3.nal
index 509828eb0f..ec4b6e5880 100644
--- a/nal/test/nal8.4.3.nal
+++ b/nal/test/nal8.4.3.nal
@@ -1,6 +1,6 @@
********** [08 + 09 -> 10]:
- IN: <(*,Self,key001) --> hold>. :|: %1.00;0.81%
+<(*,Self,key001) --> hold>. :|: %1.00;0.81%
1
- IN: <(*,Self,key001) --> hold>. :|:
+<(*,Self,key001) --> hold>. :|:
5
-''outputMustContain('<(*,Self,key001) --> hold>. :|: %1.00;0.93%')
+''outputMustContain('<(*,Self,key001) --> hold>. :!1: %1.00;0.93%%')
diff --git a/nal/test/nal8.4.4.nal b/nal/test/nal8.4.4.nal
index bf3a638f0b..c8a1318aeb 100644
--- a/nal/test/nal8.4.4.nal
+++ b/nal/test/nal8.4.4.nal
@@ -1,10 +1,10 @@
********** [02 + 10 -> 11]:
- IN: <(*,Self,key001) --> hold>. :|: %0%
+<(*,Self,key001) --> hold>. :|: %0%
5
- IN: <(*,Self,key001) --> hold>. :|: %1.00;0.91%
+<(*,Self,key001) --> hold>. :|: %1.00;0.91%
5
- IN: <(*,Self,key001) --> hold>? :|:
+<(*,Self,key001) --> hold>? :|:
50
-''outputMustContain('<(*,Self,key001) --> hold>. :\: %0.53;0.95%')
+''outputMustContain('<(*,Self,key001) --> hold>. :!5: %0.53;0.95%')
diff --git a/nal/test/nal8.4.5.nal b/nal/test/nal8.4.5.nal
index e78beaae1b..341ce6950a 100644
--- a/nal/test/nal8.4.5.nal
+++ b/nal/test/nal8.4.5.nal
@@ -1,7 +1,7 @@
********** [07 + 11 -> 12]:
- IN: (^pick,key001). :\:
- IN: <(*,Self,key001) --> hold>. :|:
+(^pick,key001). :\:
+<(*,Self,key001) --> hold>. :|:
5
''outputMustContain('<(&/,(^pick,key001),+3) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.45%')
'adjusted +2 to +3
\ No newline at end of file
diff --git a/nal/test/nal8.4.6.nal b/nal/test/nal8.4.6.nal
index 37679e366a..4f77df983c 100644
--- a/nal/test/nal8.4.6.nal
+++ b/nal/test/nal8.4.6.nal
@@ -1,5 +1,5 @@
********** [05 + 12 -> 13]:
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>. :\: %1.00;0.90%
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>. :\: %1.00;0.45%
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :\: %1.00;0.90%
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :\: %1.00;0.45%
35
-''outputMustContain('<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :\: %1.00;0.91%')
+''outputMustContain('<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :!-5: %1.00;0.91%')
diff --git a/nal/test/nal8.4.7.nal b/nal/test/nal8.4.7.nal
index b221322510..daa365915f 100644
--- a/nal/test/nal8.4.7.nal
+++ b/nal/test/nal8.4.7.nal
@@ -1,9 +1,8 @@
********** [04 + 13 -> 14]:
- IN: <(*,Self,key001) --> reachable>. :|:
+<(*,Self,key001) --> reachable>. :|:
11
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|:
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|:
20
-''outputMustContain('<(&/,<(*,Self,key001) --> reachable>,+4,(^pick,key001)) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.45%')
-'adjusted +3 to +4
+''outputMustContain('<(&/,<(*,Self,key001) --> reachable>,+11,(^pick,key001)) =/> <(*,Self,key001) --> hold>>. :!11: %1.00;0.45%')
diff --git a/nal/test/nal8.5.0.nal b/nal/test/nal8.5.0.nal
index 9512b5ab60..e7c61ac48c 100644
--- a/nal/test/nal8.5.0.nal
+++ b/nal/test/nal8.5.0.nal
@@ -1,6 +1,6 @@
********** [03 + 04 -> 05]:
- IN: <(&/,<(*,Self,key001) --> reachable>,(^pick,key001)) =/> <(*,Self,key001) --> hold>>.
- IN: <(*,Self,key001) --> reachable>. :|:
+<(&/,<(*,Self,key001) --> reachable>,(^pick,key001)) =/> <(*,Self,key001) --> hold>>.
+<(*,Self,key001) --> reachable>. :|:
1
-''outputMustContain('<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :\: %1.00;0.81%')
+''outputMustContain('<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :!0: %1.00;0.81%')
diff --git a/nal/test/nal8.5.1.nal b/nal/test/nal8.5.1.nal
index 71d0282d74..2c5fe42d2d 100644
--- a/nal/test/nal8.5.1.nal
+++ b/nal/test/nal8.5.1.nal
@@ -1,6 +1,6 @@
********** [05 + 01 -> 06]:
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.81%
- IN: <(*,Self,key001) --> hold>!
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.81%
+<(*,Self,key001) --> hold>!
10
''outputMustContain('(^pick,key001)! %1.00;0.40%')
diff --git a/nal/test/nal8.5.2.nal b/nal/test/nal8.5.2.nal
index c78dcf6571..f8aeecdb85 100644
--- a/nal/test/nal8.5.2.nal
+++ b/nal/test/nal8.5.2.nal
@@ -1,6 +1,6 @@
********** [07 + 05 -> 08]:
- IN: (^pick,key001). :|:
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.81%
+(^pick,key001). :|:
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.81%
8
-''outputMustContain('<(*,Self,key001) --> hold>. :/: %1.00;0.38%')
+''outputMustContain('<(*,Self,key001) --> hold>. :!5: %1.00;0.73%')
diff --git a/nal/test/nal8.5.3.nal b/nal/test/nal8.5.3.nal
index fc9a2e380a..81c7d91294 100644
--- a/nal/test/nal8.5.3.nal
+++ b/nal/test/nal8.5.3.nal
@@ -1,7 +1,7 @@
********** [08 + 09 -> 10]:
- IN: <(*,Self,key001) --> hold>. :|: %1.00;0.73%
+<(*,Self,key001) --> hold>. :|: %1.00;0.73%
6
- IN: <(*,Self,key001) --> hold>. :|: %1.00;0.90%
+<(*,Self,key001) --> hold>. :|: %1.00;0.90%
10
-''outputMustContain('<(*,Self,key001) --> hold>. :|: %1.00;0.92%')
+''outputMustContain('<(*,Self,key001) --> hold>. :!6: %1.00;0.92%')
diff --git a/nal/test/nal8.5.4.nal b/nal/test/nal8.5.4.nal
index c22ada5529..3b960de11c 100644
--- a/nal/test/nal8.5.4.nal
+++ b/nal/test/nal8.5.4.nal
@@ -1,7 +1,7 @@
********** [07 + 09 -> 11]:
- IN: (^pick,key001). :|: %1.00;0.90%
+(^pick,key001). :|: %1.00;0.90%
11
- IN: <(*,Self,key001) --> hold>. :|:
+<(*,Self,key001) --> hold>. :|:
16
''outputMustContain('<(&/,(^pick,key001),+4) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.45%)
'adjusted +3 to +4 ^
diff --git a/nal/test/nal8.5.5.nal b/nal/test/nal8.5.5.nal
index 092b4e5fce..25164c9798 100644
--- a/nal/test/nal8.5.5.nal
+++ b/nal/test/nal8.5.5.nal
@@ -1,7 +1,7 @@
********** [05 + 11 -> 12]:
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.81% {0 : 0 : 1}
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.81% {0 : 0 : 1}
11
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.45% {1 : 1 : 2}
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.45% {1 : 1 : 2}
10
''outputMustContain('<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.84%')
diff --git a/nal/test/nal8.5.6.nal b/nal/test/nal8.5.6.nal
index cc7249e850..9100fd49d7 100644
--- a/nal/test/nal8.5.6.nal
+++ b/nal/test/nal8.5.6.nal
@@ -1,9 +1,9 @@
********** [04 + 12 -> 13]:
- IN: <(*,Self,key001) --> reachable>. :|:
+<(*,Self,key001) --> reachable>. :|:
11
- IN: <(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.84%
+<(^pick,key001) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.84%
17
-''outputMustContain('<(&/,<(*,Self,key001) --> reachable>,+4,(^pick,key001)) =/> <(*,Self,key001) --> hold>>. :|: %1.00;0.43%')
+''outputMustContain('<(&/,<(*,Self,key001) --> reachable>,+11,(^pick,key001)) =/> <(*,Self,key001) --> hold>>. :!11: %1.00;0.43%')
'adjusted +3 to +4
diff --git a/nal/test/nal8.5.7.nal b/nal/test/nal8.5.7.nal
index e5e301a669..2ae211d275 100644
--- a/nal/test/nal8.5.7.nal
+++ b/nal/test/nal8.5.7.nal
@@ -1,8 +1,8 @@
********** [03 + 13 -> 14]:
- IN: <(&/,<(*,Self,key001) --> reachable>,(^pick,key001)) =/> <(*,Self,key001) --> hold>>. %1.00;0.90%
+<(&/,<(*,Self,key001) --> reachable>,(^pick,key001)) =/> <(*,Self,key001) --> hold>>. %1.00;0.90%
1
- IN: <(&/,<(*,Self,key001) --> reachable>,(^pick,key001)) =/> <(*,Self,key001) --> hold>>. %1.00;0.43%
+<(&/,<(*,Self,key001) --> reachable>,(^pick,key001)) =/> <(*,Self,key001) --> hold>>. %1.00;0.43%
1
''outputMustContain('<(&/,<(*,Self,key001) --> reachable>,(^pick,key001)) =/> <(*,Self,key001) --> hold>>. %1.00;0.91%')
--
GitLab