From b8542177969ac0a88b905a0f6002f0c6ce9d2b3f Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 15 Jun 2018 15:51:02 -0700 Subject: [PATCH] tools.scaffold: quick fix for scaffold-vocab bug. root-cache was getting added to with ``f`` and then subsequent check fails. --- basis/tools/scaffold/scaffold.factor | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor index db602ce4e5..d4da9a78ae 100644 --- a/basis/tools/scaffold/scaffold.factor +++ b/basis/tools/scaffold/scaffold.factor @@ -22,7 +22,7 @@ ERROR: vocab-must-not-exist string ; trim-tail-separators vocab-roots get member? ; : ensure-vocab-exists ( string -- string ) - dup loaded-vocab-names member? [ no-vocab ] unless ; + dup lookup-vocab [ no-vocab ] unless ; : check-root ( string -- string ) dup vocab-root? [ not-a-vocab-root ] unless ; @@ -31,10 +31,11 @@ ERROR: vocab-must-not-exist string ; [ check-root ] [ check-vocab-name ] bi* ; : check-vocab-exists ( string -- string ) - dup vocab-exists? [ vocab-must-not-exist ] when ; + dup vocab-exists? [ vocab-must-not-exist ] when + dup root-cache get delete-at ; : replace-vocab-separators ( vocab -- path ) - path-separator first CHAR: . associate substitute ; inline + path-separator first CHAR: . associate substitute ; : vocab-root/vocab>path ( vocab-root vocab -- path ) check-vocab-root/vocab