Author: allison
Date: Mon Jan 26 23:32:43 2009
New Revision: 36045
Added:
trunk/src/string/ (props changed)
trunk/src/string/api.c
- copied, changed from r36042, /trunk/src/string.c
trunk/src/string/charset/
- copied from r36042, /trunk/src/charset/
trunk/src/string/charset.c
- copied, changed from r36042, /trunk/src/charset.c
trunk/src/string/charset/ascii.c
- copied unchanged from r36044, /trunk/src/charset/ascii.c
trunk/src/string/charset/ascii.h
- copied unchanged from r36044, /trunk/src/charset/ascii.h
trunk/src/string/charset/binary.c
- copied unchanged from r36044, /trunk/src/charset/binary.c
trunk/src/string/charset/binary.h
- copied unchanged from r36044, /trunk/src/charset/binary.h
trunk/src/string/charset/iso-8859-1.c
- copied unchanged from r36044, /trunk/src/charset/iso-8859-1.c
trunk/src/string/charset/iso-8859-1.h
- copied unchanged from r36044, /trunk/src/charset/iso-8859-1.h
trunk/src/string/charset/tables.c
- copied unchanged from r36044, /trunk/src/charset/tables.c
trunk/src/string/charset/tables.h
- copied unchanged from r36044, /trunk/src/charset/tables.h
trunk/src/string/charset/unicode.c
- copied unchanged from r36044, /trunk/src/charset/unicode.c
trunk/src/string/charset/unicode.h
- copied unchanged from r36044, /trunk/src/charset/unicode.h
trunk/src/string/encoding/
- copied from r36042, /trunk/src/encodings/
trunk/src/string/encoding.c
- copied unchanged from r36042, /trunk/src/encoding.c
trunk/src/string/encoding/fixed_8.c
- copied unchanged from r36044, /trunk/src/encodings/fixed_8.c
trunk/src/string/encoding/fixed_8.h
- copied unchanged from r36044, /trunk/src/encodings/fixed_8.h
trunk/src/string/encoding/ucs2.c
- copied unchanged from r36044, /trunk/src/encodings/ucs2.c
trunk/src/string/encoding/ucs2.h
- copied unchanged from r36044, /trunk/src/encodings/ucs2.h
trunk/src/string/encoding/utf16.c
- copied unchanged from r36044, /trunk/src/encodings/utf16.c
trunk/src/string/encoding/utf16.h
- copied unchanged from r36044, /trunk/src/encodings/utf16.h
trunk/src/string/encoding/utf8.c
- copied unchanged from r36044, /trunk/src/encodings/utf8.c
trunk/src/string/encoding/utf8.h
- copied unchanged from r36044, /trunk/src/encodings/utf8.h
trunk/src/string/primitives.c
- copied unchanged from r36042, /trunk/src/string_primitives.c
trunk/src/string/unicode.h
- copied unchanged from r36042, /trunk/src/unicode.h
Removed:
trunk/src/charset/
trunk/src/charset.c
trunk/src/encoding.c
trunk/src/encodings/
trunk/src/string.c
trunk/src/string_primitives.c
trunk/src/unicode.h
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/config/gen/makefiles/root.in
trunk/config/inter/charset.pm
trunk/config/inter/encoding.pm
trunk/include/parrot/charset.h
trunk/include/parrot/encoding.h
trunk/include/parrot/string_funcs.h
trunk/include/parrot/string_primitives.h
trunk/src/ (props changed)
trunk/src/io/utf8.c
trunk/tools/build/c2str.pl
Log:
[pdd28str] Merging in the pdd28str_part1 branch. Large file renaming in strings
subsystem for greater maintenance sanity.
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Mon Jan 26 23:32:43 2009
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Jan 26 08:02:30 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Jan 27 07:05:41 2009 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -212,6 +212,7 @@
config/auto/attributes/test_c.in []
config/auto/backtrace.pm []
config/auto/backtrace/test_c.in []
+config/auto/backtrace/test_dlinfo_c.in []
config/auto/byteorder.pm []
config/auto/byteorder/test_c.in []
config/auto/cgoto.pm []
@@ -2737,17 +2738,6 @@
src/bignum.c []
src/bignum.h []
src/byteorder.c []
-src/charset.c []
-src/charset/ascii.c []
-src/charset/ascii.h []
-src/charset/binary.c []
-src/charset/binary.h []
-src/charset/iso-8859-1.c []
-src/charset/iso-8859-1.h []
-src/charset/tables.c []
-src/charset/tables.h []
-src/charset/unicode.c []
-src/charset/unicode.h []
src/cpu_dep.c []
src/datatypes.c []
src/debug.c []
@@ -2765,15 +2755,6 @@
src/dynpmc/rotest.pmc []
src/dynpmc/subproxy.pmc []
src/embed.c []
-src/encoding.c []
-src/encodings/fixed_8.c []
-src/encodings/fixed_8.h []
-src/encodings/ucs2.c []
-src/encodings/ucs2.h []
-src/encodings/utf16.c []
-src/encodings/utf16.h []
-src/encodings/utf8.c []
-src/encodings/utf8.h []
src/events.c []
src/exceptions.c []
src/exec.c []
@@ -2988,14 +2969,34 @@
src/spf_render.c []
src/spf_vtable.c []
src/stacks.c []
-src/string.c []
-src/string_primitives.c []
+src/string/api.c []
+src/string/charset.c []
+src/string/charset/ascii.c []
+src/string/charset/ascii.h []
+src/string/charset/binary.c []
+src/string/charset/binary.h []
+src/string/charset/iso-8859-1.c []
+src/string/charset/iso-8859-1.h []
+src/string/charset/tables.c []
+src/string/charset/tables.h []
+src/string/charset/unicode.c []
+src/string/charset/unicode.h []
+src/string/encoding.c []
+src/string/encoding/fixed_8.c []
+src/string/encoding/fixed_8.h []
+src/string/encoding/ucs2.c []
+src/string/encoding/ucs2.h []
+src/string/encoding/utf16.c []
+src/string/encoding/utf16.h []
+src/string/encoding/utf8.c []
+src/string/encoding/utf8.h []
+src/string/primitives.c []
+src/string/unicode.h []
src/sub.c []
src/thread.c []
src/trace.c []
src/trace.h []
src/tsq.c []
-src/unicode.h []
src/utils.c []
src/vtable.tbl [devel]
src/vtables.c []
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Mon Jan 26 23:32:43 2009
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Jan 26 03:38:35 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Jan 27 07:05:41 2009 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -405,6 +405,8 @@
^languages/hq9plus/
^languages/languages_smoke\.html$
^languages/languages_smoke\.html/
+^languages/lazy-k$
+^languages/lazy-k/
^languages/m4$
^languages/m4/
^languages/markdown$
@@ -417,6 +419,8 @@
^languages/test_regex\.pbc/
^languages/test_regex\.pir$
^languages/test_regex\.pir/
+^languages/unlambda$
+^languages/unlambda/
# generated from svn:ignore of 'languages/APL/'
^languages/APL/.*\.pbc$
^languages/APL/.*\.pbc/
@@ -1395,18 +1399,11 @@
^src/platform_asm\.s/
^src/revision\.c$
^src/revision\.c/
-^src/string_private_cstring\.h$
-^src/string_private_cstring\.h/
# generated from svn:ignore of 'src/atomic/'
^src/atomic/.*\.gcda$
^src/atomic/.*\.gcda/
^src/atomic/.*\.o$
^src/atomic/.*\.o/
-# generated from svn:ignore of 'src/charset/'
-^src/charset/.*\.o$
-^src/charset/.*\.o/
-^src/charset/.*\.obj$
-^src/charset/.*\.obj/
# generated from svn:ignore of 'src/dynoplibs/'
^src/dynoplibs/.*\.bundle$
^src/dynoplibs/.*\.bundle/
@@ -1485,11 +1482,6 @@
^src/dynpmc/sha256\.pmc/
^src/dynpmc/sha512\.pmc$
^src/dynpmc/sha512\.pmc/
-# generated from svn:ignore of 'src/encodings/'
-^src/encodings/.*\.o$
-^src/encodings/.*\.o/
-^src/encodings/.*\.obj$
-^src/encodings/.*\.obj/
# generated from svn:ignore of 'src/gc/'
^src/gc/.*\.bundle$
^src/gc/.*\.bundle/
@@ -1561,6 +1553,19 @@
^src/pmc/.*\.tmp/
^src/pmc/Makefile$
^src/pmc/Makefile/
+# generated from svn:ignore of 'src/string/'
+^src/string/private_cstring\.h$
+^src/string/private_cstring\.h/
+# generated from svn:ignore of 'src/string/charset/'
+^src/string/charset/.*\.o$
+^src/string/charset/.*\.o/
+^src/string/charset/.*\.obj$
+^src/string/charset/.*\.obj/
+# generated from svn:ignore of 'src/string/encoding/'
+^src/string/encoding/.*\.o$
+^src/string/encoding/.*\.o/
+^src/string/encoding/.*\.obj$
+^src/string/encoding/.*\.obj/
# generated from svn:ignore of 't/benchmark/'
^t/benchmark/.*\.pasm$
^t/benchmark/.*\.pasm/
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Mon Jan 26 23:32:43 2009
@@ -363,21 +363,21 @@
$(IO_DIR)/filehandle$(O)
INTERP_O_FILES = \
- $(SRC_DIR)/string$(O) \
+ $(SRC_DIR)/string/api$(O) \
\
$(OPS_DIR)/core_ops$(O) \
$(OPS_DIR)/core_ops_switch$(O) \
\
#IF(i386_has_gcc_cmpxchg): $(SRC_DIR)/atomic/gcc_x86$(O) \
$(SRC_DIR)/byteorder$(O) \
- $(SRC_DIR)/charset$(O) \
+ $(SRC_DIR)/string/charset$(O) \
$(SRC_DIR)/core_pmcs$(O) \
$(SRC_DIR)/cpu_dep$(O) \
$(SRC_DIR)/datatypes$(O) \
$(SRC_DIR)/debug$(O) \
$(SRC_DIR)/dynext$(O) \
$(SRC_DIR)/embed$(O) \
- $(SRC_DIR)/encoding$(O) \
+ $(SRC_DIR)/string/encoding$(O) \
$(SRC_DIR)/events$(O) \
$(SRC_DIR)/exceptions$(O) \
$(SRC_DIR)/exit$(O) \
@@ -420,7 +420,7 @@
$(SRC_DIR)/spf_render$(O) \
$(SRC_DIR)/spf_vtable$(O) \
$(SRC_DIR)/stacks$(O) \
- $(SRC_DIR)/string_primitives$(O) \
+ $(SRC_DIR)/string/primitives$(O) \
$(SRC_DIR)/sub$(O) \
$(SRC_DIR)/thread$(O) \
$(SRC_DIR)/trace$(O) \
@@ -596,7 +596,7 @@
\
$(CLASS_STR_FILES)
-$(SRC_DIR)/string_private_cstring.h : $(STR_FILES) $(BUILD_TOOLS_DIR)/c2str.pl
+$(SRC_DIR)/string/private_cstring.h : $(STR_FILES) $(BUILD_TOOLS_DIR)/c2str.pl
$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl --all
# classes PMC build utils and rules
@@ -1092,9 +1092,9 @@
$(SRC_DIR)/sub$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/sub.str
-$(SRC_DIR)/string$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/string_private_cstring.h
+$(SRC_DIR)/string/api$(O) : $(GENERAL_H_FILES)
$(SRC_DIR)/string/private_cstring.h
-$(SRC_DIR)/string_primitives$(O) : $(GENERAL_H_FILES)
+$(SRC_DIR)/string/primitives$(O) : $(GENERAL_H_FILES)
$(SRC_DIR)/longopt$(O) : $(GENERAL_H_FILES)
@@ -1187,9 +1187,9 @@
$(SRC_DIR)/spf_vtable$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/spf_vtable.str
-$(SRC_DIR)/encoding$(O) : $(SRC_DIR)/encoding.c $(GENERAL_H_FILES)
+$(SRC_DIR)/string/encoding$(O) : $(SRC_DIR)/string/encoding.c
$(GENERAL_H_FILES)
-$(SRC_DIR)/charset$(O) : $(SRC_DIR)/charset.c $(GENERAL_H_FILES)
+$(SRC_DIR)/string/charset$(O) : $(SRC_DIR)/string/charset.c $(GENERAL_H_FILES)
$(SRC_DIR)/pbc_merge$(O) : $(SRC_DIR)/pbc_merge.c $(GENERAL_H_FILES)
@@ -1637,7 +1637,7 @@
install_config.fpmc
$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl --init
$(RM_F) \
- $(SRC_DIR)/string_private_cstring.h \
+ $(SRC_DIR)/string/private_cstring.h \
"$(SRC_DIR)/*.str" "$(SRC_DIR)/io/*.str" "$(SRC_DIR)/pmc/*.str" \
"src/pmc/*.c" "src/pmc/pmc_*.h" "src/pmc/*.dump" \
vtable.dump "*.def" "*.lib" "*.exp"
@@ -2046,10 +2046,10 @@
COVER_FLAGS = -fprofile-arcs -ftest-coverage
COVER_DIRS = \
$(SRC_DIR) \
- $(SRC_DIR)/charset \
+ $(SRC_DIR)/string/charset \
$(SRC_DIR)/dynoplibs \
$(SRC_DIR)/dynpmc \
- $(SRC_DIR)/encodings \
+ $(SRC_DIR)/string/encoding \
$(SRC_DIR)/gc \
$(SRC_DIR)/ops \
$(SRC_DIR)/packfile \
Modified: trunk/config/inter/charset.pm
==============================================================================
--- trunk/config/inter/charset.pm (original)
+++ trunk/config/inter/charset.pm Mon Jan 26 23:32:43 2009
@@ -34,7 +34,7 @@
my @charsets_defaults =
defined( $ENV{TEST_CHARSET} )
? $ENV{TEST_CHARSET}
- : sort map { basename($_) } glob "./src/charset/*.c";
+ : sort map { basename($_) } glob "./src/string/charset/*.c";
sub runstep {
my ( $self, $conf ) = @_;
@@ -68,7 +68,7 @@
foreach my $charset ( split( /\s+/, $charset_list ) ) {
$charset =~ s/\.c$//;
$TEMP_charset_build .= <<END
-src/charset/$charset\$(O): src/charset/$charset.h src/charset/ascii.h
src/charset/$charset.c \$(NONGEN_HEADERS)
+src/string/charset/$charset\$(O): src/string/charset/$charset.h
src/string/charset/ascii.h src/string/charset/$charset.c \$(NONGEN_HEADERS)
END
@@ -76,7 +76,7 @@
# build list of libraries for link line in Makefile
my $slash = $conf->data->get('slash');
- $TEMP_charset_o =~ s/^| / src${slash}charset${slash}/g;
+ $TEMP_charset_o =~ s/^| / src${slash}string${slash}charset${slash}/g;
$conf->data->set(
charset => $charset_list,
Modified: trunk/config/inter/encoding.pm
==============================================================================
--- trunk/config/inter/encoding.pm (original)
+++ trunk/config/inter/encoding.pm Mon Jan 26 23:32:43 2009
@@ -34,7 +34,7 @@
my @encodings_defaults =
defined( $ENV{TEST_ENCODING} )
? $ENV{TEST_ENCODING}
- : sort map { basename($_) } glob "./src/encodings/*.c";
+ : sort map { basename($_) } glob "./src/string/encoding/*.c";
sub runstep {
my ( $self, $conf ) = @_;
@@ -68,7 +68,7 @@
foreach my $encoding ( split( /\s+/, $encoding_list ) ) {
$encoding =~ s/\.c$//;
$TEMP_encoding_build .= <<END
-src/encodings/$encoding\$(O): src/encodings/$encoding.h
src/encodings/$encoding.c \$(NONGEN_HEADERS)
+src/string/encoding/$encoding\$(O): src/string/encoding/$encoding.h
src/string/encoding/$encoding.c \$(NONGEN_HEADERS)
END
@@ -76,7 +76,7 @@
# build list of libraries for link line in Makefile
my $slash = $conf->data->get('slash');
- $TEMP_encoding_o =~ s/^| / src${slash}encodings${slash}/g;
+ $TEMP_encoding_o =~ s/^| / src${slash}string${slash}encoding${slash}/g;
$conf->data->set(
encoding => $encoding_list,
Modified: trunk/include/parrot/charset.h
==============================================================================
--- trunk/include/parrot/charset.h (original)
+++ trunk/include/parrot/charset.h Mon Jan 26 23:32:43 2009
@@ -75,7 +75,7 @@
typedef STRING* (*charset_converter_t)(PARROT_INTERP, STRING *src, STRING
*dst);
-/* HEADERIZER BEGIN: src/charset.c */
+/* HEADERIZER BEGIN: src/string/charset.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_EXPORT
@@ -203,7 +203,7 @@
|| PARROT_ASSERT_ARG(rhs) \
|| PARROT_ASSERT_ARG(func)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/charset.c */
+/* HEADERIZER END: src/string/charset.c */
struct _charset {
const char *name;
Modified: trunk/include/parrot/encoding.h
==============================================================================
--- trunk/include/parrot/encoding.h (original)
+++ trunk/include/parrot/encoding.h Mon Jan 26 23:32:43 2009
@@ -73,7 +73,7 @@
typedef INTVAL (*encoding_converter_t)(PARROT_INTERP, ENCODING *lhs, ENCODING
*rhs);
-/* HEADERIZER BEGIN: src/encoding.c */
+/* HEADERIZER BEGIN: src/string/encoding.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_EXPORT
@@ -182,7 +182,7 @@
#define ASSERT_ARGS_parrot_deinit_encodings __attribute__unused__ int
_ASSERT_ARGS_CHECK = 0
#define ASSERT_ARGS_parrot_init_encodings_2 __attribute__unused__ int
_ASSERT_ARGS_CHECK = 0
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/encoding.c */
+/* HEADERIZER END: src/string/encoding.c */
#define ENCODING_MAX_BYTES_PER_CODEPOINT(i, src) \
((src)->encoding)->max_bytes_per_codepoint
Modified: trunk/include/parrot/string_funcs.h
==============================================================================
--- trunk/include/parrot/string_funcs.h (original)
+++ trunk/include/parrot/string_funcs.h Mon Jan 26 23:32:43 2009
@@ -23,7 +23,7 @@
#define Parrot_unCOW_string(i, s) PObj_COW_TEST((s)) ? \
Parrot_unmake_COW((i), (s)), (s) : (s)
-/* HEADERIZER BEGIN: src/string.c */
+/* HEADERIZER BEGIN: src/string/api.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_EXPORT
@@ -727,7 +727,7 @@
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(tc)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/string.c */
+/* HEADERIZER END: src/string/api.c */
#endif /* PARROT_IN_CORE */
#endif /* PARROT_STRING_FUNCS_H_GUARD */
Modified: trunk/include/parrot/string_primitives.h
==============================================================================
--- trunk/include/parrot/string_primitives.h (original)
+++ trunk/include/parrot/string_primitives.h Mon Jan 26 23:32:43 2009
@@ -15,7 +15,7 @@
#ifdef PARROT_IN_CORE
-/* HEADERIZER BEGIN: src/string_primitives.c */
+/* HEADERIZER BEGIN: src/string/primitives.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
PARROT_EXPORT
@@ -62,7 +62,7 @@
|| PARROT_ASSERT_ARG(offset) \
|| PARROT_ASSERT_ARG(string)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-/* HEADERIZER END: src/string_primitives.c */
+/* HEADERIZER END: src/string/primitives.c */
#endif /* PARROT_IN_CORE */
#endif /* PARROT_STRING_PRIMITIVES_H_GUARD */
Modified: trunk/src/io/utf8.c
==============================================================================
--- trunk/src/io/utf8.c (original)
+++ trunk/src/io/utf8.c Mon Jan 26 23:32:43 2009
@@ -21,7 +21,7 @@
#include "parrot/parrot.h"
#include "io_private.h"
-#include "../unicode.h"
+#include "../string/unicode.h"
/* HEADERIZER HFILE: include/parrot/io.h */
Copied: trunk/src/string/api.c (from r36042, /trunk/src/string.c)
==============================================================================
--- /trunk/src/string.c (original)
+++ trunk/src/string/api.c Mon Jan 26 23:32:43 2009
@@ -26,7 +26,7 @@
#include "parrot/parrot.h"
#include "parrot/compiler.h"
#include "parrot/string_funcs.h"
-#include "string_private_cstring.h"
+#include "private_cstring.h"
#include "parrot/resources.h"
/*
Copied: trunk/src/string/charset.c (from r36042, /trunk/src/charset.c)
==============================================================================
--- /trunk/src/charset.c (original)
+++ trunk/src/string/charset.c Mon Jan 26 23:32:43 2009
@@ -19,10 +19,10 @@
#define PARROT_NO_EXTERN_CHARSET_PTRS
#include "parrot/parrot.h"
-#include "encodings/fixed_8.h"
-#include "encodings/utf8.h"
-#include "encodings/utf16.h"
-#include "encodings/ucs2.h"
+#include "encoding/fixed_8.h"
+#include "encoding/utf8.h"
+#include "encoding/utf16.h"
+#include "encoding/ucs2.h"
#include "charset/ascii.h"
#include "charset/binary.h"
Modified: trunk/tools/build/c2str.pl
==============================================================================
--- trunk/tools/build/c2str.pl (original)
+++ trunk/tools/build/c2str.pl Mon Jan 26 23:32:43 2009
@@ -20,7 +20,7 @@
use IO::File ();
my $outfile = 'all_cstring.str';
-my $string_private_h = 'src/string_private_cstring.h';
+my $string_private_h = 'src/string/private_cstring.h';
# add read/write permissions even if we don't read/write the file
# for example, Solaris requires write permissions for exclusive locks
