Builtin functions return their values in arg_num,arg_str.

reg_num,reg_str gets set only when reducing to pitems.
Fixed if-blocks to save the result of the last evaluated conditional
to reg_num.

@@ -34,7 +34,7 @@ static size_t mh_code_op (mh_opcode_t op);
 static size_t mh_code_string (char *string);
 static size_t mh_code_number (int num);
 static size_t mh_code_builtin (mh_builtin_t *bp, int argtype);
-static void branch_fixup (size_t pc); /* Fix-up conditional branches */
+static void branch_fixup (size_t pc, size_t tgt); 
  
   /* Lexical tie-ins */
 static int in_escape;       /* Set when inside an escape sequence */
@@ -60,8 +60,8 @@ static int want_function;   /* Set when expecting function name */
 %token <num> FMTSPEC
 %token BOGUS
 %type <type> cond_expr component funcall item argument escape literal
-%type <elif_list> elif_part elif_list else_part 
-%type <pc> cond end else elif
+%type <elif_list> elif_part elif_list fi
+%type <pc> cond end else elif else_part 
 %type <builtin> function
 
 %%
@@ -81,10 +81,12 @@ pitem     : item
 		  break;
 		  
 		case mhtype_num:
+		  mh_code_op (mhop_num_asgn);
 		  mh_code_op (mhop_num_print);
 		  break;
 		  
 		case mhtype_str:
+		  mh_code_op (mhop_str_asgn);
 		  mh_code_op (mhop_str_print);
 		  break;
 		  
@@ -105,13 +107,11 @@ item      : literal
 literal   : STRING
             {
 	      mh_code_string ($1);
-	      mh_code_op (mhop_str_asgn);
 	      $$ = mhtype_str;
 	    }
           | NUMBER
             {
 	      mh_code_number ($1);
-	      mh_code_op (mhop_num_asgn);
 	      $$ = mhtype_num;
 	    }	      
           ;
@@ -153,17 +153,29 @@ cbrace    : CBRACE
 
 funcall   : fmtspec obrace { want_function = 1;} function { want_function = 0; } argument cbrace
             {
+	      if ($4)
+		{
+		  if (!mh_code_builtin ($4, $6))
+		    YYERROR;
+		  $$ = $4->type;
+		}
+	      else
+		{
 		  switch ($6)
 		    {
+		    default:
+		      break;
+		  
 		    case mhtype_num:
-		  mh_code_op (mhop_num_to_arg);
+		      mh_code_op (mhop_num_asgn);
 		      break;
+		  
 		    case mhtype_str:
-		  mh_code_op (mhop_str_to_arg);
+		      mh_code_op (mhop_str_asgn);
+		      break;
+		    }
+		  $$ = mhtype_none;
 		}
-	      if (!mh_code_builtin ($4, $6))
-		YYERROR;
-	      $$ = $4->type;
 	    }
           ;
 
@@ -178,10 +190,17 @@ fmtspec   : /* empty */
 function  : FUNCTION
           | STRING
             {
+	      if (strcmp ($1, "void") == 0)
+		{
+		  $$ = NULL;
+		}
+	      else
+		{
 		  yyerror ("undefined function");
 		  mh_error ($1);
 		  YYERROR;
 		}
+	    }
           ;
 
 argument  : /* empty */
@@ -193,28 +212,21 @@ argument  : /* empty */
           ;
 
 /*           1   2    3   4      5         6     7 */
-cntl      : if cond list end elif_part else_part FI
+cntl      : if cond list end elif_part else_part fi
             {
 	      size_t start_pc = 0, end_pc = 0;
 
 	      /* Fixup first condition */
 	      if ($5.cond)
 		format.prog[$2] = $5.cond - $2;
-	      else if ($6.cond)
-		format.prog[$2] = $6.cond - $2;
+	      else if ($6)
+		format.prog[$2] = $6 - $2;
 	      else
-		format.prog[$2] = $4 - $2 - 1;
+		format.prog[$2] = $7.cond - $2;
 
 	      /* Link all "false" lists */
-	      if ($6.cond)
-		{
-		  start_pc = end_pc = $6.end;
-		}
 	      if ($5.cond)
 		{
-		  if (start_pc)
-		    format.prog[end_pc] = $5.end;
-		  else
 		  start_pc = $5.end;
 		  end_pc = $5.end;
 		  for (; format.prog[end_pc]; end_pc = format.prog[end_pc])
@@ -227,8 +239,8 @@ cntl      : if cond list end elif_part else_part FI
 		start_pc = $4;
 
 	      /* Now, fixup the end branches */
-	      branch_fixup (start_pc);
-	      format.prog[start_pc] = pc - start_pc;
+	      branch_fixup (start_pc, $7.end);
+	      format.prog[start_pc] = $7.end - start_pc;
 	    }
           ;
 
@@ -238,6 +250,20 @@ if        : IF
 	    }
           ;
 
+fi        : FI
+            {
+	      /* False branch of an if-block */
+	      $$.cond = mh_code_number (0);
+	      mh_code_op (mhop_num_asgn);
+	      /* Jump over the true branch */
+	      mh_code_op (mhop_branch);
+	      mh_code_op (3);
+	      /* True branch */
+	      $$.end = mh_code_number (1);
+	      mh_code_op (mhop_num_asgn);
+	    }
+          ;
+
 elif      : ELIF
             {
 	      in_escape++;
@@ -296,14 +322,9 @@ elif_list : elif cond list
 
 else_part : /* empty */
             {
-	      $$.cond = 0;
-	      $$.end = 0;
-	    }
-          | else list end
-            {
-	      $$.cond = $1;
-	      $$.end = $3;
+	      $$ = 0;
 	    }
+          | else list 
 	  ;
 
 else      : ELSE
@@ -383,6 +404,9 @@ yylex ()
     }
 
   if (in_escape)
+    {
+      while (*curp && (*curp == ' ' || *curp == '\n'))
+	curp++;
       switch (*curp)
 	{
 	case '(':
@@ -396,6 +420,7 @@ yylex ()
 	  yylval.num = strtol (curp, &curp, 0);
 	  return NUMBER;
 	}
+    }
   
   switch (*curp)
     {
@@ -481,13 +506,13 @@ backslash(int c)
 }
 
 void
-branch_fixup (size_t epc)
+branch_fixup (size_t epc, size_t tgt)
 {
   size_t prev = format.prog[epc];
   if (!prev)
     return;
-  branch_fixup (prev);
-  format.prog[prev] = epc - prev - 1;
+  branch_fixup (prev, tgt);
+  format.prog[prev] = tgt - prev - 1;
 }
 
 
@@ -531,7 +556,9 @@ mh_code_op (mh_opcode_t op)
 size_t
 mh_code_number (int num)
 {
-  return mh_code_op ((mh_opcode_t) num);
+  size_t ret = mh_code_op (mhop_num_arg);
+  mh_code_op ((mh_opcode_t) num);
+  return ret;
 }
 
 size_t