Merge branch 'nwellnhof/string_unescape'

parrot · Dec 28, 2010 · b8b3c7d · b8b3c7d
2 parents e132190 + 2ceb0e8
commit b8b3c7d
Show file tree

Hide file tree

Showing 16 changed files with 334 additions and 998 deletions.
diff --git a/DEPRECATED.pod b/DEPRECATED.pod
@@ -104,12 +104,6 @@ will not auto-vivify nested hashes and return PMCNULL early.
 
 L<https://trac.parrot.org/parrot/ticket/1561>
 
-=item Method unescape on String [experimental]
-
-This is a helper method for testing of Parrot_str_unescape_string.
-
-L<https://trac.parrot.org/parrot/ticket/1628>
-
 =item logical_* vtables [eligiblie in 2.7]
 
 These can be replaced by C<get_bool> and intval ops unless you're using them for
@@ -284,6 +278,12 @@ At this point, C<:init> is a no-op, and will therefore be removed.
 
 L<https://trac.parrot.org/parrot/ticket/1896>
 
+=item encoding:charset:"" string literals [eligible in 3.1]
+
+This form of string literals will be removed.
+
+L<https://trac.parrot.org/parrot/ticket/1808>
+
 =back
 
 =head1 Functions
@@ -317,13 +317,6 @@ this rather than relying on in-place modification of an existing pointer.
 
 L<https://trac.parrot.org/parrot/ticket/1584>
 
-=item Parrot_str_unescape_string [experimental]
-
-This function is an experimental addition to enhance and maybe replace
-Parrot_str_unescape
-
-L<https://trac.parrot.org/parrot/ticket/1628>
-
 =item Parrot_load_bytecode_file [experimental]
 
 Load a .pbc file into the interpreter. Experimental.
@@ -347,6 +340,12 @@ VTABLEs, PCC, etc.
 
 L<http://trac.parrot.org/parrot/ticket/1906>
 
+=item Old string_* functions [eligible in 3.0]
+
+The old string_* functions will be removed.
+
+L<http://trac.parrot.org/parrot/ticket/1809>
+
 =back
 
 =head1 Compiler tools

diff --git a/MANIFEST b/MANIFEST
@@ -974,7 +974,6 @@ include/parrot/settings.h                                   [main]include
 include/parrot/stat.h                                       [main]include
 include/parrot/string.h                                     [main]include
 include/parrot/string_funcs.h                               [main]include
-include/parrot/string_primitives.h                          [main]include
 include/parrot/sub.h                                        [main]include
 include/parrot/sysmem.h                                     [main]include
 include/parrot/thr_pthread.h                                [main]include
@@ -1444,7 +1443,6 @@ src/string/encoding/ucs2.c                                  []
 src/string/encoding/ucs4.c                                  []
 src/string/encoding/utf16.c                                 []
 src/string/encoding/utf8.c                                  []
-src/string/primitives.c                                     []
 src/string/unicode.h                                        []
 src/sub.c                                                   []
 src/thread.c                                                []

diff --git a/compilers/imcc/imcc.y b/compilers/imcc/imcc.y
@@ -1315,8 +1315,8 @@ sub:
         {
           IMCC_INFO(interp)->cur_call->pcc_sub->pragma = $5;
           if (!IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid) {
-            IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid = mem_sys_strdup(
-            IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->name);
+            IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid =
+                IMCC_INFO(interp)->cur_unit->instructions->symregs[0];
           }
         }
      sub_params
@@ -1447,9 +1447,10 @@ subid:
          }
    | SUBID '(' any_string ')'
          {
+           SymReg *r = mk_const(interp, $3, 'S');
            $$ = 0;
-           IMCC_INFO(interp)->cur_unit->subid = mk_const(interp, $3, 'S');
-           IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid = str_dup_remove_quotes($3);
+           IMCC_INFO(interp)->cur_unit->subid = r;
+           IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid = r;
            mem_sys_free($3);
          }
    ;