Pd-cvs December 2008

pd-cvs@lists.iem.at

20 participants
129 discussions

SF.net SVN: pure-data:[10432] trunk/pd
by millerpuckette＠users.sourceforge.net 08 Dec '08

08 Dec '08

Revision: 10432 http://pure-data.svn.sourceforge.net/pure-data/?rev=10432&view=rev Author: millerpuckette Date: 2008-12-08 20:14:40 +0000 (Mon, 08 Dec 2008) Log Message: ----------- 0.42-0test06 Modified Paths: -------------- trunk/pd/doc/3.audio.examples/J07.oversampling.pd trunk/pd/doc/5.reference/tabread4~-help.pd trunk/pd/doc/7.stuff/tools/testtone.pd trunk/pd/extra/bonk~/bonk~.c trunk/pd/extra/pd~/pd~-help.pd trunk/pd/extra/pd~/pd~.c trunk/pd/extra/sigmund~/sigmund~.c trunk/pd/extra/stdout/stdout-help.pd trunk/pd/extra/stdout/stdout.c trunk/pd/src/d_array.c trunk/pd/src/d_osc.c trunk/pd/src/m_pd.h trunk/pd/src/m_sched.c trunk/pd/src/notes.txt trunk/pd/src/s_audio_alsa.c trunk/pd/src/s_audio_pa.c trunk/pd/src/s_main.c trunk/pd/src/u_main.tk Removed Paths: ------------- trunk/pd/extra/pd~/test.pd Modified: trunk/pd/doc/3.audio.examples/J07.oversampling.pd =================================================================== --- trunk/pd/doc/3.audio.examples/J07.oversampling.pd 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/doc/3.audio.examples/J07.oversampling.pd 2008-12-08 20:14:40 UTC (rev 10432) @@ -1,10 +1,5 @@ -#N canvas 343 48 578 498 12; -#N canvas 158 4 728 420 16x 0; -#X obj 21 151 *~ 0.064; -#X obj 21 174 rpole~ 0.93538; -#X obj 21 197 *~ 0.00431; -#X obj 21 220 cpole~ 0.96559 0.05592; -#X obj 21 246 cpole~ 0.96559 -0.05592; +#N canvas 378 114 542 534 12; +#N canvas 371 260 740 538 16x 0; #X obj 21 269 *~ 0.125; #X obj 21 292 rzero~ -1; #X obj 21 315 rzero~ -1; @@ -13,44 +8,84 @@ #X obj 204 29 block~ 1024 1 16; #X obj 21 31 inlet; #X obj 21 372 outlet~; -#X text 170 151 These objects make a 3-pole \, 3-zero Butterwirth low-pass -filter with cutoff at 15kHz (assuming 44100 sample rate.) The filter +#X obj 20 166 rpole~ 0.87467; +#X obj 20 143 *~ 0.12532; +#X obj 20 189 *~ 0.01668; +#X obj 279 358 buttercoef3; +#X floatatom 279 282 7 0 0 0 - - -; +#X obj 279 332 / 16; +#X floatatom 279 488 7 0 0 0 - - -; +#X obj 279 307 / 22050; +#X floatatom 293 468 7 0 0 0 - - -; +#X floatatom 308 448 7 0 0 0 - - -; +#X floatatom 323 428 7 0 0 0 - - -; +#X floatatom 338 408 7 0 0 0 - - -; +#X floatatom 353 388 7 0 0 0 - - -; +#X text 335 489 normalizer for rpole~; +#X text 352 468 normalizer for cpole~; +#X text 366 449 coef for rpole~; +#X text 382 430 coef for cpole~ real part; +#X text 413 390 coef for cpole~ imag part; +#X text 409 408 (same \, other cpole~); +#X obj 20 212 cpole~ 0.9293 0.10812; +#X obj 20 238 cpole~ 0.9293 -0.10812; +#X msg 279 257 15000; +#X text 329 256 desired cutoff frequency; +#X text 339 308 divide by nyquist frequency of this subpatch \, which +is 22050*16 because of the 16-times oversampling.; +#X text 273 225 Here is how to calculate the filter coefficients:; +#X text 143 123 These objects make a 3-pole \, 3-zero Butterworth low-pass +filter with cutoff at 15kHz (assuming 16x44100 sample rate). The filter was designed using the "buttercoef3" abstraction introduced in patch H13.butterworth.pd in this series.; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 2 0 3 0; -#X connect 3 0 4 0; -#X connect 3 1 4 1; -#X connect 4 0 5 0; -#X connect 5 0 6 0; -#X connect 6 0 7 0; -#X connect 7 0 8 0; -#X connect 8 0 12 0; -#X connect 9 0 0 0; -#X connect 11 0 9 0; -#X restore 23 148 pd 16x; -#X floatatom 23 111 7 0 0 0 - - -; -#X obj 109 149 phasor~; -#X obj 22 194 output~; -#X obj 108 194 output~; -#X obj 23 83 mtof; -#X floatatom 23 59 3 -24 135 0 - - -; -#X text 131 18 UPSAMPLING TO CONTROL FOLDOVER; -#X text 56 57 <-- pitch; -#X text 126 250 not; -#X text 22 265 sampled; -#X text 26 249 16x up-; -#X text 20 293 The "pd 16x" subpatch at left contains a phasor~ object +#X connect 3 0 7 0; +#X connect 4 0 9 0; +#X connect 6 0 4 0; +#X connect 8 0 10 0; +#X connect 9 0 8 0; +#X connect 10 0 27 0; +#X connect 11 0 14 0; +#X connect 11 1 16 0; +#X connect 11 2 17 0; +#X connect 11 3 18 0; +#X connect 11 4 19 0; +#X connect 11 5 20 0; +#X connect 12 0 15 0; +#X connect 13 0 11 0; +#X connect 15 0 13 0; +#X connect 27 0 28 0; +#X connect 27 1 28 1; +#X connect 28 0 0 0; +#X connect 29 0 12 0; +#X restore 29 123 pd 16x; +#X floatatom 29 86 7 0 0 0 - - -; +#X obj 115 124 phasor~; +#X obj 28 169 output~; +#X obj 114 169 output~; +#X obj 29 58 mtof; +#X floatatom 29 34 3 -24 135 0 - - -; +#X text 158 15 UPSAMPLING TO CONTROL FOLDOVER; +#X text 62 32 <-- pitch; +#X text 132 225 not; +#X text 28 240 sampled; +#X text 32 224 16x up-; +#X text 26 268 The "pd 16x" subpatch at left contains a phasor~ object \, but is locally upsampled by a factor of sixteen. Without upsampling \, partials as low as 24 Khz. fold back over into the audible range. With upsampling \, the first audibly folding over partial is at almost 700 Hz \, 29 times higher. The relevant partials will be 29 times \, or almost 30 dB \, quieter when upsampled.; -#X text 21 403 A third-order Butterworth filter is used inside the +#X text 27 378 A third-order Butterworth filter is used inside the "pd 16x" subpatch - without that \, the internal signal would fold over as it gets downsampled at the outlet~ object.; -#X text 324 464 Updated for Pd version 0.39; +#X text 312 507 Updated for Pd version 0.42; +#X text 26 430 You can trade off cutoff frequency with foldover. Here +\, the filter is set for a cutoff of 15 kHz. Lowering it to 7500 Hz +would further reduce foldover by 18 dB at the expense of losing energy +in the range 7500-15000 Hz.; #X connect 0 0 3 0; #X connect 0 0 3 1; #X connect 1 0 0 0; Modified: trunk/pd/doc/5.reference/tabread4~-help.pd =================================================================== --- trunk/pd/doc/5.reference/tabread4~-help.pd 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/doc/5.reference/tabread4~-help.pd 2008-12-08 20:14:40 UTC (rev 10432) @@ -1,30 +1,28 @@ -#N canvas 59 33 814 475 10; -#X obj 11 228 tabread4~ array99; -#X text 21 207 signal input x(n); -#X msg 727 51 \; pd dsp 0; -#X graph graph1 0 -1 9 1 514 373 764 173; -#X array array99 10 float 0; -#X pop; +#N canvas 323 179 845 474 12; +#X obj 11 249 tabread4~ array99; +#N canvas 0 0 450 300 (subpatch) 0; +#X array array99 10 float 3; +#A 0 -0.5 -0.5 -0.5 0.5 0.5 0.5 0 0 0 0; +#X coords 0 1 10 -1 250 200 1; +#X restore 561 167 graph; #X text 127 21 4-point-interpolating table lookup; -#X obj 11 316 snapshot~; -#X obj 30 290 metro 200; +#X obj 11 337 snapshot~; +#X obj 30 311 metro 200; #X obj 11 124 sig~; -#X floatatom 11 98 0 0 0; -#X obj 30 264 r readout; -#X floatatom 11 342 0 0 0; -#X msg 452 50 \; readout 1 \; array99 resize 10 \; array99 0 -0.5 -0.5 --0.5 0.5 0.5 0.5 \; pd dsp 1 \;; -#X text 49 94 incoming signal is index. Indices should range from 1 +#X floatatom 11 98 6 0 10 0 - - -; +#X obj 30 285 r readout; +#X floatatom 11 363 0 0 0 0 - - -; +#X text 59 92 incoming signal is index. Indices should range from 1 to (size-2) so that the 4-point interpolation is meaningful. You can shift-drag the number box to see the effect of interpolation.; -#X msg 34 158 set array99; -#X text 116 158 "set" message permits you to switch between arrays +#X msg 23 161 set array99; +#X text 113 160 "set" message permits you to switch between arrays ; -#X text 139 228 creation argument initializes array name; -#X text 5 392 see also the "array" tutorial in section 2 of the Pd +#X text 139 249 creation argument initializes array name; +#X text 11 403 see also the "array" tutorial in section 2 of the Pd documentation \, and these objects:; #X obj 47 21 tabread4~; -#X text 509 27 click here to test; +#X text 563 16 click here to test; #X obj 12 442 tabwrite~; #X obj 157 442 tabread; #X obj 216 442 tabwrite; @@ -32,12 +30,19 @@ #X obj 346 442 tabreceive~; #X text 7 58 Tabread4~ is used to build samplers and other table lookup algorithms. The interpolation scheme is 4-point polynomial.; -#X text 616 460 updated for Pd version 0.29; #X obj 83 442 tabplay~; -#X connect 0 0 5 0; -#X connect 5 0 10 0; +#X text 626 451 updated for Pd version 0.42; +#X msg 582 40 \; readout 1 \; pd dsp 1 \;; +#X floatatom 111 190 3 0 10 0 - - -; +#X text 19 205 signal input; +#X text 138 183 inlet sets onset into table. You can use this to improve +the accuracy of indexing into the array. See B15.tabread4~-onset.pd +for details.; +#X connect 0 0 3 0; +#X connect 3 0 8 0; +#X connect 4 0 3 0; +#X connect 5 0 0 0; #X connect 6 0 5 0; -#X connect 7 0 0 0; -#X connect 8 0 7 0; -#X connect 9 0 6 0; -#X connect 13 0 0 0; +#X connect 7 0 4 0; +#X connect 10 0 0 0; +#X connect 25 0 0 1; Modified: trunk/pd/doc/7.stuff/tools/testtone.pd =================================================================== --- trunk/pd/doc/7.stuff/tools/testtone.pd 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/doc/7.stuff/tools/testtone.pd 2008-12-08 20:14:40 UTC (rev 10432) @@ -86,7 +86,7 @@ #X connect 4 0 3 0; #X restore 459 298 pd more; #X obj 399 135 tgl 20 0 tone-hipass set-tone-hipass input-hipass 25 -10 0 12 -262144 -1 -1 1 1; +10 0 12 -262144 -1 -1 0 1; #X obj 185 117 tgl 20 0 tone-ch3 tone-ch3 3 5 -8 0 12 -262144 -1 -1 1 1; #X obj 210 117 tgl 20 0 tone-ch4 tone-ch4 4 5 -8 0 12 -262144 -1 -1 @@ -112,7 +112,7 @@ #X obj 51 174 vradio 15 1 0 2 tone-type tone-type-set empty 0 -6 0 8 -262144 -1 -1 1; #X obj 51 104 vradio 15 1 0 3 tone-radio tone-radio-set empty 0 -6 -0 8 -262144 -1 -1 2; +0 8 -262144 -1 -1 0; #X obj 460 193 adc~; #X obj 459 240 print~; #X obj 468 217 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 @@ -123,7 +123,7 @@ 1 1; #X obj 308 117 tgl 20 0 tone-ch8 tone-ch8 8 5 -8 0 12 -262144 -1 -1 1 1; -#N canvas 233 399 903 462 audio 0; +#N canvas 233 399 321 422 audio 0; #X obj 25 303 s~ tone-mon; #X obj 25 277 line~; #X obj 25 249 pack 0 50; Modified: trunk/pd/extra/bonk~/bonk~.c =================================================================== --- trunk/pd/extra/bonk~/bonk~.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/extra/bonk~/bonk~.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -1,7 +1,7 @@ /* ########################################################################### # bonk~ - a Max/MSP external - # by miller puckette and ted appel + # by miller puckette and ted apel # http://crca.ucsd.edu/~msp/ # Max/MSP port by barry threw # http://www.barrythrew.com @@ -911,7 +911,7 @@ h->h_before, h->h_countup); } post("filter details (frequencies are in units of %.2f-Hz. bins):", - x->x_sr); + x->x_sr/x->x_npoints); for (j = 0; j < x->x_nfilters; j++) post("%2d cf %.2f bw %.2f nhops %d hop %d skip %d npoints %d", j, Modified: trunk/pd/extra/pd~/pd~-help.pd =================================================================== --- trunk/pd/extra/pd~/pd~-help.pd 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/extra/pd~/pd~-help.pd 2008-12-08 20:14:40 UTC (rev 10432) @@ -1,20 +1,75 @@ -#N canvas 353 325 450 300 10; -#X msg 52 86 foo bar baz; -#X obj 209 52 osc~ 440; -#X obj 74 211 env~ 8192; -#X floatatom 77 243 5 0 0 0 - - -; -#X obj 285 204 r a; -#X obj 281 232 print a; -#X msg 315 81 \; pd dsp 1; -#X obj 70 166 pd~ test.pd; -#X msg 66 20 pd~ stop; -#X msg 77 42 pd~ start; -#X msg 86 61 pd~ restart; -#X connect 0 0 7 0; -#X connect 1 0 7 0; -#X connect 2 0 3 0; -#X connect 4 0 5 0; -#X connect 7 0 2 0; -#X connect 8 0 7 0; -#X connect 9 0 7 0; -#X connect 10 0 7 0; +#N canvas 12 0 566 872 12; +#X msg 31 406 foo bar baz; +#X obj 189 466 osc~ 440; +#X obj 127 645 env~ 8192; +#X floatatom 127 694 5 0 0 0 - - -; +#X msg 434 807 \; pd dsp 1; +#X msg 24 332 pd~ stop; +#X obj 127 670 i; +#X obj 241 643 env~ 8192; +#X floatatom 241 693 5 0 0 0 - - -; +#X obj 241 669 i; +#X obj 123 489 *~; +#X obj 158 490 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X obj 189 490 *~; +#X obj 224 491 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X obj 434 781 loadbang; +#X obj 14 691 print x; +#X msg 15 309 pd~ start pd~-subprocess.pd; +#X obj 14 532 pd~ -ninsig 2 -noutsig 2 -fifo 20; +#X obj 37 20 pd~; +#X text 69 22 - run a pd sub-process; +#X text 27 57 The pd~ object starts and manages a Pd sub-process that +can communicate with the super-process (this one) via audio channels +and/or Pd messages. In this way you can take advantage of multi-core +CPUs \, and/or use Pd features from within Max (if you're using the +Max version of pd~).; +#X text 24 251 Sending a new "start" message will stop the sub-process +and start a new one. If you just want to stop the sub-process \, send +"stop".; +#X text 33 353 Any message besides "pd~" is sent to the sub-process. +For instance \, the message below sends "bar baz" to any object in +the sub-process named "foo" \, such as a "receive" object.; +#X text 43 430 Audio signals appear in adc~ objects in the sub-process. +The sub-process doesn't open real audio devices.; +#X text 281 473 Creation args:; +#X text 265 490 -insig <n> sets input audio channels; +#X text 266 508 -outsig <n> sets output channels; +#X text 269 542 -fifo <n> sets round-trip delay in blocks; +#X text 272 559 -pddir <s> sets Pd directory \, e.g. \,; +#X text 299 574 .../Pd-0.42.app/Contents/Resources; +#X text 272 590 -scheddir <s> sets scheduler dir \, e.g. \,; +#X text 297 607 .../.../Resources/extra/pd~; +#X text 267 524 -sr <n> sets sample rate; +#X text 20 716 The first outlet reports messages the sub-process sends +us via "stdout" objects. Any other outlets are signals corresponding +to "dac~" objects in the sub-process.; +#X text 10 784 ATTENTION: DSP must be running in this process for the +sub-process to run. This is because its clock is slaved to audio I/O +it gets from us!; +#X text 359 849 Updated for Pd version 0.42.; +#X text 24 138 Messages with "pd~" selector control the sub-process. +"pd~ start" takes as arguments any startup arguments you wish to send +the sub-process. For example \, specify "-nogui" to stop the sub-process's +GUI from appearing. You don't have to specify the number of channels +in and out \, since that's set by creation arguments below. Audio config +arguments arguments (-audiobuf \, -audiodev \, etc.) are ignored.; +#X connect 0 0 17 0; +#X connect 1 0 10 0; +#X connect 1 0 12 0; +#X connect 2 0 6 0; +#X connect 5 0 17 0; +#X connect 6 0 3 0; +#X connect 7 0 9 0; +#X connect 9 0 8 0; +#X connect 10 0 17 0; +#X connect 11 0 10 1; +#X connect 12 0 17 1; +#X connect 13 0 12 1; +#X connect 14 0 4 0; +#X connect 16 0 17 0; +#X connect 17 0 15 0; +#X connect 17 1 2 0; +#X connect 17 2 7 0; Modified: trunk/pd/extra/pd~/pd~.c =================================================================== --- trunk/pd/extra/pd~/pd~.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/extra/pd~/pd~.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -70,14 +70,13 @@ #ifdef PD t_object x_obj; t_clock *x_clock; + t_outlet *x_outlet1; /* for messages back from subproc */ + t_canvas *x_canvas; #endif /* PD */ #ifdef MSP t_pxobject x_obj; - void *obex; - void *x_cookedout; + void *x_outlet1; void *x_clock; - short x_vol; - #endif /* MSP */ FILE *x_infd; FILE *x_outfd; @@ -91,7 +90,6 @@ float x_sr; t_symbol *x_pddir; t_symbol *x_schedlibdir; - char *x_pdargs; t_sample **x_insig; t_sample **x_outsig; } t_pd_tilde; @@ -168,7 +166,8 @@ } static void pd_tilde_donew(t_pd_tilde *x, char *pddir, char *schedlibdir, - char *pdargs, int ninsig, int noutsig, int fifo, float samplerate) + char *patchdir, char *pdargs, int ninsig, int noutsig, int fifo, + float samplerate) { int i, pid, pipe1[2], pipe2[2]; char cmdbuf[MAXPDSTRING], pdexecbuf[MAXPDSTRING], schedbuf[MAXPDSTRING]; @@ -197,8 +196,9 @@ goto fail1; } } - snprintf(cmdbuf, MAXPDSTRING, "%s -schedlib %s/pdsched %s\n", - pdexecbuf, schedlibdir, pdargs); + snprintf(cmdbuf, MAXPDSTRING, +"%s -schedlib %s/pdsched -path %s -inchannels %d -outchannels %d -r %g %s\n", + pdexecbuf, schedlibdir, patchdir, ninsig, noutsig, samplerate, pdargs); #if 0 #ifdef PD fprintf(stderr, "%s", cmdbuf); @@ -368,25 +368,53 @@ static void pd_tilde_pdtilde(t_pd_tilde *x, t_symbol *s, int argc, t_atom *argv) { - t_symbol *sel = ((argc > 0 && argv->a_type == A_SYMBOL) ? argv->a_w.w_symbol : gensym("?")); + t_symbol *sel = ((argc > 0 && argv->a_type == A_SYMBOL) ? + argv->a_w.w_symbol : gensym("?")); + char *patchdir; if (sel == gensym("start")) { - if (!x->x_infd) - pd_tilde_donew(x, x->x_pddir->s_name, x->x_schedlibdir->s_name, - x->x_pdargs, x->x_ninsig, x->x_noutsig, x->x_fifo, x->x_sr); - } - else if (sel == gensym("stop")) - { + char pdargstring[MAXPDSTRING]; if (x->x_infd) pd_tilde_close(x); + pdargstring[0] = 0; + argc--; argv++; +#ifdef PD + while (argc--) + { + atom_string(argv++, pdargstring + strlen(pdargstring), + MAXPDSTRING - strlen(pdargstring)); + if (strlen(pdargstring) < MAXPDSTRING-1) + strcat(pdargstring, " "); + } + patchdir = canvas_getdir(x->x_canvas)->s_name; +#endif +#ifdef MAX + while (argc--) + { + if (argv->a_type == A_SYM) + strncat(pdargstring, argv->a_w.w_sym->s_name, + MAXPDSTRING - strlen(pdargstring)-3); + else if (argv->a_type == A_LONG) + snprintf(pdargstring+strlen(pdargstring), + MAXPDSTRING - strlen(pdargstring)-3, "%ld", + argv->a_w.w_long); + else if (argv->a_type == A_FLOAT) + snprintf(pdargstring+strlen(pdargstring), + MAXPDSTRING - strlen(pdargstring)-3, "%f", + argv->a_w.w_float); + strcat(pdargstring, " "); + argv++; + } + patchdir = "."; +#endif + pd_tilde_donew(x, x->x_pddir->s_name, x->x_schedlibdir->s_name, + patchdir, pdargstring, x->x_ninsig, x->x_noutsig, x->x_fifo, + x->x_sr); } - else if (sel == gensym("restart")) + else if (sel == gensym("stop")) { if (x->x_infd) pd_tilde_close(x); - if (!x->x_infd) - pd_tilde_donew(x, x->x_pddir->s_name, x->x_schedlibdir->s_name, - x->x_pdargs, x->x_ninsig, x->x_noutsig, x->x_fifo, x->x_sr); } else ERROR "pd~: unknown control message: %s", sel->s_name); } @@ -398,7 +426,6 @@ #endif pd_tilde_close(x); clock_free(x->x_clock); - free(x->x_pdargs); } /* -------------------------- Pd glue ------------------------- */ @@ -420,19 +447,11 @@ { if (vec[i].a_type == A_SEMI) { - if (i > messstart + 1) - { - t_pd *whom; - if (vec[messstart].a_type != A_SYMBOL) - bug("pd_tilde_tick"); - else if (!(whom = vec[messstart].a_w.w_symbol->s_thing)) - ERROR "%s: no such object", - vec[messstart].a_w.w_symbol->s_name); - else if (vec[messstart+1].a_type == A_SYMBOL) - typedmess(whom, vec[messstart+1].a_w.w_symbol, - i-messstart-2, vec+(messstart+2)); - else pd_list(whom, 0, i-messstart-1, vec+(messstart+1)); - } + if (i > messstart && vec[messstart].a_type == A_SYMBOL) + outlet_anything(x->x_outlet1, vec[messstart].a_w.w_symbol, + i-(messstart+1), vec+(messstart+1)); + else if (i > messstart) + outlet_list(x->x_outlet1, 0, i-messstart, vec+messstart); messstart = i+1; } } @@ -468,8 +487,7 @@ t_sample **g; t_symbol *pddir = sys_guidir, *scheddir = gensym(class_gethelpdir(pd_tilde_class)); - char pdargstring[MAXPDSTRING]; - fprintf(stderr, "pd %s, sched %s\n", pddir->s_name, scheddir->s_name); + /* fprintf(stderr, "pd %s, sched %s\n", pddir->s_name, scheddir->s_name); */ while (argc > 0) { t_symbol *firstarg = atom_getsymbolarg(0, argc, argv); @@ -505,24 +523,15 @@ } else break; } -#if 0 - { - pd_error(x, -"usage: pd~ [-sr #] [-ninsig #] [-noutsig #] [-fifo #] [-pddir <>]"); - post( -"... [-scheddir <>] [pd-argument...]"); - argc = 0; - } -#endif - - pdargstring[0] = 0; - while (argc--) + + if (argc) { - atom_string(argv++, pdargstring + strlen(pdargstring), - MAXPDSTRING - strlen(pdargstring)); - if (strlen(pdargstring) < MAXPDSTRING-1) - strcat(pdargstring, " "); + pd_error(x, +"usage: pd~ [-sr #] [-ninsig #] [-noutsig #] [-fifo #] [-pddir <>]"); + post( +"... [-scheddir <>]"); } + x->x_clock = clock_new(x, (t_method)pd_tilde_tick); x->x_insig = (t_sample **)getbytes(ninsig * sizeof(*x->x_insig)); x->x_outsig = (t_sample **)getbytes(noutsig * sizeof(*x->x_outsig)); @@ -532,15 +541,15 @@ x->x_sr = sr; x->x_pddir = pddir; x->x_schedlibdir = scheddir; - x->x_pdargs = malloc(strlen(pdargstring)+1); x->x_infd = 0; x->x_outfd = 0; x->x_outfd = 0; x->x_childpid = -1; x->x_msgbuf = 0; - strcpy(x->x_pdargs, pdargstring); + x->x_canvas = canvas_getcurrent(); for (j = 1, g = x->x_insig; j < ninsig; j++, g++) inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); + x->x_outlet1 = outlet_new(&x->x_obj, 0); for (j = 0, g = x->x_outsig; j < noutsig; j++, g++) outlet_new(&x->x_obj, &s_signal); signal(SIGPIPE, SIG_IGN); @@ -556,7 +565,7 @@ class_addmethod(pd_tilde_class, (t_method)pd_tilde_dsp, gensym("dsp"), 0); class_addmethod(pd_tilde_class, (t_method)pd_tilde_pdtilde, gensym("pd~"), A_GIMME, 0); class_addanything(pd_tilde_class, pd_tilde_anything); - post("pd~ version 0.1"); + post("pd~ version 0.2"); } #endif @@ -651,7 +660,8 @@ class_register(CLASS_BOX, c); pd_tilde_class = c; - return (0); + post("pd~ version 0.2"); + return (0); } static void *pd_tilde_new(t_symbol *s, long ac, t_atom *av) @@ -659,7 +669,6 @@ int ninsig = 2, noutsig = 2, fifo = 5, j; float sr = sys_getsr(); t_symbol *pddir = gensym("."), *scheddir = gensym("."); - char pdargstring[MAXPDSTRING]; t_pd_tilde *x; if (x = (t_pd_tilde *)object_alloc(pd_tilde_class)) @@ -705,30 +714,17 @@ } if (scheddir == gensym(".") && pddir != gensym(".")) { - char *pds = pddir->s_name; + char *pds = pddir->s_name, scheddirstring[MAXPDSTRING]; int l = strlen(pds); if (l >= 4 && (!strcmp(pds+l-3, "bin") || !strcmp(pds+l-4, "bin/"))) - snprintf(pdargstring, MAXPDSTRING, "%s/../extra/pd~", pds); - else snprintf(pdargstring, MAXPDSTRING, "%s/extra/pd~", pds); - scheddir = gensym(pdargstring); + snprintf(scheddirstring, MAXPDSTRING, "%s/../extra/pd~", pds); + else snprintf(scheddirstring, MAXPDSTRING, "%s/extra/pd~", pds); + scheddir = gensym(scheddirstring); } - pdargstring[0] = 0; - while (ac--) - { - char buf[80]; - if (av->a_type == A_SYM) - strncat(pdargstring, av->a_w.w_sym->s_name, MAXPDSTRING - strlen(pdargstring)-3); - else if (av->a_type == A_LONG) - snprintf(pdargstring+strlen(pdargstring), MAXPDSTRING - strlen(pdargstring)-3, "%ld", - av->a_w.w_long); - else if (av->a_type == A_FLOAT) - snprintf(pdargstring+strlen(pdargstring), MAXPDSTRING - strlen(pdargstring)-3, "%f", - av->a_w.w_float); - strcat(pdargstring, " "); - av++; - } - post("pd~: pddir %s scheddir %s args %s", - pddir->s_name, scheddir->s_name, pdargstring); + if (ac) + post("pd~: warning: ignoring extra arguments"); + post("pd~: pddir %s scheddir %s", + pddir->s_name, scheddir->s_name); dsp_setup((t_pxobject *)x, ninsig); for (j = 0; j < noutsig; j++) outlet_new((t_pxobject *)x, "signal"); @@ -741,13 +737,11 @@ x->x_sr = sr; x->x_pddir = pddir; x->x_schedlibdir = scheddir; - x->x_pdargs = malloc(strlen(pdargstring)+1); x->x_infd = 0; x->x_outfd = 0; x->x_outfd = 0; x->x_childpid = -1; x->x_msgbuf = 0; - strcpy(x->x_pdargs, pdargstring); } return (x); } Deleted: trunk/pd/extra/pd~/test.pd =================================================================== --- trunk/pd/extra/pd~/test.pd 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/extra/pd~/test.pd 2008-12-08 20:14:40 UTC (rev 10432) @@ -1,29 +0,0 @@ -#N canvas 643 132 450 300 10; -#X obj 65 58 r foo; -#X obj 62 100 print foo; -#X obj 244 59 adc~; -#X obj 238 102 env~ 8192; -#X floatatom 236 140 5 0 0 0 - - -; -#X obj 145 130 osc~ 440; -#X obj 287 204 stdout; -#X msg 307 153 a b c; -#X msg 307 42 \; pd dsp 1; -#X floatatom 238 173 5 0 0 0 - - -; -#X msg 149 34 a b c; -#X obj 62 157 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 --1; -#X obj 44 187 del 1000; -#X obj 26 249 print bang; -#X obj 59 219 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 --1; -#X obj 155 234 dac~ 1 2 3 4; -#X obj 168 189 sig~ 0.5; -#X connect 0 0 1 0; -#X connect 2 0 3 0; -#X connect 3 0 4 0; -#X connect 4 0 9 0; -#X connect 7 0 6 0; -#X connect 10 0 1 0; -#X connect 11 0 12 0; -#X connect 12 0 13 0; -#X connect 12 0 14 0; Modified: trunk/pd/extra/sigmund~/sigmund~.c =================================================================== --- trunk/pd/extra/sigmund~/sigmund~.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/extra/sigmund~/sigmund~.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -363,7 +363,7 @@ #define PITCHUNCERTAINTY 0.3 #define HALFTONEINC 0.059 #define SUBHARMONICS 16 -#define DBPERHALFTONE 0.5 +#define DBPERHALFTONE 0.0 static void sigmund_getpitch(int npeak, t_peak *peakv, float *freqp, float npts, float srate, int loud) @@ -405,8 +405,6 @@ for (i = 0; i < nsalient; i++) { t_peak *thispeak = bigpeaks[i]; - float pitchuncertainty = - 4 * PITCHUNCERTAINTY * fperbin / (HALFTONEINC * thispeak->p_freq); float weightindex = (48./LOG2) * log(thispeak->p_freq/(2.*fperbin)); float loudness = sqrt(thispeak->p_amp); @@ -415,8 +413,8 @@ { float subindex = weightindex - (48./LOG2) * log(j + 1.); - int loindex = subindex - pitchuncertainty; - int hiindex = subindex + pitchuncertainty + 1; + int loindex = subindex - 0.5; + int hiindex = loindex+2; if (hiindex < 0) break; if (hiindex >= npit) @@ -424,7 +422,7 @@ if (loindex < 0) loindex = 0; for (k = loindex; k <= hiindex; k++) - weights[k] += loudness * 4. / (4. + j); + weights[k] += loudness * 6. / (6. + j); } sumweight += loudness; } @@ -441,29 +439,35 @@ freq = 0; goto done; } - for (i = bestbin+1; i < npit; i++) + if (bestbin > 0 && bestbin < npit-1) { - if (weights[i] < bestweight) - break; - bestbin += 0.5; + int ibest = bestbin; + bestbin += (weights[ibest+1] - weights[ibest-1]) / + (weights[ibest+1] + weights[ibest] + weights[ibest-1]); } freq = 2*fperbin * exp((LOG2/48.)*bestbin); - for (sumamp = sumweight = sumfreq = 0, i = 0; i < nsalient; i++) { t_peak *thispeak = bigpeaks[i]; - float thisloudness = sqrt(thispeak->p_amp); + float thisloudness = thispeak->p_amp; float thisfreq = thispeak->p_freq; float harmonic = thisfreq/freq; float intpart = (int)(0.5 + harmonic); - float inharm = freq * (harmonic - intpart); - if (harmonic < 1) - continue; - if (inharm < 0.25*fperbin && inharm > -0.25*fperbin) + float inharm = harmonic - intpart; +#if 0 + if (loud) + post("freq %f intpart %f inharm %f", freq, intpart, inharm); +#endif + if (intpart >= 1 && intpart <= 16 && + inharm < 0.015 * intpart && inharm > - (0.015 * intpart)) { float weight = thisloudness * intpart; sumweight += weight; sumfreq += weight*thisfreq/intpart; +#if 0 + if (loud) + post("weight %f freq %f", weight, thisfreq); +#endif } } if (sumweight > 0) @@ -1457,7 +1461,7 @@ dsp_setup((t_pxobject *)x, 1); object_obex_store(x, gensym("dumpout"), outlet_new(x, NULL)); - for (i = 0; i < ac; i++) FIXME + for (i = 0; i < ac; i++) if (av[i].a_type == A_SYM) { char *s = av[i].a_w.w_sym->s_name; Modified: trunk/pd/extra/stdout/stdout-help.pd =================================================================== --- trunk/pd/extra/stdout/stdout-help.pd 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/extra/stdout/stdout-help.pd 2008-12-08 20:14:40 UTC (rev 10432) @@ -1,13 +1,19 @@ -#N canvas 110 37 789 525 10; -#X msg 84 147 walk the dog; -#X msg 91 169 1; -#X msg 90 215 flush; -#X obj 84 240 stdout; -#X text 472 410 updated for Pd version 0.42; +#N canvas 121 60 488 321 12; +#X msg 126 203 walk the dog; +#X msg 117 156 1; +#X obj 117 240 stdout; +#X text 269 287 updated for Pd version 0.42; #X obj 14 13 stdout; #X text 67 14 - write messages to standard output; -#X msg 96 192 1 2; -#X connect 0 0 3 0; -#X connect 1 0 3 0; -#X connect 2 0 3 0; -#X connect 7 0 3 0; +#X msg 122 179 1 2; +#X obj 119 291 pd~; +#X text 44 291 see also:; +#X text 34 39 Sends messages to Pd's standard output. This is useful +in conjunction with the pd~ object \, which starts a pd sub-process. +Messages sent to the sub-process standard output appear on the output +of the pd~ object in the owning process. This might also be useful +in other situations. Note that there's no corresponding "stdin" object +- there seems to be no one canonical way such a thing should act.; +#X connect 0 0 2 0; +#X connect 1 0 2 0; +#X connect 6 0 2 0; Modified: trunk/pd/extra/stdout/stdout.c =================================================================== --- trunk/pd/extra/stdout/stdout.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/extra/stdout/stdout.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -37,7 +37,7 @@ printf("%s;\n", msgbuf); } -static void stdout_flush(t_stdout *x) +static void stdout_free(t_stdout *x) { fflush(stdout); } @@ -45,7 +45,6 @@ void stdout_setup(void) { stdout_class = class_new(gensym("stdout"), (t_newmethod)stdout_new, - (t_method)stdout_flush, sizeof(t_stdout), 0, 0); - class_addmethod(stdout_class, (t_method)stdout_flush, gensym("flush"), 0); + (t_method)stdout_free, sizeof(t_stdout), 0, 0); class_addanything(stdout_class, stdout_anything); } Modified: trunk/pd/src/d_array.c =================================================================== --- trunk/pd/src/d_array.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/src/d_array.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -373,6 +373,7 @@ t_word *x_vec; t_symbol *x_arrayname; t_float x_f; + t_float x_onset; } t_tabread4_tilde; static void *tabread4_tilde_new(t_symbol *s) @@ -381,7 +382,9 @@ x->x_arrayname = s; x->x_vec = 0; outlet_new(&x->x_obj, gensym("signal")); + floatinlet_new(&x->x_obj, &x->x_onset); x->x_f = 0; + x->x_onset = 0; return (x); } @@ -393,6 +396,7 @@ int n = (int)(w[4]); int maxindex; t_word *buf = x->x_vec, *wp; + double onset = x->x_onset; int i; maxindex = x->x_npoints - 3; @@ -417,7 +421,7 @@ for (i = 0; i < n; i++) { - t_sample findex = *in++; + double findex = *in++ + onset; int index = findex; t_sample frac, a, b, c, d, cminusb; static int count; @@ -431,8 +435,6 @@ b = wp[0].w_float; c = wp[1].w_float; d = wp[2].w_float; - /* if (!i && !(count++ & 1023)) - post("fp = %lx, shit = %lx, b = %f", fp, buf->b_shit, b); */ cminusb = c-b; *out++ = b + frac * ( cminusb - 0.1666667f * (1.-frac) * ( Modified: trunk/pd/src/d_osc.c =================================================================== --- trunk/pd/src/d_osc.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/src/d_osc.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -86,7 +86,7 @@ t_float *in = (t_float *)(w[2]); t_float *out = (t_float *)(w[3]); int n = (int)(w[4]); - double dphase = x->x_phase + UNITBIT32; + double dphase = x->x_phase + (double)UNITBIT32; union tabfudge tf; int normhipart; float conv = x->x_conv; Modified: trunk/pd/src/m_pd.h =================================================================== --- trunk/pd/src/m_pd.h 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/src/m_pd.h 2008-12-08 20:14:40 UTC (rev 10432) @@ -11,7 +11,7 @@ #define PD_MAJOR_VERSION 0 #define PD_MINOR_VERSION 42 #define PD_BUGFIX_VERSION 0 -#define PD_TEST_VERSION "test5" +#define PD_TEST_VERSION "test6" /* old name for "MSW" flag -- we have to take it for the sake of many old "nmakefiles" for externs, which will define NT and not MSW */ Modified: trunk/pd/src/m_sched.c =================================================================== --- trunk/pd/src/m_sched.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/src/m_sched.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -450,11 +450,11 @@ if (!(idlecount & 31)) { static double idletime; - if (sched_useaudio != SCHED_AUDIO_POLL) - { - bug("m_pollingscheduler\n"); - return; - } + if (sched_useaudio != SCHED_AUDIO_POLL) + { + bug("m_pollingscheduler\n"); + return; + } /* on 32nd idle, start a clock watch; every 32 ensuing idles, check it */ if (idlecount == 32) @@ -566,6 +566,15 @@ return (0); } +int m_batchmain(void) +{ + sys_time_per_dsp_tick = (TIMEUNITPERSEC) * + ((double)sys_schedblocksize) / sys_dacsr; + while (sys_quit != SYS_QUIT_QUIT) + sched_tick(sys_time + sys_time_per_dsp_tick); + return (0); +} + /* ------------ thread locking ------------------- */ #ifdef THREAD_LOCKING Modified: trunk/pd/src/notes.txt =================================================================== --- trunk/pd/src/notes.txt 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/src/notes.txt 2008-12-08 20:14:40 UTC (rev 10432) @@ -15,6 +15,8 @@ Gnome: why don't windows pop up when clicked on? problems: +if .pdsettings asks for an alsa device out of range, dialog + comes up with empty list find asdf$1 (e.g.) doesn't work check real-time gaps in writesf~ fix declare to update current patch when changed Modified: trunk/pd/src/s_audio_alsa.c =================================================================== --- trunk/pd/src/s_audio_alsa.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/src/s_audio_alsa.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -25,6 +25,7 @@ #include <sched.h> #include <sys/mman.h> #include "s_audio_alsa.h" +#include <endian.h> /* Defines */ #define DEBUG(x) x @@ -117,17 +118,33 @@ if (err < 0) return (-1); check_error(err, "snd_pcm_hw_params_set_access"); +#if 0 /* enable this to print out which formats are available */ + { + int i; + for (i = 0; i <= SND_PCM_FORMAT_LAST; i++) + fprintf(stderr, "%d -> %d\n", + i, snd_pcm_hw_params_test_format(dev->a_handle, hw_params, i)); + } +#endif /* Try to set 32 bit format first */ err = snd_pcm_hw_params_set_format(dev->a_handle, hw_params, SND_PCM_FORMAT_S32); if (err < 0) { /* fprintf(stderr, - "PD-ALSA: 32 bit format not available - using 16\n"); */ + "PD-ALSA: 32 bit format not available - trying 24\n"); */ err = snd_pcm_hw_params_set_format(dev->a_handle, hw_params, - SND_PCM_FORMAT_S16); - check_error(err, "snd_pcm_hw_params_set_format"); - dev->a_sampwidth = 2; + SND_PCM_FORMAT_S24_3LE); + if (err < 0) + { + /* fprintf(stderr, + "PD-ALSA: 32/24 bit format not available - using 16\n"); */ + err = snd_pcm_hw_params_set_format(dev->a_handle, hw_params, + SND_PCM_FORMAT_S16); + check_error(err, "snd_pcm_hw_params_set_format"); + dev->a_sampwidth = 2; + } + else dev->a_sampwidth = 3; } else dev->a_sampwidth = 4; @@ -426,19 +443,44 @@ if (alsa_outdev[iodev].a_sampwidth == 4) { for (i = 0; i < chans; i++, ch++, fp1 += DEFDACBLKSIZE) - for (j = ch, k = DEFDACBLKSIZE, fp2 = fp1; k--; + for (j = i, k = DEFDACBLKSIZE, fp2 = fp1; k--; j += thisdevchans, fp2++) { float s1 = *fp2 * INT32_MAX; ((t_alsa_sample32 *)alsa_snd_buf)[j] = CLIP32(s1); } for (; i < thisdevchans; i++, ch++) - for (j = ch, k = DEFDACBLKSIZE; k--; j += thisdevchans) + for (j = i, k = DEFDACBLKSIZE; k--; j += thisdevchans) ((t_alsa_sample32 *)alsa_snd_buf)[j] = 0; } - else + else if (alsa_outdev[iodev].a_sampwidth == 3) { for (i = 0; i < chans; i++, ch++, fp1 += DEFDACBLKSIZE) + for (j = i, k = DEFDACBLKSIZE, fp2 = fp1; k--; + j += thisdevchans, fp2++) + { + int s = *fp2 * 8388352.; + if (s > 8388351) + s = 8388351; + else if (s < -8388351) + s = -8388351; +#if BYTE_ORDER == LITTLE_ENDIAN + ((char *)(alsa_snd_buf))[3*j] = (s & 255); + ((char *)(alsa_snd_buf))[3*j+1] = ((s>>8) & 255); + ((char *)(alsa_snd_buf))[3*j+2] = ((s>>16) & 255); +#else + fprintf(stderr("big endian 24-bit not supported"); +#endif + } + for (; i < thisdevchans; i++, ch++) + for (j = i, k = DEFDACBLKSIZE; k--; j += thisdevchans) + ((char *)(alsa_snd_buf))[3*j] = + ((char *)(alsa_snd_buf))[3*j+1] = + ((char *)(alsa_snd_buf))[3*j+2] = 0; + } + else /* 16 bit samples */ + { + for (i = 0; i < chans; i++, ch++, fp1 += DEFDACBLKSIZE) for (j = ch, k = DEFDACBLKSIZE, fp2 = fp1; k--; j += thisdevchans, fp2++) { @@ -525,6 +567,23 @@ * (1./ INT32_MAX); } } + else if (alsa_indev[iodev].a_sampwidth == 3) + { +#if BYTE_ORDER == LITTLE_ENDIAN + for (i = 0; i < chans; i++, ch++, fp1 += DEFDACBLKSIZE) + { + for (j = ch, k = DEFDACBLKSIZE, fp2 = fp1; k--; + j += thisdevchans, fp2++) + *fp2 = ((float) ( + (((unsigned char *)alsa_snd_buf)[3*j] << 8) + | (((unsigned char *)alsa_snd_buf)[3*j+1] << 16) + | (((unsigned char *)alsa_snd_buf)[3*j+2] << 24))) + * (1./ INT32_MAX); + } +#else + fprintf(stderr("big endian 24-bit not supported"); +#endif + } else { for (i = 0; i < chans; i++, ch++, fp1 += DEFDACBLKSIZE) Modified: trunk/pd/src/s_audio_pa.c =================================================================== --- trunk/pd/src/s_audio_pa.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/src/s_audio_pa.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -11,6 +11,7 @@ #include "s_stuff.h" #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #include <portaudio.h> #include "s_audio_pablio.h" @@ -29,6 +30,34 @@ int pa_foo; +static void pa_init(void) +{ + static int initialized; + if (!initialized) + { + /* Initialize PortAudio */ + /* for some reason Pa_Initialize(0 closes file descriptor 1. + As a workaround, dup it to another number and dup2 it back + afterward. */ + int newfd = dup(1); + int err = Pa_Initialize(); + if (newfd >= 0) + { + dup2(newfd, 1); + close(newfd); + } + if ( err != paNoError ) + { + fprintf( stderr, + "Error number %d occured initializing portaudio\n", + err); + fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); + return; + } + initialized = 1; + } +} + static int pa_lowlevel_callback(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *outTime, PaStreamCallbackFlags myflags, @@ -155,25 +184,11 @@ int indeviceno, int outdeviceno, t_audiocallback callbackfn) { PaError err; - static int initialized; int j, devno, pa_indev = 0, pa_outdev = 0; pa_callback = callbackfn; /* fprintf(stderr, "open callback %d\n", (callbackfn != 0)); */ - if (!initialized) - { - /* Initialize PortAudio */ - int err = Pa_Initialize(); - if ( err != paNoError ) - { - fprintf( stderr, - "Error number %d occured initializing portaudio\n", - err); - fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); - return (1); - } - initialized = 1; - } + pa_init(); /* post("in %d out %d rate %d device %d", inchans, outchans, rate, deviceno); */ if (inchans > MAX_PA_CHANS) { @@ -349,7 +364,7 @@ int numDevices; const PaDeviceInfo *pdi; PaError err; - Pa_Initialize(); + pa_init(); numDevices = Pa_GetDeviceCount(); if( numDevices < 0 ) { @@ -390,7 +405,7 @@ int i, nin = 0, nout = 0, ndev; *canmulti = 1; /* one dev each for input and output */ - Pa_Initialize(); + pa_init(); ndev = Pa_GetDeviceCount(); for (i = 0; i < ndev; i++) { Modified: trunk/pd/src/s_main.c =================================================================== --- trunk/pd/src/s_main.c 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/src/s_main.c 2008-12-08 20:14:40 UTC (rev 10432) @@ -35,6 +35,7 @@ int sys_startgui(const char *guipath); int sys_rcfile(void); int m_mainloop(void); +int m_batchmain(void); void sys_addhelppath(char *p); #ifdef USEAPI_ALSA void alsa_adddev(char *name); @@ -75,6 +76,7 @@ int sys_externalschedlib; char sys_externalschedlibname[MAXPDSTRING]; +static int sys_batch; int sys_extraflags; char sys_extraflagsstring[MAXPDSTRING]; int sys_run_scheduler(const char *externalschedlibname, @@ -299,6 +301,8 @@ if (sys_externalschedlib) return (sys_run_scheduler(sys_externalschedlibname, sys_extraflagsstring)); + else if (sys_batch) + return (m_batchmain()); else { /* open audio and MIDI */ @@ -394,6 +398,7 @@ "-nosleep -- spin, don't sleep (may lower latency on multi-CPUs)\n", "-schedlib <file> -- plug in external scheduler\n", "-extraflags <s> -- string argument to send schedlib\n", +"-batch -- run off-line as a batch process\n", }; static void sys_parsedevlist(int *np, int *vecp, int max, char *str) @@ -828,6 +833,12 @@ argv += 2; argc -= 2; } + else if (!strcmp(*argv, "-batch")) + { + sys_batch = 1; + sys_printtostderr = sys_nogui = 1; + argc--; argv++; + } #ifdef UNISTD else if (!strcmp(*argv, "-rt") || !strcmp(*argv, "-realtime")) { Modified: trunk/pd/src/u_main.tk =================================================================== --- trunk/pd/src/u_main.tk 2008-12-08 13:33:46 UTC (rev 10431) +++ trunk/pd/src/u_main.tk 2008-12-08 20:14:40 UTC (rev 10432) @@ -4449,7 +4449,7 @@ set fieldname [lindex $ddd_fields $x 0] set $varname [lindex $ddd_fields $x 1] frame $id.frame$x - pack $id.frame$x -side top + pack $id.frame$x -side top -anchor e label $id.frame$x.label -text $fieldname entry $id.frame$x.entry -textvariable $varname -width 20 bind $id.frame$x.entry <KeyPress-Return> [concat ddd_ok $id] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10431] trunk/abstractions/sfruit/sfruit
by lukeiannini＠users.sourceforge.net 08 Dec '08

08 Dec '08

Revision: 10431 http://pure-data.svn.sourceforge.net/pure-data/?rev=10431&view=rev Author: lukeiannini Date: 2008-12-08 13:33:46 +0000 (Mon, 08 Dec 2008) Log Message: ----------- improvements to OSC objects, new helpfiles, list-union-merge is handy for making OSC addresses Modified Paths: -------------- trunk/abstractions/sfruit/sfruit/deeprouteOSC.pd trunk/abstractions/sfruit/sfruit/dialog.yes-no.pd trunk/abstractions/sfruit/sfruit/keycommand.pd Added Paths: ----------- trunk/abstractions/sfruit/sfruit/OSCin.pd trunk/abstractions/sfruit/sfruit/dialog.yes-no-help.pd trunk/abstractions/sfruit/sfruit/learnOSC.pd trunk/abstractions/sfruit/sfruit/list-union-merge.pd Added: trunk/abstractions/sfruit/sfruit/OSCin.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/OSCin.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/OSCin.pd 2008-12-08 13:33:46 UTC (rev 10431) @@ -0,0 +1,16 @@ +#N canvas 237 306 254 272 10; +#X obj 46 54 udpreceive \$1; +#X obj 46 80 unpackOSC; +#X obj 139 190 s OSCIN; +#X obj 46 105 list; +#X obj 46 153 routeOSC /accxyz; +#X obj 46 128 route list; +#X obj 113 128 s OSCIN.ORPHANS; +#X obj 46 189 s OSCIN.ACCEL; +#X connect 0 0 1 0; +#X connect 1 0 3 0; +#X connect 3 0 5 0; +#X connect 4 0 7 0; +#X connect 4 1 2 0; +#X connect 5 0 4 0; +#X connect 5 1 6 0; Modified: trunk/abstractions/sfruit/sfruit/deeprouteOSC.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/deeprouteOSC.pd 2008-12-07 22:01:43 UTC (rev 10430) +++ trunk/abstractions/sfruit/sfruit/deeprouteOSC.pd 2008-12-08 13:33:46 UTC (rev 10431) @@ -1,11 +1,7 @@ #N canvas 368 88 344 571 10; - #X obj 207 43 namecanvas \$0self; #N canvas 208 132 808 593 constructor 0; #X obj 401 113 symbol2list /; -#X obj 440 364 s2l-explode; -#X obj 440 385 list prepend /; -#X obj 440 406 list-l2s; #X obj 377 466 list append; #X obj 377 533 s \$0self; #X obj 377 364 f; @@ -43,54 +39,53 @@ #X msg 377 489 obj 30 \$1 routeOSC \$2; #X obj 259 433 + 2; #X obj 292 433 + 3; -#X connect 0 0 18 0; -#X connect 1 0 2 0; -#X connect 2 0 3 0; -#X connect 3 0 4 1; -#X connect 4 0 38 0; -#X connect 6 0 13 0; -#X connect 6 0 27 1; -#X connect 6 0 29 0; -#X connect 7 0 10 0; -#X connect 7 1 8 1; -#X connect 7 2 31 0; -#X connect 8 0 7 0; -#X connect 9 0 8 0; -#X connect 9 1 8 1; -#X connect 10 0 11 0; -#X connect 10 1 6 0; -#X connect 10 2 1 0; -#X connect 11 0 8 0; -#X connect 12 0 4 0; -#X connect 12 0 23 0; -#X connect 13 0 6 1; -#X connect 14 0 15 0; -#X connect 15 0 5 0; -#X connect 16 0 6 1; +#X msg 440 384 /\$1; +#X connect 0 0 15 0; +#X connect 1 0 35 0; +#X connect 3 0 10 0; +#X connect 3 0 24 1; +#X connect 3 0 26 0; +#X connect 4 0 7 0; +#X connect 4 1 5 1; +#X connect 4 2 28 0; +#X connect 5 0 4 0; +#X connect 6 0 5 0; +#X connect 6 1 5 1; +#X connect 7 0 8 0; +#X connect 7 1 3 0; +#X connect 7 2 38 0; +#X connect 8 0 5 0; +#X connect 9 0 1 0; +#X connect 9 0 20 0; +#X connect 10 0 3 1; +#X connect 11 0 12 0; +#X connect 12 0 2 0; +#X connect 13 0 3 1; +#X connect 14 0 16 0; +#X connect 15 0 6 0; +#X connect 15 1 13 0; +#X connect 15 2 14 0; #X connect 17 0 19 0; -#X connect 18 0 9 0; -#X connect 18 1 16 0; -#X connect 18 2 17 0; -#X connect 20 0 22 0; -#X connect 21 0 20 0; -#X connect 22 0 5 0; -#X connect 24 0 21 1; -#X connect 25 0 12 0; -#X connect 26 0 27 0; -#X connect 27 0 30 0; -#X connect 28 0 39 0; -#X connect 28 1 40 0; -#X connect 29 0 28 0; -#X connect 29 1 25 0; -#X connect 30 0 28 0; -#X connect 31 0 32 0; -#X connect 31 1 21 0; -#X connect 33 0 34 0; -#X connect 34 0 36 0; -#X connect 34 1 0 0; -#X connect 35 0 33 0; -#X connect 36 0 0 0; -#X connect 38 0 5 0; -#X connect 39 0 14 0; -#X connect 40 0 14 1; +#X connect 18 0 17 0; +#X connect 19 0 2 0; +#X connect 21 0 18 1; +#X connect 22 0 9 0; +#X connect 23 0 24 0; +#X connect 24 0 27 0; +#X connect 25 0 36 0; +#X connect 25 1 37 0; +#X connect 26 0 25 0; +#X connect 26 1 22 0; +#X connect 27 0 25 0; +#X connect 28 0 29 0; +#X connect 28 1 18 0; +#X connect 30 0 31 0; +#X connect 31 0 33 0; +#X connect 31 1 0 0; +#X connect 32 0 30 0; +#X connect 33 0 0 0; +#X connect 35 0 2 0; +#X connect 36 0 11 0; +#X connect 37 0 11 1; +#X connect 38 0 1 1; #X restore 207 21 pd constructor; Added: trunk/abstractions/sfruit/sfruit/dialog.yes-no-help.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/dialog.yes-no-help.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/dialog.yes-no-help.pd 2008-12-08 13:33:46 UTC (rev 10431) @@ -0,0 +1,21 @@ +#N canvas 0 22 441 317 10; +#X text 16 18 [dialog.yes-no] will spawn a dialog box under the user's +cursor when banged \, outputting "1" if the user clicks "Yes" and "0" +if the user clicks "No". The message in the dialog box can be given +as the first argument. Due to limitations in Pd \, the message must +use _ in place of spaces. If no argument is given \, the message will +simply be "Are_you_sure?".; +#X text 312 276 2008 Luke Iannini; +#X obj 118 124 bng 30 250 50 0 empty empty empty 17 7 0 10 -261234 +-1 -1; +#X obj 118 189 sel 1 0; +#X msg 118 215 set YES; +#X msg 169 215 set NO; +#X obj 118 166 dialog.yes-no Activate_soulsonic_mantronic_force?; +#X msg 118 241; +#X connect 2 0 6 0; +#X connect 3 0 4 0; +#X connect 3 1 5 0; +#X connect 4 0 7 0; +#X connect 5 0 7 0; +#X connect 6 0 3 0; Modified: trunk/abstractions/sfruit/sfruit/dialog.yes-no.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/dialog.yes-no.pd 2008-12-07 22:01:43 UTC (rev 10430) +++ trunk/abstractions/sfruit/sfruit/dialog.yes-no.pd 2008-12-08 13:33:46 UTC (rev 10431) @@ -1,10 +1,7 @@ #N canvas 266 442 628 346 10; - - - -#N canvas 781 650 305 105 \$0.dialog-box 0; -#X obj 2 2 cnv 15 300 30 empty \$0.line1 Are_you_sure? 20 12 0 14 -262144 --1 0; +#N canvas 0 201 305 105 \$0.dialog-box 0; +#X obj 2 2 cnv 15 300 30 empty \$0.line1 empty 20 12 0 14 -262144 -1 +0; #X obj 2 33 cnv 15 300 30 empty \$0.line2 empty 20 12 0 14 -262144 -1 0; #X obj 74 71 bng 30 250 50 0 \$0.yes-s \$0.yes-r Yes. 35 15 0 10 -4032 @@ -14,9 +11,9 @@ #X restore 49 308 pd \$0.dialog-box; #X obj 31 22 inlet; #X obj 33 159 r \$0.yes-s; -#X obj 73 179 r \$0.no-s; +#X obj 103 159 r \$0.no-s; #X msg 33 203 1; -#X msg 73 203 vis 0; +#X msg 103 233 vis 0; #X obj 33 252 outlet; #X obj 344 40 loadbang; #X obj 344 87 s2l-explode; @@ -27,15 +24,17 @@ #X obj 381 165 prepent label; #X obj 344 274 s \$0.line1; #X obj 381 187 s \$0.line2; -#X obj 73 225 s pd-\$0.dialog-box; +#X obj 103 255 s pd-\$0.dialog-box; #X obj 31 67 s pd-\$0.dialog-box; #X obj 31 45 dialog.under-cursor 305 105 1440 900; #X obj 344 62 list-onearg \$1 Are_you_sure?; #X obj 481 22 import-disabled list-abs; +#X msg 64 203 0; #X connect 1 0 18 0; #X connect 2 0 4 0; #X connect 2 0 5 0; #X connect 3 0 5 0; +#X connect 3 0 21 0; #X connect 4 0 6 0; #X connect 5 0 16 0; #X connect 7 0 19 0; @@ -49,3 +48,4 @@ #X connect 13 0 15 0; #X connect 18 0 17 0; #X connect 19 0 8 0; +#X connect 21 0 6 0; Modified: trunk/abstractions/sfruit/sfruit/keycommand.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/keycommand.pd 2008-12-07 22:01:43 UTC (rev 10430) +++ trunk/abstractions/sfruit/sfruit/keycommand.pd 2008-12-08 13:33:46 UTC (rev 10431) @@ -1,13 +1,17 @@ -#N canvas 274 22 408 156 10; -#X obj 29 47 keynamedown \$1; +#N canvas 274 22 434 172 10; +#X obj 29 27 keynamedown \$1; #X obj 29 116 s \$2; #X obj 29 82 list append \$3; -#X obj 197 48 r ACTIVE_KEYCOMMANDS?; -#X obj 197 122 s ACTIVE_KEYCOMMAND; -#X obj 197 74 list append \$1: Sends \$3 to \$2; -#X obj 197 98 list trim; -#X connect 0 0 2 0; +#X obj 227 48 r ACTIVE_KEYCOMMANDS?; +#X obj 227 122 s ACTIVE_KEYCOMMAND; +#X obj 227 74 list append \$1: Sends \$3 to \$2; +#X obj 227 98 list trim; +#X obj 29 58 spigot 1; +#X obj 83 58 r ENABLE_KEYCOMMANDS?; +#X connect 0 0 7 0; #X connect 2 0 1 0; #X connect 3 0 5 0; #X connect 5 0 6 0; #X connect 6 0 4 0; +#X connect 7 0 2 0; +#X connect 8 0 7 1; Added: trunk/abstractions/sfruit/sfruit/learnOSC.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/learnOSC.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/learnOSC.pd 2008-12-08 13:33:46 UTC (rev 10431) @@ -0,0 +1,20 @@ +#N canvas 145 92 239 311 10; +#X obj 72 131 list split 1; +#X obj 72 181 t b a; +#X msg 129 155 0; +#X obj 25 218 sdeeprouteOSC; +#X obj 25 247 outlet; +#X obj 105 87 inlet learn?; +#X obj 144 249 outlet; +#X obj 72 155 spigot; +#X obj 25 58 r OSCIN; +#X connect 0 0 7 0; +#X connect 1 0 2 0; +#X connect 1 1 3 1; +#X connect 1 1 6 0; +#X connect 2 0 7 1; +#X connect 3 0 4 0; +#X connect 5 0 7 1; +#X connect 7 0 1 0; +#X connect 8 0 0 0; +#X connect 8 0 3 0; Added: trunk/abstractions/sfruit/sfruit/list-union-merge.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/list-union-merge.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/list-union-merge.pd 2008-12-08 13:33:46 UTC (rev 10431) @@ -0,0 +1,23 @@ +#N canvas 809 374 341 379 10; +#X obj 52 137 list-map; +#X obj 117 206 list; +#X obj 117 237 list-map; +#X obj 97 166 t b a; +#X obj 184 237 list append; +#X msg 184 258 \$1\$2; +#X obj 67 166 t a; +#X obj 138 33 inlet; +#X obj 52 32 inlet; +#X obj 52 339 outlet; +#X connect 0 0 9 0; +#X connect 0 1 3 0; +#X connect 1 0 2 0; +#X connect 2 0 6 0; +#X connect 2 1 4 0; +#X connect 3 0 1 0; +#X connect 3 1 4 1; +#X connect 4 0 5 0; +#X connect 5 0 2 1; +#X connect 6 0 0 1; +#X connect 7 0 1 1; +#X connect 8 0 0 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: pd-extended debian-stable-powerpc 2008-12-08 06.27.51
by pd＠debian-stable-powerpc.idmi.poly.edu 08 Dec '08

08 Dec '08

/bin/sh: -c: line 1: syntax error: unexpected end of file ../Base/GemPixPete.h:54: internal compiler error: Segmentation fault ERROR: module is write only rsync error: syntax or usage error (code 1) at main.c(641) [sender=2.6.9] rsync error: error in rsync protocol data stream (code 12) at io.c(453) [receiver=2.6.9] the full logfile - if it has been succesfully uploaded - can be viewed at: http://autobuild.puredata.info/auto-build/2008-12-08/logs/2008-12-08_06.27.…

1 0

autobuild: pd-extended planetccrma9-i386 2008-12-08 04.08.11
by pd＠planetccrma9-i386.idmi.poly.edu 08 Dec '08

08 Dec '08

filmMPEG3.cpp:53: error: 'mpeg_file' was not declared in this scope filmMPEG3.cpp:53: error: 'mpeg3_close' was not declared in this scope filmMPEG3.cpp:54: error: 'mpeg_file' was not declared in this scope filmMPEG3.cpp:63: error: 'mpeg3_check_sig' was not declared in this scope filmMPEG3.cpp:64: error: 'mpeg_file' was not declared in this scope filmMPEG3.cpp:64: error: 'mpeg3_open' was not declared in this scope filmMPEG3.cpp:65: error: 'mpeg3_has_video' was not declared in this scope filmMPEG3.cpp:69: error: 'mpeg3_total_vstreams' was not declared in this scope filmMPEG3.cpp:72: error: 'mpeg3_video_frames' was not declared in this scope filmMPEG3.cpp:73: error: 'mpeg3_frame_rate' was not declared in this scope filmMPEG3.cpp:75: error: 'mpeg3_video_width' was not declared in this scope filmMPEG3.cpp:76: error: 'mpeg3_video_height' was not declared in this scope filmMPEG3.cpp:118: error: 'mpeg_file' was not declared in this scope filmMPEG3.cpp:122: error: 'MPEG3_RGBA8888' was not declared in this scope filmMPEG3.cpp:123: error: 'mpeg3_read_frame' was not declared in this scope filmMPEG3.cpp:139: error: 'mpeg_file' was not declared in this scope filmMPEG3.cpp:139: error: 'mpeg3_read_yuvframe_ptr' was not declared in this scope filmMPEG3.cpp:157: error: 'mpeg_file' was not declared in this scope filmMPEG3.cpp:157: error: 'mpeg3_set_frame' was not declared in this scope rsync error: syntax or usage error (code 1) at main.c(1216) [receiver=3.0.4] the full logfile - if it has been succesfully uploaded - can be viewed at: http://autobuild.puredata.info/auto-build/2008-12-08/logs/2008-12-08_04.08.…

1 0

SF.net SVN: pure-data:[10430] trunk/externals/ggee/gui/gcanvas-help.pd
by eighthave＠users.sourceforge.net 07 Dec '08

07 Dec '08

Revision: 10430 http://pure-data.svn.sourceforge.net/pure-data/?rev=10430&view=rev Author: eighthave Date: 2008-12-07 22:01:43 +0000 (Sun, 07 Dec 2008) Log Message: ----------- updated gcanvas help patch to document some of the hidden features for drawing to the canvas Modified Paths: -------------- trunk/externals/ggee/gui/gcanvas-help.pd Modified: trunk/externals/ggee/gui/gcanvas-help.pd =================================================================== --- trunk/externals/ggee/gui/gcanvas-help.pd 2008-12-07 20:33:15 UTC (rev 10429) +++ trunk/externals/ggee/gui/gcanvas-help.pd 2008-12-07 22:01:43 UTC (rev 10430) @@ -1,9 +1,18 @@ -#N canvas 575 176 459 478 10; -#X obj 116 413 nbx 5 25 -1e+37 1e+37 0 0 empty empty X: -20 14 1 16 +#N canvas 292 26 524 527 10; +#X obj 34 472 nbx 5 25 -1e+37 1e+37 0 0 empty empty X: -20 14 1 16 +-241655 -1 -1 49 256; +#X obj 40 248 gcanvas 200 200; +#X obj 136 471 nbx 5 25 -1e+37 1e+37 0 0 empty empty Y: -20 14 1 16 -241655 -1 -1 26 256; +#X text 18 3 [gcanvas]; +#X text 69 505 mouse values; +#X text 41 24 click and drag in the grey [gcanvas] to get pixel values +; +#X obj 241 486 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +-1 -1; +#X text 261 487 mouse clicked in box; +#N canvas 0 22 441 440 resize 0; #X obj 132 192 gcanvas 49 49; -#X obj 342 412 nbx 5 25 -1e+37 1e+37 0 0 empty empty Y: -20 14 1 16 --241655 -1 -1 23 256; #X msg 132 172 size 49 49; #X obj 37 193 vsl 20 200 200 5 0 0 empty empty Y 0 -8 1 11 -241655 -1 -1 15308 0; @@ -11,8 +20,6 @@ -1 -1 4592 0; #X obj 20 62 loadbang; #X msg 37 85 50; -#X text 18 3 [gcanvas]; -#X text 216 421 mouse values; #N canvas 526 29 466 316 guts 0; #X obj 141 36 inlet; #X obj 184 271 outlet; @@ -36,18 +43,46 @@ #X connect 9 0 3 0; #X connect 10 0 1 0; #X restore 132 118 pd guts; -#X text 41 24 click and drag in the grey [gcanvas] to get pixel values -; #X obj 246 274 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X text 266 275 mouse clicked in box; +#X connect 0 2 7 0; #X connect 1 0 0 0; +#X connect 2 0 6 0; +#X connect 3 0 6 1; +#X connect 4 0 5 0; +#X connect 5 0 3 0; +#X connect 5 0 2 0; +#X connect 6 0 1 0; +#X restore 331 343 pd resize; +#X floatatom 241 466 5 0 0 0 - - -; +#X msg 42 63 color grey 0; +#X msg 25 44 color red 0; +#X text 131 52 change color of an element; +#X msg 142 211 delete 1; +#X msg 53 84 line green 25 50 50 50; +#X text 202 84 draw a line with args: color x y width height; +#X msg 63 104 rect blue 125 150 9 50; +#X text 205 104 draw a rectangle with args: color x y width height +; +#X msg 76 132 move 2 50 50 50 50; +#X text 195 131 move an element with args: element# x y width height +; +#X text 211 211 delete an element from the canvas; +#X msg 79 210 reset; +#X msg 83 172 move 2 50 \$1 50 50; +#X obj 86 153 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X connect 1 0 0 0; #X connect 1 1 2 0; -#X connect 1 2 12 0; -#X connect 3 0 1 0; -#X connect 4 0 10 0; -#X connect 5 0 10 1; -#X connect 6 0 7 0; -#X connect 7 0 5 0; -#X connect 7 0 4 0; -#X connect 10 0 3 0; +#X connect 1 2 9 0; +#X connect 9 0 6 0; +#X connect 10 0 1 0; +#X connect 11 0 1 0; +#X connect 13 0 1 0; +#X connect 14 0 1 0; +#X connect 16 0 1 0; +#X connect 18 0 1 0; +#X connect 21 0 1 0; +#X connect 22 0 1 0; +#X connect 23 0 22 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10429] trunk/doc/additional/messageoddness
by eighthave＠users.sourceforge.net 07 Dec '08

07 Dec '08

Revision: 10429 http://pure-data.svn.sourceforge.net/pure-data/?rev=10429&view=rev Author: eighthave Date: 2008-12-07 20:33:15 +0000 (Sun, 07 Dec 2008) Log Message: ----------- committed improved versions from Roman Haefeli Modified Paths: -------------- trunk/doc/additional/messageoddness/list_must_have_2_or_more_elements.pd trunk/doc/additional/messageoddness/route_mixing_float_and_symbol_arguments.pd Modified: trunk/doc/additional/messageoddness/list_must_have_2_or_more_elements.pd =================================================================== --- trunk/doc/additional/messageoddness/list_must_have_2_or_more_elements.pd 2008-12-07 19:22:40 UTC (rev 10428) +++ trunk/doc/additional/messageoddness/list_must_have_2_or_more_elements.pd 2008-12-07 20:33:15 UTC (rev 10429) @@ -1,4 +1,4 @@ -#N canvas 119 484 463 507 10; +#N canvas 271 55 464 710 10; #X floatatom 243 167 5 0 0 0 - - -; #X symbolatom 291 166 10 0 0 0 - - -; #X obj 196 187 bng 15 250 50 0 empty empty bang -6 23 1 12 -262144 @@ -38,9 +38,14 @@ #X obj 59 471 *; #X msg 223 429 3; #X msg 256 428 list 3; -#X obj 208 470 *~; +#X obj 208 481 *~; #X text 19 311 These two disagree about 0 element lists:; #X text 19 401 These two disagree about 1 element lists:; +#X obj 140 597 route 1; +#X msg 140 575 1 3; +#X obj 125 622 *~; +#X text 24 528 [route] doesn't seem to automatically convert 1 element +lists:; #X connect 0 0 4 0; #X connect 1 0 5 0; #X connect 3 0 2 0; @@ -65,3 +70,5 @@ #X connect 24 0 25 1; #X connect 26 0 28 1; #X connect 27 0 28 1; +#X connect 31 0 33 1; +#X connect 32 0 31 0; Modified: trunk/doc/additional/messageoddness/route_mixing_float_and_symbol_arguments.pd =================================================================== --- trunk/doc/additional/messageoddness/route_mixing_float_and_symbol_arguments.pd 2008-12-07 19:22:40 UTC (rev 10428) +++ trunk/doc/additional/messageoddness/route_mixing_float_and_symbol_arguments.pd 2008-12-07 20:33:15 UTC (rev 10429) @@ -1,15 +1,21 @@ -#N canvas 58 168 454 304 10; -#X obj 155 147 route 1 bla; -#X msg 147 44 list bla hu; -#X obj 147 185 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +#N canvas 793 278 453 550 10; +#X obj 122 255 route 1 bla; +#X msg 118 113 list bla hu; +#X obj 114 293 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; -#X obj 182 189 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +#X obj 149 297 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; -#X obj 230 188 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +#X obj 197 296 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; -#X msg 96 44 bla hu; -#X msg 187 104 1 two; -#X msg 231 104 list 1 two; +#X msg 86 85 bla hu; +#X msg 159 147 1 two; +#X msg 203 147 list 1 two; +#X text 32 22 mixing different data types in one route object is not +supported and thus leads to unexpected behaviour.; +#X msg 169 220 0; +#X text 197 218 <- unexpectedly matches 'bla'; +#X text 134 83 <- unexpectedly not matching; +#X text 200 113 unexpectedly matches 'bla'; #X connect 0 0 2 0; #X connect 0 1 3 0; #X connect 0 2 4 0; @@ -17,3 +23,4 @@ #X connect 5 0 0 0; #X connect 6 0 0 0; #X connect 7 0 0 0; +#X connect 9 0 0 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10428] trunk/externals/moocow/gfsm/gfsm
by mukau＠users.sourceforge.net 07 Dec '08

07 Dec '08

Revision: 10428 http://pure-data.svn.sourceforge.net/pure-data/?rev=10428&view=rev Author: mukau Date: 2008-12-07 19:22:40 +0000 (Sun, 07 Dec 2008) Log Message: ----------- + disabled flex, bison in local gfsm build (breaks on pd-extended darwin,ubuntu) + merged in small bugfixes from upstream gfsm repository (upstream rev=583) Modified Paths: -------------- trunk/externals/moocow/gfsm/gfsm/config/Makefile.in trunk/externals/moocow/gfsm/gfsm/configure.gnu trunk/externals/moocow/gfsm/gfsm/src/Makefile.in trunk/externals/moocow/gfsm/gfsm/src/libgfsm/Makefile.in trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmAlgebra.c trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmBitVector.hi Added Paths: ----------- trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmRegex.lex.c trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmRegex.tab.c Modified: trunk/externals/moocow/gfsm/gfsm/config/Makefile.in =================================================================== --- trunk/externals/moocow/gfsm/gfsm/config/Makefile.in 2008-12-05 20:19:42 UTC (rev 10427) +++ trunk/externals/moocow/gfsm/gfsm/config/Makefile.in 2008-12-07 19:22:40 UTC (rev 10428) @@ -240,9 +240,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign config/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign config/Makefile + $(AUTOMAKE) --gnu config/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ Modified: trunk/externals/moocow/gfsm/gfsm/configure.gnu =================================================================== --- trunk/externals/moocow/gfsm/gfsm/configure.gnu 2008-12-05 20:19:42 UTC (rev 10427) +++ trunk/externals/moocow/gfsm/gfsm/configure.gnu 2008-12-07 19:22:40 UTC (rev 10428) @@ -1,3 +1,3 @@ #!/bin/sh -exec ./configure "$@" --disable-doc --disable-programs --disable-shared --prefix="$PWD/../../extended/build.moo/noinstall" +exec ./configure "$@" FLEX=no BISON=no --disable-doc --disable-programs --disable-shared --prefix="$PWD/../../extended/build.moo/noinstall" Modified: trunk/externals/moocow/gfsm/gfsm/src/Makefile.in =================================================================== --- trunk/externals/moocow/gfsm/gfsm/src/Makefile.in 2008-12-05 20:19:42 UTC (rev 10427) +++ trunk/externals/moocow/gfsm/gfsm/src/Makefile.in 2008-12-07 19:22:40 UTC (rev 10428) @@ -264,9 +264,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/Makefile + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ Modified: trunk/externals/moocow/gfsm/gfsm/src/libgfsm/Makefile.in =================================================================== --- trunk/externals/moocow/gfsm/gfsm/src/libgfsm/Makefile.in 2008-12-05 20:19:42 UTC (rev 10427) +++ trunk/externals/moocow/gfsm/gfsm/src/libgfsm/Makefile.in 2008-12-07 19:22:40 UTC (rev 10428) @@ -435,9 +435,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libgfsm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libgfsm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/libgfsm/Makefile + $(AUTOMAKE) --gnu src/libgfsm/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ Modified: trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmAlgebra.c =================================================================== --- trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmAlgebra.c 2008-12-05 20:19:42 UTC (rev 10427) +++ trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmAlgebra.c 2008-12-07 19:22:40 UTC (rev 10428) @@ -576,7 +576,7 @@ gfsmBitVector *wanted; //-- sanity check - if (!fsm) return fsm; + if (!fsm || gfsm_automaton_n_states(fsm)==0) return fsm; wanted = gfsm_bitvector_sized_new(fsm->states->len); gfsm_automaton_connect_fw(fsm, wanted); Modified: trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmBitVector.hi =================================================================== --- trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmBitVector.hi 2008-12-05 20:19:42 UTC (rev 10427) +++ trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmBitVector.hi 2008-12-07 19:22:40 UTC (rev 10428) @@ -4,7 +4,7 @@ * Author: Bryan Jurish <moocow(a)ling.uni-potsdam.de> * Description: finite state machine library: bit vectors: inline definitions * - * Copyright (c) 2004-2007 Bryan Jurish. + * Copyright (c) 2004-2008 Bryan Jurish. * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. @@ -94,7 +94,7 @@ gfsmBitVector *gfsm_bitvector_sized_new(guint nbits) { gfsmBitVector *bv = g_array_sized_new(FALSE,TRUE,1, gfsm_bitvector_bits2bytes_(nbits)+1); - gfsm_bitvector_set(bv, nbits-1, 0); + if (nbits) gfsm_bitvector_set(bv, nbits-1, 0); return bv; } Added: trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmRegex.lex.c =================================================================== --- trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmRegex.lex.c (rev 0) +++ trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmRegex.lex.c 2008-12-07 19:22:40 UTC (rev 10428) @@ -0,0 +1,2334 @@ +#line 2 "gfsmRegex.lex.c" + +#line 4 "gfsmRegex.lex.c" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 33 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <stdlib.h> + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ + +#if __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include <inttypes.h> +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +#if __STDC__ + +#define YY_USE_CONST + +#endif /* __STDC__ */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* Returned upon end-of-file. */ +#define YY_NULL 0 + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. + */ +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +/* An opaque pointer. */ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void* yyscan_t; +#endif + +/* For convenience, these vars (plus the bison vars far below) + are macros in the reentrant scanner. */ +#define yyin yyg->yyin_r +#define yyout yyg->yyout_r +#define yyextra yyg->yyextra_r +#define yyleng yyg->yyleng_r +#define yytext yyg->yytext_r +#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) +#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) +#define yy_flex_debug yyg->yy_flex_debug_r + +int gfsmRegex_yylex_init (yyscan_t* scanner); + +/* Enter a start condition. This macro really ought to take a parameter, + * but we do it the disgusting crufty way forced on us by the ()-less + * definition of BEGIN. + */ +#define BEGIN yyg->yy_start = 1 + 2 * + +/* Translate the current start state into a value that can be later handed + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. + */ +#define YY_START ((yyg->yy_start - 1) / 2) +#define YYSTATE YY_START + +/* Action number for EOF rule of a given start state. */ +#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + +/* Special action meaning "start processing a new file". */ +#define YY_NEW_FILE gfsmRegex_yyrestart(yyin ,yyscanner ) + +#define YY_END_OF_BUFFER_CHAR 0 + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#define EOB_ACT_CONTINUE_SCAN 0 +#define EOB_ACT_END_OF_FILE 1 +#define EOB_ACT_LAST_MATCH 2 + + /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires + * access to the local variable yy_act. Since yyless() is a macro, it would break + * existing scanners that call yyless() from OUTSIDE gfsmRegex_yylex. + * One obvious solution it to make yy_act a global. I tried that, and saw + * a 5% performance hit in a non-yylineno scanner, because yy_act is + * normally declared as a register variable-- so it is not worth it. + */ + #define YY_LESS_LINENO(n) \ + do { \ + int yyl;\ + for ( yyl = n; yyl < yyleng; ++yyl )\ + if ( yytext[yyl] == '\n' )\ + --yylineno;\ + }while(0) + +/* Return all but the first "n" matched characters back to the input stream. */ +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = yyg->yy_hold_char; \ + YY_RESTORE_YY_MORE_OFFSET \ + yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + } \ + while ( 0 ) + +#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) + +/* The following is because we cannot portably get our hands on size_t + * (without autoconf's help, which isn't available because we want + * flex-generated scanners to compile on their own). + */ + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef unsigned int yy_size_t; +#endif + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + int yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + +#define YY_BUFFER_NEW 0 +#define YY_BUFFER_NORMAL 1 + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via gfsmRegex_yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ +#define YY_BUFFER_EOF_PENDING 2 + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +/* We provide macros for accessing buffer states in case in the + * future we want to put the buffer states in a more general + * "scanner state". + * + * Returns the top of the stack, or NULL. + */ +#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ + ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ + : NULL) + +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] + +void gfsmRegex_yyrestart (FILE *input_file ,yyscan_t yyscanner ); +void gfsmRegex_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE gfsmRegex_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void gfsmRegex_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void gfsmRegex_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void gfsmRegex_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +void gfsmRegex_yypop_buffer_state (yyscan_t yyscanner ); + +static void gfsmRegex_yyensure_buffer_stack (yyscan_t yyscanner ); +static void gfsmRegex_yy_load_buffer_state (yyscan_t yyscanner ); +static void gfsmRegex_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); + +#define YY_FLUSH_BUFFER gfsmRegex_yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) + +YY_BUFFER_STATE gfsmRegex_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE gfsmRegex_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE gfsmRegex_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); + +void *gfsmRegex_yyalloc (yy_size_t ,yyscan_t yyscanner ); +void *gfsmRegex_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); +void gfsmRegex_yyfree (void * ,yyscan_t yyscanner ); + +#define yy_new_buffer gfsmRegex_yy_create_buffer + +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + gfsmRegex_yyensure_buffer_stack (yyscanner); \ + YY_CURRENT_BUFFER_LVALUE = \ + gfsmRegex_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! YY_CURRENT_BUFFER ){\ + gfsmRegex_yyensure_buffer_stack (yyscanner); \ + YY_CURRENT_BUFFER_LVALUE = \ + gfsmRegex_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +/* Begin user sect3 */ + +typedef unsigned char YY_CHAR; + +typedef int yy_state_type; + +#define yytext_ptr yytext_r + +static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); +static int yy_get_next_buffer (yyscan_t yyscanner ); +static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); + +/* Done after the current pattern has been matched and before the + * corresponding action - sets up yytext. + */ +#define YY_DO_BEFORE_ACTION \ + yyg->yytext_ptr = yy_bp; \ + yyleng = (size_t) (yy_cp - yy_bp); \ + yyg->yy_hold_char = *yy_cp; \ + *yy_cp = '\0'; \ + yyg->yy_c_buf_p = yy_cp; + +#define YY_NUM_RULES 39 +#define YY_END_OF_BUFFER 40 +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[85] = + { 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 40, 22, 21, 21, + 21, 12, 3, 18, 19, 14, 6, 7, 8, 9, + 17, 15, 5, 11, 16, 4, 2, 10, 13, 20, + 22, 27, 39, 30, 32, 32, 30, 31, 33, 29, + 30, 38, 36, 35, 34, 37, 38, 26, 38, 38, + 23, 24, 25, 1, 1, 30, 32, 31, 29, 30, + 31, 28, 28, 28, 0, 26, 0, 23, 23, 0, + 25, 0, 23, 0 + } ; + +static yyconst flex_int32_t yy_ec[256] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 4, 4, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 5, 6, 1, 7, 8, 9, 10, 1, 11, + 12, 13, 14, 1, 15, 16, 1, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 18, 1, 19, + 20, 21, 22, 23, 1, 1, 1, 1, 24, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 25, 26, 27, 28, 1, 1, 1, 1, 1, 1, + + 24, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 29, 1, 30, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 31, 1, 1, 1, 1, 1, + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + } ; + +static yyconst flex_int32_t yy_meta[32] = + { 0, + 1, 2, 3, 4, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 1, 1, 1, 1, 1, 5, 2, 1, 1, 1, + 1 + } ; + +static yyconst flex_int16_t yy_base[95] = + { 0, + 0, 0, 109, 106, 30, 60, 33, 39, 105, 104, + 99, 98, 89, 108, 34, 37, 100, 263, 263, 263, + 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, + 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, + 68, 263, 263, 0, 19, 21, 128, 65, 263, 263, + 154, 263, 263, 263, 263, 263, 95, 263, 55, 76, + 57, 263, 73, 263, 48, 0, 0, 73, 263, 0, + 80, 0, 263, 184, 55, 263, 38, 72, 28, 80, + 32, 30, 26, 263, 215, 220, 225, 230, 235, 240, + 245, 248, 252, 257 + + } ; + +static yyconst flex_int16_t yy_def[95] = + { 0, + 84, 1, 85, 85, 86, 86, 87, 87, 88, 88, + 89, 89, 87, 87, 87, 87, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 90, 84, 84, 91, 92, 92, 91, 84, 84, 84, + 93, 84, 84, 84, 84, 84, 94, 84, 84, 84, + 84, 84, 84, 84, 90, 91, 46, 84, 84, 47, + 84, 91, 84, 93, 94, 84, 84, 84, 84, 84, + 84, 84, 84, 0, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84 + + } ; + +static yyconst flex_int16_t yy_nxt[295] = + { 0, + 18, 19, 20, 21, 19, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 18, 18, 32, 33, 18, + 18, 34, 35, 18, 36, 37, 18, 38, 39, 40, + 41, 45, 46, 47, 45, 43, 43, 53, 68, 43, + 68, 43, 83, 53, 79, 69, 83, 69, 81, 48, + 63, 80, 54, 63, 79, 49, 50, 76, 54, 55, + 51, 45, 46, 47, 45, 55, 71, 71, 71, 71, + 77, 78, 77, 78, 71, 71, 71, 71, 65, 48, + 80, 71, 71, 71, 71, 49, 50, 77, 78, 81, + 51, 43, 79, 82, 82, 80, 83, 76, 65, 84, + + 58, 58, 59, 59, 60, 61, 43, 43, 43, 62, + 43, 43, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 59, 59, 60, 61, 84, 84, 84, 62, 67, + 67, 70, 67, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 68, 84, 84, + 84, 84, 84, 84, 69, 73, 84, 84, 73, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 73, 84, 84, 84, 84, 84, 73, + 73, 84, 84, 84, 74, 73, 84, 84, 73, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + + 84, 84, 84, 73, 84, 84, 84, 84, 84, 73, + 73, 84, 84, 84, 74, 42, 42, 42, 42, 42, + 44, 44, 44, 44, 44, 52, 52, 52, 52, 52, + 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, + 64, 64, 84, 64, 64, 66, 84, 84, 66, 67, + 67, 67, 72, 72, 84, 72, 72, 75, 75, 75, + 75, 75, 17, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84 + + } ; + +static yyconst flex_int16_t yy_chk[295] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 5, 5, 5, 5, 7, 15, 7, 45, 16, + 46, 8, 83, 8, 79, 45, 82, 46, 81, 5, + 15, 79, 7, 16, 77, 5, 5, 75, 8, 7, + 5, 6, 6, 6, 6, 8, 48, 48, 48, 48, + 59, 59, 61, 61, 68, 68, 68, 68, 65, 6, + 61, 71, 71, 71, 71, 6, 6, 78, 78, 63, + 6, 13, 60, 80, 80, 78, 80, 57, 41, 17, + + 12, 11, 13, 13, 13, 13, 10, 9, 4, 13, + 14, 3, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 14, 14, 14, 14, 0, 0, 0, 14, 47, + 47, 47, 47, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, + 0, 0, 0, 0, 47, 51, 0, 0, 51, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 51, 0, 0, 0, 0, 0, 51, + 51, 0, 0, 0, 51, 74, 0, 0, 74, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 74, 0, 0, 0, 0, 0, 74, + 74, 0, 0, 0, 74, 85, 85, 85, 85, 85, + 86, 86, 86, 86, 86, 87, 87, 87, 87, 87, + 88, 88, 88, 88, 88, 89, 89, 89, 89, 89, + 90, 90, 0, 90, 90, 91, 0, 0, 91, 92, + 92, 92, 93, 93, 0, 93, 93, 94, 94, 94, + 94, 94, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84 + + } ; + +/* Table of booleans, true if rule could match eol. */ +static yyconst flex_int32_t yy_rule_can_match_eol[40] = + { 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, + }; + +/* The intent behind this definition is that it'll catch + * any uses of REJECT which flex missed. + */ +#define REJECT reject_used_but_not_detected +#define yymore() yymore_used_but_not_detected +#define YY_MORE_ADJ 0 +#define YY_RESTORE_YY_MORE_OFFSET +#line 1 "gfsmRegex.lex.l" +/*====================================================================== + * Flex Options + */ +/*%option outfile="gfsmRegex.lex.c"*/ +#line 15 "gfsmRegex.lex.l" +/*====================================================================== + * User C Header + */ + +#include <gfsmMem.h> +#include <gfsmRegexCompiler.h> + +#include "gfsmRegex.tab.h" + +#define my_compiler ((gfsmRegexCompiler*)yyextra) +#define my_gstr (my_compiler->gstr) +#define my_abet (my_compiler->abet) + +/*====================================================================== + * Flex Definitions + */ + + + + + + + +/*====================================================================== + * Rules + */ +#line 581 "gfsmRegex.lex.c" + +#define INITIAL 0 +#define STATE_ESCAPE 1 +#define STATE_BRACKETED 2 +#define STATE_BRACKETED_SEP 3 +#define STATE_BRACKETED_ESCAPE 4 +#define STATE_COMMENT 5 +#define STATE_WEIGHT 6 +#define STATE_UINT 7 + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include <unistd.h> +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +/* Holds the entire state of the reentrant scanner. */ +struct yyguts_t + { + + /* User-defined. Not touched by flex. */ + YY_EXTRA_TYPE yyextra_r; + + /* The rest are the same as the globals declared in the non-reentrant scanner. */ + FILE *yyin_r, *yyout_r; + size_t yy_buffer_stack_top; /**< index of top of stack. */ + size_t yy_buffer_stack_max; /**< capacity of stack. */ + YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ + char yy_hold_char; + int yy_n_chars; + int yyleng_r; + char *yy_c_buf_p; + int yy_init; + int yy_start; + int yy_did_buffer_switch_on_eof; + int yy_start_stack_ptr; + int yy_start_stack_depth; + int *yy_start_stack; + yy_state_type yy_last_accepting_state; + char* yy_last_accepting_cpos; + + int yylineno_r; + int yy_flex_debug_r; + + char *yytext_r; + int yy_more_flag; + int yy_more_len; + + YYSTYPE * yylval_r; + + }; /* end struct yyguts_t */ + +static int yy_init_globals (yyscan_t yyscanner ); + + /* This must go here because YYSTYPE and YYLTYPE are included + * from bison output in section 1.*/ + # define yylval yyg->yylval_r + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int gfsmRegex_yylex_destroy (yyscan_t yyscanner ); + +int gfsmRegex_yyget_debug (yyscan_t yyscanner ); + +void gfsmRegex_yyset_debug (int debug_flag ,yyscan_t yyscanner ); + +YY_EXTRA_TYPE gfsmRegex_yyget_extra (yyscan_t yyscanner ); + +void gfsmRegex_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); + +FILE *gfsmRegex_yyget_in (yyscan_t yyscanner ); + +void gfsmRegex_yyset_in (FILE * in_str ,yyscan_t yyscanner ); + +FILE *gfsmRegex_yyget_out (yyscan_t yyscanner ); + +void gfsmRegex_yyset_out (FILE * out_str ,yyscan_t yyscanner ); + +int gfsmRegex_yyget_leng (yyscan_t yyscanner ); + +char *gfsmRegex_yyget_text (yyscan_t yyscanner ); + +int gfsmRegex_yyget_lineno (yyscan_t yyscanner ); + +void gfsmRegex_yyset_lineno (int line_number ,yyscan_t yyscanner ); + +YYSTYPE * gfsmRegex_yyget_lval (yyscan_t yyscanner ); + +void gfsmRegex_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int gfsmRegex_yywrap (yyscan_t yyscanner ); +#else +extern int gfsmRegex_yywrap (yyscan_t yyscanner ); +#endif +#endif + + static void yyunput (int c,char *buf_ptr ,yyscan_t yyscanner); + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +#endif + +#ifndef YY_NO_INPUT + +#ifdef __cplusplus +static int yyinput (yyscan_t yyscanner ); +#else +static int input (yyscan_t yyscanner ); +#endif + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Copy whatever the last rule matched to the standard output. */ +#ifndef ECHO +/* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). + */ +#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#endif + +/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, + * is returned in "result". + */ +#ifndef YY_INPUT +#define YY_INPUT(buf,result,max_size) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ + size_t n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ + } \ + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + }\ +\ + +#endif + +/* No semi-colon after return; correct usage is to write "yyterminate();" - + * we don't want an extra ';' after the "return" because that will cause + * some compilers to complain about unreachable statements. + */ +#ifndef yyterminate +#define yyterminate() return YY_NULL +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Report a fatal error. */ +#ifndef YY_FATAL_ERROR +#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) +#endif + +/* end tables serialization structures and prototypes */ + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int gfsmRegex_yylex \ + (YYSTYPE * yylval_param ,yyscan_t yyscanner); + +#define YY_DECL int gfsmRegex_yylex \ + (YYSTYPE * yylval_param , yyscan_t yyscanner) +#endif /* !YY_DECL */ + +/* Code executed at the beginning of each rule, after yytext and yyleng + * have been set up. + */ +#ifndef YY_USER_ACTION +#define YY_USER_ACTION +#endif + +/* Code executed at the end of each rule. */ +#ifndef YY_BREAK +#define YY_BREAK break; +#endif + +#define YY_RULE_SETUP \ + YY_USER_ACTION + +/** The main scanner function which does all the work. + */ +YY_DECL +{ + register yy_state_type yy_current_state; + register char *yy_cp, *yy_bp; + register int yy_act; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + +#line 51 "gfsmRegex.lex.l" + + +#line 820 "gfsmRegex.lex.c" + + yylval = yylval_param; + + if ( !yyg->yy_init ) + { + yyg->yy_init = 1; + +#ifdef YY_USER_INIT + YY_USER_INIT; +#endif + + if ( ! yyg->yy_start ) + yyg->yy_start = 1; /* first start state */ + + if ( ! yyin ) + yyin = stdin; + + if ( ! yyout ) + yyout = stdout; + + if ( ! YY_CURRENT_BUFFER ) { + gfsmRegex_yyensure_buffer_stack (yyscanner); + YY_CURRENT_BUFFER_LVALUE = + gfsmRegex_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + } + + gfsmRegex_yy_load_buffer_state(yyscanner ); + } + + while ( 1 ) /* loops until end-of-file is reached */ + { + yy_cp = yyg->yy_c_buf_p; + + /* Support of yytext. */ + *yy_cp = yyg->yy_hold_char; + + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; + + yy_current_state = yyg->yy_start; +yy_match: + do + { + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; + yyg->yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 85 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + ++yy_cp; + } + while ( yy_base[yy_current_state] != 263 ); + +yy_find_action: + yy_act = yy_accept[yy_current_state]; + if ( yy_act == 0 ) + { /* have to back up */ + yy_cp = yyg->yy_last_accepting_cpos; + yy_current_state = yyg->yy_last_accepting_state; + yy_act = yy_accept[yy_current_state]; + } + + YY_DO_BEFORE_ACTION; + + if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) + { + int yyl; + for ( yyl = 0; yyl < yyleng; ++yyl ) + if ( yytext[yyl] == '\n' ) + + do{ yylineno++; + yycolumn=0; + }while(0) +; + } + +do_action: /* This label is used only to access EOF actions. */ + + switch ( yy_act ) + { /* beginning of action switch */ + case 0: /* must back up */ + /* undo the effects of YY_DO_BEFORE_ACTION */ + *yy_cp = yyg->yy_hold_char; + yy_cp = yyg->yy_last_accepting_cpos; + yy_current_state = yyg->yy_last_accepting_state; + goto yy_find_action; + +case 1: +YY_RULE_SETUP +#line 53 "gfsmRegex.lex.l" +{ + yylval->gs = gfsm_gstring_new_bytes(yytext,yyleng); + return TOK_STRING; +} + YY_BREAK +case 2: +YY_RULE_SETUP +#line 58 "gfsmRegex.lex.l" +{ BEGIN(STATE_ESCAPE); } + YY_BREAK +case 3: +YY_RULE_SETUP +#line 60 "gfsmRegex.lex.l" +{ BEGIN(STATE_COMMENT); } + YY_BREAK +case 4: +YY_RULE_SETUP +#line 62 "gfsmRegex.lex.l" +{ + BEGIN(STATE_BRACKETED); + return '['; +} + YY_BREAK +case 5: +YY_RULE_SETUP +#line 67 "gfsmRegex.lex.l" +{ BEGIN(STATE_WEIGHT); return '<'; } + YY_BREAK +case 6: +YY_RULE_SETUP +#line 69 "gfsmRegex.lex.l" +{ return '('; } + YY_BREAK +case 7: +YY_RULE_SETUP +#line 70 "gfsmRegex.lex.l" +{ return ')'; } + YY_BREAK +case 8: +YY_RULE_SETUP +#line 72 "gfsmRegex.lex.l" +{ return '*'; } + YY_BREAK +case 9: +YY_RULE_SETUP +#line 73 "gfsmRegex.lex.l" +{ return '+'; } + YY_BREAK +case 10: +YY_RULE_SETUP +#line 74 "gfsmRegex.lex.l" +{ BEGIN(STATE_UINT); return '|'; } + YY_BREAK +case 11: +YY_RULE_SETUP +#line 75 "gfsmRegex.lex.l" +{ return '?'; } + YY_BREAK +case 12: +YY_RULE_SETUP +#line 76 "gfsmRegex.lex.l" +{ return '!'; } + YY_BREAK +case 13: +YY_RULE_SETUP +#line 77 "gfsmRegex.lex.l" +{ return '|'; } + YY_BREAK +case 14: +YY_RULE_SETUP +#line 78 "gfsmRegex.lex.l" +{ return '&'; } + YY_BREAK +case 15: +YY_RULE_SETUP +#line 79 "gfsmRegex.lex.l" +{ return ':'; } + YY_BREAK +case 16: +YY_RULE_SETUP +#line 80 "gfsmRegex.lex.l" +{ return '@'; } + YY_BREAK +case 17: +YY_RULE_SETUP +#line 81 "gfsmRegex.lex.l" +{ return '-'; /*"/1"{return PROJ1;}*/ /*"/2"{return PROJ2;}*/ } + YY_BREAK +case 18: +YY_RULE_SETUP +#line 83 "gfsmRegex.lex.l" +{ return '$'; /* non-AT&T: determinize */ } + YY_BREAK +case 19: +YY_RULE_SETUP +#line 84 "gfsmRegex.lex.l" +{ return '%'; /* non-AT&T: rmepsilon */ } + YY_BREAK +case 20: +YY_RULE_SETUP +#line 85 "gfsmRegex.lex.l" +{ return '~'; /* non-AT&T: connect */ } + YY_BREAK +case 21: +/* rule 21 can match eol */ +YY_RULE_SETUP +#line 87 "gfsmRegex.lex.l" +{ /* ignore */ } + YY_BREAK +case 22: +YY_RULE_SETUP +#line 89 "gfsmRegex.lex.l" +{ + yylval->c = yytext[0]; + return TOK_CHAR; +} + YY_BREAK +case 23: +YY_RULE_SETUP +#line 96 "gfsmRegex.lex.l" +{ + yylval->w = strtod(yytext,NULL); + return TOK_WEIGHT; +} + YY_BREAK +case 24: +YY_RULE_SETUP +#line 101 "gfsmRegex.lex.l" +{ + BEGIN(INITIAL); + return '>'; +} + YY_BREAK +case 25: +YY_RULE_SETUP +#line 108 "gfsmRegex.lex.l" +{ + BEGIN(INITIAL); + yylval->u = strtol(yytext,NULL,0); + return TOK_UINT; +} + YY_BREAK +case 26: +/* rule 26 can match eol */ +YY_RULE_SETUP +#line 115 "gfsmRegex.lex.l" +{ BEGIN(INITIAL); /* ignore comments */ } + YY_BREAK +case 27: +YY_RULE_SETUP +#line 120 "gfsmRegex.lex.l" +{ + BEGIN(INITIAL); + yylval->c = yytext[0]; + return TOK_CHAR; +} + YY_BREAK +case 28: +YY_RULE_SETUP +#line 127 "gfsmRegex.lex.l" +{ + g_string_append_len(my_gstr,yytext,yyleng); +} + YY_BREAK +case 29: +/* rule 29 can match eol */ +YY_RULE_SETUP +#line 130 "gfsmRegex.lex.l" +{ + unput(']'); + BEGIN(STATE_BRACKETED_SEP); + if (my_gstr->len) { + yylval->gs = gfsm_gstring_dup(my_gstr); + return TOK_STRING; + } +} + YY_BREAK +case 30: +YY_RULE_SETUP +#line 138 "gfsmRegex.lex.l" +{ + g_string_append(my_gstr, yytext); +} + YY_BREAK +case 31: +/* rule 31 can match eol */ +YY_RULE_SETUP +#line 141 "gfsmRegex.lex.l" +{ + unput('='); + BEGIN(STATE_BRACKETED_SEP); + if (my_gstr->len) { + yylval->gs = gfsm_gstring_dup(my_gstr); + return TOK_STRING; + } +} + YY_BREAK +case 32: +/* rule 32 can match eol */ +YY_RULE_SETUP +#line 149 "gfsmRegex.lex.l" +{ + unput(' '); + BEGIN(STATE_BRACKETED_SEP); + if (my_gstr->len) { + yylval->gs = gfsm_gstring_dup(my_gstr); + return TOK_STRING; + } +} + YY_BREAK +case 33: +YY_RULE_SETUP +#line 157 "gfsmRegex.lex.l" +{ + BEGIN(STATE_BRACKETED_ESCAPE); +} + YY_BREAK +case 34: +YY_RULE_SETUP +#line 162 "gfsmRegex.lex.l" +{ + BEGIN(INITIAL); + if (my_gstr->len) { + g_string_truncate(my_gstr,0); + return ']'; + } +} + YY_BREAK +case 35: +YY_RULE_SETUP +#line 169 "gfsmRegex.lex.l" +{ + BEGIN(STATE_BRACKETED); + g_string_truncate(my_gstr,0); + return '='; +} + YY_BREAK +case 36: +YY_RULE_SETUP +#line 174 "gfsmRegex.lex.l" +{ + BEGIN(STATE_BRACKETED); + if (my_gstr->len) { + g_string_truncate(my_gstr,0); + return ' '; + } +} + YY_BREAK +case 37: +YY_RULE_SETUP +#line 183 "gfsmRegex.lex.l" +{ + BEGIN(STATE_BRACKETED); + g_string_append_c(my_gstr, yytext[0]); +} + YY_BREAK +case 38: +YY_RULE_SETUP +#line 190 "gfsmRegex.lex.l" +{ + gfsm_scanner_carp(yyextra, "bad character '%s'", yytext); + return TOK_UNKNOWN; +} + YY_BREAK +case 39: +YY_RULE_SETUP +#line 195 "gfsmRegex.lex.l" +ECHO; + YY_BREAK +#line 1189 "gfsmRegex.lex.c" +case YY_STATE_EOF(INITIAL): +case YY_STATE_EOF(STATE_ESCAPE): +case YY_STATE_EOF(STATE_BRACKETED): +case YY_STATE_EOF(STATE_BRACKETED_SEP): +case YY_STATE_EOF(STATE_BRACKETED_ESCAPE): +case YY_STATE_EOF(STATE_COMMENT): +case YY_STATE_EOF(STATE_WEIGHT): +case YY_STATE_EOF(STATE_UINT): + yyterminate(); + + case YY_END_OF_BUFFER: + { + /* Amount of text matched not including the EOB char. */ + int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1; + + /* Undo the effects of YY_DO_BEFORE_ACTION. */ + *yy_cp = yyg->yy_hold_char; + YY_RESTORE_YY_MORE_OFFSET + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + { + /* We're scanning a new file or input source. It's + * possible that this happened because the user + * just pointed yyin at a new source and called + * gfsmRegex_yylex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our + * globals. Here is the right place to do so, because + * this is the first action (other than possibly a + * back-up) that will match for the new input source. + */ + yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + } + + /* Note that here we test for yy_c_buf_p "<=" to the position + * of the first EOB in the buffer, since yy_c_buf_p will + * already have been incremented past the NUL character + * (since all states make transitions on EOB to the + * end-of-buffer state). Contrast this with the test + * in input(). + */ + if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) + { /* This was really a NUL. */ + yy_state_type yy_next_state; + + yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( yyscanner ); + + /* Okay, we're now positioned to make the NUL + * transition. We couldn't have + * yy_get_previous_state() go ahead and do it + * for us because it doesn't know how to deal + * with the possibility of jamming (and we don't + * want to build jamming into it because then it + * will run more slowly). + */ + + yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner); + + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + + if ( yy_next_state ) + { + /* Consume the NUL. */ + yy_cp = ++yyg->yy_c_buf_p; + yy_current_state = yy_next_state; + goto yy_match; + } + + else + { + yy_cp = yyg->yy_c_buf_p; + goto yy_find_action; + } + } + + else switch ( yy_get_next_buffer( yyscanner ) ) + { + case EOB_ACT_END_OF_FILE: + { + yyg->yy_did_buffer_switch_on_eof = 0; + + if ( gfsmRegex_yywrap(yyscanner ) ) + { + /* Note: because we've taken care in + * yy_get_next_buffer() to have set up + * yytext, we can now set up + * yy_c_buf_p so that if some total + * hoser (like flex itself) wants to + * call the scanner after we return the + * YY_NULL, it'll still work - another + * YY_NULL will get returned. + */ + yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ; + + yy_act = YY_STATE_EOF(YY_START); + goto do_action; + } + + else + { + if ( ! yyg->yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; + } + break; + } + + case EOB_ACT_CONTINUE_SCAN: + yyg->yy_c_buf_p = + yyg->yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( yyscanner ); + + yy_cp = yyg->yy_c_buf_p; + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + goto yy_match; + + case EOB_ACT_LAST_MATCH: + yyg->yy_c_buf_p = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]; + + yy_current_state = yy_get_previous_state( yyscanner ); + + yy_cp = yyg->yy_c_buf_p; + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + goto yy_find_action; + } + break; + } + + default: + YY_FATAL_ERROR( + "fatal flex scanner internal error--no action found" ); + } /* end of action switch */ + } /* end of scanning one token */ +} /* end of gfsmRegex_yylex */ + +/* yy_get_next_buffer - try to read in a new buffer + * + * Returns a code representing an action: + * EOB_ACT_LAST_MATCH - + * EOB_ACT_CONTINUE_SCAN - continue scanning from current position + * EOB_ACT_END_OF_FILE - end of file + */ +static int yy_get_next_buffer (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = yyg->yytext_ptr; + register int number_to_move, i; + int ret_val; + + if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) + YY_FATAL_ERROR( + "fatal flex scanner internal error--end of buffer missed" ); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + { /* Don't try to fill the buffer, so this is an EOF. */ + if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) + { + /* We matched a single character, the EOB, so + * treat this as a final EOF. + */ + return EOB_ACT_END_OF_FILE; + } + + else + { + /* We matched some text prior to the EOB, first + * process it. + */ + return EOB_ACT_LAST_MATCH; + } + } + + /* Try to read more data. */ + + /* First move last chars to start of buffer. */ + number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; + + for ( i = 0; i < number_to_move; ++i ) + *(dest++) = *(source++); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + /* don't do the read, it's not guaranteed to return an EOF, + * just force an EOF + */ + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0; + + else + { + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + + while ( num_to_read <= 0 ) + { /* Not enough room in the buffer - grow it. */ + + /* just a shorter name for the current buffer */ + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + + int yy_c_buf_p_offset = + (int) (yyg->yy_c_buf_p - b->yy_ch_buf); + + if ( b->yy_is_our_buffer ) + { + int new_size = b->yy_buf_size * 2; + + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; + + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + gfsmRegex_yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; + + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( + "fatal error - scanner input buffer overflow" ); + + yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + number_to_move - 1; + + } + + if ( num_to_read > YY_READ_BUF_SIZE ) + num_to_read = YY_READ_BUF_SIZE; + + /* Read in more data. */ + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + yyg->yy_n_chars, (size_t) num_to_read ); + + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + if ( yyg->yy_n_chars == 0 ) + { + if ( number_to_move == YY_MORE_ADJ ) + { + ret_val = EOB_ACT_END_OF_FILE; + gfsmRegex_yyrestart(yyin ,yyscanner); + } + + else + { + ret_val = EOB_ACT_LAST_MATCH; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + YY_BUFFER_EOF_PENDING; + } + } + + else + ret_val = EOB_ACT_CONTINUE_SCAN; + + yyg->yy_n_chars += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + + yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + + return ret_val; +} + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + + static yy_state_type yy_get_previous_state (yyscan_t yyscanner) +{ + register yy_state_type yy_current_state; + register char *yy_cp; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + yy_current_state = yyg->yy_start; + + for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) + { + register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; + yyg->yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 85 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + } + + return yy_current_state; +} + +/* yy_try_NUL_trans - try to make a transition on the NUL character + * + * synopsis + * next_state = yy_try_NUL_trans( current_state ); + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) +{ + register int yy_is_jam; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ + register char *yy_cp = yyg->yy_c_buf_p; + + register YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; + yyg->yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 85 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_is_jam = (yy_current_state == 84); + + return yy_is_jam ? 0 : yy_current_state; +} + + static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner) +{ + register char *yy_cp; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + yy_cp = yyg->yy_c_buf_p; + + /* undo effects of setting up yytext */ + *yy_cp = yyg->yy_hold_char; + + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ + register int number_to_move = yyg->yy_n_chars + 2; + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; + register char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + *--dest = *--source; + + yy_cp += (int) (dest - source); + yy_bp += (int) (dest - source); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + YY_FATAL_ERROR( "flex scanner push-back overflow" ); + } + + *--yy_cp = (char) c; + + if ( c == '\n' ){ + --yylineno; + } + + yyg->yytext_ptr = yy_bp; + yyg->yy_hold_char = *yy_cp; + yyg->yy_c_buf_p = yy_cp; +} + +#ifndef YY_NO_INPUT +#ifdef __cplusplus + static int yyinput (yyscan_t yyscanner) +#else + static int input (yyscan_t yyscanner) +#endif + +{ + int c; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + *yyg->yy_c_buf_p = yyg->yy_hold_char; + + if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + { + /* yy_c_buf_p now points to the character we want to return. + * If this occurs *before* the EOB characters, then it's a + * valid NUL; if not, then we've hit the end of the buffer. + */ + if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) + /* This was really a NUL. */ + *yyg->yy_c_buf_p = '\0'; + + else + { /* need more input */ + int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + ++yyg->yy_c_buf_p; + + switch ( yy_get_next_buffer( yyscanner ) ) + { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + gfsmRegex_yyrestart(yyin ,yyscanner); + + /*FALLTHROUGH*/ + + case EOB_ACT_END_OF_FILE: + { + if ( gfsmRegex_yywrap(yyscanner ) ) + return EOF; + + if ( ! yyg->yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; +#ifdef __cplusplus + return yyinput(yyscanner); +#else + return input(yyscanner); +#endif + } + + case EOB_ACT_CONTINUE_SCAN: + yyg->yy_c_buf_p = yyg->yytext_ptr + offset; + break; + } + } + } + + c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */ + *yyg->yy_c_buf_p = '\0'; /* preserve yytext */ + yyg->yy_hold_char = *++yyg->yy_c_buf_p; + + if ( c == '\n' ) + + do{ yylineno++; + yycolumn=0; + }while(0) +; + + return c; +} +#endif /* ifndef YY_NO_INPUT */ + +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * @param yyscanner The scanner object. + * @note This function does not reset the start condition to @c INITIAL . + */ + void gfsmRegex_yyrestart (FILE * input_file , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if ( ! YY_CURRENT_BUFFER ){ + gfsmRegex_yyensure_buffer_stack (yyscanner); + YY_CURRENT_BUFFER_LVALUE = + gfsmRegex_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + } + + gfsmRegex_yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); + gfsmRegex_yy_load_buffer_state(yyscanner ); +} + +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * @param yyscanner The scanner object. + */ + void gfsmRegex_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* TODO. We should be able to replace this entire function body + * with + * gfsmRegex_yypop_buffer_state(); + * gfsmRegex_yypush_buffer_state(new_buffer); + */ + gfsmRegex_yyensure_buffer_stack (yyscanner); + if ( YY_CURRENT_BUFFER == new_buffer ) + return; + + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *yyg->yy_c_buf_p = yyg->yy_hold_char; + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + YY_CURRENT_BUFFER_LVALUE = new_buffer; + gfsmRegex_yy_load_buffer_state(yyscanner ); + + /* We don't actually know whether we did this switch during + * EOF (gfsmRegex_yywrap()) processing, but the only time this flag + * is looked at is after gfsmRegex_yywrap() is called, so it's safe + * to go ahead and always set it. + */ + yyg->yy_did_buffer_switch_on_eof = 1; +} + +static void gfsmRegex_yy_load_buffer_state (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + yyg->yy_hold_char = *yyg->yy_c_buf_p; +} + +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * @param yyscanner The scanner object. + * @return the allocated buffer state. + */ + YY_BUFFER_STATE gfsmRegex_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + + b = (YY_BUFFER_STATE) gfsmRegex_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in gfsmRegex_yy_create_buffer()" ); + + b->yy_buf_size = size; + + /* yy_ch_buf has to be 2 characters longer than the size given because + * we need to put in 2 end-of-buffer characters. + */ + b->yy_ch_buf = (char *) gfsmRegex_yyalloc(b->yy_buf_size + 2 ,yyscanner ); + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in gfsmRegex_yy_create_buffer()" ); + + b->yy_is_our_buffer = 1; + + gfsmRegex_yy_init_buffer(b,file ,yyscanner); + + return b; +} + +/** Destroy the buffer. + * @param b a buffer created with gfsmRegex_yy_create_buffer() + * @param yyscanner The scanner object. + */ + void gfsmRegex_yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if ( ! b ) + return; + + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + + if ( b->yy_is_our_buffer ) + gfsmRegex_yyfree((void *) b->yy_ch_buf ,yyscanner ); + + gfsmRegex_yyfree((void *) b ,yyscanner ); +} + +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a gfsmRegex_yyrestart() or at EOF. + */ + static void gfsmRegex_yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + +{ + int oerrno = errno; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + gfsmRegex_yy_flush_buffer(b ,yyscanner); + + b->yy_input_file = file; + b->yy_fill_buffer = 1; + + /* If b is the current buffer, then gfsmRegex_yy_init_buffer was _probably_ + * called from gfsmRegex_yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } + + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} + +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * @param yyscanner The scanner object. + */ + void gfsmRegex_yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if ( ! b ) + return; + + b->yy_n_chars = 0; + + /* We always need two end-of-buffer characters. The first causes + * a transition to the end-of-buffer state. The second causes + * a jam in that state. + */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; + b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; + + b->yy_buf_pos = &b->yy_ch_buf[0]; + + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; + + if ( b == YY_CURRENT_BUFFER ) + gfsmRegex_yy_load_buffer_state(yyscanner ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * @param yyscanner The scanner object. + */ +void gfsmRegex_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if (new_buffer == NULL) + return; + + gfsmRegex_yyensure_buffer_stack(yyscanner); + + /* This block is copied from gfsmRegex_yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *yyg->yy_c_buf_p = yyg->yy_hold_char; + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + yyg->yy_buffer_stack_top++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from gfsmRegex_yy_switch_to_buffer. */ + gfsmRegex_yy_load_buffer_state(yyscanner ); + yyg->yy_did_buffer_switch_on_eof = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * @param yyscanner The scanner object. + */ +void gfsmRegex_yypop_buffer_state (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if (!YY_CURRENT_BUFFER) + return; + + gfsmRegex_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + YY_CURRENT_BUFFER_LVALUE = NULL; + if (yyg->yy_buffer_stack_top > 0) + --yyg->yy_buffer_stack_top; + + if (YY_CURRENT_BUFFER) { + gfsmRegex_yy_load_buffer_state(yyscanner ); + yyg->yy_did_buffer_switch_on_eof = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void gfsmRegex_yyensure_buffer_stack (yyscan_t yyscanner) +{ + int num_to_alloc; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (!yyg->yy_buffer_stack) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + yyg->yy_buffer_stack = (struct yy_buffer_state**)gfsmRegex_yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + , yyscanner); + + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + yyg->yy_buffer_stack_max = num_to_alloc; + yyg->yy_buffer_stack_top = 0; + return; + } + + if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ + + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = yyg->yy_buffer_stack_max + grow_size; + yyg->yy_buffer_stack = (struct yy_buffer_state**)gfsmRegex_yyrealloc + (yyg->yy_buffer_stack, + num_to_alloc * sizeof(struct yy_buffer_state*) + , yyscanner); + + /* zero only the new slots.*/ + memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); + yyg->yy_buffer_stack_max = num_to_alloc; + } +} + +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE gfsmRegex_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + + b = (YY_BUFFER_STATE) gfsmRegex_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in gfsmRegex_yy_scan_buffer()" ); + + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; + b->yy_buffer_status = YY_BUFFER_NEW; + + gfsmRegex_yy_switch_to_buffer(b ,yyscanner ); + + return b; +} + +/** Setup the input buffer state to scan a string. The next call to gfsmRegex_yylex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * gfsmRegex_yy_scan_bytes() instead. + */ +YY_BUFFER_STATE gfsmRegex_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) +{ + + return gfsmRegex_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); +} + +/** Setup the input buffer state to scan the given bytes. The next call to gfsmRegex_yylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE gfsmRegex_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + char *buf; + yy_size_t n; + int i; + + /* Get memory for full buffer, including space for trailing EOB's. */ + n = _yybytes_len + 2; + buf = (char *) gfsmRegex_yyalloc(n ,yyscanner ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in gfsmRegex_yy_scan_bytes()" ); + + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; + + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + + b = gfsmRegex_yy_scan_buffer(buf,n ,yyscanner); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in gfsmRegex_yy_scan_bytes()" ); + + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; +} + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif + +static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} + +/* Redefine yyless() so it works in section 3 code. */ + +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = yyg->yy_hold_char; \ + yyg->yy_c_buf_p = yytext + yyless_macro_arg; \ + yyg->yy_hold_char = *yyg->yy_c_buf_p; \ + *yyg->yy_c_buf_p = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) + +/* Accessor methods (get/set functions) to struct members. */ + +/** Get the user-defined data for this scanner. + * @param yyscanner The scanner object. + */ +YY_EXTRA_TYPE gfsmRegex_yyget_extra (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyextra; +} + +/** Get the current line number. + * @param yyscanner The scanner object. + */ +int gfsmRegex_yyget_lineno (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (! YY_CURRENT_BUFFER) + return 0; + + return yylineno; +} + +/** Get the current column number. + * @param yyscanner The scanner object. + */ +int gfsmRegex_yyget_column (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (! YY_CURRENT_BUFFER) + return 0; + + return yycolumn; +} + +/** Get the input stream. + * @param yyscanner The scanner object. + */ +FILE *gfsmRegex_yyget_in (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyin; +} + +/** Get the output stream. + * @param yyscanner The scanner object. + */ +FILE *gfsmRegex_yyget_out (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyout; +} + +/** Get the length of the current token. + * @param yyscanner The scanner object. + */ +int gfsmRegex_yyget_leng (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyleng; +} + +/** Get the current token. + * @param yyscanner The scanner object. + */ + +char *gfsmRegex_yyget_text (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yytext; +} + +/** Set the user-defined data. This data is never touched by the scanner. + * @param user_defined The data to be associated with this scanner. + * @param yyscanner The scanner object. + */ +void gfsmRegex_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyextra = user_defined ; +} + +/** Set the current line number. + * @param line_number + * @param yyscanner The scanner object. + */ +void gfsmRegex_yyset_lineno (int line_number , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* lineno is only valid if an input buffer exists. */ + if (! YY_CURRENT_BUFFER ) + yy_fatal_error( "gfsmRegex_yyset_lineno called with no buffer" , yyscanner); + + yylineno = line_number; +} + +/** Set the current column. + * @param line_number + * @param yyscanner The scanner object. + */ +void gfsmRegex_yyset_column (int column_no , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* column is only valid if an input buffer exists. */ + if (! YY_CURRENT_BUFFER ) + yy_fatal_error( "gfsmRegex_yyset_column called with no buffer" , yyscanner); + + yycolumn = column_no; +} + +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * @param yyscanner The scanner object. + * @see gfsmRegex_yy_switch_to_buffer + */ +void gfsmRegex_yyset_in (FILE * in_str , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyin = in_str ; +} + +void gfsmRegex_yyset_out (FILE * out_str , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyout = out_str ; +} + +int gfsmRegex_yyget_debug (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yy_flex_debug; +} + +void gfsmRegex_yyset_debug (int bdebug , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yy_flex_debug = bdebug ; +} + +/* Accessor methods for yylval and yylloc */ + +YYSTYPE * gfsmRegex_yyget_lval (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yylval; +} + +void gfsmRegex_yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yylval = yylval_param; +} + +/* User-visible API */ + +/* gfsmRegex_yylex_init is special because it creates the scanner itself, so it is + * the ONLY reentrant function that doesn't take the scanner as the last argument. + * That's why we explicitly handle the declaration, instead of using our macros. + */ + +int gfsmRegex_yylex_init(yyscan_t* ptr_yy_globals) + +{ + if (ptr_yy_globals == NULL){ + errno = EINVAL; + return 1; + } + + *ptr_yy_globals = (yyscan_t) gfsmRegex_yyalloc ( sizeof( struct yyguts_t ), NULL ); + + if (*ptr_yy_globals == NULL){ + errno = ENOMEM; + return 1; + } + + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ + memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); + + return yy_init_globals ( *ptr_yy_globals ); +} + +static int yy_init_globals (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from gfsmRegex_yylex_destroy(), so don't allocate here. + */ + + yyg->yy_buffer_stack = 0; + yyg->yy_buffer_stack_top = 0; + yyg->yy_buffer_stack_max = 0; + yyg->yy_c_buf_p = (char *) 0; + yyg->yy_init = 0; + yyg->yy_start = 0; + + yyg->yy_start_stack_ptr = 0; + yyg->yy_start_stack_depth = 0; + yyg->yy_start_stack = NULL; + +/* Defined in main.c */ +#ifdef YY_STDINIT + yyin = stdin; + yyout = stdout; +#else + yyin = (FILE *) 0; + yyout = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * gfsmRegex_yylex_init() + */ + return 0; +} + +/* gfsmRegex_yylex_destroy is for both reentrant and non-reentrant scanners. */ +int gfsmRegex_yylex_destroy (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + gfsmRegex_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + YY_CURRENT_BUFFER_LVALUE = NULL; + gfsmRegex_yypop_buffer_state(yyscanner); + } + + /* Destroy the stack itself. */ + gfsmRegex_yyfree(yyg->yy_buffer_stack ,yyscanner); + yyg->yy_buffer_stack = NULL; + + /* Destroy the start condition stack. */ + gfsmRegex_yyfree(yyg->yy_start_stack ,yyscanner ); + yyg->yy_start_stack = NULL; + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * gfsmRegex_yylex() is called, initialization will occur. */ + yy_init_globals( yyscanner); + + /* Destroy the main struct (reentrant only). */ + gfsmRegex_yyfree ( yyscanner , yyscanner ); + yyscanner = NULL; + return 0; +} + +/* + * Internal utility routines. + */ + +#ifndef yytext_ptr +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) +{ + register int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; +} +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) +{ + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; +} +#endif + +void *gfsmRegex_yyalloc (yy_size_t size , yyscan_t yyscanner) +{ + return (void *) malloc( size ); +} + +void *gfsmRegex_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) +{ + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); +} + +void gfsmRegex_yyfree (void * ptr , yyscan_t yyscanner) +{ + free( (char *) ptr ); /* see gfsmRegex_yyrealloc() for (char *) cast */ +} + +#define YYTABLES_NAME "yytables" + +#line 195 "gfsmRegex.lex.l" + + + +/*====================================================================== + * User C Code + */ + +GFSM_SCANNER_YYWRAP(gfsmRegex_yy) + Added: trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmRegex.tab.c =================================================================== --- trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmRegex.tab.c (rev 0) +++ trunk/externals/moocow/gfsm/gfsm/src/libgfsm/gfsmRegex.tab.c 2008-12-07 19:22:40 UTC (rev 10428) @@ -0,0 +1,1750 @@ +/* A Bison parser, made by GNU Bison 2.3. */ + +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + + This program 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. + + This program 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 this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "2.3" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 1 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + +/* Substitute the variable and function names. */ +#define yyparse gfsmRegex_yyparse +#define yylex gfsmRegex_yylex +#define yyerror gfsmRegex_yyerror +#define yylval gfsmRegex_yylval +#define yychar gfsmRegex_yychar +#define yydebug gfsmRegex_yydebug +#define yynerrs gfsmRegex_yynerrs + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + TOK_UNKNOWN = 258, + TOK_CHAR = 259, + TOK_UINT = 260, + TOK_STRING = 261, + TOK_WEIGHT = 262, + CONCAT = 263, + LABCONCAT = 264, + WEIGHT = 265 + }; +#endif +/* Tokens. */ +#define TOK_UNKNOWN 258 +#define TOK_CHAR 259 +#define TOK_UINT 260 +#define TOK_STRING 261 +#define TOK_WEIGHT 262 +#define CONCAT 263 +#define LABCONCAT 264 +#define WEIGHT 265 + + + + +/* Copy the first part of user declarations. */ +#line 6 "gfsmRegex.tab.y" + +/*====================================================================== + * Bison C Header + */ +#include <gfsmRegexCompiler.h> +#include <gfsmAutomatonIO.h> +#include <string.h> + +#include "gfsmRegex.tab.h" +#include "gfsmRegex.lex.h" + +#define my_compiler ((gfsmRegexCompiler*)reparser) + +#define YYLEX_PARAM ((gfsmRegexCompiler*)reparser)->scanner.yyscanner +#define YYPARSE_PARAM reparser + +#define YYERROR_VERBOSE 1 +#define gfsmRegex_yyerror(msg) \ + gfsm_scanner_carp((gfsmScanner*)reparser, (msg)); + + + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 31 "gfsmRegex.tab.y" +{ + gfsmAutomaton *fsm; //-- automaton + GString *gs; //-- needs to be freed by hand + gchar c; + guint32 u; + gfsmWeight w; +} +/* Line 187 of yacc.c. */ +#line 154 "gfsmRegex.tab.c" + YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif + + + +/* Copy the second part of user declarations. */ + + +/* Line 216 of yacc.c. */ +#line 167 "gfsmRegex.tab.c" + +#ifdef short +# undef short +#endif + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; +#endif + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif + +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int i) +#else +static int +YYID (i) + int i; +#endif +{ + return i; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif +# else +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# endif +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + + +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + yytype_int16 yyss; + YYSTYPE yyvs; + }; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) + +#endif + +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 17 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 213 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 30 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 4 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 23 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 41 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 265 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const yytype_uint8 yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 18, 2, 2, 12, 11, 22, 2, + 24, 25, 14, 15, 2, 21, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 20, 2, + 28, 2, 29, 16, 19, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 26, 2, 27, 17, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 23, 2, 13, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10 +}; + +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint8 yyprhs[] = +{ + 0, 0, 3, 7, 9, 12, 15, 18, 21, 24, + 27, 30, 34, 37, 40, 44, 48, 52, 56, 60, + 63, 65, 67, 71 +}; + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int8 yyrhs[] = +{ + 31, 0, -1, 24, 31, 25, -1, 32, -1, 32, + 31, -1, 31, 31, -1, 11, 31, -1, 12, 31, + -1, 13, 31, -1, 31, 14, -1, 31, 15, -1, + 31, 17, 5, -1, 31, 16, -1, 18, 31, -1, + 31, 23, 31, -1, 31, 22, 31, -1, 31, 20, + 31, -1, 31, 19, 31, -1, 31, 21, 31, -1, + 31, 33, -1, 4, -1, 6, -1, 26, 6, 27, + -1, 28, 7, 29, -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const yytype_uint8 yyrline[] = +{ + 0, 77, 77, 80, 83, 86, 89, 92, 95, 98, + 101, 104, 107, 110, 113, 116, 119, 122, 125, 128, + 132, 135, 138, 142 +}; +#endif + +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "TOK_UNKNOWN", "TOK_CHAR", "TOK_UINT", + "TOK_STRING", "TOK_WEIGHT", "CONCAT", "LABCONCAT", "WEIGHT", "'%'", + "'$'", "'~'", "'*'", "'+'", "'?'", "'^'", "'!'", "'@'", "':'", "'-'", + "'&'", "'|'", "'('", "')'", "'['", "']'", "'<'", "'>'", "$accept", + "regex", "label", "weight", 0 +}; +#endif + +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const yytype_uint16 yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 37, 36, 126, 42, 43, 63, 94, 33, 64, + 58, 45, 38, 124, 40, 41, 91, 93, 60, 62 +}; +# endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 30, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 32, 32, 32, 33 +}; + +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 3, 1, 2, 2, 2, 2, 2, 2, + 2, 3, 2, 2, 3, 3, 3, 3, 3, 2, + 1, 1, 3, 3 +}; + +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 0, 20, 21, 0, 0, 0, 0, 0, 0, 0, + 3, 6, 7, 8, 13, 0, 0, 1, 9, 10, + 12, 0, 0, 0, 0, 0, 0, 0, 5, 19, + 4, 2, 22, 11, 17, 16, 18, 15, 14, 0, + 23 +}; + +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + -1, 28, 10, 29 +}; + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -26 +static const yytype_int16 yypact[] = +{ + 187, -26, -26, 187, 187, 187, 187, 187, -5, 0, + 187, 73, 94, 115, 136, 50, -25, -26, -26, -26, + -26, -2, 187, 187, 187, 187, 187, 1, 73, -26, + 73, -26, -26, -26, 145, 157, 166, 178, 99, -24, + -26 +}; + +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = +{ + -26, 27, -26, -26 +}; + +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -1 +static const yytype_uint8 yytable[] = +{ + 17, 16, 32, 33, 1, 40, 2, 0, 39, 0, + 0, 3, 4, 5, 18, 19, 20, 21, 6, 22, + 23, 24, 25, 26, 7, 0, 8, 9, 27, 0, + 11, 12, 13, 14, 15, 0, 0, 30, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, + 35, 36, 37, 38, 1, 0, 2, 0, 0, 0, + 0, 3, 4, 5, 18, 19, 20, 21, 6, 22, + 23, 24, 25, 26, 7, 31, 8, 1, 27, 2, + 0, 0, 0, 0, 3, 4, 5, 18, 19, 20, + 21, 6, 22, 23, 24, 25, 26, 7, 1, 8, + 2, 27, 0, 1, 0, 2, 4, 5, 18, 19, + 20, 21, 6, 22, 23, 24, 25, 26, 7, 1, + 8, 2, 27, 7, 0, 8, 0, 27, 5, 18, + 19, 20, 21, 6, 22, 23, 24, 25, 26, 7, + 1, 8, 2, 27, 0, 0, 0, 0, 0, 1, + 0, 2, 0, 0, 6, 22, 23, 24, 25, 26, + 7, 1, 8, 2, 27, 23, 24, 25, 26, 7, + 1, 8, 2, 27, 0, 0, 0, 0, 24, 25, + 26, 7, 1, 8, 2, 27, 0, 0, 25, 26, + 7, 1, 8, 2, 27, 0, 0, 0, 3, 4, + 5, 26, 7, 0, 8, 6, 27, 0, 0, 0, + 0, 7, 0, 8 +}; + +static const yytype_int8 yycheck[] = +{ + 0, 6, 27, 5, 4, 29, 6, -1, 7, -1, + -1, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, -1, 26, 0, 28, -1, + 3, 4, 5, 6, 7, -1, -1, 10, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 22, + 23, 24, 25, 26, 4, -1, 6, -1, -1, -1, + -1, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 4, 28, 6, + -1, -1, -1, -1, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 4, 26, + 6, 28, -1, 4, -1, 6, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 4, + 26, 6, 28, 24, -1, 26, -1, 28, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 4, 26, 6, 28, -1, -1, -1, -1, -1, 4, + -1, 6, -1, -1, 18, 19, 20, 21, 22, 23, + 24, 4, 26, 6, 28, 20, 21, 22, 23, 24, + 4, 26, 6, 28, -1, -1, -1, -1, 21, 22, + 23, 24, 4, 26, 6, 28, -1, -1, 22, 23, + 24, 4, 26, 6, 28, -1, -1, -1, 11, 12, + 13, 23, 24, -1, 26, 18, 28, -1, -1, -1, + -1, 24, -1, 26 +}; + +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 4, 6, 11, 12, 13, 18, 24, 26, 31, + 32, 31, 31, 31, 31, 31, 6, 0, 14, 15, + 16, 17, 19, 20, 21, 22, 23, 28, 31, 33, + 31, 25, 27, 5, 31, 31, 31, 31, 31, 7, + 29 +}; + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. */ + +#define YYFAIL goto yyerrlab + +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK (1); \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (YYID (0)) + + +#define YYTERROR 1 +#define YYERRCODE 256 + + +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) +#endif + + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + +/* YYLEX -- calling `yylex' with the right arguments. */ + +#ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, YYLEX_PARAM) +#else +# define YYLEX yylex (&yylval) +#endif + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (YYID (0)) + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +#else +static void +yy_stack_print (bottom, top) + yytype_int16 *bottom; + yytype_int16 *top; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +#else +static void +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; + int yyrule; +#endif +{ + int yynrhs = yyr2[yyrule]; + int yyi; + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + fprintf (stderr, "\n"); + } +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) + +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + + +/* YYINITDEPTH -- initial size of the parser's stacks. */ +#ifndef YYINITDEPTH +# define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ + +#ifndef YYMAXDEPTH +# define YYMAXDEPTH 10000 +#endif + + + +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static YYSIZE_T +yystrlen (const char *yystr) +#else +static YYSIZE_T +yystrlen (yystr) + const char *yystr; +#endif +{ + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) + continue; + return yylen; +} +# endif +# endif + +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static char * +yystpcpy (char *yydest, const char *yysrc) +#else +static char * +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +#endif +{ + char *yyd = yydest; + const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: pd-extended planetccrma9-i386 2008-12-07 04.08.01
by pd＠planetccrma9-i386.idmi.poly.edu 07 Dec '08

07 Dec '08

1 0

autobuild: pd-extended planetccrma9-i386 2008-12-06 04.08.02
by pd＠planetccrma9-i386.idmi.poly.edu 06 Dec '08

06 Dec '08

1 0

SF.net SVN: pure-data:[10427] trunk/externals/ggee/filters
by eighthave＠users.sourceforge.net 05 Dec '08

05 Dec '08

Revision: 10427 http://pure-data.svn.sourceforge.net/pure-data/?rev=10427&view=rev Author: eighthave Date: 2008-12-05 20:19:42 +0000 (Fri, 05 Dec 2008) Log Message: ----------- made all help patches actually control a [biquad~] with a [noise~] input Modified Paths: -------------- trunk/externals/ggee/filters/bandpass-help.pd trunk/externals/ggee/filters/equalizer-help.pd trunk/externals/ggee/filters/highpass-help.pd trunk/externals/ggee/filters/highshelf-help.pd trunk/externals/ggee/filters/hlshelf-help.pd trunk/externals/ggee/filters/lowpass-help.pd trunk/externals/ggee/filters/lowshelf-help.pd trunk/externals/ggee/filters/notch-help.pd Modified: trunk/externals/ggee/filters/bandpass-help.pd =================================================================== --- trunk/externals/ggee/filters/bandpass-help.pd 2008-12-05 20:04:50 UTC (rev 10426) +++ trunk/externals/ggee/filters/bandpass-help.pd 2008-12-05 20:19:42 UTC (rev 10427) @@ -1,23 +1,30 @@ -#N canvas 295 68 566 339 10; -#X obj 77 199 print; -#X floatatom 77 114 0 0 0 0 - - -; -#X floatatom 168 114 0 0 0 0 - - -; -#X msg 91 138 bang; -#X text 139 93 bandwidth (0 - 100); -#X text 75 226 These filters are all controlled by a bandwidth which +#N canvas 92 30 461 436 10; +#X text 63 298 These filters are all controlled by a bandwidth which is expressed in octaves. A bandwidth of 100 is equivalent to one octave. ; #X text 76 12 Bandpass coefficients for biquad~; #X text 70 26 ===================================; -#X text 6 320 (C) Guenter Geiger 2000; -#X text 75 92 frequency; -#X text 75 268 Attention \, only the left inlet triggers new coefficients +#X text 63 340 Attention \, only the left inlet triggers new coefficients for biquad~; -#X obj 77 160 bandpass 4000 33; -#X obj 33 114 r doit; -#X connect 1 0 11 0; -#X connect 2 0 11 1; -#X connect 2 0 3 0; -#X connect 3 0 11 0; -#X connect 11 0 0 0; -#X connect 12 0 3 0; +#X text 8 388 (C) Guenter Geiger 2000; +#X floatatom 176 119 0 0 0 0 - - -; +#X floatatom 267 119 0 0 0 0 - - -; +#X obj 267 142 trigger bang float; +#X obj 113 216 biquad~; +#X obj 113 156 noise~; +#X obj 102 258 dac~; +#X obj 179 74 hsl 128 17 20 20000 1 0 empty empty frequency 5 9 0 10 +-203904 -1 -1 0 0; +#X obj 270 97 hsl 128 17 0 100 0 0 empty empty bandwidth 5 9 0 10 -261682 +-1 -1 0 1; +#X obj 176 185 bandpass; +#X connect 5 0 13 0; +#X connect 6 0 7 0; +#X connect 7 0 13 0; +#X connect 7 1 13 1; +#X connect 8 0 10 1; +#X connect 8 0 10 0; +#X connect 9 0 8 0; +#X connect 11 0 5 0; +#X connect 12 0 6 0; +#X connect 13 0 8 0; Modified: trunk/externals/ggee/filters/equalizer-help.pd =================================================================== --- trunk/externals/ggee/filters/equalizer-help.pd 2008-12-05 20:04:50 UTC (rev 10426) +++ trunk/externals/ggee/filters/equalizer-help.pd 2008-12-05 20:19:42 UTC (rev 10427) @@ -1,27 +1,40 @@ -#N canvas 212 148 577 304 10; -#X obj 87 145 print; -#X floatatom 87 77 0 0 0 0 - - -; -#X floatatom 196 75 0 0 0 0 - - -; -#X msg 101 101 bang; -#X text 196 54 bandwidth (0 - 100); -#X text 75 179 These filters are all controlled by a bandwidth which +#N canvas 153 157 456 417 10; +#X text 63 298 These filters are all controlled by a bandwidth which is expressed in octaves. A bandwidth of 100 is equivalent to one octave. ; -#X text 8 268 (C) Guenter Geiger 2000; -#X text 85 55 frequency; -#X text 75 221 Attention \, only the left inlet triggers new coefficients +#X text 63 340 Attention \, only the left inlet triggers new coefficients for biquad~; -#X floatatom 139 76 0 0 0 0 - - -; -#X text 148 55 gain; +#X text 8 388 (C) Guenter Geiger 2000; +#X floatatom 96 109 0 0 0 0 - - -; +#X floatatom 157 109 0 0 0 0 - - -; +#X obj 157 132 trigger bang float; +#X obj 43 206 biquad~; +#X obj 43 146 noise~; +#X obj 99 64 hsl 128 17 20 20000 1 1 empty empty frequency 5 9 0 10 +-203904 -1 -1 5400 0; +#X obj 160 87 hsl 128 17 0 100 0 1 empty empty gain 5 9 0 10 -204786 +-1 -1 6300 0; +#X obj 34 266 dac~; +#X obj 43 234 *~ 0.1; +#X floatatom 297 109 0 0 0 0 - - -; +#X obj 297 132 trigger bang float; +#X obj 300 87 hsl 128 17 0 100 0 1 empty empty bandwidth 5 9 0 10 -261682 +-1 -1 9100 0; #X text 71 26 ==============================================; #X text 76 12 Parametric Equalizer coefficients for biquad~; -#X obj 87 123 equalizer 5000 70 8; -#X obj 41 77 r doit; -#X connect 1 0 13 0; -#X connect 2 0 3 0; -#X connect 2 0 13 2; -#X connect 3 0 13 0; -#X connect 9 0 3 0; -#X connect 9 0 13 1; -#X connect 13 0 0 0; -#X connect 14 0 13 0; +#X obj 96 175 equalizer 5000 70 8; +#X connect 3 0 17 0; +#X connect 4 0 5 0; +#X connect 5 0 17 0; +#X connect 5 1 17 1; +#X connect 6 0 11 0; +#X connect 7 0 6 0; +#X connect 8 0 3 0; +#X connect 9 0 4 0; +#X connect 11 0 10 0; +#X connect 11 0 10 1; +#X connect 12 0 13 0; +#X connect 13 0 17 0; +#X connect 13 1 17 2; +#X connect 14 0 12 0; +#X connect 17 0 6 0; Modified: trunk/externals/ggee/filters/highpass-help.pd =================================================================== --- trunk/externals/ggee/filters/highpass-help.pd 2008-12-05 20:04:50 UTC (rev 10426) +++ trunk/externals/ggee/filters/highpass-help.pd 2008-12-05 20:19:42 UTC (rev 10427) @@ -1,23 +1,32 @@ -#N canvas 365 183 559 332 10; -#X obj 77 151 print; -#X floatatom 77 83 0 0 0 0 - - -; -#X floatatom 168 84 0 0 0 0 - - -; -#X msg 91 107 bang; -#X text 168 63 bandwidth (0 - 100); -#X text 75 195 These filters are all controlled by a bandwidth which +#N canvas 92 30 461 436 10; +#X text 63 298 These filters are all controlled by a bandwidth which is expressed in octaves. A bandwidth of 100 is equivalent to one octave. ; #X text 70 26 ===================================; -#X text 3 308 (C) Guenter Geiger 2000; -#X text 75 61 frequency; -#X text 75 237 Attention \, only the left inlet triggers new coefficients +#X text 63 340 Attention \, only the left inlet triggers new coefficients for biquad~; +#X text 8 388 (C) Guenter Geiger 2000; +#X floatatom 176 119 0 0 0 0 - - -; +#X floatatom 267 119 0 0 0 0 - - -; +#X obj 267 142 trigger bang float; +#X obj 113 216 biquad~; +#X obj 113 156 noise~; +#X obj 179 74 hsl 128 17 20 20000 1 1 empty empty frequency 5 9 0 10 +-203904 -1 -1 10100 0; +#X obj 270 97 hsl 128 17 0 100 0 1 empty empty bandwidth 5 9 0 10 -261682 +-1 -1 6200 0; +#X obj 176 185 highpass; +#X obj 104 276 dac~; #X text 76 12 Highpass coefficients for biquad~; -#X obj 77 129 highpass 4000 33; -#X obj 34 82 r doit; -#X connect 1 0 11 0; -#X connect 2 0 3 0; -#X connect 2 0 11 1; -#X connect 3 0 11 0; -#X connect 11 0 0 0; -#X connect 12 0 11 0; +#X obj 113 244 *~ 0.1; +#X connect 4 0 11 0; +#X connect 5 0 6 0; +#X connect 6 0 11 0; +#X connect 6 1 11 1; +#X connect 7 0 14 0; +#X connect 8 0 7 0; +#X connect 9 0 4 0; +#X connect 10 0 5 0; +#X connect 11 0 7 0; +#X connect 14 0 12 0; +#X connect 14 0 12 1; Modified: trunk/externals/ggee/filters/highshelf-help.pd =================================================================== --- trunk/externals/ggee/filters/highshelf-help.pd 2008-12-05 20:04:50 UTC (rev 10426) +++ trunk/externals/ggee/filters/highshelf-help.pd 2008-12-05 20:19:42 UTC (rev 10427) @@ -1,27 +1,40 @@ -#N canvas 310 193 553 339 10; -#X obj 77 182 print; -#X floatatom 77 114 0 0 0 0 - - -; -#X floatatom 186 112 0 0 0 0 - - -; -#X msg 91 138 bang; -#X text 75 226 These filters are all controlled by a bandwidth which +#N canvas 321 83 456 417 10; +#X text 63 298 These filters are all controlled by a bandwidth which is expressed in octaves. A bandwidth of 100 is equivalent to one octave. ; -#X text 4 317 (C) Guenter Geiger 2000; -#X text 75 92 frequency; -#X text 75 268 Attention \, only the left inlet triggers new coefficients +#X text 70 26 ===================================; +#X text 63 340 Attention \, only the left inlet triggers new coefficients for biquad~; -#X floatatom 129 113 0 0 0 0 - - -; -#X text 138 92 gain; -#X text 71 26 ==============================================; -#X text 186 91 slope (0 - 100); +#X text 8 388 (C) Guenter Geiger 2000; +#X floatatom 96 109 0 0 0 0 - - -; +#X floatatom 157 109 0 0 0 0 - - -; +#X obj 157 132 trigger bang float; +#X obj 43 206 biquad~; +#X obj 43 146 noise~; +#X obj 99 64 hsl 128 17 20 20000 1 1 empty empty frequency 5 9 0 10 +-203904 -1 -1 5100 0; +#X obj 160 87 hsl 128 17 0 100 0 1 empty empty gain 5 9 0 10 -204786 +-1 -1 2800 0; +#X obj 34 266 dac~; +#X obj 43 234 *~ 0.1; +#X floatatom 297 109 0 0 0 0 - - -; +#X obj 297 132 trigger bang float; +#X obj 300 87 hsl 128 17 0 100 0 1 empty empty slope 5 9 0 10 -261682 +-1 -1 6600 0; #X text 76 12 Highshelf coefficients for biquad~; -#X obj 77 160 highshelf 5000 70 100; -#X obj 30 113 r doit; -#X connect 1 0 13 0; -#X connect 2 0 3 0; -#X connect 2 0 13 2; -#X connect 3 0 13 0; -#X connect 8 0 3 0; -#X connect 8 0 13 1; -#X connect 13 0 0 0; -#X connect 14 0 13 0; +#X obj 96 175 highshelf 5000 70 100; +#X connect 4 0 17 0; +#X connect 5 0 6 0; +#X connect 6 0 17 0; +#X connect 6 1 17 1; +#X connect 7 0 12 0; +#X connect 8 0 7 0; +#X connect 9 0 4 0; +#X connect 10 0 5 0; +#X connect 12 0 11 0; +#X connect 12 0 11 1; +#X connect 13 0 14 0; +#X connect 14 0 17 0; +#X connect 14 1 17 2; +#X connect 15 0 13 0; +#X connect 17 0 7 0; Modified: trunk/externals/ggee/filters/hlshelf-help.pd =================================================================== --- trunk/externals/ggee/filters/hlshelf-help.pd 2008-12-05 20:04:50 UTC (rev 10426) +++ trunk/externals/ggee/filters/hlshelf-help.pd 2008-12-05 20:19:42 UTC (rev 10427) @@ -1,28 +1,58 @@ -#N canvas 365 183 620 471 10; -#X obj 38 182 print; -#X floatatom 38 114 0 0 0 0 - - -; -#X floatatom 71 115 0 0 0 0 - - -; -#X text 37 12 Bandpass coefficients for biquad~; -#X text 31 26 ===================================; -#X text 7 313 (C) Guenter Geiger 2000; -#X text 36 268 Attention \, only the left inlet triggers new coefficients +#N canvas 317 111 789 401 10; +#X text 7 351 (C) Guenter Geiger 2000; +#X text 211 298 Attention \, only the left inlet triggers new coefficients for biquad~; -#X obj 38 160 hlshelf; -#X floatatom 106 114 0 0 0 0 - - -; -#X text 36 99; -#X floatatom 173 114 0 0 0 0 - - -; -#X floatatom 212 115 0 0 0 0 - - -; -#X text 31 90 gain0; -#X text 70 89 gain1; -#X text 111 89 gain2; -#X text 171 89 f-low; -#X text 214 90 f-high; -#X text 33 218 The hlshelf object creates filter coefficients for the -biquad~ filter. The three shelfs of the filter are controlled through +#X text 208 248 The hlshelf object creates filter coefficients for +the biquad~ filter. The three shelfs of the filter are controlled through the gains \, the boundaries of the areas through f-low and f-high; -#X connect 1 0 7 0; -#X connect 2 0 7 1; -#X connect 7 0 0 0; -#X connect 8 0 7 2; -#X connect 10 0 7 3; -#X connect 11 0 7 4; +#X text 37 12 high-low shelf coefficients for biquad~; +#X text 31 26 ========================================; +#X floatatom 488 101 0 0 0 0 - - -; +#X floatatom 349 101 0 0 0 0 - - -; +#X obj 349 123 trigger bang float; +#X obj 45 223 biquad~; +#X obj 45 163 noise~; +#X obj 491 81 hsl 128 17 20 20000 1 1 empty empty frequency-low 5 9 +0 10 -203904 -1 -1 4400 0; +#X obj 352 81 hsl 128 17 0 100 0 1 empty empty gain2 5 9 0 10 -204786 +-1 -1 9100 0; +#X obj 36 283 dac~; +#X obj 45 251 *~ 0.1; +#X obj 129 192 hlshelf 30 50 70 500 5000; +#X obj 488 123 trigger bang float; +#X floatatom 628 101 0 0 0 0 - - -; +#X obj 631 81 hsl 128 17 20 20000 1 1 empty empty frequency-high 5 +9 0 10 -204800 -1 -1 8800 0; +#X obj 628 123 trigger bang float; +#X floatatom 209 101 0 0 0 0 - - -; +#X obj 209 123 trigger bang float; +#X obj 212 81 hsl 128 17 0 100 0 1 empty empty gain1 5 9 0 10 -204786 +-1 -1 9200 0; +#X floatatom 69 100 0 0 0 0 - - -; +#X obj 72 80 hsl 128 17 0 100 0 1 empty empty gain0 5 9 0 10 -204786 +-1 -1 2300 0; +#X obj 129 140 bang; +#X connect 5 0 15 0; +#X connect 6 0 7 0; +#X connect 7 0 24 0; +#X connect 7 1 14 2; +#X connect 8 0 13 0; +#X connect 9 0 8 0; +#X connect 10 0 5 0; +#X connect 11 0 6 0; +#X connect 13 0 12 0; +#X connect 13 0 12 1; +#X connect 14 0 8 0; +#X connect 15 0 24 0; +#X connect 15 1 14 3; +#X connect 16 0 18 0; +#X connect 17 0 16 0; +#X connect 18 0 24 0; +#X connect 18 1 14 4; +#X connect 19 0 20 0; +#X connect 20 0 24 0; +#X connect 20 1 14 1; +#X connect 21 0 19 0; +#X connect 22 0 14 0; +#X connect 23 0 22 0; +#X connect 24 0 14 0; Modified: trunk/externals/ggee/filters/lowpass-help.pd =================================================================== --- trunk/externals/ggee/filters/lowpass-help.pd 2008-12-05 20:04:50 UTC (rev 10426) +++ trunk/externals/ggee/filters/lowpass-help.pd 2008-12-05 20:19:42 UTC (rev 10427) @@ -1,23 +1,32 @@ -#N canvas 365 183 515 357 10; -#X obj 77 182 print; -#X floatatom 77 114 0 0 0 0 - - -; -#X floatatom 162 114 0 0 0 0 - - -; -#X msg 91 138 bang; -#X text 139 93 bandwidth (0 - 100); -#X text 75 226 These filters are all controlled by a bandwidth which +#N canvas 271 181 461 436 10; +#X text 63 298 These filters are all controlled by a bandwidth which is expressed in octaves. A bandwidth of 100 is equivalent to one octave. ; #X text 70 26 ===================================; -#X text 5 320 (C) Guenter Geiger 2000; -#X text 75 92 frequency; -#X text 75 268 Attention \, only the left inlet triggers new coefficients +#X text 63 340 Attention \, only the left inlet triggers new coefficients for biquad~; -#X text 71 12 Lowpass coefficients for biquad~; -#X obj 32 114 r doit; -#X obj 77 160 lowpass 4000 33; -#X connect 1 0 12 0; -#X connect 2 0 3 0; -#X connect 2 0 12 1; -#X connect 3 0 12 0; -#X connect 11 0 12 0; -#X connect 12 0 0 0; +#X text 8 388 (C) Guenter Geiger 2000; +#X floatatom 176 119 0 0 0 0 - - -; +#X floatatom 267 119 0 0 0 0 - - -; +#X obj 267 142 trigger bang float; +#X obj 113 216 biquad~; +#X obj 113 156 noise~; +#X obj 179 74 hsl 128 17 20 20000 1 1 empty empty frequency 5 9 0 10 +-203904 -1 -1 8000 0; +#X obj 270 97 hsl 128 17 0 100 0 1 empty empty bandwidth 5 9 0 10 -261682 +-1 -1 6400 0; +#X obj 104 276 dac~; +#X obj 113 244 *~ 0.1; +#X text 76 12 Lowpass coefficients for biquad~; +#X obj 176 185 lowpass; +#X connect 4 0 14 0; +#X connect 5 0 6 0; +#X connect 6 0 14 0; +#X connect 6 1 14 1; +#X connect 7 0 12 0; +#X connect 8 0 7 0; +#X connect 9 0 4 0; +#X connect 10 0 5 0; +#X connect 12 0 11 0; +#X connect 12 0 11 1; +#X connect 14 0 7 0; Modified: trunk/externals/ggee/filters/lowshelf-help.pd =================================================================== --- trunk/externals/ggee/filters/lowshelf-help.pd 2008-12-05 20:04:50 UTC (rev 10426) +++ trunk/externals/ggee/filters/lowshelf-help.pd 2008-12-05 20:19:42 UTC (rev 10427) @@ -1,27 +1,40 @@ -#N canvas 365 183 595 347 10; -#X obj 77 182 print; -#X floatatom 77 114 0 0 0 0 - - -; -#X floatatom 192 113 0 0 0 0 - - -; -#X msg 91 138 bang; -#X text 75 226 These filters are all controlled by a bandwidth which +#N canvas 321 83 456 417 10; +#X text 63 298 These filters are all controlled by a bandwidth which is expressed in octaves. A bandwidth of 100 is equivalent to one octave. ; -#X text 4 319 (C) Guenter Geiger 2000; -#X text 75 92 frequency; -#X text 75 268 Attention \, only the left inlet triggers new coefficients +#X text 70 26 ===================================; +#X text 63 340 Attention \, only the left inlet triggers new coefficients for biquad~; -#X floatatom 129 113 0 0 0 0 - - -; -#X text 138 92 gain; -#X text 71 26 ==============================================; -#X text 192 92 slope (0 - 100); +#X text 8 388 (C) Guenter Geiger 2000; +#X floatatom 96 109 0 0 0 0 - - -; +#X floatatom 157 109 0 0 0 0 - - -; +#X obj 157 132 trigger bang float; +#X obj 43 206 biquad~; +#X obj 43 146 noise~; +#X obj 99 64 hsl 128 17 20 20000 1 1 empty empty frequency 5 9 0 10 +-203904 -1 -1 5100 0; +#X obj 160 87 hsl 128 17 0 100 0 1 empty empty gain 5 9 0 10 -204786 +-1 -1 2800 0; +#X obj 34 266 dac~; +#X obj 43 234 *~ 0.1; #X text 76 12 Lowshelf coefficients for biquad~; -#X obj 31 113 r doit; -#X obj 77 160 lowshelf 4000 50 100; -#X connect 1 0 14 0; -#X connect 2 0 3 0; -#X connect 2 0 14 2; -#X connect 3 0 14 0; -#X connect 8 0 3 0; -#X connect 8 0 14 1; -#X connect 13 0 14 0; -#X connect 14 0 0 0; +#X floatatom 297 109 0 0 0 0 - - -; +#X obj 297 132 trigger bang float; +#X obj 300 87 hsl 128 17 0 100 0 1 empty empty slope 5 9 0 10 -261682 +-1 -1 6600 0; +#X obj 96 175 lowshelf 4000 50 100; +#X connect 4 0 17 0; +#X connect 5 0 6 0; +#X connect 6 0 17 0; +#X connect 6 1 17 1; +#X connect 7 0 12 0; +#X connect 8 0 7 0; +#X connect 9 0 4 0; +#X connect 10 0 5 0; +#X connect 12 0 11 0; +#X connect 12 0 11 1; +#X connect 14 0 15 0; +#X connect 15 0 17 0; +#X connect 15 1 17 2; +#X connect 16 0 14 0; +#X connect 17 0 7 0; Modified: trunk/externals/ggee/filters/notch-help.pd =================================================================== --- trunk/externals/ggee/filters/notch-help.pd 2008-12-05 20:04:50 UTC (rev 10426) +++ trunk/externals/ggee/filters/notch-help.pd 2008-12-05 20:19:42 UTC (rev 10427) @@ -1,21 +1,32 @@ -#N canvas 363 47 641 397 10; -#X obj 68 149 print; -#X floatatom 68 81 0 0 0 0 - - -; -#X floatatom 141 81 0 0 0 0 - - -; -#X msg 82 105 bang; -#X text 141 60 bandwidth (0 - 100); -#X text 66 193 These filters are all controlled by a bandwidth which +#N canvas 271 181 461 436 10; +#X text 63 298 These filters are all controlled by a bandwidth which is expressed in octaves. A bandwidth of 100 is equivalent to one octave. ; #X text 70 26 ===================================; -#X text 7 310 (C) Guenter Geiger 2000; -#X text 66 59 frequency; -#X text 66 235 Attention \, only the left inlet triggers new coefficients +#X text 63 340 Attention \, only the left inlet triggers new coefficients for biquad~; -#X text 72 13 Notch coefficients for biquad~; -#X obj 68 127 notch 4000 33; -#X connect 1 0 11 0; -#X connect 2 0 3 0; -#X connect 2 0 11 1; -#X connect 3 0 11 0; -#X connect 11 0 0 0; +#X text 8 388 (C) Guenter Geiger 2000; +#X floatatom 176 119 0 0 0 0 - - -; +#X floatatom 267 119 0 0 0 0 - - -; +#X obj 267 142 trigger bang float; +#X obj 113 216 biquad~; +#X obj 113 156 noise~; +#X obj 179 74 hsl 128 17 20 20000 1 1 empty empty frequency 5 9 0 10 +-203904 -1 -1 8800 0; +#X obj 270 97 hsl 128 17 0 300 0 1 empty empty bandwidth 5 9 0 10 -261682 +-1 -1 12700 0; +#X obj 104 276 dac~; +#X obj 113 244 *~ 0.1; +#X text 76 12 Notch coefficients for biquad~; +#X obj 176 185 notch; +#X connect 4 0 14 0; +#X connect 5 0 6 0; +#X connect 6 0 14 0; +#X connect 6 1 14 1; +#X connect 7 0 12 0; +#X connect 8 0 7 0; +#X connect 9 0 4 0; +#X connect 10 0 5 0; +#X connect 12 0 11 0; +#X connect 12 0 11 1; +#X connect 14 0 7 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs December 2008