diff --git a/src/TODO b/src/TODO
index 48dac996fc3e3048a9e48d7eb44c742560bcd627..715f85ab25438fb0ad3e112674ae3e151a53a60b 100644
--- a/src/TODO
+++ b/src/TODO
@@ -98,9 +98,6 @@ lazycompiler.ml:
* Verifier que les test de map_red couvre les cas tordus.
-* BUG dans test/should_work/NONREG/Int.lus
-
-la constante 'Int8::zero' a pour type 'bool^8' au lieu de 'Int8::Int'
* Evaluer statiquement les iterateurs quand c'est possible (cf evalConst.ml)
@@ -121,8 +118,9 @@ generer les lexemes qui vont bien,
tk_real+tk_real -> tk_int+tk_dotdot+tk_int
-* autoriser le fait le pouvoir donner une valeur par defaut à une constante
- exportée. («provides const : n = 4; »)
+* autoriser le fait le pouvoir donner une valeur par defaut à une
+ constante exportée. («provides const : n = 4; »)
+ -> cf test/should_work/Pascal/packs.lus
* Dans les messages d'erreurs, le numero de colonne est faux à cause des tabulations
@@ -167,6 +165,8 @@ index de slice
* finir de rédiger le manuel
++ verifier que j'y parle bien de la priorite des operateurs
+
* Essayer de tronconner le lazyCompiler, 700 lignes, c'est trop (et
c'est pas fini !)
diff --git a/src/lazyCompiler.ml b/src/lazyCompiler.ml
index 75b6a159ceb45b4b5b9e66c44ef36b1834ef7d7e..380a46eb31e57d140249f131c2f48e89b21c93b8 100644
--- a/src/lazyCompiler.ml
+++ b/src/lazyCompiler.ml
@@ -1,4 +1,4 @@
-(** Time-stamp: <modified the 16/05/2008 (at 10:09) by Erwan Jahier> *)
+(** Time-stamp: <modified the 20/05/2008 (at 16:57) by Erwan Jahier> *)
open Lxm
@@ -327,7 +327,7 @@ and (const_check_interface_do: t -> Ident.long -> Lxm.t -> SymbolTab.t ->
if
(id = cn) && (CompiledData.types_are_compatible teff_prov teff_body)
then
- body_const_eff
+ prov_const_eff
else
raise(Compile_error (
const_def.src,
diff --git a/src/test/should_work/Pascal/packs.lus b/src/test/should_work/Pascal/packs.lus
index dd4fcfff472d737266410f159920162d2688a0fc..8e8d95c8a6d67fbb0052666663b4a79def0612cb 100644
--- a/src/test/should_work/Pascal/packs.lus
+++ b/src/test/should_work/Pascal/packs.lus
@@ -26,7 +26,7 @@ package inter
uses pbool, pint, preal;
provides
node preced(in: selType) returns (out, out2: selType);
- const n : int;
+ const n : int = -4;
type selType;
type toto = enum {X, Y} ;
diff --git a/src/test/test.res.exp b/src/test/test.res.exp
index aa0850ab5ef978be503f00128aa23a1e68842097..d0553a08cee275df066b760a7dadd1d3f06f8673 100644
--- a/src/test/test.res.exp
+++ b/src/test/test.res.exp
@@ -97,10 +97,12 @@ tel
Exported types:
Exported constants:
Exported nodes:
-*** Error in file "should_work/NONREG/Int.lus", line 47, col 10 to 11, token 'if': type error:
-*** type 'bool*bool^8*Int8__Int' was provided whereas
-*** type 'bool*any*any' was expected
-
+node mainPack__Nat(evt:bool; reset:bool) returns (nat:Int8__Int);
+let
+ nat = if (true -> reset) then (Int8::zero) else ( if (evt) then
+ (Int8__incr(pre(nat))) else (pre(nat)));
+tel
+-- end of node mainPack__Nat
----------------------------------------------------------------------
====> ../lus2lic -vl 3 --compile-all-items should_work/NONREG/PCOND.lus
@@ -5845,103 +5847,8 @@ type inter__selType = {i : int; b : bool; r : real};
----------------------------------------------------------------------
====> ../lus2lic -vl 3 --compile-all-items should_work/Pascal/packs.lus
Opening file should_work/Pascal/packs.lus
-*** SyntaxTab.create pass 1
-*** SyntaxTab.create pass 2
- init pack inter
- export node 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 node preced
- init pack pint
- export node fby1
- export type t
- init pack pbool
- export node fby1
- export type t
- init pack preal
- export node 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__packs"
-*** Dump the exported items of the packages.
- * package preal
- Exported types:
-type preal__t = real;
- Exported constants:
- Exported nodes:
-node preal__fby1(init:real; fb:real) returns (next:real);
-let
- next = init -> pre(fb);
-tel
--- end of node preal__fby1
- * package pbool
- Exported types:
-type pbool__t = bool;
- Exported constants:
- Exported nodes:
-node pbool__fby1(init:bool; fb:bool) returns (next:bool);
-let
- next = init -> pre(fb);
-tel
--- end of node pbool__fby1
- * package pint
- Exported types:
-type pint__t = int;
- Exported constants:
- Exported nodes:
-node pint__fby1(init:int; fb:int) returns (next:int);
-let
- next = init -> pre(fb);
-tel
--- end of node pint__fby1
- * package mainPack
- Exported types:
-const inter__n = -4;
-const mainPack__N = 8;
-type mainPack__T = int^8;
-type mainPack__couleurs = enum {mainPack__bleu, mainPack__rose, mainPack__jaune};
- Exported constants:
-const mainPack__bleu;
-const mainPack__jaune;
-const mainPack__rose;
-const mainPack__X = 8;
- Exported nodes:
-type inter__selType = {i : int; b : bool; r : real};
+*** Error in file "should_work/Pascal/packs.lus", line 29, col 16 to 16, token '=': syntax error
- XXX evalType.ml:anonymous struct not yet supported -> finish me!
-
-*** oops: an internal error occurred in file evalType.ml, line 155, column 3
-*** when compiling lustre program should_work/Pascal/packs.lus
----------------------------------------------------------------------
====> ../lus2lic -vl 3 --compile-all-items should_work/Pascal/pfs.lus