mirror of
https://github.com/ProgramSnail/pass_strategy_synthesis.git
synced 2026-06-10 19:28:16 +00:00
struct: send test: impl for analyzer (currently broken), fix of rev order in tuplecopy
This commit is contained in:
ProgramSnail
parent
64935b3c7e
commit
123012f68f
3 changed files with 264 additions and 9 deletions
|
|
@ -201,9 +201,9 @@ struct
|
|||
let (mem'', id'') = mem_add mem' v' in
|
||||
(mem'', RefV id'')
|
||||
| TupleT ts, TupleV vs -> let folder = fun (mem, vs') v t -> let (mem', v') = valcopy mem v t in
|
||||
(mem, v' :: vs') in
|
||||
(mem', v' :: vs') in
|
||||
let mem', vs' = List.fold_left2 folder (mem, []) vs ts in
|
||||
(mem', TupleV vs')
|
||||
(mem', TupleV (List.rev vs')) (* TODO: FIXME: should reverse or not ?? *)
|
||||
| _, _ -> raise @@ Typing_error "valcopy: not trivial value, wrong type"
|
||||
|
||||
(* - value update *)
|
||||
|
|
@ -433,6 +433,7 @@ struct
|
|||
(* - shortcuts *)
|
||||
|
||||
let ( #. ) x y = SeqS (x, y)
|
||||
let ( |. ) x y = ChoiceS (x, y)
|
||||
|
||||
let v0 = VarP 0
|
||||
let v1 = VarP 1
|
||||
|
|
@ -452,6 +453,8 @@ struct
|
|||
let vg6 = VarP (globals_min_id + 6)
|
||||
let vg7 = VarP (globals_min_id + 7)
|
||||
let vg8 = VarP (globals_min_id + 8)
|
||||
let vg9 = VarP (globals_min_id + 9)
|
||||
let vg10 = VarP (globals_min_id + 10)
|
||||
|
||||
let rf0E = RefE 0
|
||||
let rf1E = RefE 1
|
||||
|
|
@ -475,7 +478,7 @@ struct
|
|||
let pE p = PathE p
|
||||
|
||||
let drf p = DerefP p
|
||||
let access p i = AccessP (p, i)
|
||||
let access i p = AccessP (p, i)
|
||||
|
||||
let wr x = ReadS x
|
||||
let rd x = WriteS x
|
||||
|
|
@ -862,7 +865,87 @@ struct
|
|||
Printf.printf "done!";
|
||||
[%expect {| done! |}]
|
||||
|
||||
(* TODO: recursive call test (for the future when memoization will be implemented) *)
|
||||
(* - complex tests *)
|
||||
|
||||
let%expect_test "complex test: send, dsl" =
|
||||
prog_eval_noret (
|
||||
(* TODO: set optimal ref mods later *)
|
||||
let user_utilsT = TupleT [uT_r_aw (* 0 id *); uT_r_aw] in
|
||||
let user_infoT = TupleT [uT_r_aw (* 0 name *); uT_r_aw; uT_r_aw] in
|
||||
let userT = TupleT [cpT user_utilsT (* 0 utils *); cpT user_infoT (* 1 info *)] in
|
||||
let versionT = TupleT [uT_r_aw (* 0 id *); uT_r_aw; uT_r_aw] in
|
||||
let utilsT = TupleT [uT_r_aw (* 0 has_version *); uT_r_aw (* 1 id *)] in
|
||||
let requestT = TupleT [cpT userT (* 0 user *);
|
||||
cpT versionT (* 1 version *);
|
||||
cpT utilsT (* 2 utils *);
|
||||
cpT uT_r_aw (* 3 data *);
|
||||
uT_r_aw (* 4 operation_date *)] in
|
||||
let user_utilsE = TupleE [UnitE (* 0 id *); UnitE] in
|
||||
let user_infoE = TupleE [UnitE (* 0 name *); UnitE; UnitE] in
|
||||
let userE = TupleE [rfg0E (* 0 utils *); rfg1E (* 1 info *)] in
|
||||
let versionE = TupleE [UnitE (* 0 id *); UnitE; UnitE] in
|
||||
let utilsE = TupleE [UnitE (* 0 has_version *); UnitE (* 1 id *)] in
|
||||
let requestE = TupleE [rfg2E (* 0 user *);
|
||||
rfg3E (* 1 version *);
|
||||
rfg4E (* 2 utils *);
|
||||
rfg5E (* 3 data *);
|
||||
UnitE (* 4 operation_date *)] in
|
||||
let get_version_idID = vg7 in
|
||||
let updated_versionID = vg8 in
|
||||
let sendID = vg9 in
|
||||
let send_allID = vg10 in
|
||||
let get_version_idF = FunD ([moded requestT],
|
||||
(* (rdS @@ access 1 @@ drf @@ access 0 v0) |. skp) in *)
|
||||
skp) in
|
||||
(* TODO: real op paths *)
|
||||
let updated_versionF = FunD ([moded requestT],
|
||||
(* (rdS @@ access 2 @@ drf @@ access 0 v0) #. *)
|
||||
(* TODO: read all the substructure ?? *)
|
||||
(* (rdS @@ access 1 @@ drf @@ access 0 v0) #. *)
|
||||
(* (rdS @@ access 1 @@ drf @@ access 1 v0)) in *)
|
||||
skp) in
|
||||
let sendF = FunD ([moded requestT],
|
||||
(* (( *)
|
||||
(* (wrS @@ access 2 @@ drf @@ access 0 v0) #. *)
|
||||
(* (rdS @@ access 3 @@ drf v0) #. *)
|
||||
(* (wrS @@ access 3 @@ drf v0) #. *)
|
||||
(* (rdS @@ access 0 @@ drf @@ access 1 @@ drf @@ access 0 v0) *)
|
||||
(* ) |. skp) #. *)
|
||||
(* (wrS @@ access 4 v0) #. *)
|
||||
(* TODO: read all the substructure ?? *)
|
||||
(* (rdS @@ access 4 v0) (*rdS v0*)) in (* FIXME: TMP, parial read, should be full *) *)
|
||||
skp) in
|
||||
let send_allF = FunD ([moded requestT],
|
||||
(wrS @@ access 4 v0) (*wrS v0*) #. (* FIXME: TMP, parial write, should be full *)
|
||||
(* (callS sendID [pE v0]) #. *)
|
||||
(* (callS get_version_idID [pE v0]) #. *)
|
||||
(* (callS updated_versionID [pE v0]) #. *)
|
||||
(* TODO: read all the substructure ?? *)
|
||||
(wrS @@ access 1 @@ drf @@ access 0 v0) #.
|
||||
(* (wrS @@ access 1 @@ drf @@ access 1 v0) #. *)
|
||||
(* --- *)
|
||||
(* ((rdS @@ access 0 @@ drf @@ access 0 @@ drf @@ access 0 v0) |. *)
|
||||
(* (rdS @@ access 2 @@ drf @@ access 0 v0))) in *)
|
||||
skp) in
|
||||
let varID = vg6 in
|
||||
[
|
||||
defg user_utilsT user_utilsE;
|
||||
defg user_infoT user_infoE;
|
||||
defg userT userE;
|
||||
defg versionT versionE;
|
||||
defg utilsT utilsE;
|
||||
defgu uT_r_aw;
|
||||
defg requestT requestE;
|
||||
get_version_idF;
|
||||
updated_versionF;
|
||||
sendF;
|
||||
send_allF
|
||||
(* TODO: var def *)
|
||||
],
|
||||
callS send_allID [pE varID]
|
||||
);
|
||||
Printf.printf "done!";
|
||||
[%expect {| done! |}]
|
||||
|
||||
(* --- FIXME --- CURRENT REWRITE POINT --- FIXME --- *)
|
||||
|
||||
|
|
|
|||
172
model_with_structures/send_example.md
Normal file
172
model_with_structures/send_example.md
Normal file
|
|
@ -0,0 +1,172 @@
|
|||
### C++ pseudocode
|
||||
```cpp
|
||||
// external
|
||||
|
||||
struct Data { /*...*/ };
|
||||
struct DateTime { /*...*/ };
|
||||
|
||||
Request init() { /*...*/ }
|
||||
Version old_version_placeholder() { /*...*/ }
|
||||
bool new_api_activated() { /*...*/ }
|
||||
void do_request(const Remote& remote, const Request& r) { /*...*/ }
|
||||
Data convert_to_new_data(const Data& data) { /*...*/ }
|
||||
string name_to_new_format(const string& name) { /*...*/ }
|
||||
DateTime current_time() { /*...*/ }
|
||||
bool no_errors() { /*...*/ }
|
||||
void log_write(int x) { /*...*/ }
|
||||
|
||||
// structures
|
||||
|
||||
struct UserUtils {
|
||||
int id;
|
||||
vector<int> connected_users;
|
||||
};
|
||||
|
||||
struct UserInfo {
|
||||
string name;
|
||||
string surname;
|
||||
int age;
|
||||
};
|
||||
|
||||
struct User {
|
||||
UserUtils* utils;
|
||||
PersonalInfo* info;
|
||||
};
|
||||
|
||||
struct Version {
|
||||
int id;
|
||||
DateTime release_date;
|
||||
vector<int> supported_stds;
|
||||
};
|
||||
|
||||
struct Utils {
|
||||
bool has_version;
|
||||
int id;
|
||||
};
|
||||
|
||||
struct Request {
|
||||
User* user;
|
||||
Version* version;
|
||||
Utils* utils;
|
||||
Data* data;
|
||||
DateTime operaiton_date;
|
||||
};
|
||||
|
||||
// example itself
|
||||
|
||||
int get_version_id(Request /*[?]*/ r) {
|
||||
if (r.utils.has_version) {
|
||||
return r.version.id;
|
||||
}
|
||||
return old_version_placeholder().id;
|
||||
}
|
||||
|
||||
Version updated_version(Request /*[?]*/ r) {
|
||||
if (not r.utils.has_version) {
|
||||
return old_version_placeholder();
|
||||
}
|
||||
return r.vestion;
|
||||
}
|
||||
|
||||
void send(const Remote& remote, Request /*[?]*/ r) {
|
||||
if (new_api_activated()) {
|
||||
r.utils.has_version = true;
|
||||
r.data = convert_to_new_data(r.data);
|
||||
r.user.info.name =
|
||||
name_to_new_format(r.user.info.name);
|
||||
}
|
||||
r.time = current_time();
|
||||
do_request(remote, r);
|
||||
}
|
||||
|
||||
void send_all(const vector<Remote>& remotes) {
|
||||
Request r = init();
|
||||
for(const auto& remote : remotes) {
|
||||
send(remote, r);
|
||||
log_write(get_version_id(r));
|
||||
}
|
||||
r.version = updated_version(r);
|
||||
if (no_errors()) {
|
||||
print("Done requests for user {}", r.user.utils.id);
|
||||
} else {
|
||||
print("Error during send of {}", r.utils.id);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### DSL pseudocode
|
||||
```python
|
||||
|
||||
# structures
|
||||
|
||||
UserUtils := [(); ()] # id, connected_users
|
||||
|
||||
UserInfo := [(); (); ()] # name, surname, age
|
||||
|
||||
User := [& UserUtils; & UserInfo] # utils, info
|
||||
# or User := [& [(); ()]; & [(); (); ()]] # utils, info
|
||||
|
||||
Version := [(); (); ()] # id, release_date, supported_stds
|
||||
|
||||
Utils := [(); ()] # has_version, id
|
||||
|
||||
Request := [& User; # user
|
||||
& Version; # version
|
||||
& Utils; # utils
|
||||
& (); # data
|
||||
()] # operation_date
|
||||
# or Request := [& [& [(); ()], & [(); (); ()]]; # user
|
||||
# & [(); (); ()]; # version
|
||||
# & [(); ()]; # utils
|
||||
# & (); # data
|
||||
# ()] # operation_date
|
||||
|
||||
# example itself
|
||||
|
||||
get_version_id(r : Request) {
|
||||
read(r.version.id) | skip
|
||||
}
|
||||
|
||||
updated_version(r : Request) {
|
||||
read(r.utils.has_version);
|
||||
read(r.version)
|
||||
}
|
||||
|
||||
send(r : Request) {
|
||||
((write(r.utils.has_version);
|
||||
convert_to_new_data(r.data); # -> read(r.data)
|
||||
write(r.data);
|
||||
name_to_new_format(r.user.info.name); # -> read(r.user.info.name)
|
||||
write(r.user.info.name))
|
||||
| skip);
|
||||
write(r.time);
|
||||
do_request(r) # -> read(r)
|
||||
}
|
||||
|
||||
send_all(r : Request) { # NOTE: add argument to not place body on top level
|
||||
write(r);
|
||||
send(r);
|
||||
get_version_id(r);
|
||||
|
||||
updated_version(r);
|
||||
write(r.version);
|
||||
|
||||
(read(r.user.utils.id) | read(r.utils.id))
|
||||
}
|
||||
|
||||
send_all(r)
|
||||
```
|
||||
`
|
||||
|
||||
### Actual representation
|
||||
In `analyzer.ml` & `synthesizer.ml`
|
||||
|
||||
### DSL result
|
||||
```
|
||||
TODO
|
||||
```
|
||||
|
||||
### C++ result
|
||||
```
|
||||
TODO
|
||||
```
|
||||
|
|
@ -538,13 +538,13 @@ struct
|
|||
valcopyo mem v' tp' (Std.pair mem_cp v_cp) &
|
||||
mem_addo mem_cp v_cp (Std.pair mem_add id_add) &
|
||||
mem_with_id' == (mem_add, RefV id_add) } } } |
|
||||
{ fresh vs, tps, init_mem_with_vs, mem_with_vs', mem', vs' in
|
||||
{ fresh vs, tps, mem', vs', vs'' in
|
||||
v == TupleV vs &
|
||||
tp == TupleT tps &
|
||||
init_mem_with_vs == Std.pair mem [] &
|
||||
list_foldl2o valcopy_foldero init_mem_with_vs vs tps mem_with_vs' &
|
||||
Std.pair mem' vs' == mem_with_vs' &
|
||||
mem_with_id' == Std.pair mem' (TupleV vs') }
|
||||
list_foldl2o valcopy_foldero (Std.pair mem []) vs tps (Std.pair mem' vs') &
|
||||
== mem_with_vs' &
|
||||
List.reverso vs' vs''
|
||||
mem_with_id' == Std.pair mem' (TupleV vs'') }
|
||||
}
|
||||
|
||||
(* - value update *)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue