skov: "skov.basis" load works now

diff --git a/extra/skov/basis/code/factor-abstraction/factor-abstraction.factor b/extra/skov/basis/code/factor-abstraction/factor-abstraction.factor
index 3c13e60d29c1cbfbb08097ff4c5c87c8a2ceed9c..6534c1cf5500c5ba6f2d5d06de43958448236cb6 100644 (file)
--- a/extra/skov/basis/code/factor-abstraction/factor-abstraction.factor
+++ b/extra/skov/basis/code/factor-abstraction/factor-abstraction.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2016-2017 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors code combinators combinators.smart effects
+USING: accessors skov.basis.code combinators combinators.smart effects
 kernel locals math math.parser quotations sequences splitting
 stack-checker strings vectors words ;
-FROM: code => call word ;
+FROM: skov.basis.code => call word ;
 IN: skov.basis.code.factor-abstraction
 
 :: call-from-factor ( factor-word -- call )

diff --git a/extra/skov/basis/help/help.factor b/extra/skov/basis/help/help.factor
index a0e754e05cf1686574da60d9837f6151dd8da9fb..bcdc4f2c0982149013509b80e97c20c090a1c3e0 100644 (file)
--- a/extra/skov/basis/help/help.factor
+++ b/extra/skov/basis/help/help.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs classes classes.error combinators
 combinators.short-circuit continuations debugger effects fry
-generic help.crossref help.markup help.stylesheet help.topics io
+generic help.crossref skov.basis.help.markup help.stylesheet help.topics io
 io.styles kernel make namespaces prettyprint sequences sets
 sorting vocabs words words.alias words.symbol ;
 IN: skov.basis.help

diff --git a/extra/skov/basis/ui/gadgets/pens/gradient-rounded/gradient-rounded.factor b/extra/skov/basis/ui/gadgets/pens/gradient-rounded/gradient-rounded.factor
index 175493ff77d4e9d433aaa3f8356af0f769a69e07..c50fe42b524bc6589c34e03efbfa216a55bdf7b2 100755 (executable)
--- a/extra/skov/basis/ui/gadgets/pens/gradient-rounded/gradient-rounded.factor
+++ b/extra/skov/basis/ui/gadgets/pens/gradient-rounded/gradient-rounded.factor
@@ -1,8 +1,8 @@
 USING: accessors arrays assocs colors combinators
 combinators.short-circuit combinators.smart kernel locals math
-math.functions math.order math.ranges math.vectors opengl.gl
+math.functions math.order ranges math.vectors opengl.gl
 sequences ui.gadgets ui.gadgets.packs ui.pens ui.pens.caching
-skov.basis.ui.pens.gradient system ;
+ui.pens.gradient system ;
 IN: skov.basis.ui.pens.gradient-rounded
 
 TUPLE: gradient-shape < caching-pen  colors foreground shape last-vertices last-colors ;

diff --git a/extra/skov/basis/ui/tools/environment/tree/help-tree/help-tree.factor b/extra/skov/basis/ui/tools/environment/tree/help-tree/help-tree.factor
index abfe971a8d7e889806c30c98425629c208ce69e2..3c8239476c0f961d0a6bcc72bfbca198773fec48 100644 (file)
--- a/extra/skov/basis/ui/tools/environment/tree/help-tree/help-tree.factor
+++ b/extra/skov/basis/ui/tools/environment/tree/help-tree/help-tree.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2016-2017 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: code code.factor-abstraction continuations kernel models
-ui.gadgets.borders ui.gadgets.labels ui.tools.environment.tree words ;
+USING: skov.basis.code skov.basis.code.factor-abstraction continuations kernel models
+ui.gadgets.borders ui.gadgets.labels
+skov.basis.ui.tools.environment.tree ;
 
-IN: ui.tools.environment.tree.help-tree
+IN: skov.basis.ui.tools.environment.tree.help-tree
 
 : <help-tree> ( factor-word -- gadget )
     word new swap call-from-factor add-element

diff --git a/extra/skov/basis/ui/tools/tools.factor b/extra/skov/basis/ui/tools/tools.factor
index 1d9a3413bbec92432d1f5449d8a4c400bfcd1eee..494990499458981eeca804b043a9fdc037ec4ed2 100644 (file)
--- a/extra/skov/basis/ui/tools/tools.factor
+++ b/extra/skov/basis/ui/tools/tools.factor
@@ -3,7 +3,7 @@
 USING: io.pathnames kernel literals memory namespaces sequences
 system tools.test ui ui.backend ui.commands ui.gestures
 ui.tools.browser ui.tools.button-list ui.tools.common
-ui.tools.error-list ui.tools.listener vocabs.refresh ui.tools.environment ;
+ui.tools.error-list ui.tools.listener vocabs.refresh skov.basis.ui.tools.environment ;
 IN: skov.basis.ui.tools
 
 \ refresh-all H{ { +nullary+ t } { +listener+ t } } define-command