From 7c68064c9a63f39e66b6ab185a36c1fb6ca08e53 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Fri, 24 Jul 2020 16:21:23 -0500 Subject: [PATCH] Update dependency: deps/k_release (#1995) * deps/k_release: v5.0.0-e698f30 * deps/k_release: v5.0.0-cecacf8 * deps/k_release: v5.0.0-d10c70c * deps/k_release: v5.0.0-bbc70cb * test: make golden Co-authored-by: Thomas Tuegel --- deps/k_release | 2 +- test/imp/1.merge.out.golden | 13 ++++++------ test/imp/2.merge.out.golden | 21 +++++++++++-------- ...save-proofs-spec.k.save-proofs.kore.golden | 10 +++++---- .../simple-lists/broken-spec.k.out.golden | 2 +- test/priority/1.merge.out.golden | 8 +++---- test/priority/2.merge.out.golden | 8 +++---- .../test-1-spec.k.out.golden | 2 +- test/save-proofs/test-1-spec.k.out.golden | 2 +- .../test-1-spec.k.save-proofs.kore.golden | 8 +++---- 10 files changed, 41 insertions(+), 35 deletions(-) diff --git a/deps/k_release b/deps/k_release index 4c3341eb06..fc7d3069f9 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -v5.0.0-e160771 +v5.0.0-bbc70cb diff --git a/test/imp/1.merge.out.golden b/test/imp/1.merge.out.golden index ae35262f73..a11deeeac9 100644 --- a/test/imp/1.merge.out.golden +++ b/test/imp/1.merge.out.golden @@ -15,7 +15,7 @@ /* Inj: */ inj{SortId{}, SortKItem{}}( /* Fl Fn D Sfa */ VarX:SortId{} ), - /* Fl Fn D Sfa */ VarDotVar2:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortK{} ) ), /* Fn Sfc */ @@ -31,11 +31,11 @@ /* Fl Fn D Sfa */ VarI:SortKItem{} ), /* opaque child: */ /* Fl Fn D Sfa */ - VarDotVar3:SortMap{} + Var'Unds'DotVar3:SortMap{} ) ) ), - /* Fl Fn D Sfa */ VarDotVar0:SortGeneratedCounterCell{} + /* Fl Fn D Sfa */ Var'Unds'DotVar0:SortGeneratedCounterCell{} ) ), /* Fn Spc */ @@ -47,7 +47,7 @@ /* Fl Fn D Spa */ kseq{}( /* Fl Fn D Sfa */ VarI:SortKItem{}, - /* Fl Fn D Sfa */ VarDotVar2:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortK{} ) ), /* Fn Sfc */ @@ -62,10 +62,11 @@ ), /* Fl Fn D Sfa */ VarI:SortKItem{} ), - /* opaque child: */ /* Fl Fn D Sfa */ VarDotVar3:SortMap{} + /* opaque child: */ /* Fl Fn D Sfa */ + Var'Unds'DotVar3:SortMap{} ) ) ), - /* Fl Fn D Sfa */ VarDotVar0:SortGeneratedCounterCell{} + /* Fl Fn D Sfa */ Var'Unds'DotVar0:SortGeneratedCounterCell{} ) ) \ No newline at end of file diff --git a/test/imp/2.merge.out.golden b/test/imp/2.merge.out.golden index 913b2e7725..77535a8593 100644 --- a/test/imp/2.merge.out.golden +++ b/test/imp/2.merge.out.golden @@ -13,7 +13,7 @@ /* Inj: */ inj{SortId{}, SortKItem{}}( /* Fl Fn D Sfa */ VarX:SortId{} ), - /* Fl Fn D Sfa */ VarDotVar3:SortMap{} + /* Fl Fn D Sfa */ Var'Unds'DotVar3:SortMap{} ), /* Fl Fn D Sfa Cl */ /* builtin: */ \dv{SortBool{}}("false") ), @@ -32,7 +32,8 @@ /* Fl Fn D Sfa */ VarI:SortInt{} ) ), - /* opaque child: */ /* Fl Fn D Sfa */ VarDotVar3:SortMap{} + /* opaque child: */ /* Fl Fn D Sfa */ + Var'Unds'DotVar3:SortMap{} ), /* Fn Sfc */ /* builtin: */ @@ -44,7 +45,8 @@ ), /* Fl Fn D Sfa */ VarI0:SortKItem{} ), - /* opaque child: */ /* Fl Fn D Sfa */ VarDotVar6:SortMap{} + /* opaque child: */ /* Fl Fn D Sfa */ + Var'Unds'DotVar6:SortMap{} ) ) ), @@ -73,7 +75,7 @@ /* Inj: */ inj{SortId{}, SortKItem{}}( /* Fl Fn D Sfa */ VarX0:SortId{} ), - /* Fl Fn D Sfa */ VarDotVar5:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar5:SortK{} ) ) ), @@ -90,11 +92,11 @@ /* Fl Fn D Sfa */ Var'Unds'0:SortKItem{} ), /* opaque child: */ /* Fl Fn D Sfa */ - VarDotVar3:SortMap{} + Var'Unds'DotVar3:SortMap{} ) ) ), - /* Fl Fn D Sfa */ VarDotVar4:SortGeneratedCounterCell{} + /* Fl Fn D Sfa */ Var'Unds'DotVar4:SortGeneratedCounterCell{} ) ), /* Fn Spa */ @@ -106,7 +108,7 @@ /* Fl Fn D Spa */ kseq{}( /* Fl Fn D Sfa */ VarI0:SortKItem{}, - /* Fl Fn D Sfa */ VarDotVar5:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar5:SortK{} ) ), /* Fn Spa */ @@ -121,10 +123,11 @@ ), /* Fl Fn D Sfa */ VarI0:SortKItem{} ), - /* opaque child: */ /* Fl Fn D Sfa */ VarDotVar6:SortMap{} + /* opaque child: */ /* Fl Fn D Sfa */ + Var'Unds'DotVar6:SortMap{} ) ) ), - /* Fl Fn D Sfa */ VarDotVar4:SortGeneratedCounterCell{} + /* Fl Fn D Sfa */ Var'Unds'DotVar4:SortGeneratedCounterCell{} ) ) \ No newline at end of file diff --git a/test/imp/sum-save-proofs-spec.k.save-proofs.kore.golden b/test/imp/sum-save-proofs-spec.k.save-proofs.kore.golden index ddf5889218..0eef08838c 100644 --- a/test/imp/sum-save-proofs-spec.k.save-proofs.kore.golden +++ b/test/imp/sum-save-proofs-spec.k.save-proofs.kore.golden @@ -104,7 +104,7 @@ module haskell-backend-saved-claims-43943e50-f723-47cd-99fd-07104d664c6d ) ) ), - /* Fl Fn D Sfa */ VarDotVar2:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortK{} ) ), /* Fl Fn D Spa */ @@ -139,7 +139,7 @@ module haskell-backend-saved-claims-43943e50-f723-47cd-99fd-07104d664c6d ), /* Fl Fn D Spa */ Lbl'-LT-'generatedCounter'-GT-'{}( - /* Fl Fn D Sfa */ VarDotVar3:SortInt{} + /* Fl Fn D Sfa */ Var'Unds'DotVar3:SortInt{} ) ) ), @@ -150,7 +150,9 @@ module haskell-backend-saved-claims-43943e50-f723-47cd-99fd-07104d664c6d /* Fn Spa */ Lbl'-LT-'T'-GT-'{}( /* Fl Fn D Spa */ - Lbl'-LT-'k'-GT-'{}(/* Fl Fn D Sfa */ VarDotVar2:SortK{}), + Lbl'-LT-'k'-GT-'{}( + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortK{} + ), /* Fn Spa */ Lbl'-LT-'state'-GT-'{}( /* Fn Spa */ @@ -200,7 +202,7 @@ module haskell-backend-saved-claims-43943e50-f723-47cd-99fd-07104d664c6d ), /* Fl Fn D Spa */ Lbl'-LT-'generatedCounter'-GT-'{}( - /* Fl Fn D Sfa */ VarDotVar3:SortInt{} + /* Fl Fn D Sfa */ Var'Unds'DotVar3:SortInt{} ) ) ) diff --git a/test/overloads/simple-lists/broken-spec.k.out.golden b/test/overloads/simple-lists/broken-spec.k.out.golden index 66c0f7f37e..a73cfee30f 100644 --- a/test/overloads/simple-lists/broken-spec.k.out.golden +++ b/test/overloads/simple-lists/broken-spec.k.out.golden @@ -1,3 +1,3 @@ - i1 i2 .EmptyStmts ~> DotVar1 ~> . + i1 i2 .EmptyStmts ~> _DotVar1 ~> . diff --git a/test/priority/1.merge.out.golden b/test/priority/1.merge.out.golden index 0caf516968..6e0ce15bda 100644 --- a/test/priority/1.merge.out.golden +++ b/test/priority/1.merge.out.golden @@ -62,10 +62,10 @@ /* Fl Fn D Sfa */ VarX0:SortInt{} ) ), - /* Fl Fn D Sfa */ VarDotVar3:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar3:SortK{} ) ), - /* Fl Fn D Sfa */ VarDotVar2:SortGeneratedCounterCell{} + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortGeneratedCounterCell{} ) ) ), @@ -79,9 +79,9 @@ /* Inj: */ inj{SortS{}, SortKItem{}}( /* Fl Fn D Sfa Cl */ Lbltwo'Unds'PRIORITY'Unds'S{}() ), - /* Fl Fn D Sfa */ VarDotVar3:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar3:SortK{} ) ), - /* Fl Fn D Sfa */ VarDotVar2:SortGeneratedCounterCell{} + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortGeneratedCounterCell{} ) ) \ No newline at end of file diff --git a/test/priority/2.merge.out.golden b/test/priority/2.merge.out.golden index bd366abbf6..147d482b22 100644 --- a/test/priority/2.merge.out.golden +++ b/test/priority/2.merge.out.golden @@ -65,10 +65,10 @@ /* Fl Fn D Sfa */ VarX0:SortInt{} ) ), - /* Fl Fn D Sfa */ VarDotVar3:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar3:SortK{} ) ), - /* Fl Fn D Sfa */ VarDotVar2:SortGeneratedCounterCell{} + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortGeneratedCounterCell{} ) ) ), @@ -82,9 +82,9 @@ /* Inj: */ inj{SortS{}, SortKItem{}}( /* Fl Fn D Sfa Cl */ Lblone'Unds'PRIORITY'Unds'S{}() ), - /* Fl Fn D Sfa */ VarDotVar3:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar3:SortK{} ) ), - /* Fl Fn D Sfa */ VarDotVar2:SortGeneratedCounterCell{} + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortGeneratedCounterCell{} ) ) \ No newline at end of file diff --git a/test/remove-destination/test-1-spec.k.out.golden b/test/remove-destination/test-1-spec.k.out.golden index 567b90c743..d322d22053 100644 --- a/test/remove-destination/test-1-spec.k.out.golden +++ b/test/remove-destination/test-1-spec.k.out.golden @@ -36,7 +36,7 @@ #And a ( K:Int |-> V:Int - M ) ~> DotVar1 ~> . + M ) ~> _DotVar1 ~> . #And { diff --git a/test/save-proofs/test-1-spec.k.out.golden b/test/save-proofs/test-1-spec.k.out.golden index 9453df52b3..a6484687fa 100644 --- a/test/save-proofs/test-1-spec.k.out.golden +++ b/test/save-proofs/test-1-spec.k.out.golden @@ -1,3 +1,3 @@ - AA ( X ) ~> DotVar1 ~> . + AA ( X ) ~> _DotVar1 ~> . diff --git a/test/save-proofs/test-1-spec.k.save-proofs.kore.golden b/test/save-proofs/test-1-spec.k.save-proofs.kore.golden index 2ffc1e8d28..4fc53ad92c 100644 --- a/test/save-proofs/test-1-spec.k.save-proofs.kore.golden +++ b/test/save-proofs/test-1-spec.k.save-proofs.kore.golden @@ -17,12 +17,12 @@ module haskell-backend-saved-claims-43943e50-f723-47cd-99fd-07104d664c6d LblBB'LParUndsRParUnds'SAVE-PROOFS'Unds'KItem'Unds'Int{}( /* Fl Fn D Sfa */ VarX:SortInt{} ), - /* Fl Fn D Sfa */ VarDotVar1:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar1:SortK{} ) ), /* Fl Fn D Spa */ Lbl'-LT-'generatedCounter'-GT-'{}( - /* Fl Fn D Sfa */ VarDotVar2:SortInt{} + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortInt{} ) ) ), @@ -38,12 +38,12 @@ module haskell-backend-saved-claims-43943e50-f723-47cd-99fd-07104d664c6d LblCC'LParUndsRParUnds'SAVE-PROOFS'Unds'KItem'Unds'Int{}( /* Fl Fn D Sfa */ VarX:SortInt{} ), - /* Fl Fn D Sfa */ VarDotVar1:SortK{} + /* Fl Fn D Sfa */ Var'Unds'DotVar1:SortK{} ) ), /* Fl Fn D Spa */ Lbl'-LT-'generatedCounter'-GT-'{}( - /* Fl Fn D Sfa */ VarDotVar2:SortInt{} + /* Fl Fn D Sfa */ Var'Unds'DotVar2:SortInt{} ) ) )