cvsuser 05/03/23 13:28:09
Modified: config/gen/config_h config_h.in
include/parrot stacks.h
src stacks.c
Log:
Clean up some defines, which had been marked as obsolete.
Revision Changes Path
1.27 +3 -9 parrot/config/gen/config_h/config_h.in
Index: config_h.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/config_h/config_h.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config_h.in 8 Oct 2004 07:08:29 -0000 1.26
+++ config_h.in 23 Mar 2005 21:28:06 -0000 1.27
@@ -1,3 +1,6 @@
+/* Copyright: 2001-2005 The Perl Foundation. All Rights Reserved. */
+/* $Id: config_h.in,v 1.27 2005/03/23 21:28:06 bernhard Exp $ */
+
/* config.h
*
* Platform-specific config file
@@ -99,15 +102,6 @@
typedef struct _vtable VTABLE;
typedef void DPOINTER;
-/* XXX Temporary until the grand rename is done */
-typedef INTVAL Intval;
-typedef UINTVAL UIntval;
-typedef FLOATVAL Floatval;
-typedef VTABLE VTable;
-typedef DPOINTER DPointer;
-
-/* typedef INTVAL *(*opcode_funcs)(void *, void *) OPFUNC; */
-
#define FRAMES_PER_CHUNK 16
/* Default amount of memory to allocate in one whack */
1.44 +3 -3 parrot/include/parrot/stacks.h
Index: stacks.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/stacks.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- stacks.h 8 Dec 2004 13:20:38 -0000 1.43
+++ stacks.h 23 Mar 2005 21:28:08 -0000 1.44
@@ -1,7 +1,7 @@
/* stacks.h
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: stacks.h,v 1.43 2004/12/08 13:20:38 leo Exp $
+ * $Id: stacks.h,v 1.44 2005/03/23 21:28:08 bernhard Exp $
* Overview:
* Stack handling routines for Parrot
* Data Structure and Algorithms:
@@ -64,10 +64,10 @@
size_t stack_height(Interp *interpreter, Stack_Chunk_t *stack_base);
Stack_Entry_t * stack_entry(Interp *intepreter, Stack_Chunk_t *stack_base,
- Intval stack_depth);
+ INTVAL stack_depth);
void rotate_entries(Interp *interpreter, Stack_Chunk_t **stack_base,
- Intval num_entries);
+ INTVAL num_entries);
void stack_push(Interp *interpreter, Stack_Chunk_t **stack_base,
void *thing, Stack_entry_type type,
1.82 +11 -11 parrot/src/stacks.c
Index: stacks.c
===================================================================
RCS file: /cvs/public/parrot/src/stacks.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- stacks.c 12 Dec 2004 23:03:49 -0000 1.81
+++ stacks.c 23 Mar 2005 21:28:09 -0000 1.82
@@ -1,6 +1,6 @@
/*
Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-$Id: stacks.c,v 1.81 2004/12/12 23:03:49 chromatic Exp $
+$Id: stacks.c,v 1.82 2005/03/23 21:28:09 bernhard Exp $
=head1 NAME
@@ -130,7 +130,7 @@
/*
=item C<Stack_Entry_t *
-stack_entry(Interp *interpreter, Stack_Chunk_t *stack, Intval depth)>
+stack_entry(Interp *interpreter, Stack_Chunk_t *stack, INTVAL depth)>
If C<< depth >= 0 >>, return the entry at that depth from the top of the
stack, with 0 being the top entry. If C<depth < 0>, then return the
@@ -142,7 +142,7 @@
*/
Stack_Entry_t *
-stack_entry(Interp *interpreter, Stack_Chunk_t *stack, Intval depth)
+stack_entry(Interp *interpreter, Stack_Chunk_t *stack, INTVAL depth)
{
Stack_Chunk_t *chunk;
Stack_Entry_t *entry = NULL;
@@ -172,7 +172,7 @@
=item C<void
rotate_entries(Interp *interpreter, Stack_Chunk_t **stack_p,
- Intval num_entries)>
+ INTVAL num_entries)>
Rotate the top N entries by one. If C<N > 0>, the rotation is bubble
up, so the top most element becomes the Nth element. If C<N < 0>, the
@@ -184,12 +184,12 @@
*/
void
-rotate_entries(Interp *interpreter, Stack_Chunk_t **stack_p, Intval
num_entries)
+rotate_entries(Interp *interpreter, Stack_Chunk_t **stack_p, INTVAL
num_entries)
{
Stack_Chunk_t *stack = *stack_p;
Stack_Entry_t temp;
- Intval i;
- Intval depth = num_entries - 1;
+ INTVAL i;
+ INTVAL depth = num_entries - 1;
if (num_entries >= -1 && num_entries <= 1) {
return;
@@ -260,10 +260,10 @@
switch (type) {
case STACK_ENTRY_INT:
case STACK_ENTRY_MARK:
- UVal_int(entry->entry) = *(Intval *)thing;
+ UVal_int(entry->entry) = *(INTVAL *)thing;
break;
case STACK_ENTRY_FLOAT:
- UVal_num(entry->entry) = *(Floatval *)thing;
+ UVal_num(entry->entry) = *(FLOATVAL *)thing;
break;
case STACK_ENTRY_ACTION:
case STACK_ENTRY_PMC:
@@ -321,10 +321,10 @@
switch (type) {
case STACK_ENTRY_MARK:
case STACK_ENTRY_INT:
- *(Intval *)where = UVal_int(entry->entry);
+ *(INTVAL *)where = UVal_int(entry->entry);
break;
case STACK_ENTRY_FLOAT:
- *(Floatval *)where = UVal_num(entry->entry);
+ *(FLOATVAL *)where = UVal_num(entry->entry);
break;
case STACK_ENTRY_ACTION:
case STACK_ENTRY_PMC:
