diff options
| author | Alasdair Armstrong | 2017-08-10 23:28:43 +0100 |
|---|---|---|
| committer | Alasdair Armstrong | 2017-08-10 23:28:43 +0100 |
| commit | 01f382196302e378c377c96bf249236e06d7291c (patch) | |
| tree | 69bfa09d2ec3d8011740f3f322e37f8112c5e0a9 /src/pretty_print_sail.ml | |
| parent | de787176067f4569af1ed4133b0edf72d4dcd4a1 (diff) | |
| parent | 588c45e84642425fe9530f4ef6a44753cc54a0f8 (diff) | |
Merge remote-tracking branch 'origin/sail_new_tc' into experiments
Conflicts:
src/pretty_print_common.ml
Diffstat (limited to 'src/pretty_print_sail.ml')
| -rw-r--r-- | src/pretty_print_sail.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pretty_print_sail.ml b/src/pretty_print_sail.ml index aff3a976..a63df7ea 100644 --- a/src/pretty_print_sail.ml +++ b/src/pretty_print_sail.ml @@ -117,7 +117,7 @@ let doc_pat, doc_atomic_pat = | P_vector_indexed ipats -> brackets (separate_map comma_sp npat ipats) | P_tup pats -> parens (separate_map comma_sp atomic_pat pats) | P_list pats -> squarebarbars (separate_map semi_sp atomic_pat pats) - | P_cons (pat1, pat2) -> separate space [atomic_pat pat1; string "::"; pat pat2] + | P_cons (pat1, pat2) -> separate space [atomic_pat pat1; coloncolon; pat pat2] | P_app(_, _ :: _) | P_vector_concat _ -> group (parens (pat pa)) and fpat (FP_aux(FP_Fpat(id,fpat),_)) = doc_op equals (doc_id id) (pat fpat) @@ -155,7 +155,7 @@ let doc_exp, doc_let = | E_vector_append(l,r) -> doc_op colon (shift_exp l) (cons_exp r) | E_cons(l,r) -> - doc_op colon (shift_exp l) (cons_exp r) + doc_op coloncolon (shift_exp l) (cons_exp r) | _ -> shift_exp expr and shift_exp ((E_aux(e,_)) as expr) = match e with | E_app_infix(l,(Id_aux(Id (">>" | ">>>" | "<<" | "<<<"),_) as op),r) -> |