diff --git a/src/test/test.res b/src/test/test.res
deleted file mode 100644
index db695ccea0fce240663b152dbad0ad80848483bb..0000000000000000000000000000000000000000
--- a/src/test/test.res
+++ /dev/null
@@ -1,638 +0,0 @@
-Non-regression tests
-
-====> ../lus2lic -vl 3 newpacks.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack inter
- export oper preced
- export const n
- export type selType
- init pack mainPack
- export oper preced
- init pack pint
- export oper fby1
- export type t
- init pack pbool
- export oper fby1
- export type t
- init pack preal
- export oper fby1
- export type t
-*** SyntaxTab.create pass 3
- init symbol tables for pack inter
- init symbol tables for pack mainPack
- init symbol tables for pack pint
- init symbol tables for pack pbool
- init symbol tables for pack preal
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- modSimple (model)
- pint (pack)
- pbool (pack)
- preal (pack)
- inter (pack)
- mainPack (pack)
-
- - Raw model table: modSimple
- - Raw Package table: inter mainPack pint pbool preal
- - Package manager table: inter mainPack pint pbool preal
-End of Syntax table dump. »
--- MAIN NODE: "pint::main"
-*** Dump the exported items of the packages.
- * package preal
- Exported types:
- type t = real
- Exported constants:
- * package pbool
- Exported types:
- type t = bool
- Exported constants:
- * package pint
- Exported types:
- type t = int
- Exported constants:
- * package mainPack
- Exported types:
- type selType = inter::selType (imported)
- Exported constants:
- const n = inter::n (imported)
- * package inter
- Exported types:
- type t = preal::t (imported)
- type selType = inter::selType
- Exported constants:
- const n = -4
-
-====> ../lus2lic -vl 3 struct0.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export type Toto
- export oper bibi
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- struct0 (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "struct0::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- type Toto = {x : int (1); y : int (2)}
- Exported constants:
-
-====> ../lus2lic -vl 3 t0.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export oper min_4
- export oper min
- export oper min_n
- export oper max
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- t0 (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "t0::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
-
-====> ../lus2lic -vl 3 t2.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export oper fold_left
- export oper consensus_6_bis
- export oper consensus_6
- export oper consensus_bis
- export oper consensus
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- t2 (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "t2::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
-
-====> ../lus2lic -vl 3 test.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack P1
- export const y
- export type titi
-*** SyntaxTab.create pass 3
- init symbol tables for pack P1
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- P1 (pack)
-
- - Raw model table:
- - Raw Package table: P1
- - Package manager table: P1
-End of Syntax table dump. »
--- MAIN NODE: "P1::main"
-*** Dump the exported items of the packages.
- * package P1
- Exported types:
- type titi = P1::titi
- Exported constants:
- const y = 3
-
-====> ../lus2lic -vl 3 trivial.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export oper trivial
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- trivial (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "trivial::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
-
-====> ../lus2lic -vl 3 x.lus
-Error. 'm' (file:x.lus, line:3, col:7 to 7):
----> recursion loop detected:
- > const ref 'x' (file:x.lus, line:3, col:11 to 11)
- > const ref 't' (file:x.lus, line:5, col:11 to 11)
- > const ref 'n' (file:x.lus, line:7, col:11 to 11)
- > const ref 'm' (file:x.lus, line:1, col:11 to 11)
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export const m
- export const n
- export const t
- export const x
- export const y
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- x (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "x::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
-
-====> ../lus2lic -vl 3 consensus.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export oper main
- export oper main2
- export oper consensus
- export oper c8
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- consensus (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "consensus::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
-
-====> ../lus2lic -vl 3 left.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export type truc
- export oper toto
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- left (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "left::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- type truc = {a : bool^100; b : int}
- Exported constants:
-
-====> ../lus2lic -vl 3 packs.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack inter
- export oper preced
- export const n
- export type selType
- export enum const X
- export enum const Y
- export type toto
- init pack mainPack
- export type T
- export enum const bleu
- export enum const rose
- export enum const jaune
- export type couleurs
- export const N
- export const X
- export oper preced
- init pack pint
- export oper fby1
- export type t
- init pack pbool
- export oper fby1
- export type t
- init pack preal
- export oper fby1
- export type t
-*** SyntaxTab.create pass 3
- init symbol tables for pack inter
- init symbol tables for pack mainPack
- init symbol tables for pack pint
- init symbol tables for pack pbool
- init symbol tables for pack preal
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- modSimple (model)
- pint (pack)
- pbool (pack)
- preal (pack)
- inter (pack)
- mainPack (pack)
-
- - Raw model table: modSimple
- - Raw Package table: inter mainPack pint pbool preal
- - Package manager table: inter mainPack pint pbool preal
-End of Syntax table dump. »
--- MAIN NODE: "pint::main"
-*** Dump the exported items of the packages.
- * package preal
- Exported types:
- type t = real
- Exported constants:
- * package pbool
- Exported types:
- type t = bool
- Exported constants:
- * package pint
- Exported types:
- type t = int
- Exported constants:
- * package mainPack
- Exported types:
- type selType = inter::selType (imported)
- type toto = inter::toto (imported)
- type T = int^8
- type couleurs = enum {mainPack::bleu, mainPack::rose, mainPack::jaune}
- Exported constants:
- const bleu = mainPack::bleu
- const n = inter::n (imported)
- const jaune = mainPack::jaune
- const N = 8
- const rose = mainPack::rose
- const X = 8
- const Y = inter::Y (imported)
- * package inter
- Exported types:
- type t = preal::t (imported)
- type selType = inter::selType
- type toto = enum {inter::X, inter::Y}
- Exported constants:
- const n = -4
- const X = inter::X
- const Y = inter::Y
-
-====> ../lus2lic -vl 3 p.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack inter
- export oper preced
- export const n
- export type selType
- init pack mainPack
- export oper preced
- init pack pint
- export oper fby1
- export type t
- init pack pbool
- export oper fby1
- export type t
- init pack preal
- export oper fby1
- export type t
-*** SyntaxTab.create pass 3
- init symbol tables for pack inter
- init symbol tables for pack mainPack
- init symbol tables for pack pint
- init symbol tables for pack pbool
- init symbol tables for pack preal
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- modSimple (model)
- pint (pack)
- pbool (pack)
- preal (pack)
- inter (pack)
- mainPack (pack)
-
- - Raw model table: modSimple
- - Raw Package table: inter mainPack pint pbool preal
- - Package manager table: inter mainPack pint pbool preal
-End of Syntax table dump. »
--- MAIN NODE: "pint::main"
-*** Dump the exported items of the packages.
- * package preal
- Exported types:
- type t = real
- Exported constants:
- * package pbool
- Exported types:
- type t = bool
- Exported constants:
- * package pint
- Exported types:
- type t = int
- Exported constants:
- * package mainPack
- Exported types:
- type selType = inter::selType (imported)
- Exported constants:
- const n = inter::n (imported)
- * package inter
- Exported types:
- type t = preal::t (imported)
- type selType = inter::selType
- Exported constants:
- const n = -4
-
-====> ../lus2lic -vl 3 t.lus
-Error. '+' (file:t.lus, line:33, col:1 to 1):
----> can't eval constant: type combination error, int*int or real*real expected
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export const A
- export const B
- export oper map2
- export oper toto
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- t (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "t::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
-
-====> ../lus2lic -vl 3 trivial.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export oper trivial
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- trivial (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "trivial::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
-
-====> ../lus2lic -vl 3 t1.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export oper fold_left
- export oper consensus
- export oper bt_void
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- t1 (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "t1::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
-
-====> ../lus2lic -vl 3 onlyroll.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export const NRminP
- export const NRmaxP
- export const NRminR
- export const DELTA_PITCH
- export const NRmaxR
- export const FAIL_SAFE_PITCH_VALUE
- export const DELTA_YAW
- export const HORminP
- export const NRminY
- export const XFAIL_SAFE_ROLL_VALUE
- export const HORmaxP
- export const HORminR
- export const NRmaxY
- export const HORmaxR
- export const CROSS_CH_TOL_PITCH
- export const HORminY
- export const FAIL_SAFE_YAW_VALUE
- export const HORmaxY
- export const OneSecond
- export const FAIL_SAFE_ROLL_VALUE
- export const DELTA_ROLL
- export const TIME_ROLL
- export const CROSS_CH_TOL_ROLL
- export const TIME5
- export const BID_LAST
- export const SAFE_COUNTER_TIME
- export const BID_VAL
- export const TIME_CROSS_ROLL
- export const CROSS_CH_TOL_YAW
- export oper Calculate
- export oper onlyroll
- export oper Median
- export oper oneoffour
- export oper MedianValue3
- export oper Monitor
- export oper Allocator
- export oper Channel
- export oper min2
- export oper min4
- export oper max2
- export oper max4
- export oper OlympicAverage
- export oper InHardoverRange
- export oper twooffour
- export oper noneof
- export oper threeoffour
- export oper InNominalRange
- export oper FailDetect
- export oper abs
- export oper Average2
- export oper Average
- export oper maintain
- export oper values_nok
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- onlyroll (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "onlyroll::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
- const NRminP = -5.100000
- const NRminR = -25.300000
- const NRmaxP = 5.100000
- const DELTA_PITCH = 3.000000
- const NRmaxR = 25.300000
- const FAIL_SAFE_PITCH_VALUE = 4.000000
- const DELTA_YAW = 2.730000
- const NRminY = -5.000000
- const HORminP = -57.000000
- const XFAIL_SAFE_ROLL_VALUE = 1.100000
- const NRmaxY = 5.000000
- const HORminR = -285.000000
- const HORmaxP = 57.000000
- const CROSS_CH_TOL_PITCH = 10.100000
- const HORmaxR = 285.000000
- const FAIL_SAFE_YAW_VALUE = 4.000000
- const HORminY = -57.000000
- const DELTA_ROLL = 14.900000
- const FAIL_SAFE_ROLL_VALUE = 1.000000
- const OneSecond = 10
- const HORmaxY = 57.000000
- const TIME_ROLL = 3
- const CROSS_CH_TOL_ROLL = 51.000000
- const BID_LAST = 2.200000
- const TIME5 = 4
- const SAFE_COUNTER_TIME = 3
- const BID_VAL = 3.300000
- const CROSS_CH_TOL_YAW = 10.000000
- const TIME_CROSS_ROLL = 3
-
-====> ../lus2lic -vl 3 heater_control.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack dummy
- export const FAILURE
- export const TMIN
- export const TMAX
- export const DELTA
- export oper not_a_sauna2
- export oper Median
- export oper heater_control
- export oper min2
- export oper max2
- export oper alloftree
- export oper not_a_sauna
- export oper abs
- export oper noneoftree
- export oper oneoftree
- export oper Average
-*** SyntaxTab.create pass 3
- init symbol tables for pack dummy
-*** SyntaxTab.create done
-*** « Syntax table dump:
- - Package or model list:
- heater_control (pack)
-
- - Raw model table:
- - Raw Package table: dummy
- - Package manager table: dummy
-End of Syntax table dump. »
--- MAIN NODE: "heater_control::main"
-*** Dump the exported items of the packages.
- * package dummy
- Exported types:
- Exported constants:
- const FAILURE = -999.000000
- const TMIN = 6.000000
- const TMAX = 9.000000
- const DELTA = 0.500000
-
-====> ../lus2lic -vl 3 pfs.lus
-Error. '[' (file:pfs.lus, line:43, col:22 to 22):
----> syntax error
diff --git a/src/test/test.res.exp b/src/test/test.res.exp
index 0eac2a13cfae67f05452de178ac677bf8e3065d8..db695ccea0fce240663b152dbad0ad80848483bb 100644
--- a/src/test/test.res.exp
+++ b/src/test/test.res.exp
@@ -634,5 +634,5 @@ End of Syntax table dump.
const DELTA = 0.500000
====> ../lus2lic -vl 3 pfs.lus
-Error. '[' (file:pfs.lus, line:40, col:18 to 18):
+Error. '[' (file:pfs.lus, line:43, col:22 to 22):
---> syntax error