Mercurial > hg > xemacs-beta
view src/hpplay.c @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 16 Aug 2009 20:55:49 +0100 |
parents | ecf1ebac70d8 |
children | aa5ed11f473b |
line wrap: on
line source
/* Copyright (C) 1993 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized by Ben Wing, 5-15-01. */ /*** NAME hpplay PURPOSE Play .au sound files on hp9000s700 BUGS I have been unable to figure out how to use the volume feature, so no attempt has been made to honor the volume arg of play_sound_* This means that all sounds are played at 100%. The gain parameter can be set by using the hp-play-gain variable. NOTES This file is mostly based on the player program found in the examples directory of the audio software delivered on our machines. The path I found it under was /usr/audio/examples/player.c This file contained no credits and no copyrights. The original fileheader is given below. HISTORY lynbech - Feb 10, 1993: Created. ***/ /* ORIGINAL FILEHEADER: * player - command-line audio file player * Aug. 28 1991 * by three unknown, unsung audio programmers * (well, only two are unsung) */ #include <config.h> #include "lisp.h" #include "sound.h" #ifdef HPUX10 #include <Alib.h> #include <CUlib.h> #else /* !HPUX 10 */ #include <audio/Alib.h> #include <audio/CUlib.h> #endif /* !HPUX 10 */ Lisp_Object Vhp_play_server; Lisp_Object Vhp_play_speaker; Fixnum hp_play_gain; /* Functions */ /* error handling */ void player_error_internal (Audio * audio, Ascbyte * text, long errorCode) { Extbyte errorbuff[132]; Ibyte *interr; AGetErrorText (audio, errorCode, errorbuff, 131); EXTERNAL_TO_C_STRING (errorbuf, interr, Qnative); signal_error (Qsound_error, text, build_string (interr)); } long myHandler( Audio * audio, AErrorEvent * err_event) { player_error_internal(audio, "Internal sound error", err_event->error_code); return 1; /* Must return something, was orig. an exit */ } /* Playing */ void play_bucket_internal( Audio *audio, SBucket *pSBucket, long UNUSED (volume)) { SBPlayParams playParams; AGainEntry gainEntry; ATransID xid; long status; playParams.priority = APriorityNormal; /* normal priority */ /* * We can't signal an error, because all h*ll would break loose if * we did. */ if (EQ (Vhp_play_speaker, Qexternal)) gainEntry.u.o.out_dst = AODTMonoJack; else gainEntry.u.o.out_dst = AODTMonoIntSpeaker; gainEntry.u.o.out_ch = AOCTMono; gainEntry.gain = AUnityGain; playParams.gain_matrix.type = AGMTOutput; /* gain matrix */ playParams.gain_matrix.num_entries = 1; playParams.gain_matrix.gain_entries = &gainEntry; playParams.play_volume = hp_play_gain; /* play volume */ playParams.pause_first = False; /* don't pause */ playParams.start_offset.type = ATTSamples; /* start offset 0 */ playParams.start_offset.u.samples = 0; playParams.duration.type = ATTFullLength; /* play entire sample */ playParams.loop_count = 1; /* play sample just once */ playParams.previous_transaction = 0; /* no linked transaction */ playParams.event_mask = 0; /* don't solicit any events */ /* * play the sound bucket */ xid = APlaySBucket( audio, pSBucket, &playParams, NULL ); /* * set close mode to prevent playback from stopping * when we close audio connection */ ASetCloseDownMode( audio, AKeepTransactions, &status ); /* * That's all, folks! * Always destroy bucket and close connection. */ ADestroySBucket( audio, pSBucket, &status ); ACloseAudio( audio, &status ); } void play_sound_file (Extbyte * sound_file, int volume) { sbucket *pSBucket; Audio *audio; long status; AErrorHandler prevHandler; /* pointer to previous handler */ Extbyte *server; if (STRINGP (Vhp_play_server)) LISP_STRING_TO_EXTERNAL (Vhp_play_server, server, Qnative); else server = ""; /* * open audio connection */ audio = AOpenAudio( server, &status ); if( status ) { player_error_internal( audio, "Open audio failed", status ); } /* replace default error handler */ prevHandler = ASetErrorHandler(myHandler); /* * Load the audio file into a sound bucket */ pSBucket = ALoadAFile( audio, sound_file, AFFUnknown, 0, NULL, NULL ); /* * Play the bucket */ play_bucket_internal(audio, pSBucket, volume); ASetErrorHandler(prevHandler); } int play_sound_data (Binbyte * data, int UNUSED (length), int volume) { SBucket *pSBucket; Audio *audio; AErrorHandler prevHandler; SunHeader *header; long status; Extbyte *server; int result; /* #### Finish this to return an error code. This function signal a lisp error. How consistent with the rest. What if this function is needed in doing the beep for the error? Apparently the author of this didn't read the comment in Fplay_sound. */ if (STRINGP (Vhp_play_server)) LISP_STRING_TO_EXTERNAL (Vhp_play_server, server, Qnative); else server = ""; /* open audio connection */ audio = AOpenAudio( server, &status ); if(status) { player_error_internal( audio, "Open audio failed", status ); } /* replace default error handler */ prevHandler = ASetErrorHandler (myHandler); /* Create sound bucket */ header = (SunHeader *) data; pSBucket = ACreateSBucket(audio, NULL, NULL, &status); if (status) player_error_internal( audio, "Bucket creation failed", status ); APutSBucketData(audio, pSBucket, 0, (CBinbyte *) (data + header->header_size), header->data_length, &status); if (status) player_error_internal( audio, "Audio data copy failed", status ); /* Play sound */ play_bucket_internal(audio, pSBucket, volume); ASetErrorHandler(prevHandler); if (status) player_error_internal( audio, "Audio data copy failed", status ); return 1; } void vars_of_hpplay (void) { DEFVAR_LISP ("hp-play-server", &Vhp_play_server /* A string, determining which server to play sound at. Note that this is specific to the HP sound implementation, and you should not make your functions depend on it. */ ); Vhp_play_server = Qnil; DEFVAR_LISP ("hp-play-speaker", &Vhp_play_speaker /* If this variable is the symbol `external', sound is played externally. If the environment variable SPEAKER is set, that value is used for initializing this variable. Note that this is specific to the HP sound implementation, and you should not make your functions depend on it. */ ); Vhp_play_speaker = intern ("internal"); DEFVAR_INT ("hp-play-gain", &hp_play_gain /* Global gain value for playing sounds. Default value is AUnityGain which means keep level. Please refer to the HP documentation, for instance in `Using the Audio Application Program Interface', for details on how to interpret this variable. Note that this is specific to the HP sound implementation, and you should not make your functions depend on it. */ ); hp_play_gain = AUnityGain; } void init_hpplay (void) { if (egetenv ("SPEAKER")) Vhp_play_speaker = intern (egetenv ("SPEAKER")); }