Author: ianjoyce
Date: Thu Aug 18 07:04:57 2005
New Revision: 207
Added:
mod_parrot/trunk/cc_test.pir
- copied unchanged from r206, mod_parrot/trunk/cc_test.imc
mod_parrot/trunk/eg/authenhandler.pir
- copied unchanged from r206, mod_parrot/trunk/eg/authenhandler.imc
mod_parrot/trunk/eg/handler.pir
- copied unchanged from r206, mod_parrot/trunk/eg/handler.imc
mod_parrot/trunk/lib/APR/Table.pir
- copied, changed from r206, mod_parrot/trunk/lib/APR/Table.imc
mod_parrot/trunk/lib/Apache/Constants.pir
- copied, changed from r206, mod_parrot/trunk/lib/Apache/Constants.imc
mod_parrot/trunk/lib/Apache/RequestRec.pir
- copied, changed from r206, mod_parrot/trunk/lib/Apache/RequestRec.imc
mod_parrot/trunk/lib/ModParrot/HLL/pir.pir
- copied unchanged from r206, mod_parrot/trunk/lib/ModParrot/HLL/pir.imc
mod_parrot/trunk/lib/ModParrot/HLL/pugs.pir
- copied, changed from r206, mod_parrot/trunk/lib/ModParrot/HLL/pugs.imc
mod_parrot/trunk/lib/ModParrot/init.pir
- copied, changed from r206, mod_parrot/trunk/lib/ModParrot/init.imc
mod_parrot/trunk/lib/pugs/Apache/RequestRec.pir
- copied unchanged from r206, mod_parrot/trunk/lib/pugs/Apache/RequestRec.imc
mod_parrot/trunk/t/lib/handlers.pir
- copied unchanged from r206, mod_parrot/trunk/t/lib/handlers.imc
Removed:
mod_parrot/trunk/eg/authenhandler.imc
mod_parrot/trunk/eg/handler.imc
mod_parrot/trunk/lib/APR/Table.imc
mod_parrot/trunk/lib/Apache/Constants.imc
mod_parrot/trunk/lib/Apache/RequestRec.imc
mod_parrot/trunk/lib/ModParrot/HLL/pir.imc
mod_parrot/trunk/lib/ModParrot/HLL/pugs.imc
mod_parrot/trunk/lib/ModParrot/init.imc
mod_parrot/trunk/lib/pugs/Apache/RequestRec.imc
mod_parrot/trunk/t/lib/handlers.imc
Modified:
mod_parrot/trunk/Configure.pl
mod_parrot/trunk/Makefile.in
mod_parrot/trunk/README
mod_parrot/trunk/build/lib/Generator/ApacheConstants.pm
mod_parrot/trunk/build/lib/Generator/ApacheRequestRec.pm
mod_parrot/trunk/build/lib/Generator/BaseGenerator.pm
mod_parrot/trunk/build/lib/generate_source.pl
mod_parrot/trunk/docs/build-autogen.txt
mod_parrot/trunk/docs/nci.txt
mod_parrot/trunk/eg/mod_pugs-httpd.conf
mod_parrot/trunk/t/conf/extra.conf.in
Log:
converted .imc files to .pir
Modified: mod_parrot/trunk/Configure.pl
==============================================================================
--- mod_parrot/trunk/Configure.pl (original)
+++ mod_parrot/trunk/Configure.pl Thu Aug 18 07:04:57 2005
@@ -52,7 +52,7 @@ print "\n";
my $defines;
print "Determining Parrot calling conventions...";
-my $calling_conventions = `$parrot_build_dir/parrot cc_test.imc`;
+my $calling_conventions = `$parrot_build_dir/parrot cc_test.pir`;
chomp($calling_conventions);
if ($calling_conventions eq 'new') {
$defines = '-DPARROT_NEW_CALL_CONV';
Modified: mod_parrot/trunk/Makefile.in
==============================================================================
--- mod_parrot/trunk/Makefile.in (original)
+++ mod_parrot/trunk/Makefile.in Thu Aug 18 07:04:57 2005
@@ -37,7 +37,7 @@ libraries:
@for i in $(MPLIBS); \
do \
echo " $$i"; \
- $(PARROT) -o $$i.pbc $$i.imc; \
+ $(PARROT) -o $$i.pbc $$i.pir; \
done
gen-src:
@@ -69,5 +69,5 @@ nci_sig_test: nci_sig_test.o
$(CC) -o $@ $(CFLAGS) nci_sig_test.c $(PARROT_OBJS) $(LDFLAGS) $(LIBS)
test: mod_parrot.la libraries nci_sig_test
- $(PARROT) -o t/lib/handlers.pbc t/lib/handlers.imc
+ $(PARROT) -o t/lib/handlers.pbc t/lib/handlers.pir
$(PERL) t/TEST
Modified: mod_parrot/trunk/README
==============================================================================
--- mod_parrot/trunk/README (original)
+++ mod_parrot/trunk/README Thu Aug 18 07:04:57 2005
@@ -95,8 +95,8 @@ DOCUMENTATION
The "docs" directory contains most of the documentation. Most of it is
focused on the design of mod_parrot rather than usage. Additional POD
documentation can be found in:
-* lib/Apache/RequestRec.imc
-* lib/Apache/Constants.imc
+* lib/Apache/RequestRec.pir
+* lib/Apache/Constants.pir
NOTES
-----
Modified: mod_parrot/trunk/build/lib/Generator/ApacheConstants.pm
==============================================================================
--- mod_parrot/trunk/build/lib/Generator/ApacheConstants.pm (original)
+++ mod_parrot/trunk/build/lib/Generator/ApacheConstants.pm Thu Aug 18 07:04:57 2005
@@ -98,7 +98,7 @@ sub generate_source
$template =~ s/%%HTTP%%/$http/;
$template =~ s/%%LOG%%/$log/;
- $self->write_file('imc', 'ap_constants.imc', $template);
+ $self->write_file('pir', 'ap_constants.pir', $template);
}
1;
Modified: mod_parrot/trunk/build/lib/Generator/ApacheRequestRec.pm
==============================================================================
--- mod_parrot/trunk/build/lib/Generator/ApacheRequestRec.pm (original)
+++ mod_parrot/trunk/build/lib/Generator/ApacheRequestRec.pm Thu Aug 18 07:04:57 2005
@@ -33,8 +33,8 @@ sub run
$self->build_attribs($map);
$self->generate_c_source($map);
- $self->generate_imc_source($map);
- $self->generate_imc_dlfunc_source($map);
+ $self->generate_pir_source($map);
+ $self->generate_pir_dlfunc_source($map);
}
sub build_attribs
@@ -44,16 +44,16 @@ sub build_attribs
foreach my $record (@$map) {
if ($record->{'return_type'} eq 'int') {
$record->{'sig'} = 'iJpii';
- $record->{'imc_type'} = 'int';
+ $record->{'pir_type'} = 'int';
}
else {
$record->{'sig'} = 'tJpt';
- $record->{'imc_type'} = 'string';
+ $record->{'pir_type'} = 'string';
}
}
}
-sub generate_imc_dlfunc_source
+sub generate_pir_dlfunc_source
{
my ($self, $map) = @_;
@@ -63,7 +63,7 @@ sub generate_imc_dlfunc_source
$source .= $self->merge($self->get_dlfunc_template(), $record);
}
- $self->write_file('imc', 'request_rec_dlfunc.imc', $source);
+ $self->write_file('pir', 'request_rec_dlfunc.pir', $source);
}
sub get_dlfunc_template
@@ -97,31 +97,31 @@ sub generate_c_source
$self->write_file('nci', 'request_rec.c', "$prototype\n$source");
}
-sub generate_imc_source
+sub generate_pir_source
{
my ($self, $map) = @_;
my $source;
foreach my $record (@$map) {
- $source .= $self->get_imc_method($record);
+ $source .= $self->get_pir_method($record);
}
- $self->write_file('imc', 'request_rec.imc', $source);
+ $self->write_file('pir', 'request_rec.pir', $source);
}
-sub get_imc_method
+sub get_pir_method
{
my ($self, $record) = @_;
my $template = $record->{'return_type'} eq 'int'
- ? $self->get_imc_int_template()
- : $self->get_imc_string_template();
+ ? $self->get_pir_int_template()
+ : $self->get_pir_string_template();
return $self->merge($template, $record);
}
-sub get_imc_int_template
+sub get_pir_int_template
{
my $self = shift;
@@ -184,17 +184,17 @@ END
return $template;
}
-sub get_imc_string_template
+sub get_pir_string_template
{
my $self = shift;
my $template = <<'END'
.sub %%NAME%% method
- .param %%IMC_TYPE%% data
+ .param %%PIR_TYPE%% data
.local pmc r
.local int offset
.local pmc request_rec_%%NAME%%
- .local %%IMC_TYPE%% %%NAME%%
+ .local %%PIR_TYPE%% %%NAME%%
classoffset offset, self, 'Apache::RequestRec'
getattribute r, self, offset
Modified: mod_parrot/trunk/build/lib/Generator/BaseGenerator.pm
==============================================================================
--- mod_parrot/trunk/build/lib/Generator/BaseGenerator.pm (original)
+++ mod_parrot/trunk/build/lib/Generator/BaseGenerator.pm Thu Aug 18 07:04:57 2005
@@ -68,7 +68,7 @@ sub write_file
my $file = $type eq 'nci'
? $self->{'nci_src'}
- : $self->{'imc_src'};
+ : $self->{'pir_src'};
$file .= $filename;
open (OUT_FILE, ">$file") or die $!;
Modified: mod_parrot/trunk/build/lib/generate_source.pl
==============================================================================
--- mod_parrot/trunk/build/lib/generate_source.pl (original)
+++ mod_parrot/trunk/build/lib/generate_source.pl Thu Aug 18 07:04:57 2005
@@ -35,7 +35,7 @@ GetOptions(
eval {
mkdir 'build/src';
mkdir 'build/src/nci';
- mkdir 'build/src/imc';
+ mkdir 'build/src/pir';
};
if ($@ && $@ !~ /File exists/) {
@@ -46,7 +46,7 @@ my %args = (
'apache_include_dir' => $apache_include_dir . '/',
'calling_conventions' => $calling_conventions,
'nci_src' => 'build/src/nci/',
- 'imc_src' => 'build/src/imc/',
+ 'pir_src' => 'build/src/pir/',
);
ModParrot::Config::Generator::ApacheConstants->new(%args)->run();
Modified: mod_parrot/trunk/docs/build-autogen.txt
==============================================================================
--- mod_parrot/trunk/docs/build-autogen.txt (original)
+++ mod_parrot/trunk/docs/build-autogen.txt Thu Aug 18 07:04:57 2005
@@ -2,8 +2,8 @@ This is documentation for the code auto
Code that is currently being generated.
---------------------------------------
- + Most of Apache::Constants (lib/Apache/Constants.imc)
- + Simple properties of Apache::RequestRec (lib/Apache/RequestRec.imc)
+ + Most of Apache::Constants (lib/Apache/Constants.pir)
+ + Simple properties of Apache::RequestRec (lib/Apache/RequestRec.pir)
Files of importance.
@@ -14,13 +14,13 @@ Files of importance.
+ build/lib/Generator/ApacheConstants.pm
- Generates the following files:
- - build/src/imc/apache_constants.imc
+ - build/src/pir/apache_constants.pir
- Parses httpds httpd.h and http_log.h
+ build/lib/Generator/ApacheRequestRec.pm
- Generates the following files:
- - build/src/imc/request_rec.imc
- - build/src/imc/request_rec_dlfunc.imc
+ - build/src/pir/request_rec.pir
+ - build/src/pir/request_rec_dlfunc.pir
- build/src/nci/request_rec.c
+ build/maps/httpd/request_rec.map
Modified: mod_parrot/trunk/docs/nci.txt
==============================================================================
--- mod_parrot/trunk/docs/nci.txt (original)
+++ mod_parrot/trunk/docs/nci.txt Thu Aug 18 07:04:57 2005
@@ -18,14 +18,14 @@ C wrappers in the mod_parrot source:
in a small C function that can be called through NCI. This function should
be placed in nci.c and its NCI object should be defined in the Parrot
namespace ModParrot::NCI. The function should be prefixed with mpnci_.
- The PIR code to load the object should be placed in lib/ModParrot/init.imc.
+ The PIR code to load the object should be placed in lib/ModParrot/init.pir.
3) mod_parrot functions that should be callable via NCI should be placed in
nci.c and defined in the Parrot namespace ModParrot::NCI. The first
argument passed to the function should be the Parrot interpreter, which
Parrot will handle for you if you use the 'J' signature. Each function
should be prefixed with mpnci_. The PIR code to load these objects should
- be placed in lib/ModParrot/init.imc.
+ be placed in lib/ModParrot/init.pir.
4) Wrapper functions MUST maintain the same parameter order as the
corresponding Apache API function. This is to ensure future compatibility
Modified: mod_parrot/trunk/eg/mod_pugs-httpd.conf
==============================================================================
--- mod_parrot/trunk/eg/mod_pugs-httpd.conf (original)
+++ mod_parrot/trunk/eg/mod_pugs-httpd.conf Thu Aug 18 07:04:57 2005
@@ -4,8 +4,8 @@ ParrotLoad /path/to/lib/Apache/Constants
ParrotLoad /path/to/lib/Apache/RequestRec.pbc
# required for mod_pugs
-ParrotLoad /path/to/lib/ModParrot/HLL/pugs.imc
-ParrotLoad /path/to/lib/pugs/Apache/RequestRec.imc
+ParrotLoad /path/to/lib/ModParrot/HLL/pugs.pir
+ParrotLoad /path/to/lib/pugs/Apache/RequestRec.pir
# the handler
<Location /pugs/test>
Copied: mod_parrot/trunk/lib/APR/Table.pir (from r206, mod_parrot/trunk/lib/APR/Table.imc)
==============================================================================
--- mod_parrot/trunk/lib/APR/Table.imc (original)
+++ mod_parrot/trunk/lib/APR/Table.pir Thu Aug 18 07:04:57 2005
@@ -16,7 +16,7 @@
=head1 NAME
-APR/Table.imc
+APR/Table.pir
=head1 SYNOPSIS
Copied: mod_parrot/trunk/lib/Apache/Constants.pir (from r206, mod_parrot/trunk/lib/Apache/Constants.imc)
==============================================================================
--- mod_parrot/trunk/lib/Apache/Constants.imc (original)
+++ mod_parrot/trunk/lib/Apache/Constants.pir Thu Aug 18 07:04:57 2005
@@ -16,7 +16,7 @@
=head1 NAME
-Apache/Constants.imc
+Apache/Constants.pir
=head1 DESCRIPTION
@@ -41,7 +41,7 @@ Jeff Horwitz
.namespace [ 'Apache::Constants' ]
-.include 'build/src/imc/ap_constants.imc'
+.include 'build/src/pir/ap_constants.pir'
.sub _initialize @LOAD
_init_const_table( )
Copied: mod_parrot/trunk/lib/Apache/RequestRec.pir (from r206, mod_parrot/trunk/lib/Apache/RequestRec.imc)
==============================================================================
--- mod_parrot/trunk/lib/Apache/RequestRec.imc (original)
+++ mod_parrot/trunk/lib/Apache/RequestRec.pir Thu Aug 18 07:04:57 2005
@@ -16,7 +16,7 @@
=head1 NAME
-Apache/RequestRec.imc
+Apache/RequestRec.pir
=head1 SYNOPSIS
@@ -94,7 +94,7 @@ SETUP_R:
setattribute self, offset, r
.end
-.include 'build/src/imc/request_rec.imc'
+.include 'build/src/pir/request_rec.pir'
=item C<puts(STRING str)>
Copied: mod_parrot/trunk/lib/ModParrot/HLL/pugs.pir (from r206, mod_parrot/trunk/lib/ModParrot/HLL/pugs.imc)
==============================================================================
--- mod_parrot/trunk/lib/ModParrot/HLL/pugs.imc (original)
+++ mod_parrot/trunk/lib/ModParrot/HLL/pugs.pir Thu Aug 18 07:04:57 2005
@@ -20,20 +20,20 @@
.param string module
.local int rc
.local string cmd
- .local string imcpath
+ .local string pirpath
# compile handler
- imcpath = "/tmp/"
- concat imcpath, module
- concat imcpath, ".imc"
+ pirpath = "/tmp/"
+ concat pirpath, module
+ concat pirpath, ".pir"
cmd = "cd /tmp; pugs -CParrot -M"
concat cmd, module
concat cmd, " > "
- concat cmd, imcpath
+ concat cmd, pirpath
rc = spawnw cmd
# load the PIR
- load_bytecode imcpath
+ load_bytecode pirpath
.pcc_begin_return
.return 0
Copied: mod_parrot/trunk/lib/ModParrot/init.pir (from r206, mod_parrot/trunk/lib/ModParrot/init.imc)
==============================================================================
--- mod_parrot/trunk/lib/ModParrot/init.imc (original)
+++ mod_parrot/trunk/lib/ModParrot/init.pir Thu Aug 18 07:04:57 2005
@@ -23,7 +23,7 @@
null nul
- .include "build/src/imc/request_rec_dlfunc.imc"
+ .include "build/src/pir/request_rec_dlfunc.pir"
dlfunc func, nul, "mpnci_backtrace", "tJ"
store_global "ModParrot::NCI", "backtrace", func
Modified: mod_parrot/trunk/t/conf/extra.conf.in
==============================================================================
--- mod_parrot/trunk/t/conf/extra.conf.in (original)
+++ mod_parrot/trunk/t/conf/extra.conf.in Thu Aug 18 07:04:57 2005
@@ -10,8 +10,8 @@ ParrotLoad @ServerRoot@/../lib/Apache/Re
ParrotLoad @ServerRoot@/lib/handlers.pbc
# for mod_pugs
-ParrotLoad @ServerRoot@/../lib/ModParrot/HLL/pugs.imc
-ParrotLoad @ServerRoot@/../lib/pugs/Apache/RequestRec.imc
+ParrotLoad @ServerRoot@/../lib/ModParrot/HLL/pugs.pir
+ParrotLoad @ServerRoot@/../lib/pugs/Apache/RequestRec.pir
<Location /parrot-test/RequestRec-content_type>
SetHandler parrot-code
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.