diff --git a/basis/compiler/cfg/cfg.factor b/basis/compiler/cfg/cfg.factor index a595a87b3b..035cc63b1e 100644 --- a/basis/compiler/cfg/cfg.factor +++ b/basis/compiler/cfg/cfg.factor @@ -4,6 +4,7 @@ USING: kernel math vectors arrays accessors namespaces ; IN: compiler.cfg TUPLE: basic-block < identity-tuple +id number { instructions vector } { successors vector } @@ -11,10 +12,13 @@ number : ( -- bb ) basic-block new + \ basic-block counter >>id V{ } clone >>instructions V{ } clone >>successors V{ } clone >>predecessors ; +M: basic-block hashcode* nip id>> ; + TUPLE: cfg { entry basic-block } word label spill-area-size reps post-order linear-order diff --git a/basis/compiler/tests/intrinsics.factor b/basis/compiler/tests/intrinsics.factor index b2159e9c09..7fe5e2b601 100755 --- a/basis/compiler/tests/intrinsics.factor +++ b/basis/compiler/tests/intrinsics.factor @@ -585,16 +585,16 @@ TUPLE: alien-accessor-regression { b byte-array } { i fixnum } ; swap [ { tuple } declare 1 slot ] [ - 0 slot + 1 slot ] if ; -[ t ] [ f B{ } mutable-value-bug-1 byte-array type-number = ] unit-test +[ 0 ] [ f { } mutable-value-bug-1 ] unit-test : mutable-value-bug-2 ( a b -- c ) swap [ - 0 slot + 1 slot ] [ { tuple } declare 1 slot ] if ; -[ t ] [ t B{ } mutable-value-bug-2 byte-array type-number = ] unit-test +[ 0 ] [ t { } mutable-value-bug-2 ] unit-test diff --git a/core/io/pathnames/pathnames-docs.factor b/core/io/pathnames/pathnames-docs.factor index 07664ba331..8dacef6f8c 100644 --- a/core/io/pathnames/pathnames-docs.factor +++ b/core/io/pathnames/pathnames-docs.factor @@ -134,7 +134,7 @@ $nl "If a pathname begins with " { $snippet "vocab:" } ", then it will be searched for in all current vocabulary roots (see " { $link "add-vocab-roots" } ")." ; ARTICLE: "io.pathnames.presentations" "Pathname presentations" -"Pathname presentations are objects that wrap a pathname string. Clicking a pathname presentation in the UI brings up the file in one of the supported editors. See " { $link "editor" } " for more details." +"Pathname presentations are objects that wrap a pathname string. Clicking a pathname presentation in the UI brings up the file in one of the supported editors. See " { $link "editor" } " for more details." { $subsections pathname