diff --git a/unison-src/transcripts/name-selection.md b/unison-src/transcripts/name-selection.md index cff6c15d4..5443349c0 100644 --- a/unison-src/transcripts/name-selection.md +++ b/unison-src/transcripts/name-selection.md @@ -5,10 +5,8 @@ This transcript shows how the pretty-printer picks names for a hash when multipl 3. Otherwise if there are multiple names with a minimal number of segments, compare the names alphabetically. ```ucm:hide -.a> builtins.merge -.a2> builtins.merge -.a3> builtins.merge -.biasing> builtins.merge +scratch/main> builtins.merge lib.builtins +scratch/biasing> builtins.merge lib.builtins ``` ```unison:hide @@ -20,8 +18,8 @@ a.aaa.but.more.segments = 0 + 1 Will add `a` and `b` to the codebase and give `b` a longer (in terms of segment length alias), and show that it isn't used when viewing `a`: ```ucm -.> add -.a> view a +scratch/main> add +scratch/main> view a.a ``` Next let's introduce a conflicting symbol and show that its hash qualified name isn't used when it has an unconflicted name: @@ -43,9 +41,9 @@ a3.long.name.but.shortest.suffixification = 1 ``` ```ucm -.> add -.> debug.alias.term.force a2.c a3.c -.> debug.alias.term.force a2.d a3.d +scratch/main> add +scratch/main> debug.alias.term.force a2.c a3.c +scratch/main> debug.alias.term.force a2.d a3.d ``` At this point, `a3` is conflicted for symbols `c` and `d`, so those are deprioritized. @@ -53,7 +51,7 @@ The original `a2` namespace has an unconflicted definition for `c` and `d`, but `a2.c` is chosen because although the suffixified version has fewer segments, its fully-qualified name has the fewest segments. ```ucm -.> view a b c d +scratch/main> view a b c d ``` ## Name biasing @@ -68,11 +66,11 @@ a = 10 ``` ```ucm -.biasing> add +scratch/biasing> add -- Despite being saved with name `a`, -- the pretty printer should prefer the suffixified 'deeply.nested.num name' over the shallow 'a'. -- It's closer to the term being printed. -.biasing> view deeply.nested.term +scratch/biasing> view deeply.nested.term ``` Add another term with `num` suffix to force longer suffixification of `deeply.nested.num` @@ -82,8 +80,8 @@ other.num = 20 ``` ```ucm -.biasing> add +scratch/biasing> add -- nested.num should be preferred over the shorter name `a` due to biasing -- because `deeply.nested.num` is nearby to the term being viewed. -.biasing> view deeply.nested.term +scratch/biasing> view deeply.nested.term ``` diff --git a/unison-src/transcripts/name-selection.output.md b/unison-src/transcripts/name-selection.output.md index a9b3d9679..fd076c9cc 100644 --- a/unison-src/transcripts/name-selection.output.md +++ b/unison-src/transcripts/name-selection.output.md @@ -13,7 +13,7 @@ a.aaa.but.more.segments = 0 + 1 Will add `a` and `b` to the codebase and give `b` a longer (in terms of segment length alias), and show that it isn't used when viewing `a`: ```ucm -.> add +scratch/main> add ⍟ I've added these definitions: @@ -21,10 +21,10 @@ Will add `a` and `b` to the codebase and give `b` a longer (in terms of segment a.aaa.but.more.segments : Nat a.b : Nat -.a> view a +scratch/main> view a.a - a : Nat - a = + a.a : Nat + a.a = use Nat + b + 1 @@ -48,7 +48,7 @@ a3.long.name.but.shortest.suffixification = 1 ``` ```ucm -.> add +scratch/main> add ⍟ I've added these definitions: @@ -71,11 +71,11 @@ a3.long.name.but.shortest.suffixification = 1 a3.d : Nat a3.long.name.but.shortest.suffixification : Nat -.> debug.alias.term.force a2.c a3.c +scratch/main> debug.alias.term.force a2.c a3.c Done. -.> debug.alias.term.force a2.d a3.d +scratch/main> debug.alias.term.force a2.d a3.d Done. @@ -85,7 +85,7 @@ The original `a2` namespace has an unconflicted definition for `c` and `d`, but `a2.c` is chosen because although the suffixified version has fewer segments, its fully-qualified name has the fewest segments. ```ucm -.> view a b c d +scratch/main> view a b c d a.a : Nat a.a = @@ -141,7 +141,7 @@ a = 10 ``` ```ucm -.biasing> add +scratch/biasing> add ⍟ I've added these definitions: @@ -152,7 +152,7 @@ a = 10 -- Despite being saved with name `a`, -- the pretty printer should prefer the suffixified 'deeply.nested.num name' over the shallow 'a'. -- It's closer to the term being printed. -.biasing> view deeply.nested.term +scratch/biasing> view deeply.nested.term deeply.nested.term : Nat deeply.nested.term = @@ -180,7 +180,7 @@ other.num = 20 ``` ```ucm -.biasing> add +scratch/biasing> add ⍟ I've added these definitions: @@ -188,7 +188,7 @@ other.num = 20 -- nested.num should be preferred over the shorter name `a` due to biasing -- because `deeply.nested.num` is nearby to the term being viewed. -.biasing> view deeply.nested.term +scratch/biasing> view deeply.nested.term deeply.nested.term : Nat deeply.nested.term =