Commit c6d1841
Add explicit ML effect annotations for --MLish removal
With the removal of --MLish from F*, functions that call effectful
operations must now have explicit ML return type annotations. The
--MLish flag previously made ML the default effect for all unannotated
top-level let bindings; without it, the default is Tot.
Changes by file:
src/syntax_extension/PulseSyntaxExtension.Sugar.fst:
- Added 'open FStarC.Effect' and 'open FStarC.Class.Deq'
- eq_ident, eq_lident: added ': ML bool' (=? operator is ML)
- forall2: changed parameter type to 'f:'a -> 'a -> ML bool'
- eq_opt, eq_slprop, eq_while_invariant1: added ': ML bool'
- Entire eq_decl mutual recursion block (eq_decl, eq_fn_decl,
eq_fn_defn, eq_slprop_defn, eq_ascription, eq_computation_type,
eq_annot, eq_body, eq_stmt, eq_stmt', eq_let_init, eq_array_init,
eq_hint_type, eq_ensures_slprop, eq_lambda): added ': ML bool'
- stmt_to_string, branch_to_string: added ': ML string'
src/syntax_extension/PulseSyntaxExtension.Err.fst:
- err type: nat -> ML (...) instead of nat -> Tot (...)
- bind_err, map_err_opt: added ML annotations
src/syntax_extension/PulseSyntaxExtension.Desugar.fst:
- All desugar_* functions: added ': ML (err ...)' annotations
- as_qual: added ML annotation
- desugar_decl: moved out of mutual recursion group (it calls
but is not called by the other mutually recursive functions)
- Helper functions (close_st_term_bvs, close_comp_bvs,
fold_right1, sugar_app, sugar_var, etc.): added ML annotations
src/syntax_extension/PulseSyntaxExtension.ASTBuilder.fst:
- Functions calling mk/mk_term/show: added ML annotations
src/syntax_extension/PulseSyntaxExtension.Env.fst:
- Functions using refs and show: added ML annotations
src/syntax_extension/PulseSyntaxExtension.Printing.fst:
- Printing functions using show: added ML annotations
src/extraction/ExtractPulse.fst:
- lookup_goto: added ': ML' (dereferences goto_env ref)
src/extraction/ExtractPulseC.fst:
- char_of_typechar, string_of_typestring, go: added ML annotations
- Functions calling FStarC.String operations: added ML annotations
src/extraction/ExtractPulseOCaml.fst:
- hua, tr_typ: added ': ML' annotations
Build verified: clean build passes with no errors.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent 0abf8e8 commit c6d1841
File tree
10 files changed
+156
-151
lines changed- src
- extraction
- syntax_extension
10 files changed
+156
-151
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
| 77 | + | |
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
34 | | - | |
| 33 | + | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
| 52 | + | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
67 | | - | |
| 66 | + | |
| 67 | + | |
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
84 | | - | |
| 84 | + | |
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
| 127 | + | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | | - | |
| 138 | + | |
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
| |||
302 | 302 | | |
303 | 303 | | |
304 | 304 | | |
305 | | - | |
306 | | - | |
| 305 | + | |
| 306 | + | |
307 | 307 | | |
308 | 308 | | |
309 | 309 | | |
| |||
347 | 347 | | |
348 | 348 | | |
349 | 349 | | |
| 350 | + | |
350 | 351 | | |
351 | 352 | | |
352 | 353 | | |
| |||
355 | 356 | | |
356 | 357 | | |
357 | 358 | | |
| 359 | + | |
358 | 360 | | |
359 | 361 | | |
360 | 362 | | |
| |||
368 | 370 | | |
369 | 371 | | |
370 | 372 | | |
| 373 | + | |
371 | 374 | | |
372 | 375 | | |
373 | 376 | | |
374 | 377 | | |
375 | 378 | | |
376 | 379 | | |
377 | 380 | | |
| 381 | + | |
378 | 382 | | |
379 | 383 | | |
380 | 384 | | |
| |||
386 | 390 | | |
387 | 391 | | |
388 | 392 | | |
389 | | - | |
| 393 | + | |
390 | 394 | | |
391 | 395 | | |
392 | 396 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
| 77 | + | |
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
| |||
Lines changed: 11 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
| 57 | + | |
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | | - | |
| 75 | + | |
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
85 | | - | |
| 85 | + | |
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
113 | | - | |
| 113 | + | |
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | | - | |
| 138 | + | |
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
| |||
160 | 160 | | |
161 | 161 | | |
162 | 162 | | |
163 | | - | |
| 163 | + | |
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
| |||
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
221 | | - | |
| 221 | + | |
222 | 222 | | |
223 | 223 | | |
224 | 224 | | |
| |||
230 | 230 | | |
231 | 231 | | |
232 | 232 | | |
233 | | - | |
| 233 | + | |
234 | 234 | | |
235 | 235 | | |
236 | 236 | | |
| |||
259 | 259 | | |
260 | 260 | | |
261 | 261 | | |
262 | | - | |
| 262 | + | |
263 | 263 | | |
264 | 264 | | |
265 | 265 | | |
| |||
0 commit comments