Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Try to make it work with: perl Configure.pl --gen_parrot
  • Loading branch information
bschmalhofer committed Mar 1, 2009
1 parent 13f1fb5 commit a0655a0
Show file tree
Hide file tree
Showing 16 changed files with 81 additions and 85 deletions.
2 changes: 1 addition & 1 deletion build/PARROT_REVISION
@@ -1 +1 @@
36930
37000
18 changes: 7 additions & 11 deletions build/templates/src/pmc/Makefile.in
Expand Up @@ -10,7 +10,6 @@ CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@

# Set up directories
BUILD_DIR = @build_dir@
PMC_DIR = src/pmc
INCLUDE_DIR = $(BUILD_DIR)/include
PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext

Expand All @@ -19,15 +18,15 @@ LOAD_EXT = @load_ext@
O = @o@


PIPP_GROUP = $(PMC_DIR)/pipp_group$(LOAD_EXT)
PIPP_GROUP = pipp_group$(LOAD_EXT)

PMCS = \
php \
phparray \
phpboolean \
phpfloat \
phpinteger \
pippresource \
phpresource \
phpstring \
phpnull

Expand All @@ -37,7 +36,7 @@ PMC_SOURCES = \
phpboolean.pmc \
phpfloat.pmc \
phpinteger.pmc \
pippresource.pmc \
phpresource.pmc \
phpstring.pmc \
phpnull.pmc

Expand Down Expand Up @@ -65,14 +64,11 @@ pipp_hash$(O): pipp_hash.c pipp_hash.h
$(TOUCH) phparray.pmc
$(CC) $(CFLAGS) -I$(INCLUDE_DIR) pipp_hash.c -c -g -o pipp_hash$(O)

export DYNPMC_INCLUDE=$(BUILD_DIR)/languages/pipp
export DYNPMC_LINK=$(BUILD_DIR)/languages/pipp/src/pmc/pipp_hash$(O)

$(PIPP_GROUP): $(PMC_SOURCES)
@$(PMCBUILD) generate $(PMCS)
@$(PMCBUILD) compile $(PMCS)
@$(PMCBUILD) linklibs $(PMCS)
@$(PMCBUILD) copy "--destination=$(PARROT_DYNEXT)" $(PMCS)
$(PMCBUILD) generate $(PMCS)
$(PMCBUILD) compile $(PMCS)
$(PMCBUILD) linklibs $(PMCS)
$(PMCBUILD) copy "--destination=$(PARROT_DYNEXT)" $(PMCS)

# cleaning up
clean:
Expand Down
10 changes: 5 additions & 5 deletions src/common/builtins.pir
Expand Up @@ -3,10 +3,10 @@

.loadlib 'pipp_group'

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'languages/pipp/src/common/guts.pir'
.include 'languages/pipp/src/classes/Object.pir'
.include 'languages/pipp/src/common/eval.pir'
.include 'src/common/php_MACRO.pir'
.include 'src/common/guts.pir'
.include 'src/classes/Object.pir'
.include 'src/common/eval.pir'

# steal builtins from Perl6
.sub 'print'
Expand Down Expand Up @@ -325,7 +325,7 @@
.return($P0)
.end

.include 'languages/pipp/src/common/php_standard.pir'
.include 'src/common/php_standard.pir'

# Local Variables:
# mode: pir
Expand Down
2 changes: 1 addition & 1 deletion src/common/php_API.pir
Expand Up @@ -12,7 +12,7 @@ php_API.pir - PHP API Library

=cut

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'

.sub '__onload' :anon :load :init

Expand Down
2 changes: 1 addition & 1 deletion src/common/php_base64.pir
Expand Up @@ -12,7 +12,7 @@ php_base64.pir - PHP base64 Standard Library

=cut

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'

.sub '__onload' :load
load_bytecode 'MIME/Base64.pbc'
Expand Down
2 changes: 1 addition & 1 deletion src/common/php_builtin.pir
Expand Up @@ -12,7 +12,7 @@ php_builtin.pir - PHP builtin Library

=cut

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'

=item C<bool class_exists(string classname [, bool autoload])>

Expand Down
2 changes: 1 addition & 1 deletion src/common/php_ctype.pir
Expand Up @@ -14,7 +14,7 @@ php_ctype.pir - PHP ctype Library

.HLL 'pipp'

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'
.include 'cclass.pasm'

.macro CTYPE(class, args)
Expand Down
2 changes: 1 addition & 1 deletion src/common/php_gmp.pir
Expand Up @@ -18,7 +18,7 @@ The good way is by a full NCI wrapper over the GMP library.

.HLL 'pipp'

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'

.const string GMP_PMC = 'BigInt'

Expand Down
2 changes: 1 addition & 1 deletion src/common/php_info.pir
Expand Up @@ -12,7 +12,7 @@ php_info.pir - PHP info Standard Library

=cut

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'

.const string PHP_LOGO_GUID = 'PHPE9568F34-D428-11d2-A769-00AA001ACF42'
.const string PHP_EGG_LOGO_GUID = 'PHPE9568F36-D428-11d2-A769-00AA001ACF42'
Expand Down
2 changes: 1 addition & 1 deletion src/common/php_md5.pir
Expand Up @@ -12,7 +12,7 @@ php_md5.pir - PHP md5 Standard Library

=cut

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'

.sub '__onload' :anon :load
$P0 = loadlib 'digest_group'
Expand Down
2 changes: 1 addition & 1 deletion src/common/php_pcre.pir
Expand Up @@ -14,7 +14,7 @@ php_pcre.pir - PHP pcre Library

.HLL 'pipp'

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'
.include 'cclass.pasm'

.sub '__onload' :anon :load :init
Expand Down
2 changes: 1 addition & 1 deletion src/common/php_rand.pir
Expand Up @@ -12,7 +12,7 @@ php_rand.pir - PHP rand Standard Library

=cut

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'

.sub '__onload' :anon :load
load_bytecode 'Math/Random/mt19937ar.pbc'
Expand Down
2 changes: 1 addition & 1 deletion src/common/php_sha1.pir
Expand Up @@ -12,7 +12,7 @@ php_sha1.pir - PHP sha1 Standard Library

=cut

.include 'languages/pipp/src/common/php_MACRO.pir'
.include 'src/common/php_MACRO.pir'

.sub '__onload' :anon :load
$P0 = loadlib 'digest_group'
Expand Down
108 changes: 54 additions & 54 deletions src/common/php_standard.pir
@@ -1,60 +1,60 @@
# Copyright (C) 2008, The Perl Foundation.

.include 'languages/pipp/src/common/php_API.pir'
.include 'src/common/php_API.pir'

.include 'languages/pipp/src/common/php_array.pir'
.include 'languages/pipp/src/common/php_assert.pir'
.include 'languages/pipp/src/common/php_base64.pir'
.include 'languages/pipp/src/common/php_basic.pir'
.include 'languages/pipp/src/common/php_browscap.pir'
.include 'languages/pipp/src/common/php_builtin.pir'
.include 'languages/pipp/src/common/php_crc32.pir'
.include 'languages/pipp/src/common/php_crypt.pir'
.include 'languages/pipp/src/common/php_cyr_convert.pir'
.include 'languages/pipp/src/common/php_datetime.pir'
.include 'languages/pipp/src/common/php_dir.pir'
.include 'languages/pipp/src/common/php_dl.pir'
.include 'languages/pipp/src/common/php_dns.pir'
.include 'languages/pipp/src/common/php_exec.pir'
.include 'languages/pipp/src/common/php_file.pir'
.include 'languages/pipp/src/common/php_filestat.pir'
.include 'languages/pipp/src/common/php_filesystem.pir'
.include 'languages/pipp/src/common/php_formatted_print.pir'
.include 'languages/pipp/src/common/php_fsock.pir'
.include 'languages/pipp/src/common/php_ftok.pir'
.include 'languages/pipp/src/common/php_head.pir'
.include 'languages/pipp/src/common/php_html.pir'
.include 'languages/pipp/src/common/php_http.pir'
.include 'languages/pipp/src/common/php_image.pir'
.include 'languages/pipp/src/common/php_info.pir'
.include 'languages/pipp/src/common/php_iptc.pir'
.include 'languages/pipp/src/common/php_lcg.pir'
.include 'languages/pipp/src/common/php_levenshtein.pir'
.include 'languages/pipp/src/common/php_link.pir'
.include 'languages/pipp/src/common/php_mail.pir'
.include 'languages/pipp/src/common/php_math.pir'
.include 'languages/pipp/src/common/php_md5.pir'
.include 'languages/pipp/src/common/php_metaphone.pir'
.include 'languages/pipp/src/common/php_microtime.pir'
.include 'languages/pipp/src/common/php_pack.pir'
.include 'languages/pipp/src/common/php_pageinfo.pir'
.include 'languages/pipp/src/common/php_proc_open.pir'
.include 'languages/pipp/src/common/php_quot_print.pir'
.include 'languages/pipp/src/common/php_rand.pir'
.include 'languages/pipp/src/common/php_reflection.pir'
.include 'languages/pipp/src/common/php_reg.pir'
.include 'languages/pipp/src/common/php_sha1.pir'
.include 'languages/pipp/src/common/php_soundex.pir'
.include 'languages/pipp/src/common/php_streamsfuncs.pir'
.include 'languages/pipp/src/common/php_string.pir'
.include 'languages/pipp/src/common/php_syslog.pir'
.include 'languages/pipp/src/common/php_type.pir'
.include 'languages/pipp/src/common/php_uniqid.pir'
.include 'languages/pipp/src/common/php_url.pir'
.include 'languages/pipp/src/common/php_user_filters.pir'
.include 'languages/pipp/src/common/php_uuencode.pir'
.include 'languages/pipp/src/common/php_var.pir'
.include 'languages/pipp/src/common/php_versioning.pir'
.include 'src/common/php_array.pir'
.include 'src/common/php_assert.pir'
.include 'src/common/php_base64.pir'
.include 'src/common/php_basic.pir'
.include 'src/common/php_browscap.pir'
.include 'src/common/php_builtin.pir'
.include 'src/common/php_crc32.pir'
.include 'src/common/php_crypt.pir'
.include 'src/common/php_cyr_convert.pir'
.include 'src/common/php_datetime.pir'
.include 'src/common/php_dir.pir'
.include 'src/common/php_dl.pir'
.include 'src/common/php_dns.pir'
.include 'src/common/php_exec.pir'
.include 'src/common/php_file.pir'
.include 'src/common/php_filestat.pir'
.include 'src/common/php_filesystem.pir'
.include 'src/common/php_formatted_print.pir'
.include 'src/common/php_fsock.pir'
.include 'src/common/php_ftok.pir'
.include 'src/common/php_head.pir'
.include 'src/common/php_html.pir'
.include 'src/common/php_http.pir'
.include 'src/common/php_image.pir'
.include 'src/common/php_info.pir'
.include 'src/common/php_iptc.pir'
.include 'src/common/php_lcg.pir'
.include 'src/common/php_levenshtein.pir'
.include 'src/common/php_link.pir'
.include 'src/common/php_mail.pir'
.include 'src/common/php_math.pir'
.include 'src/common/php_md5.pir'
.include 'src/common/php_metaphone.pir'
.include 'src/common/php_microtime.pir'
.include 'src/common/php_pack.pir'
.include 'src/common/php_pageinfo.pir'
.include 'src/common/php_proc_open.pir'
.include 'src/common/php_quot_print.pir'
.include 'src/common/php_rand.pir'
.include 'src/common/php_reflection.pir'
.include 'src/common/php_reg.pir'
.include 'src/common/php_sha1.pir'
.include 'src/common/php_soundex.pir'
.include 'src/common/php_streamsfuncs.pir'
.include 'src/common/php_string.pir'
.include 'src/common/php_syslog.pir'
.include 'src/common/php_type.pir'
.include 'src/common/php_uniqid.pir'
.include 'src/common/php_url.pir'
.include 'src/common/php_user_filters.pir'
.include 'src/common/php_uuencode.pir'
.include 'src/common/php_var.pir'
.include 'src/common/php_versioning.pir'

# Local Variables:
# mode: pir
Expand Down
2 changes: 1 addition & 1 deletion src/pmc/phparray.pmc
Expand Up @@ -18,7 +18,7 @@ Implementation of the Array datatype.
*/

#include "pipp_private.h"
#include "src/pmc/pipp_hash.h"
#include "pipp_hash.h"

pmclass PhpArray
dynpmc
Expand Down
6 changes: 3 additions & 3 deletions src/pmc/pippresource.pmc → src/pmc/phpresource.pmc
Expand Up @@ -3,7 +3,7 @@ Copyright (C) 2008, The Perl Foundation.

=head1 NAME

src/pmc/pippresource.pmc - Pipp Resource
src/pmc/phpresource.pmc - PHP Resource

=head1 DESCRIPTION

Expand All @@ -17,7 +17,7 @@ src/pmc/pippresource.pmc - Pipp Resource

#include "pipp_private.h"

pmclass PippResource
pmclass PhpResource
provides ref
dynpmc
group pipp_group
Expand All @@ -34,7 +34,7 @@ Raises an exception. Use C<init_pmc()>.
*/
void init() {
Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_INVALID_OPERATION,
"PippResource init without pmc");
"PhpResource init without pmc");
}

/*
Expand Down

0 comments on commit a0655a0

Please sign in to comment.