Changeset 1464

Timestamp:

04/03/05 10:29:11 (4 years ago)

Author:

mugwump

svk:copy_cache_prev:

2941

Message:

r6094@speights: samv | 2005-04-03 16:28:18 +0800
Rename Category back to Assoc, Category is probably incorrect

Files:

• VICTUALS (modified) (1 diff)
• src/Class.hs (modified) (6 diffs)

VICTUALS

@@ -37 +37 @@
 
 Kwiki, the Ritalin and Everything        Brian Ingerson ref:YAPC::Taipei::2005
+
+the true Black Meat, flesh of the
+giant aquatic Brazilian centipede        Sam Vilain

src/Class.hs

@@ -43 +43 @@
     --, clsAssocs     :: Map Label MetaAssoc
     --, clsRevAssocs  :: Map Label MetaAssoc
-    , clsCats       :: Map Label (Visibility, MetaCategory)
+    , clsCats       :: Map Label (Visibility, MetaAssoc)
     }
 
@@ -82 +82 @@
     writing proofs.
 -}
-data MetaCategory = MetaCategory
+data MetaAssoc = MetaAssoc
     { catClass       :: MetaClass
-    , catPair        :: MetaCategory
+    , catPair        :: MetaAssoc
     , catRange       :: Range
     , catIsComposite :: Bool        -- if you kill this, its children
@@ -95 +95 @@
 {-
 
-    ∃ MetaClass A, MetaCategory C : A.clsCats ∋ C ↔ C.catClass = A
-
-    ∃ MetaCategory C₁, C₂ : C₁.catPair = C₂ ↔ C₂.catPair = C₁
+    ∃ MetaClass A, MetaAssoc C : A.clsCats ∋ C ↔ C.catClass = A
+
+    ∃ MetaAssoc C₁, C₂ : C₁.catPair = C₂ ↔ C₂.catPair = C₁
 
     -- can't be composite both ways
 
-    ∃ MetaCategory C₁, C₂ : C₁.catPair = C₂ ∧ C₁.catIsComposite
+    ∃ MetaAssoc C₁, C₂ : C₁.catPair = C₂ ∧ C₁.catIsComposite
          → ¬(C₂.catIsComposite)
 
     -- this seems the simplest way to specify complementary categories
 
-    ∃ MetaCategory C₁, C₂, MetaClass M₁, M₂
+    ∃ MetaAssoc C₁, C₂, MetaClass M₁, M₂
        : C₁.catPair = C₂ ∧ C₁.catClass = M₁ ∧ C₂.catClass = M₂
        → (   ∃ M₁.clsCats{C₂.catCompanion}
@@ -178 +178 @@
   Package.clsCats =
         { pkgChildren = 
-              (Public, MetaCategory
+              (Public, MetaAssoc
                 { catIsComposite = true,
                   catRange = (Zero, One),
                   catCompanion = "pkgParent",
-                  catPair = MetaCategory {
+                  catPair = MetaAssoc {
                      catClass = Package,
                      catRange = (Zero, Many),
@@ -218 +218 @@
 
   Module.clsAssocs =
-        { modTraits = (Public, MetaCategory
+        { modTraits = (Public, MetaAssoc
                       { catIsComposite = true,
                         catRange = (Zero, Many),
                         catCompanion = "pkgParent",
                         catKeyed = true,
-                        catPair = MetaCategory
+                        catPair = MetaAssoc
                                    ( { catClass = PkgTrait,
                                        catRange = (One, One) } ),
@@ -231 +231 @@
   Class := MetaClass where clsName = "Class"
   Class.clsAssocs =
-        { isa = (Public, MetaCategory
+        { isa = (Public, MetaAssoc
                          { catOrdered = true,
                            catRange = (Zero, Many),
                            catCompanion = "subClasses",
-                           catPair = MetaCategory
+                           catPair = MetaAssoc
                                      { catRange = (Zero, Many),
                                        catClass = Class }
                          }),
-          methods = (Public, MetaCategory
+          methods = (Public, MetaAssoc
                              { catKeyed = true,
                                catRange = (Zero, Many),
                                catCompanion = "Class",
-                               catPair = MetaCategory
+                               catPair = MetaAssoc
                                          { catRange = (One, One),
                                            catClass = Method