Skip to content

Commit

Permalink
Merge branch 'master' into leto/embed_grant
Browse files Browse the repository at this point in the history
  • Loading branch information
leto committed Jun 1, 2011
2 parents c04523b + 47df0fb commit 2a51d1e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 38 deletions.
11 changes: 6 additions & 5 deletions docs/pct/gettingstarted.pod
@@ -1,4 +1,4 @@
# Copyright (C) 2008, Parrot Foundation.
# Copyright (C) 2008-2011 Parrot Foundation.

=head1 NAME

Expand All @@ -8,11 +8,12 @@ Getting Started with the Parrot Compiler Tools

This document can be considered your Number One entry point for starting to use
the Parrot Compiler Tools (PCT). As there's a whole lot of acronyms flying
around (see Parrot's glossary at L<http://www.parrotcode.org/glossary.html>),
around (see Parrot's glossary at
L<https://github.com/parrot/parrot/blob/master/docs/glossary.pod>),
this document will get you up and running within 10 minutes (that excludes
building Parrot). Once you begin, it's a matter of getting your hands dirty and
get experienced using the tools. Feel free to ask questions on
irc.parrot.org#parrot.
get experienced using the tools. Feel free to ask questions in
the #parrot channel on irc.parrot.org .

=head1 GETTING STARTED

Expand Down Expand Up @@ -43,7 +44,7 @@ write, which is why Parrot has something called PIR.
Stands for Parrot Intermediate Representation. This is a fancy layer of
syntactic sugar on top of PASM. If you program Parrot natively, you
write in PIR. Other documents discuss PIR syntax, for instance
L<http://www.parrotcode.org/docs/pdd/pdd19_pir.html>.
L<https://github.com/parrot/parrot/blob/master/docs/pdds/pdd19_pir.pod>

=item * PGE

Expand Down
14 changes: 3 additions & 11 deletions docs/pdds/draft/pdd11_extending.pod
Expand Up @@ -8,10 +8,6 @@ The extension API for Parrot is a simple, somewhat abstract, interface to
Parrot for code written in C or other compiled languages. It provides about
the same level of access to Parrot that bytecode programs have.





=head2 Description

The API presents to C programs roughly the same interface presented to
Expand Down Expand Up @@ -267,9 +263,9 @@ Parrot_CharType charset, Parrot_Language language, Parrot_Int flags)>
Create a new Parrot string from a passed-in buffer. If the C<encoding>,
C<charset>, or C<language> are unspecified (i.e. if you pass in 0), then the
defaults are used. Otherwise, the functions C<Parrot_find_encoding>,
C<Parrot_find_chartype> and C<Parrot_find_language> (all described below) can
be used to find the appropriate values for a particular choice of encoding,
chartype or language.
or C<Parrot_find_chartype> (both described below) can
be used to find the appropriate values for a particular choice of encoding,
or chartype.

Flag values are currently undocumented.

Expand All @@ -283,10 +279,6 @@ Find the magic token for an encoding, by name.

Find the magic token for a chartype, by name.

=item C<Parrot_find_language(interp, char *language)>

Find the magic token for a language, by language name.

=item C<Parrot_free_cstring(char* string)>

Deallocates a C string that the interpreter has handed to you. This function
Expand Down
21 changes: 0 additions & 21 deletions src/extend.c
Expand Up @@ -596,27 +596,6 @@ Parrot_new_string(PARROT_INTERP, ARGIN_NULLOK(const char *buffer),

/*
=item C<Parrot_Language Parrot_find_language(PARROT_INTERP, const char
*language)>
Find the magic language token for a language, by language name.
=cut
*/

PARROT_EXPORT
PARROT_PURE_FUNCTION
PARROT_WARN_UNUSED_RESULT
Parrot_Language
Parrot_find_language(SHIM_INTERP, ARGIN(SHIM(const char *language)))
{
ASSERT_ARGS(Parrot_find_language)
return 0;
}

/*
=item C<void Parrot_register_pmc(PARROT_INTERP, Parrot_PMC pmc)>
Add a reference of the PMC to the interpreter's GC registry. This prevents PMCs
Expand Down
2 changes: 1 addition & 1 deletion src/hash.c
Expand Up @@ -1183,7 +1183,7 @@ Parrot_hash_create_sized(PARROT_INTERP, PARROT_DATA_TYPE val_type, Hash_key_type
{
ASSERT_ARGS(Parrot_hash_create_sized)

Hash *hash = Parrot_hash_create(interp, val_type, hkey_type);
Hash * const hash = Parrot_hash_create(interp, val_type, hkey_type);
allocate_buckets(interp, hash, size);
return hash;
}
Expand Down

0 comments on commit 2a51d1e

Please sign in to comment.