[pdd15oo] Merging the pdd15oo branch at r22176 back into trunk.

git-svn-id: https://svn.parrot.org/parrot/trunk@22180 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
parrot · Oct 17, 2007 · 8e57fe8 · 8e57fe8
1 parent a193d5f
commit 8e57fe8
Show file tree

Hide file tree

Showing 242 changed files with 8,353 additions and 16,779 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -1,7 +1,7 @@
 # ex: set ro:
 # $Id$
 #
-# generated by tools/dev/mk_manifest_and_skip.pl Tue Oct 16 16:30:39 2007 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Oct 17 17:00:27 2007 UT
 #
 # See tools/dev/install_files.pl for documentation on the
 # format of this file.
@@ -819,6 +819,8 @@ include/parrot/misc.h                                       [main]include
 include/parrot/mmd.h                                        [main]include
 include/parrot/nci.h                                        [main]include
 include/parrot/objects.h                                    [main]include
+include/parrot/oo.h                                         [main]include
+include/parrot/oo_private.h                                 [main]include
 include/parrot/op.h                                         [main]include
 include/parrot/oplib.h                                      [main]include
 include/parrot/packfile.h                                   [main]include
@@ -2674,6 +2676,7 @@ src/misc.c                                                  []
 src/mmd.c                                                   []
 src/nci_test.c                                              []
 src/objects.c                                               []
+src/oo.c                                                    []
 src/ops/bit.ops                                             []
 src/ops/cmp.ops                                             []
 src/ops/core.ops                                            []
@@ -2712,7 +2715,6 @@ src/pmc/boolean.pmc                                         []
 src/pmc/bound_nci.pmc                                       []
 src/pmc/capture.pmc                                         []
 src/pmc/class.pmc                                           []
-src/pmc/classobject.h                                       []
 src/pmc/closure.pmc                                         []
 src/pmc/codestring.pmc                                      []
 src/pmc/compiler.pmc                                        []
@@ -3057,11 +3059,15 @@ t/native_pbc/string.t                                       []
 t/native_pbc/string_1.pbc                                   []
 t/native_pbc/string_2.pbc                                   []
 t/oo/composition.t                                          []
+t/oo/isa.t                                                  []
 t/oo/metamodel.t                                            []
+t/oo/methods.t                                              []
 t/oo/mro-c3.t                                               []
 t/oo/names.t                                                []
 t/oo/new.t                                                  []
 t/oo/ops.t                                                  []
+t/oo/proxy.t                                                []
+t/oo/subclass.t                                             []
 t/op/00ff-dos.t                                             []
 t/op/00ff-unix.t                                            []
 t/op/01-parse_ops.t                                         []
@@ -3101,26 +3107,18 @@ t/op/stringu.t                                              []
 t/op/time.t                                                 []
 t/op/trans.t                                                []
 t/op/types.t                                                []
-t/pdd15oo/calling.t                                         []
 t/pdd15oo/dumper.t                                          []
 t/pdd15oo/exception.t                                       []
 t/pdd15oo/freeze.t                                          []
-t/pdd15oo/gc.t                                              []
 t/pdd15oo/grammar.t                                         []
 t/pdd15oo/llqueue.t                                         []
-t/pdd15oo/mmd.t                                             []
 t/pdd15oo/namespace.t                                       []
-t/pdd15oo/object-meths.t                                    []
-t/pdd15oo/object-mro.t                                      []
-t/pdd15oo/objects.t                                         []
 t/pdd15oo/parrotobject.t                                    []
 t/pdd15oo/queue.t                                           []
 t/pdd15oo/ro.t                                              []
 t/pdd15oo/runtime.t                                         []
-t/pdd15oo/spill.t                                           []
 t/pdd15oo/string.t                                          []
 t/pdd15oo/sub.t                                             []
-t/pdd15oo/tail.t                                            []
 t/pdd15oo/test_more.t                                       []
 t/pdd15oo/threads.t                                         []
 t/perl/Parrot_Distribution.t                                []

diff --git a/apps/p3/p3p.html b/apps/p3/p3p.html
@@ -47,8 +47,7 @@ <h1>[ HTTP; Daemon]</h1>
 <p>Starting it with some options is as simple as this:</p>
 <pre>
   .local pmc d, opts
-  $I0 = find_type ['HTTP'; 'Daemon']
-  d = new $I0, opts
+  d = new ['HTTP'; 'Daemon'], opts
   d.'run'()
 </pre>
 <h1>CGI</h1>

diff --git a/compilers/imcc/imcc.l b/compilers/imcc/imcc.l
@@ -296,7 +296,7 @@ SP              [ ]
 ".pcc_begin_yield"    return PCC_BEGIN_YIELD;
 ".pcc_end_yield"      return PCC_END_YIELD;
 
-":method"        return METHOD;
+<emit,INITIAL>":method"        return METHOD;
 <emit,INITIAL>":multi"   return MULTI;
 <emit,INITIAL>":main"    return MAIN;
 <emit,INITIAL>":load"    return LOAD;