Merge branch 'master' into libjit

ashgti · Nov 5, 2009 · f57ee7b · f57ee7b
2 parents e33797b + d0183bd
commit f57ee7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/docs/compiler_faq.pod b/docs/compiler_faq.pod
@@ -780,22 +780,4 @@ Create a new C<Env> PMC and access it like a hash.
 See F<config_lib.pasm> for all the keys in the config hash - or iterate over
 the config hash.
 
-=head1 Languages
+=cut
-
-=head2 What files do I need to modify to add my new language compiler?
-
-Aside from the files in your new language directory, you must modify
-
-    CREDITS
-    MANIFEST
-    config/gen/languages.pm
-    config/gen/makefiles/languages.in
-
-Inside your language dir, you may consider adding the following:
-
-    LICENSE
-    MAINTAINER
-    README
-    STATUS
-
-Look to existing languages for some examples.
diff --git a/src/pmc/callsignaturereturns.pmc b/src/pmc/callsignaturereturns.pmc
@@ -308,7 +308,9 @@ necessary.
                 *(STRING **)ptr = value;
                 break;
             case PARROT_ARG_PMC:
-                *(PMC **)ptr = get_string_pmc(INTERP, value);
+                *(PMC **)ptr = STRING_IS_NULL(value) ?
+                    PMCNULL :
+                    get_string_pmc(INTERP, value);
                 break;
             default:
                 PARROT_ASSERT(!"Impossible type");