* fixed web bug #1501 in conjunction with -Or

compiler/nbas.pas

@@ -266,7 +266,9 @@ implementation
                    { concat function result to exit }
                    { this is wrong for string or other complex
                      result types !!! }
-                   if ret_in_acc(procinfo^.returntype.def) and
+                   if {ret_in_acc(procinfo^.returntype.def) and }
+                      (is_ordinal(procinfo^.returntype.def) or
+                       is_smallset(procinfo^.returntype.def)) and
                       assigned(hp.left) and
                       assigned(tstatementnode(hp.left).right) and
                       (tstatementnode(hp.left).right.nodetype=exitn) and
@@ -394,7 +396,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.11  2001-05-18 22:31:06  peter
+  Revision 1.12  2001-06-11 17:41:12  jonas
+    * fixed web bug 1501 in conjunction with -Or
+
+  Revision 1.11  2001/05/18 22:31:06  peter
     * tasmnode.pass_2 is independent of cpu, moved to ncgbas
     * include ncgbas for independent nodes