Project

General

Profile

Revision 4f26dcf5 src/parser_lustre.mly

View differences:

src/parser_lustre.mly
56 56
%token <Num.num * int * string> REAL
57 57

  
58 58
%token <string> STRING
59
%token AUTOMATON STATE UNTIL UNLESS RESTART RESUME LAST
59
%token AUTOMATON STATE UNTIL UNLESS RESTART RESUME 
60 60
%token ASSERT OPEN QUOTE FUNCTION
61 61
%token <string> IDENT
62 62
%token <string> UIDENT
63 63
%token TRUE FALSE
64 64
%token <Lustre_types.expr_annot> ANNOT
65
%token <Lustre_types.node_annot> NODESPEC
65
%token <Lustre_types.contract_desc> NODESPEC
66 66
%token LBRACKET RBRACKET LCUR RCUR LPAR RPAR SCOL COL COMMA COLCOL 
67 67
%token AMPERAMPER BARBAR NOT POWER
68 68
%token IF THEN ELSE
......
113 113
%type <Lustre_types.expr_annot> lustre_annot
114 114

  
115 115
%start lustre_spec
116
%type <Lustre_types.node_annot> lustre_spec
116
%type <Lustre_types.contract_desc> lustre_spec
117 117

  
118 118
%start signed_const
119 119
%type <Lustre_types.constant> signed_const
......
248 248
| NODESPEC nodespec_list { 
249 249
  (function 
250 250
  | None    -> (fun s1 -> Some s1) 
251
  | Some s2 -> (fun s1 -> Some (merge_node_annot s1 s2))) $2 $1 }
251
  | Some s2 -> (fun s1 -> Some (merge_contracts s1 s2))) $2 $1 }
252 252

  
253 253
typ_def_list:
254 254
    /* empty */             { (fun itf -> []) }

Also available in: Unified diff