diff --git a/docs/src/manpage.md b/docs/src/manpage.md
index e1a0ac63a..3153b20a2 100644
--- a/docs/src/manpage.md
+++ b/docs/src/manpage.md
@@ -3354,5 +3354,5 @@ MILLER(1) MILLER(1)
- 2023-03-27 MILLER(1)
+ 2023-04-15 MILLER(1)
diff --git a/docs/src/manpage.txt b/docs/src/manpage.txt
index 17b05732b..9317002fb 100644
--- a/docs/src/manpage.txt
+++ b/docs/src/manpage.txt
@@ -3333,4 +3333,4 @@ MILLER(1) MILLER(1)
- 2023-03-27 MILLER(1)
+ 2023-04-15 MILLER(1)
diff --git a/docs/src/reference-dsl-time.md b/docs/src/reference-dsl-time.md
index cd6210ec5..680057fb1 100644
--- a/docs/src/reference-dsl-time.md
+++ b/docs/src/reference-dsl-time.md
@@ -136,7 +136,7 @@ Regardless, if you specify an invalid timezone, you'll be clearly notified:
mlr --from example.csv --tz This/Is/A/Typo cat
-mlr : unknown time zone This/Is/A/Typo
+mlr: TZ environment variable appears malformed: "This/Is/A/Typo"
diff --git a/internal/pkg/mlrval/mlrval_infer.go b/internal/pkg/mlrval/mlrval_infer.go
index 0e8df93e5..cf28bd260 100644
--- a/internal/pkg/mlrval/mlrval_infer.go
+++ b/internal/pkg/mlrval/mlrval_infer.go
@@ -142,6 +142,9 @@ func inferHexInt(mv *Mlrval) *Mlrval {
if mv.printrep[0] == '-' {
input = mv.printrep[3:]
negate = true
+ } else if mv.printrep[0] == '+' {
+ input = mv.printrep[3:]
+ negate = false
} else {
input = mv.printrep[2:]
negate = false
@@ -207,6 +210,9 @@ func inferBaseInt(mv *Mlrval, base int) *Mlrval {
if mv.printrep[0] == '-' {
input = mv.printrep[3:]
negate = true
+ } else if mv.printrep[0] == '+' {
+ input = mv.printrep[3:]
+ negate = false
} else {
input = mv.printrep[2:]
negate = false
diff --git a/internal/pkg/scan/find.go b/internal/pkg/scan/find.go
index d3a911205..1de423f30 100644
--- a/internal/pkg/scan/find.go
+++ b/internal/pkg/scan/find.go
@@ -37,6 +37,9 @@ func FindScanType(sinput string) ScanType {
if i0 == '-' {
return findScanTypePositiveNumberOrString(input[1:])
}
+ if i0 == '+' {
+ return findScanTypePositiveNumberOrString(input[1:])
+ }
if i0 >= '0' && i0 <= '9' {
return findScanTypePositiveNumberOrString(input)
}
diff --git a/man/manpage.txt b/man/manpage.txt
index 17b05732b..9317002fb 100644
--- a/man/manpage.txt
+++ b/man/manpage.txt
@@ -3333,4 +3333,4 @@ MILLER(1) MILLER(1)
- 2023-03-27 MILLER(1)
+ 2023-04-15 MILLER(1)
diff --git a/man/mlr.1 b/man/mlr.1
index 1c50f0b02..70b2e85e5 100644
--- a/man/mlr.1
+++ b/man/mlr.1
@@ -2,12 +2,12 @@
.\" Title: mlr
.\" Author: [see the "AUTHOR" section]
.\" Generator: ./mkman.rb
-.\" Date: 2023-03-27
+.\" Date: 2023-04-15
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "MILLER" "1" "2023-03-27" "\ \&" "\ \&"
+.TH "MILLER" "1" "2023-04-15" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Portability definitions
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/test/cases/dsl-pythonic-division/0001/expout b/test/cases/dsl-pythonic-division/0001/expout
index 757d2c861..0d4b67d06 100644
--- a/test/cases/dsl-pythonic-division/0001/expout
+++ b/test/cases/dsl-pythonic-division/0001/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot 7.12000000
iquot 7.00000000
mod 1.20000000
diff --git a/test/cases/dsl-pythonic-division/0002/expout b/test/cases/dsl-pythonic-division/0002/expout
index 60b88f2fa..b4e98b21a 100644
--- a/test/cases/dsl-pythonic-division/0002/expout
+++ b/test/cases/dsl-pythonic-division/0002/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot 7.50000000
iquot 7
mod 5
diff --git a/test/cases/dsl-pythonic-division/0003/expout b/test/cases/dsl-pythonic-division/0003/expout
index 4e12a72ab..584de6648 100644
--- a/test/cases/dsl-pythonic-division/0003/expout
+++ b/test/cases/dsl-pythonic-division/0003/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot -7.12000000
iquot -8.00000000
mod 8.80000000
diff --git a/test/cases/dsl-pythonic-division/0004/expout b/test/cases/dsl-pythonic-division/0004/expout
index 29d184588..a41c5440a 100644
--- a/test/cases/dsl-pythonic-division/0004/expout
+++ b/test/cases/dsl-pythonic-division/0004/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot -7.50000000
iquot -8
mod 5
diff --git a/test/cases/dsl-pythonic-division/0005/expout b/test/cases/dsl-pythonic-division/0005/expout
index 757d2c861..0d4b67d06 100644
--- a/test/cases/dsl-pythonic-division/0005/expout
+++ b/test/cases/dsl-pythonic-division/0005/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot 7.12000000
iquot 7.00000000
mod 1.20000000
diff --git a/test/cases/dsl-pythonic-division/0006/expout b/test/cases/dsl-pythonic-division/0006/expout
index 60b88f2fa..b4e98b21a 100644
--- a/test/cases/dsl-pythonic-division/0006/expout
+++ b/test/cases/dsl-pythonic-division/0006/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot 7.50000000
iquot 7
mod 5
diff --git a/test/cases/dsl-pythonic-division/0007/expout b/test/cases/dsl-pythonic-division/0007/expout
index 4e12a72ab..584de6648 100644
--- a/test/cases/dsl-pythonic-division/0007/expout
+++ b/test/cases/dsl-pythonic-division/0007/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot -7.12000000
iquot -8.00000000
mod 8.80000000
diff --git a/test/cases/dsl-pythonic-division/0008/expout b/test/cases/dsl-pythonic-division/0008/expout
index 29d184588..a41c5440a 100644
--- a/test/cases/dsl-pythonic-division/0008/expout
+++ b/test/cases/dsl-pythonic-division/0008/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot -7.50000000
iquot -8
mod 5
diff --git a/test/cases/dsl-pythonic-division/0009/expout b/test/cases/dsl-pythonic-division/0009/expout
index 3513bb680..9fa54f8c7 100644
--- a/test/cases/dsl-pythonic-division/0009/expout
+++ b/test/cases/dsl-pythonic-division/0009/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot -7.12000000
iquot -8.00000000
mod -8.80000000
diff --git a/test/cases/dsl-pythonic-division/0010/expout b/test/cases/dsl-pythonic-division/0010/expout
index 32c71f536..5596fb0d0 100644
--- a/test/cases/dsl-pythonic-division/0010/expout
+++ b/test/cases/dsl-pythonic-division/0010/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot -7.50000000
iquot -8
mod -5
diff --git a/test/cases/dsl-pythonic-division/0011/expout b/test/cases/dsl-pythonic-division/0011/expout
index ebc436b6f..2e6752035 100644
--- a/test/cases/dsl-pythonic-division/0011/expout
+++ b/test/cases/dsl-pythonic-division/0011/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot 7.12000000
iquot 7.00000000
mod -1.20000000
diff --git a/test/cases/dsl-pythonic-division/0012/expout b/test/cases/dsl-pythonic-division/0012/expout
index 2f7fac631..14033d7b8 100644
--- a/test/cases/dsl-pythonic-division/0012/expout
+++ b/test/cases/dsl-pythonic-division/0012/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot 7.50000000
iquot 7
mod -5
diff --git a/test/cases/dsl-pythonic-division/0013/expout b/test/cases/dsl-pythonic-division/0013/expout
index 3513bb680..9fa54f8c7 100644
--- a/test/cases/dsl-pythonic-division/0013/expout
+++ b/test/cases/dsl-pythonic-division/0013/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot -7.12000000
iquot -8.00000000
mod -8.80000000
diff --git a/test/cases/dsl-pythonic-division/0014/expout b/test/cases/dsl-pythonic-division/0014/expout
index 32c71f536..5596fb0d0 100644
--- a/test/cases/dsl-pythonic-division/0014/expout
+++ b/test/cases/dsl-pythonic-division/0014/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot -7.50000000
iquot -8
mod -5
diff --git a/test/cases/dsl-pythonic-division/0015/expout b/test/cases/dsl-pythonic-division/0015/expout
index ebc436b6f..2e6752035 100644
--- a/test/cases/dsl-pythonic-division/0015/expout
+++ b/test/cases/dsl-pythonic-division/0015/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot 7.12000000
iquot 7.00000000
mod -1.20000000
diff --git a/test/cases/dsl-pythonic-division/0016/expout b/test/cases/dsl-pythonic-division/0016/expout
index 2f7fac631..14033d7b8 100644
--- a/test/cases/dsl-pythonic-division/0016/expout
+++ b/test/cases/dsl-pythonic-division/0016/expout
@@ -1,13 +1,17 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
quot 7.50000000
iquot 7
mod -5
diff --git a/test/cases/dsl-type-inference/0001/expout b/test/cases/dsl-type-inference/0001/expout
index 8cf2af4f0..8906da73f 100644
--- a/test/cases/dsl-type-inference/0001/expout
+++ b/test/cases/dsl-type-inference/0001/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 151
diff --git a/test/cases/dsl-type-inference/0002/expout b/test/cases/dsl-type-inference/0002/expout
index d1eb241e1..20f27bee3 100644
--- a/test/cases/dsl-type-inference/0002/expout
+++ b/test/cases/dsl-type-inference/0002/expout
@@ -1,10 +1,14 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
diff --git a/test/cases/dsl-type-inference/0004/expout b/test/cases/dsl-type-inference/0004/expout
index dbd293b55..8fa6fcc01 100644
--- a/test/cases/dsl-type-inference/0004/expout
+++ b/test/cases/dsl-type-inference/0004/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 71.20000000
diff --git a/test/cases/dsl-type-inference/0005/expout b/test/cases/dsl-type-inference/0005/expout
index dbd293b55..8fa6fcc01 100644
--- a/test/cases/dsl-type-inference/0005/expout
+++ b/test/cases/dsl-type-inference/0005/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 71.20000000
diff --git a/test/cases/dsl-type-inference/0006/expout b/test/cases/dsl-type-inference/0006/expout
index 919b9e0e9..9e4b4b56e 100644
--- a/test/cases/dsl-type-inference/0006/expout
+++ b/test/cases/dsl-type-inference/0006/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0.00000000
diff --git a/test/cases/dsl-type-inference/0007/expout b/test/cases/dsl-type-inference/0007/expout
index 21c2d6ce3..2cd2d946e 100644
--- a/test/cases/dsl-type-inference/0007/expout
+++ b/test/cases/dsl-type-inference/0007/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 75
diff --git a/test/cases/dsl-type-inference/0008/expout b/test/cases/dsl-type-inference/0008/expout
index 21c2d6ce3..2cd2d946e 100644
--- a/test/cases/dsl-type-inference/0008/expout
+++ b/test/cases/dsl-type-inference/0008/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 75
diff --git a/test/cases/dsl-type-inference/0009/expout b/test/cases/dsl-type-inference/0009/expout
index d5e8fbcd2..94d02c77b 100644
--- a/test/cases/dsl-type-inference/0009/expout
+++ b/test/cases/dsl-type-inference/0009/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0
diff --git a/test/cases/dsl-type-inference/0010/expout b/test/cases/dsl-type-inference/0010/expout
index dbd293b55..8fa6fcc01 100644
--- a/test/cases/dsl-type-inference/0010/expout
+++ b/test/cases/dsl-type-inference/0010/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 71.20000000
diff --git a/test/cases/dsl-type-inference/0011/expout b/test/cases/dsl-type-inference/0011/expout
index dbd293b55..8fa6fcc01 100644
--- a/test/cases/dsl-type-inference/0011/expout
+++ b/test/cases/dsl-type-inference/0011/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 71.20000000
diff --git a/test/cases/dsl-type-inference/0012/expout b/test/cases/dsl-type-inference/0012/expout
index 919b9e0e9..9e4b4b56e 100644
--- a/test/cases/dsl-type-inference/0012/expout
+++ b/test/cases/dsl-type-inference/0012/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0.00000000
diff --git a/test/cases/dsl-type-inference/0013/expout b/test/cases/dsl-type-inference/0013/expout
index 21c2d6ce3..2cd2d946e 100644
--- a/test/cases/dsl-type-inference/0013/expout
+++ b/test/cases/dsl-type-inference/0013/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 75
diff --git a/test/cases/dsl-type-inference/0014/expout b/test/cases/dsl-type-inference/0014/expout
index 21c2d6ce3..2cd2d946e 100644
--- a/test/cases/dsl-type-inference/0014/expout
+++ b/test/cases/dsl-type-inference/0014/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 75
diff --git a/test/cases/dsl-type-inference/0015/expout b/test/cases/dsl-type-inference/0015/expout
index d5e8fbcd2..94d02c77b 100644
--- a/test/cases/dsl-type-inference/0015/expout
+++ b/test/cases/dsl-type-inference/0015/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0
diff --git a/test/cases/dsl-type-inference/0016/expout b/test/cases/dsl-type-inference/0016/expout
index 1848bb44d..d336fc72e 100644
--- a/test/cases/dsl-type-inference/0016/expout
+++ b/test/cases/dsl-type-inference/0016/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 72.00000000
diff --git a/test/cases/dsl-type-inference/0017/expout b/test/cases/dsl-type-inference/0017/expout
index d04c62db8..10feae7d4 100644
--- a/test/cases/dsl-type-inference/0017/expout
+++ b/test/cases/dsl-type-inference/0017/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -71.00000000
diff --git a/test/cases/dsl-type-inference/0018/expout b/test/cases/dsl-type-inference/0018/expout
index 919b9e0e9..9e4b4b56e 100644
--- a/test/cases/dsl-type-inference/0018/expout
+++ b/test/cases/dsl-type-inference/0018/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0.00000000
diff --git a/test/cases/dsl-type-inference/0019/expout b/test/cases/dsl-type-inference/0019/expout
index 21c2d6ce3..2cd2d946e 100644
--- a/test/cases/dsl-type-inference/0019/expout
+++ b/test/cases/dsl-type-inference/0019/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 75
diff --git a/test/cases/dsl-type-inference/0020/expout b/test/cases/dsl-type-inference/0020/expout
index ea1874d15..de73aa4a7 100644
--- a/test/cases/dsl-type-inference/0020/expout
+++ b/test/cases/dsl-type-inference/0020/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -75
diff --git a/test/cases/dsl-type-inference/0021/expout b/test/cases/dsl-type-inference/0021/expout
index d5e8fbcd2..94d02c77b 100644
--- a/test/cases/dsl-type-inference/0021/expout
+++ b/test/cases/dsl-type-inference/0021/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0
diff --git a/test/cases/dsl-type-inference/0022/expout b/test/cases/dsl-type-inference/0022/expout
index 05403c566..4521d8b5f 100644
--- a/test/cases/dsl-type-inference/0022/expout
+++ b/test/cases/dsl-type-inference/0022/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 71.00000000
diff --git a/test/cases/dsl-type-inference/0023/expout b/test/cases/dsl-type-inference/0023/expout
index 9d9ada2c6..658d215a5 100644
--- a/test/cases/dsl-type-inference/0023/expout
+++ b/test/cases/dsl-type-inference/0023/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -72.00000000
diff --git a/test/cases/dsl-type-inference/0024/expout b/test/cases/dsl-type-inference/0024/expout
index 919b9e0e9..9e4b4b56e 100644
--- a/test/cases/dsl-type-inference/0024/expout
+++ b/test/cases/dsl-type-inference/0024/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0.00000000
diff --git a/test/cases/dsl-type-inference/0025/expout b/test/cases/dsl-type-inference/0025/expout
index 21c2d6ce3..2cd2d946e 100644
--- a/test/cases/dsl-type-inference/0025/expout
+++ b/test/cases/dsl-type-inference/0025/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 75
diff --git a/test/cases/dsl-type-inference/0026/expout b/test/cases/dsl-type-inference/0026/expout
index ea1874d15..de73aa4a7 100644
--- a/test/cases/dsl-type-inference/0026/expout
+++ b/test/cases/dsl-type-inference/0026/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -75
diff --git a/test/cases/dsl-type-inference/0027/expout b/test/cases/dsl-type-inference/0027/expout
index d5e8fbcd2..94d02c77b 100644
--- a/test/cases/dsl-type-inference/0027/expout
+++ b/test/cases/dsl-type-inference/0027/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0
diff --git a/test/cases/dsl-type-inference/0028/expout b/test/cases/dsl-type-inference/0028/expout
index 05403c566..4521d8b5f 100644
--- a/test/cases/dsl-type-inference/0028/expout
+++ b/test/cases/dsl-type-inference/0028/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 71.00000000
diff --git a/test/cases/dsl-type-inference/0029/expout b/test/cases/dsl-type-inference/0029/expout
index d04c62db8..10feae7d4 100644
--- a/test/cases/dsl-type-inference/0029/expout
+++ b/test/cases/dsl-type-inference/0029/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -71.00000000
diff --git a/test/cases/dsl-type-inference/0030/expout b/test/cases/dsl-type-inference/0030/expout
index 919b9e0e9..9e4b4b56e 100644
--- a/test/cases/dsl-type-inference/0030/expout
+++ b/test/cases/dsl-type-inference/0030/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0.00000000
diff --git a/test/cases/dsl-type-inference/0031/expout b/test/cases/dsl-type-inference/0031/expout
index 21c2d6ce3..2cd2d946e 100644
--- a/test/cases/dsl-type-inference/0031/expout
+++ b/test/cases/dsl-type-inference/0031/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 75
diff --git a/test/cases/dsl-type-inference/0032/expout b/test/cases/dsl-type-inference/0032/expout
index ea1874d15..de73aa4a7 100644
--- a/test/cases/dsl-type-inference/0032/expout
+++ b/test/cases/dsl-type-inference/0032/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -75
diff --git a/test/cases/dsl-type-inference/0033/expout b/test/cases/dsl-type-inference/0033/expout
index d5e8fbcd2..94d02c77b 100644
--- a/test/cases/dsl-type-inference/0033/expout
+++ b/test/cases/dsl-type-inference/0033/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0
diff --git a/test/cases/dsl-type-inference/0034/expout b/test/cases/dsl-type-inference/0034/expout
index 05403c566..4521d8b5f 100644
--- a/test/cases/dsl-type-inference/0034/expout
+++ b/test/cases/dsl-type-inference/0034/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 71.00000000
diff --git a/test/cases/dsl-type-inference/0035/expout b/test/cases/dsl-type-inference/0035/expout
index d04c62db8..10feae7d4 100644
--- a/test/cases/dsl-type-inference/0035/expout
+++ b/test/cases/dsl-type-inference/0035/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -71.00000000
diff --git a/test/cases/dsl-type-inference/0036/expout b/test/cases/dsl-type-inference/0036/expout
index 919b9e0e9..9e4b4b56e 100644
--- a/test/cases/dsl-type-inference/0036/expout
+++ b/test/cases/dsl-type-inference/0036/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0.00000000
diff --git a/test/cases/dsl-type-inference/0037/expout b/test/cases/dsl-type-inference/0037/expout
index 21c2d6ce3..2cd2d946e 100644
--- a/test/cases/dsl-type-inference/0037/expout
+++ b/test/cases/dsl-type-inference/0037/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 75
diff --git a/test/cases/dsl-type-inference/0038/expout b/test/cases/dsl-type-inference/0038/expout
index ea1874d15..de73aa4a7 100644
--- a/test/cases/dsl-type-inference/0038/expout
+++ b/test/cases/dsl-type-inference/0038/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -75
diff --git a/test/cases/dsl-type-inference/0039/expout b/test/cases/dsl-type-inference/0039/expout
index d5e8fbcd2..94d02c77b 100644
--- a/test/cases/dsl-type-inference/0039/expout
+++ b/test/cases/dsl-type-inference/0039/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0
diff --git a/test/cases/dsl-type-inference/0040/expout b/test/cases/dsl-type-inference/0040/expout
index 075dbac1d..37891f3c6 100644
--- a/test/cases/dsl-type-inference/0040/expout
+++ b/test/cases/dsl-type-inference/0040/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 1.00000000
diff --git a/test/cases/dsl-type-inference/0041/expout b/test/cases/dsl-type-inference/0041/expout
index 75c8f1d3e..b529f9d0f 100644
--- a/test/cases/dsl-type-inference/0041/expout
+++ b/test/cases/dsl-type-inference/0041/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -1.00000000
diff --git a/test/cases/dsl-type-inference/0042/expout b/test/cases/dsl-type-inference/0042/expout
index 919b9e0e9..9e4b4b56e 100644
--- a/test/cases/dsl-type-inference/0042/expout
+++ b/test/cases/dsl-type-inference/0042/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0.00000000
diff --git a/test/cases/dsl-type-inference/0043/expout b/test/cases/dsl-type-inference/0043/expout
index 2ddc9ce0e..5f9dc4dd2 100644
--- a/test/cases/dsl-type-inference/0043/expout
+++ b/test/cases/dsl-type-inference/0043/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 1
diff --git a/test/cases/dsl-type-inference/0044/expout b/test/cases/dsl-type-inference/0044/expout
index d3f11bcd4..361548a77 100644
--- a/test/cases/dsl-type-inference/0044/expout
+++ b/test/cases/dsl-type-inference/0044/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -1
diff --git a/test/cases/dsl-type-inference/0045/expout b/test/cases/dsl-type-inference/0045/expout
index d5e8fbcd2..94d02c77b 100644
--- a/test/cases/dsl-type-inference/0045/expout
+++ b/test/cases/dsl-type-inference/0045/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0
diff --git a/test/cases/dsl-type-inference/0046/expout b/test/cases/dsl-type-inference/0046/expout
index 075dbac1d..37891f3c6 100644
--- a/test/cases/dsl-type-inference/0046/expout
+++ b/test/cases/dsl-type-inference/0046/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 1.00000000
diff --git a/test/cases/dsl-type-inference/0047/expout b/test/cases/dsl-type-inference/0047/expout
index 75c8f1d3e..b529f9d0f 100644
--- a/test/cases/dsl-type-inference/0047/expout
+++ b/test/cases/dsl-type-inference/0047/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -1.00000000
diff --git a/test/cases/dsl-type-inference/0048/expout b/test/cases/dsl-type-inference/0048/expout
index 919b9e0e9..9e4b4b56e 100644
--- a/test/cases/dsl-type-inference/0048/expout
+++ b/test/cases/dsl-type-inference/0048/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0.00000000
diff --git a/test/cases/dsl-type-inference/0049/expout b/test/cases/dsl-type-inference/0049/expout
index 2ddc9ce0e..5f9dc4dd2 100644
--- a/test/cases/dsl-type-inference/0049/expout
+++ b/test/cases/dsl-type-inference/0049/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 1
diff --git a/test/cases/dsl-type-inference/0050/expout b/test/cases/dsl-type-inference/0050/expout
index d3f11bcd4..361548a77 100644
--- a/test/cases/dsl-type-inference/0050/expout
+++ b/test/cases/dsl-type-inference/0050/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y -1
diff --git a/test/cases/dsl-type-inference/0051/expout b/test/cases/dsl-type-inference/0051/expout
index d5e8fbcd2..94d02c77b 100644
--- a/test/cases/dsl-type-inference/0051/expout
+++ b/test/cases/dsl-type-inference/0051/expout
@@ -1,11 +1,15 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
y 0
diff --git a/test/cases/dsl-type-inference/0052/expout b/test/cases/dsl-type-inference/0052/expout
index d282edc75..23ffcd7dc 100644
--- a/test/cases/dsl-type-inference/0052/expout
+++ b/test/cases/dsl-type-inference/0052/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 71.20000000
max 73.40000000
diff --git a/test/cases/dsl-type-inference/0053/expout b/test/cases/dsl-type-inference/0053/expout
index 8e775a37e..6ed80cc36 100644
--- a/test/cases/dsl-type-inference/0053/expout
+++ b/test/cases/dsl-type-inference/0053/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 71.20000000
max 76.00000000
diff --git a/test/cases/dsl-type-inference/0054/expout b/test/cases/dsl-type-inference/0054/expout
index a60a32a63..677f5dc52 100644
--- a/test/cases/dsl-type-inference/0054/expout
+++ b/test/cases/dsl-type-inference/0054/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 73.40000000
max 75.00000000
diff --git a/test/cases/dsl-type-inference/0055/expout b/test/cases/dsl-type-inference/0055/expout
index c643ab352..98397d62a 100644
--- a/test/cases/dsl-type-inference/0055/expout
+++ b/test/cases/dsl-type-inference/0055/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 75
max 76
diff --git a/test/cases/dsl-type-inference/0056/expout b/test/cases/dsl-type-inference/0056/expout
index d282edc75..23ffcd7dc 100644
--- a/test/cases/dsl-type-inference/0056/expout
+++ b/test/cases/dsl-type-inference/0056/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 71.20000000
max 73.40000000
diff --git a/test/cases/dsl-type-inference/0057/expout b/test/cases/dsl-type-inference/0057/expout
index 8e775a37e..6ed80cc36 100644
--- a/test/cases/dsl-type-inference/0057/expout
+++ b/test/cases/dsl-type-inference/0057/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 71.20000000
max 76.00000000
diff --git a/test/cases/dsl-type-inference/0058/expout b/test/cases/dsl-type-inference/0058/expout
index a60a32a63..677f5dc52 100644
--- a/test/cases/dsl-type-inference/0058/expout
+++ b/test/cases/dsl-type-inference/0058/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 73.40000000
max 75.00000000
diff --git a/test/cases/dsl-type-inference/0059/expout b/test/cases/dsl-type-inference/0059/expout
index c643ab352..98397d62a 100644
--- a/test/cases/dsl-type-inference/0059/expout
+++ b/test/cases/dsl-type-inference/0059/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 75
max 76
diff --git a/test/cases/dsl-type-inference/0060/expout b/test/cases/dsl-type-inference/0060/expout
index d282edc75..23ffcd7dc 100644
--- a/test/cases/dsl-type-inference/0060/expout
+++ b/test/cases/dsl-type-inference/0060/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 71.20000000
max 73.40000000
diff --git a/test/cases/dsl-type-inference/0061/expout b/test/cases/dsl-type-inference/0061/expout
index 8e775a37e..6ed80cc36 100644
--- a/test/cases/dsl-type-inference/0061/expout
+++ b/test/cases/dsl-type-inference/0061/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 71.20000000
max 76.00000000
diff --git a/test/cases/dsl-type-inference/0062/expout b/test/cases/dsl-type-inference/0062/expout
index a60a32a63..677f5dc52 100644
--- a/test/cases/dsl-type-inference/0062/expout
+++ b/test/cases/dsl-type-inference/0062/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 73.40000000
max 75.00000000
diff --git a/test/cases/dsl-type-inference/0063/expout b/test/cases/dsl-type-inference/0063/expout
index c643ab352..98397d62a 100644
--- a/test/cases/dsl-type-inference/0063/expout
+++ b/test/cases/dsl-type-inference/0063/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 75
max 76
diff --git a/test/cases/dsl-type-inference/0064/expout b/test/cases/dsl-type-inference/0064/expout
index d282edc75..23ffcd7dc 100644
--- a/test/cases/dsl-type-inference/0064/expout
+++ b/test/cases/dsl-type-inference/0064/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 71.20000000
max 73.40000000
diff --git a/test/cases/dsl-type-inference/0065/expout b/test/cases/dsl-type-inference/0065/expout
index 8e775a37e..6ed80cc36 100644
--- a/test/cases/dsl-type-inference/0065/expout
+++ b/test/cases/dsl-type-inference/0065/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 71.20000000
max 76.00000000
diff --git a/test/cases/dsl-type-inference/0066/expout b/test/cases/dsl-type-inference/0066/expout
index a60a32a63..677f5dc52 100644
--- a/test/cases/dsl-type-inference/0066/expout
+++ b/test/cases/dsl-type-inference/0066/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 73.40000000
max 75.00000000
diff --git a/test/cases/dsl-type-inference/0067/expout b/test/cases/dsl-type-inference/0067/expout
index c643ab352..98397d62a 100644
--- a/test/cases/dsl-type-inference/0067/expout
+++ b/test/cases/dsl-type-inference/0067/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
min 75
max 76
diff --git a/test/cases/dsl-type-inference/0068/expout b/test/cases/dsl-type-inference/0068/expout
index 0fa3178e4..638418b2a 100644
--- a/test/cases/dsl-type-inference/0068/expout
+++ b/test/cases/dsl-type-inference/0068/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
sum 144.60000000
diff -2.20000000
diff --git a/test/cases/dsl-type-inference/0069/expout b/test/cases/dsl-type-inference/0069/expout
index dc911d1ce..fc5add129 100644
--- a/test/cases/dsl-type-inference/0069/expout
+++ b/test/cases/dsl-type-inference/0069/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
sum 147.20000000
diff -4.80000000
diff --git a/test/cases/dsl-type-inference/0070/expout b/test/cases/dsl-type-inference/0070/expout
index 8d1b2feeb..2f292ea20 100644
--- a/test/cases/dsl-type-inference/0070/expout
+++ b/test/cases/dsl-type-inference/0070/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
sum 148.40000000
diff 1.60000000
diff --git a/test/cases/dsl-type-inference/0071/expout b/test/cases/dsl-type-inference/0071/expout
index 7f1f0f317..bed734ee2 100644
--- a/test/cases/dsl-type-inference/0071/expout
+++ b/test/cases/dsl-type-inference/0071/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
sum 151
diff -1
diff --git a/test/cases/dsl-type-inference/0072/expout b/test/cases/dsl-type-inference/0072/expout
index 0fa3178e4..638418b2a 100644
--- a/test/cases/dsl-type-inference/0072/expout
+++ b/test/cases/dsl-type-inference/0072/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
sum 144.60000000
diff -2.20000000
diff --git a/test/cases/dsl-type-inference/0073/expout b/test/cases/dsl-type-inference/0073/expout
index dc911d1ce..fc5add129 100644
--- a/test/cases/dsl-type-inference/0073/expout
+++ b/test/cases/dsl-type-inference/0073/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
sum 147.20000000
diff -4.80000000
diff --git a/test/cases/dsl-type-inference/0074/expout b/test/cases/dsl-type-inference/0074/expout
index 8d1b2feeb..2f292ea20 100644
--- a/test/cases/dsl-type-inference/0074/expout
+++ b/test/cases/dsl-type-inference/0074/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
sum 148.40000000
diff 1.60000000
diff --git a/test/cases/dsl-type-inference/0075/expout b/test/cases/dsl-type-inference/0075/expout
index 7f1f0f317..bed734ee2 100644
--- a/test/cases/dsl-type-inference/0075/expout
+++ b/test/cases/dsl-type-inference/0075/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
sum 151
diff -1
diff --git a/test/cases/dsl-type-inference/0076/expout b/test/cases/dsl-type-inference/0076/expout
index c4e520059..b12e7b3bd 100644
--- a/test/cases/dsl-type-inference/0076/expout
+++ b/test/cases/dsl-type-inference/0076/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
prod 5226.08000000
quot 0.97002725
diff --git a/test/cases/dsl-type-inference/0077/expout b/test/cases/dsl-type-inference/0077/expout
index e9d043388..4417e6176 100644
--- a/test/cases/dsl-type-inference/0077/expout
+++ b/test/cases/dsl-type-inference/0077/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
prod 5411.20000000
quot 0.93684211
diff --git a/test/cases/dsl-type-inference/0078/expout b/test/cases/dsl-type-inference/0078/expout
index 8bca95465..c90d8c3a1 100644
--- a/test/cases/dsl-type-inference/0078/expout
+++ b/test/cases/dsl-type-inference/0078/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
prod 5505.00000000
quot 1.02179837
diff --git a/test/cases/dsl-type-inference/0079/expout b/test/cases/dsl-type-inference/0079/expout
index 3be9daf0d..772d2e30a 100644
--- a/test/cases/dsl-type-inference/0079/expout
+++ b/test/cases/dsl-type-inference/0079/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
prod 5700
quot 0.98684211
diff --git a/test/cases/dsl-type-inference/0080/expout b/test/cases/dsl-type-inference/0080/expout
index c4e520059..b12e7b3bd 100644
--- a/test/cases/dsl-type-inference/0080/expout
+++ b/test/cases/dsl-type-inference/0080/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
prod 5226.08000000
quot 0.97002725
diff --git a/test/cases/dsl-type-inference/0081/expout b/test/cases/dsl-type-inference/0081/expout
index e9d043388..4417e6176 100644
--- a/test/cases/dsl-type-inference/0081/expout
+++ b/test/cases/dsl-type-inference/0081/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
prod 5411.20000000
quot 0.93684211
diff --git a/test/cases/dsl-type-inference/0082/expout b/test/cases/dsl-type-inference/0082/expout
index 8bca95465..c90d8c3a1 100644
--- a/test/cases/dsl-type-inference/0082/expout
+++ b/test/cases/dsl-type-inference/0082/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
prod 5505.00000000
quot 1.02179837
diff --git a/test/cases/dsl-type-inference/0083/expout b/test/cases/dsl-type-inference/0083/expout
index 3be9daf0d..772d2e30a 100644
--- a/test/cases/dsl-type-inference/0083/expout
+++ b/test/cases/dsl-type-inference/0083/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
prod 5700
quot 0.98684211
diff --git a/test/cases/dsl-type-inference/0084/expout b/test/cases/dsl-type-inference/0084/expout
index 23b9a78e5..7958e7098 100644
--- a/test/cases/dsl-type-inference/0084/expout
+++ b/test/cases/dsl-type-inference/0084/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
iquot 0.00000000
mod 71.20000000
diff --git a/test/cases/dsl-type-inference/0085/expout b/test/cases/dsl-type-inference/0085/expout
index 23b9a78e5..7958e7098 100644
--- a/test/cases/dsl-type-inference/0085/expout
+++ b/test/cases/dsl-type-inference/0085/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
iquot 0.00000000
mod 71.20000000
diff --git a/test/cases/dsl-type-inference/0086/expout b/test/cases/dsl-type-inference/0086/expout
index 3f1f1ee5b..6056d16c8 100644
--- a/test/cases/dsl-type-inference/0086/expout
+++ b/test/cases/dsl-type-inference/0086/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
iquot 1.00000000
mod 1.60000000
diff --git a/test/cases/dsl-type-inference/0087/expout b/test/cases/dsl-type-inference/0087/expout
index 53096d849..50ac3f314 100644
--- a/test/cases/dsl-type-inference/0087/expout
+++ b/test/cases/dsl-type-inference/0087/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
iquot 0
mod 75
diff --git a/test/cases/dsl-type-inference/0088/expout b/test/cases/dsl-type-inference/0088/expout
index 23b9a78e5..7958e7098 100644
--- a/test/cases/dsl-type-inference/0088/expout
+++ b/test/cases/dsl-type-inference/0088/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
iquot 0.00000000
mod 71.20000000
diff --git a/test/cases/dsl-type-inference/0089/expout b/test/cases/dsl-type-inference/0089/expout
index 23b9a78e5..7958e7098 100644
--- a/test/cases/dsl-type-inference/0089/expout
+++ b/test/cases/dsl-type-inference/0089/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
iquot 0.00000000
mod 71.20000000
diff --git a/test/cases/dsl-type-inference/0090/expout b/test/cases/dsl-type-inference/0090/expout
index 3f1f1ee5b..6056d16c8 100644
--- a/test/cases/dsl-type-inference/0090/expout
+++ b/test/cases/dsl-type-inference/0090/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
iquot 1.00000000
mod 1.60000000
diff --git a/test/cases/dsl-type-inference/0091/expout b/test/cases/dsl-type-inference/0091/expout
index 53096d849..50ac3f314 100644
--- a/test/cases/dsl-type-inference/0091/expout
+++ b/test/cases/dsl-type-inference/0091/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
iquot 0
mod 75
diff --git a/test/cases/dsl-type-inference/0092/expout b/test/cases/dsl-type-inference/0092/expout
index a290adbe3..00542528e 100644
--- a/test/cases/dsl-type-inference/0092/expout
+++ b/test/cases/dsl-type-inference/0092/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
a 70.00000000
b 70.00000000
diff --git a/test/cases/dsl-type-inference/0093/expout b/test/cases/dsl-type-inference/0093/expout
index a290adbe3..00542528e 100644
--- a/test/cases/dsl-type-inference/0093/expout
+++ b/test/cases/dsl-type-inference/0093/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
a 70.00000000
b 70.00000000
diff --git a/test/cases/dsl-type-inference/0094/expout b/test/cases/dsl-type-inference/0094/expout
index 823138b84..b9daf5200 100644
--- a/test/cases/dsl-type-inference/0094/expout
+++ b/test/cases/dsl-type-inference/0094/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
a 80.00000000
b 80.00000000
diff --git a/test/cases/dsl-type-inference/0095/expout b/test/cases/dsl-type-inference/0095/expout
index a10429d42..5422ac07c 100644
--- a/test/cases/dsl-type-inference/0095/expout
+++ b/test/cases/dsl-type-inference/0095/expout
@@ -1,12 +1,16 @@
pf1 71.20000000
nf1 -71.20000000
+tf1 71.20000000
zf 0.00000000
pf2 73.40000000
nf2 -73.40000000
+tf2 73.40000000
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76
a 80
b 80
diff --git a/test/input/mixed-types.xtab b/test/input/mixed-types.xtab
index 2a47e04a3..da9fdacaf 100644
--- a/test/input/mixed-types.xtab
+++ b/test/input/mixed-types.xtab
@@ -1,10 +1,14 @@
pf1 71.2
nf1 -71.2
+tf1 +71.2
zf 0.0
pf2 73.4
nf2 -73.4
+tf2 +73.4
pi1 75
ni1 -75
+ti1 +75
zi 0
pi2 76
ni2 -76
+ti2 +76