[svn:parrot] r45565 - in trunk: include/parrot src
petdance at svn.parrot.org
petdance at svn.parrot.org
Sun Apr 11 05:09:55 UTC 2010
Author: petdance
Date: Sun Apr 11 05:09:54 2010
New Revision: 45565
URL: https://trac.parrot.org/parrot/changeset/45565
Log:
consting and shimming
Modified:
trunk/include/parrot/packfile.h
trunk/src/packfile.c
Modified: trunk/include/parrot/packfile.h
==============================================================================
--- trunk/include/parrot/packfile.h Sun Apr 11 04:03:47 2010 (r45564)
+++ trunk/include/parrot/packfile.h Sun Apr 11 05:09:54 2010 (r45565)
@@ -808,10 +808,9 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
-opcode_t * PackFile_Annotations_pack(PARROT_INTERP,
+opcode_t * PackFile_Annotations_pack(SHIM_INTERP,
ARGIN(PackFile_Segment *seg),
ARGMOD(opcode_t *cursor))
- __attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(3)
FUNC_MODIFIES(*cursor);
@@ -976,8 +975,7 @@
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(self))
#define ASSERT_ARGS_PackFile_Annotations_pack __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
- PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(seg) \
+ PARROT_ASSERT_ARG(seg) \
, PARROT_ASSERT_ARG(cursor))
#define ASSERT_ARGS_PackFile_Annotations_packed_size \
__attribute__unused__ int _ASSERT_ARGS_CHECK = (\
Modified: trunk/src/packfile.c
==============================================================================
--- trunk/src/packfile.c Sun Apr 11 04:03:47 2010 (r45564)
+++ trunk/src/packfile.c Sun Apr 11 05:09:54 2010 (r45565)
@@ -4213,7 +4213,7 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
opcode_t *
-PackFile_Annotations_pack(PARROT_INTERP, ARGIN(PackFile_Segment *seg),
+PackFile_Annotations_pack(SHIM_INTERP, ARGIN(PackFile_Segment *seg),
ARGMOD(opcode_t *cursor))
{
ASSERT_ARGS(PackFile_Annotations_pack)
@@ -4269,7 +4269,7 @@
ARGIN(const opcode_t *cursor))
{
ASSERT_ARGS(PackFile_Annotations_unpack)
- PackFile_Annotations *self = (PackFile_Annotations *)seg;
+ PackFile_Annotations * const self = (PackFile_Annotations *)seg;
PackFile_ByteCode *code;
STRING *code_name;
#if TRACE_PACKFILE
@@ -4359,7 +4359,7 @@
PackFile_Annotations_dump(PARROT_INTERP, ARGIN(const PackFile_Segment *seg))
{
ASSERT_ARGS(PackFile_Annotations_dump)
- const PackFile_Annotations *self = (const PackFile_Annotations *)seg;
+ const PackFile_Annotations * const self = (const PackFile_Annotations *)seg;
INTVAL i;
default_dump_header(interp, (const PackFile_Segment *)self);
@@ -4432,6 +4432,7 @@
opcode_t offset)
{
ASSERT_ARGS(PackFile_Annotations_add_group)
+ PackFile_Annotations_Group *group;
/* Allocate extra space for the group in the groups array. */
if (self->groups)
@@ -4442,11 +4443,10 @@
1 + self->num_groups, PackFile_Annotations_Group *);
/* Store details. */
- self->groups[self->num_groups] =
- mem_gc_allocate_zeroed_typed(interp,
- PackFile_Annotations_Group);
- self->groups[self->num_groups]->bytecode_offset = offset;
- self->groups[self->num_groups]->entries_offset = self->num_entries;
+ group = self->groups[self->num_groups] =
+ mem_gc_allocate_zeroed_typed(interp, PackFile_Annotations_Group);
+ group->bytecode_offset = offset;
+ group->entries_offset = self->num_entries;
/* Increment group count. */
self->num_groups++;
@@ -4476,12 +4476,12 @@
{
ASSERT_ARGS(PackFile_Annotations_add_entry)
/* See if we already have this key. */
- STRING *key_name = PF_CONST(self->code, key)->u.string;
+ STRING * const key_name = PF_CONST(self->code, key)->u.string;
opcode_t key_id = -1;
INTVAL i;
for (i = 0; i < self->num_keys; i++) {
- STRING *test_key = PF_CONST(self->code, self->keys[i]->name)->u.string;
+ STRING * const test_key = PF_CONST(self->code, self->keys[i]->name)->u.string;
if (Parrot_str_equal(interp, test_key, key_name)) {
key_id = i;
break;
More information about the parrot-commits
mailing list