Author: julianalbo
Date: Tue Jan 27 12:09:48 2009
New Revision: 36063
Modified:
trunk/include/parrot/datatypes.h
trunk/include/parrot/inter_call.h
trunk/src/inter_call.c
trunk/src/string/charset/ascii.c
trunk/src/string/charset/ascii.h
trunk/src/string/charset/binary.c
trunk/src/string/charset/binary.h
trunk/src/string/charset/iso-8859-1.c
trunk/src/string/charset/iso-8859-1.h
trunk/src/string/charset/unicode.c
trunk/src/string/charset/unicode.h
trunk/src/string/encoding/fixed_8.c
trunk/src/string/encoding/fixed_8.h
trunk/src/string/encoding/ucs2.c
trunk/src/string/encoding/ucs2.h
trunk/src/string/encoding/utf16.c
trunk/src/string/encoding/utf16.h
trunk/src/string/encoding/utf8.c
trunk/src/string/encoding/utf8.h
Log:
[cage] update headerizer info in charset and encoding files and update
headerizing
Modified: trunk/include/parrot/datatypes.h
==============================================================================
--- trunk/include/parrot/datatypes.h (original)
+++ trunk/include/parrot/datatypes.h Tue Jan 27 12:09:48 2009
@@ -138,6 +138,10 @@
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_EXPORT
+FLOATVAL floatval_divide_by_zero(PARROT_INTERP, FLOATVAL num)
+ __attribute__nonnull__(1);
+
+PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
INTVAL Parrot_get_datatype_enum(PARROT_INTERP,
ARGIN(const STRING *type_name))
@@ -150,10 +154,8 @@
STRING * Parrot_get_datatype_name(PARROT_INTERP, INTVAL type)
__attribute__nonnull__(1);
-PARROT_EXPORT
-FLOATVAL
-floatval_divide_by_zero(PARROT_INTERP, FLOATVAL num);
-
+#define ASSERT_ARGS_floatval_divide_by_zero __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp)
#define ASSERT_ARGS_Parrot_get_datatype_enum __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(type_name)
Modified: trunk/include/parrot/inter_call.h
==============================================================================
--- trunk/include/parrot/inter_call.h (original)
+++ trunk/include/parrot/inter_call.h Tue Jan 27 12:09:48 2009
@@ -110,11 +110,12 @@
FUNC_MODIFIES(*st);
PARROT_EXPORT
-int Parrot_init_arg_indexes_and_sig_pmc(SHIM_INTERP,
+int Parrot_init_arg_indexes_and_sig_pmc(PARROT_INTERP,
ARGIN(Parrot_Context *ctx),
ARGIN_NULLOK(opcode_t *indexes),
ARGIN_NULLOK(PMC *sig_pmc),
ARGMOD(call_state_item *sti))
+ __attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(5)
FUNC_MODIFIES(*sti);
@@ -138,11 +139,12 @@
__attribute__nonnull__(4);
PARROT_EXPORT
-int Parrot_init_arg_sig(SHIM_INTERP,
+int Parrot_init_arg_sig(PARROT_INTERP,
ARGIN(Parrot_Context *ctx),
ARGIN(const char *sig),
ARGIN_NULLOK(void *ap),
ARGMOD(call_state_item *sti))
+ __attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(3)
__attribute__nonnull__(5)
@@ -277,7 +279,8 @@
|| PARROT_ASSERT_ARG(st)
#define ASSERT_ARGS_Parrot_init_arg_indexes_and_sig_pmc \
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(ctx) \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(ctx) \
|| PARROT_ASSERT_ARG(sti)
#define ASSERT_ARGS_Parrot_init_arg_nci __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
@@ -288,7 +291,8 @@
|| PARROT_ASSERT_ARG(ctx) \
|| PARROT_ASSERT_ARG(sti)
#define ASSERT_ARGS_Parrot_init_arg_sig __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(ctx) \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(ctx) \
|| PARROT_ASSERT_ARG(sig) \
|| PARROT_ASSERT_ARG(sti)
#define ASSERT_ARGS_Parrot_init_ret_nci __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
Modified: trunk/src/inter_call.c
==============================================================================
--- trunk/src/inter_call.c (original)
+++ trunk/src/inter_call.c Tue Jan 27 12:09:48 2009
@@ -29,8 +29,11 @@
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-static void check_for_opt_flag(PARROT_INTERP, ARGMOD(call_state *st), int
has_arg)
+static void check_for_opt_flag(PARROT_INTERP,
+ ARGMOD(call_state *st),
+ int has_arg)
__attribute__nonnull__(1)
+ __attribute__nonnull__(2)
FUNC_MODIFIES(*st);
static void check_named(PARROT_INTERP, ARGMOD(call_state *st))
@@ -141,6 +144,7 @@
static void next_arg_sig(PARROT_INTERP, ARGMOD(call_state_item *sti))
__attribute__nonnull__(1)
+ __attribute__nonnull__(2)
FUNC_MODIFIES(*sti);
static void null_val(int sig, ARGMOD(call_state *st))
@@ -231,7 +235,8 @@
__attribute__nonnull__(3);
#define ASSERT_ARGS_check_for_opt_flag __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(st)
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(st)
#define ASSERT_ARGS_check_named __attribute__unused__ int _ASSERT_ARGS_CHECK =
\
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(st)
@@ -284,7 +289,8 @@
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(st)
#define ASSERT_ARGS_next_arg_sig __attribute__unused__ int _ASSERT_ARGS_CHECK
= \
- PARROT_ASSERT_ARG(sti)
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(sti)
#define ASSERT_ARGS_null_val __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(st)
#define ASSERT_ARGS_set_context_sig_params __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
Modified: trunk/src/string/charset/ascii.c
==============================================================================
--- trunk/src/string/charset/ascii.c (original)
+++ trunk/src/string/charset/ascii.c Tue Jan 27 12:09:48 2009
@@ -26,7 +26,7 @@
#include "tables.h"
-/* HEADERIZER HFILE: src/charset/ascii.h */
+/* HEADERIZER HFILE: src/string/charset/ascii.h */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
Modified: trunk/src/string/charset/ascii.h
==============================================================================
--- trunk/src/string/charset/ascii.h (original)
+++ trunk/src/string/charset/ascii.h Tue Jan 27 12:09:48 2009
@@ -17,7 +17,7 @@
* common functions for ascii-ish charsets
*/
-/* HEADERIZER BEGIN: src/charset/ascii.c */
+/* HEADERIZER BEGIN: src/string/charset/ascii.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_WARN_UNUSED_RESULT
@@ -135,7 +135,7 @@
#define ASSERT_ARGS_Parrot_charset_ascii_init __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/charset/ascii.c */
+/* HEADERIZER END: src/string/charset/ascii.c */
#endif /* PARROT_CHARSET_ASCII_H_GUARD */
Modified: trunk/src/string/charset/binary.c
==============================================================================
--- trunk/src/string/charset/binary.c (original)
+++ trunk/src/string/charset/binary.c Tue Jan 27 12:09:48 2009
@@ -22,7 +22,7 @@
#include "ascii.h"
#include "binary.h"
-/* HEADERIZER HFILE: src/charset/binary.h */
+/* HEADERIZER HFILE: src/string/charset/binary.h */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
Modified: trunk/src/string/charset/binary.h
==============================================================================
--- trunk/src/string/charset/binary.h (original)
+++ trunk/src/string/charset/binary.h Tue Jan 27 12:09:48 2009
@@ -13,7 +13,7 @@
#ifndef PARROT_CHARSET_BINARY_H_GUARD
#define PARROT_CHARSET_BINARY_H_GUARD
-/* HEADERIZER BEGIN: src/charset/binary.c */
+/* HEADERIZER BEGIN: src/string/charset/binary.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_CANNOT_RETURN_NULL
@@ -23,7 +23,7 @@
#define ASSERT_ARGS_Parrot_charset_binary_init __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/charset/binary.c */
+/* HEADERIZER END: src/string/charset/binary.c */
#endif /* PARROT_CHARSET_BINARY_H_GUARD */
Modified: trunk/src/string/charset/iso-8859-1.c
==============================================================================
--- trunk/src/string/charset/iso-8859-1.c (original)
+++ trunk/src/string/charset/iso-8859-1.c Tue Jan 27 12:09:48 2009
@@ -20,7 +20,7 @@
#include "iso-8859-1.h"
#include "ascii.h"
-/* HEADERIZER HFILE: src/charset/iso-8859-1.h */
+/* HEADERIZER HFILE: src/string/charset/iso-8859-1.h */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
Modified: trunk/src/string/charset/iso-8859-1.h
==============================================================================
--- trunk/src/string/charset/iso-8859-1.h (original)
+++ trunk/src/string/charset/iso-8859-1.h Tue Jan 27 12:09:48 2009
@@ -13,7 +13,7 @@
#ifndef PARROT_CHARSET_ISO_8859_1_H_GUARD
#define PARROT_CHARSET_ISO_8859_1_H_GUARD
-/* HEADERIZER BEGIN: src/charset/iso-8859-1.c */
+/* HEADERIZER BEGIN: src/string/charset/iso-8859-1.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_CANNOT_RETURN_NULL
@@ -37,7 +37,7 @@
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/charset/iso-8859-1.c */
+/* HEADERIZER END: src/string/charset/iso-8859-1.c */
#endif /* PARROT_CHARSET_ISO_8859_1_H_GUARD */
Modified: trunk/src/string/charset/unicode.c
==============================================================================
--- trunk/src/string/charset/unicode.c (original)
+++ trunk/src/string/charset/unicode.c Tue Jan 27 12:09:48 2009
@@ -21,7 +21,7 @@
#include "ascii.h"
#include "tables.h"
-/* HEADERIZER HFILE: src/charset/unicode.h */
+/* HEADERIZER HFILE: src/string/charset/unicode.h */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
Modified: trunk/src/string/charset/unicode.h
==============================================================================
--- trunk/src/string/charset/unicode.h (original)
+++ trunk/src/string/charset/unicode.h Tue Jan 27 12:09:48 2009
@@ -18,7 +18,7 @@
*/
-/* HEADERIZER BEGIN: src/charset/unicode.c */
+/* HEADERIZER BEGIN: src/string/charset/unicode.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_CANNOT_RETURN_NULL
@@ -28,7 +28,7 @@
#define ASSERT_ARGS_Parrot_charset_unicode_init __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/charset/unicode.c */
+/* HEADERIZER END: src/string/charset/unicode.c */
#endif /* PARROT_CHARSET_UNICODE_H_GUARD */
Modified: trunk/src/string/encoding/fixed_8.c
==============================================================================
--- trunk/src/string/encoding/fixed_8.c (original)
+++ trunk/src/string/encoding/fixed_8.c Tue Jan 27 12:09:48 2009
@@ -19,7 +19,7 @@
#include "parrot/parrot.h"
#include "fixed_8.h"
-/* HEADERIZER HFILE: src/encodings/fixed_8.h */
+/* HEADERIZER HFILE: src/string/encoding/fixed_8.h */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
Modified: trunk/src/string/encoding/fixed_8.h
==============================================================================
--- trunk/src/string/encoding/fixed_8.h (original)
+++ trunk/src/string/encoding/fixed_8.h Tue Jan 27 12:09:48 2009
@@ -13,7 +13,7 @@
#ifndef PARROT_ENCODING_FIXED_8_H_GUARD
#define PARROT_ENCODING_FIXED_8_H_GUARD
-/* HEADERIZER BEGIN: src/encodings/fixed_8.c */
+/* HEADERIZER BEGIN: src/string/encoding/fixed_8.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_CANNOT_RETURN_NULL
@@ -23,7 +23,7 @@
#define ASSERT_ARGS_Parrot_encoding_fixed_8_init __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/encodings/fixed_8.c */
+/* HEADERIZER END: src/string/encoding/fixed_8.c */
#endif /* PARROT_ENCODING_FIXED_8_H_GUARD */
Modified: trunk/src/string/encoding/ucs2.c
==============================================================================
--- trunk/src/string/encoding/ucs2.c (original)
+++ trunk/src/string/encoding/ucs2.c Tue Jan 27 12:09:48 2009
@@ -21,7 +21,7 @@
#include "parrot/parrot.h"
#include "../unicode.h"
-/* HEADERIZER HFILE: src/encodings/ucs2.h */
+/* HEADERIZER HFILE: src/string/encoding/ucs2.h */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
Modified: trunk/src/string/encoding/ucs2.h
==============================================================================
--- trunk/src/string/encoding/ucs2.h (original)
+++ trunk/src/string/encoding/ucs2.h Tue Jan 27 12:09:48 2009
@@ -13,7 +13,7 @@
#ifndef PARROT_ENCODING_UCS2_H_GUARD
#define PARROT_ENCODING_UCS2_H_GUARD
-/* HEADERIZER BEGIN: src/encodings/ucs2.c */
+/* HEADERIZER BEGIN: src/string/encoding/ucs2.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_CANNOT_RETURN_NULL
@@ -23,7 +23,7 @@
#define ASSERT_ARGS_Parrot_encoding_ucs2_init __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/encodings/ucs2.c */
+/* HEADERIZER END: src/string/encoding/ucs2.c */
#endif /* PARROT_ENCODING_UCS2_H_GUARD */
Modified: trunk/src/string/encoding/utf16.c
==============================================================================
--- trunk/src/string/encoding/utf16.c (original)
+++ trunk/src/string/encoding/utf16.c Tue Jan 27 12:09:48 2009
@@ -21,7 +21,7 @@
#include "parrot/parrot.h"
#include "../unicode.h"
-/* HEADERIZER HFILE: src/encodings/utf16.h */
+/* HEADERIZER HFILE: src/string/encoding/utf16.h */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
Modified: trunk/src/string/encoding/utf16.h
==============================================================================
--- trunk/src/string/encoding/utf16.h (original)
+++ trunk/src/string/encoding/utf16.h Tue Jan 27 12:09:48 2009
@@ -13,7 +13,7 @@
#ifndef PARROT_ENCODING_UTF16_H_GUARD
#define PARROT_ENCODING_UTF16_H_GUARD
-/* HEADERIZER BEGIN: src/encodings/utf16.c */
+/* HEADERIZER BEGIN: src/string/encoding/utf16.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_CANNOT_RETURN_NULL
@@ -23,7 +23,7 @@
#define ASSERT_ARGS_Parrot_encoding_utf16_init __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/encodings/utf16.c */
+/* HEADERIZER END: src/string/encoding/utf16.c */
#endif /* PARROT_ENCODING_UTF16_H_GUARD */
Modified: trunk/src/string/encoding/utf8.c
==============================================================================
--- trunk/src/string/encoding/utf8.c (original)
+++ trunk/src/string/encoding/utf8.c Tue Jan 27 12:09:48 2009
@@ -22,7 +22,7 @@
#include "../unicode.h"
#include "utf8.h"
-/* HEADERIZER HFILE: src/encodings/utf8.h */
+/* HEADERIZER HFILE: src/string/encoding/utf8.h */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
Modified: trunk/src/string/encoding/utf8.h
==============================================================================
--- trunk/src/string/encoding/utf8.h (original)
+++ trunk/src/string/encoding/utf8.h Tue Jan 27 12:09:48 2009
@@ -13,7 +13,7 @@
#ifndef PARROT_ENCODING_UTF8_H_GUARD
#define PARROT_ENCODING_UTF8_H_GUARD
-/* HEADERIZER BEGIN: src/encodings/utf8.c */
+/* HEADERIZER BEGIN: src/string/encoding/utf8.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_CANNOT_RETURN_NULL
@@ -23,7 +23,7 @@
#define ASSERT_ARGS_Parrot_encoding_utf8_init __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/encodings/utf8.c */
+/* HEADERIZER END: src/string/encoding/utf8.c */
#endif /* PARROT_ENCODING_UTF8_H_GUARD */
