home *** CD-ROM | disk | FTP | other *** search
/ OS/2 Shareware BBS: 22 gnu / 22-gnu.zip / gwm18a.zip / contrib / gwmsh / PATCH-GWM < prev    next >
Text File  |  1995-07-03  |  3KB  |  107 lines
  1. This will give you with-output-to-string function
  2. gwmsh uses to get back results from gwm.
  3.  
  4. (with-output-to-string
  5.   <form1>
  6.   ...
  7.   <formN>)
  8.  
  9. Forms are evaluated as in prog, but all output from calls to print
  10. is directed to string returned as with-output-to-string value.
  11.  
  12. diff -c gwm-1.7o-dist/wool.c gwm-1.7o/wool.c
  13. *** gwm-1.7o-dist/wool.c    Fri Sep 30 21:06:51 1994
  14. --- gwm-1.7o/wool.c    Fri Sep 30 21:07:17 1994
  15. ***************
  16. *** 1145,1150 ****
  17. --- 1145,1186 ----
  18.       return result;
  19.   }
  20.   
  21. + /*XXX-UWE-XXX*/
  22. + static int expand_string_stream ();
  23. + 
  24. + WOOL_OBJECT
  25. + wool_with_output_to_string (argc, argv)
  26. +   int argc;
  27. +   WOOL_OBJECT *argv;
  28. + {
  29. +     WOOL_STRING_STREAM str, WOOL_STRING_STREAM_make (); 
  30. +     int old_type;
  31. +     char *old_stream;
  32. +     WOOL_OBJECT result;
  33. + 
  34. +     str = WOOL_STRING_STREAM_make (256, expand_string_stream);
  35. +     old_type = wool_output_redirect (1, str, &old_stream);
  36. +     progn (argc, argv);
  37. +     wool_output_redirect (old_type, old_stream, NULL);
  38. + 
  39. +     result = (WOOL_OBJECT) WLString_make (str->buffer);
  40. +     WOOL_STRING_STREAM_free (str);
  41. +     return result;
  42. + }
  43. + 
  44. + static int
  45. + expand_string_stream (str)
  46. +   WOOL_STRING_STREAM str;
  47. + {
  48. +     char *new_buf;
  49. +     int nbytes = str->last - str->buffer + 1;
  50. +     int ptr_pos = str->ptr - str->buffer;
  51. + 
  52. +     str->buffer = Realloc (str->buffer, 2*nbytes);        
  53. +     str->last = str->buffer + nbytes - 1;
  54. +     str->ptr = str->buffer + ptr_pos;
  55. + }
  56. + /*XXX-UWE-XXX*/
  57.   /*
  58.    * (progn inst1 ... instn)
  59.    * evals the n instructions then return the last one's result
  60. ***************
  61. *** 1987,1992 ****
  62. --- 2023,2032 ----
  63.       wool_subr_make(WLSubr, shell, "!", NARY);
  64.       increase_reference(wool_atom("print") -> c_val =
  65.                  wool_subr_make(WLSubr, wool_print_nary, "?", NARY));
  66. + /*XXX-UWE-XXX*/
  67. +     wool_subr_make(WLFSubr, wool_with_output_to_string,
  68. +                    "with-output-to-string", NARY);
  69. + /*XXX-UWE-XXX*/
  70.       wool_subr_make(WLSubr, not, "not", 1);
  71.       wool_subr_make(WLFSubr, and, "and", NARY);
  72.       wool_subr_make(WLFSubr, or, "or", NARY);
  73. diff -c gwm-1.7o-dist/wool.flex gwm-1.7o/wool.flex
  74. *** gwm-1.7o-dist/wool.flex    Fri Sep 30 21:06:51 1994
  75. --- gwm-1.7o/wool.flex    Fri Sep 30 21:07:17 1994
  76. ***************
  77. *** 135,142 ****
  78.   yyoutflush(){
  79.       if(yyout_is_string){
  80.           ASSERT(yystrout->overflow_handler);
  81. !     (*(yystrout->overflow_handler))(yystrout->buffer);
  82. !     yystrout->ptr = yystrout-> buffer;
  83.       }else{
  84.       fflush(yyout);
  85.       }
  86. --- 135,144 ----
  87.   yyoutflush(){
  88.       if(yyout_is_string){
  89.           ASSERT(yystrout->overflow_handler);
  90. ! /*XXX-UWE-XXX*/
  91. !     (*(yystrout->overflow_handler))(yystrout);
  92. !     /* yystrout->ptr = yystrout-> buffer; */
  93. ! /*XXX-UWE-XXX*/
  94.       }else{
  95.       fflush(yyout);
  96.       }
  97. ***************
  98. *** 271,276 ****
  99. --- 273,279 ----
  100.       WOOL_STRING_STREAM str = (WOOL_STRING_STREAM)
  101.           Malloc(sizeof(struct _WOOL_STRING_STREAM));
  102.       str->buffer = (char *) Malloc(nbytes);
  103. +     *str->buffer = '\0';        /*XXX-UWE-XXX*/
  104.       str->ptr = str->buffer;
  105.       str->last = str->buffer + nbytes -1;
  106.       str->overflow_handler = handler;
  107.