Skip to content

Commit 19065e2

Browse files
author
Jérôme FERET
committed
put constraints about the numer of agent of a given type in a cc ; deal with the four order relations about int ; put constraints on each agent
1 parent 6712a45 commit 19065e2

32 files changed

+1005
-378
lines changed

core/KaSa_rep/export/export.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,7 @@ functor
18191819
(NamedDecls.create_from_list l)
18201820
in
18211821
let signature =
1822-
Signature.create ~counters_per_agent:[] ~size_predicate_list:[]
1822+
Signature.create ~counters_per_agent:[] ~size_predicate_list:([],[])
18231823
agent_sigs
18241824
in
18251825
Remanent_state.set_signature signature state, signature

core/KaSa_rep/frontend/prepreprocess.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ let scan_agent ~get_counter_name ~get_size_predicate_name parameters k ag
163163
remanent =
164164
match ag with
165165
| Ast.Absent _ -> remanent
166-
| Ast.Present ((name, _), intf, _modif) ->
166+
| Ast.Present ((name, _), intf, _modif, _cc) ->
167167
fst
168168
(scan_interface ~get_counter_name ~get_size_predicate_name parameters k
169169
name intf
@@ -367,7 +367,7 @@ let translate_interface ~translate_counter parameters is_signature =
367367
let translate_agent ~translate_counter parameters is_signature ag remanent =
368368
match ag with
369369
| Ast.Absent _pos -> None, remanent
370-
| Ast.Present ((agent_name, agent_name_pos), intf, _modif) ->
370+
| Ast.Present ((agent_name, agent_name_pos), intf, _modif, _cc) ->
371371
let interface, remanent =
372372
translate_interface ~translate_counter parameters is_signature intf
373373
remanent
@@ -438,7 +438,7 @@ let rec translate_mixture ~translate_counter parameters mixture remanent =
438438

439439
let support_agent = function
440440
| Ast.Absent _ -> None
441-
| Ast.Present ((name, _), intfs, _) ->
441+
| Ast.Present ((name, _), intfs, _, _ ) ->
442442
let list =
443443
let rec scan intf list =
444444
match intf with
@@ -726,7 +726,7 @@ let refine_agent_sig parameters error agent_set agent =
726726
let error, agent_set =
727727
match agent with
728728
| Ast.Absent _ -> error, agent_set
729-
| Ast.Present ((name, _), _, _) ->
729+
| Ast.Present ((name, _), _, _, _) ->
730730
check_freshness parameters error "Agent" name agent_set
731731
in
732732
let error, map =

0 commit comments

Comments
 (0)