Permalink
Browse files

Merge branch 'gc_ms2_faster_list' into gc_ms2_sf

Conflicts:
	src/gc/gc_ms2.c
  • Loading branch information...
bacek committed Nov 17, 2010
2 parents 7245c69 + fc3e87b commit 8407c2bf365a8c0dd54b241e10c5f24663c572bd
Showing 1,861 changed files with 5,692 additions and 6,999 deletions.
View
@@ -30,9 +30,12 @@ ports
*.sto
*.suo
*.tmp
+*.sw?
*.vcproj*
.git
.parrot_current_rev
+.parrot_current_sha1
+.parrot_current_git_describe
CFLAGS
MANIFEST.configure.generated
Makefile
@@ -467,6 +470,7 @@ src/ops/*.obj
# generated from svn:ignore of 'src/packfile/'
src/packfile/*.o
src/packfile/*.obj
+src/packfile/*.str
# generated from svn:ignore of 'src/pmc/'
src/pmc/*.c
src/pmc/*.dump
@@ -571,6 +575,8 @@ t/op/*.pasm
t/op/*.pbc
t/op/*.pir
t/op/*_pbcexe*
+# generated from svn:ignore of 't/op/testlib/'
+t/op/testlib/*.pbc
# generated from svn:ignore of 't/perl/'
t/perl/Parrot_Test_1.pasm
t/perl/Parrot_Test_1.pir
@@ -580,6 +586,8 @@ t/pmc/*.pasm
t/pmc/*.pbc
t/pmc/*.pir
t/pmc/*_pbcexe*
+# generated from svn:ignore of 't/pmc/testlib/'
+t/pmc/testlib/*.pbc
# generated from svn:ignore of 't/src/'
t/src/*_*
# generated from svn:ignore of 't/stress/'
@@ -597,6 +605,7 @@ t/tools/pmc2c.*.c
t/tools/pmc2c.*.dump
t/tools/pmc2c.*.h
t/tools/pmc2c.*.pmc
+tools/dev/mk_language_shell.pl
# Local variables:
# mode: text
# buffer-read-only: t
View
35 CREDITS
@@ -1,6 +1,5 @@
=pod
-# $Id$
Following in the steps of other open source projects that
eventually take over the world, here is the partial list
@@ -16,6 +15,7 @@
The Parrot Team
PS: Yes, this looks remarkably like the Linux CREDITS format
PPS: This file is encoded in UTF-8
+ PPPS: To turn this file into a author map for git-svn, see tools/dev/mk_author_map.pl
----------
N: Aaron Sherman
@@ -241,7 +241,7 @@ E: cdolan@cpan.org
N: Chris Fields (cjfields)
D: Rakudo patches
-N: Christoph Otto a.k.a. cotto
+N: Christoph Otto
U: cotto
D: Patch for key flags in pdd08
D: Range check in Env PMC
@@ -291,6 +291,8 @@ D: imcc optimizer and register allocator patches and tests
E: cgrawls@gmail.com
U: cxreg
+N: Dave Olszewski
+E: cxreg@pobox.com
D: copyright test cleanup
N: Damian Miles Knopp
@@ -402,6 +404,7 @@ D: Documentation patch for Parrot_PMC_get_pointer_intkey()
N: Géraud Continsouzas
U: GeJ
+E: geraud@gcu.info
A: geraud
D: Perl2Pir tests conversion
D: Miscellaneous codingstd fixes
@@ -456,7 +459,7 @@ D: string.pmc, complex.pmc
N: isop
D: various Pynie patches
-N: James E Keenan (Jim) (aka kid51)
+N: James E Keenan
E: jkeenan@cpan.org
U: jkeenan
D: Testing of configuration and build tools
@@ -500,7 +503,7 @@ E: jquelin@cpan.org
U: jquelin
S: Lyon, France
-N: Jerry Gay a.k.a. particle
+N: Jerry Gay
U: particle
E: Jerry.Gay@gmail.com
D: Whatever
@@ -531,7 +534,7 @@ D: coding standard tests
N: John Paul Wallington
D: pir-mode.el: fix for xemacs plus bugfixes and cleanups
-N: Jonathan Leto
+N: Jonathan "Duke" Leto
E: jonathan@leto.net
W: http://leto.net
D: Release manager for 1.7.0
@@ -672,7 +675,7 @@ D: Bug fix
N: Marcus Thiesen
D: URM language, bugfixes
-N: Mark Glines a.k.a. Infinoid
+N: Mark Glines
U: infinoid
D: Cage cleaning, random bugfixes, report bugs
E: mark@glines.org
@@ -751,8 +754,7 @@ D: Patch reducing code duplication
N: Mitchell N Charity
-N: Moritz A Lenz
-A: Moritz Lenz
+N: Moritz Lenz
E: moritz@faui2k3.org
U: moritz
D: Test infrastructure for languages/perl6/ and Perl 6 in general
@@ -806,7 +808,7 @@ N: Ovid
D: Rename 'pbc_to_c' to 'pbc_to_exe'
N: Paco Alguacil
-D: Building on various platorms
+D: Building on various platforms
E: paco.linux@gmail.com
N: Pancake
@@ -1084,18 +1086,3 @@ U: svn
E: svn@perl.org
=cut
-
-# This makes a "svn authors" file for git svn
-
-open my $fh, "<", $0 or die "can't open $0: $!";
-my %n;
-while (<$fh>) {
- #warn "[$_]";
- if (m/^\s*$/) {
- printf "%-10s = %s <%s>\n", $n{U}, $n{N}, $n{E} if $n{U};
- %n = ();
- }
- next unless m/^([NEDUSW]): (.*)/;
- my ($f, $v) = ($1, $2);
- $n{$f} = $v unless $n{$f}; # doesn't do the right thing for the multiline fields
-}
View
@@ -1446,7 +1446,7 @@
* string.c: When you clone a constant, it ain't constant no mo'.
- Cocurtesy of "Bryan C. Warnock" <Bryan.Warnock@raba.com>
+ Courtesy of "Bryan C. Warnock" <Bryan.Warnock@raba.com>
2002-02-28 00:51 dan
@@ -2352,7 +2352,7 @@
2002-01-30 19:08 dan
- * lib/Parrot/Assembler.pm: fixes the POD in Parrot::Assember so
+ * lib/Parrot/Assembler.pm: fixes the POD in Parrot::Assembler so
that perldoc
can read it and just tidies it up generally. It also adds
documentation
@@ -3165,7 +3165,7 @@
2002-01-13 19:39 dan
- * key.c, classes/perlarray.pmc: key.c: intialize KEY.keys
+ * key.c, classes/perlarray.pmc: key.c: initialize KEY.keys
classes/perlarray.c: * get_string: is casting
SELF->cache.struct_val to a STRING*, while all other methods are
@@ -8335,7 +8335,7 @@
* assemble.pl: macro expansion. Here's the test macro I was using:
- # this uses I32,I31 as temporaries. # macro must be preceeded by a
+ # this uses I32,I31 as temporaries. # macro must be preceded by a
label. testi macro num,got,want print "Test #"
print num print "..." set I32,want set
I31,got eq I32,I31,$ok print "NG\n" branch
View
@@ -1,7 +1,6 @@
#! perl
# Copyright (C) 2001-2009, Parrot Foundation.
-# $Id$
use 5.008;
use strict;
View
@@ -1,4 +1,3 @@
-# $Id$
=head1 Purpose
@@ -59,10 +58,6 @@ L<http://trac.parrot.org/parrot/ticket/1633>
L<https://trac.parrot.org/parrot/ticket/452>
-=item Method stdhandle in ParrotInterpreter [experimental]
-
-L<https://trac.parrot.org/parrot/ticket/264>
-
=item Overriding vtable invoke in PIR objects [experimental]
The VTABLE invoke in object.pmc puts SELF at the start of the
@@ -82,7 +77,7 @@ L<https://trac.parrot.org/parrot/ticket/1551>
=item UnManagedStruct initializer structure [eligible in 2.4]
-The initializer structure will cease to be an array of triples. In stead, an
+The initializer structure will cease to be an array of triples. Instead, an
array of flags (no counts or offsets), or a string representation of the same
information may be used.
View
@@ -1,4 +1,3 @@
-# $Id$
This file should only exist in development distributions. Delete it
(and its entry in the MANIFEST) before packaging Parrot up for a CPAN
View
@@ -1,5 +1,4 @@
# Parrot is Copyright (C) 2001-2008, Parrot Foundation.
-# $Id$
=head1 DONORS
View
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Fri Oct 22 02:09:27 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sun Nov 14 02:10:12 2010 UT
#
# See below for documentation on the format of this file.
#
@@ -201,6 +201,7 @@ config/auto/gcc.pm []
config/auto/gcc/test_c.in []
config/auto/gettext.pm []
config/auto/gettext/gettext_c.in []
+config/auto/git_describe.pm []
config/auto/glibc.pm []
config/auto/glibc/test_c.in []
config/auto/gmp.pm []
@@ -236,6 +237,7 @@ config/auto/pod2man.pm []
config/auto/readline.pm []
config/auto/readline/readline_c.in []
config/auto/revision.pm []
+config/auto/sha1.pm []
config/auto/signal.pm []
config/auto/signal/test1_c.in []
config/auto/signal/test2_c.in []
@@ -470,10 +472,11 @@ docs/pmc/struct.pod [doc]
docs/pmc/subs.pod [doc]
docs/pmc2c.pod [doc]
docs/porting_intro.pod [doc]
-docs/project/branching_guide.pod [doc]
docs/project/cage_cleaners_guide.pod [doc]
docs/project/committer_guide.pod [doc]
docs/project/debian_packaging_guide.pod [doc]
+docs/project/git_terminology.pod [doc]
+docs/project/git_workflow.pod [doc]
docs/project/metacommitter_guide.pod [doc]
docs/project/release_manager_guide.pod [doc]
docs/project/roles_responsibilities.pod [doc]
@@ -506,7 +509,6 @@ editor/pasm.vim []
editor/pir-mode.el []
editor/pir_vim.in []
editor/pmc.vim []
-editor/subversion_config []
examples/README [examples]
examples/benchmarks/addit.pasm [examples]
examples/benchmarks/addit.pir [examples]
@@ -1066,6 +1068,7 @@ lib/Parrot/Docs/Section/Perl.pm [devel]lib
lib/Parrot/Docs/Section/Tests.pm [devel]lib
lib/Parrot/Docs/Section/Tools.pm [devel]lib
lib/Parrot/Docs/Text2HTML.pm [devel]lib
+lib/Parrot/Git/Describe.pm [devel]lib
lib/Parrot/H2inc.pm [devel]lib
lib/Parrot/Harness/DefaultTests.pm [devel]lib
lib/Parrot/Harness/Options.pm [devel]lib
@@ -1099,6 +1102,7 @@ lib/Parrot/Pmc2c/Pmc2cMain.pm [devel]lib
lib/Parrot/Pmc2c/UtilFunctions.pm [devel]lib
lib/Parrot/Pmc2c/VTable.pm [devel]lib
lib/Parrot/Revision.pm [devel]lib
+lib/Parrot/SHA1.pm [devel]lib
lib/Parrot/SearchOps.pm [devel]lib
lib/Parrot/Test.pm [devel]lib
lib/Parrot/Test/Harness.pm [devel]lib
@@ -1163,6 +1167,7 @@ runtime/parrot/library/Data/Dumper.pir [library]
runtime/parrot/library/Data/Dumper/Base.pir [library]
runtime/parrot/library/Data/Dumper/Default.pir [library]
runtime/parrot/library/Digest/MD5.pir [library]
+runtime/parrot/library/Digest/sha256.pir [library]
runtime/parrot/library/Getopt/Obj.pir [library]
runtime/parrot/library/HTTP/Daemon.pir [library]
runtime/parrot/library/HTTP/Message.pir [library]
@@ -1515,7 +1520,6 @@ t/codingstd/pmc_docs.t [test]
t/codingstd/pod_description.t [test]
t/codingstd/pod_syntax.t [test]
t/codingstd/pod_todo.t [test]
-t/codingstd/svn_id.t [test]
t/codingstd/tabs.t [test]
t/codingstd/trailing_space.t [test]
t/compilers/data_json/from_parrot.t [test]
@@ -1641,6 +1645,9 @@ t/configure/050-fatal.t [test]
t/configure/051-fatal_step.t [test]
t/configure/059-silent.t [test]
t/configure/061-revision_from_cache.t [test]
+t/configure/062-sha1_to_cache.t [test]
+t/configure/063-git_describe_to_cache.t [test]
+t/configure/064-sha1_from_cache.t [test]
t/configure/testlib/Make_VERSION_File.pm [test]
t/configure/testlib/Tie/Filehandle/Preempt/Stdin.pm [test]
t/configure/testlib/adefectivefoobar [test]
@@ -1660,7 +1667,6 @@ t/configure/testlib/init/mu.pm [test]
t/configure/testlib/init/zeta.pm [test]
t/configure/testlib/inter/theta.pm [test]
t/configure/testlib/verbosefoobar [test]
-t/distro/file_metadata.t [test]
t/distro/manifest.t [test]
t/distro/manifest_generated.t [test]
t/dynoplibs/bit.t [test]
@@ -1991,6 +1997,7 @@ t/steps/auto/frames-01.t [test]
t/steps/auto/gc-01.t [test]
t/steps/auto/gcc-01.t [test]
t/steps/auto/gettext-01.t [test]
+t/steps/auto/git_describe-01.t [test]
t/steps/auto/glibc-01.t [test]
t/steps/auto/gmp-01.t [test]
t/steps/auto/headers-01.t [test]
@@ -2115,7 +2122,6 @@ tools/dev/README []doc
tools/dev/addopstags.pl []
tools/dev/as2c.pl []
tools/dev/bench_op.pir []
-tools/dev/branch_status.pl []
tools/dev/checkdepend.pl []
tools/dev/create_language.pl [devel]
tools/dev/debian_docs.sh []
@@ -2133,6 +2139,7 @@ tools/dev/install_files.pl []
tools/dev/lib_deps.pl []
tools/dev/list_unjitted.pl []
tools/dev/manicheck.pl []
+tools/dev/mk_author_map.pl []
tools/dev/mk_gitignore.pl []
tools/dev/mk_inno.pl []
tools/dev/mk_inno_language.pl []
@@ -2165,7 +2172,6 @@ tools/dev/pmctree.pl []
tools/dev/pprof2cg.pl [devel]
tools/dev/reconfigure.pl [devel]
tools/dev/search-ops.pl []
-tools/dev/svnclobber.pl []
tools/dev/symlink.pl []
tools/dev/update_copyright.pl []
tools/dev/vgp []
Oops, something went wrong.

0 comments on commit 8407c2b

Please sign in to comment.