mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-25 18:14:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/parse/grammar.y: Remove handling of { } for threads.

Browse source 
Original commit message from CVS:
* gst/parse/grammar.y:
Remove handling of { } for threads.
This commit is contained in:
Michael Smith 2005-12-07 11:52:05 +00:00
parent e8b8381452
commit 4e8cd3c843
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-12-07 Michael Smith <msmith@fluendo.com>
* gst/parse/grammar.y:
Remove handling of { } for threads.
2005-12-06 David Schleef <ds@schleef.org> 2005-12-06 David Schleef <ds@schleef.org>
* libs/gst/base/gstbasetransform.c: speling fix. * libs/gst/base/gstbasetransform.c: speling fix.

9
gst/parse/grammar.y
View file

@ -563,7 +563,7 @@ static int yyerror (const char *s);
%type <e> element %type <e> element
%type <p> padlist pads assignments %type <p> padlist pads assignments
%left '{' '}' '(' ')' %left '(' ')'
%left ',' %left ','
%right '.' %right '.'
%left '!' '=' %left '!' '='
@ -587,18 +587,13 @@ element: IDENTIFIER { $$ = gst_element_factory_make ($1, NULL);
assignments: /* NOP */ { $$ = NULL; } assignments: /* NOP */ { $$ = NULL; }
| assignments ASSIGNMENT { $$ = g_slist_prepend ($1, $2); } | assignments ASSIGNMENT { $$ = g_slist_prepend ($1, $2); }
; ;
bin: '{' assignments chain '}' { GST_BIN_MAKE ($$, "thread", $3, $2); } bin: '(' assignments chain ')' { GST_BIN_MAKE ($$, "bin", $3, $2); }
| '(' assignments chain ')' { GST_BIN_MAKE ($$, "bin", $3, $2); }
| BINREF assignments chain ')' { GST_BIN_MAKE ($$, $1, $3, $2); | BINREF assignments chain ')' { GST_BIN_MAKE ($$, $1, $3, $2);
gst_parse_strfree ($1); gst_parse_strfree ($1);
} }
| '{' assignments '}' { GST_BIN_MAKE ($$, "thread", NULL, $2); }
| '(' assignments '}' { GST_BIN_MAKE ($$, "thread", NULL, $2); }
| BINREF assignments ')' { GST_BIN_MAKE ($$, $1, NULL, $2); | BINREF assignments ')' { GST_BIN_MAKE ($$, $1, NULL, $2);
gst_parse_strfree ($1); gst_parse_strfree ($1);
} }
| '{' assignments error '}' { GST_BIN_MAKE ($$, "thread", NULL, $2); }
| '(' assignments error '}' { GST_BIN_MAKE ($$, "thread", NULL, $2); }
| BINREF assignments error ')' { GST_BIN_MAKE ($$, $1, NULL, $2); | BINREF assignments error ')' { GST_BIN_MAKE ($$, $1, NULL, $2);
gst_parse_strfree ($1); gst_parse_strfree ($1);
} }