Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into leto/embed_grant

  • Loading branch information...
commit 048156b99c617e407b377196e5d7ee263839a158 2 parents d6726f8 + 5dd8c54
Duke Leto leto authored
4 MANIFEST.SKIP
View
@@ -62,8 +62,6 @@
^/.*\.sto/
^/.*\.suo$
^/.*\.suo/
-^/.*\.sw?$
-^/.*\.sw?/
^/.*\.tmp$
^/.*\.tmp/
^/.*\.vcproj.*$
@@ -86,6 +84,8 @@
^/\.parrot_current_sha1/
^/\B\.svn\b$
^/\B\.svn\b/
+^/\\..*sw?$
+^/\\..*sw?/
^/all_cstring\.str$
^/all_cstring\.str/
^/blib$
1  NEWS
View
@@ -1,5 +1,6 @@
New in 3.5.0
- Core
+ + Parrot_PMC_destroy and Parrot_PMC_mark were removed from the public extension API
- Languages
- Tests
+ The Parrot test suite harness now understands the HARNESS_TIMER environment
2  docs/embed.pod
View
@@ -1209,8 +1209,6 @@ The list may also be augmented if additional functionality is required.
=item C<Parrot_PMC_i_subtract_int>
-=item C<Parrot_PMC_mark>
-
=item C<Parrot_PMC_modulus>
=item C<Parrot_PMC_modulus_float>
13 include/parrot/parrot.h
View
@@ -8,9 +8,16 @@
* References:
*/
-/* Only parrot core files should include this file.
- Extensions should include <parrot/extend.h>.
- Programs embedding parrot should include <parrot/embed.h>.
+/*
+ This file contains definitions for functions and data structures used by
+ Parrot. This file is currently included in almost all Parrot source files
+ and is typically required in add-in extensions. This file is *not* used
+ when embedding Parrot. For embedding, use <parrot/api.h>. For extensions,
+ you probably also need <parrot/extend.h> in addition to <parrot/parrot.h>.
+
+ In the future, <parrot/parrot.h> might not be required for extensions. For
+ now, it is required for most purposes because the extending API is not
+ stable or mature enough to be used without parrot.h.
*/
#ifndef PARROT_PARROT_H_GUARD
4 lib/Parrot/Vtable.pm
View
@@ -317,7 +317,9 @@ sub vtbl_embed {
}
next if $@;
- next if $name eq "destroy";
+
+ # these are GC internals and should not be exposed
+ next if $name =~ m/^(destroy|mark)$/;
my $signature = join( ', ', @sig );
my $arguments = join( ', ', @args );
Please sign in to comment.
Something went wrong with that request. Please try again.