definitions: Separate definition definitions.

diff --git a/basis/help/tips/tips.factor b/basis/help/tips/tips.factor
index 241e54d967c746261b61a13626fe622aca48746d..d07d67d570bfaf2adc4ca93b2753d9310fed20e2 100644 (file)
--- a/basis/help/tips/tips.factor
+++ b/basis/help/tips/tips.factor
@@ -58,4 +58,4 @@ H{
 : $tips-of-the-day ( element -- )
     drop tips get [ nl nl ] [ content>> print-element ] interleave ;
 
-INSTANCE: tip definition
+INSTANCE: tip definition-mixin

diff --git a/basis/help/topics/topics.factor b/basis/help/topics/topics.factor
index fafbf14274c262047e3d5c0a38961ca595881c9d..322b92eee3fc8590bdb3d233bb39b64c29c88e70 100644 (file)
--- a/basis/help/topics/topics.factor
+++ b/basis/help/topics/topics.factor
@@ -7,7 +7,7 @@ IN: help.topics
 
 TUPLE: link name ;
 
-INSTANCE: link definition
+INSTANCE: link definition-mixin
 
 MIXIN: topic
 
@@ -81,4 +81,4 @@ M: f valid-article? drop t ;
 M: f article-title drop \ f article-title ;
 M: f article-content drop \ f article-content ;
 M: f article-parent drop \ f article-parent ;
-M: f set-article-parent drop \ f set-article-parent ;
\ No newline at end of file
+M: f set-article-parent drop \ f set-article-parent ;

diff --git a/core/definitions/definitions.factor b/core/definitions/definitions.factor
index f76dcf590a769e3180bebeb34271ab3d4463f0b2..95c452d55bf40b2823bf5630d15ab879c674e76e 100644 (file)
--- a/core/definitions/definitions.factor
+++ b/core/definitions/definitions.factor
@@ -3,7 +3,7 @@
 USING: accessors assocs kernel namespaces sequences sets ;
 IN: definitions
 
-MIXIN: definition
+MIXIN: definition-mixin
 
 ERROR: no-compilation-unit definition ;
 

diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor
index e197dff51000458492e5eb0292cb25cb411dd7c2..72f179185807d4e391f5d7ef2a44cb94cb39bf6e 100644 (file)
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@@ -135,7 +135,7 @@ SYMBOL: require-hook
 PREDICATE: runnable-vocab < vocab
     vocab-main >boolean ;
 
-INSTANCE: vocab-spec definition
+INSTANCE: vocab-spec definition-mixin
 
 : call-require-hook ( name -- )
     require-hook get call( name -- ) ;

diff --git a/core/words/words.factor b/core/words/words.factor
index 398e4288630073194d015c486ff01b2a9056cea9..ac0b729f06f02d107a6f26d2118e1941b30a43b3 100644 (file)
--- a/core/words/words.factor
+++ b/core/words/words.factor
@@ -256,4 +256,4 @@ M: word hashcode*
 
 M: word literalize <wrapper> ;
 
-INSTANCE: word definition
+INSTANCE: word definition-mixin