diff --git a/src/language.yacc b/src/language.yacc
index 97544dfc4340512c3b0d5d2b60a03ff949d840d3..8ef81e842eab7a2824f2b9039606285e8e385df5 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -179,7 +179,7 @@
 /* This is the grammar definition of Pike. */
 
 #include "global.h"
-RCSID("$Id: language.yacc,v 1.96 1998/05/12 23:51:25 hubbe Exp $");
+RCSID("$Id: language.yacc,v 1.97 1998/05/20 02:14:28 hubbe Exp $");
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
 #endif
@@ -575,7 +575,7 @@ def: modifiers type_or_error optional_stars F_IDENTIFIER
     
     if(compiler_frame->current_return_type)
       free_string(compiler_frame->current_return_type);
-    compiler_frame->current_return_type=pop_type();
+    compiler_frame->current_return_type=compiler_pop_type();
     
     push_finished_type(compiler_frame->current_return_type);
     
@@ -597,7 +597,7 @@ def: modifiers type_or_error optional_stars F_IDENTIFIER
     push_type(T_FUNCTION);
 
     {
-      struct pike_string *s=pop_type();
+      struct pike_string *s=compiler_pop_type();
       $<n>$=mkstrnode(s);
       free_string(s);
     }
@@ -639,7 +639,7 @@ def: modifiers type_or_error optional_stars F_IDENTIFIER
   | modifiers type_or_error optional_stars bad_identifier
     '(' arguments ')' block_or_semi
   {
-    free_string(pop_type());
+    free_string(compiler_pop_type());
   }
   | modifiers type_or_error name_list ';' {}
   | inheritance {}
@@ -698,7 +698,7 @@ new_arg_name: type7 optional_dot_dot_dot optional_identifier
       my_yyerror("Variable '%s' appears twice in argument list.",
 		 $3->u.sval.u.string->str);
     
-    add_local_name($3->u.sval.u.string, pop_type());
+    add_local_name($3->u.sval.u.string, compiler_pop_type());
     free_node($3);
   }
   ;
@@ -745,7 +745,7 @@ optional_stars: optional_stars '*' { $$=$1 + 1; }
 
 cast: '(' type ')'
     {
-      struct pike_string *s=pop_type();
+      struct pike_string *s=compiler_pop_type();
       $$=mkstrnode(s);
       free_string(s);
     }
@@ -763,7 +763,7 @@ type7: type7 '*' { push_type(T_ARRAY); }
 
 simple_type: type4
   {
-    struct pike_string *s=pop_type();
+    struct pike_string *s=compiler_pop_type();
     $$=mkstrnode(s);
     free_string(s);
   }
@@ -771,7 +771,7 @@ simple_type: type4
 
 simple_type2: type2
   {
-    struct pike_string *s=pop_type();
+    struct pike_string *s=compiler_pop_type();
     $$=mkstrnode(s);
     free_string(s);
   }
@@ -779,7 +779,7 @@ simple_type2: type2
 
 simple_identifier_type: identifier_type
   {
-    struct pike_string *s=pop_type();
+    struct pike_string *s=compiler_pop_type();
     $$=mkstrnode(s);
     free_string(s);
   }
@@ -926,7 +926,7 @@ new_name: optional_stars F_IDENTIFIER
     struct pike_string *type;
     push_finished_type(compiler_frame->current_type);
     while($1--) push_type(T_ARRAY);
-    type=pop_type();
+    type=compiler_pop_type();
     define_variable($2->u.sval.u.string, type, current_modifiers);
     free_string(type);
     free_node($2);
@@ -937,7 +937,7 @@ new_name: optional_stars F_IDENTIFIER
     struct pike_string *type;
     push_finished_type(compiler_frame->current_type);
     while($1--) push_type(T_ARRAY);
-    type=pop_type();
+    type=compiler_pop_type();
     $<number>$=define_variable($2->u.sval.u.string, type, current_modifiers);
     free_string(type);
   }
@@ -964,7 +964,7 @@ new_local_name: optional_stars F_IDENTIFIER
   {
     push_finished_type($<n>0->u.sval.u.string);
     while($1--) push_type(T_ARRAY);
-    add_local_name($2->u.sval.u.string, pop_type());
+    add_local_name($2->u.sval.u.string, compiler_pop_type());
     $$=mknode(F_ASSIGN,mkintnode(0),mklocalnode(islocal($2->u.sval.u.string)));
     free_node($2);
   }
@@ -973,7 +973,7 @@ new_local_name: optional_stars F_IDENTIFIER
   {
     push_finished_type($<n>0->u.sval.u.string);
     while($1--) push_type(T_ARRAY);
-    add_local_name($2->u.sval.u.string, pop_type());
+    add_local_name($2->u.sval.u.string, compiler_pop_type());
     $$=mknode(F_ASSIGN,$4,mklocalnode(islocal($2->u.sval.u.string)));
     free_node($2);
   }
@@ -1132,7 +1132,7 @@ lambda: F_LAMBDA
     
     push_type(T_FUNCTION);
     
-    type=pop_type();
+    type=compiler_pop_type();
 
     sprintf(buf,"__lambda_%ld_%ld",
 	    (long)new_program->id,
@@ -1838,7 +1838,7 @@ lvalue: expr4
   | '[' low_lvalue_list ']' { $$=mknode(F_ARRAY_LVALUE, $2,0); }
   | type6 F_IDENTIFIER
   {
-    add_local_name($2->u.sval.u.string,pop_type());
+    add_local_name($2->u.sval.u.string,compiler_pop_type());
     $$=mklocalnode(islocal($2->u.sval.u.string));
     free_node($2);
   }
diff --git a/src/pike_types.c b/src/pike_types.c
index eb30ee0cd632aa1204d6ae2b13f50689816452d9..17bc4fb5eca8430774c1f8806ce863f6c154042e 100644
--- a/src/pike_types.c
+++ b/src/pike_types.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: pike_types.c,v 1.42 1998/04/28 07:47:17 hubbe Exp $");
+RCSID("$Id: pike_types.c,v 1.43 1998/05/20 02:14:29 hubbe Exp $");
 #include <ctype.h>
 #include "svalue.h"
 #include "pike_types.h"
@@ -301,6 +301,27 @@ struct pike_string *debug_pop_type(void)
   return s;
 }
 
+struct pike_string *debug_compiler_pop_type(void)
+{
+  extern int num_parse_error;
+  if(num_parse_error)
+  {
+    /* This could be fixed to check if the type
+     * is correct and then return it, I just didn't feel
+     * like writing the checking code today. / Hubbe
+     */
+    pop_stack_mark();
+    type_stack_mark();
+    reference_shared_string(mixed_type_string);
+    return mixed_type_string;
+  }else{
+    struct pike_string *s;
+    s=pop_unfinished_type();
+    type_stack_mark();
+    return s;
+  }
+}
+
 static void internal_parse_typeA(char **_s)
 {
   char buf[80];
diff --git a/src/pike_types.h b/src/pike_types.h
index 4fe9eb3f75713799c1b8012fad76680e229f10ce..2049537301c36de336d86bea14b8362e74d2fa23 100644
--- a/src/pike_types.h
+++ b/src/pike_types.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: pike_types.h,v 1.12 1998/04/24 00:08:43 hubbe Exp $
+ * $Id: pike_types.h,v 1.13 1998/05/20 02:14:29 hubbe Exp $
  */
 #ifndef PIKE_TYPES_H
 #define PIKE_TYPES_H
@@ -101,6 +101,7 @@ void push_finished_type(struct pike_string *type);
 void push_finished_type_backwards(struct pike_string *type);
 struct pike_string *debug_pop_unfinished_type(void);
 struct pike_string *debug_pop_type(void);
+struct pike_string *debug_compiler_pop_type(void);
 struct pike_string *parse_type(char *s);
 void stupid_describe_type(char *a,INT32 len);
 void simple_describe_type(struct pike_string *s);
@@ -123,10 +124,12 @@ void cleanup_pike_types(void);
 
 #ifdef DEBUG_MALLOC
 #define pop_type() ((struct pike_string *)debug_malloc_update_location(debug_pop_type(),__FILE__,__LINE__))
+#define compiler_pop_type() ((struct pike_string *)debug_malloc_update_location(debug_compiler_pop_type(),__FILE__,__LINE__))
 #define pop_unfinished_type() \
  ((struct pike_string *)debug_malloc_update_location(debug_pop_unfinished_type(),__FILE__,__LINE__))
 #else
 #define pop_type debug_pop_type
+#define compiler_pop_type debug_compiler_pop_type
 #define pop_unfinished_type debug_pop_unfinished_type
 #endif
 
diff --git a/src/testsuite.in b/src/testsuite.in
index 6352d4e19194e33bc39b0baaa012d8aeee168b81..f41749f471f3292c00f58dd47601cd692a0b6fe3 100644
--- a/src/testsuite.in
+++ b/src/testsuite.in
@@ -1,4 +1,4 @@
-stest_true([["$Id: testsuite.in,v 1.110 1998/05/16 10:58:01 hubbe Exp $"]])
+stest_true([["$Id: testsuite.in,v 1.111 1998/05/20 02:14:29 hubbe Exp $"]])
 cond([[all_constants()->_verify_internals]],
 [[
   test_do(_verify_internals())
@@ -27,6 +27,20 @@ test_any([[ int a,b; [ [a],b]=({ ({ 1 }) ,2}); return a]],1)
 test_any([[ int a,b; [ [a],b]=({ ({ 1 }) ,2}); return b]],2)
 test_compile_error([[ default ; ]])
 test_compile_error([[ int a,b; [a,b]++; ]])
+test_compile_error([[
+array(int) x;
+
+string foo()
+{
+ return "foo "+(array(string) x) * ",";
+}
+
+int main()
+{
+  return 0;
+}
+]])
+
 test_compile_eror(0())
 test_compile_eror(1())
 test_compile_eror(""())