Author: jkeenan
Date: Tue Mar 6 16:58:56 2007
New Revision: 17373
Modified:
branches/buildtools/compilers/imcc/pbc.c
branches/buildtools/include/parrot/sub.h
branches/buildtools/lib/Parrot/IO/Capture/Mini.pm (contents, props changed)
branches/buildtools/lib/Parrot/Ops2c/Auxiliary.pm (contents, props changed)
branches/buildtools/lib/Parrot/Ops2c/Utils.pm (contents, props changed)
branches/buildtools/src/global.c
branches/buildtools/src/pmc/sub.pmc
branches/buildtools/src/sub.c
branches/buildtools/t/codingstd/line_endings.t
branches/buildtools/t/pmc/object-mro.t
branches/buildtools/t/tools/ops2cutils/01-new.t (contents, props changed)
branches/buildtools/t/tools/ops2cutils/02-usage.t (contents, props changed)
branches/buildtools/t/tools/ops2cutils/03-print_c_header_file.t (contents,
props changed)
branches/buildtools/t/tools/ops2cutils/04-print_c_source_top.t (contents,
props changed)
branches/buildtools/t/tools/ops2cutils/05-print_c_source_bottom.t
(contents, props changed)
branches/buildtools/t/tools/ops2cutils/06-dynamic.t (contents, props
changed)
branches/buildtools/t/tools/ops2cutils/07-make_incdir.t (contents, props
changed)
branches/buildtools/t/tools/ops2cutils/08-nolines.t (contents, props
changed)
branches/buildtools/t/tools/ops2cutils/09-dynamic_nolines.t (contents,
props changed)
branches/buildtools/t/tools/ops2cutils/testlib/GenerateCore.pm (contents,
props changed)
branches/buildtools/tools/util/svn_new_branch.pl (contents, props changed)
branches/buildtools/tools/util/svn_synch.pl (contents, props changed)
Log:
1. Setting svn properties on recently contributed .pl, .pm and .t files.
2. Thanks to quick action by mdiep, all tests (except one I'm working on) are
now passing -- which means my patches didn't cause the test failure and I can
restore them to their rightful place in the buildtools branch. Synching
buildtools branch to trunk.
Modified: branches/buildtools/compilers/imcc/pbc.c
==============================================================================
--- branches/buildtools/compilers/imcc/pbc.c (original)
+++ branches/buildtools/compilers/imcc/pbc.c Tue Mar 6 16:58:56 2007
@@ -708,7 +708,7 @@
break;
}
}
- sub->namespace = ns_pmc;
+ sub->namespace_name = ns_pmc;
sub->start_offs = offs;
sub->end_offs = end;
sub->HLL_id = CONTEXT(interp->ctx)->current_HLL;
Modified: branches/buildtools/include/parrot/sub.h
==============================================================================
--- branches/buildtools/include/parrot/sub.h (original)
+++ branches/buildtools/include/parrot/sub.h Tue Mar 6 16:58:56 2007
@@ -121,7 +121,7 @@
size_t end_offs;
INTVAL HLL_id; /* see src/hll.c XXX or per segment? */
- PMC *namespace; /* where this Sub is in - this is either
+ PMC *namespace_name; /* where this Sub is in - this is either
* a String or a [Key] and describes
* the relative path in the NameSpace
*/
Modified: branches/buildtools/lib/Parrot/IO/Capture/Mini.pm
==============================================================================
--- branches/buildtools/lib/Parrot/IO/Capture/Mini.pm (original)
+++ branches/buildtools/lib/Parrot/IO/Capture/Mini.pm Tue Mar 6 16:58:56 2007
@@ -1,5 +1,5 @@
# Copyright (C) 2007, The Perl Foundation.
-# $Id: Mini.pm 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
package Parrot::IO::Capture::Mini;
use strict;
Modified: branches/buildtools/lib/Parrot/Ops2c/Auxiliary.pm
==============================================================================
--- branches/buildtools/lib/Parrot/Ops2c/Auxiliary.pm (original)
+++ branches/buildtools/lib/Parrot/Ops2c/Auxiliary.pm Tue Mar 6 16:58:56 2007
@@ -1,5 +1,5 @@
# Copyright (C) 2007, The Perl Foundation.
-# $Id: Auxiliary.pm 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
package Parrot::Ops2c::Auxiliary;
use strict;
use warnings;
Modified: branches/buildtools/lib/Parrot/Ops2c/Utils.pm
==============================================================================
--- branches/buildtools/lib/Parrot/Ops2c/Utils.pm (original)
+++ branches/buildtools/lib/Parrot/Ops2c/Utils.pm Tue Mar 6 16:58:56 2007
@@ -1,5 +1,5 @@
# Copyright (C) 2007, The Perl Foundation.
-# $Id: Utils.pm 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
package Parrot::Ops2c::Utils;
use strict;
use lib ("lib/");
Modified: branches/buildtools/src/global.c
==============================================================================
--- branches/buildtools/src/global.c (original)
+++ branches/buildtools/src/global.c Tue Mar 6 16:58:56 2007
@@ -452,7 +452,7 @@
static PMC *
get_namespace_pmc(Parrot_Interp interp, PMC *sub)
{
- PMC *nsname = PMC_sub(sub)->namespace;
+ PMC *nsname = PMC_sub(sub)->namespace_name;
PMC *nsroot = Parrot_get_HLL_namespace(interp, PMC_sub(sub)->HLL_id);
/* If we have a NULL, return the HLL namespace */
@@ -513,7 +513,7 @@
/* store other subs (as long as they're not :anon) */
else if (!(PObj_get_FLAGS(sub) & SUB_FLAG_PF_ANON)) {
STRING *name = PMC_sub(sub)->name;
- PMC *nsname = PMC_sub(sub)->namespace;
+ PMC *nsname = PMC_sub(sub)->namespace_name;
Parrot_store_global_n(interp, ns, name, sub);
Modified: branches/buildtools/src/pmc/sub.pmc
==============================================================================
--- branches/buildtools/src/pmc/sub.pmc (original)
+++ branches/buildtools/src/pmc/sub.pmc Tue Mar 6 16:58:56 2007
@@ -391,8 +391,8 @@
return;
if (sub->name)
pobject_lives(INTERP, (PObj *) sub->name);
- if (!PMC_IS_NULL(sub->namespace))
- pobject_lives(INTERP, (PObj *) sub->namespace);
+ if (!PMC_IS_NULL(sub->namespace_name))
+ pobject_lives(INTERP, (PObj *) sub->namespace_name);
if (!PMC_IS_NULL(sub->multi_signature))
pobject_lives(INTERP, (PObj *) sub->multi_signature);
if (!PMC_IS_NULL(sub->eval_pmc))
@@ -432,8 +432,8 @@
void visit(visit_info *info) {
struct Parrot_sub * const sub = PMC_sub(SELF);
- info->thaw_ptr = &sub->namespace;
- (info->visit_pmc_now)(INTERP, sub->namespace, info);
+ info->thaw_ptr = &sub->namespace_name;
+ (info->visit_pmc_now)(INTERP, sub->namespace_name, info);
info->thaw_ptr = &sub->multi_signature;
(info->visit_pmc_now)(INTERP, sub->multi_signature, info);
info->thaw_ptr = &sub->outer_sub;
Modified: branches/buildtools/src/sub.c
==============================================================================
--- branches/buildtools/src/sub.c (original)
+++ branches/buildtools/src/sub.c Tue Mar 6 16:58:56 2007
@@ -336,12 +336,12 @@
info->subname = sub->name;
/* set the namespace name and fullname of the sub */
- if (PMC_IS_NULL(sub->namespace)) {
+ if (PMC_IS_NULL(sub->namespace_name)) {
info->nsname = string_from_cstring(interp, "", 0);
info->fullname = info->subname;
}
else {
- info->nsname = VTABLE_get_string(interp, sub->namespace);
+ info->nsname = VTABLE_get_string(interp, sub->namespace_name);
info->fullname = Parrot_full_sub_name(interp, ctx->current_sub);
}
Modified: branches/buildtools/t/codingstd/line_endings.t
==============================================================================
--- branches/buildtools/t/codingstd/line_endings.t (original)
+++ branches/buildtools/t/codingstd/line_endings.t Tue Mar 6 16:58:56 2007
@@ -15,6 +15,14 @@
if ($@) {
plan skip_all => 'SVN::Client not installed';
}
+ eval {
+ require SVK;
+ require SVK::XD;
+ require SVK::Util;
+ };
+ if ($@) {
+ warn "SVK not installed\n";
+ }
}
# are we using svk?
@@ -127,15 +135,12 @@
}
sub is_svk_working_dir {
- use SVK;
- use SVK::XD;
- use SVK::Util qw(catfile);
# set up svk so that we can use it
- my $svkpath = $ENV{SVKROOT} || catfile( $ENV{HOME}, ".svk" );
+ my $svkpath = $ENV{SVKROOT} || SVK::Util::catfile( $ENV{HOME}, ".svk" );
my $xd = SVK::XD->new(
- giantlock => catfile( $svkpath, 'lock' ),
- statefile => catfile( $svkpath, 'config' ),
+ giantlock => SVK::Util::catfile( $svkpath, 'lock' ),
+ statefile => SVK::Util::catfile( $svkpath, 'config' ),
svkpath => $svkpath,
);
Modified: branches/buildtools/t/pmc/object-mro.t
==============================================================================
--- branches/buildtools/t/pmc/object-mro.t (original)
+++ branches/buildtools/t/pmc/object-mro.t Tue Mar 6 16:58:56 2007
@@ -242,7 +242,7 @@
pir_output_is( <<'CODE', <<'OUTPUT', "print mro 4" );
#
-# Object
+# TestObject
# ^
# |
# LifeForm
@@ -265,11 +265,11 @@
# define class <vulcan> (<intelligent>, <humanoid>) end class;
#
.sub main :main
- .local pmc Object, LifeForm, Sentient, BiPedal, Intelligent, Humanoid,
Vulcan
+ .local pmc TestObject, LifeForm, Sentient, BiPedal, Intelligent, Humanoid,
Vulcan
- newclass Object, "Object"
+ newclass TestObject, "TestObject"
- subclass LifeForm, Object, "LifeForm"
+ subclass LifeForm, TestObject, "LifeForm"
subclass Sentient, LifeForm, "Sentient"
subclass Intelligent, Sentient, "Intelligent"
@@ -297,7 +297,7 @@
print_newline
.end
CODE
-Vulcan Intelligent Sentient Humanoid BiPedal LifeForm Object R
+Vulcan Intelligent Sentient Humanoid BiPedal LifeForm TestObject R
OUTPUT
# ... now some tests which fail to compose the class
Modified: branches/buildtools/t/tools/ops2cutils/01-new.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/01-new.t (original)
+++ branches/buildtools/t/tools/ops2cutils/01-new.t Tue Mar 6 16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: 01-new.t 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
# 01-new.t
use strict;
Modified: branches/buildtools/t/tools/ops2cutils/02-usage.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/02-usage.t (original)
+++ branches/buildtools/t/tools/ops2cutils/02-usage.t Tue Mar 6 16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: 02-usage.t 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
# 02-usage.t
use strict;
Modified: branches/buildtools/t/tools/ops2cutils/03-print_c_header_file.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/03-print_c_header_file.t
(original)
+++ branches/buildtools/t/tools/ops2cutils/03-print_c_header_file.t Tue Mar
6 16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: 03-print_c_header_file.t 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
# 03-print_c_header_file.t
use strict;
Modified: branches/buildtools/t/tools/ops2cutils/04-print_c_source_top.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/04-print_c_source_top.t
(original)
+++ branches/buildtools/t/tools/ops2cutils/04-print_c_source_top.t Tue Mar
6 16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: 04-print_c_source_top.t 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
# 04-print_c_source_top.t
use strict;
Modified: branches/buildtools/t/tools/ops2cutils/05-print_c_source_bottom.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/05-print_c_source_bottom.t
(original)
+++ branches/buildtools/t/tools/ops2cutils/05-print_c_source_bottom.t Tue Mar
6 16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: 05-print_c_source_bottom.t 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
# 05-print_c_source_bottom.t
use strict;
Modified: branches/buildtools/t/tools/ops2cutils/06-dynamic.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/06-dynamic.t (original)
+++ branches/buildtools/t/tools/ops2cutils/06-dynamic.t Tue Mar 6 16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: 06-dynamic.t 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
# 06-dynamic.t
use strict;
Modified: branches/buildtools/t/tools/ops2cutils/07-make_incdir.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/07-make_incdir.t (original)
+++ branches/buildtools/t/tools/ops2cutils/07-make_incdir.t Tue Mar 6
16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: 07-make_incdir.t 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
# 07-make_incdir.t
use strict;
Modified: branches/buildtools/t/tools/ops2cutils/08-nolines.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/08-nolines.t (original)
+++ branches/buildtools/t/tools/ops2cutils/08-nolines.t Tue Mar 6 16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: 08-nolines.t 17036 2007-02-18 04:46:00Z jkeenan $
+# $Id$
# 08-nolines.t
use strict;
Modified: branches/buildtools/t/tools/ops2cutils/09-dynamic_nolines.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/09-dynamic_nolines.t (original)
+++ branches/buildtools/t/tools/ops2cutils/09-dynamic_nolines.t Tue Mar 6
16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: 09-dynamic_nolines.t 17036 2007-02-18 04:46:00Z jkeenan $
+# $Id$
# 09-dynamic_nolines.t
use strict;
Modified: branches/buildtools/t/tools/ops2cutils/testlib/GenerateCore.pm
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/testlib/GenerateCore.pm
(original)
+++ branches/buildtools/t/tools/ops2cutils/testlib/GenerateCore.pm Tue Mar
6 16:58:56 2007
@@ -1,5 +1,5 @@
# Copyright (C) 2007, The Perl Foundation.
-# $Id: GenerateCore.pm 17167 2007-02-24 02:36:06Z jkeenan $
+# $Id$
package GenerateCore;
use strict;
our (@ISA, @EXPORT_OK);
Modified: branches/buildtools/tools/util/svn_new_branch.pl
==============================================================================
--- branches/buildtools/tools/util/svn_new_branch.pl (original)
+++ branches/buildtools/tools/util/svn_new_branch.pl Tue Mar 6 16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2001-2004, The Perl Foundation.
-# $Id: svn_new_branch.pl 17314 2007-03-03 22:20:39Z jkeenan $
+# $Id$
use strict;
use warnings;
use lib ("lib");
Modified: branches/buildtools/tools/util/svn_synch.pl
==============================================================================
--- branches/buildtools/tools/util/svn_synch.pl (original)
+++ branches/buildtools/tools/util/svn_synch.pl Tue Mar 6 16:58:56 2007
@@ -1,6 +1,6 @@
#! perl
# Copyright (C) 2007, The Perl Foundation.
-# $Id: svn_synch.pl 17314 2007-03-03 22:20:39Z jkeenan $
+# $Id$
use strict;
use warnings;
use Getopt::Long;
