cvs commit: mod_parrot mod_parrot.diff

cvsuser     02/09/03 13:27:07

  Modified:    .        mod_parrot.diff
  Log:
  The way we register PMCs in global_setup.c changed
  
  Revision  Changes    Path
  1.9       +30 -27    mod_parrot/mod_parrot.diff
  
  Index: mod_parrot.diff
  ===================================================================
  RCS file: /cvs/public/mod_parrot/mod_parrot.diff,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -w -r1.8 -r1.9
  --- mod_parrot.diff	5 Jul 2002 21:42:46 -0000	1.8
  +++ mod_parrot.diff	3 Sep 2002 20:27:07 -0000	1.9
  @@ -1,42 +1,45 @@
   Index: global_setup.c
   ===================================================================
   RCS file: /cvs/public/parrot/global_setup.c,v
  -retrieving revision 1.28
  -diff -u -p -r1.28 global_setup.c
  ---- global_setup.c	4 Jul 2002 18:32:38 -0000	1.28
  -+++ global_setup.c	5 Jul 2002 21:37:39 -0000
  -@@ -32,6 +32,7 @@ init_world(void)
  -     Parrot_IntQueue_class_init(enum_class_IntQueue);
  -     Parrot_Sub_class_init(enum_class_Sub);
  -     Parrot_Coroutine_class_init(enum_class_Coroutine);
  +retrieving revision 1.35
  +diff -u -p -r1.35 global_setup.c
  +--- global_setup.c	2 Sep 2002 20:58:49 -0000	1.35
  ++++ global_setup.c	3 Sep 2002 20:23:04 -0000
  +@@ -31,6 +31,7 @@ extern void Parrot_Continuation_class_in
  + extern void Parrot_CSub_class_init(INTVAL);
  + extern void Parrot_MultiArray_class_init(INTVAL);
  + extern void Parrot_Key_class_init(INTVAL);
  ++extern void Parrot_Apache_class_init(INTVAL);
  + 
  + static void register_pmc(PMC* registry, int pmc_id)
  + {
  +@@ -62,6 +63,7 @@ init_world(void)
  +     Parrot_Continuation_class_init(enum_class_Continuation);
  +     Parrot_MultiArray_class_init(enum_class_MultiArray);
  +     Parrot_Key_class_init(enum_class_Key);
   +    Parrot_Apache_class_init(enum_class_Apache);
    
        /* Now register the names of the PMCs */
    
  -@@ -112,6 +113,12 @@ init_world(void)
  -     key->atom.type = enum_key_string;
  -     Parrot_base_classname_hash->vtable->set_integer_keyed(NULL,
  -                                                           Parrot_base_classname_hash, key, enum_class_Coroutine);
  -+
  -+    key->atom.val.string_val = (STRING*)
  -+        Parrot_base_vtables[enum_class_Apache].name(NULL, NULL);
  -+    key->atom.type = enum_key_string;
  -+    Parrot_base_classname_hash->vtable->set_integer_keyed(NULL,
  -+                                                          Parrot_base_classname_hash, key, enum_class_Apache);
  - 
  +@@ -85,6 +87,7 @@ init_world(void)
  +     register_pmc(Parrot_base_classname_hash, enum_class_Continuation);
  +     register_pmc(Parrot_base_classname_hash, enum_class_MultiArray);
  +     register_pmc(Parrot_base_classname_hash, enum_class_Key);
  ++    register_pmc(Parrot_base_classname_hash, enum_class_Apache);
    }
    
  + /*
   Index: include/parrot/pmc.h
   ===================================================================
   RCS file: /cvs/public/parrot/include/parrot/pmc.h,v
  -retrieving revision 1.31
  -diff -u -p -r1.31 pmc.h
  ---- include/parrot/pmc.h	4 Jul 2002 18:31:20 -0000	1.31
  -+++ include/parrot/pmc.h	5 Jul 2002 21:37:39 -0000
  -@@ -27,6 +27,7 @@ enum {
  -     enum_class_Coroutine,
  -     enum_class_Closure,
  -     enum_class_Continuation,
  +retrieving revision 1.38
  +diff -u -p -r1.38 pmc.h
  +--- include/parrot/pmc.h	19 Aug 2002 23:15:52 -0000	1.38
  ++++ include/parrot/pmc.h	3 Sep 2002 20:23:13 -0000
  +@@ -30,6 +30,7 @@ enum {
  +     enum_class_CSub,
  +     enum_class_MultiArray,
  +     enum_class_Key,
   +    enum_class_Apache,
        enum_class_max = 100
    };